Don't show visualizations selector (unused).

A bit of cleanup in simple prefs

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 72a2ed88d35c4681975e7771be0e2cae2aa47d87..e75041932a18ece5c370de33f670ca54c60ed956 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -20,7 +20,6 @@ TOUI =        \
        ui/sprefs_interface \
        ui/sprefs_playlist \
        ui/sprefs_subtitles \
-       ui/sprefs_trivial \
        ui/sprefs_video \
        ui/streampanel
 
@@ -160,7 +159,6 @@ EXTRA_DIST += \
        ui/sprefs_interface.ui \
        ui/sprefs_playlist.ui \
        ui/sprefs_subtitles.ui \
-       ui/sprefs_trivial.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
        pixmaps/advanced.xpm \

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index df16ea9b1a2bcb9b31ccba87fa1c840b1c574060..4d8962d60961a58d7c07234691fed45957995204 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -186,10 +186,12 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
                                         mi, SLOT( advanced() ) );
         adv->setCheckable( true );
         if( adv_controls_enabled ) adv->setChecked( true );
+#if 0
         adv = menu->addAction( qtr("Visualizations selector" ),
                                mi, SLOT( visual() ) );
         adv->setCheckable( true );
         if( visual_selector_enabled ) adv->setChecked( true );
+#endif
     }
     menu->addSeparator();
     DP_SADD( qtr("Preferences"), "", "", prefsDialog() );

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index d4951db571f95cc56b71d4b17689e285f5e8a151..e20e4b60299aaa24d7336feadbfaa3e46e150238 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -1,171 +1,213 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>SPrefsAudio</class>
  <widget class="QWidget" name="SPrefsAudio" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>408</height>
+    <width>685</width>
+    <height>565</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QHBoxLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="9" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Filters</string>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QCheckBox" name="headphoneEffect" >
-        <property name="text" >
-         <string>Headphone effect</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QComboBox" name="equalizerPreset" />
-      </item>
-      <item row="0" column="1" >
-       <widget class="QLabel" name="label_6" >
-        <property name="layoutDirection" >
-         <enum>Qt::RightToLeft</enum>
-        </property>
-        <property name="text" >
-         <string>Preset</string>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="2" column="1" >
+      <widget class="QSlider" name="defaultVolume" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>200</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" colspan="2" >
+      <widget class="QGroupBox" name="groupBox_2" >
+       <property name="title" >
+        <string>Output</string>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="equalizer" >
-        <property name="text" >
-         <string>Equalizer</string>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QCheckBox" name="volumeNormalizer" >
-        <property name="text" >
-         <string>Volume normalizer</string>
+        <item row="0" column="1" >
+         <widget class="QComboBox" name="outputModule" />
+        </item>
+        <item row="2" column="1" >
+         <widget class="QSpinBox" name="directXDevice" >
+          <property name="maximumSize" >
+           <size>
+            <width>200</width>
+            <height>16777215</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" >
+         <widget class="QLineEdit" name="lineEdit" />
+        </item>
+        <item row="0" column="0" >
+         <widget class="QLabel" name="label_3" >
+          <property name="text" >
+           <string>Type</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QLabel" name="label_4" >
+          <property name="text" >
+           <string>Device</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="QComboBox" name="alsaDevice" />
+        </item>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="label_6" >
+          <property name="text" >
+           <string>Device</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0" >
+         <widget class="QLabel" name="label_7" >
+          <property name="text" >
+           <string>File</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Preferred audio language</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QComboBox" name="preferredAudioLanguage" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>300</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Default volume</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QCheckBox" name="enableAudio" >
+       <property name="text" >
+        <string>Enable audio</string>
+       </property>
+       <property name="checked" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0" colspan="2" >
+      <widget class="QGroupBox" name="groupBox" >
+       <property name="title" >
+        <string>Effects</string>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>9</number>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QCheckBox" name="parametricEqualizer" >
-        <property name="text" >
-         <string>Parametric equalizer</string>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QCheckBox" name="enableAudio" >
-     <property name="text" >
-      <string>Enable audio</string>
-     </property>
-     <property name="checked" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="Line" name="line" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Preferred audio language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="preferredAudioLanguage" />
-   </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Default volume</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QSlider" name="defaultVolume" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>Output module</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" >
-    <widget class="QComboBox" name="outputModule" />
-   </item>
-   <item row="6" column="0" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>Output device</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" >
-    <widget class="QComboBox" name="outputDevice" />
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="Line" name="line_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2" >
-    <widget class="Line" name="line_3" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1" >
-    <widget class="QComboBox" name="visualisation" />
-   </item>
-   <item row="8" column="0" >
-    <widget class="QLabel" name="label_5" >
-     <property name="text" >
-      <string>Visualisation</string>
-     </property>
-    </widget>
+        <item row="1" column="1" >
+         <widget class="QSlider" name="horizontalSlider" >
+          <property name="toolTip" >
+           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum volume when using the volume normalizer&lt;/p>&lt;/body>&lt;/html></string>
+          </property>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QComboBox" name="visualisation" />
+        </item>
+        <item row="0" column="0" >
+         <widget class="QCheckBox" name="headphoneEffect" >
+          <property name="text" >
+           <string>Headphone surround effect</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QCheckBox" name="volumeNormalizer" >
+          <property name="text" >
+           <string>Volume normalizer</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" >
+         <widget class="QLabel" name="label_5" >
+          <property name="text" >
+           <string>Visualisation</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 6b449b6b96e3f8ca9d8f937bf1e67cef42b8b106..5a531077cf13157d50de506c59f02c8c428e5585 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>SPrefsInterface</class>
  <widget class="QWidget" name="SPrefsInterface" >
   <property name="geometry" >
