Changeset 64

Timestamp:

04/14/06 15:05:24 (2 years ago)

Author:

jordi

Message:

Added the reload action to the GTK's MainView?.

Also I fixed a weird bug (although I don't really know if it's mine) that deleted the m_FileName of the IDocument when reloaded the new file.

Location:

trunk

Files:

• data/epdfview-ui.xml (modified) (1 diff)
• src/IDocument.cxx (modified) (1 diff)
• src/MainPter.cxx (modified) (1 diff)
• src/gtk/MainView.cxx (modified) (6 diffs)
• src/gtk/MainView.h (modified) (1 diff)
• tests/MainPterTest.cxx (modified) (1 diff)

trunk/data/epdfview-ui.xml

@@ -1 +1 @@
 <ui>
-  <menubar name='MenuBar'>
-    <menu action='FileMenu'>
-      <menuitem name='OpenFile' action='OpenFile'/>
+  <menubar name="MenuBar">
+    <menu action="FileMenu">
+      <menuitem name="OpenFile" action="OpenFile"/>
+      <menuitem name="ReloadFile" action="ReloadFile"/>
       <separator/>
-      <menuitem name='Quit' action='Quit'/>
+      <menuitem name="Quit" action="Quit"/>
     </menu>
-    <menu action='ViewMenu'>
-      <menuitem name='ZoomIn' action='ZoomIn'/>
-      <menuitem name='ZoomOut' action='ZoomOut'/>
-      <menuitem name='ZoomFit' action='ZoomFit'/>
-      <menuitem name='ZoomWidth' action='ZoomWidth'/>
+    <menu action="ViewMenu">
+      <menuitem name="ZoomIn" action="ZoomIn"/>
+      <menuitem name="ZoomOut" action="ZoomOut"/>
+      <menuitem name="ZoomFit" action="ZoomFit"/>
+      <menuitem name="ZoomWidth" action="ZoomWidth"/>
       <separator />
-      <menuitem name='RotateRight' action='RotateRight'/>
-      <menuitem name='RotateLeft' action='RotateLeft'/>
+      <menuitem name="RotateRight" action="RotateRight"/>
+      <menuitem name="RotateLeft" action="RotateLeft"/>
     </menu>
-    <menu action='GoMenu'>
-      <menuitem name='GoToFirstPage' action='GoToFirstPage'/>
-      <menuitem name='GoToPreviousPage' action='GoToPreviousPage'/>
-      <menuitem name='GoToNextPage' action='GoToNextPage'/>
-      <menuitem name='GoToLastPage' action='GoToLastPage'/>
+    <menu action="GoMenu">
+      <menuitem name="GoToFirstPage" action="GoToFirstPage"/>
+      <menuitem name="GoToPreviousPage" action="GoToPreviousPage"/>
+      <menuitem name="GoToNextPage" action="GoToNextPage"/>
+      <menuitem name="GoToLastPage" action="GoToLastPage"/>
     </menu>
-    <menu action='HelpMenu'>
-      <menuitem name='About' action='About'/>
+    <menu action="HelpMenu">
+      <menuitem name="About" action="About"/>
     </menu>
   </menubar>
   
-  <toolbar name='ToolBar'>
-    <toolitem name='OpenFile' action='OpenFile'/>
+  <toolbar name="ToolBar">
+    <toolitem name="OpenFile" action="OpenFile"/>
     <separator/>
-    <toolitem name='GoToPreviousPage' action='GoToPreviousPage'/>
-    <toolitem name='GoToNextPage' action='GoToNextPage'/>
+    <toolitem name="GoToPreviousPage" action="GoToPreviousPage"/>
+    <toolitem name="GoToNextPage" action="GoToNextPage"/>
     <separator/>
-    <toolitem name='ZoomIn' action='ZoomIn'/>
-    <toolitem name='ZoomOut' action='ZoomOut'/>
-    <toolitem name='ZoomFit' action='ZoomFit'/>
-    <toolitem name='ZoomWidth' action='ZoomWidth'/>
+    <toolitem name="ZoomIn" action="ZoomIn"/>
+    <toolitem name="ZoomOut" action="ZoomOut"/>
+    <toolitem name="ZoomFit" action="ZoomFit"/>
+    <toolitem name="ZoomWidth" action="ZoomWidth"/>
   </toolbar>
 </ui>

