[pitivi] mainwindow: Use standard shortcuts for Help and Fullscreen

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit d8a09f935e47ae48813536327d756de0c38373b2
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Sat Jun 2 14:25:09 2012 -0400

    mainwindow: Use standard shortcuts for Help and Fullscreen

 data/ui/mainwindow.xml |    1 -
 pitivi/mainwindow.py   |   13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/data/ui/mainwindow.xml b/data/ui/mainwindow.xml
index 9d05fbb..c467407 100644
--- a/data/ui/mainwindow.xml
+++ b/data/ui/mainwindow.xml
@@ -58,6 +58,5 @@
         <placeholder name="Timeline" />
         <separator />
   </toolbar>
-  <accelerator action="FullScreenAlternate" />
   <accelerator action="RenderProject" />
 </ui>
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 106fe0c..3a0433f 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -294,7 +294,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
             None, _("Information about %s") % APPNAME, self._aboutCb),
 
             ("UserManual", gtk.STOCK_HELP, _("User Manual"),
-             None, None, self._userManualCb),
+             "F1", None, self._userManualCb),
 
             # Set up the toplevel menu items for translation
             ("File", None, _("_Project")),
@@ -308,10 +308,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
 
         self.toggleactions = [
             ("FullScreen", gtk.STOCK_FULLSCREEN, None,
-            "f", _("View the main window on the whole screen"), self._fullScreenCb),
-
-            ("FullScreenAlternate", gtk.STOCK_FULLSCREEN, None,
-            "F11", None, self._fullScreenAlternateCb),
+            "F11", _("View the main window on the whole screen"), self._fullScreenCb),
 
             ("ShowHideMainToolbar", None, _("Main Toolbar"),
             None, None, self._showHideMainToolBar,
@@ -350,7 +347,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
             elif action_name in [
                 "File", "Edit", "View", "Help",
                 "About", "Quit", "ImportSourcesFolder",
-                "FullScreen", "FullScreenAlternate", "UserManual",
+                "FullScreen", "UserManual",
                 "ShowHideMainToolbar", "ShowHideTimelineToolbar",
                 "FrameForward", "FrameBackward",
                 "SecondForward", "SecondBackward",
@@ -626,10 +623,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
     def _fullScreenCb(self, unused_action):
         self.setFullScreen(not self.is_fullscreen)
 
-    def _fullScreenAlternateCb(self, unused_action):
-        # Nothing more, nothing less.
-        self.actiongroup.get_action("FullScreen").activate()
-
     def _showHideMainToolBar(self, action):
         self.uimanager.get_widget("/MainToolBar").props.visible = \
             action.props.active