Changeset 165 for smplayer/trunk/src/mpcgui/mpcgui.cpp

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/mpcgui/mpcgui.cpp (modified) (10 diffs)

smplayer/trunk/src/mpcgui/mpcgui.cpp

@@ -20 +20 @@
 #include "mpcstyles.h"
 #include "widgetactions.h"
-#include "floatingwidget.h"
+#include "autohidewidget.h"
 #include "myaction.h"
 #include "mplayerwindow.h"
@@ -32 +32 @@
 #include <QLabel>
 #include <QSlider>
+#include <QLayout>
 #include <QApplication>
 
@@ -42 +43 @@
         createActions();
         createControlWidget();
-    createStatusBar();
-
-        connect( this, SIGNAL(cursorNearBottom(QPoint)),
-             this, SLOT(showFloatingControl(QPoint)) );
-
-        connect( this, SIGNAL(cursorFarEdges()),
-             this, SLOT(hideFloatingControl()) );
+        createStatusBar();
+        createFloatingControl();
 
         retranslateStrings();
@@ -93 +89 @@
         controlwidget->setAllowedAreas(Qt::BottomToolBarArea);
         controlwidget->addAction(playAct);
-    controlwidget->addAction(pauseAct);
+        controlwidget->addAction(pauseAct);
         controlwidget->addAction(stopAct);
         controlwidget->addSeparator();
-    controlwidget->addAction(rewind3Act);
-    controlwidget->addAction(rewind1Act);
-    controlwidget->addAction(forward1Act);
-    controlwidget->addAction(forward3Act);
-    controlwidget->addSeparator();
-    controlwidget->addAction(frameStepAct);
-    controlwidget->addSeparator();
-
-    QLabel* pLabel = new QLabel(this);
-    pLabel->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-    controlwidget->addWidget(pLabel);
+        controlwidget->addAction(rewind3Act);
+        controlwidget->addAction(rewind1Act);
+        controlwidget->addAction(forward1Act);
+        controlwidget->addAction(forward3Act);
+        controlwidget->addSeparator();
+        controlwidget->addAction(frameStepAct);
+        controlwidget->addSeparator();
+
+        QLabel* pLabel = new QLabel(this);
+        pLabel->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
+        controlwidget->addWidget(pLabel);
 
         controlwidget->addAction(muteAct);
@@ -115 +111 @@
         timeslidewidget->setLayoutDirection(Qt::LeftToRight);
         timeslidewidget->addAction(timeslider_action);
-    timeslidewidget->setMovable(false);
-    
-    QColor SliderColor = palette().color(QPalette::Window);
-    QColor SliderBorderColor = palette().color(QPalette::Dark);
-    setIconSize( QSize( 16 , 16 ) );
-
-    addToolBar(Qt::BottomToolBarArea, controlwidget);
-    addToolBarBreak(Qt::BottomToolBarArea);
+        timeslidewidget->setMovable(false);
+
+        /*
+        QColor SliderColor = palette().color(QPalette::Window);
+        QColor SliderBorderColor = palette().color(QPalette::Dark);
+        */
+        setIconSize( QSize( 16 , 16 ) );
+
+        addToolBar(Qt::BottomToolBarArea, controlwidget);
+        addToolBarBreak(Qt::BottomToolBarArea);
         addToolBar(Qt::BottomToolBarArea, timeslidewidget);
 
-    controlwidget->setStyle(new  MpcToolbarStyle() );
-    timeslidewidget->setStyle(new  MpcToolbarStyle() );
-
-    statusBar()->show();
+        controlwidget->setStyle(new MpcToolbarStyle() );
+        timeslidewidget->setStyle(new MpcToolbarStyle() );
+
+        statusBar()->show();
+}
+
+void MpcGui::createFloatingControl() {
+        // Floating control
+        floating_control = new AutohideWidget(panel);
+        floating_control->setAutoHide(true);
+        floating_control->hide();
+        spacer = new QSpacerItem(10,10);
 }
 
@@ -163 +169 @@
         BaseGuiPlus::aboutToEnterFullscreen();
 
+        // Show floating_control
+        // Move controls to the floating_control layout
+        removeToolBarBreak(controlwidget);
+        removeToolBar(controlwidget);
+        removeToolBar(timeslidewidget);
+        floating_control->layout()->addWidget(timeslidewidget);
+        floating_control->layout()->addItem(spacer);
+        floating_control->layout()->addWidget(controlwidget);
+        controlwidget->show();
+        timeslidewidget->show();
+        floating_control->adjustSize();
+
+        floating_control->setMargin(pref->floating_control_margin);
+        floating_control->setPercWidth(pref->floating_control_width);
+        floating_control->setAnimated(pref->floating_control_animated);
+        floating_control->setActivationArea( (AutohideWidget::Activation) pref->floating_activation_area);
+        floating_control->setHideDelay(pref->floating_hide_delay);
+        QTimer::singleShot(500, floating_control, SLOT(activate()));
+
+
         if (!pref->compact_mode) {
-                controlwidget->hide();
-        timeslidewidget->hide();
-        statusBar()->hide();
+                //controlwidget->hide();
+                //timeslidewidget->hide();
+                statusBar()->hide();
         }
 }
@@ -173 +199 @@
         BaseGuiPlus::aboutToExitFullscreen();
 
+        // Remove controls from the floating_control and put them back to the mainwindow
+        floating_control->deactivate();
+        floating_control->layout()->removeWidget(controlwidget);
+        floating_control->layout()->removeWidget(timeslidewidget);
+        floating_control->layout()->removeItem(spacer);
+        addToolBar(Qt::BottomToolBarArea, controlwidget);
+        addToolBarBreak(Qt::BottomToolBarArea);
+        addToolBar(Qt::BottomToolBarArea, timeslidewidget);
+
         if (!pref->compact_mode) {
                 controlwidget->show();
-        statusBar()->show();
-        timeslidewidget->show();
+                statusBar()->show();
+                timeslidewidget->show();
+        } else {
+                controlwidget->hide();
+                timeslidewidget->hide();
         }
 }
@@ -184 +222 @@
 
         controlwidget->hide();
-    timeslidewidget->hide();
-    statusBar()->hide();
+        timeslidewidget->hide();
+        statusBar()->hide();
 }
 
@@ -193 +231 @@
         statusBar()->show();
         controlwidget->show();
-    timeslidewidget->show();
-}
-
-void MpcGui::showFloatingControl(QPoint /*p*/) {
-}
-
-void MpcGui::hideFloatingControl() {
+        timeslidewidget->show();
 }
 
@@ -381 +413 @@
         connect( this, SIGNAL(frameChanged(int)),
              this, SLOT(displayFrame(int)) );
-
-    connect( this, SIGNAL(cursorNearBottom(QPoint)),
-             this, SLOT(showFullscreenControls()) );
-
-    connect( this, SIGNAL(cursorFarEdges()),
-             this, SLOT(hideFullscreenControls()) );
 }