@@ -37,7 +34,7 @@
       <item row="3" column="0" colspan="2" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>This is VLC's skinable interface. You can download skins on http://www.videolan.org/ to customize your player.</string>
+         <string>This is VLC's skinnable interface. You can download skins on http://www.videolan.org/ to customize your player.</string>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
@@ -47,33 +44,13 @@
       <item row="1" column="0" colspan="2" >
        <widget class="QLabel" name="label_2" >
         <property name="text" >
-         <string>This is the new VLC default interface. Its dialogs give access to most VLC features.</string>
+         <string>VLC's default interface, with native look and feel</string>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
-         <string>This is the legacy VLC default interface. It will be removed once the Qt4 interface is completed and tested.</string>
-        </property>
-        <property name="textFormat" >
-         <enum>Qt::AutoText</enum>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QRadioButton" name="wxwidgets" >
-        <property name="text" >
-         <string>wxWidgets</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0" >
        <widget class="QRadioButton" name="skins" >
         <property name="text" >
@@ -84,7 +61,7 @@
       <item row="0" column="0" >
        <widget class="QRadioButton" name="qt4" >
         <property name="text" >
-         <string>Qt4</string>
+         <string>Default</string>
         </property>
        </widget>
       </item>
@@ -103,7 +80,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>

diff --git a/modules/gui/qt4/ui/sprefs_trivial.ui b/modules/gui/qt4/ui/sprefs_trivial.ui
deleted file mode 100644 (file)
index bf1488e..0000000
--- a/modules/gui/qt4/ui/sprefs_trivial.ui
+++ /dev/null
@@ -1,63 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>SPrefsTrivial</class>
- <widget class="QWidget" name="SPrefsTrivial" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>681</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="4" column="1" >
-    <widget class="QSpinBox" name="crSpin" />
-   </item>
-   <item row="0" column="0" >
-    <widget class="QComboBox" name="memcpyCombo" />
-   </item>
-   <item row="5" column="0" colspan="2" >
-    <widget class="QDateTimeEdit" name="dateTimeEdit" />
-   </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="crLabel" >
-     <property name="text" >
-      <string>That's the question</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLabel" name="memcpyLabel" >
-     <property name="text" >
-      <string>Should labels be set in Designer or by program ?.</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLCDNumber" name="lcdNumber" >
-     <property name="numDigits" >
-      <number>3</number>
-     </property>
-     <property name="value" stdset="0" >
-      <double>42</double>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <pixmapfunction></pixmapfunction>
- <resources/>
- <connections/>
-</ui>

diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index 609e07021f1806d1a0028fcf3d4bd2cd1b94d7d3..c02f8f9b7a2245ef0395bb2addebf185e84156cb 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>SPrefsVideo</class>
  <widget class="QWidget" name="SPrefsVideo" >
   <property name="geometry" >
@@ -64,8 +61,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Format
-</string>
+         <string>Format</string>
         </property>
        </widget>
       </item>
@@ -100,7 +96,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Output module</string>
+         <string>Output</string>
         </property>
        </widget>
       </item>
@@ -128,7 +124,7 @@
       <item row="0" column="2" >
        <widget class="QCheckBox" name="overlay" >
         <property name="text" >
-         <string>Overlay video output</string>
+         <string>Accelerated video output</string>
         </property>
        </widget>
       </item>
@@ -144,7 +140,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>