Qt4 - Remove QFontDialog Dependency... We don't have some CONFIG_ITEM_FONT yet.....

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 0595ff559d2a84b7d00ae8f742a00ca0cb30a040..139292e1579d22f3c04659b38e085d99ba4b648a 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -30,6 +30,9 @@
  *  - Improvements over WX
  *      - Validator for modulelist
  */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "components/preferences_widgets.hpp"
 #include "util/customwidgets.hpp"
@@ -41,7 +44,6 @@
 #include <QGridLayout>
 #include <QSlider>
 #include <QFileDialog>
-#include <QFontDialog>
 #include <QGroupBox>
 #include <QTreeWidgetItem>
 #include <QSignalMapper>
@@ -132,10 +134,12 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
         p_control = new DirectoryConfigControl( p_this, p_item, parent, l,
                                                 line, false );
         break;
+#if 0
     case CONFIG_ITEM_FONT:
         p_control = new FontConfigControl( p_this, p_item, parent, l,
                                            line, false );
         break;
+#endif
     case CONFIG_ITEM_KEY:
         p_control = new KeySelectorControl( p_this, p_item, parent, l, line );
         break;
@@ -334,6 +338,9 @@ void DirectoryConfigControl::updateField()
     text->setText( dir );
 }
 
+#if 0
+#include <QFontDialog>
+
 /********* String / Font **********/
 FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
                         module_config_t *_p_item, QWidget *_p_widget,
@@ -354,6 +361,7 @@ void FontConfigControl::updateField()
     if( !ok ) return;
     text->setText( font.family() );
 }
+#endif
 
 /********* String / choice list **********/
 StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
@@ -612,6 +620,9 @@ ModuleListConfigControl::~ModuleListConfigControl()
 \
        cbl->psz_module = strdup( module_GetObjName( p_parser ) ); \
        modules.push_back( cbl ); \
+\
+       if( p_item->value.psz && strstr( p_item->value.psz, cbl->psz_module ) ) \
+            cbl->checkBox->setChecked( true ); \
 }