Qt: uniformize ui previews, drop xml declaration related to changes made by 2779ac98f...

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 20b65d43e301627e2d29cfa87676b8c1f58e2d4b..7e09a0ed127e9d604bb2485e41be03bc499fba4b 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -214,7 +214,8 @@ void InterfacePreviewWidget::setPreview( int comboid )
     */
     const char * pixmaps[] = { ":/prefsmenu/sample_classic",
                                ":/prefsmenu/sample_complete",
-                               ":/prefsmenu/sample_minimal" };
+                               ":/prefsmenu/sample_minimal",
+                                ":/prefsmenu/sample_skins" };
     setPixmap( QPixmap( pixmaps[ comboid ] ) );
 }
 

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 009b287eff80e754b0572d258a831b5a105e14bb..1ffa0ff089c1f54510f5c808d8b139d8be2710cf 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -546,6 +546,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     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 );
 
             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 164221214a8b7f95e437fcfafda2996a14d651c1..6a4d5767e0e20a44727d8cea7aef877b189129fc 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -397,17 +397,6 @@
         </layout>
        </widget>
       </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="previewSkins">
-        <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/prefsmenu/sample_skins&quot; /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0" colspan="2">
        <widget class="QRadioButton" name="qt4">
         <property name="toolTip">
@@ -431,8 +420,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>artFetcher</tabstop>
   <tabstop>updatesBox</tabstop>
  </tabstops>
- <resources>
-  <include location="../vlc.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>