Do not include vlc_modules.h in vlc_common.h

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

diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index b34a14ef0d2842c133f5db7a72afc5774d3cade0..1892f8e0e1ecc1ab195c90609e8399e896b81080 100644 (file)
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -34,17 +34,15 @@
 #include <QGroupBox>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QGridLayout>
 #include <QHeaderView>
-#include <QPalette>
-#include <QColor>
 
 #include "components/complete_preferences.hpp"
 #include "components/preferences_widgets.hpp"
 
 #include <vlc_config_cat.h>
 #include <vlc_intf_strings.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 #define ITEM_HEIGHT 25
@@ -56,22 +54,21 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
                             QTreeWidget( _parent ), p_intf( _p_intf )
 {
     /* General Qt options */
-    setColumnCount( 1 );
     setAlternatingRowColors( true );
-    header()->hide();
+    setHeaderHidden( true );
 
     setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
     setTextElideMode( Qt::ElideNone );
 
     /* Nice icons */
-#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
-    BI( audio, ":/advprefs_audio" );
-    BI( video, ":/advprefs_video" );
-    BI( input, ":/advprefs_codec" );
-    BI( sout, ":/advprefs_sout" );
-    BI( advanced, ":/advprefs_extended" );
-    BI( playlist, ":/advprefs_playlist" );
-    BI( interface, ":/advprefs_intf" );
+#define BI( a,b) QIcon a##_icon = QIcon( b )
+    BI( audio, ":/prefsmenu/advanced/audio" );
+    BI( video, ":/prefsmenu/advanced/video" );
+    BI( input, ":/prefsmenu/advanced/codec" );
+    BI( sout, ":/prefsmenu/advanced/sout" );
+    BI( advanced, ":/prefsmenu/advanced/extended" );
+    BI( playlist, ":/prefsmenu/advanced/playlist" );
+    BI( interface, ":/prefsmenu/advanced/intf" );
 #undef BI
 
     /* Build the tree for the main module */
@@ -128,7 +125,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
             current_item = new QTreeWidgetItem();
             current_item->setText( 0, data->name );
             current_item->setIcon( 0 , icon );
-            current_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+            //current_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
             current_item->setData( 0, Qt::UserRole,
                                    qVariantFromValue( data ) );
             addTopLevelItem( current_item );
@@ -180,7 +177,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
             subcat_item->setText( 0, data_sub->name );
             subcat_item->setData( 0, Qt::UserRole,
                                   qVariantFromValue( data_sub ) );
-            subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+            //subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
 
             /* Add it to the parent */
             assert( current_item );
@@ -201,7 +198,9 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
         // Main module excluded
         if( module_is_main( p_module) ) continue;
 
-        unsigned i_subcategory = 0, i_category = 0, confsize;
+        unsigned  confsize;
+        int i_subcategory = 0, i_category = 0;
+
         bool b_options = false;
         module_config_t *const p_config = module_config_get (p_module, &confsize);
 
@@ -272,7 +271,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
         module_item->setText( 0, qtr( module_get_name( p_module, false ) ) );
         module_item->setData( 0, Qt::UserRole,
                               QVariant::fromValue( module_data) );
-        module_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+        //module_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
         subcat_item->addChild( module_item );
     }
 
@@ -280,6 +279,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
     sortItems( 0, Qt::AscendingOrder );
 
     module_list_free( p_list );
+    resizeColumnToContents( 0 );
 }
 
 PrefsTree::~PrefsTree() {}
@@ -370,11 +370,11 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     {
         while (p_item < p_end)
         {
-            if( p_item->i_type == CONFIG_SUBCATEGORY &&
-                            ( data->i_type == TYPE_SUBCATEGORY &&
+            if(  p_item->i_type == CONFIG_SUBCATEGORY &&
+                            ( ( data->i_type == TYPE_SUBCATEGORY &&
                               p_item->value.i == data->i_object_id ) ||
                             ( data->i_type == TYPE_CATSUBCAT &&
-                              p_item->value.i == data->i_subcat_id ) )
+                              p_item->value.i == data->i_subcat_id ) ) )
                 break;
             p_item++;
         }
@@ -405,9 +405,8 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     }
 
     QLabel *titleLabel = new QLabel( head );
-    QFont titleFont = QApplication::font( static_cast<QWidget*>(0) );
+    QFont titleFont = QApplication::font();
     titleFont.setPointSize( titleFont.pointSize() + 6 );
-    titleFont.setFamily( "Verdana" );
     titleLabel->setFont( titleFont );
 
     // Title <hr>