Changeset 302

Timestamp:

01/25/08 08:41:42 (7 months ago)

Author:

jordi

Message:

Is now possible to zooming by pressin control and scrolling with the scroll version. Thanks to Michael Opitz <opitz.michael@gmail.com> and Lester Godwin <lgodwin@pushcorp.com>.

Files:

• trunk/THANKS (modified) (1 diff)
• trunk/src/gtk/MainView.cxx (modified) (3 diffs)
• trunk/src/gtk/PageView.cxx (modified) (1 diff)

trunk/THANKS

@@ -11 +11 @@
-    - Lester Godwin <lgodwin@pushcorp.com>, for his patches.
-    - LoneFox <>, for his patches.
+    - Michael Opitz <opitz.michael@gmail.com>, for his patches.
-    - Moritz Heiber <moe@xfce.org>, for his German translation.
-    - Mr_Moustache <mr.moustache@laposte.net>, for his French translation.

trunk/src/gtk/MainView.cxx

@@ -78 +78 @@
-static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
-static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
-
-#if defined (HAVE_CUPS)
@@ -268 +269 @@
-    m_StatusBar = gtk_statusbar_new ();
-    gtk_box_pack_start (GTK_BOX (m_MainBox), m_StatusBar, FALSE, FALSE, 0);
+
+    // Signal for Zooming into the page per ctrl + scroll-wheel.
+    g_signal_connect (G_OBJECT (m_PageView->getTopWidget ()), "scroll-event",
+                      G_CALLBACK (main_window_page_scrolled_cb), pter);
-}
-
@@ -1474 +1479 @@
-    pter->setPageMode (mode);
-}
+
+void 
+main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    // Only zoom when the CTRL-Button is down...
+    if ( !(event->state & GDK_CONTROL_MASK) ) return;
+    if ( event->direction == GDK_SCROLL_UP ) {
+        pter->zoomInActivated ();
+    } else if ( event->direction == GDK_SCROLL_DOWN ) {
+        pter->zoomOutActivated ();
+    }
+}
+

trunk/src/gtk/PageView.cxx

@@ -528 +528 @@
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
+    // don't scroll when the CRTL-Button is down, because then the page should
+    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
+    // class.
+    if ( event->state & GDK_CONTROL_MASK )
+    {
+        return FALSE;
+    }
-    PagePter *pter = (PagePter *)data;
-    GtkAdjustment *adjustment =