Changeset 199

Timestamp:

05/28/06 15:57:37 (2 years ago)

Author:

jordi

Message:

The Preferences dialog is implemented in the Gtk+ shell. Now the user can enter the command that will use to open the URI's in the document.

Location:

trunk/src

Files:

• IMainView.h (modified) (19 diffs)
• MainPter.cxx (modified) (11 diffs)
• MainPter.h (modified) (1 diff)
• gtk/FindView.cxx (modified) (1 diff)
• gtk/MainView.cxx (modified) (23 diffs)
• gtk/MainView.h (modified) (2 diffs)
• gtk/Makefile.am (modified) (1 diff)
• gtk/PageView.h (modified) (1 diff)
• gtk/PreferencesView.cxx (added)
• gtk/PreferencesView.h (added)

trunk/src/IMainView.h

@@ -66 +66 @@
             ///
             virtual void activeZoomFit (gboolean active) = 0;
-           
+
             ///
             /// @brief Actives or deactivates the zoom to width.
@@ -77 +77 @@
             ///
             virtual void activeZoomWidth (gboolean active) = 0;
-           
+
             ///
             /// @brief Shows the open file dialog.
@@ -106 +106 @@
             ///
             virtual gchar *promptPasswordDialog (void) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Find" action.
@@ -132 +132 @@
             ///
             virtual void sensitiveGoToFirstPage (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Go To Last Page" action.
@@ -145 +145 @@
             ///
             virtual void sensitiveGoToLastPage (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Go To Next Page" action.
@@ -158 +158 @@
             ///
             virtual void sensitiveGoToNextPage (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Go To Page" action.
@@ -171 +171 @@
             ///
             virtual void sensitiveGoToPage (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Go To Prev. Page" action.
@@ -184 +184 @@
             ///
             virtual void sensitiveGoToPreviousPage (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Open" action.
@@ -210 +210 @@
             ///
             virtual void sensitiveReload (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Rotate Left" action.
@@ -223 +223 @@
             ///
             virtual void sensitiveRotateLeft (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Rotate Right" action.
@@ -236 +236 @@
             ///
             virtual void sensitiveRotateRight (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Zoom In" action.
@@ -249 +249 @@
             ///
             virtual void sensitiveZoomIn (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Zoom Out" action.
@@ -262 +262 @@
             ///
             virtual void sensitiveZoomOut (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Zoom to Fit" action.
@@ -275 +275 @@
             ///
             virtual void sensitiveZoomFit (gboolean sensitive) = 0;
-            
+
             ///
             /// @brief Changes the sensitivity of the "Zoom to Width" action.
@@ -331 +331 @@
             /// @param body The error dialog's body (the error message.)
             ///
-            virtual void showErrorMessage (const gchar *title, 
+            virtual void showErrorMessage (const gchar *title,
                                            const gchar *body) = 0;
-            
+
             ///
             /// @brief Shows the document's index.
@@ -359 +359 @@
             ///
             virtual void showStatusbar (gboolean show) = 0;
-            
+
             ///
             /// @brief Shows the tool bar.
@@ -369 +369 @@
             ///
             virtual void showToolbar (gboolean show) = 0;
-            
+
             ///
             /// @brief Gives the number of pages that the document has.
@@ -417 +417 @@
             ///         freed by the main view.
             virtual IFindView *getFindView (void) = 0;
-            
+
             ///
             /// @brief Gets the page's view.
@@ -432 +432 @@
             ///
             virtual IPageView *getPageView (void) = 0;
+
+            ///
+            /// @brief Gets the preferences' view.
+            ///
+            /// The preferences view is created each time the presenter
+            /// calls this function, with the main view as its parent window.
+            ///
+            /// @return The new preferences view. The returned pointer
+            ///         must be freed by the caller.
+            ///
+            virtual IPreferencesView *getPreferencesView (void) = 0;
 
             ///

trunk/src/MainPter.cxx

@@ -104 +104 @@
 {
     g_assert ( NULL != m_Document && "The document is NULL.");
-    
+
     IMainView &view = getView ();
     Config &config = Config::getConfig ();
@@ -137 +137 @@
                        0 < m_Document->getOutline ()->getNumChildren () &&
                        PageModeOutlines == m_Document->getPageMode ());
-    
     }
     else
@@ -174 +173 @@
     // by the first outline is selected and we don't want this.
     view.show ();
-    
 }
 
@@ -307 +305 @@
     g_assert (NULL != m_Document && 
               "Tried to go to the next page of a NULL document.");
-   
+
     if ( m_Document->getCurrentPageNum () < m_Document->getNumPages () )
     {
@@ -325 +323 @@
 MainPter::goToPageActivated ()
 {
-    g_assert (NULL != m_Document && 
+    g_assert (NULL != m_Document &&
               "Tried to go to the a page of a NULL document.");
-    
+
     // First try to get the page number from the view.
     const gchar *goToPageText = getView ().getGoToPageText ();
@@ -346 +344 @@
         getView ().setGoToPageText (goToPageText);
         g_free (goToPageText);
-    
     }
 }
@@ -359 +356 @@
     g_assert (NULL != m_Document && 
               "Tried to go to the previous page of a NULL document.");
-   
+
     if ( 1 < m_Document->getCurrentPageNum () )
     {
@@ -386 +383 @@
     if ( NULL != fileName )
     {
-        gchar *dirName = g_path_get_dirname (fileName);        
+        gchar *dirName = g_path_get_dirname (fileName);
         config.setOpenFileFolder (dirName);
         g_free (dirName);
@@ -407 +404 @@
 {
     g_assert (NULL != outline && "The outline activated is NULL.");
-    
+
     m_PagePter->setNextPageScroll (PAGE_SCROLL_START);
     m_Document->goToPage (outline->getDestinationPage ());
@@ -413 +410 @@
 
 ///
+/// @brief The "Preferences" was activated.
+///
+void
+MainPter::preferencesActivated ()
+{
+    PreferencesPter *preferences = new PreferencesPter ();
+    IPreferencesView *view = getView ().getPreferencesView ();
+    if ( NULL != view )
+    {
+        preferences->setView (view);
+    }
+    // There's no need to keep a pointer of the preferences presenter because
+    // when the dialog is closed of the application is finished it will
+    // destroy itself.
+}
+
+///
 /// @brief The "Reload" was activated.
 ///
@@ -420 +434 @@
 void
 MainPter::reloadActivated ()
-{   
+{
     g_assert ( m_Document->isLoaded () && 
             "Tried to reload a yet to load document.");

trunk/src/MainPter.h

@@ -52 +52 @@
             void goToPageActivated (void);
             void goToPreviousPageActivated (void);
-            gboolean openDocument (const gchar *fileName, 
+            gboolean openDocument (const gchar *fileName,
                                    const gchar *oldPassword, GError **error);
             void openFileActivated (void);
             void outlineActivated (DocumentOutline *outline);
+            void preferencesActivated (void);
             void reloadActivated (void);
             void rotateLeftActivated (void);

trunk/src/gtk/FindView.cxx

@@ -134 +134 @@
                 (gpointer) find_view_close_cb, oldPter);
     }
-    
+
     IFindView::setPresenter (pter);
 

trunk/src/gtk/MainView.cxx

@@ -25 +25 @@
 #include "FindView.h"
 #include "PageView.h"
+#include "PreferencesView.h"
 #include "MainView.h"
 
@@ -33 +34 @@
 
 // Enumerations.
-static enum 
+static enum
 {
     outlineTitleColumn,
@@ -56 +57 @@
 static void main_window_open_file_cb (GtkWidget *, gpointer);
 static void main_window_outline_cb (GtkTreeSelection *, gpointer);
+static void main_window_preferences_cb (GtkWidget *, gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
 static void main_window_show_index_cb (GtkToggleAction *, gpointer);
@@ -74 +76 @@
     { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL },
 
-    { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O",       
+    { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
       N_("Open a PDF document"),
       G_CALLBACK (main_window_open_file_cb) },
@@ -81 +83 @@
       N_("Reload the current document"),
       G_CALLBACK (main_window_reload_cb) },
-    
-    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 
-      N_("Close this window"), 
+
+    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+      N_("Close this window"),
       G_CALLBACK (main_window_quit_cb) },
 
@@ -89 +91 @@
       N_("Find a word in the document"),
       G_CALLBACK (main_window_find_cb) },
-    
-    { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus", 
-      N_("Enlarge the document"), 
+
+    { "Preferences", GTK_STOCK_PREFERENCES, N_("Preferences..."), NULL,
+      N_("Change the application's preferences"),
+      G_CALLBACK (main_window_preferences_cb) },
+
+    { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
+      N_("Enlarge the document"),
       G_CALLBACK (main_window_zoom_in_cb) },
 
-    { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus", 
-      N_("Shrink the document"), 
+    { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
+      N_("Shrink the document"),
       G_CALLBACK (main_window_zoom_out_cb) },
-    
-    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, 
-      N_("Rotate the document 90 degrees clockwise"), 
+
+    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL,
+      N_("Rotate the document 90 degrees clockwise"),
       G_CALLBACK (main_window_rotate_right_cb) },
 
-    { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, 
-      N_("Rotate the document 90 degrees counter-clockwise"), 
+    { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL,
+      N_("Rotate the document 90 degrees counter-clockwise"),
       G_CALLBACK (main_window_rotate_left_cb) },
 
     { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
-      N_("Go to the first page"), 
+      N_("Go to the first page"),
       G_CALLBACK (main_window_go_to_first_page_cb) },
 
-    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down", 
-      N_("Go to the next page"), 
+    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down",
+      N_("Go to the next page"),
       G_CALLBACK (main_window_go_to_next_page_cb) },
 
-    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up", 
+    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up",
       N_("Go to the previous page"),
       G_CALLBACK (main_window_go_to_previous_page_cb) },
@@ -122 +128 @@
       G_CALLBACK (main_window_go_to_last_page_cb) },
 
-    { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, 
-      N_("Display application's credits"), 
+    { "About", GTK_STOCK_ABOUT, N_("_About"), NULL,
+      N_("Display application's credits"),
       G_CALLBACK (main_window_about_box_cb) },
 
@@ -131 +137 @@
 };
 
-static GtkToggleActionEntry g_ToggleEntries[] = 
+static GtkToggleActionEntry g_ToggleEntries[] =
 {
     { "ShowToolBar", NULL, N_("Show _Toolbar"), NULL,
@@ -144 +150 @@
 
     { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
-      N_("Make the current document fill the window"), 
+      N_("Make the current document fill the window"),
       G_CALLBACK (main_window_zoom_fit_cb), FALSE },
 
     { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
-      N_("Make the current document fill the window width"), 
+      N_("Make the current document fill the window width"),
       G_CALLBACK (main_window_zoom_width_cb), FALSE }
 
@@ -225 +231 @@
 MainView::activeZoomWidth (gboolean active)
 {
-    GtkAction *zoomWidth = 
+    GtkAction *zoomWidth =
         gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
@@ -241 +247 @@
     gtk_dialog_set_alternative_button_order (GTK_DIALOG (openDialog),
             GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
-    
+
     // Select the last used folder as the initial folder, if any.
     if ( NULL != lastFolder )
@@ -555 +561 @@
 IPageView *
 MainView::getPageView ()
-{    
+{
     return m_PageView;
 }
 
-void 
+IPreferencesView *
+MainView::getPreferencesView ()
+{
+    return new PreferencesView (GTK_WINDOW (m_MainWindow));
+}
+
+void
 MainView::setTitle (const gchar *title)
 {
@@ -600 +612 @@
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
-    if ( show ) 
+    if ( show )
     {
         gtk_widget_show (toolBar);
@@ -623 +635 @@
 {
     GtkWidget *hbox = gtk_hbox_new (FALSE, 3);
-    
+
     GtkWidget *pageLabel= gtk_label_new (_("Page"));
     gtk_box_pack_start (GTK_BOX (hbox), pageLabel, FALSE, FALSE, 0);
-    
+
     m_CurrentPage = gtk_entry_new ();
     gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), _("0 of 0"));
@@ -633 +645 @@
                       G_CALLBACK (main_window_go_to_page_cb), m_Pter);
     gtk_box_pack_start (GTK_BOX (hbox), m_CurrentPage, TRUE, TRUE, 0);
-    
+
     m_CurrentPageToolItem = gtk_tool_item_new ();
     gtk_container_add (GTK_CONTAINER (m_CurrentPageToolItem), hbox);
@@ -653 +665 @@
     // Create the page view.
     m_PageView = new PageView ();
-    
+
     // Create the side bar, with the index tree.
     m_Outline = gtk_tree_store_new (outlineNumColumns, 
@@ -664 +676 @@
     gtk_tree_view_column_set_title (column, _("Index"));
     gtk_tree_view_append_column (GTK_TREE_VIEW (m_TreeIndex), column);
-   
+
     {
         GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
@@ -675 +687 @@
         gtk_tree_view_column_set_attributes (column, renderer, "text", 0, NULL);
     }
-            
+
     {
         GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
@@ -711 +723 @@
 void
 MainView::createUIManager ()
-{        
+{
     GtkActionGroup *actionGroup = gtk_action_group_new ("ePDFView");
     // Set the translation domain for labels and tool tips.
@@ -723 +735 @@
     m_UIManager = gtk_ui_manager_new ();
     gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
-    
+
     GError *error = NULL;
     if ( !gtk_ui_manager_add_ui_from_file (m_UIManager, 
@@ -756 +768 @@
         "icon_epdfview-24.png",
     };
-    
+
     GList *iconList = NULL;
     int iconFilesNum = G_N_ELEMENTS (iconFiles);
@@ -796 +808 @@
 {
     if ( NULL != outline )
-    {        
+    {
         DocumentOutline *child = outline->getFirstChild ();
         while (NULL != child)
         {
-            GtkTreeIter childIter;            
+            GtkTreeIter childIter;
             gtk_tree_store_append (m_Outline, &childIter, rootIter);
             gtk_tree_store_set (m_Outline, &childIter,
@@ -1025 +1037 @@
 
 ///
+/// @brief The user wants to change the preferences.
+///
+void
+main_window_preferences_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->preferencesActivated ();
+}
+
+///
 /// @brief Called when the window is closed or Quit is activated.
 ///

trunk/src/gtk/MainView.h

@@ -33 +33 @@
             MainView (MainPter *pter);
             ~MainView ();
-           
+
             void activeZoomFit (gboolean active);
             void activeZoomWidth (gboolean active);
@@ -62 +62 @@
             IFindView *getFindView (void);
             IPageView *getPageView (void);
+            IPreferencesView *getPreferencesView (void);
             void setTitle (const gchar *title);
             void setOutline (DocumentOutline *outline);

trunk/src/gtk/Makefile.am

@@ -5 +5 @@
     FindView.h  \
     MainView.cxx    \
-    MainView.h      \
+    MainView.h  \
     PageView.cxx    \
     PageView.h  \
+    PreferencesView.cxx \
+    PreferencesView.h   \
     StockIcons.cxx  \
     StockIcons.h

trunk/src/gtk/PageView.h

@@ -26 +26 @@
             PageView (void);
             ~PageView (void);
-           
+
             gdouble getHorizontalScroll (void);
             GtkWidget *getTopWidget (void);