[vlc-commits] commit: Qt, sprefs: reorder interface tabulations and widget buddies ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec 19 20:21:59 2010 +0100| [cb085c10109344edc2a9c6f7a4f258aadcc77a5b] | committer: Jean-Baptiste Kempf 

Qt, sprefs: reorder interface tabulations and widget buddies

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

 modules/gui/qt4/ui/sprefs_audio.ui     |   19 +++++++++++++++++++
 modules/gui/qt4/ui/sprefs_input.ui     |    6 ++++++
 modules/gui/qt4/ui/sprefs_interface.ui |   27 +++++++++++++++++++++++----
 modules/gui/qt4/ui/sprefs_subtitles.ui |    2 ++
 modules/gui/qt4/ui/sprefs_video.ui     |   12 ++++++++++++
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 6ed8bbc..afe1b02 100644
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -328,6 +328,9 @@
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
+           <property name="buddy">
+            <cstring>replayCombo</cstring>
+           </property>
           </widget>
          </item>
          <item row="5" column="2" colspan="2">
@@ -542,9 +545,25 @@
  </widget>
  <tabstops>
   <tabstop>enableAudio</tabstop>
+  <tabstop>keepVolumeRadio</tabstop>
+  <tabstop>resetVolumeRadio</tabstop>
+  <tabstop>defaultVolume</tabstop>
+  <tabstop>volumeValue</tabstop>
   <tabstop>outputModule</tabstop>
   <tabstop>fileName</tabstop>
   <tabstop>fileBrowseButton</tabstop>
+  <tabstop>spdifBox</tabstop>
+  <tabstop>autoscaleBox</tabstop>
+  <tabstop>volNormBox</tabstop>
+  <tabstop>volNormSpin</tabstop>
+  <tabstop>replayCombo</tabstop>
+  <tabstop>detectionDolby</tabstop>
+  <tabstop>headphoneEffect</tabstop>
+  <tabstop>visualisation</tabstop>
+  <tabstop>preferredAudioLanguage</tabstop>
+  <tabstop>lastfm</tabstop>
+  <tabstop>lastfm_user_edit</tabstop>
+  <tabstop>lastfm_pass_edit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index dd4e2cd..1a14db1 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -231,6 +231,9 @@
         <property name="text">
          <string>Record directory or filename</string>
         </property>
+        <property name="buddy">
+         <cstring>recordPath</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -318,6 +321,9 @@
         <property name="text">
          <string>Live555 stream transport</string>
         </property>
+        <property name="buddy">
+         <cstring>live555TransportHTTPRadio</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="0">
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 08c5136..d7f68de 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>697</width>
-    <height>590</height>
+    <height>594</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -235,7 +235,7 @@
       <property name="bottomMargin">
        <number>9</number>
       </property>
-      <item row="0" column="0" colspan="2">
+      <item row="0" column="0" colspan="3">
        <widget class="QCheckBox" name="treePlaylist">
         <property name="text">
          <string>Display playlist tree</string>
@@ -253,9 +253,12 @@
         <property name="text">
          <string>File extensions association</string>
         </property>
+        <property name="buddy">
+         <cstring>assoButton</cstring>
+        </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="1" column="2">
        <widget class="QPushButton" name="assoButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -274,6 +277,19 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <spacer name="horizontalSpacer_6">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -621,6 +637,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>language</tabstop>
+  <tabstop>qt4</tabstop>
   <tabstop>skins</tabstop>
   <tabstop>fsController</tabstop>
   <tabstop>minimalviewBox</tabstop>
@@ -632,12 +649,14 @@
   <tabstop>OneInterfaceMode</tabstop>
   <tabstop>EnqueueOneInterfaceMode</tabstop>
   <tabstop>artFetcher</tabstop>
+  <tabstop>updatesBox</tabstop>
+  <tabstop>updatesDays</tabstop>
   <tabstop>saveRecentlyPlayed</tabstop>
   <tabstop>recentlyPlayedFilters</tabstop>
   <tabstop>treePlaylist</tabstop>
   <tabstop>assoButton</tabstop>
-  <tabstop>skinBrowse</tabstop>
   <tabstop>fileSkin</tabstop>
+  <tabstop>skinBrowse</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index cc2b314..c5ccba5 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -246,12 +246,14 @@
  </widget>
  <tabstops>
   <tabstop>OSDBox</tabstop>
+  <tabstop>OSDTitleBox</tabstop>
   <tabstop>preferredLanguage</tabstop>
   <tabstop>encoding</tabstop>
   <tabstop>font</tabstop>
   <tabstop>fontSize</tabstop>
   <tabstop>fontColor</tabstop>
   <tabstop>effect</tabstop>
+  <tabstop>subsPosition</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index 89eb1d6..764b94f 100644
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -144,6 +144,9 @@
         <property name="text">
          <string>Deinterlacing</string>
         </property>
+        <property name="buddy">
+         <cstring>deinterlaceBox</cstring>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
@@ -151,6 +154,9 @@
         <property name="text">
          <string>Force Aspect Ratio</string>
         </property>
+        <property name="buddy">
+         <cstring>arLine</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -174,6 +180,9 @@
         <property name="text">
          <string>Mode</string>
         </property>
+        <property name="buddy">
+         <cstring>deinterlaceModeBox</cstring>
+        </property>
        </widget>
       </item>
       <item row="0" column="3">
@@ -285,6 +294,8 @@
  <tabstops>
   <tabstop>enableVideo</tabstop>
   <tabstop>fullscreen</tabstop>
+  <tabstop>overlay</tabstop>
+  <tabstop>hwYUVBox</tabstop>
   <tabstop>alwaysOnTop</tabstop>
   <tabstop>windowDecorations</tabstop>
   <tabstop>outputModule</tabstop>
@@ -297,6 +308,7 @@
   <tabstop>snapshotsDirectoryBrowse</tabstop>
   <tabstop>snapshotsPrefix</tabstop>
   <tabstop>snapshotsSequentialNumbering</tabstop>
+  <tabstop>snapshotsFormat</tabstop>
  </tabstops>
  <resources/>
  <connections/>