Commit a2a5c539 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

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

Qt: uniformize ui previews, drop xml declaration related to changes made by 2779ac98Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 5450e850
...@@ -214,7 +214,8 @@ void InterfacePreviewWidget::setPreview( int comboid ) ...@@ -214,7 +214,8 @@ void InterfacePreviewWidget::setPreview( int comboid )
*/ */
const char * pixmaps[] = { ":/prefsmenu/sample_classic", const char * pixmaps[] = { ":/prefsmenu/sample_classic",
":/prefsmenu/sample_complete", ":/prefsmenu/sample_complete",
":/prefsmenu/sample_minimal" }; ":/prefsmenu/sample_minimal",
":/prefsmenu/sample_skins" };
setPixmap( QPixmap( pixmaps[ comboid ] ) ); setPixmap( QPixmap( pixmaps[ comboid ] ) );
} }
......
...@@ -546,6 +546,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -546,6 +546,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
addWidget( preview, 1, 0, 1, 2 ); addWidget( preview, 1, 0, 1, 2 );
CONNECT( ui.displayModeBox, currentIndexChanged( int ), CONNECT( ui.displayModeBox, currentIndexChanged( int ),
preview, setPreview( 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, CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel,
displayModeBox ); displayModeBox );
......
...@@ -397,17 +397,6 @@ ...@@ -397,17 +397,6 @@
</layout> </layout>
</widget> </widget>
</item> </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"> <item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="qt4"> <widget class="QRadioButton" name="qt4">
<property name="toolTip"> <property name="toolTip">
...@@ -431,8 +420,6 @@ p, li { white-space: pre-wrap; } ...@@ -431,8 +420,6 @@ p, li { white-space: pre-wrap; }
<tabstop>artFetcher</tabstop> <tabstop>artFetcher</tabstop>
<tabstop>updatesBox</tabstop> <tabstop>updatesBox</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../vlc.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment