various fixes

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 43cf1edc4ed30e881e4c4d4de9d85a212e06af33..50280724f71a1d01f715204aff21b07c8172a69b 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -50,8 +50,7 @@ BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
 endif
 
 resources.cpp: res.qrc
-       rm -f $@
-       $(RCC) $< > $@
+       $(RCC) -name vlc -o $@ $<
 
 $(MOCCPP): %.moc.cpp: %.hpp
        @echo "$(MOC) $< -> $@"

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 9575fc38539de4d1afacd91b77897f8812c1de5d..507859196e608b82f383977b33ff9d25b7007361 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -35,13 +35,17 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QMainWindow(), p_intf(
     QVLCFrame::fixStyle( this );
     QWidget *main = new QWidget( this );
     setCentralWidget( main );
-    setWindowTitle( _("VLC media player") );
+    setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
     ui.setupUi( centralWidget() );
 
     slider = new InputSlider( Qt::Horizontal, ui.sliderBox );
     QVBoxLayout *box_layout = new QVBoxLayout();
     box_layout->addWidget( slider );
     ui.sliderBox->setLayout( box_layout );
+    ui.prevButton->setText( "" );
+    ui.nextButton->setText( "" );
+    ui.playButton->setText( "" ); 
+    ui.stopButton->setText( "" ); 
     ui.prevButton->setIcon( QIcon( ":/pixmaps/previous.png" ) );
     ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) );
     ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 17eb195133eb1d4e69e96caa079f138ce86739e2..7a32e1e7316af566838ac43b181d167f0e632ddd 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -113,6 +113,8 @@ static void Init( intf_thread_t *p_intf )
 {
     char *argv[] = { "" };
     int argc = 1;
+    Q_INIT_RESOURCE( vlc );
+
     QApplication *app = new QApplication( argc, argv , true );
     p_intf->p_sys->p_app = app;