(p?)gettext -> vlc_\1gettext

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

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index aa8047068206382f2e2fc31369a1363ee57728c3..b764a9c4f3ef4afd2b548e1c5bb9b9a4e15c31a8 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * qt4.hpp : QT4 interface
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $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
@@ -18,63 +19,103 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
 
-#ifndef _QVLC_H_
-#define _QVLC_H_
+#ifndef QVLC_H_
+#define QVLC_H_
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
+#include <vlc_interface.h> /* intf_thread_t */
+#include <vlc_playlist.h>  /* playlist_t */
 
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
 #include <QEvent>
+#include <QString>
+
+#if ( QT_VERSION < 0x040300 )
+# error Update your Qt version
+#endif
+
+enum {
+    QT_NORMAL_MODE = 0,
+    QT_ALWAYS_VIDEO_MODE,
+    QT_MINIMAL_MODE
+};
+
+enum {
+    DialogEventType = 0,
+    IMEventType     = 100,
+    PLEventType     = 200,
+    MsgEventType    = 300,
+};
 
-class QApplication;
+class QVLCApp;
 class QMenu;
 class MainInterface;
-class DialogsProvider;
-class VideoWidget;
+class QSettings;
 
 struct intf_sys_t
 {
-    QApplication *p_app;
-    MainInterface *p_mi;
-    playlist_t *p_playlist;
-    msg_subscription_t *p_sub; ///< Subscription to the message bank
+    vlc_thread_t thread;
+
+    QVLCApp *p_app;          /* Main Qt Application */
+    MainInterface *p_mi;     /* Main Interface, NULL if DialogProvider Mode */
+
+    QSettings *mainSettings; /* Qt State settings not messing main VLC ones */
+
+    bool b_isDialogProvider; /* Qt mode or Skins mode */
 
-    VideoWidget *p_video;
-    int i_saved_height, i_saved_width;
+    int  i_screenHeight;     /* Detection of Small screens */
 
-    QMenu * p_popup_menu;
+    playlist_t *p_playlist;  /* Core Playlist discussion */
+
+    QString filepath;        /* Last path used in dialogs */
+
+    QMenu * p_popup_menu;    /* The right click menu */
 };
 
 #define THEPL p_intf->p_sys->p_playlist
+#define QPL_LOCK playlist_Lock( THEPL );
+#define QPL_UNLOCK playlist_Unlock( THEPL );
+
 #define THEDP DialogsProvider::getInstance()
-#define THEMIM MainInputManager::getInstance( NULL )
+#define THEMIM MainInputManager::getInstance( p_intf )
 
 #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 qtr( i ) QString::fromUtf8( vlc_gettext(i) )
+#define qtu( i ) ((i).toUtf8().constData())
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
-#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout, this, act )
 
-static int DialogEvent_Type = QEvent::User + 1;
+#define BUTTON_SET( button, text, tooltip )  \
+    button->setText( text );                 \
+    button->setToolTip( tooltip );
+
+#define BUTTON_SET_ACT( button, text, tooltip, thisslot ) \
+    BUTTON_SET( button, text, tooltip );                  \
+    BUTTONACT( button, thisslot );
+
+#define BUTTON_SET_IMG( button, text, image, tooltip )    \
+    BUTTON_SET( button, text, tooltip );                  \
+    button->setIcon( QIcon( ":/"#image ) );
+
+#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
+    BUTTON_SET_IMG( button, text, image, tooltip );                \
+    BUTTONACT( button, thisslot );
+
+#define VISIBLE(i) (i && i->isVisible())
+
+#define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
+            else  x->show(); }
+
+#define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
+
+#define getSettings() p_intf->p_sys->mainSettings
 
-class DialogEvent : public QEvent
-{
-public:
-    DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) :
-                 QEvent( (QEvent::Type)(DialogEvent_Type) )
-    {
-        i_dialog = _i_dialog;
-        i_arg = _i_arg;
-        p_arg = _p_arg;
-    };
-    virtual ~DialogEvent() {};
-
-    int i_arg, i_dialog;
-    intf_dialog_args_t *p_arg;
-};
 
 #endif