Changeset 253

Timestamp:

10/16/06 14:49:05 (2 years ago)

Author:

jordi

Message:

Applied Enrico Tröger's patch for full screen support. This closes ticket #33.

Location:

trunk

Files:

• THANKS (modified) (1 diff)
• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (1 diff)
• src/MainPter.h (modified) (1 diff)
• src/gtk/MainView.cxx (modified) (7 diffs)
• src/gtk/MainView.h (modified) (1 diff)
• tests/DumbMainView.cxx (modified) (1 diff)
• tests/DumbMainView.h (modified) (1 diff)

trunk/THANKS

@@ -2 +2 @@
 contributions:
 
+    - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch.
     - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation.
     - LoneFox <>, for his patches.

trunk/src/IMainView.h

@@ -356 +356 @@
 
             ///
+            /// @brief Sets the view to full screen.
+            ///
+            /// @param fullScreen @a TRUE if the view should go full screen,
+            ///                   @a FALSE otherwise.
+            ///
+            virtual void setFullScreen (gboolean fullScreen) = 0;
+
+            ///
             /// @brief Sets the text for the number of pages.
             ///

trunk/src/MainPter.cxx

@@ -329 +329 @@
 
 ///
+/// @brief The "Full Screen" action was activated.
+///
+/// @param show TRUE if Full Screen is active, FALSE otherwise.
+///
+void
+MainPter::fullScreenActivated (gboolean active)
+{
+    getView ().setFullScreen (active);
+}
+
+///
 /// @brief The "Go To First Page" action was activated.
 ///

trunk/src/MainPter.h

@@ -48 +48 @@
             void aboutBoxLinkActivated (const gchar *link);
             void findActivated (void);
+            void fullScreenActivated (gboolean active);
             void goToFirstPageActivated (void);
             void goToLastPageActivated (void);

trunk/src/gtk/MainView.cxx

@@ -53 +53 @@
                                             gpointer);
 static void main_window_find_cb (GtkWidget *, gpointer);
+static void main_window_fullscreen_cb (GtkToggleAction *, gpointer);
 static gboolean main_window_moved_or_resized_cb (GtkWidget *,
                                                  GdkEventConfigure *, gpointer);
@@ -82 +83 @@
 
 // The actions for menus and toolbars.
-static const GtkActionEntry g_NormalEntries[] = 
+static const GtkActionEntry g_NormalEntries[] =
 {
     { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
@@ -163 +164 @@
 static GtkToggleActionEntry g_ToggleEntries[] =
 {
+    { "FullScreen", NULL, N_("F_ull screen"), NULL,
+      N_("Toggle full screen window"),
+      G_CALLBACK (main_window_fullscreen_cb), FALSE },
+
     { "ShowToolBar", NULL, N_("Show _Toolbar"), NULL,
       N_("Show or hide the toolbar"),
       G_CALLBACK (main_window_show_toolbar_cb), TRUE },
+
     { "ShowStatusBar", NULL, N_("Show _Statusbar"), NULL,
       N_("Show or hide the statusbar"),
       G_CALLBACK (main_window_show_statusbar_cb), TRUE },
+
     { "ShowIndex", NULL, N_("Show I_ndex"), "F9",
       N_("Show or hide the document's outline"),
@@ -568 +575 @@
                                  config.getWindowHeight ());
     gtk_widget_show (m_MainWindow);
-    gtk_window_move (GTK_WINDOW (m_MainWindow), 
+    gtk_window_move (GTK_WINDOW (m_MainWindow),
                      config.getWindowX (), config.getWindowY ());
 }
@@ -598 +605 @@
         gtk_widget_hide (m_Sidebar);
     }
-    GtkAction *showIndex = 
-        gtk_ui_manager_get_action (m_UIManager, 
+    GtkAction *showIndex =
+        gtk_ui_manager_get_action (m_UIManager,
                                    "/MenuBar/ViewMenu/ShowIndex");
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (showIndex), show);
@@ -629 +636 @@
     }
     gdk_flush ();
+}
+
+void
+MainView::setFullScreen (gboolean fullScreen)
+{
+    if ( fullScreen )
+    {
+        gtk_window_fullscreen (GTK_WINDOW (m_MainWindow));
+    }
+    else
+    {
+        gtk_window_unfullscreen (GTK_WINDOW (m_MainWindow));
+    }
 }
 
@@ -1059 +1079 @@
 
 ///
+/// @brief The user tried to switch to full screen.
+///
+void
+main_window_fullscreen_cb (GtkToggleAction *action, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->fullScreenActivated (gtk_toggle_action_get_active (action));
+}
+
+///
 /// @brief Called when the window is moved or resized.
 ///

trunk/src/gtk/MainView.h

@@ -62 +62 @@
             void showIndex (gboolean show);
             void setCursor (ViewCursor cursorType);
+            void setFullScreen (gboolean fullScreen);
             void setNumberOfPagesText (const gchar *text);
             void setGoToPageText (const gchar *text);

trunk/tests/DumbMainView.cxx

@@ -267 +267 @@
 
 void
+DumbMainView::setFullScreen (gboolean fullScreen)
+{
+}
+
+void
 DumbMainView::setNumberOfPagesText (const gchar *text)
 {

trunk/tests/DumbMainView.h

@@ -63 +63 @@
             const gchar *getGoToPageText (void);
             void setCursor (ViewCursor cursorType);
+            void setFullScreen (gboolean fullScreen);
             void setNumberOfPagesText (const gchar *text);
             void setGoToPageText (const gchar *text);