Changeset 259

Timestamp:

10/20/06 10:22:49 (2 years ago)

Author:

jordi

Message:

Switching to Full Screen hides the tool bar, menu bar, side bar and status bar. Then it switches to Zoom To Fit mode.

Files:

• trunk/src/IMainView.h (modified) (1 diff)
• trunk/src/gtk/MainView.cxx (modified) (6 diffs)

trunk/src/IMainView.h

@@ -583 +583 @@
-            /// @param pter The main presenter that will drive the view.
-            ///
- 
- 
+
+
-                g_assert ( NULL != pter && "Tried to set a NULL presenter." );
- 
+
-            }
-

trunk/src/gtk/MainView.cxx

@@ -164 +164 @@
-static GtkToggleActionEntry g_ToggleEntries[] =
-{
-NULL
+"F11"
-      N_("Toggle full screen window"),
-      G_CALLBACK (main_window_fullscreen_cb), FALSE },
@@ -436 +436 @@
-MainView::sensitiveFind (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/EditMenu/Find");
-    gtk_action_set_sensitive (find, sensitive);
@@ -497 +497 @@
-#endif // HAVE_CUPS
-
- 
+
-MainView::sensitiveReload (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/ReloadFile");
-    gtk_action_set_sensitive (reload, sensitive);
-}
-
- 
+
-MainView::sensitiveRotateLeft (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/RotateLeft");
-    gtk_action_set_sensitive (rotateLeft, sensitive);
@@ -516 +516 @@
-MainView::sensitiveRotateRight (gboolean sensitive)
-{
- 
+
-            "/MenuBar/ViewMenu/RotateRight");
-    gtk_action_set_sensitive (rotateRight, sensitive);
@@ -641 +641 @@
-MainView::setFullScreen (gboolean fullScreen)
-{
+    GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
+    GtkWidget *menuBar = gtk_ui_manager_get_widget (m_UIManager, "/MenuBar");
-    if ( fullScreen )
-    {
-        gtk_window_fullscreen (GTK_WINDOW (m_MainWindow));
+        // Hide the menu bar, tool bar, status bar and the index bar. Then
+        // zoom to fit.
+        gtk_widget_hide (menuBar);
+        gtk_widget_hide (toolBar);
+        gtk_widget_hide (m_StatusBar);
+        gtk_widget_hide (m_Sidebar);
+        gtk_toggle_action_set_active (
+                GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
+                                   "/MenuBar/ViewMenu/ZoomFit")), TRUE);
-    }
-    else
-    {
-        gtk_window_unfullscreen (GTK_WINDOW (m_MainWindow));
+        gtk_widget_show (menuBar);
+        // Show again the toolbar, status bar and index, only if it was
+        // enabled.
+        main_window_show_index_cb (
+                GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
+                        "/MenuBar/ViewMenu/ShowIndex")),
+                (gpointer)m_Pter);
+        main_window_show_statusbar_cb (
+                GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
+                        "/MenuBar/ViewMenu/ShowStatusBar")),
+                (gpointer)m_Pter);
+        main_window_show_toolbar_cb (
+                GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
+                        "/MenuBar/ViewMenu/ShowToolBar")),
+                (gpointer)m_Pter);
-    }
-}
@@ -743 +769 @@
-                                            "/MenuBar/ViewMenu/ShowStatusBar");
-    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
- 
+
-    {
-        gtk_widget_show (m_StatusBar);