Author: humdinger Date: 2011-01-28 20:18:09 +0100 (Fri, 28 Jan 2011) New Revision: 40309 Changeset: http://dev.haiku-os.org/changeset/40309 Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp Log: * 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. Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp =================================================================== --- haiku/trunk/src/apps/mediaplayer/MainWin.cpp 2011-01-28 12:24:45 UTC (rev 40308) +++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp 2011-01-28 19:18:09 UTC (rev 40309) @@ -1518,7 +1518,7 @@ 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,21 +2006,26 @@ 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); + 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->AddItem(item = new BMenuItem(B_TRANSLATE("Hide interface"), - new BMessage(M_TOGGLE_NO_INTERFACE), 'H')); - item->SetMarked(fNoInterface); - item->SetEnabled(fHasVideo); - menu->AddSeparatorItem(); // Add track selector menus