Changeset 188 for smplayer/trunk/src/basegui.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/basegui.cpp (modified) (35 diffs)

smplayer/trunk/src/basegui.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
@@ -42 +42 @@
 #include <QDesktopWidget>
 
-#include <cmath>
+#include <QtCore/qmath.h>
 
 #include "mplayerwindow.h"
@@ -261 +261 @@
 #endif
 
-#if defined(SHARE_ACTIONS) && !defined(SHARE_WIDGET)
+#ifdef DONATE_REMINDER
         QTimer::singleShot(1000, this, SLOT(checkReminder()));
 #endif
@@ -907 +907 @@
              this, SLOT(helpShowConfig()) );
 
-#ifdef SHARE_ACTIONS
         donateAct = new MyAction( this, "donate" );
         connect( donateAct, SIGNAL(triggered()),
              this, SLOT(helpDonate()) );
-#endif
 
         aboutThisAct = new MyAction( this, "about_smplayer" );
@@ -1068 +1066 @@
                          core, SLOT(nextWheelFunction()) );
 
-        showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_filename");
+        showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_info_osd");
         connect( showFilenameAct, SIGNAL(triggered()), core, SLOT(showFilenameOnOSD()) );
 
@@ -1482 +1480 @@
 
         // Screenshot option
+        /*
         bool screenshots_enabled = ( (pref->use_screenshot) && 
                                  (!pref->screenshot_directory.isEmpty()) &&
@@ -1488 +1487 @@
         screenshotAct->setEnabled( screenshots_enabled );
         screenshotsAct->setEnabled( screenshots_enabled );
+        */
 
 #ifdef CAPTURE_STREAM
@@ -1568 +1568 @@
         // Disable video filters if using vdpau
         if ((pref->vdpau.disable_video_filters) && (pref->vo.startsWith("vdpau"))) {
+                /*
                 screenshotAct->setEnabled(false);
                 screenshotsAct->setEnabled(false);
+                */
                 flipAct->setEnabled(false);
                 mirrorAct->setEnabled(false);
@@ -1844 +1846 @@
 #ifdef SHARE_ACTIONS
         donateAct->change( Images::icon("donate"), tr("&Donate / Share with your friends") );
+#else
+        donateAct->change( Images::icon("donate"), tr("&Donate") );
 #endif
         aboutThisAct->change( Images::icon("logo"), tr("About &SMPlayer") );
@@ -1899 +1903 @@
         nextWheelFunctionAct->change( Images::icon("next_wheel_function"), tr("Next wheel function") );
 
-        showFilenameAct->change( tr("Show filename on OSD") );
+        showFilenameAct->change( tr("Show &info on OSD") );
         showTimeAct->change( tr("Show playback time on OSD") );
+
         toggleDeinterlaceAct->change( tr("Toggle deinterlacing") );
 
@@ -2320 +2325 @@
         sharewidget = new ShareWidget(Global::settings, mplayerwindow);
         mplayerwindow->setCornerWidget(sharewidget);
-        #ifdef SHARE_ACTIONS
+        //#ifdef SHARE_ACTIONS
         connect(sharewidget, SIGNAL(supportClicked()), this, SLOT(helpDonate()));
-        #endif
+        //#endif
 #endif
 
@@ -2434 +2439 @@
             core, SLOT(open(const QString &, int)));
 
+        connect(playlist, SIGNAL(requestToPlayStream(const QString &, QStringList)),
+            core, SLOT(openStream(const QString &, QStringList)));
+
         connect(playlist, SIGNAL(requestToAddCurrentFile()), this, SLOT(addToPlaylistCurrentFile()));
 
-        if (playlist->automaticallyPlayNext()) {
-                connect( core, SIGNAL(mediaFinished()), playlist, SLOT(playNext()), Qt::QueuedConnection );
-        }
+        connect( core, SIGNAL(mediaFinished()), playlist, SLOT(playNextAuto()), Qt::QueuedConnection );
+
         connect( core, SIGNAL(mplayerFailed(QProcess::ProcessError)), playlist, SLOT(playerFailed(QProcess::ProcessError)) );
         connect( core, SIGNAL(mplayerFinishedWithError(int)), playlist, SLOT(playerFinishedWithError(int)) );
@@ -2696 +2703 @@
         osd_menu->menuAction()->setObjectName("osd_menu");
         osd_menu->addActions(osdGroup->actions());
+        osd_menu->addSeparator();
+        osd_menu->addAction(showFilenameAct);
         osd_menu->addSeparator();
         osd_menu->addAction(decOSDScaleAct);
@@ -2985 +2994 @@
                 helpMenu->addSeparator();
         }
