X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=384bef8deb3acb65cca814a68c4b7c2021f82413;hb=3500cf1011e97ae7c60b63b4147cbcb69bde5d47;hp=021088d2831ca74d0284ca7d4cff5d8fd1781302;hpb=0a930100a2cc42330b052ba3b990d6ba46caed20;p=vlc

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 021088d283..384bef8deb 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -164,19 +164,15 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object,
  * Main Menu Bar Creation
  **/
 void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
-        bool playlist,
         bool visual_selector_enabled )
 {
     QMenuBar *bar = mi->menuBar();
     BAR_ADD( FileMenu(), qtr( "&Media" ) );
-    if( playlist )
-    {
-        BAR_ADD( PlaylistMenu( mi,p_intf ), qtr( "&Playlist" ) );
-    }
+    BAR_ADD( PlaylistMenu( p_intf, mi ), qtr( "&Playlist" ) );
     BAR_ADD( ToolsMenu( p_intf, mi, visual_selector_enabled, true ), qtr( "&Tools" ) );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 2 );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 1 );
-    BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Navigation" ), 3 );
+    BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
 
     BAR_ADD( HelpMenu(), qtr( "&Help" ) );
 }
@@ -189,36 +185,35 @@ QMenu *QVLCMenu::FileMenu()
 {
     QMenu *menu = new QMenu();
 
-    DP_SADD( menu, qtr( "Open &File..." ), "",
-            ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" );
+    DP_SADD( menu, qtr( "&Open File..." ), "",
+            ":/pixmaps/file-asym_16px.png", openFileDialog(), "Ctrl+O" );
     DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
-            ":/pixmaps/vlc_folder-grey_16px.png", openDirDialog(), "Ctrl+F" );
-    DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png",
+            ":/pixmaps/folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
+    DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/disc_16px.png",
              openDiscDialog(), "Ctrl+D" );
     DP_SADD( menu, qtr( "Open &Network..." ), "",
-                ":/pixmaps/vlc_network_16px.png", openNetDialog(), "Ctrl+N" );
+                ":/pixmaps/network_16px.png", openNetDialog(), "Ctrl+N" );
     DP_SADD( menu, qtr( "Open &Capture Device..." ), "",
-            ":/pixmaps/vlc_capture-card_16px.png", openCaptureDialog(),
+            ":/pixmaps/capture-card_16px.png", openCaptureDialog(),
             "Ctrl+C" );
     menu->addSeparator();
 
-    DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/vlc_stream_16px.png",
+    DP_SADD( menu, qtr( "&Streaming..." ), "", ":/pixmaps/menus_stream_16px.png",
             openThenStreamingDialogs(), "Ctrl+S" );
     DP_SADD( menu, qtr( "Conve&rt / Save..." ), "", "",
             openThenTranscodingDialogs(), "Ctrl+R" );
 
     menu->addSeparator();
-    DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/vlc_quit_16px.png", quit(),
+    DP_SADD( menu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png", quit(),
             "Ctrl+Q" );
     return menu;
 }
 
