don't poll volume-change, change volumecontrol to use signal from

[vlc] / modules / gui / qt4 / util / qvlcframe.hpp

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 03a5db73f16600d84cecf03bce2d390195f0451f..a45c392b193d281d094662850089c5cc606fad78 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -54,19 +54,25 @@ 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() );
+        /* never trust any saved size ;-) */
+        QSize newSize = settings.value( "size", defSize ).toSize();
+        if( newSize.isValid() )
+           resize( newSize );
+        move( settings.value( "pos", defPos ).toPoint() );
         settings.endGroup();
     }
     void writeSettings( QString name )
     {
         QSettings settings( "vlc", "vlc-qt-interface" );
         settings.beginGroup( name );
-        settings.setValue ("size", size() );
+        /* only save valid sizes ... */
+        QSize currentsize = size();
+        if( currentsize.isValid() )
+           settings.setValue ("size", currentsize );
         settings.setValue( "pos", pos() );
         settings.endGroup();
     }
@@ -90,7 +96,6 @@ protected:
              msg_Dbg( p_intf, "Enter Key pressed" );
              close();
          }
-
     }
 };
 
@@ -157,18 +162,27 @@ protected:
         move( settings.value( "pos", QPoint( 0,0 ) ).toPoint() );
         settings.endGroup();
     }
+
     void readSettings( QString name )
     {
         QSettings settings( "vlc", "vlc-qt-interface" );
         settings.beginGroup( name );
         mainSize = settings.value( "size", QSize( 0,0 ) ).toSize();
+        if( !mainSize.isValid() )
+        {
+           mainSize = QSize(0,0);
+        }
         settings.endGroup();
     }
+
     void writeSettings( QString name )
     {
         QSettings settings( "vlc", "vlc-qt-interface" );
         settings.beginGroup( name );
-        settings.setValue ("size", size() );
+        /* only save valid sizes ... */
+        QSize currentsize = size();
+        if( currentsize.isValid() )
+            settings.setValue ("size", currentsize );
         settings.setValue( "pos", pos() );
         settings.endGroup();
     }