[vlc-commits] Qt: fix toolbars customization

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov 17 22:22:56 2011 +0100| [cd62d6f2bcb502b7755b5a1f63164d0506636671] | committer: Jean-Baptiste Kempf

Qt: fix toolbars customization

Close #5547
This must be a side-effect of the playlist settings

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

 modules/gui/qt4/components/controller.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 22ec4cd..2de9480 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -636,13 +636,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     QHBoxLayout *controlLayout1 = new QHBoxLayout;
     controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );
 
-    QString line1 = getSettings()->value( "MainToolbar1", MAIN_TB1_DEFAULT )
+    QString line1 = getSettings()->value( "MainWindow/MainToolbar1", MAIN_TB1_DEFAULT )
                                         .toString();
     parseAndCreate( line1, controlLayout1 );
 
     QHBoxLayout *controlLayout2 = new QHBoxLayout;
     controlLayout2->setSpacing( 0 ); controlLayout2->setMargin( 0 );
-    QString line2 = getSettings()->value( "MainToolbar2", MAIN_TB2_DEFAULT )
+    QString line2 = getSettings()->value( "MainWindow/MainToolbar2", MAIN_TB2_DEFAULT )
                                         .toString();
     parseAndCreate( line2, controlLayout2 );
 
@@ -676,7 +676,7 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, QWidget *_parent ) :
 #endif
 
 
-    QString line = getSettings()->value( "AdvToolbar", ADV_TB_DEFAULT )
+    QString line = getSettings()->value( "MainWindow/AdvToolbar", ADV_TB_DEFAULT )
         .toString();
     parseAndCreate( line, controlLayout );
 }
@@ -692,7 +692,7 @@ InputControlsWidget::InputControlsWidget( intf_thread_t *_p_i, QWidget *_parent
     setStyleSheet( "background: green ");
 #endif
 
-    QString line = getSettings()->value( "InputToolbar", INPT_TB_DEFAULT ).toString();
+    QString line = getSettings()->value( "MainWindow/InputToolbar", INPT_TB_DEFAULT ).toString();
     parseAndCreate( line, controlLayout );
 }
 /**********************************************************************