Changeset 165 for smplayer/trunk/src/skingui/skingui.h

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/skingui.h (modified) (8 diffs)

smplayer/trunk/src/skingui/skingui.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -32 +32 @@
 class TimeSliderAction;
 class VolumeSliderAction;
-class FloatingWidget;
+class AutohideWidget;
 class TimeLabelAction;
 class MyAction;
@@ -41 +41 @@
 #endif
 
-//#define SKIN_CONTROLWIDGET_OVER_VIDEO 1
+//#define SKIN_EDITABLE_CONTROL 1
 
 class SkinGui : public BaseGuiPlus
@@ -60 +60 @@
         void createMainToolBars();
         void createControlWidget();
-#if SKIN_CONTROLWIDGET_OVER_VIDEO
         void createFloatingControl();
-#endif
         void createActions();
         void createMenus();
@@ -81 +79 @@
         virtual void displayMessage(QString message);
 
-        virtual void showFloatingControl(QPoint p);
-        virtual void showFloatingMenu(QPoint p);
-        virtual void hideFloatingControls();
-
         // Reimplemented:
 #if AUTODISABLE_ACTIONS
@@ -95 +89 @@
 protected:
         MediaBarPanel* mediaBarPanel;
+        QAction * mediaBarPanelAction;
 
         EditableToolbar * toolbar1;
@@ -107 +102 @@
 #endif
 
-#if SKIN_CONTROLWIDGET_OVER_VIDEO
-        FloatingWidget * floating_control;
-#endif
+        AutohideWidget * floating_control;
         TimeLabelAction * time_label_action;
 
 #if USE_CONFIGURABLE_TOOLBARS
         MyAction * editToolbar1Act;
-        #if SKIN_CONTROLWIDGET_OVER_VIDEO
+        #if defined(SKIN_EDITABLE_CONTROL)
         MyAction * editFloatingControlAct;
         #endif
@@ -128 +121 @@
         bool fullscreen_toolbar1_was_visible;
         bool compact_toolbar1_was_visible;
+
+        bool was_muted;
 };