qt4: metaChanged -> currentMetaChanged

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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index f8e4a1704daff4830b87df2f233da3aab54bb98c..4a3b369b16bb3628a7428e551288b33e207d2b62 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -84,6 +84,8 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma
                   spref_cone_Input_64.png, 4 );
     ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
 
+#undef ADD_CATEGORY
+
     SPrefsInterface->setChecked( true );
     layout->setMargin( 0 );
     layout->setSpacing( 1 );
@@ -279,6 +281,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 optionWidgets.append( NULL );
 #endif
 
+#undef audioControl2
+#undef audioControl
+#undef audioCommon
+
             /* Audio Options */
             CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
                                      defaultVolume );
@@ -380,6 +386,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 free( psz_dvddiscpath );
                 free( psz_vcddiscpath );
             }
+            CONFIG_GENERIC_FILE( "input-record-path", Directory, ui.recordLabel,
+                                 ui.recordPath, ui.recordBrowse );
 
             CONFIG_GENERIC_NO_BOOL( "server-port", Integer, ui.portLabel,
                                     UDPPort );
@@ -395,6 +403,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
             optionWidgets.append( ui.DVDDevice );
             optionWidgets.append( ui.cachingCombo );
+            CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
 
             /* Caching */
             /* Add the things to the ComboBox */
@@ -406,6 +415,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             addToCachingBox( N_("Normal"), CachingNormal );
             addToCachingBox( N_("High latency"), CachingHigh );
             addToCachingBox( N_("Higher latency"), CachingHigher );
+            #undef addToCachingBox
 
 #define TestCaC( name ) \
     b_cache_equal =  b_cache_equal && \
@@ -445,6 +455,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             TestCaCi( "mms-caching", 19 );
             if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
                 ui.cachingCombo->findData( QVariant( i_cache ) ) );
+#undef TestCaCi
+#undef TestCaC
 
         END_SPREFS_CAT;
         /*******************
@@ -552,10 +564,22 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             panel->setLayout( gLayout );
             int line = 0;
 
+            panel_label->setText( qtr( "Configure Hotkeys" ) );
             control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
                                                 this, gLayout, line );
+            controls.append( control );
 
-            panel_label->setText( qtr( "Configure Hotkeys" ) );
+            line++;
+
+            QFrame *sepline = new QFrame;
+            sepline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+            gLayout->addWidget( sepline, line, 0, 1, -1 );
+
+            line++;
+
+            p_config = config_FindConfig( VLC_OBJECT(p_intf), "hotkeys-mousewheel-mode" );
+            control = new IntegerListConfigControl( VLC_OBJECT(p_intf),
+                    p_config, false, this, gLayout, line );
             controls.append( control );
 
             break;
@@ -580,6 +604,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     }
 
     setLayout( panel_layout );
+
+#undef END_SPREFS_CAT
+#undef START_SPREFS_CAT
+#undef CONFIG_GENERIC_FILE
+#undef CONFIG_GENERIC_NO_BOOL
+#undef CONFIG_GENERIC2
+#undef CONFIG_GENERIC
 }
 
 void SPrefsPanel::updateAudioOptions( int number)
@@ -672,6 +703,8 @@ void SPrefsPanel::apply()
             //CaCi( "dv-caching" ) too short...
         }
         break;
+#undef CaC
+#undef CaCi
     }
 
     /* Interfaces */
@@ -804,6 +837,10 @@ void SPrefsPanel::assoDialog()
                                Qt::Checked : Qt::PartiallyChecked )
                             : Qt::Unchecked );
 
+#undef aTo
+#undef aTv
+#undef aTa
+
     QDialogButtonBox *buttonBox = new QDialogButtonBox( d );
     QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) );
     QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) );