Qt: simplify previewWidgets creation.

Btw, you really shouldn't use C cast on QObjects

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 7e09a0ed127e9d604bb2485e41be03bc499fba4b..396da64011dfcc9bdf35b2a9f54df96f1e134da9 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -200,8 +200,7 @@ void ConfigControl::doApply( intf_thread_t *p_intf )
 /*******************************************************
  * Simple widgets
  *******************************************************/
-InterfacePreviewWidget::InterfacePreviewWidget
-        ( QWidget *parent ) : QLabel( parent, 0 )
+InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( parent )
 {
     setGeometry( 0, 0, 128, 100 );
     setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 1b235e85abcc2311e23be9b646cc7e558dfd3f51..420f835dd7f77badcf62ccc938a032a54a1d32e9 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -64,6 +64,10 @@ class InterfacePreviewWidget : public QLabel
 public:
     InterfacePreviewWidget( QWidget * );
 public slots:
+    /* 0: sample_classic, aka VLC 0.8.6
+       1: sample_complete, aka MPC
+       2: sample_minimal, aka WMP12 minimal
+       3: sample_skins */
     void setPreview( int );
 };
 

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index f0e56477933214fdabb1b1330b164edfdc6ed102..3ffe3b303ffe88af01037ec2469512b84f087bb5 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -542,15 +542,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.native_zone->setEnabled( ui.qt4->isChecked() );
             CONNECT( ui.qt4, toggled( bool ), ui.native_zone, setEnabled( bool ) );
 
-            InterfacePreviewWidget *preview = new InterfacePreviewWidget( this );
-            ( (QGridLayout *) ui.LooknfeelBox->layout() )->
-                    addWidget( preview, 1, 0, 1, 2 );
             CONNECT( ui.displayModeBox, currentIndexChanged( int ),
-                     preview, setPreview( int ) );
-            InterfacePreviewWidget *skinspreview = new InterfacePreviewWidget( this );
-            skinspreview->setPreview(3); /* skins_preview resource index */
-            ( (QGridLayout *) ui.LooknfeelBox->layout() )->
-                    addWidget( skinspreview, 7, 0, 1, 2 );
+                     ui.mainPreview, setPreview( int ) );
+            ui.skinsPreview->setPreview( 3 ); /* skins_preview resource index */
 
             CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel,
                             displayModeBox );

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 6a4d5767e0e20a44727d8cea7aef877b189129fc..b279c8445e2ec81133e60ce6b3380a0f09233395 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -61,6 +61,9 @@
         <property name="text">
          <string>Album art download policy:</string>
         </property>
+        <property name="buddy">
+         <cstring>artFetcher</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="2" colspan="2">
@@ -126,6 +129,9 @@
         <property name="margin">
          <number>5</number>
         </property>
+        <property name="buddy">
+         <cstring>recentlyPlayedFilters</cstring>
+        </property>
        </widget>
       </item>
       <item row="2" column="2" colspan="2">
@@ -164,6 +170,9 @@
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
+        <property name="buddy">
+         <cstring>language</cstring>
+        </property>
        </widget>
       </item>
       <item>
@@ -392,6 +401,9 @@
            <property name="text">
             <string>Force window style:</string>
            </property>
+           <property name="buddy">
+            <cstring>stylesCombo</cstring>
+           </property>
           </widget>
          </item>
         </layout>
@@ -410,11 +422,31 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="InterfacePreviewWidget" name="mainPreview">
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <property name="buddy">
+         <cstring>displayModeBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="2">
+       <widget class="InterfacePreviewWidget" name="skinsPreview"/>
+      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>InterfacePreviewWidget</class>
+   <extends>QLabel</extends>
+   <header>components/preferences_widgets.hpp</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>OneInterfaceMode</tabstop>
   <tabstop>artFetcher</tabstop>