[vlc-commits] Qt4: soft-code when to show the language setting (fixes #7803)

Rémi Denis-Courmont git at videolan.org
Sun Nov 25 09:27:18 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 25 10:26:56 2012 +0200| [e6f024b49698b2a282df9211d549d6dc5484b9e9] | committer: Rémi Denis-Courmont

Qt4: soft-code when to show the language setting (fixes #7803)

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

 modules/gui/qt4/components/simple_preferences.cpp |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 7835b44..b5c3706 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -529,11 +529,16 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     + qtr( "VLC skins website" )+ QString( "</a>." ) );
             ui.skinsLabel->setFont( italicFont );
 
-#if defined( WIN32 )
-            CONFIG_GENERIC( "language", StringList, ui.languageLabel, language );
+            if( config_GetType( p_intf, "language" ) )
+            {
+                CONFIG_GENERIC( "language", StringList, ui.languageLabel,
+                                language );
+            }
+            else
+                ui.languageBox->hide();
+#ifdef WIN32
             BUTTONACT( ui.assoButton, assoDialog() );
 #else
-            ui.languageBox->hide();
             ui.assoButton->hide();
             ui.assocLabel->hide();
 #endif



More information about the vlc-commits mailing list