X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.cpp;h=39d84a47213695dcb66fd051695ef3b33f09162f;hb=ec6ed81c26a20b84a0592d58176f9e778cbc3933;hp=d8254b76c85768454983bc6262e9cca61dcbc91c;hpb=c6adecf5346037600a5f332f2c14d56b43abb354;p=vlc

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index d8254b76c8..39d84a4721 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -278,7 +278,7 @@ void QVLCMenu::createMenuBar( MainInterface *mi,
              qtr( "&Tools" ) );
     BAR_DADD( AudioMenu( p_intf, NULL ), qtr( "&Audio" ), 1 );
     BAR_DADD( VideoMenu( p_intf, NULL ), qtr( "&Video" ), 2 );
-    BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "&Playback" ), 3 );
+    BAR_DADD( NavigMenu( p_intf, NULL ), qtr( "P&layback" ), 3 );
     BAR_ADD( HelpMenu( NULL ), qtr( "&Help" ) );
 }
 #undef BAR_ADD
@@ -293,27 +293,27 @@ QMenu *QVLCMenu::FileMenu()
     QMenu *menu = new QMenu();
 
     addDPStaticEntry( menu, qtr( "&Open File..." ), "",
-        ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ), "Ctrl+O" );
+        ":/file-asym", SLOT( openFileDialog() ), "Ctrl+O" );
     addDPStaticEntry( menu, qtr( I_OPEN_FOLDER ), "",
-        ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ), "Ctrl+F" );
+        ":/folder-grey", SLOT( PLAppendDir() ), "Ctrl+F" );
     addDPStaticEntry( menu, qtr( "Open &Disc..." ), "",
-        ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ), "Ctrl+D" );
+        ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
     addDPStaticEntry( menu, qtr( "Open &Network..." ), "",
-        ":/pixmaps/network_16px.png", SLOT( openNetDialog() ), "Ctrl+N" );
+        ":/network", SLOT( openNetDialog() ), "Ctrl+N" );
     addDPStaticEntry( menu, qtr( "Open &Capture Device..." ), "",
-        ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ),
+        ":/capture-card", SLOT( openCaptureDialog() ),
         "Ctrl+C" );
     menu->addSeparator();
 
     addDPStaticEntry( menu, qtr( "&Streaming..." ), "",
-        ":/pixmaps/menus_stream_16px.png", SLOT( openThenStreamingDialogs() ),
+        ":/stream", SLOT( openThenStreamingDialogs() ),
         "Ctrl+S" );
     addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "", "",
         SLOT( openThenTranscodingDialogs() ), "Ctrl+R" );
     menu->addSeparator();
 
     addDPStaticEntry( menu, qtr( "&Quit" ) , "",
-        ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "Ctrl+Q" );
+        ":/quit", SLOT( quit() ), "Ctrl+Q" );
     return menu;
 }
 
@@ -322,8 +322,8 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
 {
     QMenu *menu = new QMenu();
     menu->addMenu( SDMenu( p_intf ) );
-    menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
-                     qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
+    menu->addAction( QIcon( ":/playlist_menu" ),
+                     qtr( "Show P&laylist" ), mi, SLOT( togglePlaylist() ) );
     menu->addSeparator();
 
     addDPStaticEntry( menu, qtr( I_PL_LOAD ), "", "", SLOT( openAPlaylist() ),
@@ -352,14 +352,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
     if( mi )
     {
         QAction *act=
-            menu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
-                             qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ),
-                             qtr( "Ctrl+L" ) );
+            menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ),
+                    mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
         act->setData( "_static_" );
     }
-    addDPStaticEntry( menu, qtr( I_MENU_EXT ), "",
-        ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ),
-        "Ctrl+E" );
+    addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", ":/settings",
+            SLOT( extendedDialog() ), "Ctrl+E" );
 
     menu->addSeparator();
 