trunk/src/IDocument.cxx

@@ -540 +540 @@
     g_assert (NULL != fileName && "Tried to set a NULL file name.");
 
-    g_free (m_FileName);
+    // Don't ask me why, but then I set like this:
+    //      g_free (m_FileName);
+    //      m_FileName = fileName
+    // Somehow the g_free also frees the parameter ????????
+    //      
+    gchar *oldFileName = m_FileName;
     m_FileName = g_strdup (fileName);
+    g_free (oldFileName);
 }
 

trunk/src/MainPter.cxx

@@ -263 +263 @@
     gdouble currentZoom = m_Document->getZoom ();
     // Reopen the document.
-    openDocument (m_Document->getFileName (), FALSE);
+    openDocument (m_Document->getFileName (), FALSE);    
     // And restore the state
     m_Document->setZoom (currentZoom);

trunk/src/gtk/MainView.cxx

@@ -41 +41 @@
 static void main_window_go_to_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_previous_page_cb (GtkWidget *, gpointer);
-static void main_window_rotate_left (GtkWidget *, gpointer);
-static void main_window_rotate_right (GtkWidget *, gpointer);
+static void main_window_reload_cb (GtkWidget *, gpointer);
+static void main_window_rotate_left_cb (GtkWidget *, gpointer);
+static void main_window_rotate_right_cb (GtkWidget *, gpointer);
 static void main_window_open_file_cb (GtkWidget *, gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
@@ -60 +61 @@
     { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O",       
       N_("Open a PDF document"),
-      G_CALLBACK (main_window_open_file_cb) },    
+      G_CALLBACK (main_window_open_file_cb) },
+
+    { "ReloadFile", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
+      N_("Reload the current document"),
+      G_CALLBACK (main_window_reload_cb) },
     
     { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 
@@ -84 +89 @@
     { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, 
       N_("Rotate the document 90 degrees clockwise"), 
-      G_CALLBACK (main_window_rotate_right) },
+      G_CALLBACK (main_window_rotate_right_cb) },
 
     { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, 
       N_("Rotate the document 90 degrees counter-clockwise"), 
-      G_CALLBACK (main_window_rotate_left) },
+      G_CALLBACK (main_window_rotate_left_cb) },
 
     { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
@@ -274 +279 @@
 
 void 
+MainView::sensitiveReload (gboolean sensitive)
+{
+    GtkAction *reload = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/ReloadFile");
+    gtk_action_set_sensitive (reload, sensitive);
+}
+
+void 
 MainView::sensitiveRotateLeft (gboolean sensitive)
 {
@@ -629 +642 @@
 
 ///
+/// @brief The user tried to reload the current document.
+///
+void
+main_window_reload_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->reloadActivated ();
+}
+
+///
 /// @brief The user tried to rotate the document counter-clockwise.
 ///
 void
-main_window_rotate_left (GtkWidget *widget, gpointer data)
+main_window_rotate_left_cb (GtkWidget *widget, gpointer data)
 {
     g_assert ( NULL != data && "The data parameter is NULL.");
@@ -644 +669 @@
 ///
 void
-main_window_rotate_right (GtkWidget *widget, gpointer data)
+main_window_rotate_right_cb (GtkWidget *widget, gpointer data)
 {
     g_assert ( NULL != data && "The data parameter is NULL.");

trunk/src/gtk/MainView.h

@@ -39 +39 @@
             void sensitiveGoToPage (gboolean sensitive);
             void sensitiveGoToPreviousPage (gboolean sensitive);
+            void sensitiveReload (gboolean sensitive);
             void sensitiveRotateLeft (gboolean sensitive);
             void sensitiveRotateRight (gboolean sensitive);

trunk/tests/MainPterTest.cxx

@@ -570 +570 @@
     // Reload the document.
     m_MainPter->reloadActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
     CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
     CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());