Changeset 168 for smplayer/vendor/current/src/basegui.cpp

Timestamp:

Oct 9, 2014, 11:54:00 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 14.9.0

File:

• smplayer/vendor/current/src/basegui.cpp (modified) (12 diffs)

smplayer/vendor/current/src/basegui.cpp

@@ -117 +117 @@
 #endif
 
+#ifdef AUTO_SHUTDOWN_PC
+#include "shutdowndialog.h"
+#include "shutdown.h"
+#endif
+
 using namespace Global;
 
@@ -123 +128 @@
 {
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef AVOID_SCREENSAVER
         /* Disable screensaver by event */
         just_stopped = false;
+#endif
 #endif
         ignore_show_hide_events = false;
@@ -1676 +1683 @@
         showConfigAct->change( Images::icon("show_config"), tr("&Open configuration folder") );
 #ifdef REMINDER_ACTIONS
-        donateAct->change( Images::icon("donate"), tr("&Donate") );
-#endif
-        aboutThisAct->change( Images::icon("logo_small"), tr("About &SMPlayer") );
+        donateAct->change( Images::icon("donate"), tr("&Donate / Share with your friends") );
+#endif
+        aboutThisAct->change( Images::icon("logo"), tr("About &SMPlayer") );
 
 #ifdef SHARE_MENU
@@ -3034 +3041 @@
 
 void BaseGui::newMediaLoaded() {
-    qDebug("BaseGui::newMediaLoaded");
-
-        pref->history_recents->addItem( core->mdat.filename );
+        qDebug("BaseGui::newMediaLoaded");
+
+        QString stream_title = core->mdat.stream_title;
+        qDebug("BaseGui::newMediaLoaded: mdat.stream_title: %s", stream_title.toUtf8().constData());
+
+        if (!stream_title.isEmpty()) {
+                pref->history_recents->addItem( core->mdat.filename, stream_title );
+                //pref->history_recents->list();
+        } else {
+                pref->history_recents->addItem( core->mdat.filename );
+        }
         updateRecents();
 
@@ -3323 +3338 @@
                         }
 
-                        QAction * a = recentfiles_menu->addAction( QString("%1. " + filename ).arg( i.insert( i.size()-1, '&' ), 3, ' ' ));
+                        QString show_name = filename;
+                        QString title = pref->history_recents->title(n);
+                        if (!title.isEmpty()) show_name = title;
+
+                        QAction * a = recentfiles_menu->addAction( QString("%1. " + show_name ).arg( i.insert( i.size()-1, '&' ), 3, ' ' ));
                         a->setStatusTip(fullname);
                         a->setData(n);
@@ -4567 +4586 @@
                 files = Helper::resolveSymlinks(files); // Check for Windows shortcuts
                 #endif
+                files.sort();
 
                 if (files.count() == 1) {
@@ -4687 +4707 @@
 
         if (arg_close_on_finish != 0) {
-                if ((arg_close_on_finish == 1) || (pref->close_on_finish)) exitAct->trigger();
+                if ((arg_close_on_finish == 1) || (pref->close_on_finish)) {
+                        #ifdef AUTO_SHUTDOWN_PC
+                        if (pref->auto_shutdown_pc) {
+                                ShutdownDialog d(this);
+                                if (d.exec() == QDialog::Accepted) {
+                                        qDebug("BaseGui::playlistHasFinished: the PC will shut down");
+                                        Shutdown::shutdown();
+                                } else {
+                                        qDebug("BaseGui::playlistHasFinished: shutdown aborted");
+                                }
+                        }
+                        #endif
+                        exitAct->trigger();
+                }
         }
 }
@@ -4701 +4734 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef AVOID_SCREENSAVER
         /* Disable screensaver by event */
         just_stopped = false;
@@ -4709 +4743 @@
                 QTimer::singleShot( time, this, SLOT(clear_just_stopped()) );
         }
+#endif
 #endif
 }
@@ -4967 +5002 @@
         QString styleSheet = QLatin1String(file.readAll());
 
+#ifdef USE_RESOURCES
+        Images::setTheme(pref->iconset);
+        QString path = ":/" + pref->iconset;
+#else
         QDir current = QDir::current();
         QString td = Images::themesDirectory();
-        QString relativePath = current.relativeFilePath(td);
+        QString path = current.relativeFilePath(td);
+#endif
         styleSheet.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
-                                                QString("url(%1\\1)").arg(relativePath + "/"));
-        qDebug("styeSheet: %s", styleSheet.toUtf8().constData());
-
+                                                QString("url(%1\\1)").arg(path + "/"));
+        //qDebug("BaseGui::loadQss: styeSheet: %s", styleSheet.toUtf8().constData());
         qApp->setStyleSheet(styleSheet);
 }
@@ -5250 +5289 @@
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef AVOID_SCREENSAVER
 void BaseGui::clear_just_stopped() {
         qDebug("BaseGui::clear_just_stopped");
@@ -5255 +5295 @@
 }
 #endif
+#endif
 
 #include "moc_basegui.cpp"