Changeset 43

Timestamp:

04/12/06 13:51:22 (3 years ago)

Author:

jordi

Message:

Included the config.h file into all source files.

Added the default ePDFView's icon, which is Gnome's Postscript Viewer file. Now is loaded by the MainWindow? class.

Location:

trunk

Files:

• data/Makefile.am (modified) (1 diff)
• data/icon_epdfview-24.png (added)
• data/icon_epdfview-32.png (added)
• data/icon_epdfview-48.png (added)
• src/DocumentIndex.cxx (modified) (1 diff)
• src/DocumentPage.cxx (modified) (1 diff)
• src/IDocument.cxx (modified) (1 diff)
• src/MainPter.cxx (modified) (1 diff)
• src/PDFDocument.cxx (modified) (1 diff)
• src/gtk/MainView.cxx (modified) (20 diffs)
• src/gtk/MainView.h (modified) (1 diff)
• src/gtk/StockIcons.cxx (modified) (1 diff)
• src/main.cxx (modified) (3 diffs)

trunk/data/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to produce a Makefile.in file.
 
-stockdir = $(pkgdatadir)/pixmaps
-stock_DATA =    \
+pixmapdir = $(pkgdatadir)/pixmaps
+pixmap_DATA =   \
+    icon_epdfview-24.png    \
+    icon_epdfview-32.png    \
+    icon_epdfview-48.png    \
     stock_rotate-90.png \
     stock_rotate-270.png    \

trunk/src/DocumentIndex.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
 #include "epdfview.h"
 

trunk/src/DocumentPage.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
 #include "epdfview.h"
 

trunk/src/IDocument.cxx

@@ -15 +15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#include <config.h>
 
 // Poppler headers.

trunk/src/MainPter.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
 #include "epdfview.h"
 

trunk/src/PDFDocument.cxx

@@ -15 +15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#include <config.h>
 
 // Poppler headers.

trunk/src/gtk/MainView.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gettext.h>
@@ -31 +33 @@
 
 // Forward delarations.
+static void main_window_about_box_cb (GtkWidget *, gpointer);
 static void main_window_go_to_first_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_last_page_cb (GtkWidget *, gpointer);
@@ -45 +48 @@
 static void main_window_zoom_width_cb (GtkWidget *, gpointer);
 
+// The actions for menus and toolbars.
+static const GtkActionEntry g_NormalEntries[] = 
+{
+    { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
+    { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
+    { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL },
+    { "HelpMenu", GTK_STOCK_HELP, N_("_Help"), NULL, NULL, NULL },
+
+    { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O",       
+      N_("Open a PDF document"),
+      G_CALLBACK (main_window_open_file_cb) },    
+    
+    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 
+      N_("Close this window"), 
+      G_CALLBACK (main_window_quit_cb) },
+    
+    { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "plus", 
+      N_("Enlarge the document"), 
+      G_CALLBACK (main_window_zoom_in_cb) },
+
+    { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "minus", 
+      N_("Shrink the document"), 
+      G_CALLBACK (main_window_zoom_out_cb) },
+    
+    { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
+      N_("Make the current document fill the window"), 
+      G_CALLBACK (main_window_zoom_fit_cb) },
+
+    { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
+      N_("Make the current document fill the window width"), 
+      G_CALLBACK (main_window_zoom_width_cb) },
+
+    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, 
+      N_("Rotate the document 90 degrees clockwise"), 
+      G_CALLBACK (main_window_rotate_right) },
+
+    { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, 
+      N_("Rotate the document 90 degrees counter-clockwise"), 
+      G_CALLBACK (main_window_rotate_left) },
+
+    { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
+      N_("Go to the first page"), 
+      G_CALLBACK (main_window_go_to_first_page_cb) },
+
+    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<control>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"), "<control>Page_Up", 
+      N_("Go to the previous page"),
+      G_CALLBACK (main_window_go_to_previous_page_cb) },
+
+    { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End",
+      N_("Go to the last page"),
+      G_CALLBACK (main_window_go_to_last_page_cb) },
+
+    { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, 
+      N_("Display application's credits"), 
+      G_CALLBACK (main_window_about_box_cb) }
+};
+
 ////////////////////////////////////////////////////////////////
 // Interface Methods.
@@ -56 +120 @@
     // Create the main window.
     m_MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    setMainWindowIcon ();
     // Connect already the destroy signal.
     g_signal_connect (G_OBJECT (m_MainWindow), "destroy",
@@ -319 +384 @@
 ////////////////////////////////////////////////////////////////
 
+///
+/// @brief Creates the "Current Page" widget that will be displayed on toolbar.
+///
+/// @return The tool item to add to the toolbar.
+///
 GtkToolItem *
 MainView::createCurrentPage ()
@@ -340 +410 @@
 }
 
+///
+/// @brief Creates the widget that will display the page.
+///
 void
 MainView::createPageView ()
