[vlc-devel] commit: Provide a SPrefs to deactivate the systray icon as often requested on the forums ... (Jean-Baptiste Kempf )
git version control
git at videolan.org
Fri Sep 19 00:40:24 CEST 2008
vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep 16 15:51:07 2008 -0700| [45e83673c4c653228b20d82fbefa92a5359bbe29] | committer: Jean-Baptiste Kempf
Provide a SPrefs to deactivate the systray icon as often requested on the forums...
(cherry picked from commit e1bf75ae6e4a4715ffb2acff1f4ce43696464117)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45e83673c4c653228b20d82fbefa92a5359bbe29
---
modules/gui/qt4/components/simple_preferences.cpp | 1 +
modules/gui/qt4/ui/sprefs_interface.ui | 122 ++++++++++++---------
2 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 87076b7..2ff2af8 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -485,6 +485,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
displayModeBox );
CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
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,
ui.skinBrowse );
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index d17a4ee..3f92d56 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>518</width>
- <height>598</height>
+ <width>629</width>
+ <height>576</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -18,7 +18,7 @@
<property name="windowTitle" >
<string>Form</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout_3" >
<item row="0" column="0" >
<widget class="QLabel" name="languageLabel" >
<property name="text" >
@@ -34,16 +34,44 @@
<property name="title" >
<string>_("Interface Type")</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QRadioButton" name="qt4" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text" >
<string>_("Native")</string>
</property>
</widget>
</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" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
@@ -61,10 +89,10 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
+ <item row="1" column="2" >
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -74,7 +102,7 @@
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2" >
+ <item row="1" column="3" colspan="3" >
<widget class="QComboBox" name="displayModeBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -84,17 +112,24 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="3" >
+ <item row="2" column="2" colspan="2" >
<widget class="QCheckBox" name="embedVideo" >
<property name="text" >
<string>_("Integrate video in interface")</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="4" >
- <widget class="Line" name="line" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="2" column="4" colspan="2" >
+ <widget class="QCheckBox" name="systrayBox" >
+ <property name="text" >
+ <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>
</widget>
</item>
@@ -105,10 +140,10 @@
</property>
</widget>
</item>
- <item rowspan="2" row="5" column="1" colspan="3" >
+ <item row="5" column="2" colspan="4" >
<widget class="QLabel" name="skinsLabel" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -123,7 +158,7 @@
<enum>Qt::RichText</enum>
</property>
<property name="scaledContents" >
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -132,37 +167,27 @@
<bool>true</bool>
</property>
<property name="margin" >
- <number>0</number>
+ <number>5</number>
</property>
<property name="openExternalLinks" >
<bool>true</bool>
</property>
</widget>
</item>
- <item row="6" column="0" >
- <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" >
+ <item row="6" column="0" colspan="2" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>_("Skin file")</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
<property name="buddy" >
<cstring>fileSkin</cstring>
</property>
</widget>
</item>
- <item row="7" column="1" colspan="2" >
+ <item row="6" column="2" colspan="3" >
<widget class="QLineEdit" name="fileSkin" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
@@ -172,7 +197,7 @@
</property>
</widget>
</item>
- <item row="7" column="3" >
+ <item row="6" column="5" >
<widget class="QPushButton" name="skinBrowse" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -185,10 +210,10 @@
</property>
</widget>
</item>
- <item row="3" column="1" colspan="3" >
- <widget class="QCheckBox" name="fsController" >
- <property name="text" >
- <string>_("Show a controller in fullscreen")</string>
+ <item row="4" column="0" colspan="6" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
@@ -200,29 +225,29 @@
<property name="title" >
<string>_("Instances")</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
<widget class="QCheckBox" name="OneInterfaceMode" >
<property name="text" >
<string>_("Allow only one instance")</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
+ <item row="1" column="0" >
+ <widget class="QLabel" name="assoName" >
<property name="text" >
- <string>_("Enqueue files in playlist when in one instance mode")</string>
+ <string>_("File associations:")</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="assoName" >
+ <item row="0" column="1" colspan="2" >
+ <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
<property name="text" >
- <string>_("File associations:")</string>
+ <string>_("Enqueue files in playlist when in one instance mode")</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
+ <item row="1" column="2" >
<widget class="QPushButton" name="assoButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -280,12 +305,7 @@
<tabstop>language</tabstop>
<tabstop>qt4</tabstop>
<tabstop>displayModeBox</tabstop>
- <tabstop>embedVideo</tabstop>
- <tabstop>skins</tabstop>
- <tabstop>fileSkin</tabstop>
- <tabstop>skinBrowse</tabstop>
<tabstop>OneInterfaceMode</tabstop>
- <tabstop>EnqueueOneInterfaceMode</tabstop>
<tabstop>assoButton</tabstop>
<tabstop>artFetcher</tabstop>
<tabstop>updatesBox</tabstop>
More information about the vlc-devel
mailing list