[vlc-commits] Qt: remove menus language selection. (fix #8201)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Feb 28 15:47:35 2013 +0100| [5d0338086cfc6699ceda3928f5f333fb6a0c5faa] | committer: Francois Cartegnie

Qt: remove menus language selection. (fix #8201)

Removed/Deprecated for 2.1.0
See 76c72672d89033c9da6bcb576be6d1cf6bc52bd8

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

 modules/gui/qt4/components/simple_preferences.cpp |    7 ---
 modules/gui/qt4/ui/sprefs_interface.ui            |   49 +++------------------
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 8de46fa..dc0a8af 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -523,13 +523,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     + qtr( "VLC skins website" )+ QString( "</a>." ) );
             ui.skinsLabel->setFont( italicFont );
 
-            if( config_GetType( p_intf, "language" ) )
-            {
-                CONFIG_GENERIC( "language", StringList, ui.languageLabel,
-                                language );
-            }
-            else
-                ui.languageBox->hide();
 #ifdef WIN32
             BUTTONACT( ui.assoButton, assoDialog() );
 #else
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index a372240..d1f3e59 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -30,12 +30,15 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="OneInterfaceBox">
      <property name="title">
       <string>Instances</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
       <property name="leftMargin">
        <number>9</number>
       </property>
@@ -45,9 +48,6 @@
       <property name="bottomMargin">
        <number>9</number>
       </property>
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
       <item row="0" column="0">
        <widget class="QCheckBox" name="OneInterfaceMode">
         <property name="text">
@@ -65,7 +65,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Privacy / Network Interaction</string>
@@ -183,41 +183,7 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="languageBox">
-     <property name="title">
-      <string>Language</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="languageLabel">
-        <property name="maximumSize">
-         <size>
-          <width>220</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Menus language:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="buddy">
-         <cstring>language</cstring>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="language"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="playlistGroupBox">
      <property name="title">
       <string>Playlist</string>
@@ -308,7 +274,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="LooknfeelBox">
      <property name="title">
       <string>Look and feel</string>
@@ -673,7 +639,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>language</tabstop>
   <tabstop>qt</tabstop>
   <tabstop>skins</tabstop>
   <tabstop>fsController</tabstop>