Skip to content

V
vlc
Commit 45e83673 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Provide a SPrefs to deactivate the systray icon as often requested on the forums... 

(cherry picked from commit e1bf75ae)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 09e49c41
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 51 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ 45e83673
...@@ -485,6 +485,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -485,6 +485,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
displayModeBox ); displayModeBox );
CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo ); CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController ); CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController );
CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, ui.fileSkin, CONFIG_GENERIC_FILE( "skins2-last", File, NULL, ui.fileSkin,
ui.skinBrowse ); ui.skinBrowse );
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ 45e83673
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>518</width> <width>629</width>
<height>598</height> <height>576</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<property name="windowTitle" > <property name="windowTitle" >
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_3" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="languageLabel" > <widget class="QLabel" name="languageLabel" >
<property name="text" > <property name="text" >
...@@ -34,16 +34,44 @@ ...@@ -34,16 +34,44 @@
<property name="title" > <property name="title" >
<string>_("Interface Type")</string> <string>_("Interface Type")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QRadioButton" name="qt4" > <widget class="QRadioButton" name="qt4" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" > <property name="text" >
<string>_("Native")</string> <string>_("Native")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3" > <item row="0" column="1" >
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2" colspan="4" >
<widget class="QLabel" name="defaultLabel" > <widget class="QLabel" name="defaultLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" > <property name="frameShape" >
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
...@@ -61,10 +89,10 @@ ...@@ -61,10 +89,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="2" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" > <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
...@@ -74,7 +102,7 @@ ...@@ -74,7 +102,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" colspan="2" > <item row="1" column="3" colspan="3" >
<widget class="QComboBox" name="displayModeBox" > <widget class="QComboBox" name="displayModeBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
...@@ -84,17 +112,24 @@ ...@@ -84,17 +112,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3" > <item row="2" column="2" colspan="2" >
<widget class="QCheckBox" name="embedVideo" > <widget class="QCheckBox" name="embedVideo" >
<property name="text" > <property name="text" >
<string>_("Integrate video in interface")</string> <string>_("Integrate video in interface")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="4" > <item row="2" column="4" colspan="2" >
<widget class="Line" name="line" > <widget class="QCheckBox" name="systrayBox" >
<property name="orientation" > <property name="text" >
<enum>Qt::Horizontal</enum> <string>_("Systray icon")</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="4" >
<widget class="QCheckBox" name="fsController" >
<property name="text" >
<string>_("Show a controller in fullscreen")</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -105,10 +140,10 @@ ...@@ -105,10 +140,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item rowspan="2" row="5" column="1" colspan="3" > <item row="5" column="2" colspan="4" >
<widget class="QLabel" name="skinsLabel" > <widget class="QLabel" name="skinsLabel" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" > <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
...@@ -123,7 +158,7 @@ ...@@ -123,7 +158,7 @@
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
</property> </property>
<property name="scaledContents" > <property name="scaledContents" >
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
...@@ -132,37 +167,27 @@ ...@@ -132,37 +167,27 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="margin" > <property name="margin" >
<number>0</number> <number>5</number>
</property> </property>
<property name="openExternalLinks" > <property name="openExternalLinks" >
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" > <item row="6" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>_("Skin file")</string> <string>_("Skin file")</string>
</property> </property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" > <property name="buddy" >
<cstring>fileSkin</cstring> <cstring>fileSkin</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1" colspan="2" > <item row="6" column="2" colspan="3" >
<widget class="QLineEdit" name="fileSkin" > <widget class="QLineEdit" name="fileSkin" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
...@@ -172,7 +197,7 @@ ...@@ -172,7 +197,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="3" > <item row="6" column="5" >
<widget class="QPushButton" name="skinBrowse" > <widget class="QPushButton" name="skinBrowse" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" > <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
...@@ -185,10 +210,10 @@ ...@@ -185,10 +210,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="3" > <item row="4" column="0" colspan="6" >
<widget class="QCheckBox" name="fsController" > <widget class="Line" name="line" >
<property name="text" > <property name="orientation" >
<string>_("Show a controller in fullscreen")</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -200,29 +225,29 @@ ...@@ -200,29 +225,29 @@
<property name="title" > <property name="title" >
<string>_("Instances")</string> <string>_("Instances")</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="2" > <item row="0" column="0" >
<widget class="QCheckBox" name="OneInterfaceMode" > <widget class="QCheckBox" name="OneInterfaceMode" >
<property name="text" > <property name="text" >
<string>_("Allow only one instance")</string> <string>_("Allow only one instance")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="1" column="0" >
<widget class="QCheckBox" name="EnqueueOneInterfaceMode" > <widget class="QLabel" name="assoName" >
<property name="text" > <property name="text" >
<string>_("Enqueue files in playlist when in one instance mode")</string> <string>_("File associations:")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="0" column="1" colspan="2" >
<widget class="QLabel" name="assoName" > <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
<property name="text" > <property name="text" >
<string>_("File associations:")</string> <string>_("Enqueue files in playlist when in one instance mode")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="1" column="2" >
<widget class="QPushButton" name="assoButton" > <widget class="QPushButton" name="assoButton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" > <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
...@@ -280,12 +305,7 @@ ...@@ -280,12 +305,7 @@
<tabstop>language</tabstop> <tabstop>language</tabstop>
<tabstop>qt4</tabstop> <tabstop>qt4</tabstop>
<tabstop>displayModeBox</tabstop> <tabstop>displayModeBox</tabstop>
<tabstop>embedVideo</tabstop>
<tabstop>skins</tabstop>
<tabstop>fileSkin</tabstop>
<tabstop>skinBrowse</tabstop>
<tabstop>OneInterfaceMode</tabstop> <tabstop>OneInterfaceMode</tabstop>
<tabstop>EnqueueOneInterfaceMode</tabstop>
<tabstop>assoButton</tabstop> <tabstop>assoButton</tabstop>
<tabstop>artFetcher</tabstop> <tabstop>artFetcher</tabstop>
<tabstop>updatesBox</tabstop> <tabstop>updatesBox</tabstop>
......
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