From 04a2ebaeef464d826a6e7bdfa37ab66f792f6991 Mon Sep 17 00:00:00 2001
From: Luca Ferretti <elle.uca@libero.it>
Date: Fri, 19 Jan 2007 13:52:45 +0000
Subject: Move Evince icons under new apps directory.

2007-01-19  Luca Ferretti  <elle.uca@libero.it>

	* data/icons/*/apps/evince.*:

	Move Evince icons under new apps directory.

	* data/icons/*/actions/*:

	Add new custom themeable Evince icons: view-page-continuous, 
	view-page-facing, zoom-fit-width, zoom-fit-page. From Andreas
	Nilsson, at 16 and 22 pixels (plus 24 for compatibility).

	* configure.ac:

	Add new directories to AC_CONFIG_FILES.

	* shell/ev-stock-icons.c:
	* shell/ev-stock-icons.h:

	Use new custom themeable icons.


svn path=/trunk/; revision=2235
---
(limited to 'shell')

diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c
index cda5c53..3b30489 100644
--- a/shell/ev-stock-icons.c
+++ b/shell/ev-stock-icons.c
@@ -34,13 +34,13 @@ typedef struct {
 	char *icon;
 } EvStockIcon;
 
-/* Evince stock icons from gnome-icon-theme */
+/* Evince stock icons */
 static const EvStockIcon stock_icons [] = {
-	{ EV_STOCK_ZOOM_PAGE,        "stock_zoom-page" },
-	{ EV_STOCK_ZOOM_WIDTH,       "stock_zoom-page-width" },
-	{ EV_STOCK_LEAVE_FULLSCREEN, "stock_leave-fullscreen" },
-	{ EV_STOCK_VIEW_DUAL,        "stock_preview-two-pages" },
-	{ EV_STOCK_VIEW_CONTINUOUS,  "stock_new-master-document" },
+	{ EV_STOCK_ZOOM_PAGE,        "zoom-fit-page" },
+	{ EV_STOCK_ZOOM_WIDTH,       "zoom-fit-width" },
+	{ EV_STOCK_LEAVE_FULLSCREEN, "view-restore" },
+	{ EV_STOCK_VIEW_DUAL,        "view-page-facing" },
+	{ EV_STOCK_VIEW_CONTINUOUS,  "view-page-continuous" },
 	{ EV_STOCK_ROTATE_LEFT,      "object-rotate-left"},
 	{ EV_STOCK_ROTATE_RIGHT,     "object-rotate-right"},
 };
@@ -73,4 +73,12 @@ ev_stock_icons_init (void)
 	gtk_icon_source_free (source);
 
 	g_object_unref (G_OBJECT (factory));
+
+        /* GtkIconTheme will then look in Evince custom hicolor dir
+         * for icons as well as the standard search paths
+         */
+        /* FIXME: multi-head! */
+        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                           DATADIR G_DIR_SEPARATOR_S "icons");
+
 }
diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h
index 4064ef0..3ea635a 100644
--- a/shell/ev-stock-icons.h
+++ b/shell/ev-stock-icons.h
@@ -29,11 +29,11 @@
 G_BEGIN_DECLS
 
 /* Evince stock icons */
-#define EV_STOCK_ZOOM_PAGE              "stock_zoom-page" 
-#define EV_STOCK_ZOOM_WIDTH             "stock_zoom-page-width" 
-#define EV_STOCK_LEAVE_FULLSCREEN       "stock_leave-fullscreen"
-#define EV_STOCK_VIEW_DUAL       	"stock_view-dual-page"
-#define EV_STOCK_VIEW_CONTINUOUS        "stock_view-continuous"
+#define EV_STOCK_ZOOM_PAGE              "zoom-fit-page" 
+#define EV_STOCK_ZOOM_WIDTH             "zoom-fit-width" 
+#define EV_STOCK_LEAVE_FULLSCREEN       "view-restore"
+#define EV_STOCK_VIEW_DUAL       	"view-page-facing"
+#define EV_STOCK_VIEW_CONTINUOUS        "view-page-continuous"
 #define EV_STOCK_ROTATE_LEFT            "object-rotate-left"
 #define EV_STOCK_ROTATE_RIGHT           "object-rotate-right"
 
--
cgit v0.9.1