From: Michael Monreal Date: Wed, 6 Jun 2007 22:15:50 +0000 (+0000) Subject: Zoom icon artwork. See bug #444795. X-Git-Tag: EVINCE_0_9_1~17 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=bd9b5427d0f4e3c98976b0ae209b18922445b879;p=evince.git Zoom icon artwork. See bug #444795. 2007-06-07 Michael Monreal * data/icons/16x16/actions/Makefile.am: * data/icons/16x16/actions/zoom.svg: * data/icons/22x22/actions/Makefile.am: * data/icons/22x22/actions/zoom.svg: * data/icons/24x24/actions/Makefile.am: * shell/ev-stock-icons.c: * shell/ev-stock-icons.h: * shell/ev-window.c: Zoom icon artwork. See bug #444795. svn path=/trunk/; revision=2488 --- diff --git a/ChangeLog b/ChangeLog index 3e87f258..b6eb20c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-06-07 Michael Monreal + + * data/icons/16x16/actions/Makefile.am: + * data/icons/16x16/actions/zoom.svg: + * data/icons/22x22/actions/Makefile.am: + * data/icons/22x22/actions/zoom.svg: + * data/icons/24x24/actions/Makefile.am: + * shell/ev-stock-icons.c: + * shell/ev-stock-icons.h: + * shell/ev-window.c: + + Zoom icon artwork. See bug #444795. + 2007-06-05 Bastien Nocera * shell/ev-metadata-manager.c: Remove extraneous function diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index f63776cf..274f6900 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -7,12 +7,14 @@ iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ view-page-continuous.png \ view-page-facing.png \ + zoom.png \ zoom-fit-page.png \ zoom-fit-width.png noinst_DATA = \ view-page-continuous.xcf \ view-page-facing.xcf \ + zoom.svg \ zoom-fit-page.svg \ zoom-fit-width.svg diff --git a/data/icons/16x16/actions/zoom.png b/data/icons/16x16/actions/zoom.png new file mode 100644 index 00000000..3161d00a Binary files /dev/null and b/data/icons/16x16/actions/zoom.png differ diff --git a/data/icons/16x16/actions/zoom.svg b/data/icons/16x16/actions/zoom.svg new file mode 100644 index 00000000..14e713e9 --- /dev/null +++ b/data/icons/16x16/actions/zoom.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nillson + + + Zoom + + + + + + + + + + + + + + + diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index d2b21b2e..8c5c684c 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -7,12 +7,14 @@ iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ view-page-continuous.png \ view-page-facing.png \ + zoom.png \ zoom-fit-page.png \ zoom-fit-width.png noinst_DATA = \ view-page-continuous.xcf \ view-page-facing.xcf \ + zoom.svg \ zoom-fit-page.svg \ zoom-fit-width.svg diff --git a/data/icons/22x22/actions/zoom.png b/data/icons/22x22/actions/zoom.png new file mode 100644 index 00000000..aa5be522 Binary files /dev/null and b/data/icons/22x22/actions/zoom.png differ diff --git a/data/icons/22x22/actions/zoom.svg b/data/icons/22x22/actions/zoom.svg new file mode 100644 index 00000000..bff113b8 --- /dev/null +++ b/data/icons/22x22/actions/zoom.svg @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index e40425c6..492936f0 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -7,6 +7,7 @@ iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ view-page-continuous.png \ view-page-facing.png \ + zoom.png \ zoom-fit-page.png \ zoom-fit-width.png diff --git a/data/icons/24x24/actions/zoom.png b/data/icons/24x24/actions/zoom.png new file mode 100644 index 00000000..6a96b133 Binary files /dev/null and b/data/icons/24x24/actions/zoom.png differ diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c index c318dedc..801db9a8 100644 --- a/shell/ev-stock-icons.c +++ b/shell/ev-stock-icons.c @@ -34,6 +34,7 @@ typedef struct { /* Evince stock icons */ static const EvStockIcon stock_icons [] = { + { EV_STOCK_ZOOM, "zoom" }, { EV_STOCK_ZOOM_PAGE, "zoom-fit-page" }, { EV_STOCK_ZOOM_WIDTH, "zoom-fit-width" }, { EV_STOCK_VIEW_DUAL, "view-page-facing" }, diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h index d461a4a0..b3455de5 100644 --- a/shell/ev-stock-icons.h +++ b/shell/ev-stock-icons.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS /* Evince stock icons */ +#define EV_STOCK_ZOOM "zoom" #define EV_STOCK_ZOOM_PAGE "zoom-fit-page" #define EV_STOCK_ZOOM_WIDTH "zoom-fit-width" #define EV_STOCK_VIEW_DUAL "view-page-facing" diff --git a/shell/ev-window.c b/shell/ev-window.c index d48e4c00..7f3a5203 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4476,7 +4476,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) action = g_object_new (EPHY_TYPE_ZOOM_ACTION, "name", ZOOM_CONTROL_ACTION, "label", _("Zoom"), - "stock_id", GTK_STOCK_ZOOM_IN, + "stock_id", EV_STOCK_ZOOM, "tooltip", _("Adjust the zoom level"), "zoom", 1.0, NULL);