Qt: respect font sizes

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

diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 46b398c2590dc9f456bf2ce8d2ec9c547c7e8d6e..fb05481e0dc62d74c37a19329e17c2006632dfac 100644 (file)
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _ACTIONS_MANAGER_H_
-#define _ACTIONS_MANAGER_H_
+#ifndef QVLC_ACTIONS_MANAGER_H_
+#define QVLC_ACTIONS_MANAGER_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -50,6 +50,10 @@ typedef enum actionType_e
     REVERSE_ACTION,
     SKIP_BACK_ACTION,
     SKIP_FW_ACTION,
+    QUIT_ACTION,
+    RANDOM_ACTION,
+    LOOP_ACTION,
+    INFO_ACTION,
 } actionType_e;
 
 class ActionsManager : public QObject
@@ -57,41 +61,38 @@ class ActionsManager : public QObject
 
     Q_OBJECT
 public:
-    static ActionsManager *getInstance( intf_thread_t *_p_intf )
+    static ActionsManager *getInstance( intf_thread_t *_p_intf, QObject *_parent = 0 )
     {
         if( !instance )
-            instance = new ActionsManager( _p_intf );
+            instance = new ActionsManager( _p_intf, _parent );
         return instance;
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
+        instance = NULL;
     }
-    virtual ~ActionsManager();
 
 private:
+    virtual ~ActionsManager();
+
     static ActionsManager *instance;
-    ActionsManager( intf_thread_t  *_p_i, QObject *_parent = 0 );
+    ActionsManager( intf_thread_t  *_p_i, QObject *_parent );
     intf_thread_t       *p_intf;
 
-protected slots:
-    virtual void doAction( int );
-
-protected slots:
+public slots:
+    void toggleMuteAudio();
+    void AudioUp();
+    void AudioDown();
     void play();
-    void stop();
-    void prev();
-    void next();
+protected slots:
     void fullscreen();
-    void extSettings();
-    void faster();
-    void slower();
-    void reverse();
-    void playlist();
     void snapshot();
+    void playlist();
     void record();
     void frame();
 
+    virtual void doAction( int );
 };
 
 #endif