Changeset 71

Timestamp:

04/16/06 06:52:48 (2 years ago)

Author:

jordi

Message:

The application can now open directly a file from the command line. I haven't added a test case because the function used to load the file is the same used the the openFileActivate() and reloadActivated() member functions of MainPter?, so it's tested with them. I only set this function public instead of protected.

Location:

trunk

Files:

• data/epdfview.desktop (modified) (1 diff)
• src/MainPter.h (modified) (2 diffs)
• src/main.cxx (modified) (3 diffs)

trunk/data/epdfview.desktop

@@ -5 +5 @@
 Comment[es]=Visor de documentos PDF ligero
 Encoding=UTF-8
-Exec=epdfview
+Exec=epdfview %f
 GenericName=PDF Viewer
 GenericName[ca]=Visor PDF

trunk/src/MainPter.h

@@ -50 +50 @@
             void goToPageActivated (void);
             void goToPreviousPageActivated (void);
+            void openDocument (const gchar *fileName, const gchar *oldPassword,
+                               gboolean canShowPage);
             void openFileActivated (void);
             void outlineActivated (DocumentOutline *outline);
@@ -61 +63 @@
 
         protected:
-            void openDocument (const gchar *fileName, const gchar *oldPassword,
-                               gboolean canShowPage);
             void showPage (void);
 

trunk/src/main.cxx

@@ -25 +25 @@
 #include "MainPter.h"
 
+
 using namespace ePDFView;
+
+///
+/// @brief The data passed to open_command_line_file() function.
+///
+typedef struct
+{
+    /// The presenter to make open the file.
+    MainPter *presenter;
+    /// The filename to open.
+    gchar *fileName;
+} OpenFileData;
+
+// Forward declarations.
+static gboolean open_command_line_file (gpointer data);
 
 int
 main (int argc, char **argv)
 {
-    // Enable NLS support.
+    // Enable NLS.
     setlocale (LC_ALL, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
     bind_textdomain_codeset (PACKAGE, "UTF-8");
     textdomain (PACKAGE);
+    // Create the comman line options context.
+    GOptionContext *optionContext = 
+        g_option_context_new (_("[FILE] - view PDF documents"));
+    g_option_context_add_group (optionContext, gtk_get_option_group (TRUE));
+    GError *error = NULL;
+    if ( !g_option_context_parse (optionContext, &argc, &argv, &error) )
+    {
+        g_critical ("Error parsing command line options: %s\n", error->message);
+        g_error_free (error);
+        exit (EXIT_FAILURE);
+    }
     // Initialise the GTK library.
     gtk_init (&argc, &argv);
@@ -40 +66 @@
     // Create the main presenter.
     MainPter *mainPter = new MainPter ();
+    // Now check if we have additional parameters. Any additional parameter
+    // will be a filename to open.
+    if ( argc > 1 )
+    {
+        OpenFileData *openFile = new OpenFileData;
+        if ( NULL != openFile )
+        {
+            openFile->presenter = mainPter;
+            openFile->fileName = g_strdup (argv[1]);
+
+            // This will call the function when no other GTK event is on
+            // the queue, and will let the presenter open the file when
+            // then main view is shown.
+            g_idle_add (open_command_line_file, openFile);
+        }
+    }
     // Create the main view.
     MainView *mainView = new MainView (mainPter);
@@ -53 +95 @@
     return EXIT_SUCCESS;
 }
+
+gboolean
+open_command_line_file (gpointer data)
+{
+    g_assert (NULL != data && "The data parameter is NULL.");
+
+    OpenFileData *openFile = (OpenFileData *)data;
+    g_assert (NULL != openFile->presenter && "The presenter is NULL.");
+    g_assert (NULL != openFile->fileName && "The file name is NULL.");
+    openFile->presenter->openDocument (openFile->fileName, NULL, TRUE);
+    delete openFile;
+
+    // Returning FALSE means that the function won't be called again.
+    return FALSE;
+}