[vlc-devel] commit: Fix Tooltips and accelerators, since we need to update po. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Tue Jul 29 20:24:57 CEST 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jul 29 11:26:52 2008 -0700| [80bed63ec08fa7759871ebb4c79ad3af522dba29]

Fix Tooltips and accelerators, since we need to update po.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=80bed63ec08fa7759871ebb4c79ad3af522dba29
---

 include/vlc_intf_strings.h         |   18 +++++++++---------
 modules/gui/qt4/main_interface.cpp |    3 +++
 modules/gui/qt4/menus.cpp          |   26 ++++++++++++--------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 01e7c3a..cb24a2f 100644
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -34,15 +34,15 @@
 
 /******************* Menus *****************/
 
-#define I_MENU_INFO  N_("Media Information...")
-#define I_MENU_CODECINFO  N_("Codec Information...")
-#define I_MENU_MSG   N_("Messages...")
-#define I_MENU_EXT   N_("Extended Settings...")
-#define I_MENU_GOTOTIME N_("Go to Specific Time...")
-#define I_MENU_BOOKMARK N_("Bookmarks...")
-#define I_MENU_VLM N_("VLM Configuration...")
-
-#define I_MENU_ABOUT N_("About...")
+#define I_MENU_INFO  N_("Media &Information...")
+#define I_MENU_CODECINFO  N_("&Codec Information...")
+#define I_MENU_MSG   N_("&Messages...")
+#define I_MENU_EXT   N_("&Extended Settings...")
+#define I_MENU_GOTOTIME N_("Go to Specific &Time...")
+#define I_MENU_BOOKMARK N_("&Bookmarks...")
+#define I_MENU_VLM N_("&VLM Configuration...")
+
+#define I_MENU_ABOUT N_("&About...")
 
 /* Playlist popup */
 #define I_POP_PLAY N_("Play")
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 1a23842..2c488db 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -293,10 +293,13 @@ inline void MainInterface::createStatusBar()
     timeLabel = new TimeLabel;
     timeLabel->setText( " --:--/--:-- " );
     timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    timeLabel->setToolTip( qtr( "Toggle between elapsed and remaining time" ) );
     nameLabel = new QLabel;
     nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
                                       | Qt::TextSelectableByKeyboard );
     speedLabel = new SpeedLabel( p_intf, "1.00x" );
+    speedLabel->setToolTip(
+            qtr( "Current playback speed.\nRight click to adjust" ) );
     speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
 
     /* Styling those labels */
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 5908752..22d60fa 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -352,14 +352,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
     if( mi )
     {
         QAction *act=
-            menu->addAction( QIcon( ":/playlist_menu" ),
-                             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 ), "",
-        ":/settings", 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_" );
@@ -420,7 +418,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
 #endif
 
     menu->addSeparator();
-    addDPStaticEntry( menu, qtr( "Preferences..." ), "",
+    addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
         ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
     return menu;
 }
@@ -509,7 +507,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
         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( "Snapsh&ot" ) );
         /* 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,10 +611,10 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
 QMenu *QVLCMenu::HelpMenu( QMenu *current )
 {
     QMenu *menu = new QMenu( current );
-    addDPStaticEntry( menu, qtr( "Help..." ) , "",
+    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();




More information about the vlc-devel mailing list