Commit 80bed63e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent ef1dfd89
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
/******************* Menus *****************/ /******************* Menus *****************/
#define I_MENU_INFO N_("Media Information...") #define I_MENU_INFO N_("Media &Information...")
#define I_MENU_CODECINFO N_("Codec Information...") #define I_MENU_CODECINFO N_("&Codec Information...")
#define I_MENU_MSG N_("Messages...") #define I_MENU_MSG N_("&Messages...")
#define I_MENU_EXT N_("Extended Settings...") #define I_MENU_EXT N_("&Extended Settings...")
#define I_MENU_GOTOTIME N_("Go to Specific Time...") #define I_MENU_GOTOTIME N_("Go to Specific &Time...")
#define I_MENU_BOOKMARK N_("Bookmarks...") #define I_MENU_BOOKMARK N_("&Bookmarks...")
#define I_MENU_VLM N_("VLM Configuration...") #define I_MENU_VLM N_("&VLM Configuration...")
#define I_MENU_ABOUT N_("About...") #define I_MENU_ABOUT N_("&About...")
/* Playlist popup */ /* Playlist popup */
#define I_POP_PLAY N_("Play") #define I_POP_PLAY N_("Play")
......
...@@ -293,10 +293,13 @@ inline void MainInterface::createStatusBar() ...@@ -293,10 +293,13 @@ inline void MainInterface::createStatusBar()
timeLabel = new TimeLabel; timeLabel = new TimeLabel;
timeLabel->setText( " --:--/--:-- " ); timeLabel->setText( " --:--/--:-- " );
timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
timeLabel->setToolTip( qtr( "Toggle between elapsed and remaining time" ) );
nameLabel = new QLabel; nameLabel = new QLabel;
nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
| Qt::TextSelectableByKeyboard ); | Qt::TextSelectableByKeyboard );
speedLabel = new SpeedLabel( p_intf, "1.00x" ); speedLabel = new SpeedLabel( p_intf, "1.00x" );
speedLabel->setToolTip(
qtr( "Current playback speed.\nRight click to adjust" ) );
speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu ); speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
/* Styling those labels */ /* Styling those labels */
......
...@@ -352,14 +352,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -352,14 +352,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
if( mi ) if( mi )
{ {
QAction *act= QAction *act=
menu->addAction( QIcon( ":/playlist_menu" ), menu->addAction( QIcon( ":/playlist_menu" ), qtr( "Play&list..." ),
qtr( "Playlist..." ), mi, SLOT( togglePlaylist() ), mi, SLOT( togglePlaylist() ), qtr( "Ctrl+L" ) );
qtr( "Ctrl+L" ) );
act->setData( "_static_" ); act->setData( "_static_" );
} }
addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", addDPStaticEntry( menu, qtr( I_MENU_EXT ), "", ":/settings",
":/settings", SLOT( extendedDialog() ), SLOT( extendedDialog() ), "Ctrl+E" );
"Ctrl+E" );
menu->addSeparator(); menu->addSeparator();
...@@ -374,7 +372,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -374,7 +372,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
if( mi ) if( mi )
{ {
/* Minimal View */ /* Minimal View */
QAction *action = menu->addAction( qtr( "Minimal View..." ), mi, QAction *action = menu->addAction( qtr( "Mi&nimal View..." ), mi,
SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) ); SLOT( toggleMinimalView() ), qtr( "Ctrl+H" ) );
action->setCheckable( true ); action->setCheckable( true );
action->setData( "_static_" ); action->setData( "_static_" );
...@@ -383,13 +381,13 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -383,13 +381,13 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
minimalViewAction = action; /* HACK for minimalView */ minimalViewAction = action; /* HACK for minimalView */
/* FullScreen View */ /* FullScreen View */
action = menu->addAction( qtr( "Fullscreen Interface" ), mi, action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
SLOT( toggleFullScreen() ), QString( "F11" ) ); SLOT( toggleFullScreen() ), QString( "F11" ) );
action->setCheckable( true ); action->setCheckable( true );
action->setData( "_static_" ); action->setData( "_static_" );
/* Advanced Controls */ /* Advanced Controls */
action = menu->addAction( qtr( "Advanced Controls" ), mi, action = menu->addAction( qtr( "&Advanced Controls" ), mi,
SLOT( toggleAdvanced() ) ); SLOT( toggleAdvanced() ) );
action->setCheckable( true ); action->setCheckable( true );
action->setData( "_static_" ); action->setData( "_static_" );
...@@ -420,7 +418,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, ...@@ -420,7 +418,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
#endif #endif
menu->addSeparator(); menu->addSeparator();
addDPStaticEntry( menu, qtr( "Preferences..." ), "", addDPStaticEntry( menu, qtr( "&Preferences..." ), "",
":/preferences", SLOT( prefsDialog() ), "Ctrl+P" ); ":/preferences", SLOT( prefsDialog() ), "Ctrl+P" );
return menu; return menu;
} }
...@@ -509,7 +507,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current ) ...@@ -509,7 +507,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
ACT_ADD( current, "crop", qtr( "&Crop" ) ); ACT_ADD( current, "crop", qtr( "&Crop" ) );
ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) ); ACT_ADD( current, "video-on-top", qtr( "Always &On Top" ) );
/* ACT_ADD( current, "directx-wallpaper", qtr( "DirectX Wallpaper" ) ); */ /* 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" ) ); */ /* ACT_ADD( current, "ffmpeg-pp-q", qtr( "Decoder" ) ); */
} }
...@@ -548,7 +546,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) ...@@ -548,7 +546,7 @@ QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QMenu *menu )
menu->addSeparator(); menu->addSeparator();
ACT_ADD( menu, "bookmark", qtr( "&Bookmarks" ) ); 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, "chapter", qtr( "&Chapter" ) );
ACT_ADD( menu, "program", qtr( "&Program" ) ); ACT_ADD( menu, "program", qtr( "&Program" ) );
ACT_ADD( menu, "navigation", qtr( "&Navigation" ) ); ACT_ADD( menu, "navigation", qtr( "&Navigation" ) );
...@@ -613,10 +611,10 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf ) ...@@ -613,10 +611,10 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
QMenu *QVLCMenu::HelpMenu( QMenu *current ) QMenu *QVLCMenu::HelpMenu( QMenu *current )
{ {
QMenu *menu = new QMenu( current ); QMenu *menu = new QMenu( current );
addDPStaticEntry( menu, qtr( "Help..." ) , "", addDPStaticEntry( menu, qtr( "&Help..." ) , "",
":/help", SLOT( helpDialog() ), "F1" ); ":/help", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK #ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "", addDPStaticEntry( menu, qtr( "Check for &Updates..." ) , "", "",
SLOT( updateDialog() ), ""); SLOT( updateDialog() ), "");
#endif #endif
menu->addSeparator(); menu->addSeparator();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment