Changeset 154 for smplayer/vendor/current/src/smplayer.cpp

Timestamp:

Feb 21, 2014, 4:44:11 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.6

File:

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

smplayer/vendor/current/src/smplayer.cpp

@@ -27 +27 @@
 #include "config.h"
 #include "clhelp.h"
+#include "cleanconfig.h"
 #include "myapplication.h"
 
@@ -104 +105 @@
                         QString theme = pref->iconset;
                         if (theme.isEmpty()) theme = "Gonzo";
+                        QString user_theme_dir = Paths::configPath() + "/themes/" + theme;
                         QString theme_dir = Paths::themesPath() + "/" + theme;
+                        qDebug("SMPlayer::gui: user_theme_dir: %s", user_theme_dir.toUtf8().constData());
                         qDebug("SMPlayer::gui: theme_dir: %s", theme_dir.toUtf8().constData());
-                        if (QDir(theme_dir).exists()) {
+                        if ((QDir(theme_dir).exists()) || (QDir(user_theme_dir).exists())) {
                                 if (pref->iconset.isEmpty()) pref->iconset = theme;
                         } else {
@@ -205 +208 @@
 
 #ifdef Q_OS_WIN
-        if (args.contains("-uninstall")){
-#if USE_ASSOCIATIONS
+        if (args.contains("-uninstall")) {
+                #if USE_ASSOCIATIONS
                 //Called by uninstaller. Will restore old associations.
                 WinFileAssoc RegAssoc; 
@@ -214 +217 @@
                 RegAssoc.RestoreFileAssociations(regExts); 
                 printf("Restored associations\n");
-#endif
-                return NoError; 
-        }
-#endif
+                #endif
+                return NoError;
+        }
+#endif
+
+        if (args.contains("-delete-config")) {
+                CleanConfig::clean(Paths::configPath());
+                return NoError;
+        }
 
         for (int n = 1; n < args.count(); n++) {
@@ -393 +401 @@
 #ifdef FONTCACHE_DIALOG
 #ifndef PORTABLE_APP
-        if (smplayerVersion() != pref->smplayer_version) {
+        if (Version::with_revision() != pref->smplayer_version) {
                 FontCacheDialog d(0);
                 d.run(pref->mplayer_bin, "sample.avi");
-                pref->smplayer_version = smplayerVersion();
+                pref->smplayer_version = Version::with_revision();
         }
 #endif
@@ -454 +462 @@
 #endif
         QString s = QObject::tr("This is SMPlayer v. %1 running on %2")
-            .arg(smplayerVersion())
+            .arg(Version::printable())
 #ifdef Q_OS_LINUX
            .arg("Linux")