@@ -352 +425 @@
 }
 
+///
+/// @brief Creates and initializes the main window's UI manager.
+///
 void
 MainView::createUIManager ()
-{
-    GtkActionEntry entries[] = 
-    {
-        { "FileMenu", NULL, _("_File"), NULL, NULL, NULL },
-        { "ViewMenu", NULL, _("_View"), NULL, NULL, NULL },
-        { "GoMenu", NULL, _("_Go"), NULL, NULL, NULL },
-        { "HelpMenu", GTK_STOCK_HELP, _("_Help"), NULL, NULL, NULL },
-        { "OpenFile", GTK_STOCK_OPEN, _("_Open"), "<control>O", NULL, G_CALLBACK (main_window_open_file_cb) },
-        { "Quit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", NULL, G_CALLBACK (main_window_quit_cb) },
-        { "ZoomIn", GTK_STOCK_ZOOM_IN, _("Zoom _In"), "plus", NULL, G_CALLBACK (main_window_zoom_in_cb) },
-        { "ZoomOut", GTK_STOCK_ZOOM_OUT, _("Zoom _Out"), "minus", NULL, G_CALLBACK (main_window_zoom_out_cb) },
-        { "ZoomFit", GTK_STOCK_ZOOM_FIT, _("Zoom to _Fit"), NULL, NULL, G_CALLBACK (main_window_zoom_fit_cb) },
-        { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, _("Zoom to _Width"), NULL, NULL, G_CALLBACK (main_window_zoom_width_cb) },
-        { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, _("Rotate _Right"), NULL, NULL, G_CALLBACK (main_window_rotate_right)},
-        { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, _("Rotate _Left"), NULL, NULL, G_CALLBACK (main_window_rotate_left)},
-        { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, _("_First Page"), "Home", NULL, G_CALLBACK (main_window_go_to_first_page_cb) },
-        { "GoToNextPage", GTK_STOCK_GO_FORWARD, _("_Next Page"), "Page_Down", NULL, G_CALLBACK (main_window_go_to_next_page_cb) },
-        { "GoToPreviousPage", GTK_STOCK_GO_BACK, _("_Previous Page"), "Page_Up", NULL, G_CALLBACK (main_window_go_to_previous_page_cb) },
-        { "GoToLastPage", GTK_STOCK_GOTO_LAST, _("_Last Page"), "End", NULL, G_CALLBACK (main_window_go_to_last_page_cb) },
-        { "About", GTK_STOCK_ABOUT, "_About", NULL, NULL, NULL }
-    };
-        
+{        
     GtkActionGroup *actionGroup = gtk_action_group_new ("ePDFView");
     // The data passed to all actions is the presenter
-    gtk_action_group_add_actions (actionGroup, entries,
-            G_N_ELEMENTS (entries), m_Pter);
+    gtk_action_group_add_actions (actionGroup, g_NormalEntries,
+                                  G_N_ELEMENTS (g_NormalEntries), m_Pter);
     m_UIManager = gtk_ui_manager_new ();
     gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
@@ -388 +443 @@
                                            &error) )
     {
-        g_message (_("Error building UI manager: %s\n"), error->message);
+        g_critical (_("Error building UI manager: %s\n"), error->message);
         g_error_free (error);
         exit (EXIT_FAILURE);
@@ -394 +449 @@
 }
 
+///
+/// @brief Creates a new GdkPixbuf from a given DocumentPage.
+///
+/// @param page The DocumentPage to transform to a GdkPixbuf.
+/// @return The resultant GdkPixbuf.
+///
 GdkPixbuf *
 MainView::getPixbufFromPage (DocumentPage *page)
@@ -404 +465 @@
 }
 
+///
+/// @brief Loads and sets the application's icon.
+///
+void
+MainView::setMainWindowIcon ()
+{
+    const gchar *iconFiles[] =
+    {
+        "icon_epdfview-48.png",
+        "icon_epdfview-32.png",
+        "icon_epdfview-24.png",
+    };
+    
+    GList *iconList = NULL;
+    int iconFilesNum = G_N_ELEMENTS (iconFiles);
+    for ( int iconIndex = 0 ; iconIndex < iconFilesNum ; iconIndex++ )
+    {
+        gchar *filename = g_strconcat (DATADIR, "/pixmaps/", 
+                                       iconFiles[iconIndex], NULL);
+        GError *error = NULL;
+        GdkPixbuf *iconPixbuf = gdk_pixbuf_new_from_file (filename, &error);
+        if ( NULL != iconPixbuf )
+        {
+            iconList = g_list_prepend (iconList, iconPixbuf);
+        }
+        else
+        {
+            g_warning ("Error loading icon: %s\n", error->message);
+            g_error_free (error);
+        }
+        g_free (filename);
+    }
+    gtk_window_set_default_icon_list (iconList);
+    g_list_foreach (iconList, (GFunc)g_object_unref, NULL);
+    g_list_free (iconList);
+}
+
 ////////////////////////////////////////////////////////////////
 // GTK+ Callbacks.
 ////////////////////////////////////////////////////////////////
 
