[vlc-devel] commit: Qt: sprefs, add the auto-resize option to the interface panel. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb  7 22:04:34 2009 +0100| [7ffb2aeec2563091b2803b7b20933b214c897cac] | committer: Jean-Baptiste Kempf 

Qt: sprefs, add the auto-resize option to the interface panel.

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

 modules/gui/qt4/components/simple_preferences.cpp |    1 +
 modules/gui/qt4/ui/sprefs_interface.ui            |   25 +++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 8a9e286..73198d0 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -483,6 +483,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
             CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
                                  ui.fileSkin, ui.skinBrowse );
+            CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox );
 
             CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
                                                       artFetcher );
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 2b01f2b..b4c8c66 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>693</width>
+    <width>701</width>
     <height>604</height>
    </rect>
   </property>
@@ -119,14 +119,7 @@
         </property>
        </widget>
       </item>
-      <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" >
+      <item row="3" column="2" colspan="2" >
        <widget class="QCheckBox" name="fsController" >
         <property name="text" >
          <string>_("Show a controller in fullscreen")</string>
@@ -217,6 +210,20 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="4" colspan="2" >
+       <widget class="QCheckBox" name="systrayBox" >
+        <property name="text" >
+         <string>_("Systray icon")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4" colspan="2" >
+       <widget class="QCheckBox" name="resizingBox" >
+        <property name="text" >
+         <string>_("Resize interface to video size")</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>