Changeset 176 for smplayer/trunk/src/defaultgui.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/defaultgui.cpp (modified) (22 diffs)

smplayer/trunk/src/defaultgui.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -31 +31 @@
 #include "editabletoolbar.h"
 
+#if !USE_CONFIGURABLE_TOOLBARS
+#include "favorites.h"
+#endif
+
 #if DOCK_PLAYLIST
 #include "playlistdock.h"
+#endif
+
+#ifdef BUFFERING_ANIMATION
+#include "statewidget.h"
 #endif
 
@@ -42 +50 @@
 #include <QToolButton>
 #include <QMenuBar>
+#include <QMovie>
 
 #define TOOLBAR_VERSION 1
@@ -63 +72 @@
         createActions();
         createMainToolBars();
-    createControlWidget();
-    createControlWidgetMini();
+        createControlWidget();
+        createControlWidgetMini();
         createFloatingControl();
         createMenus();
@@ -99 +108 @@
                 }
         }
+
+        applyStyles();
 }
 
@@ -119 +130 @@
 
         timeslider_action = createTimeSliderAction(this);
+        volumeslider_action = createVolumeSliderAction(this);
+
+#if AUTODISABLE_ACTIONS
         timeslider_action->disable();
-
-        volumeslider_action = createVolumeSliderAction(this);
         volumeslider_action->disable();
+#endif
 
         // Create the time label
@@ -176 +189 @@
 }
 #endif // AUTODISABLE_ACTIONS
+
+void DefaultGui::togglePlayAction(Core::State state) {
+        qDebug("DefaultGui::togglePlayAction");
+        BaseGui::togglePlayAction(state);
+
+        if (state == Core::Playing) {
+                playOrPauseAct->setIcon(Images::icon("pause"));
+        } else {
+                playOrPauseAct->setIcon(Images::icon("play"));
+        }
+}
 
 void DefaultGui::createMenus() {
@@ -227 +251 @@
 #else
         toolbar1->addAction(openFileAct);
-        toolbar1->addAction(openDVDAct);
+        /* toolbar1->addAction(openDVDAct); */
         toolbar1->addAction(openURLAct);
+        toolbar1->addAction(favorites->menuAction());
         toolbar1->addSeparator();
+        /*
         toolbar1->addAction(compactAct);
         toolbar1->addAction(fullscreenAct);
         toolbar1->addSeparator();
+        */
         toolbar1->addAction(screenshotAct);
         toolbar1->addSeparator();
@@ -245 +272 @@
         //toolbar1->addAction(timeslider_action);
         //toolbar1->addAction(volumeslider_action);
+
+        QToolButton * button = qobject_cast<QToolButton *>(toolbar1->widgetForAction(favorites->menuAction()));
+        button->setPopupMode(QToolButton::InstantPopup);
 #endif
 
@@ -257 +287 @@
 
         select_subtitle = new QPushButton( this );
-        select_subtitle->setMenu( subtitlestrack_menu );
+        select_subtitle->setMenu( subtitles_track_menu );
         toolbar2->addWidget(select_subtitle);
 
@@ -327 +357 @@
 #if USE_CONFIGURABLE_TOOLBARS
         QStringList controlwidget_actions;
-        controlwidget_actions << "play" << "pause_and_frame_step" << "stop" << "separator";
+        controlwidget_actions << "play_or_pause" << "stop" << "separator";
         #if MINI_ARROW_BUTTONS
         controlwidget_actions << "rewindbutton_action";
@@ -342 +372 @@
         controlwidget->setDefaultActions(controlwidget_actions);
 #else
+        /*
         controlwidget->addAction(playAct);
         controlwidget->addAction(pauseAndStepAct);
+        */
+        controlwidget->addAction(playOrPauseAct);
         controlwidget->addAction(stopAct);
 
@@ -386 +419 @@
         EditableToolbar * iw = new EditableToolbar(floating_control);
         iw->setObjectName("floating_control");
+        connect(iw, SIGNAL(iconSizeChanged(const QSize &)), this, SLOT(adjustFloatingControlSize()));
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -482 +516 @@
         video_info_display->setFrameShape(QFrame::NoFrame);
 
+#ifdef BUFFERING_ANIMATION
+        state_widget = new StateWidget(statusBar());
+        connect(core, SIGNAL(stateChanged(Core::State)), state_widget, SLOT(watchState(Core::State)));
+        statusBar()->addPermanentWidget(state_widget);
+#endif
+
         statusBar()->setAutoFillBackground(true);
 
@@ -499 +539 @@
         statusBar()->addPermanentWidget( ab_section_display );
 
-    statusBar()->showMessage( tr("Welcome to SMPlayer") );
+        statusBar()->showMessage( tr("Ready") );
         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 ");
 
@@ -515 +555 @@
         BaseGuiPlus::retranslateStrings();
 
+        // Change the icon of the play/pause action
+        playOrPauseAct->setIcon(Images::icon("play"));
+
         toolbar_menu->menuAction()->setText( tr("&Toolbars") );
         toolbar_menu->menuAction()->setIcon( Images::icon("toolbars") );
@@ -538 +581 @@
         editControl2Act->change( tr("Edit m&ini control bar") );
         editFloatingControlAct->change( tr("Edit &floating control") );
+#endif
+
+#ifdef BUFFERING_ANIMATION
+        state_widget->setAnimation(Images::file("buffering.gif"));
 #endif
 }
@@ -612 +659 @@
         reconfigureFloatingControl();
         floating_control->deactivate(); // Hide the control in case it was running from compact mode
-        QTimer::singleShot(500, floating_control, SLOT(activate()));
+        QTimer::singleShot(100, floating_control, SLOT(activate()));
 
 
@@ -656 +703 @@
         if (pref->floating_display_in_compact_mode) {
                 reconfigureFloatingControl();
-                QTimer::singleShot(500, floating_control, SLOT(activate()));
+                QTimer::singleShot(100, floating_control, SLOT(activate()));
         }
 
@@ -721 +768 @@
 #endif
 
+void DefaultGui::adjustFloatingControlSize() {
+        qDebug("DefaultGui::adjustFloatingControlSize");
+        //floating_control->adjustSize();
+        QWidget *iw = floating_control->internalWidget();
+        QSize iws = iw->size();
+        QMargins m = floating_control->contentsMargins();
+        int new_height = iws.height() + m.top() + m.bottom();
+        if (new_height < 32) new_height = 32;
+        floating_control->resize(floating_control->width(), new_height);
+}
 
 void DefaultGui::saveConfig() {
@@ -755 +812 @@
         set->setValue("toolbar1_version", TOOLBAR_VERSION);
         set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        set->setValue("toolbar1", toolbar1->iconSize());
+        set->setValue("controlwidget", controlwidget->iconSize());
+        set->setValue("controlwidget_mini", controlwidget_mini->iconSize());
+        set->setValue("floating_control", iw->iconSize());
+        set->endGroup();
 #endif
 
@@ -807 +871 @@
         EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
         iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
+        set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        toolbar1->setIconSize(set->value("toolbar1", toolbar1->iconSize()).toSize());
+        controlwidget->setIconSize(set->value("controlwidget", controlwidget->iconSize()).toSize());
+        controlwidget_mini->setIconSize(set->value("controlwidget_mini", controlwidget_mini->iconSize()).toSize());
+        iw->setIconSize(set->value("floating_control", iw->iconSize()).toSize());
+        set->endGroup();
+
         floating_control->adjustSize();
-        set->endGroup();
 #endif