qt4: Don't create QMenu without parents

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

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index 3dc463113b619d6774a5cf263880661fa5fb2862..4343bb719d55b6a3bfe9034f96955a8275e6bff4 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -22,61 +22,51 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
 
-#ifndef _MEDIAINFO_DIALOG_H_
-#define _MEDIAINFO_DIALOG_H_
+#ifndef QVLC_MEDIAINFO_DIALOG_H_
+#define QVLC_MEDIAINFO_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
-#include "components/infopanels.hpp"
+#include "components/info_panels.hpp"
+#include "util/singleton.hpp"
 
 class QTabWidget;
-class InfoTab;
-class QLineEdit;
 
-class MediaInfoDialog : public QVLCFrame
+class MediaInfoDialog : public QVLCFrame, public Singleton<MediaInfoDialog>
 {
     Q_OBJECT;
 public:
-    MediaInfoDialog( intf_thread_t *, bool stats = true,
-                    bool mainInput = false );
-    static MediaInfoDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance)
-            instance = new MediaInfoDialog( p_intf, true, true );
-        return instance;
-    }
-    static void killInstance()
-    {
-        if( instance ) delete instance;
-        instance= NULL;
-    }
-    virtual ~MediaInfoDialog();
+    MediaInfoDialog( intf_thread_t *,
+                     input_item_t * input = NULL );
 
     void showTab( int );
-    bool need_update;
+#if 0
     void setInput( input_item_t * );
-    QLineEdit *uriLine;
+#endif
+
 private:
-    input_thread_t *p_input;
-    QTabWidget *IT;
-    static MediaInfoDialog *instance;
-    int i_runs;
-    bool mainInput;
-    bool stats;
-    bool in_edit;
+    virtual ~MediaInfoDialog();
+
+    bool isMainInputInfo;
+
+    QTabWidget *infoTabW;
+
     InputStatsPanel *ISP;
     MetaPanel *MP;
     InfoPanel *IP;
     ExtraMetaPanel *EMP;
+
     QPushButton *saveMetaButton;
-    QPushButton *editMetaButton;
-public slots:
-    void update();
+
+private slots:
+    void updateAllTabs( input_item_t * );
+    void clearAllTabs();
+
+    virtual void close();
+
     void saveMeta();
-    void editMeta();
-    void update( input_item_t *, bool, bool );
-    void close();
-    void clear();
     void updateButtons( int i_tab );
+
+    friend class    Singleton<MediaInfoDialog>;
 };
 
 #endif