Commit c6276f93 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - Simple Prefs: More. Interfaces.

parent 0435ea9a
......@@ -38,7 +38,7 @@
#include "pixmaps/audio_50x50.xpm"
#include "pixmaps/input_and_codecs_50x50.xpm"
#include "pixmaps/interface_50x50.xpm"
#include "pixmaps/playlist_50x50.xpm"
//#include "pixmaps/playlist_50x50.xpm"
#include "pixmaps/subtitles_50x50.xpm"
#include "pixmaps/video_50x50.xpm"
......@@ -46,7 +46,7 @@
#include "ui/sprefs_input.h"
#include "ui/sprefs_video.h"
#include "ui/sprefs_subtitles.h"
#include "ui/sprefs_playlist.h"
//#include "ui/sprefs_playlist.h"
#include "ui/sprefs_interface.h"
#define ITEM_HEIGHT 50
......@@ -69,7 +69,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
ADD_CATEGORY( SPrefsAudio, qtr("Audio"), audio_50x50_xpm );
ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
input_and_codecs_50x50_xpm );
ADD_CATEGORY( SPrefsPlaylist, qtr("Playlist"), playlist_50x50_xpm );
// ADD_CATEGORY( SPrefsPlaylist, qtr("Playlist"), playlist_50x50_xpm );
ADD_CATEGORY( SPrefsInterface, qtr("Interface"), interface_50x50_xpm );
ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), subtitles_50x50_xpm );
ADD_CATEGORY( SPrefsAdvanced, qtr("Advanced"), advanced_50x50_xpm );
......@@ -140,8 +140,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
END_SPREFS_CAT;
START_SPREFS_CAT( Playlist );
END_SPREFS_CAT;
/* START_SPREFS_CAT( Playlist );
END_SPREFS_CAT;*/
START_SPREFS_CAT( Interface );
......
......@@ -32,7 +32,7 @@ enum {
SPrefsVideo = 0,
SPrefsAudio,
SPrefsInputAndCodecs,
SPrefsPlaylist,
// SPrefsPlaylist,
SPrefsInterface,
SPrefsSubtitles,
SPrefsAdvanced,
......
......@@ -91,21 +91,28 @@
<property name="title" >
<string>Network</string>
</property>
<layout class="QHBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<item row="1" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>HTTP Proxy</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>UDP Default Port</string>
</property>
</widget>
</item>
<item>
<item row="0" column="1" >
<widget class="QSpinBox" name="UDPPort" >
<property name="alignment" >
<set>Qt::AlignRight</set>
......@@ -121,6 +128,9 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="lineEdit" />
</item>
</layout>
</widget>
</item>
......@@ -267,7 +277,7 @@
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Default Network caching in ms</string>
</property>
......@@ -292,7 +302,6 @@
</item>
</layout>
</widget>
<includes/>
<resources/>
<connections/>
</ui>
......@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>357</height>
<height>297</height>
</rect>
</property>
<property name="windowTitle" >
......@@ -19,6 +19,35 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Instances</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="OneInterfaceMode" >
<property name="text" >
<string>Allow only one interface</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
<property name="text" >
<string>Enqueue files in playlist when in one interface mode</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
......@@ -34,7 +63,10 @@
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>This is VLC's skinnable interface. You can download skins on &lt;a href="http://www.videolan.org/">http://www.videolan.org/&lt;/a> to customize your player.</string>
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This is VLC's skinnable interface. You can download skins on &lt;a href="http://www.videolan.org/">&lt;span style=" text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php&lt;/span>&lt;/a> to customize your player.&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="wordWrap" >
<bool>true</bool>
......@@ -68,9 +100,6 @@
</layout>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="language" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
......@@ -78,6 +107,9 @@
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="language" />
</item>
</layout>
</widget>
<resources/>
......
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