-        #ifdef SHARE_ACTIONS
         helpMenu->addAction(donateAct);
         helpMenu->addSeparator();
-        #endif
         helpMenu->addAction(aboutThisAct);
 
@@ -3107 +3114 @@
         pl->setSavePlaylistOnExit(playlist->savePlaylistOnExit());
         pl->setPlayFilesFromStart(playlist->playFilesFromStart());
+        pl->setPlayOnLoad(playlist->startPlayOnLoad());
+        pl->setPlayNextAutomatically(playlist->automaticallyPlayNext());
         pl->setIgnorePlayerErrors(playlist->ignorePlayerErrors());
+        pl->setAutoSort(playlist->autoSort());
+        pl->setFilterCaseSensitive(playlist->filterCaseSensitive());
 
         pref_dialog->show();
@@ -3117 +3128 @@
 
         bool need_update_language = false;
+        bool need_apply_styles = false;
 
         PlayerID::Player old_player_type = PlayerID::player(pref->mplayer_bin);
@@ -3124 +3136 @@
         // Setup proxy
         setupNetworkProxy();
-
-        // Change application font
-        if (!pref->default_font.isEmpty()) {
-                QFont f;
-                f.fromString( pref->default_font );
-                if (QApplication::font() != f) {
-                        qDebug("BaseGui::applyNewPreferences: setting new font: %s", pref->default_font.toLatin1().constData());
-                        QApplication::setFont(f);
-                }
-        }
 
         PrefGeneral *_general = pref_dialog->mod_general();
@@ -3150 +3152 @@
                 // Stylesheet
                 #if ALLOW_CHANGE_STYLESHEET
-                if (!_interface->guiChanged()) applyStyles();
+                if (!_interface->guiChanged()) need_apply_styles = true;
                 #endif
         }
+
+        if (_interface->fontChanged()) need_apply_styles = true;
 
 #ifndef MOUSE_GESTURES
@@ -3199 +3203 @@
         playlist->setSavePlaylistOnExit(pl->savePlaylistOnExit());
         playlist->setPlayFilesFromStart(pl->playFilesFromStart());
+        playlist->setStartPlayOnLoad(pl->playOnLoad());
+        playlist->setAutomaticallyPlayNext(pl->playNextAutomatically());
         playlist->setIgnorePlayerErrors(pl->ignorePlayerErrors());
+        playlist->setAutoSort(pl->autoSort());
+        playlist->setFilterCaseSensitive(pl->filterCaseSensitive());
 
 #ifdef PLAYLIST_DOWNLOAD
@@ -3214 +3222 @@
 #if STYLE_SWITCHING
         if (_interface->styleChanged()) {
-                applyStyles();
-        }
-#endif
-
-    // Restart the video if needed
+                need_apply_styles = true;
+        }
+#endif
+
+        if (need_apply_styles) applyStyles();
+
+        // Restart the video if needed
         if (pref_dialog->requiresRestart())
                 core->restart();
@@ -4092 +4102 @@
         qDebug("BaseGui::openFavorite");
 
+        QUrl url(file);
+        if (url.isValid() && url.scheme().toLower() == "file") {
+                file = url.toLocalFile();
+        }
+
         openFiles(QStringList() << file);
 }
@@ -4157 +4172 @@
 
 void BaseGui::openFile() {
-        qDebug("BaseGui::fileOpen");
+        qDebug("BaseGui::openFile");
 
         exitFullscreenIfNeeded();
@@ -4176 +4191 @@
 
 void BaseGui::openFile(QString file) {
-        qDebug("BaseGui::openFile: '%s'", file.toUtf8().data());
+        qDebug() << "BaseGui::openFile:" << file;
 
    if ( !file.isEmpty() ) {
 
+                #ifdef Q_OS_WIN
+                // Check for Windows shortcuts
+                QFileInfo fi(file);
+                if (fi.isSymLink()) {
+                        file = fi.symLinkTarget();
+                }
+                #endif
+        
                 //playlist->clear();
                 //playlistdock->hide();
@@ -4465 +4488 @@
                 #endif
         }
+}
+#else
+void BaseGui::helpDonate() {
+        qDebug("BaseGui::helpDonate");
+
+        int action = 0;
+        bool accepted;
+        showHelpDonateDialog(&accepted);
+        if (accepted) action = 1;
+
+        if (action > 0) {
+                QSettings * set = Global::settings;
+                set->beginGroup("reminder");
+                set->setValue("action", action);
+                set->endGroup();
+        }
+}
+
+void BaseGui::showHelpDonateDialog(bool * accepted) {
+        bool result = false;
+
+        QMessageBox d(this);
+        d.setIconPixmap(Images::icon("donate"));
+        d.setWindowTitle(tr("Support SMPlayer"));
+
+        QPushButton * ok_button = d.addButton(tr("Donate"), QMessageBox::YesRole);
+        d.addButton(tr("No"), QMessageBox::NoRole);
+        d.setDefaultButton(ok_button);
+
+        d.setText("<h1>" + tr("SMPlayer needs you") + "</h1><p>" +
+                tr("SMPlayer is free software. However the development requires a lot of time and a lot of work.") + "<p>" +
+                tr("In order to keep developing SMPlayer with new features we need your help.") + "<p>" +
+                tr("Please consider to support the SMPlayer project by sending a donation.") + " " +
+                tr("Even the smallest amount will help a lot.")
+        );
+        d.exec();
+        if (d.clickedButton() == ok_button) {
+                QDesktopServices::openUrl(QUrl(URL_DONATE));
+                result = true;
+        }
+        if (accepted != 0) *accepted = result;
 }
 #endif
@@ -4652 +4716 @@
         updateWidgets();
 
+#ifdef ADD_BLACKBORDERS_FS
         if ((pref->add_blackborders_on_fullscreen) && 
         (!core->mset.add_letterbox)) 
@@ -4658 +4723 @@
                 /* core->restart(); */
         }
