Changeset 181 for smplayer/trunk/src/defaultgui.h

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/defaultgui.h (modified) (7 diffs)

smplayer/trunk/src/defaultgui.h

@@ -21 +21 @@
 
 #define BUFFERING_ANIMATION
+//#define LANGUAGE_TOOLBAR
+
+#ifdef IDOPT_BUILD
+#define ADD_QUICK_ACCESS
+#endif
 
 #include "guiconfig.h"
@@ -72 +77 @@
         void createActions();
         void createMenus();
+        virtual void populateMainMenu();
 
         void loadConfig();
@@ -86 +92 @@
 protected slots:
         virtual void updateWidgets();
-        virtual void applyNewPreferences();
-        virtual void displayTime(QString text);
         virtual void displayFrame(int frame);
         virtual void displayABSection(int secs_a, int secs_b);
         virtual void displayVideoInfo(int width, int height, double fps);
+        void checkCompactMode();
+#ifdef ADD_QUICK_ACCESS
+        void adaptForTabletMode();
+#endif
 
         // Reimplemented:
@@ -109 +117 @@
         QLabel * ab_section_display;
         QLabel * video_info_display;
+        QLabel * format_info_display;
 #ifdef BUFFERING_ANIMATION
         StateWidget * state_widget;
@@ -117 +126 @@
 
         EditableToolbar * toolbar1;
+
+#ifdef LANGUAGE_TOOLBAR
         QToolBar * toolbar2;
-
         QPushButton * select_audio;
         QPushButton * select_subtitle;
+#endif
 
         TimeSliderAction * timeslider_action;
@@ -132 +143 @@
         AutohideWidget * floating_control;
         TimeLabelAction * time_label_action;
+        TimeLabelAction * current_time_label_action;
+        TimeLabelAction * total_time_label_action;
+        TimeLabelAction * remaining_time_label_action;
 
         MyAction * viewFrameCounterAct;
         MyAction * viewVideoInfoAct;
+        MyAction * viewFormatInfoAct;
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -149 +164 @@
 
         bool fullscreen_toolbar1_was_visible;
+        bool compact_toolbar1_was_visible;
+#ifdef LANGUAGE_TOOLBAR
         bool fullscreen_toolbar2_was_visible;
-        bool compact_toolbar1_was_visible;
         bool compact_toolbar2_was_visible;
+#endif
 };