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

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/defaultgui.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -51 +51 @@
 #include <QMenuBar>
 #include <QMovie>
-
-#define TOOLBAR_VERSION 2
-#define CONTROLWIDGET_VERSION 0
-#define FLOATING_CONTROL_VERSION 1
+#include <QtCore/qmath.h>
+
+#define TOOLBAR_VERSION "2"
+#define CONTROLWIDGET_VERSION "1"
+#define CONTROLWIDGETMINI_VERSION "1"
+#define FLOATING_CONTROL_VERSION "1"
 
 using namespace Global;
@@ -63 +65 @@
         createStatusBar();
 
+        connect( core, SIGNAL(showTime(double)), this, SLOT(displayTime(double)));
         connect( this, SIGNAL(frameChanged(int)),
              this, SLOT(displayFrame(int)) );
@@ -69 +72 @@
         connect( this, SIGNAL(videoInfoChanged(int,int,double)),
              this, SLOT(displayVideoInfo(int,int,double)) );
+        connect( core, SIGNAL(bitrateChanged(int,int)), this, SLOT(displayBitrateInfo(int,int)) );
 
         createActions();
@@ -187 +191 @@
              format_info_display, SLOT(setVisible(bool)) );
 
+        viewBitrateInfoAct = new MyAction( this, "toggle_bitrate_info" );
+        viewBitrateInfoAct->setCheckable( true );
+        connect( viewBitrateInfoAct, SIGNAL(toggled(bool)),
+             bitrate_info_display, SLOT(setVisible(bool)) );
+
+        useMillisecondsAct = new MyAction( this, "use_milliseconds" );
+        useMillisecondsAct->setCheckable( true );
+
 #if USE_CONFIGURABLE_TOOLBARS
         editToolbar1Act = new MyAction( this, "edit_main_toolbar" );
@@ -242 +254 @@
         statusbar_menu->addAction(viewVideoInfoAct);
         statusbar_menu->addAction(viewFormatInfoAct);
+        statusbar_menu->addAction(viewBitrateInfoAct);
         statusbar_menu->addAction(viewFrameCounterAct);
+        statusbar_menu->addAction(useMillisecondsAct);
 
         populateMainMenu();
@@ -595 +609 @@
         time_display->setText(" 88:88:88 / 88:88:88 ");
         time_display->setMinimumSize(time_display->sizeHint());
-        connect(this, SIGNAL(timeChanged(QString)), time_display, SLOT(setText(QString)));
+        //connect(this, SIGNAL(timeChanged(QString)), time_display, SLOT(setText(QString)));
 
         frame_display = new QLabel( statusBar() );
@@ -620 +634 @@
         format_info_display->setAlignment(Qt::AlignRight);
         format_info_display->setFrameShape(QFrame::NoFrame);
+
+        bitrate_info_display = new QLabel( statusBar() );
+        bitrate_info_display->setObjectName("bitrate_info_display");
+        bitrate_info_display->setAlignment(Qt::AlignRight);
+        bitrate_info_display->setFrameShape(QFrame::NoFrame);
 
 #ifdef BUFFERING_ANIMATION
@@ -643 +662 @@
         statusBar()->setSizeGripEnabled(false);
 
+        statusBar()->addPermanentWidget( format_info_display );
+        statusBar()->addPermanentWidget( bitrate_info_display );
+        statusBar()->addPermanentWidget( ab_section_display );
         statusBar()->addPermanentWidget( video_info_display );
-        statusBar()->addPermanentWidget( format_info_display );
-        statusBar()->addPermanentWidget( ab_section_display );
 
         statusBar()->showMessage( tr("Ready") );
@@ -659 +679 @@
         video_info_display->hide();
         format_info_display->hide();
+        bitrate_info_display->hide();
 }
 
@@ -687 +708 @@
         viewFrameCounterAct->change( Images::icon("frame_counter"), tr("&Frame counter") );
         viewFormatInfoAct->change( Images::icon("view_format_info"), tr("F&ormat info") );
