Qt: Correctly close the player when alt+f4 is pressed

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

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index 91c20571312f4d98863cbf2407bd6abd7b27e882..762adb80d08b6e3d159f052775bc8e4c470eb356 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -21,39 +21,55 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MESSAGES_DIALOG_H_
-#define _MESSAGES_DIALOG_H_
+#ifndef QVLC_MESSAGES_DIALOG_H_
+#define QVLC_MESSAGES_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
+#include "util/singleton.hpp"
 
+class QTabWidget;
 class QPushButton;
 class QSpinBox;
 class QGridLayout;
 class QLabel;
 class QTextEdit;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QLineEdit;
 
-class MessagesDialog : public QVLCFrame
+class MessagesDialog : public QVLCFrame, public Singleton<MessagesDialog>
 {
-    Q_OBJECT;
-public:
-    static MessagesDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new MessagesDialog( p_intf);
-        return instance;
-    }
+    Q_OBJECT
+private:
+    MessagesDialog( intf_thread_t * );
     virtual ~MessagesDialog();
 
-private:
-    MessagesDialog( intf_thread_t *);
-    static MessagesDialog *instance;
+    QTabWidget *mainTab;
     QSpinBox *verbosityBox;
+    QLabel *verbosityLabel;
     QTextEdit *messages;
+    QTreeWidget *modulesTree;
+    QPushButton *clearUpdateButton;
+    QPushButton *saveLogButton;
+    QLineEdit *vbobjectsEdit;
+    QLabel *vbobjectsLabel;
+    msg_subscription_t *sub;
+    msg_cb_data_t *cbData;
+    static void sinkMessage( msg_cb_data_t *, msg_item_t *, unsigned );
+    void customEvent( QEvent * );
+    void sinkMessage( msg_item_t *item );
+
 private slots:
-    void updateLog();
-    void close();
-    void clear();
+    void updateTab( int );
+    void clearOrUpdate();
     bool save();
+    void updateConfig();
+private:
+    void clear();
+    void updateTree();
+    void buildTree( QTreeWidgetItem *, vlc_object_t * );
+
+    friend class    Singleton<MessagesDialog>;
 };
 
 #endif