+///
+/// @brief The user tries to open the dialog box.
+///
+void
+main_window_about_box_cb (GtkWidget *widget, gpointer data)
+{
+    const gchar *authors[] = {
+        "Jordi Fita <jordi@emma-soft.com>",
+        NULL
+    };
+
+    const gchar *comments = _("A lighweight PDF viewer");
+
+    const gchar *license[] = {
+        N_("ePDFView is free software; you can redistribute it and/or modify\n"
+           "it under the terms of the GNU General Public License as published "
+           "by\nthe Free Software Foundation; either version 2 of the "
+           "License, or\n(at your option) any later version.\n"),
+        N_("ePDFView is distributes in the hope that it will be useful,\n"
+           "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+           "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+           "GNU General Public License for more details.\n"),
+        N_("You should have received a copy of the GNU General Public License\n"
+           "along with ePDFView; if not, write to the Free Software Foundation,"
+           "Inc.,\n59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n")
+    };
+    gchar *licenseTranslated = g_strconcat (_(license[0]), "\n",
+                                            _(license[1]), "\n",
+                                            _(license[2]), "\n", NULL);    
+    gtk_show_about_dialog (NULL,
+            "name", _("ePDFView"),
+            "version", VERSION,
+            "copyright", "\xc2\xa9 2006 Emma's Software",
+            "license", licenseTranslated,
+            "website", "http://www.emma-soft.com/projects/epdfview/",
+            "authors", authors,
+            "comments", comments,
+            NULL);
+
+    g_free (licenseTranslated);
+}
+
+///
+/// @brief The user tries to go to the first page.
+///
 void
 main_window_go_to_first_page_cb (GtkWidget *widget, gpointer data)
@@ -417 +560 @@
 }
 
+///
+/// @brief The user tries to go the last page.
+///
 void
 main_window_go_to_last_page_cb (GtkWidget *widget, gpointer data)
@@ -426 +572 @@
 }
 
+///
+/// @brief The user tries to go to the next page.
+///
 void
 main_window_go_to_next_page_cb (GtkWidget *widget, gpointer data)
@@ -435 +584 @@
 }
 
+///
+/// @brief The user tries to go to a given page on the toolbar.
+///
 void
 main_window_go_to_page_cb (GtkWidget *widget, gpointer data)
@@ -444 +596 @@
 }
 
+///
+/// @brief The user tries to go to the previous page.
+///
 void
 main_window_go_to_previous_page_cb (GtkWidget *widget, gpointer data)
@@ -453 +608 @@
 }
 
+///
+/// @brief The user tried to rotate the document counter-clockwise.
+///
 void
 main_window_rotate_left (GtkWidget *widget, gpointer data)
@@ -462 +620 @@
 }
 
+///
+/// @brief The user tried to rotate the document clockwise.
+///
 void
 main_window_rotate_right (GtkWidget *widget, gpointer data)
@@ -492 +653 @@
 }
 
+///
+/// @brief The user tries to fit the document into the window.
+///
 void
 main_window_zoom_fit_cb (GtkWidget *widget, gpointer data)
@@ -501 +665 @@
 }
 
+///
+/// @brief The user tries to expand the document.
+///
 void
 main_window_zoom_in_cb (GtkWidget *widget, gpointer data)
@@ -510 +677 @@
 }
 
+///
+/// @brief The user tries to shrink the document.
+///
 void
 main_window_zoom_out_cb (GtkWidget *widget, gpointer data)
@@ -519 +689 @@
 }
 
+///
+/// @brief The user tries to fit the document in the window's width.
+///
 void
 main_window_zoom_width_cb (GtkWidget *widget, gpointer data)

trunk/src/gtk/MainView.h

@@ -67 +67 @@
             void createUIManager (void);
             GdkPixbuf *getPixbufFromPage (DocumentPage *page);
+            void setMainWindowIcon (void);
     };
 }

trunk/src/gtk/StockIcons.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
 #include <gettext.h>
 #include <gtk/gtkiconfactory.h>

trunk/src/main.cxx

@@ -16 +16 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+#include <config.h>
+#include <stdlib.h>
+#include <gettext.h>
 #include <gtk/gtk.h>
 #include <IMainView.h>
@@ -28 +31 @@
     // Initialize the GTK library.
     gtk_init (&argc, &argv);
+    g_set_application_name (_("PDF Viewer"));
     // Create the main presenter.
     MainPter *mainPter = new MainPter ();
@@ -41 +45 @@
     delete mainPter;
     // All done!.
-    return 0;
+    return EXIT_SUCCESS;
 }