[vlc-devel] commit: Qt: sprefs, add the systray popup on minize on the main page ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan 15 18:49:51 2010 +0100| [f4232007aa8415b492e41402e8d2a5856eee9eb1] | committer: Jean-Baptiste Kempf 

Qt: sprefs, add the systray popup on minize on the main page

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f4232007aa8415b492e41402e8d2a5856eee9eb1
---

 modules/gui/qt4/components/simple_preferences.cpp |    1 +
 modules/gui/qt4/ui/sprefs_interface.ui            |   57 +++++++++++++--------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 2f4e6d5..e8542da 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -552,6 +552,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             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( "qt-notification", Bool, NULL, sysPop );
             CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
                                  ui.fileSkin, ui.skinBrowse );
             CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox );
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index dd69bfb..87bd924 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -7,7 +7,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>745</width>
+    <width>802</width>
     <height>651</height>
    </rect>
   </property>
@@ -332,6 +332,12 @@
       </item>
       <item row="0" column="2" rowspan="3" colspan="2">
        <widget class="QWidget" name="native_zone" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>10</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <layout class="QGridLayout" name="gridLayout_4">
          <property name="margin">
           <number>0</number>
@@ -346,13 +352,6 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="1">
-          <widget class="QCheckBox" name="fsController">
-           <property name="text">
-            <string>Show controls in full screen mode</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="displayLabel">
            <property name="sizePolicy">
@@ -372,13 +371,6 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="systrayBox">
-           <property name="text">
-            <string>Show systray icon</string>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="0">
           <widget class="QCheckBox" name="resizingBox">
            <property name="text">
@@ -386,13 +378,6 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="0">
-          <widget class="QCheckBox" name="embedVideo">
-           <property name="text">
-            <string>Embed video in interface</string>
-           </property>
-          </widget>
-         </item>
          <item row="8" column="1">
           <widget class="QComboBox" name="stylesCombo"/>
          </item>
@@ -406,6 +391,34 @@
            </property>
           </widget>
          </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="systrayBox">
+           <property name="text">
+            <string>Show systray icon</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QCheckBox" name="embedVideo">
+           <property name="text">
+            <string>Embed video in interface</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <widget class="QCheckBox" name="fsController">
+           <property name="text">
+            <string>Show controls in full screen mode</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QCheckBox" name="sysPop">
+           <property name="text">
+            <string> Systray popup when minimized</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>