[vlc-devel] commit: Qt: uniformize ui previews, drop xml declaration related to changes made by 2779ac98fc116275cf490f63470f327917d40fc6 (Francois Cartegnie )

Mon Oct 5 21:50:19 CEST 2009

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Oct  5 21:35:33 2009 +0200| [a2a5c539b9a174667dd91a1cb5e640dea7032900] | committer: Jean-Baptiste Kempf 

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

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

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

 modules/gui/qt4/components/preferences_widgets.cpp |    3 ++-
 modules/gui/qt4/components/simple_preferences.cpp  |    4 ++++
 modules/gui/qt4/ui/sprefs_interface.ui             |   15 +--------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 20b65d4..7e09a0e 100644
--- 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 009b287..1ffa0ff 100644
--- 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 1642212..6a4d576 100644
--- 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/prefsmenu/sample_skins" /></p></body></html></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>


