Qt4 - SPrefs: add the option to embed the video in the interface In the Simple Prefer...

[vlc] / modules / gui / qt4 / qt4.hpp

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 0643f86f79395b2027b49f4fd514c97b8a45c22c..7670514801884e3a386ac79b931cbd30c2cc8d93 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,12 +31,11 @@
 
 #include <QEvent>
 
-#define QT43 ( QT_VERSION >= 0x040300 )
+#define HAS_QT43 ( QT_VERSION >= 0x040300 )
 
 /* Add define for duration, VLC_META_ENGINE doesn't include it */
 #define VLC_META_ENGINE_DURATION   0x00000002
-#define VLC_META_DURATION          N_("Duration")
-
+#define VLC_META_DURATION          N_( "Duration" )
 
 class QApplication;
 class QMenu;
@@ -65,8 +65,8 @@ struct intf_sys_t
 
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( _(i) )
-#define qtu( i ) i.toUtf8().data()
-#define qta( i ) i.toAscii().data()
+#define qtu( i ) (i).toUtf8().data()
+#define qta( i ) (i).toAscii().data()
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
@@ -90,9 +90,12 @@ 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;
+//static int PLUndockEvent_Type = QEvent::User + 2;
+//static int PLDockEvent_Type = QEvent::User + 3;
 static int SetVideoOnTopEvent_Type = QEvent::User + 4;
 
 class DialogEvent : public QEvent
@@ -111,16 +114,4 @@ public:
     intf_dialog_args_t *p_arg;
 };
 
-/* Ugly to put it here, but don't want more files ... */
-#if 0
-#include <QFrame>
-class BasePlaylistWidget : public QFrame
-{
-public:
-    BasePlaylistWidget( intf_thread_t *_p_i ) : p_intf( _p_i)  {};
-    virtual ~BasePlaylistWidget() {};
-protected:
-    intf_thread_t *p_intf;
-};
-#endif
 #endif