Qt4 - Define a TOGGLEV to toggleVisible on QWidgets, and use it instead of rewriting...

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index fd172f9d4514d4fd144454a6458072c8c2e6a83a..250705ee09930898feac12e7c3263e79f6f61138 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -280,7 +280,7 @@ void OpenDialog::finish( bool b_enqueue = false )
 void OpenDialog::toggleAdvancedPanel()
 {
     //FIXME does not work under Windows
-    if (ui.advancedFrame->isVisible()) {
+    if( ui.advancedFrame->isVisible() ) {
         ui.advancedFrame->hide();
 #ifndef WIN32
         setMinimumHeight(1);

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 7601d23d4c36de2a1c155b876faf49f97c32f173..37ac552b561ec6cdf2f1ca2af4245771f98d81e1 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -225,20 +225,15 @@ void SoutDialog::setOptions()
 void SoutDialog::toggleSout()
 {
     //Toggle all the streaming options.
-    #define TGV( x ) { \
-        if( ( x->isHidden() ) )  \
-        x->show();          \
-        else  x->hide();\
-    }
-    TGV( ui.HTTPOutput ) ; TGV( ui.UDPOutput ) ; TGV( ui.MMSHOutput ) ;
-    TGV( ui.HTTPEdit ) ; TGV( ui.UDPEdit ) ; TGV( ui.MMSHEdit ) ;
-    TGV( ui.HTTPLabel ) ; TGV( ui.UDPLabel ) ; TGV( ui.MMSHLabel ) ;
-    TGV( ui.HTTPPortLabel ) ; TGV( ui.UDPPortLabel ) ; TGV( ui.MMSHPortLabel ) ;
-    TGV( ui.HTTPPort ) ; TGV( ui.UDPPort ) ; TGV( ui.MMSHPort ) ;
-
-    TGV( ui.sap ); TGV( ui.sapName );
-    TGV( ui.sapGroup ); TGV( ui.sapGroupLabel );
-    TGV( ui.ttlLabel ); TGV( ui.ttl );
+    TOGGLEV( ui.HTTPOutput ) ; TOGGLEV( ui.UDPOutput ) ; TOGGLEV( ui.MMSHOutput ) ;
+    TOGGLEV( ui.HTTPEdit ) ; TOGGLEV( ui.UDPEdit ) ; TOGGLEV( ui.MMSHEdit ) ;
+    TOGGLEV( ui.HTTPLabel ) ; TOGGLEV( ui.UDPLabel ) ; TOGGLEV( ui.MMSHLabel ) ;
+    TOGGLEV( ui.HTTPPortLabel ) ; TOGGLEV( ui.UDPPortLabel ) ; TOGGLEV( ui.MMSHPortLabel ) ;
+    TOGGLEV( ui.HTTPPort ) ; TOGGLEV( ui.UDPPort ) ; TOGGLEV( ui.MMSHPort ) ;
+
+    TOGGLEV( ui.sap ); TOGGLEV( ui.sapName );
+    TOGGLEV( ui.sapGroup ); TOGGLEV( ui.sapGroupLabel );
+    TOGGLEV( ui.ttlLabel ); TOGGLEV( ui.ttl );
 
     if( b_transcode_only ) okButton->setText( "&Save" );
     else okButton->setText( "&Stream" );

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index ab885e7f4cf6e655b199f9cf2bce7f7ed2f1b60c..0dd678cb5a4ba8cdd4f9d04579664dc4588645c1 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -625,10 +625,8 @@ void MainInterface::visual()
 void MainInterface::toggleMenus()
 {
     msg_Dbg( p_intf, "I HAS HERE, HIDING YOUR MENUZ: \\_o<~~ coin coin" );
-    if( controls->isVisible() ) controls->hide();
-    else controls->show();
-    if( statusBar()->isVisible() ) statusBar()->hide();
-    else statusBar()->show();
+    TOGGLEV( controls );
+    TOGGLEV( statusBar() );
     updateGeometry();
 }
 

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 0643f86f79395b2027b49f4fd514c97b8a45c22c..3c2de020e581f6bbacd17fa3f6fc959a7635e3ff 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -90,6 +90,9 @@ struct intf_sys_t
 
 #define VISIBLE(i) (i && i->isVisible())
 
+#define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
+            else  x->show(); }
+
 static int DialogEvent_Type = QEvent::User + 1;
 static int PLUndockEvent_Type = QEvent::User + 2;
 static int PLDockEvent_Type = QEvent::User + 3;