diff --git a/ChangeLog b/ChangeLog index 8e4d20650..903b7a7af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2007-09-06 Benny Malengier + * src/images/16x16/gramps-zoom-fit-width.png: delete + * src/images/22x22/gramps-zoom-fit-width.png: + * src/images/22x22/gramps-zoom-in.png: + * src/images/22x22/gramps-zoom-out.png: + * src/images/22x22/gramps-zoom-best-fit.png: + * src/images/48x48/gramps-zoom-fit-width.png: + * src/images/48x48/gramps-zoom-out.png: + * src/images/48x48/gramps-zoom-in.png: + * src/images/48x48/gramps-zoom-best-fit.png: + * src/images/scalable/gramps-zoom-best-fit.svg: + * src/images/scalable/gramps-zoom-fit-width.svg: + * src/images/scalable/gramps-zoom-out.svg: + * src/images/scalable/gramps-zoom-in.svg: + * src/gramps_main.py: + * src/docgen/GtkPrint.py: + GUI consistency, all preview scaling icons equal style. When Tango icons + are finished for this, we will use those, now based on Gnome icons. + 2007-09-06 Benny Malengier * src/images/48x48/gramps-font.png: * src/images/scalable/gramps-font.png: diff --git a/src/docgen/GtkPrint.py b/src/docgen/GtkPrint.py index 4ab60c029..c50080a25 100644 --- a/src/docgen/GtkPrint.py +++ b/src/docgen/GtkPrint.py @@ -135,8 +135,11 @@ class PrintPreview: self._zoom_fit_width_button = window_xml.get_widget('zoom_fit_width') self._zoom_fit_width_button.set_stock_id('gramps-zoom-fit-width') self._zoom_best_fit_button = window_xml.get_widget('zoom_best_fit') + self._zoom_best_fit_button.set_stock_id('gramps-zoom-best-fit') self._zoom_in_button = window_xml.get_widget('zoom_in') + self._zoom_in_button.set_stock_id('gramps-zoom-in') self._zoom_out_button = window_xml.get_widget('zoom_out') + self._zoom_out_button.set_stock_id('gramps-zoom-out') # connect the signals window_xml.signal_autoconnect({ diff --git a/src/gramps_main.py b/src/gramps_main.py index bd935ebe7..2d2411f5b 100644 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -125,7 +125,10 @@ def register_stock_icons (): ('gramps-tools',_('Tools'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-unlock',_('Private'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-viewmedia',_('View'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-zoom-in',_('Zoom In'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-zoom-out',_('Zoom Out'),gtk.gdk.CONTROL_MASK,0,''), ('gramps-zoom-fit-width',_('Fit Width'),gtk.gdk.CONTROL_MASK,0,''), + ('gramps-zoom-best-fit',_('Fit Page'),gtk.gdk.CONTROL_MASK,0,''), ] # the following icons are not yet in new directory structure # they should be ported in the near future diff --git a/src/images/16x16/gramps-zoom-fit-width.png b/src/images/16x16/gramps-zoom-fit-width.png deleted file mode 100644 index 1c495cab6..000000000 Binary files a/src/images/16x16/gramps-zoom-fit-width.png and /dev/null differ diff --git a/src/images/22x22/gramps-zoom-best-fit.png b/src/images/22x22/gramps-zoom-best-fit.png new file mode 100644 index 000000000..c0da422a7 Binary files /dev/null and b/src/images/22x22/gramps-zoom-best-fit.png differ diff --git a/src/images/22x22/gramps-zoom-fit-width.png b/src/images/22x22/gramps-zoom-fit-width.png index 4bed0553b..245524a3e 100644 Binary files a/src/images/22x22/gramps-zoom-fit-width.png and b/src/images/22x22/gramps-zoom-fit-width.png differ diff --git a/src/images/22x22/gramps-zoom-in.png b/src/images/22x22/gramps-zoom-in.png new file mode 100644 index 000000000..8822add40 Binary files /dev/null and b/src/images/22x22/gramps-zoom-in.png differ diff --git a/src/images/22x22/gramps-zoom-out.png b/src/images/22x22/gramps-zoom-out.png new file mode 100644 index 000000000..5ee82f18a Binary files /dev/null and b/src/images/22x22/gramps-zoom-out.png differ diff --git a/src/images/48x48/gramps-zoom-best-fit.png b/src/images/48x48/gramps-zoom-best-fit.png new file mode 100644 index 000000000..75b5a14da Binary files /dev/null and b/src/images/48x48/gramps-zoom-best-fit.png differ diff --git a/src/images/48x48/gramps-zoom-fit-width.png b/src/images/48x48/gramps-zoom-fit-width.png index 395162ebb..6a3845f8d 100644 Binary files a/src/images/48x48/gramps-zoom-fit-width.png and b/src/images/48x48/gramps-zoom-fit-width.png differ diff --git a/src/images/48x48/gramps-zoom-in.png b/src/images/48x48/gramps-zoom-in.png new file mode 100644 index 000000000..8c347473a Binary files /dev/null and b/src/images/48x48/gramps-zoom-in.png differ diff --git a/src/images/48x48/gramps-zoom-out.png b/src/images/48x48/gramps-zoom-out.png new file mode 100644 index 000000000..1daf1f793 Binary files /dev/null and b/src/images/48x48/gramps-zoom-out.png differ diff --git a/src/images/scalable/gramps-zoom-best-fit.svg b/src/images/scalable/gramps-zoom-best-fit.svg new file mode 100644 index 000000000..a6c36acb5 --- /dev/null +++ b/src/images/scalable/gramps-zoom-best-fit.svg @@ -0,0 +1,578 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Find + + + document + search + find + + + + + + Lapo Calamandrei + + + + + + Jakub Steiner + + + 2006-04-21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-zoom-fit-width.svg b/src/images/scalable/gramps-zoom-fit-width.svg index d1498db57..3e128e3fc 100644 --- a/src/images/scalable/gramps-zoom-fit-width.svg +++ b/src/images/scalable/gramps-zoom-fit-width.svg @@ -9,244 +9,681 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" - height="22" - id="svg7360" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - version="1.0" - sodipodi:docbase="/home/andreas/project/misc icons/22x22/actions" - sodipodi:docname="zoom-fit-width.svg" - inkscape:export-filename="/home/andreas/project/misc icons/22x22/actions/zoom-fit-width.png" - inkscape:export-xdpi="90" inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/benny/programms/gramps/myicons/48x48/gramps-zoom-fit-width.png" + sodipodi:docname="gramps-zoom-fit-width.svg" + sodipodi:docbase="/home/benny/programms/gramps/myicons/scalable" + inkscape:version="0.45" + sodipodi:version="0.32" + id="svg249" + height="48.000000px" + width="48.000000px" inkscape:output_extension="org.inkscape.output.svg.inkscape" sodipodi:modified="TRUE"> + id="defs3"> + xlink:href="#linearGradient15493" + id="linearGradient17263" + gradientUnits="userSpaceOnUse" + x1="19" + y1="14.875" + x2="19.65625" + y2="29" + gradientTransform="translate(2,-1)" /> + + id="stop23436" /> + id="stop23438" /> + id="linearGradient19914"> + + + + id="linearGradient19900"> + id="stop19902" /> + id="stop19904" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + gradientTransform="matrix(-3.294293e-16,1.143443,-1.247217,-1.248581e-6,41.735,-54.25682)" + cx="45.094624" + cy="-2.6936908" + fx="45.094624" + fy="-2.6936908" + r="10.498367" /> + gradientTransform="matrix(4.928248e-11,-1.686609,1.66336,-1.770202e-15,41.65431,111.7396)" + cx="59.787472" + cy="10.901535" + fx="59.787472" + fy="10.901535" + r="10.55559" /> - - - + xlink:href="#linearGradient2698" + id="linearGradient1421" + gradientUnits="userSpaceOnUse" + x1="81.332451" + y1="55.106758" + x2="82.919647" + y2="53.511261" /> + x1="81.096306" + y1="57.148193" + x2="83.629295" + y2="54.615208" /> + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-height="789" + inkscape:window-width="748" + inkscape:document-units="px" + inkscape:grid-bbox="false" + showgrid="false" + inkscape:current-layer="layer5" + inkscape:cy="24.45218" + inkscape:cx="18.913318" + inkscape:zoom="10.08264" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + borderopacity="1" + bordercolor="#666666" + pagecolor="#b6b6b6" + id="base" + inkscape:showpageshadow="false" + showborder="true" + showguides="false" + inkscape:guide-bbox="true" + inkscape:grid-points="true" + gridspacingx="0.5px" + gridspacingy="0.5px" + gridempspacing="2" + fill="#729fcf" + stroke="#2e3436"> + + + + id="metadata4"> image/svg+xml + Find + + + document + search + find + + + + + + Lapo Calamandrei + + + + + + Jakub Steiner + + + 2006-04-21 + small change for gramps, fit width + + + + + + + + + inkscape:groupmode="layer" + id="layer6" + inkscape:label="Shadow" /> + + - - - - - - - - - - - - - - - + transform="translate(-12.26513,47.49999)" + style="display:inline" + inkscape:label="base" + id="g2637" /> + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-zoom-in.svg b/src/images/scalable/gramps-zoom-in.svg new file mode 100644 index 000000000..00fb0b21e --- /dev/null +++ b/src/images/scalable/gramps-zoom-in.svg @@ -0,0 +1,555 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Find + + + document + search + find + + + + + + Lapo Calamandrei + + + + + + Jakub Steiner + + + 2006-04-21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-zoom-out.svg b/src/images/scalable/gramps-zoom-out.svg new file mode 100644 index 000000000..1aef526a2 --- /dev/null +++ b/src/images/scalable/gramps-zoom-out.svg @@ -0,0 +1,555 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Find + + + document + search + find + + + + + + Lapo Calamandrei + + + + + + Jakub Steiner + + + 2006-04-21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +