[pitivi: 3/6] patch for bug 621342 (show Quickstart Guide in Help Menu)

[Edward Hervey <edwardrv src gnome org>]

commit e0223735c3d0d23fbe282b89ead49384f44b42e4
Author: 7 Stéphane Maniaci <stephane maniaci gmail com>
Date:   Mon Oct 18 13:19:10 2010 +0100

    patch for bug 621342 (show Quickstart Guide in Help Menu)

 configure.ac             |    2 +-
 pitivi/configure.py.in   |    2 ++
 pitivi/ui/mainwindow.py  |   15 ++++++++++-----
 pitivi/ui/mainwindow.xml |    1 +
 4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index de47d03..ede6618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
 AC_INIT(PiTiVi, 0.13.5.1,
-    http://www.pitivi.org/,
+    https://bugzilla.gnome.org/browse.cgi?product=pitivi,
     pitivi)
 
 dnl initialize automake
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index 888f58b..9ca78d9 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -30,6 +30,8 @@ PKGDATADIR = '@DATADIR@/@PACKAGE@'
 PIXMAPDIR = '@DATADIR@/pixmaps'
 pitivi_version = '@VERSION@'
 APPNAME = '@PACKAGE_NAME@'
+APPURL = 'http://www.pitivi.org/'
+APPMANUALURL = 'http://www.pitivi.org/manual/'
 PYGTK_REQ = '@PYGTK_REQ@'
 PYGST_REQ = '@PYGST_REQ@'
 GST_REQ = '@GST_REQ@'
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 3da0de2..97631e7 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -31,6 +31,7 @@ gobject.threads_init()
 import gst
 import gst.pbutils
 from urllib import unquote
+import webbrowser
 
 try:
     import gconf
@@ -46,8 +47,8 @@ from pitivi.log.loggable import Loggable
 from pitivi.ui.timeline import Timeline
 from pitivi.ui.basetabs import BaseTabs
 from pitivi.ui.viewer import PitiviViewer
-from pitivi.configure import pitivi_version, APPNAME, get_pixmap_dir, \
-     get_global_pixmap_dir, LIBDIR
+from pitivi.configure import pitivi_version, APPNAME, APPURL, APPMANUALURL, \
+     get_pixmap_dir, get_global_pixmap_dir, LIBDIR
 from pitivi.ui import dnd
 from pitivi.pipeline import Pipeline
 from pitivi.action import ViewAction
@@ -298,6 +299,8 @@ class PitiviMainWindow(gtk.Window, Loggable):
             ("Quit", gtk.STOCK_QUIT, None, None, None, self._quitCb),
             ("About", gtk.STOCK_ABOUT, None, None,
              _("Information about %s") % APPNAME, self._aboutCb),
+            ("UserManual", gtk.STOCK_HELP, _("User manual"),
+             None, None, self._userManualCb),
             ("File", None, _("_File")),
             ("Edit", None, _("_Edit")),
             ("View", None, _("_View")),
@@ -351,7 +354,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
                 action.set_visible(False)
             elif action_name in [
                 "ProjectSettings", "Quit", "File", "Edit", "Help", "About",
-                "View", "FullScreen", "FullScreenAlternate",
+                "View", "FullScreen", "FullScreenAlternate", "UserManual",
                 "ImportSourcesFolder", "PluginManager", "PlayPause",
                 "Project", "FrameForward", "FrameBackward",
                 "ShowHideMainToolbar", "ShowHideTimelineToolbar", "Library",
@@ -674,11 +677,13 @@ class PitiviMainWindow(gtk.Window, Loggable):
         self.uimanager.get_widget("/TimelineToolBar").props.visible = \
             action.props.active
 
+    def _userManualCb(self, unused_action):
+        webbrowser.open_new (APPMANUALURL)
+
     def _aboutResponseCb(self, dialog, unused_response):
         dialog.destroy()
 
     def _showWebsiteCb(self, dialog, uri):
-        import webbrowser
         webbrowser.open_new(uri)
 
     def _aboutCb(self, unused_action):
@@ -686,7 +691,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
         abt.set_name(APPNAME)
         abt.set_version("v%s" % pitivi_version)
         gtk.about_dialog_set_url_hook(self._showWebsiteCb)
-        abt.set_website("http://www.pitivi.org/";)
+        abt.set_website(APPURL)
         authors = ["Edward Hervey <bilboed bilboed com>",
                    "Alessandro Decina <alessandro decina collabora co uk>",
                    "Brandon Lewis <brandon_lewis berkeley edu> (UI)",
diff --git a/pitivi/ui/mainwindow.xml b/pitivi/ui/mainwindow.xml
index 1673fcf..7be62a2 100644
--- a/pitivi/ui/mainwindow.xml
+++ b/pitivi/ui/mainwindow.xml
@@ -44,6 +44,7 @@
     </menu>
     <menu action="Help">
       <menuitem action="About" />
+      <menuitem action="UserManual" />
     </menu>
   </menubar>
   <toolbar name="MainToolBar">