Changeset 181 for smplayer/trunk/src/mpcgui

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/mpcgui/mpcgui.cpp (modified) (14 diffs)
• src/mpcgui/mpcgui.h (modified) (3 diffs)
• src/mpcgui/mpcstyles.cpp (modified) (10 diffs)
• src/mpcgui/mpcstyles.h (modified) (1 diff)

smplayer/trunk/src/mpcgui/mpcgui.cpp

@@ -45 +45 @@
         createStatusBar();
         createFloatingControl();
+        populateMainMenu();
 
         retranslateStrings();
@@ -70 +71 @@
         volumeslider_action = createVolumeSliderAction(this);
         volumeslider_action->disable();
-    volumeslider_action->setCustomStyle( new MpcVolumeSlideStyle() );
-    volumeslider_action->setFixedSize( QSize(50,18) );
+        volumeslider_action->setCustomStyle( new MpcVolumeSlideStyle() );
+        volumeslider_action->setFixedSize( QSize(50,18) );
         volumeslider_action->setTickPosition( QSlider::NoTicks );
 #endif
-
-        time_label_action = new TimeLabelAction(this);
-        time_label_action->setObjectName("timelabel_action");
-
-        connect( this, SIGNAL(timeChanged(QString)),
-             time_label_action, SLOT(setText(QString)) );
 }
 
@@ -133 +128 @@
 void MpcGui::createFloatingControl() {
         // Floating control
-        floating_control = new AutohideWidget(panel);
+        floating_control = new AutohideWidget(mplayerwindow);
         floating_control->setAutoHide(true);
         floating_control->hide();
@@ -141 +136 @@
         floating_control_time->setAlignment(Qt::AlignRight);
         floating_control_time->setAutoFillBackground(true);
+        floating_control_time->setObjectName("floating_control_time");
+#ifdef CHANGE_WIDGET_COLOR
         ColorUtils::setBackgroundColor( floating_control_time, QColor(0,0,0) );
         ColorUtils::setForegroundColor( floating_control_time, QColor(255,255,255) );
-
+#endif
+
+        connect(this, SIGNAL(timeChanged(QString)), floating_control_time, SLOT(setText(QString)));
 }
 
@@ -152 +151 @@
         timeslidewidget->setWindowTitle( tr("Seek bar") );
 
-    setupIcons();
+        setupIcons();
 }
 
@@ -288 +287 @@
 
                 if (!DesktopInfo::isInsideScreen(this)) {
-                        move(0,0);
-                        qWarning("MpcGui::loadConfig: window is outside of the screen, moved to 0x0");
+                        QPoint tl = DesktopInfo::topLeftPrimaryScreen();
+                        move(tl);
+                        qWarning("DefaultGui::loadConfig: window is outside of the screen, moved to %d x %d", tl.x(), tl.y());
                 }
         }
@@ -316 +316 @@
     playAct->setCheckable(true);
     stopAct->setCheckable(true);
+
         connect( muteAct, SIGNAL(toggled(bool)),
              this, SLOT(muteIconChange(bool)) );
@@ -322 +323 @@
              this, SLOT(updateAudioChannels()) );
 
-    connect( core , SIGNAL(stateChanged(Core::State)),
+        connect( core , SIGNAL(stateChanged(Core::State)),
              this, SLOT(iconChange(Core::State)) );
 }
@@ -369 +370 @@
 
 void MpcGui::createStatusBar() {
-
     // remove frames around statusbar items
     statusBar()->setStyleSheet("QStatusBar::item { border: 0px solid black }; ");
@@ -381 +381 @@
     audiochannel_display->setMaximumSize(audiochannel_display->sizeHint());
     audiochannel_display->setPixmap( QPixmap("") );
-    
+
         time_display = new QLabel( statusBar() );
         time_display->setAlignment(Qt::AlignRight);
         time_display->setText(" 88:88:88 / 88:88:88 ");
         time_display->setMinimumSize(time_display->sizeHint());
-    time_display->setContentsMargins(15,2,1,1);
+        time_display->setContentsMargins(15,2,1,1);
 
         frame_display = new QLabel( statusBar() );
@@ -392 +392 @@
         frame_display->setText("88888888");
         frame_display->setMinimumSize(frame_display->sizeHint());
-    frame_display->setContentsMargins(15,2,1,1);
-
-        statusBar()->setAutoFillBackground(TRUE);   
-
+        frame_display->setContentsMargins(15,2,1,1);
+
+        statusBar()->setAutoFillBackground(true);
+
+#ifdef CHANGE_WIDGET_COLOR
         ColorUtils::setBackgroundColor( statusBar(), QColor(0,0,0) );
         ColorUtils::setForegroundColor( statusBar(), QColor(255,255,255) );
@@ -404 +405 @@
         ColorUtils::setBackgroundColor( audiochannel_display, QColor(0,0,0) );
         ColorUtils::setForegroundColor( audiochannel_display, QColor(255,255,255) );
-        statusBar()->setSizeGripEnabled(FALSE);
-
-    
+#endif
+
+        statusBar()->setSizeGripEnabled(false);
 
         statusBar()->addPermanentWidget( frame_display, 0 );
         frame_display->setText( "0" );
 
-    statusBar()->addPermanentWidget( time_display, 0 );
+        statusBar()->addPermanentWidget( time_display, 0 );
         time_display->setText(" 00:00:00 / 00:00:00 ");
 
-    statusBar()->addPermanentWidget( audiochannel_display, 0 );
+        statusBar()->addPermanentWidget( audiochannel_display, 0 );
 
         time_display->show();
         frame_display->hide();
 
-        connect( this, SIGNAL(timeChanged(QString)),
-             this, SLOT(displayTime(QString)) );
-
-        connect( this, SIGNAL(frameChanged(int)),
-             this, SLOT(displayFrame(int)) );
-}
-
-void MpcGui::displayTime(QString text) {
-        time_display->setText( text );
-        time_label_action->setText(text );
-        floating_control_time->setText(text);
+        connect(this, SIGNAL(timeChanged(QString)), time_display, SLOT(setText(QString)));
+        connect(this, SIGNAL(frameChanged(int)), this, SLOT(displayFrame(int)));
 }
 
