Changeset 245

Timestamp:

06/29/06 14:22:27 (2 years ago)

Author:

jordi

Message:

The link on the about box is now clickable and the command executed is the same as an external link has been activated (i.e., uses the web browser specified in the preferences dialog.)

This commit fixes bug #45.

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/src/MainPter.cxx (modified) (2 diffs)
• trunk/src/MainPter.h (modified) (1 diff)
• trunk/src/gtk/MainView.cxx (modified) (3 diffs)

trunk/configure.ac

@@ -1 +1 @@
-dnl Process this file with autoconf to produce a configure script.
-5
+6
-AC_PREREQ([2.13])
-AC_CONFIG_HEADER([config.h])

trunk/src/MainPter.cxx

@@ -285 +285 @@
-    m_PagePter = new PagePter (m_Document);
-    m_PagePter->setView (*view);
-
+
-    delete m_View;
-    m_View = view;
@@ -291 +291 @@
-    // state.
-    setInitialState ();
+}
+
+///
+/// @brief An URL link in the about box has been activated.
+///
+/// @param link The URL of the link activated.
+///
+void
+MainPter::aboutBoxLinkActivated (const gchar *link)
+{
+    gchar *browserCommandLine =
+        Config::getConfig ().getExternalBrowserCommandLine ();
+    gchar *commandLine = g_strdup_printf (browserCommandLine, link);
+    g_free (browserCommandLine);
+
+    GError *error = NULL;
+    if ( !g_spawn_command_line_async (commandLine, &error) )
+    {
+        g_error_free (error);
+    }
+    g_free (commandLine);
-}
-

trunk/src/MainPter.h

@@ -46 +46 @@
-            void setView (IMainView *view);
-
+            void aboutBoxLinkActivated (const gchar *link);
-            void findActivated (void);
-            void goToFirstPageActivated (void);

trunk/src/gtk/MainView.cxx

@@ -50 +50 @@
-// Forward declarations.
-static void main_window_about_box_cb (GtkWidget *, gpointer);
+static void main_window_about_box_url_hook (GtkAboutDialog *, const gchar *,
+                                            gpointer);
-static void main_window_find_cb (GtkWidget *, gpointer);
-static gboolean main_window_moved_or_resized_cb (GtkWidget *,
@@ -1013 +1015 @@
-    gchar *licenseTranslated = g_strconcat (_(license[0]), "\n",
-                                            _(license[1]), "\n",
-
+
+
-    gtk_show_about_dialog (NULL,
-            "name", _("ePDFView"),
@@ -1028 +1031 @@
-}
-
+
+void
+main_window_about_box_url_hook (GtkAboutDialog *about, const gchar *link,
+                                gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->aboutBoxLinkActivated (link);
+}
+
-///
-/// @brief The user tried to find a word in the document.