[gthumb/ext: 8/79] added other commands to the fullscreen toolbar

[Paolo Bacchilega <paobac src gnome org>]

commit 43c70246411d6cbcecb0278d55d33efb69389dd4
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Jun 15 13:44:30 2009 +0200

    added other commands to the fullscreen toolbar

 extensions/image_viewer/gth-image-viewer-page.c |   15 ++++++++++++---
 gthumb/gth-browser-ui.h                         |   14 +++++++++++++-
 gthumb/gth-browser.c                            |    5 +++++
 3 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 967b68c..2d9d8f0 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -61,9 +61,18 @@ static const char *image_viewer_ui_info =
 "  </menubar>"
 "  <toolbar name='ViewerToolBar'>"
 "    <placeholder name='ViewerCommands'>"
-"      <separator/>"
-"      <toolitem action='View_Fullscreen'/>"
-"      <separator/>"
+"      <toolitem action='ImageViewer_View_ZoomIn'/>"
+"      <toolitem action='ImageViewer_View_ZoomOut'/>"
+"      <toolitem action='ImageViewer_View_Zoom100'/>"
+"      <toolitem action='ImageViewer_View_ZoomFit'/>"
+"      <toolitem action='ImageViewer_View_ZoomFitWidth'/>"
+"    </placeholder>"
+"    <placeholder name='ViewerCommandsSecondary'>"
+"      <toolitem action='Viewer_Tools'/>"
+"    </placeholder>"
+"  </toolbar>"
+"  <toolbar name='Fullscreen_ToolBar'>"
+"    <placeholder name='ViewerCommands'>"
 "      <toolitem action='ImageViewer_View_ZoomIn'/>"
 "      <toolitem action='ImageViewer_View_ZoomOut'/>"
 "      <toolitem action='ImageViewer_View_Zoom100'/>"
diff --git a/gthumb/gth-browser-ui.h b/gthumb/gth-browser-ui.h
index 55ea3ba..9d88c0f 100644
--- a/gthumb/gth-browser-ui.h
+++ b/gthumb/gth-browser-ui.h
@@ -113,6 +113,8 @@ static const char *fixed_ui_info =
 "    <separator/>"
 "    <toolitem action='Edit_Metadata'/>"
 "    <separator/>"
+"    <toolitem action='View_Fullscreen'/>"
+"    <separator/>"
 "    <placeholder name='ViewerCommands'/>"
 "    <separator expand='true'/>"
 "    <placeholder name='ViewerCommandsSecondary'/>"
@@ -121,6 +123,16 @@ static const char *fixed_ui_info =
 
 "  <toolbar name='Fullscreen_ToolBar'>"
 "    <toolitem action='View_Leave_Fullscreen'/>"
+"    <separator/>"
+"    <toolitem action='View_Prev'/>"
+"    <toolitem action='View_Next'/>"
+"    <separator/>"
+"    <toolitem action='Edit_Metadata'/>"
+"    <separator/>"
+"    <placeholder name='ViewerCommands'/>"
+"    <separator expand='true'/>"
+"    <placeholder name='ViewerCommandsSecondary'/>"
+"    <toolitem action='Viewer_Properties'/>"
 "  </toolbar>"
 
 "  <popup name='GoBackHistoryPopup'>"
@@ -183,7 +195,7 @@ static const char *browser_ui_info =
 "  <toolbar name='ToolBar'>"
 "    <placeholder name='BrowserCommands'>"
 "      <toolitem action='Edit_Metadata'/>"
-"        <separator/>"
+"      <separator/>"
 "      <toolitem action='View_Fullscreen'/>"
 "    </placeholder>"
 "  </toolbar>"
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 7cbed32..c465848 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -3635,6 +3635,8 @@ void
 gth_browser_show_viewer_properties (GthBrowser *browser,
 				    gboolean    show)
 {
+	_gth_browser_set_action_active (browser, "Viewer_Properties", show);
+
 	if (show) {
 		_gth_browser_set_action_active (browser, "Viewer_Tools", FALSE);
 		gtk_widget_show (browser->priv->viewer_sidebar);
@@ -3649,6 +3651,8 @@ void
 gth_browser_show_viewer_tools (GthBrowser *browser,
 			       gboolean    show)
 {
+	_gth_browser_set_action_active (browser, "Viewer_Tools", show);
+
 	if (show) {
 		_gth_browser_set_action_active (browser, "Viewer_Properties", FALSE);
 		gtk_widget_show (browser->priv->viewer_sidebar);
@@ -3878,6 +3882,7 @@ gth_browser_fullscreen (GthBrowser *browser)
 
 	_gth_browser_create_fullscreen_toolbar (browser);
 
+	gth_browser_show_viewer_properties (browser, FALSE);
 	gtk_window_fullscreen (GTK_WINDOW (browser));
 	gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER);
 	gth_window_show_only_content (GTH_WINDOW (browser), TRUE);