Skip to content

V
vlc-2-2
Commit 834d0aa8 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

various fixes

parent 4ec49559
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/gui/qt4/Modules.am
View file @ 834d0aa8
...@@ -50,8 +50,7 @@ BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4) ...@@ -50,8 +50,7 @@ BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
endif endif
resources.cpp: res.qrc resources.cpp: res.qrc
rm -f $@ $(RCC) -name vlc -o $@ $<
$(RCC) $< > $@
$(MOCCPP): %.moc.cpp: %.hpp $(MOCCPP): %.moc.cpp: %.hpp
@echo "$(MOC) $< -> $@" @echo "$(MOC) $< -> $@"
......
modules/gui/qt4/main_interface.cpp
View file @ 834d0aa8
...@@ -35,13 +35,17 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QMainWindow(), p_intf( ...@@ -35,13 +35,17 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QMainWindow(), p_intf(
QVLCFrame::fixStyle( this ); QVLCFrame::fixStyle( this );
QWidget *main = new QWidget( this ); QWidget *main = new QWidget( this );
setCentralWidget( main ); setCentralWidget( main );
setWindowTitle( _("VLC media player") ); setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
ui.setupUi( centralWidget() ); ui.setupUi( centralWidget() );
slider = new InputSlider( Qt::Horizontal, ui.sliderBox ); slider = new InputSlider( Qt::Horizontal, ui.sliderBox );
QVBoxLayout *box_layout = new QVBoxLayout(); QVBoxLayout *box_layout = new QVBoxLayout();
box_layout->addWidget( slider ); box_layout->addWidget( slider );
ui.sliderBox->setLayout( box_layout ); 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.prevButton->setIcon( QIcon( ":/pixmaps/previous.png" ) );
ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) ); ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) );
ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
......
modules/gui/qt4/qt4.cpp
View file @ 834d0aa8
...@@ -113,6 +113,8 @@ static void Init( intf_thread_t *p_intf ) ...@@ -113,6 +113,8 @@ static void Init( intf_thread_t *p_intf )
{ {
char *argv[] = { "" }; char *argv[] = { "" };
int argc = 1; int argc = 1;
Q_INIT_RESOURCE( vlc );
QApplication *app = new QApplication( argc, argv , true ); QApplication *app = new QApplication( argc, argv , true );
p_intf->p_sys->p_app = app; p_intf->p_sys->p_app = app;
......
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