Changeset 279

Timestamp:

06/26/07 07:07:49 (16 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.

Location:

trunk/src

Files:

• MainPter.cxx (modified) (1 diff)
• MainPter.h (modified) (1 diff)
• PDFDocument.cxx (modified) (4 diffs)
• PagePter.cxx (modified) (5 diffs)
• PagePter.h (modified) (3 diffs)
• gtk/MainView.cxx (modified) (4 diffs)

trunk/src/MainPter.cxx

@@ -697 +697 @@
 
 void
-MainPter::pageModeScrollActivated (gboolean active)
-{
-    IMainView &view = getView ();
-    if ( active )
-    {
-        m_PagePter->setMode(PagePterModeScroll);
-        view.activePageModeText (FALSE);
-    }
-}
-
-void
-MainPter::pageModeTextActivated (gboolean active)
-{
-    IMainView &view = getView ();
-    if ( active )
-    {
-        m_PagePter->setMode(PagePterModeSelectText);
-        view.activePageModeScroll (FALSE);
-    }
+MainPter::setPageMode (PagePterMode mode)
+{
+    m_PagePter->setMode(mode);
 }
 

trunk/src/MainPter.h

@@ -41 +41 @@
             ~MainPter (void);
 
-            void pageModeTextActivated(gboolean active);
-            void pageModeScrollActivated(gboolean active);
+            void setPageMode(PagePterMode mode);
 
             void setInitialState (void);

trunk/src/PDFDocument.cxx

@@ -657 +657 @@
 }
 
+static void
+repairEmpty(PopplerRectangle& rect)
+{
+    //rect must have be least 1x1
+    if(rect.y1 == rect.y2)
+        rect.y2++;
+    if(rect.x1 == rect.x2)
+        rect.x2++;
+}
+
 void 
 PDFDocument::setTextSelection (DocumentRectangle *rect)
@@ -670 +680 @@
     
     //for get text we must exchange y coordinate, don't ask me where logic here.
-    PopplerRectangle textRect = { rect->getX1(),
-                                  (pageHeight - rect->getY2()),
-                                  rect->getX2(),
-                                  (pageHeight - rect->getY1())};
+    PopplerRectangle textRect = { rect->getX1() / getZoom(),
+                                  (pageHeight - rect->getY2() / getZoom()),
+                                  rect->getX2() * getZoom() / getZoom(),
+                                  (pageHeight - rect->getY1() / getZoom())};
+    repairEmpty(textRect);
+
     gchar *text = poppler_page_get_text(page, &textRect);
     if(!text)
@@ -692 +704 @@
         g_free(text);
 }
+
 GdkRegion*
 PDFDocument::getTextRegion (DocumentRectangle *r)
@@ -705 +718 @@
     rect.y1 = r->getY1() / getZoom();
     rect.x2 = r->getX2() / getZoom();
-    rect.y2 = r->getY2() / getZoom();
+    rect.y2 = r->getY2() / getZoom();   
+    repairEmpty(rect);
 
     //calc selection size

trunk/src/PagePter.cxx

@@ -68 +68 @@
     m_NextPageScroll = PAGE_SCROLL_START;
     m_PageView = NULL;
-    m_Mode = PagePterModeScroll;
+    m_ScrollMode = PagePterModeScroll;
 }
 
@@ -135 +135 @@
             m_DragInfo->startX = x;
             m_DragInfo->startY = y;
-            if(m_Mode == PagePterModeScroll)
+            if(m_ScrollMode == PagePterModeScroll)
                 view.setCursor (PAGE_VIEW_CURSOR_DRAG);
             else
@@ -160 +160 @@
         m_LastSelection = NULL;
 
-        if(m_Document->isLoaded() && m_Mode == PagePterModeSelectText){
+        if(m_Document->isLoaded() && m_ScrollMode == PagePterModeSelectText){
             DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY,
                                    m_DragInfo->x, m_DragInfo->y);
@@ -205 +205 @@
         m_DragInfo->y = y;  
 
-        if(m_Mode == PagePterModeScroll){
+        if(m_ScrollMode == PagePterModeScroll){
             view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (),
                              x - m_DragInfo->startX, y - m_DragInfo->startY);
@@ -408 +408 @@
 
 ///
+/// @brief Sets the page mouse scroll mode
+///
+/// @param mode Scroll mode to set.
+///
+void
+PagePter::setMode (PagePterMode mode)
+{
+    this->m_ScrollMode = mode;
+}
+
+///
 /// @brief The page view has been resized.
 ///

trunk/src/PagePter.h

@@ -24 +24 @@
 namespace ePDFView
 {
-    enum PagePterMode{
-        PagePterModeScroll,
-        PagePterModeSelectText,
-    };
+    enum PagePterMode{
+        PagePterModeScroll,
+        PagePterModeSelectText,
+    };
 
     ///
@@ -59 +59 @@
             void setView (IMainView &view);
             void viewResized (gint width, gint height);
-            void setMode(PagePterMode mode)
-            {
-                m_Mode = mode;
-            }
+            void setMode(PagePterMode mode);
 
         protected:
@@ -73 +70 @@
             /// The page view.
             IPageView *m_PageView;
-            /// Last text selection
-            GdkRegion *m_LastSelection;
-            /// What page presenter must do when user move mouse with button pressed.
-            PagePterMode m_Mode;
+            /// Last text selection
+            GdkRegion *m_LastSelection;
+            /// What page presenter must do when user move mouse with button pressed.
+            PagePterMode m_ScrollMode;
 
-            void refreshPage (PageScroll pageScroll, gboolean wasZoomed);
+            void refreshPage (PageScroll pageScroll, gboolean wasZoomed);
     };
 }

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);
+}