-/* Playlist Menu, undocked when playlist is undocked */
-QMenu *QVLCMenu::PlaylistMenu( MainInterface *mi, intf_thread_t *p_intf )
+QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
 {
     QMenu *menu = new QMenu();
     menu->addMenu( SDMenu( p_intf ) );
-    menu->addAction ( QIcon( ":/pixmaps/vlc_playlist_16px.png" ),
+    menu->addAction ( QIcon( ":/pixmaps/playlist_16px.png" ),
                       qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
     menu->addSeparator();
 
@@ -239,58 +234,65 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
         bool visual_selector_enabled,
         bool with_intf )
 {
-    QMenu *menu = new QMenu();
+    QMenu *menu = new QMenu;
+    if( mi )
+    {
+        menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+                         qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
+                         qtr( "Ctrl+L" ) );
+    }
+    DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/menus_settings_16px.png",
+                 extendedDialog() ,  "Ctrl+E" );
+
+    menu->addSeparator();
+
     if( with_intf )
     {
         QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
-        intfmenu->setTitle( qtr( "Interfaces" ) );
+        intfmenu->setTitle( qtr( "Add Interfaces" ) );
         menu->addMenu( intfmenu );
         menu->addSeparator();
     }
-
-    DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/vlc_messages_16px.png",
-             messagesDialog(), "Ctrl+M" );
-    DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" );
-    DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/vlc_info_16px.png",
-             mediaCodecDialog(), "Ctrl+J" );
-    DP_SADD( menu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(), "Ctrl+T" );
-
-#if 0 /* Not Implemented yet */
-    DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" );
-    DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" );
-#endif
-
-    menu->addSeparator();
     if( mi )
     {
         /* Minimal View */
-        QAction *action=menu->addAction( qtr( "Minimal View..." ), mi, SLOT( toggleMenus() ),
-                qtr( "Ctrl+H" ) );
+        QAction *action=menu->addAction( qtr( "Minimal View..." ), mi,
+                SLOT( toggleMenus() ), qtr( "Ctrl+H" ) );
         action->setCheckable( true );
-        if( mi->getControlsVisibilityStatus() & 0x2 ) action->setChecked( true );
+        if( mi->getControlsVisibilityStatus() & CONTROLS_VISIBLE ) 
+            action->setChecked( true );
 
         /* Advanced Controls */
-        action = menu->addAction( qtr( "Advanced controls" ), mi, SLOT( toggleAdvanced() ) );
+        action = menu->addAction( qtr( "Advanced controls" ), mi,
+                SLOT( toggleAdvanced() ) );
         action->setCheckable( true );
-        if( mi->getControlsVisibilityStatus() & 0x1 ) action->setChecked( true );
-        menu->addSeparator();
-
-#if 0 /* For Visualisations. Not yet working */
+        if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
+            action->setChecked( true );
+     #if 0 /* For Visualisations. Not yet working */
         adv = menu->addAction( qtr( "Visualizations selector" ),
                 mi, SLOT( visual() ) );
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
 #endif
-        menu->addAction ( QIcon( ":/pixmaps/vlc_playlist_16px.png" ),
-                          qtr( "Playlist" ), mi, SLOT( togglePlaylist() ),
-                          qtr( "Ctrl+L" ) );
     }
 
-    DP_SADD( menu, qtr( I_MENU_EXT ), "", ":/pixmaps/vlc_settings_16px.png",
-                 extendedDialog() ,  "Ctrl+E" );
+    menu->addSeparator();
+
+
+    DP_SADD( menu, qtr( I_MENU_MSG ), "", ":/pixmaps/menus_messages_16px.png",
+             messagesDialog(), "Ctrl+M" );
+    DP_SADD( menu, qtr( I_MENU_INFO ) , "", "", mediaInfoDialog(), "Ctrl+I" );
+    DP_SADD( menu, qtr( I_MENU_CODECINFO ) , "", ":/pixmaps/menus_info_16px.png",
+             mediaCodecDialog(), "Ctrl+J" );
+
+#if 0 /* Not Implemented yet */
+    DP_SADD( menu, qtr( I_MENU_BOOKMARK ), "","", bookmarksDialog(), "Ctrl+B" );
+#endif
+    DP_SADD( menu, qtr( I_MENU_VLM ), "","", vlmDialog(), "Ctrl+V" );
+
 
     menu->addSeparator();
-    DP_SADD( menu, qtr( "Preferences" ), "", ":/pixmaps/vlc_preferences_16px.png",
+       DP_SADD( menu, qtr( "Preferences..." ), "", ":/pixmaps/menus_preferences_16px.png",
              prefsDialog(), "Ctrl+P" );
     return menu;
 }
@@ -379,7 +381,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
  * Navigation Menu
  * For DVD, MP4, MOV and other chapter based format
  **/
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *navMenu )
 {
     vlc_object_t *p_object;
     vector<int> objects;
@@ -395,7 +397,11 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *current )
         PUSH_VAR( "prev-chapter" ); PUSH_VAR( "next-chapter" );
         vlc_object_release( p_object );
     }
