Changeset 38

Timestamp:

04/12/06 07:27:49 (3 years ago)

Author:

jordi

Message:

The Zoom functions works, but I had to save the scrolled window around the image because when the presenter requests the size, if the image's height is given then it returns the current image height's, which is useless (and I think is the same for the width, but I didn't see any proof of it).

Location:

trunk/src/gtk

Files:

• MainView.cxx (modified) (6 diffs)
• MainView.h (modified) (1 diff)

trunk/src/gtk/MainView.cxx

@@ -34 +34 @@
 static void main_window_open_file_cb (GtkWidget *, gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
+static void main_window_zoom_fit_cb (GtkWidget *, 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);
 
 ////////////////////////////////////////////////////////////////
@@ -60 +64 @@
     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
     // Create the page view
-    GtkWidget *pageView = createPageView ();
-    gtk_box_pack_start (GTK_BOX (m_MainBox), pageView, TRUE, TRUE, 0);
+    createPageView ();
+    gtk_box_pack_start (GTK_BOX (m_MainBox), m_PageViewScroll, TRUE, TRUE, 0);
 }
 
@@ -231 +235 @@
 MainView::getPageViewSize (gint *width, gint *height)
 {
+    g_assert (NULL != width && "Tried to save the width to a NULL pointer.");
+    g_assert (NULL != height && "Tried to save the height to a NULL pointer.");
+    
+    *width = m_PageView->allocation.width - 12;
+    *height = m_PageViewScroll->allocation.height - 12;
 }
 
@@ -243 +252 @@
 ////////////////////////////////////////////////////////////////
 
-GtkWidget *
+void
 MainView::createPageView ()
 {
-    GtkWidget *scrolledWindow = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow),
+    m_PageViewScroll = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_PageViewScroll),
                                     GTK_POLICY_AUTOMATIC,
                                     GTK_POLICY_AUTOMATIC);
     m_PageView = gtk_image_new  ();
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledWindow),
-                                           m_PageView);
-    return scrolledWindow;
+    gtk_scrolled_window_add_with_viewport (
+            GTK_SCROLLED_WINDOW (m_PageViewScroll), m_PageView);
 }
 
@@ -267 +275 @@
         { "OpenFile", GTK_STOCK_OPEN, _("_Open"), "<control>O", NULL, G_CALLBACK (main_window_open_file_cb) },
         { "Quit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", NULL, G_CALLBACK (main_window_quit_cb) },
-        { "ZoomIn", GTK_STOCK_ZOOM_IN, _("Zoom _In"), "plus", NULL, NULL },
-        { "ZoomOut", GTK_STOCK_ZOOM_OUT, _("Zoom _Out"), "minus", NULL, NULL },
-        { "ZoomFit", GTK_STOCK_ZOOM_FIT, _("Zoom to _Fit"), NULL, NULL, NULL },
-        { "ZoomWidth", NULL, _("Zoom to _Width"), NULL, NULL, NULL },
+        { "ZoomIn", GTK_STOCK_ZOOM_IN, _("Zoom _In"), "plus", NULL, G_CALLBACK (main_window_zoom_in_cb) },
+        { "ZoomOut", GTK_STOCK_ZOOM_OUT, _("Zoom _Out"), "minus", NULL, G_CALLBACK (main_window_zoom_out_cb) },
+        { "ZoomFit", GTK_STOCK_ZOOM_FIT, _("Zoom to _Fit"), NULL, NULL, G_CALLBACK (main_window_zoom_fit_cb) },
+        { "ZoomWidth", NULL, _("Zoom to _Width"), NULL, NULL, G_CALLBACK (main_window_zoom_width_cb) },
         { "RotateRight", GTK_STOCK_REDO, _("Rotate _Right"), NULL, NULL, G_CALLBACK (main_window_rotate_right)},
         { "RotateLeft", GTK_STOCK_UNDO, _("Rotate Left"), NULL, NULL, G_CALLBACK (main_window_rotate_left)},
@@ -426 +434 @@
     gtk_main_quit ();
 }
+
+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 ();
+}
+
+void
+main_window_zoom_in_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->zoomInActivated ();
+}
+
+void
+main_window_zoom_out_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->zoomOutActivated ();
+}
+
+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 ();
+}

trunk/src/gtk/MainView.h

@@ -58 +58 @@
             GtkWidget *m_MainBox;
             GtkWidget *m_PageView;
+            GtkWidget *m_PageViewScroll;
             GtkUIManager *m_UIManager;
 
-            GtkWidget *createPageView (void);
+            void createPageView (void);
             void createUIManager (void);
             GdkPixbuf *getPixbufFromPage (DocumentPage *page);