Changeset 99 for trunk/src/gtk/MainView.cxx

Timestamp:

04/20/06 13:09:22 (3 years ago)

Author:

jordi

Message:

The MainPter? now resizes the page shown if the zoom to width or zoom to fit, that now are toggle actions, are activated. The view also tells to the presenter when the scroll window has resized, so it can calculate the new page.

Files:

• trunk/src/gtk/MainView.cxx (modified) (12 diffs)

trunk/src/gtk/MainView.cxx

@@ -46 +46 @@
 static void main_window_open_file_cb (GtkWidget *, gpointer);
 static void main_window_outline_cb (GtkTreeSelection *, gpointer);
+static void main_window_page_view_resized_cb (GtkWidget *, GtkAllocation *, 
+                                              gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
 static void main_window_show_sidebar_cb (GtkToggleAction *, gpointer);
 static void main_window_show_statusbar_cb (GtkToggleAction *, gpointer);
 static void main_window_show_toolbar_cb (GtkToggleAction *, gpointer);
-static void main_window_zoom_fit_cb (GtkWidget *, gpointer);
+static void main_window_zoom_fit_cb (GtkToggleAction *, gpointer);
 static void main_window_zoom_in_cb (GtkWidget *, gpointer);
 static void main_window_zoom_out_cb (GtkWidget *, gpointer);
-static void main_window_zoom_width_cb (GtkWidget *, gpointer);
+static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
 
 // The actions for menus and toolbars.
@@ -83 +85 @@
       G_CALLBACK (main_window_zoom_out_cb) },
     
-    { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
-      N_("Make the current document fill the window"), 
-      G_CALLBACK (main_window_zoom_fit_cb) },
-
-    { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
-      N_("Make the current document fill the window width"), 
-      G_CALLBACK (main_window_zoom_width_cb) },
-
     { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, 
       N_("Rotate the document 90 degrees clockwise"), 
@@ -130 +124 @@
     { "ShowSideBar", NULL, N_("Show O_utline"), NULL,
       N_("Show or hide the document's outline"),
-      G_CALLBACK (main_window_show_sidebar_cb), FALSE }
+      G_CALLBACK (main_window_show_sidebar_cb), FALSE },
+
+    { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
+      N_("Make the current document fill the window"), 
+      G_CALLBACK (main_window_zoom_fit_cb), FALSE },
+
+    { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
+      N_("Make the current document fill the window width"), 
+      G_CALLBACK (main_window_zoom_width_cb), FALSE }
+
 };
 
@@ -190 +193 @@
 }
 
+void
+MainView::activeZoomFit (gboolean active)
+{
+    GtkAction *zoomFit = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active);
+}
+
+void
+MainView::activeZoomWidth (gboolean active)
+{
+    GtkAction *zoomWidth = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
+}
 
 gchar *
@@ -513 +531 @@
                                     GTK_POLICY_AUTOMATIC,
                                     GTK_POLICY_AUTOMATIC);
+    // When resizing.
+    g_signal_connect (G_OBJECT (m_PageViewScroll), "size-allocate",
+                      G_CALLBACK (main_window_page_view_resized_cb), m_Pter);
+    // The actual image,
     m_PageView = gtk_image_new  ();
     gtk_misc_set_padding (GTK_MISC (m_PageView), 
@@ -586 +608 @@
     gtk_action_group_add_toggle_actions (actionGroup, g_ToggleEntries,
                                          G_N_ELEMENTS (g_ToggleEntries),
-                                         this);
+                                         m_Pter);
     m_UIManager = gtk_ui_manager_new ();
     gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
@@ -919 +941 @@
     }
 }
+
+///
+/// @brief The page view has been resized.
+static void
+main_window_page_view_resized_cb (GtkWidget *widget, GtkAllocation *allocation,
+                                  gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    gint scrollSize = SCROLLBARS_SIZE + PAGE_VIEW_PADDING * 2;
+    gint width = allocation->width - scrollSize;
+    gint height = allocation->height - scrollSize;
+    MainPter *pter = (MainPter *)data;
+    pter->pageViewResized (width, height);
+}
+
 ///
 /// @brief Called when the window is closed or Quit is activated.
@@ -936 +974 @@
     g_assert ( NULL != data && "The data parameter is NULL.");
 
-    MainView *view = (MainView *)data;
-    view->showSidebar (gtk_toggle_action_get_active (action));
+//    MainView *view = (MainView *)data;
+//    view->showSidebar (gtk_toggle_action_get_active (action));
 }
 
@@ -948 +986 @@
     g_assert ( NULL != data && "The data parameter is NULL.");
 
-    MainView *view = (MainView *)data;
-    view->showStatusbar (gtk_toggle_action_get_active (action));
+//    MainView *view = (MainView *)data;
+//    view->showStatusbar (gtk_toggle_action_get_active (action));
 }
 
@@ -960 +998 @@
     g_assert ( NULL != data && "The data parameter is NULL.");
 
-    MainView *view = (MainView *)data;
-    view->showToolbar (gtk_toggle_action_get_active (action));
+//    MainView *view = (MainView *)data;
+//    view->showToolbar (gtk_toggle_action_get_active (action));
 }
 
@@ -968 +1006 @@
 ///
 void
-main_window_zoom_fit_cb (GtkWidget *widget, gpointer data)
-{
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-    MainPter *pter = (MainPter *)data;
-    pter->zoomFitActivated ();
+main_window_zoom_fit_cb (GtkToggleAction *action, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->zoomFitActivated (gtk_toggle_action_get_active (action));
 }
 
@@ -1004 +1042 @@
 ///
 void
-main_window_zoom_width_cb (GtkWidget *widget, gpointer data)
-{
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-    MainPter *pter = (MainPter *)data;
-    pter->zoomWidthActivated ();
-}
+main_window_zoom_width_cb (GtkToggleAction *action, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->zoomWidthActivated (gtk_toggle_action_get_active (action));
+}