Permalink
Browse files

mainwindow: Use standard shortcuts for Help and Fullscreen

  • Loading branch information...
1 parent 7bb7ed9 commit d8a09f935e47ae48813536327d756de0c38373b2 @nekohayo committed Jun 2, 2012
Showing with 3 additions and 11 deletions.
  1. +0 −1 data/ui/mainwindow.xml
  2. +3 −10 pitivi/mainwindow.py
View
@@ -58,6 +58,5 @@
<placeholder name="Timeline" />
<separator />
</toolbar>
- <accelerator action="FullScreenAlternate" />
<accelerator action="RenderProject" />
</ui>
View
@@ -294,7 +294,7 @@ def _setActions(self, instance):
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 @@ def _setActions(self, instance):
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 @@ def _setActions(self, instance):
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 @@ def _quitCb(self, unused_action):
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

0 comments on commit d8a09f9

Please sign in to comment.