@@ -374,7 +372,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
     if( mi )
     {
         /* Minimal View */
-        QAction *action = menu->addAction( qtr( "Minimal View..." ), mi,
+        QAction *action = menu->addAction( qtr( "Mi&nimal View..." ), mi,
                                 SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
         action->setCheckable( true );
         action->setData( "_static_" );
@@ -383,13 +381,13 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
         minimalViewAction = action; /* HACK for minimalView */
 
         /* FullScreen View */
-        action = menu->addAction( qtr( "Fullscreen Interface" ), mi,
+        action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
                                   SLOT( toggleFullScreen() ), QString( "F11" ) );
         action->setCheckable( true );
         action->setData( "_static_" );
 
         /* Advanced Controls */
-        action = menu->addAction( qtr( "Advanced Controls" ), mi,
+        action = menu->addAction( qtr( "&Advanced Controls" ), mi,
                                   SLOT( toggleAdvanced() ) );
         action->setCheckable( true );
         action->setData( "_static_" );
@@ -406,12 +404,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
     menu->addSeparator();
 
     addDPStaticEntry( menu, qtr( I_MENU_MSG ), "",
-        ":/pixmaps/menus_messages_16px.png", SLOT( messagesDialog() ),
+        ":/messages", SLOT( messagesDialog() ),
         "Ctrl+M" );
-    addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "",
+    addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", ":/info",
         SLOT( mediaInfoDialog() ), "Ctrl+I" );
     addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
-        ":/pixmaps/menus_info_16px.png", SLOT( mediaCodecDialog() ), "Ctrl+J" );
+        ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
     addDPStaticEntry( menu, qtr( I_MENU_BOOKMARK ), "","",
                       SLOT( bookmarksDialog() ), "Ctrl+B" );
 #ifdef ENABLE_VLM
@@ -420,8 +418,8 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
 #endif
 
     menu->addSeparator();
-    addDPStaticEntry( menu, qtr( "Preferences..." ), "",
-        ":/pixmaps/menus_preferences_16px.png", SLOT( prefsDialog() ), "Ctrl+P" );
+    addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
+        ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
     return menu;
 }
 
@@ -502,14 +500,14 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
                           SLOT( loadSubtitlesFile() ) );
         submenu->addSeparator();
 
-        ACT_ADD( current, "fullscreen", qtr( "Toggle &Fullscreen" ) );
+        ACT_ADD( current, "fullscreen", qtr( "&Fullscreen" ) );
         ACT_ADD( current, "zoom", qtr( "&Zoom" ) );
         ACT_ADD( current, "deinterlace", qtr( "&Deinterlace" ) );
         ACT_ADD( current, "aspect-ratio", qtr( "&Aspect Ratio" ) );
         ACT_ADD( current, "crop", qtr( "&Crop" ) );
         ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) );
         /* ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); */
-        ACT_ADD( current, "video-snapshot", qtr( "Snapshot" ) );
+        ACT_ADD( current, "video-snapshot", qtr( "Sna&pshot" ) );
         /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
     }
 
@@ -548,7 +546,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
         menu->addSeparator();
 
         ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) );
-        ACT_ADD( menu, "title", qtr( "&Title" ) );
+        ACT_ADD( menu, "title", qtr( "T&itle" ) );
         ACT_ADD( menu, "chapter", qtr( "&Chapter" ) );
         ACT_ADD( menu, "program", qtr( "&Program" ) );
         ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
@@ -613,15 +611,15 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
 QMenu *QVLCMenu::HelpMenu( QMenu *current )
 {
     QMenu *menu = new QMenu( current );
-    addDPStaticEntry( menu, qtr( "Help..." ) , "",
-        ":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
+    addDPStaticEntry( menu, qtr( "&Help..." ) , "",
+        ":/help", SLOT( helpDialog() ), "F1" );
 #ifdef UPDATE_CHECK
-    addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "",
+    addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", "",
                       SLOT( updateDialog() ), "");
 #endif
     menu->addSeparator();
-    addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", "", SLOT( aboutDialog() ),
-        "Ctrl+F1" );
+    addDPStaticEntry( menu, qtr( I_MENU_ABOUT ), "", ":/info",
+            SLOT( aboutDialog() ), "Ctrl+F1" );
     return menu;
 }
 
@@ -651,24 +649,24 @@ void QVLCMenu::PopupMenuControlEntries( QMenu *menu,
         var_Get( p_input, "state", &val );
         if( val.i_int == PLAYING_S )
             addMIMStaticEntry( p_intf, menu, qtr( "Pause" ), "",
-                    ":/pixmaps/pause_16px.png", SLOT( togglePlayPause() ) );
+                    ":/pause", SLOT( togglePlayPause() ) );
         else
             addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