+#endif
 
         setFocus(); // Fixes bug #2493415
@@ -4890 +4956 @@
 #endif
 
-#if defined(SHARE_ACTIONS) && !defined(SHARE_WIDGET)
+#ifdef DONATE_REMINDER
 void BaseGui::checkReminder() {
         qDebug("BaseGui::checkReminder");
@@ -4912 +4978 @@
 #endif
 
+#ifdef SHARE_ACTIONS
         ShareDialog d(this);
         //d.showRemindCheck(false);
@@ -4923 +4990 @@
                 set->endGroup();
         }
+#else
+        action = 0;
+        bool accepted;
+        showHelpDonateDialog(&accepted);
+        if (accepted) action = 1;
+#endif
 
         if (action > 0) {
@@ -5222 +5295 @@
         if (!core->mdat.filename.isEmpty()) {
                 playlist->addItem(core->mdat.filename, "", 0);
+                playlist->setModified(true);
                 playlist->getMediaInfo(core->mdat);
         }
@@ -5260 +5334 @@
 
 void BaseGui::gotCurrentTime(double sec) {
-        //qDebug( "DefaultGui::displayTime: %f", sec);
+        //qDebug() << "BaseGui::gotCurrentTime:" << sec;
 
         static int last_second = 0;
 
-        if (floor(sec)==last_second) return; // Update only once per second
-        last_second = (int) floor(sec);
+        if (qFloor(sec) == last_second) return; // Update only once per second
+        last_second = qFloor(sec);
 
         QString time = Helper::formatTime( (int) sec ) + " / " +
                            Helper::formatTime( (int) core->mdat.duration );
-
-        //qDebug( " duration: %f, current_sec: %f", core->mdat.duration, core->mset.current_sec);
 
         emit timeChanged(sec);
@@ -5401 +5473 @@
 
         if (panel->isVisible()) {
+                if (isMaximized()) showNormal();
+
                 // Exit from fullscreen mode 
                 if (pref->fullscreen) { toggleFullscreen(false); update(); }
@@ -5628 +5702 @@
         }
 
+        // Use the user specified font
+        if (!pref->default_font.isEmpty()) {
+                QFont f;
+                f.fromString( pref->default_font );
+                QString fstyle = QString("QWidget { font: %1 %2 %3pt %4; }")
+                        .arg(f.bold() ? "bold" :"").arg(f.italic() ? "italic" : "")
+                        .arg(f.pointSize()).arg(f.family());
+                stylesheet = fstyle + stylesheet;
+        }
         //qDebug() << "BaseGui::changeStyleSheet: styleSheet:" << stylesheet;
         qApp->setStyleSheet(stylesheet);
@@ -5635 +5718 @@
 void BaseGui::applyStyles() {
         qDebug("BaseGui::applyStyles");
+
+#if !ALLOW_CHANGE_STYLESHEET
+        if (!pref->default_font.isEmpty()) {
+                QFont f;
+                f.fromString( pref->default_font );
+                if (QApplication::font() != f) {
+                        qDebug() << "BaseGui::applyStyles: setting new font:" << pref->default_font;
+                        QApplication::setFont(f);
+                }
+        }
+#endif
 
 #if ALLOW_CHANGE_STYLESHEET
@@ -5652 +5746 @@
         }
 #endif
+
 }