@@ -452 +444 @@
         !pref->compact_mode )
     {
-            controlwidget->show();
+        controlwidget->show();
         timeslidewidget->show();
         statusBar()->show();
@@ -501 +493 @@
 
 void MpcGui::updateWidgets() {
-
-    BaseGui::updateWidgets();
+        BaseGui::updateWidgets();
 
         // Frame counter

smplayer/trunk/src/mpcgui/mpcgui.h

@@ -27 +27 @@
 class TimeSliderAction;
 class VolumeSliderAction;
-class TimeLabelAction;
 class AutohideWidget;
 class QSpacerItem;
@@ -49 +48 @@
     void updateAudioChannels();
 
-    void displayTime(QString text);
     void displayFrame(int frame);
     void showFullscreenControls();
@@ -98 +96 @@
         VolumeSliderAction * volumeslider_action;
 #endif
-        TimeLabelAction * time_label_action;
 };
 

smplayer/trunk/src/mpcgui/mpcstyles.cpp

@@ -19 +19 @@
 #include "mpcstyles.h"
 
-#include <QWindowsStyle>
+#include <QProxyStyle>
 #include <QStyleOptionToolBar>
 #include <QSlider>
 #include <QPainter>
-
+#include <qdrawutil.h>
 
 void
@@ -79 +79 @@
             else
             {
-                QWindowsStyle::drawControl(control,toolbar, painter, widget);
+                QProxyStyle::drawControl(control,toolbar, painter, widget);
             }
         }
@@ -85 +85 @@
     else
     {
-        QWindowsStyle::drawControl(control,option, painter, widget);
+        QProxyStyle::drawControl(control,option, painter, widget);
     }
 }
@@ -109 +109 @@
                             };
                     QPen oldPen = p->pen();
-                    
+
                     p->setPen(slider->palette.dark().color());
                     p->drawLine(QPoint(points[0].x(), points[0].y() -2 ),QPoint(points[2].x(), points[2].y()));
@@ -128 +128 @@
 
             if (slider->subControls & SC_SliderHandle) {
+                /*
                 const QColor c0 = slider->palette.shadow().color();
                 const QColor c1 = slider->palette.dark().color();
@@ -133 +134 @@
                 const QColor c3 = slider->palette.midlight().color();
                 const QColor c4 = slider->palette.light().color();
+                */
                 QBrush handleBrush;
 
@@ -164 +166 @@
     else
     {
-        QWindowsStyle::drawComplexControl(cc,opt,p,widget);
+        QProxyStyle::drawComplexControl(cc,opt,p,widget);
     }
 }
@@ -197 +199 @@
 
             if (slider->subControls & SC_SliderHandle) {
+                /*
                 const QColor c0 = slider->palette.shadow().color();
                 const QColor c1 = slider->palette.dark().color();
@@ -202 +205 @@
                 const QColor c3 = slider->palette.midlight().color();
                 const QColor c4 = slider->palette.light().color();
+                */
                 QBrush handleBrush;
 
@@ -234 +238 @@
     else
     {
-        QWindowsStyle::drawComplexControl(cc,opt,p,widget);
+        QProxyStyle::drawComplexControl(cc,opt,p,widget);
     }
 }

smplayer/trunk/src/mpcgui/mpcstyles.h

@@ -20 +20 @@
 #define MPC_STYLES_H
 
-#include <QWindowsStyle>
+#include <QProxyStyle>
 #include <QStyleOptionToolBar>
+#include <QStyleFactory>
 
 enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
 
-class MpcToolbarStyle : public QWindowsStyle
+class MpcToolbarStyle : public QProxyStyle
 {
     Q_OBJECT
 
 public:
-    MpcToolbarStyle() {};
+    MpcToolbarStyle() { setBaseStyle(QStyleFactory::create("windows")); };
     void drawControl(ControlElement control, const QStyleOption *option,
                       QPainter *painter, const QWidget *widget) const;
 };
 
-class MpcTimeSlideStyle : public QWindowsStyle
+class MpcTimeSlideStyle : public QProxyStyle
 {
     Q_OBJECT
 
 public:
-    MpcTimeSlideStyle() {};
+    MpcTimeSlideStyle() { setBaseStyle(QStyleFactory::create("windows")); };
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
                                        QPainter *p, const QWidget *widget) const;
 };
 
-class MpcVolumeSlideStyle : public QWindowsStyle
+class MpcVolumeSlideStyle : public QProxyStyle
 {
     Q_OBJECT
 
 public:
-    MpcVolumeSlideStyle() {};
+    MpcVolumeSlideStyle() { setBaseStyle(QStyleFactory::create("windows")); };
     void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
                                        QPainter *p, const QWidget *widget) const;