From b8c8c193b62bd30906b6954b4dddbd5331eca08e Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Sat, 11 Nov 2006 20:33:50 +0000
Subject: Add rotate right and rotate left to available items for toolbar.

2006-11-11  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>

	* data/evince-toolbar.xml:

	Add rotate right and rotate left to available items for toolbar.

	* data/evince-ui.xml:
	* shell/ev-window.c: (ev_window_init):

	Customize toolbar with right click. Fixes bug #372451.
---
diff --git a/ChangeLog b/ChangeLog
index 8c1cd43..d9a2644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
+2006-11-11  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* data/evince-toolbar.xml:
+	
+	Add rotate right and rotate left to available items for toolbar.
+	
+	* data/evince-ui.xml:
+	* shell/ev-window.c: (ev_window_init):
+	
+	Customize toolbar with right click. Fixes bug #372451.
+
 2006-11-11  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
 
-	* shell/ev-window.c: Use "object-rotate-{left,right}" stock icons. 
-	Fixes bug #373863.
+	* shell/ev-window.c: 
+	
+	Use "object-rotate-{left,right}" stock icons. Fixes 
+	bug #373863.
 
 2006-11-10  Carlos Garcia Campos  <carlosgc@gnome.org>
 
diff --git a/data/evince-toolbar.xml b/data/evince-toolbar.xml
index 060b938..ff0099e 100644
--- a/data/evince-toolbar.xml
+++ b/data/evince-toolbar.xml
@@ -9,6 +9,8 @@
     <toolitem name="ViewZoom"/>
     <toolitem name="ViewZoomIn"/>
     <toolitem name="ViewZoomOut"/>
+    <toolitem name="EditRotateLeft"/>
+    <toolitem name="EditRotateRight"/>
     <toolitem name="ViewBestFit"/>
     <toolitem name="ViewPageWidth"/>
     <toolitem name="FileOpen"/>
diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index 13c0518..c029404 100644
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -79,6 +79,10 @@
     <menuitem name="SaveAttachmentAs" action="SaveAttachmentAs"/>
   </popup>
 
+  <popup name="ToolbarPopup" action="ToolbarPopupAction">
+    <menuitem name="EditToolbarMenu" action="EditToolbar"/>
+  </popup>
+
   <accelerator name="PageDownAccel" action="PageDown"/>
   <accelerator name="PageUpAccel" action="PageUp"/>
   <accelerator name="GoBackwardFastAccel" action="GoBackwardFast"/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index c81a6de..98db4a5 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -4253,8 +4253,13 @@ ev_window_init (EvWindow *ev_window)
 			    FALSE, FALSE, 0);
 	gtk_widget_show (toolbar_dock);
 
-	ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
-				(ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, FALSE), NULL);
+	ev_window->priv->toolbar = GTK_WIDGET 
+	  (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,
+			 "ui-manager", ev_window->priv->ui_manager,
+			 "popup-path", "/ToolbarPopup",
+			 "model", ev_application_get_toolbars_model (EV_APP, FALSE),
+			 NULL));
+
 	egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
 				   "DefaultToolBar");
 	gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
--
cgit v0.9.1