[vlc-commits] Qt: cosmetics

Ludovic Fauvet git at videolan.org
Wed Dec 17 17:54:52 CET 2014


vlc/vlc-2.2 | branch: master | Ludovic Fauvet <etix at videolan.org> | Mon Nov 24 19:21:54 2014 +0100| [1a5a3ba2e50100b46bf6e97de76369cdffbbb36f] | committer: Jean-Baptiste Kempf

Qt: cosmetics

(cherry picked from commit b80d2ab3bec0aa7ac847acf71be991a6b6c2254b)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1a5a3ba2e50100b46bf6e97de76369cdffbbb36f
---

 modules/gui/qt4/main_interface.cpp |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index b7e7f54..7e951b2 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -370,7 +370,6 @@ void MainInterface::reloadPrefs()
 
 void MainInterface::createResumePanel( QWidget *w )
 {
-    /* Create non-modal resumePanel */
     resumePanel = new QWidget( w );
     resumePanel->hide();
     QHBoxLayout *resumePanelLayout = new QHBoxLayout( resumePanel );
@@ -385,10 +384,11 @@ void MainInterface::createResumePanel( QWidget *w )
     QToolButton *cancel = new QToolButton( resumePanel );
     cancel->setAutoRaise( true );
     cancel->setText( "X" );
-    QPushButton *ok = new QPushButton( qtr("&Continue")  );
+
+    QPushButton *ok = new QPushButton( qtr( "&Continue" )  );
 
     resumePanelLayout->addWidget( continuePixmapLabel );
-    resumePanelLayout->addWidget(continueLabel);
+    resumePanelLayout->addWidget( continueLabel );
     resumePanelLayout->addStretch( 1 );
     resumePanelLayout->addWidget( ok );
     resumePanelLayout->addWidget( cancel );
@@ -398,11 +398,9 @@ void MainInterface::createResumePanel( QWidget *w )
     resumeTimer->setInterval( 6000 );
 
     CONNECT( resumeTimer, timeout(), this, hideResumePanel() );
-
     CONNECT( cancel, clicked(), this, hideResumePanel() );
-    BUTTONACT(ok, resumePlayback() );
-
     CONNECT( THEMIM->getIM(), resumePlayback(int64_t), this, showResumePanel(int64_t) );
+    BUTTONACT( ok, resumePlayback() );
 
     w->layout()->addWidget( resumePanel );
 }



More information about the vlc-commits mailing list