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

Timestamp:

06/26/07 07:07:49 (18 months ago)

Author:

jordi

Message:

Igor Vagulin sent a patch to change the Scroll and Text Selection ToggleAction? to RadioActions?.

Moved the implementation of PagePter?'s setMode() to its implementation file.

Fixed the selection of an empty rectangle.

Files:

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

trunk/src/gtk/MainView.cxx

@@ -77 +77 @@
 static void main_window_zoom_out_cb (GtkWidget *, gpointer);
 static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
-static void main_window_page_mode_scroll_cb (GtkToggleAction *, gpointer);
-static void main_window_page_mode_text_cb (GtkToggleAction *, gpointer);
+static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
 
 #if defined (HAVE_CUPS)
@@ -189 +188 @@
       N_("Make the current document fill the window width"),
       G_CALLBACK (main_window_zoom_width_cb), FALSE },
-
+};
+
+static GtkRadioActionEntry g_PageScrollEntries[] =
+{   
     { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL,
-      N_("Mouse scroll page"),
-      G_CALLBACK (main_window_page_mode_scroll_cb), FALSE },
+      N_("Mouse scroll page"), (int)PagePterModeScroll },
 
     { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL,
-      N_(" Mouse select text"),
-      G_CALLBACK (main_window_page_mode_text_cb), FALSE },
-
+      N_(" Mouse select text"), (int)PagePterModeSelectText },
 };
+
 
 ////////////////////////////////////////////////////////////////
@@ -963 +963 @@
                                          G_N_ELEMENTS (g_ToggleEntries),
                                          m_Pter);
+    gtk_action_group_add_radio_actions (actionGroup, g_PageScrollEntries,
+                                        G_N_ELEMENTS (g_PageScrollEntries), 0,
+                                        G_CALLBACK(main_window_set_page_mode), m_Pter);
     m_UIManager = gtk_ui_manager_new ();
     gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
@@ -1453 +1456 @@
 
 void
-main_window_page_mode_scroll_cb (GtkToggleAction *action, gpointer data)
-{
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-    MainPter *pter = (MainPter *)data;
-    pter->pageModeScrollActivated (gtk_toggle_action_get_active (action));
-}
-
-void
-main_window_page_mode_text_cb (GtkToggleAction *action, gpointer data)
-{
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-    MainPter *pter = (MainPter *)data;
-    pter->pageModeTextActivated (gtk_toggle_action_get_active (action));
-}
+main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    PagePterMode mode = (PagePterMode)gtk_radio_action_get_current_value(action);
+    pter->setPageMode (mode);
+}