properly display translated strings in setWindowTitle in qt4 interface

diff --git a/modules/gui/qt4/dialogs/errors.cpp b/modules/gui/qt4/dialogs/errors.cpp
index 6b57bbbb1db355fcd19ca9608c87dd73452c27e0..177ea230a88a3528c7a45d76362a7ff04d2df9bc 100644 (file)
--- a/modules/gui/qt4/dialogs/errors.cpp
+++ b/modules/gui/qt4/dialogs/errors.cpp
@@ -34,7 +34,7 @@ ErrorsDialog *ErrorsDialog::instance = NULL;
 
 ErrorsDialog::ErrorsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
-    setWindowTitle( _("Errors" ) );
+    setWindowTitle( qtr( "Errors" ) );
     resize( 500 , 200 );
 
     QGridLayout *layout = new QGridLayout( this );

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index e143a7bfbeb0168082456c01d34a0460618eebbb..176559508aac93114754eda964b7a9354a9a47ff 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -38,7 +38,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 
     l->addWidget( tab );
 
-    setWindowTitle( _("Extended controls" ) );
+    setWindowTitle( qtr( "Extended controls" ) );
     Equalizer *foo = new Equalizer( p_intf, this );
 
     tab->addTab( foo, qtr( "Equalizer" ) );

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 57d87d35fd76b89fa5548a6e34b40465935e1c30..31f81b575d5d7f132d13d9220fc4e8d7640cfff4 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -38,7 +38,7 @@ MessagesDialog *MessagesDialog::instance = NULL;
 
 MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 {
-    setWindowTitle( _("Messages" ) );
+    setWindowTitle( qtr( "Messages" ) );
     resize(600, 400);
 
     QGridLayout *layout = new QGridLayout(this);

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.cpp b/modules/gui/qt4/dialogs/prefs_dialog.cpp
index a1466a1df546448cc658772a8572292826539dfb..36f0c91d1117d1fa46019888bed86a5746a8249e 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.cpp
+++ b/modules/gui/qt4/dialogs/prefs_dialog.cpp
@@ -40,7 +40,7 @@ PrefsDialog *PrefsDialog::instance = NULL;
 PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
      QGridLayout *main_layout = new QGridLayout(this);
-     setWindowTitle( qtr("Preferences" ) );
+     setWindowTitle( qtr( "Preferences" ) );
      resize( 800, 450 );
 
      tree_panel = new QWidget(0);

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index d9c3f8ad178abab41dc7542c7215bebcdb1860ba..5ed388472ea357a6d916e7f52f2e869c57211bd1 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -29,7 +29,7 @@
 
 SoutDialog::SoutDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
-    setWindowTitle( _("Stream output") );
+    setWindowTitle( qtr( "Stream output") );
     main = new QWidget( this );
 
     /* UI stuff */

diff --git a/modules/gui/qt4/dialogs/streaminfo.cpp b/modules/gui/qt4/dialogs/streaminfo.cpp
index 1d8eed472aaf401387239b8dcdeca5aadf6526b5..4b2979fc65f9c417e7571bdcba15d4fa9d4ee8a3 100644 (file)
--- a/modules/gui/qt4/dialogs/streaminfo.cpp
+++ b/modules/gui/qt4/dialogs/streaminfo.cpp
@@ -37,7 +37,7 @@ StreamInfoDialog *StreamInfoDialog::instance = NULL;
 StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf )
 {
     i_runs = 0;
-    setWindowTitle( _("Stream information" ) );
+    setWindowTitle( qtr( "Stream information" ) );
     QGridLayout *layout = new QGridLayout(this);
 
     IT = new InfoTab( this, p_intf, true ) ;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 1c794e57aa0f752861bb9f9e14ede1bf3fc02990..72cb23e47d4a9f87ef24c4d8b43aff1da537c7df 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -102,7 +102,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
 
     /* UI */
-    setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
+    setWindowTitle( qtr( "VLC media player" ) );
     handleMainUi( settings );
     QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
                              advControlsEnabled, visualSelectorEnabled );