Qt4 - saving size, position for the playlist and the extended panels.

Be careful, if you have a config file, you may need to clean it.

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 5e7adda5290ea5b113a7c7a32175010137bef6d8..b8b26a3804d9c7013951578ac667754d095366c1 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -721,11 +721,6 @@ void ControlsWidget::toggleAdvanced()
 PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) :
                                 p_intf ( _p_i )
 {
-    /* In case we want to keep the splitter informations */
-    settings->beginGroup( "Playlist" );
-    restoreState(settings->value("splitterSizes").toByteArray());
-    settings->endGroup();
-
     /* Left Part and design */
     QWidget *leftW = new QWidget( this );
     QVBoxLayout *left = new QVBoxLayout( leftW );
@@ -776,8 +771,13 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) :
     sizeList << 180 << 420 ;
     setSizes( sizeList );
     setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
-    resize( 600, 300 );
-    //updateGeometry();
+    
+    /* In case we want to keep the splitter informations */
+    settings->beginGroup( "playlist" );
+    restoreState( settings->value("splitterSizes").toByteArray());
+    resize( settings->value("size", QSize(600, 300)).toSize());
+    move( settings->value("pos", QPoint( 0, 400)).toPoint());
+    settings->endGroup();
 }
 
 void PlaylistWidget::setArt( QString url )
@@ -801,12 +801,13 @@ QSize PlaylistWidget::sizeHint() const
 }
 
 PlaylistWidget::~PlaylistWidget()
-{
-}
+{}
 
-void PlaylistWidget::saveSettings( QSettings *settings )
+void PlaylistWidget::savingSettings( QSettings *settings )
 {
-    settings->beginGroup( "Playlist" );
+    settings->beginGroup( "playlist" );
+    settings->setValue( "pos", pos() );
+    settings->setValue( "size", size() );
     settings->setValue("splitterSizes", saveState() );
     settings->endGroup();
 }

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 00acc5dd5372a0e0f5893f3868f73db06b7cc25c..258119071781481b4f5666772b94be0f9a614e2f 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -245,7 +245,7 @@ public:
     PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) ;
     virtual ~PlaylistWidget();
     QSize sizeHint() const;
-    void saveSettings( QSettings *settings );
+    void savingSettings( QSettings *settings );
 private:
     PLSelector *selector;
     PLPanel *rightPanel;

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index c38186614ca11153e58865e3c51bb6ce39b0c400..f94f8c41650b65144953455a7d189403ee4b81a3 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -63,9 +63,15 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
     layout->addWidget( closeButton, 1, 4, 1, 1);
     CONNECT( closeButton, clicked(), this, close() );
+    
+    readSettings( "EPanel", QSize( 400, 300 ), QPoint( 450, 0 ) );
 }
 
-ExtendedDialog::~ExtendedDialog()
+void ExtendedDialog::savingSettings()
 {
+    writeSettings( "EPanel" );
 }
 
+ExtendedDialog::~ExtendedDialog()
+{}
+

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index 44bd256b78d4687b9ec4682c3b5a74e3a103872a..b4f8a2f64f10eb0f97c9c620f0f8280942202cd0 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -37,10 +37,11 @@ public:
         return instance;
     }
     virtual ~ExtendedDialog();
+    static bool exists(){ return ( instance != NULL ) ; }
+    void savingSettings();
 private:
     ExtendedDialog( intf_thread_t * );
     static ExtendedDialog *instance;
-public slots:
 };
 
 #endif

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index b7d8f9a81a078dac1889d411d99ef090dd3619eb..ead03de0db917e4454b13f96d498fa04929012ef 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -54,7 +54,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
 
 PlaylistDialog::~PlaylistDialog()
 {
-    writeSettings( "playlist" );
+    writeSettings( "playlist" );    
 }
 
 void PlaylistDialog::dropEvent(QDropEvent *event)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 474867c68003747953c9d11b8086dd26adb83c4d..b2c9e0b70144b59ea968ff96d7a282601321caaa 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -29,6 +29,7 @@
 #include "util/customwidgets.hpp"
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
+#include "dialogs/extended.hpp"
 #include "dialogs/playlist.hpp"
 #include "menus.hpp"
 
@@ -287,8 +288,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 
 MainInterface::~MainInterface()
 {
-    if( playlistWidget ) playlistWidget->saveSettings( settings );
-
+    if( playlistWidget ) playlistWidget->savingSettings( settings );
+    if( ExtendedDialog::exists() ) 
+        ExtendedDialog::getInstance( p_intf )->savingSettings();
+    
     settings->beginGroup( "MainWindow" );
     settings->setValue( "playlist-floats", dockPL->isFloating() );
     settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 03a5db73f16600d84cecf03bce2d390195f0451f..d1f2a615574f66052557ac1b8ce688862ef1d484 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -54,12 +54,12 @@ public:
 protected:
     intf_thread_t *p_intf;
 
-    void readSettings( QString name, QSize defSize )
+    void readSettings( QString name, QSize defSize, QPoint defPos )
     {
         QSettings settings( "vlc", "vlc-qt-interface" );
         settings.beginGroup( name );
         resize( settings.value( "size", defSize ).toSize() );
-        move( settings.value( "pos", QPoint( 0,0 ) ).toPoint() );
+        move( settings.value( "pos", defPos ).toPoint() );
         settings.endGroup();
     }
     void writeSettings( QString name )
@@ -90,7 +90,6 @@ protected:
              msg_Dbg( p_intf, "Enter Key pressed" );
              close();
          }
-
     }
 };