Commit 5d033808 authored by Francois Cartegnie's avatar Francois Cartegnie

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

Removed/Deprecated for 2.1.0
See 76c72672
parent 6daa02af
...@@ -523,13 +523,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -523,13 +523,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
+ qtr( "VLC skins website" )+ QString( "</a>." ) ); + qtr( "VLC skins website" )+ QString( "</a>." ) );
ui.skinsLabel->setFont( italicFont ); ui.skinsLabel->setFont( italicFont );
if( config_GetType( p_intf, "language" ) )
{
CONFIG_GENERIC( "language", StringList, ui.languageLabel,
language );
}
else
ui.languageBox->hide();
#ifdef WIN32 #ifdef WIN32
BUTTONACT( ui.assoButton, assoDialog() ); BUTTONACT( ui.assoButton, assoDialog() );
#else #else
......
...@@ -30,12 +30,15 @@ ...@@ -30,12 +30,15 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="2" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="OneInterfaceBox"> <widget class="QGroupBox" name="OneInterfaceBox">
<property name="title"> <property name="title">
<string>Instances</string> <string>Instances</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
...@@ -45,9 +48,6 @@ ...@@ -45,9 +48,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="OneInterfaceMode"> <widget class="QCheckBox" name="OneInterfaceMode">
<property name="text"> <property name="text">
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Privacy / Network Interaction</string> <string>Privacy / Network Interaction</string>
...@@ -183,41 +183,7 @@ ...@@ -183,41 +183,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="3" 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">
<widget class="QGroupBox" name="playlistGroupBox"> <widget class="QGroupBox" name="playlistGroupBox">
<property name="title"> <property name="title">
<string>Playlist</string> <string>Playlist</string>
...@@ -308,7 +274,7 @@ ...@@ -308,7 +274,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="LooknfeelBox"> <widget class="QGroupBox" name="LooknfeelBox">
<property name="title"> <property name="title">
<string>Look and feel</string> <string>Look and feel</string>
...@@ -673,7 +639,6 @@ ...@@ -673,7 +639,6 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>language</tabstop>
<tabstop>qt</tabstop> <tabstop>qt</tabstop>
<tabstop>skins</tabstop> <tabstop>skins</tabstop>
<tabstop>fsController</tabstop> <tabstop>fsController</tabstop>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment