[haiku-commits] r38597 - haiku/trunk/src/apps/mediaplayer

From: superstippi@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Fri, 10 Sep 2010 12:37:38 +0200 (CEST)
Author: stippi
Date: 2010-09-10 12:37:38 +0200 (Fri, 10 Sep 2010)
New Revision: 38597
Changeset: http://dev.haiku-os.org/changeset/38597

Modified:
   haiku/trunk/src/apps/mediaplayer/MainWin.cpp
   haiku/trunk/src/apps/mediaplayer/MainWin.h
Log:
 * Moved the Settings menu items into the MediaPlayer menu.
 * Removed the Settings menu in favor of a new Attributes
   menu (does not offer anything yet).
 * The context menu was showing two separator items by mistake
   (after the About item was removed from it).


Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.cpp        2010-09-10 10:07:13 UTC 
(rev 38596)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp        2010-09-10 10:37:38 UTC 
(rev 38597)
@@ -1351,20 +1351,19 @@
        fAudioMenu = new BMenu("Audio");
        fVideoMenu = new BMenu("Video");
        fVideoAspectMenu = new BMenu("Aspect ratio");
-       fSettingsMenu = new BMenu("Settings");
        fAudioTrackMenu = new BMenu("Track");
        fVideoTrackMenu = new BMenu("Track");
+       fAttributesMenu = new BMenu("Attributes");
 
        fMenuBar->AddItem(fFileMenu);
        fMenuBar->AddItem(fAudioMenu);
        fMenuBar->AddItem(fVideoMenu);
-       fMenuBar->AddItem(fSettingsMenu);
+       fMenuBar->AddItem(fAttributesMenu);
 
        BMenuItem* item = new BMenuItem("New player"B_UTF8_ELLIPSIS,
                new BMessage(M_NEW_PLAYER), 'N');
        fFileMenu->AddItem(item);
        item->SetTarget(be_app);
-       fFileMenu->AddSeparatorItem();
 
 #if 0
        // Plain "Open File" entry
@@ -1380,6 +1379,8 @@
        fFileMenu->AddItem(item);
 #endif
 
+       fFileMenu->AddSeparatorItem();
+
        fFileMenu->AddItem(new BMenuItem("File info"B_UTF8_ELLIPSIS,
                new BMessage(M_FILE_INFO), 'I'));
        fFileMenu->AddItem(fPlaylistMenu);
@@ -1387,11 +1388,27 @@
        fPlaylistMenu->Superitem()->SetMessage(new BMessage(M_FILE_PLAYLIST));
 
        fFileMenu->AddSeparatorItem();
+
+       fNoInterfaceMenuItem = new BMenuItem("No interface",
+               new BMessage(M_TOGGLE_NO_INTERFACE), 'B');
+       fFileMenu->AddItem(fNoInterfaceMenuItem);
+       fFileMenu->AddItem(new BMenuItem("Always on top",
+               new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'A'));
+
+       item = new BMenuItem("Settings"B_UTF8_ELLIPSIS,
+               new BMessage(M_SETTINGS), 'S');
+       fFileMenu->AddItem(item);
+       item->SetTarget(be_app);
+
+       fFileMenu->AddSeparatorItem();
+
        item = new BMenuItem("About " NAME B_UTF8_ELLIPSIS,
                new BMessage(B_ABOUT_REQUESTED));
        fFileMenu->AddItem(item);
        item->SetTarget(be_app);
+
        fFileMenu->AddSeparatorItem();
+
        fFileMenu->AddItem(new BMenuItem("Close", new BMessage(M_FILE_CLOSE), 
'W'));
        fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 
'Q'));
 
@@ -1431,16 +1448,9 @@
        _SetupVideoAspectItems(fVideoAspectMenu);
        fVideoMenu->AddItem(fVideoAspectMenu);
 
-       fNoInterfaceMenuItem = new BMenuItem("No interface",
-               new BMessage(M_TOGGLE_NO_INTERFACE), 'B');
-       fSettingsMenu->AddItem(fNoInterfaceMenuItem);
-       fSettingsMenu->AddItem(new BMenuItem("Always on top",
-               new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'A'));
-       fSettingsMenu->AddSeparatorItem();
-       item = new BMenuItem("Settings"B_UTF8_ELLIPSIS,
-               new BMessage(M_SETTINGS), 'S');
-       fSettingsMenu->AddItem(item);
-       item->SetTarget(be_app);
+       item = new BMenuItem("<- This space for rent ->", NULL);
+       item->SetEnabled(false);
+       fAttributesMenu->AddItem(item);
 }
 
 
@@ -1883,8 +1893,6 @@
        item->SetEnabled(fHasVideo);
 
        menu->AddSeparatorItem();
-
-       menu->AddSeparatorItem();
        menu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q'));
 
        menu->SetTargetForItems(this);
@@ -2083,7 +2091,7 @@
 
        fVideoView->SetFullscreen(fIsFullscreen);
 
-       _MarkItem(fSettingsMenu, M_TOGGLE_FULLSCREEN, fIsFullscreen);
+       _MarkItem(fFileMenu, M_TOGGLE_FULLSCREEN, fIsFullscreen);
 
        printf("_ToggleFullscreen leave\n");
 }
@@ -2094,7 +2102,7 @@
        fAlwaysOnTop = !fAlwaysOnTop;
        SetFeel(fAlwaysOnTop ? B_FLOATING_ALL_WINDOW_FEEL : 
B_NORMAL_WINDOW_FEEL);
 
-       _MarkItem(fSettingsMenu, M_TOGGLE_ALWAYS_ON_TOP, fAlwaysOnTop);
+       _MarkItem(fFileMenu, M_TOGGLE_ALWAYS_ON_TOP, fAlwaysOnTop);
 }
 
 
@@ -2124,7 +2132,7 @@
                SetLook(B_TITLED_WINDOW_LOOK);
        }
 
-       _MarkItem(fSettingsMenu, M_TOGGLE_NO_INTERFACE, fNoInterface);
+       _MarkItem(fFileMenu, M_TOGGLE_NO_INTERFACE, fNoInterface);
 
        printf("_ToggleNoInterface leave\n");
 }

Modified: haiku/trunk/src/apps/mediaplayer/MainWin.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.h  2010-09-10 10:07:13 UTC (rev 
38596)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.h  2010-09-10 10:37:38 UTC (rev 
38597)
@@ -146,7 +146,7 @@
                        BMenu*                          fVideoAspectMenu;
                        BMenu*                          fAudioTrackMenu;
                        BMenu*                          fVideoTrackMenu;
-                       BMenu*                          fSettingsMenu;
+                       BMenu*                          fAttributesMenu;
                        BMenuItem*                      fNoInterfaceMenuItem;
                        BMenu*                          fPlaylistMenu;
[haiku-commits] r38597 - haiku/trunk/src/apps/mediaplayer

Other related posts:
