From 8c95e40e185c1303713ed27b477da366577ccab2 Mon Sep 17 00:00:00 2001 From: Joachim Seemer Date: Fri, 28 Jan 2011 19:18:09 +0000 Subject: [PATCH] * Changed full screen shortcut to B_ENTER like in Terminal, ShowImage, Web+. * Put "Always on top" into context menu. * Rearranged items in context menu to have interface related options together. * Disable "No interface" in full screen mode context menu. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40309 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/mediaplayer/MainWin.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index 332d023223..b0c8dc8666 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -1518,7 +1518,7 @@ MainWin::_CreateMenu() fVideoMenu->AddSeparatorItem(); fVideoMenu->AddItem(new BMenuItem(B_TRANSLATE("Full screen"), - new BMessage(M_TOGGLE_FULLSCREEN), 'F')); + new BMessage(M_TOGGLE_FULLSCREEN), B_ENTER)); fVideoMenu->AddSeparatorItem(); @@ -2006,19 +2006,24 @@ MainWin::_ShowContextMenu(const BPoint& screenPoint) BPopUpMenu* menu = new BPopUpMenu("context menu", false, false); BMenuItem* item; menu->AddItem(item = new BMenuItem(B_TRANSLATE("Full screen"), - new BMessage(M_TOGGLE_FULLSCREEN), 'F')); + new BMessage(M_TOGGLE_FULLSCREEN), B_ENTER)); item->SetMarked(fIsFullscreen); item->SetEnabled(fHasVideo); - BMenu* aspectSubMenu = new BMenu(B_TRANSLATE("Aspect ratio")); - _SetupVideoAspectItems(aspectSubMenu); - aspectSubMenu->SetTargetForItems(this); - menu->AddItem(item = new BMenuItem(aspectSubMenu)); - item->SetEnabled(fHasVideo); - menu->AddItem(item = new BMenuItem(B_TRANSLATE("Hide interface"), new BMessage(M_TOGGLE_NO_INTERFACE), 'H')); item->SetMarked(fNoInterface); + item->SetEnabled(fHasVideo && !fIsFullscreen); + + menu->AddItem(item = new BMenuItem(B_TRANSLATE("Always on top"), + new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'A')); + item->SetMarked(fAlwaysOnTop); + item->SetEnabled(fHasVideo); + + BMenu* aspectSubMenu = new BMenu(B_TRANSLATE("Aspect ratio")); + _SetupVideoAspectItems(aspectSubMenu); + aspectSubMenu->SetTargetForItems(this); + menu->AddItem(item = new BMenuItem(aspectSubMenu)); item->SetEnabled(fHasVideo); menu->AddSeparatorItem();