Skip to content

V
vlc-1.1
Commit aa8da70e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - SPrefs : a few additions. Still not working for selecting interface.

parent 79181e9c
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 43 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ aa8da70e
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* Authors: Clément Stenac <zorglub@videolan.org> * Authors: Clément Stenac <zorglub@videolan.org>
* Antoine Cellerier <dionoea@videolan.org> * Antoine Cellerier <dionoea@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org> * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
...@@ -190,12 +191,14 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -190,12 +191,14 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
#ifndef WIN32 #ifndef WIN32
CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice ); CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );
//FIXME File
#else #else
CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
DirectXDevice ); DirectXDevice );
#endif #endif
CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName );
//Fixme File
CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer // CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer
...@@ -228,9 +231,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -228,9 +231,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
START_SPREFS_CAT( Interface, "Interfaces settings" ); START_SPREFS_CAT( Interface, "Interfaces settings" );
CONFIG_GENERIC( "language", StringList, NULL, language ); CONFIG_GENERIC( "language", StringList, NULL, language );
/* interface */
/* p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
ui.qt4->setChecked( true );
if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
ui.skins->setChecked( true );*/
/* CONFIG_GENERIC( "intf", Module, NULL, ??? ); */ //FIXME interface choice /* CONFIG_GENERIC( "intf", Module, NULL, ??? ); */ //FIXME interface choice
CONFIG_GENERIC ("one-instance", Bool, NULL, OneInterfaceMode ); CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC ("playlist-enqueue", Bool, NULL, CONFIG_GENERIC( "skins2-last", String, NULL, fileSkin);
//FIXME File
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode ); EnqueueOneInterfaceMode );
END_SPREFS_CAT; END_SPREFS_CAT;
...@@ -240,7 +252,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -240,7 +252,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage ); CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */ CONFIG_GENERIC( "freetype-font", String, NULL, font );
/* FIXME -> use file instead of string */
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
fontSize ); fontSize );
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ aa8da70e
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>440</width>
<height>297</height> <height>373</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -19,81 +19,108 @@ ...@@ -19,81 +19,108 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" colspan="2" > <item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" > <widget class="QGroupBox" name="groupBox" >
<property name="title" > <property name="title" >
<string>Instances</string> <string>Default Interface</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="5" column="2" >
<widget class="QCheckBox" name="OneInterfaceMode" > <widget class="QPushButton" name="skinBrowse" >
<property name="text" > <property name="text" >
<string>Allow only one interface</string> <string>Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="5" column="1" >
<widget class="QCheckBox" name="EnqueueOneInterfaceMode" > <widget class="QLineEdit" name="fileSkin" />
<property name="text" >
<string>Enqueue files in playlist when in one interface mode</string>
</property>
</widget>
</item> </item>
</layout> <item row="4" column="1" colspan="2" >
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Default Interface</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } 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;/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> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">This is VLC's skinnable interface. You can download skins on &lt;/span>&lt;a href="http://www.videolan.org/">&lt;span style=" font-style:italic; text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php&lt;/span>&lt;/a>&lt;span style=" font-style:italic;"> to customize your player.&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="1" colspan="2" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >
<string>VLC's default interface, with native look and feel</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;">&lt;span style=" font-style:italic;">VLC's default interface, with native look and feel&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="0" column="0" colspan="2" >
<widget class="QRadioButton" name="qt4" >
<property name="text" >
<string>Default</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Skin File</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QRadioButton" name="skins" > <widget class="QRadioButton" name="skins" >
<property name="text" > <property name="text" >
<string>Skins</string> <string>Skins</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="2" column="1" >
<widget class="QRadioButton" name="qt4" > <widget class="QCheckBox" name="qtAlwaysVideo" >
<property name="text" > <property name="text" >
<string>Default</string> <string>Display always the video</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<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> </property>
</widget> </widget>
</item> </item>
......
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