+        viewBitrateInfoAct->change( Images::icon("view_bitrate_info"), tr("&Bitrate info") );
+        useMillisecondsAct->change( Images::icon("use_milliseconds"), tr("&Show the current time with milliseconds") );
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -701 +724 @@
 
 
+void DefaultGui::displayTime(double sec) {
+        //qDebug() << "DefaultGui::displayTime:" << sec;
+
+        static int last_second = 0;
+        QString time;
+
+        if (useMillisecondsAct->isChecked()) {
+                time = Helper::formatTime2(sec) + " / " + Helper::formatTime( (int) core->mdat.duration );
+        } else {
+                if (qFloor(sec) == last_second) return; // Update only once per second
+                last_second = qFloor(sec);
+                time = Helper::formatTime( (int) sec ) + " / " + Helper::formatTime( (int) core->mdat.duration );
+        }
+        time_display->setText(time);
+}
+
 void DefaultGui::displayFrame(int frame) {
         if (frame_display->isVisible()) {
@@ -734 +773 @@
 }
 
+void DefaultGui::displayBitrateInfo(int vbitrate, int abitrate) {
+        bitrate_info_display->setText(tr("V: %1 kbps A: %2 kbps").arg(vbitrate/1000).arg(abitrate/1000));
+}
+
 void DefaultGui::updateWidgets() {
         qDebug("DefaultGui::updateWidgets");
 
         BaseGuiPlus::updateWidgets();
+
+        viewFrameCounterAct->setEnabled((PlayerID::player(pref->mplayer_bin) == PlayerID::MPLAYER));
+        viewBitrateInfoAct->setEnabled((PlayerID::player(pref->mplayer_bin) == PlayerID::MPV));
 
         panel->setFocus();
@@ -935 +981 @@
         set->setValue("frame_counter", viewFrameCounterAct->isChecked());
         set->setValue("format_info", viewFormatInfoAct->isChecked());
+        set->setValue("bitrate_info", viewBitrateInfoAct->isChecked());
+        set->setValue("use_milliseconds", useMillisecondsAct->isChecked());
 
         set->setValue("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible);
@@ -954 +1002 @@
 #if USE_CONFIGURABLE_TOOLBARS
         set->beginGroup( "actions" );
-        set->setValue("toolbar1", toolbar1->actionsToStringList() );
-        set->setValue("controlwidget", controlwidget->actionsToStringList() );
-        set->setValue("controlwidget_mini", controlwidget_mini->actionsToStringList() );
+        set->setValue("toolbar1/" TOOLBAR_VERSION, toolbar1->actionsToStringList() );
+        set->setValue("controlwidget/" CONTROLWIDGET_VERSION, controlwidget->actionsToStringList() );
+        set->setValue("controlwidget_mini/" CONTROLWIDGETMINI_VERSION, controlwidget_mini->actionsToStringList() );
         EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
-        set->setValue("floating_control", iw->actionsToStringList() );
-        set->setValue("toolbar1_version", TOOLBAR_VERSION);
-        set->setValue("controlwidget_version", CONTROLWIDGET_VERSION);
-        set->setValue("floating_control_version", FLOATING_CONTROL_VERSION);
+        set->setValue("floating_control/" FLOATING_CONTROL_VERSION, iw->actionsToStringList() );
         set->endGroup();
 
@@ -985 +1030 @@
         viewFrameCounterAct->setChecked(set->value("frame_counter", false).toBool());
         viewFormatInfoAct->setChecked(set->value("format_info", false).toBool());
+        viewBitrateInfoAct->setChecked(set->value("bitrate_info", false).toBool());
+        useMillisecondsAct->setChecked(set->value("use_milliseconds", false).toBool());
 
         fullscreen_toolbar1_was_visible = set->value("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible).toBool();
@@ -1015 +1062 @@
 #if USE_CONFIGURABLE_TOOLBARS
         set->beginGroup( "actions" );
-        int toolbar_version = set->value("toolbar1_version", 0).toInt();
-        if (toolbar_version >= TOOLBAR_VERSION) {
-                toolbar1->setActionsFromStringList( set->value("toolbar1", toolbar1->defaultActions()).toStringList() );
-        } else {
-                qDebug("DefaultGui::loadConfig: toolbar too old, loading default one");
-                toolbar1->setActionsFromStringList( toolbar1->defaultActions() );
-        }
-
-        int controlwidget_version = set->value("controlwidget_version", 0).toInt();
-        if (controlwidget_version >= CONTROLWIDGET_VERSION) {
-                QStringList l = set->value("controlwidget", controlwidget->defaultActions()).toStringList();
-                #ifdef ADD_QUICK_ACCESS
-                if (l.indexOf("quick_access_menu") == -1) l << "quick_access_menu";
-                #endif
-                controlwidget->setActionsFromStringList(l);
-        } else {
-                controlwidget->setActionsFromStringList( controlwidget->defaultActions() );
-        }
-
-        controlwidget_mini->setActionsFromStringList( set->value("controlwidget_mini", controlwidget_mini->defaultActions()).toStringList() );
+        toolbar1->setActionsFromStringList( set->value("toolbar1/" TOOLBAR_VERSION, toolbar1->defaultActions()).toStringList() );
+
+        {
+        QStringList l = set->value("controlwidget/" CONTROLWIDGET_VERSION, controlwidget->defaultActions()).toStringList();
+        #ifdef ADD_QUICK_ACCESS
+        if (l.indexOf("quick_access_menu") == -1) l << "quick_access_menu";
+        #endif
+        controlwidget->setActionsFromStringList(l);
+        }
+
+        controlwidget_mini->setActionsFromStringList( set->value("controlwidget_mini/" CONTROLWIDGETMINI_VERSION, controlwidget_mini->defaultActions()).toStringList() );
+
         EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
-
-        int floating_control_version = set->value("floating_control_version", 0).toInt();
-        if (floating_control_version >= FLOATING_CONTROL_VERSION) {
-                iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
-        } else {
-                qDebug("DefaultGui::loadConfig: floating control too old, loading default one");
-                iw->setActionsFromStringList( iw->defaultActions() );
-        }
+        iw->setActionsFromStringList( set->value("floating_control/" FLOATING_CONTROL_VERSION, iw->defaultActions()).toStringList() );
         set->endGroup();