-    return Populate( p_intf, current, varnames, objects );
+    navMenu = new QMenu();
+    DP_SADD( navMenu, qtr( I_MENU_GOTOTIME ), "","", gotoTimeDialog(),
+            "Ctrl+T" );
+    navMenu->addSeparator();
+    return Populate( p_intf, navMenu, varnames, objects, true );
 }
 
 /**
@@ -452,7 +458,7 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
 QMenu *QVLCMenu::HelpMenu()
 {
     QMenu *menu = new QMenu();
-    DP_SADD( menu, qtr( "Help" ) , "", ":/pixmaps/vlc_help_16px.png",
+    DP_SADD( menu, qtr( "Help..." ) , "", ":/pixmaps/menus_help_16px.png",
              helpDialog(), "F1" );
     menu->addSeparator();
     DP_SADD( menu, qtr( I_MENU_ABOUT ), "", "", aboutDialog(), "Ctrl+F1" );
@@ -470,7 +476,6 @@ QMenu *QVLCMenu::HelpMenu()
     input_thread_t *p_input = THEMIM->getInput();
 
 #define CREATE_POPUP \
-    QMenu *menu = new QMenu(); \
     Populate( p_intf, menu, varnames, objects ); \
     p_intf->p_sys->p_popup_menu = menu; \
     menu->popup( QCursor::pos() ); \
@@ -483,27 +488,23 @@ QMenu *QVLCMenu::HelpMenu()
         vlc_value_t val; \
         var_Get( p_input, "state", &val ); \
         if( val.i_int == PLAYING_S ) \
-            MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/vlc_pause_16px.png", \
+            MIM_SADD( menu, qtr( "Pause" ), "", ":/pixmaps/pause_16px.png", \
                     togglePlayPause() ) \
         else \
-            MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/vlc_play_16px.png", \
+            MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
                     togglePlayPause() ) \
     } \
     else if( THEPL->items.i_size && THEPL->i_enabled ) \
-        MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/vlc_play_16px.png", \
+        MIM_SADD( menu, qtr( "Play" ), "", ":/pixmaps/play_16px.png", \
                 togglePlayPause() ); \
     \
-    MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/vlc_stop_16px.png", stop() ); \
-    MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/vlc_previous_16px.png", \
+    MIM_SADD( menu, qtr( "Stop" ), "", ":/pixmaps/stop_16px.png", stop() ); \
+    MIM_SADD( menu, qtr( "Previous" ), "", ":/pixmaps/previous_16px.png", \
             prev() ); \
-    MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/vlc_next_16px.png", next() );
+    MIM_SADD( menu, qtr( "Next" ), "", ":/pixmaps/next_16px.png", next() );
 
 #define POPUP_STATIC_ENTRIES( menu ) \
-    QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \
-    intfmenu->setTitle( qtr( "Interfaces" ) ); \
-    menu->addMenu( intfmenu ); \
-    \
-    QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, false ); \
+    QMenu *toolsmenu = ToolsMenu( p_intf, NULL, false, true ); \
     toolsmenu->setTitle( qtr( "Tools" ) ); \
     menu->addMenu( toolsmenu ); \
     \
@@ -542,6 +543,7 @@ void QVLCMenu::VideoPopupMenu( intf_thread_t *p_intf )
         }
         vlc_object_release( p_input );
     }
+    QMenu *menu = new QMenu();
     CREATE_POPUP;
 }
 
@@ -563,6 +565,7 @@ void QVLCMenu::AudioPopupMenu( intf_thread_t *p_intf )
         }
         vlc_object_release( p_input );
     }
+    QMenu *menu = new QMenu();
     CREATE_POPUP;
 }
 
@@ -687,8 +690,8 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
 
     sysMenu->addSeparator();
     DP_SADD( sysMenu, qtr( "&Open Media" ), "",
-            ":/pixmaps/vlc_file-wide_16px.png", openFileDialog(), "" );
-    DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/vlc_quit_16px.png",
+            ":/pixmaps/file-wide_16px.png", openFileDialog(), "" );
+    DP_SADD( sysMenu, qtr( "&Quit" ) , "", ":/pixmaps/menus_quit_16px.png",
              quit(), "" );
 
     /* Set the menu */