Don't show visualizations selector (unused).

A bit of cleanup in simple prefs

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 \

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() );

modules/gui/qt4/ui/sprefs_interface.ui

 <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>

modules/gui/qt4/ui/sprefs_trivial.ui

-<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>

modules/gui/qt4/ui/sprefs_video.ui

 <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>