-                    ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+                    ":/play", SLOT( togglePlayPause() ) );
     }
     else if( THEPL->items.i_size )
         addMIMStaticEntry( p_intf, menu, qtr( "Play" ), "",
-                ":/pixmaps/play_16px.png", SLOT( togglePlayPause() ) );
+                ":/play", SLOT( togglePlayPause() ) );
     else
         addDPStaticEntry( menu, qtr( "Play" ), "",
-                ":/pixmaps/play_16px.png", SLOT( openDialog() ) );
+                ":/play", SLOT( openDialog() ) );
 
     addMIMStaticEntry( p_intf, menu, qtr( "Stop" ), "",
-            ":/pixmaps/stop_16px.png", SLOT( stop() ) );
+            ":/stop", SLOT( stop() ) );
     addMIMStaticEntry( p_intf, menu, qtr( "Previous" ), "",
-            ":/pixmaps/previous_16px.png", SLOT( prev() ) );
+            ":/previous", SLOT( prev() ) );
     addMIMStaticEntry( p_intf, menu, qtr( "Next" ), "",
-            ":/pixmaps/next_16px.png", SLOT( next() ) );
+            ":/next", SLOT( next() ) );
 }
 
 void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
@@ -681,15 +679,15 @@ void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
 
     QMenu *openmenu = new QMenu( qtr( "Open" ), menu );
     addDPStaticEntry( openmenu, qtr( "&Open File..." ), "",
-        ":/pixmaps/file-asym_16px.png", SLOT( openFileDialog() ) );
+        ":/file-asym", SLOT( openFileDialog() ) );
     addDPStaticEntry( openmenu, qtr( I_OPEN_FOLDER ), "",
-        ":/pixmaps/folder-grey_16px.png", SLOT( PLAppendDir() ) );
+        ":/folder-grey", SLOT( PLAppendDir() ) );
     addDPStaticEntry( openmenu, qtr( "Open &Disc..." ), "",
-        ":/pixmaps/disc_16px.png", SLOT( openDiscDialog() ) );
+        ":/disc", SLOT( openDiscDialog() ) );
     addDPStaticEntry( openmenu, qtr( "Open &Network..." ), "",
-        ":/pixmaps/network_16px.png", SLOT( openNetDialog() ) );
+        ":/network", SLOT( openNetDialog() ) );
     addDPStaticEntry( openmenu, qtr( "Open &Capture Device..." ), "",
-        ":/pixmaps/capture-card_16px.png", SLOT( openCaptureDialog() ) );
+        ":/capture-card", SLOT( openCaptureDialog() ) );
     menu->addMenu( openmenu );
 
     menu->addSeparator();
@@ -699,7 +697,7 @@ void QVLCMenu::PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu )
     menu->addMenu( helpmenu );
 #endif
 
-    addDPStaticEntry( menu, qtr( "Quit" ), "", ":/pixmaps/menus_quit_16px.png",
+    addDPStaticEntry( menu, qtr( "Quit" ), "", ":/quit",
                       SLOT( quit() ), "Ctrl+Q" );
 }
 
@@ -839,10 +837,10 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
         if( !b_isFullscreen )
         {
             submenu = new QMenu( qtr( "Interface" ), menu );
-            submenu->addAction( QIcon( ":/pixmaps/playlist_16px.png" ),
+            submenu->addAction( QIcon( ":/playlist" ),
                      qtr( "Show Playlist" ), mi, SLOT( togglePlaylist() ) );
             addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
-                ":/pixmaps/menus_settings_16px.png", SLOT( extendedDialog() ) );
+                ":/settings", SLOT( extendedDialog() ) );
             action = submenu->addAction( QIcon( "" ),
                  qtr( "Minimal View..." ), mi, SLOT( toggleMinimalView() ) );
             action->setCheckable( true );
@@ -904,9 +902,9 @@ void QVLCMenu::updateSystrayMenu( MainInterface *mi,
 
     sysMenu->addSeparator();
     addDPStaticEntry( sysMenu, qtr( "&Open Media" ), "",
-            ":/pixmaps/file-wide_16px.png", SLOT( openFileDialog() ), "" );
+            ":/file-wide", SLOT( openFileDialog() ), "" );
     addDPStaticEntry( sysMenu, qtr( "&Quit" ) , "",
-            ":/pixmaps/menus_quit_16px.png", SLOT( quit() ), "" );
+            ":/quit", SLOT( quit() ), "" );
 
     /* Set the menu */
     mi->getSysTray()->setContextMenu( sysMenu );