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

Timestamp:

May 23, 2013, 5:06:17 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.5'

File:

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

smplayer/vendor/current/src/smplayer.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -62 +62 @@
 #endif
 
-        gui_to_use = "DefaultGui";
+        gui_to_use = "DefaultGUI";
 
         close_at_end = -1; // Not set
@@ -99 +99 @@
                 qDebug("SMPlayer::gui: changed working directory to app path");
                 qDebug("SMPlayer::gui: current directory: %s", QDir::currentPath().toUtf8().data());
+
+#ifdef SKINS
+                if (gui_to_use == "SkinGUI") {
+                        QString theme = pref->iconset;
+                        if (theme.isEmpty()) theme = "Gonzo";
+                        QString theme_dir = Paths::themesPath() + "/" + theme;
+                        qDebug("SMPlayer::gui: theme_dir: %s", theme_dir.toUtf8().constData());
+                        if (QDir(theme_dir).exists()) {
+                                if (pref->iconset.isEmpty()) pref->iconset = theme;
+                        } else {
+                                qDebug("SMPlayer::gui: skin folder doesn't exist. Falling back to default gui.");
+                                gui_to_use = "DefaultGUI";
+                                pref->iconset = "";
+                                pref->gui = gui_to_use;
+                        }
+                }
+#endif
 
                 main_window = createGUI(gui_to_use);
@@ -295 +312 @@
                 else
                 if (argument == "-mini" || argument == "-minigui") {
-                        gui_to_use = "MiniGui";
+                        gui_to_use = "MiniGUI";
                 }
                 else
                 if (argument == "-mpcgui") {
-                        gui_to_use = "MpcGui";
+                        gui_to_use = "MpcGUI";
                 }
                 else
                 if (argument == "-defaultgui") {
-                        gui_to_use = "DefaultGui";
-                }
+                        gui_to_use = "DefaultGUI";
+                }
+#ifdef SKINS
+                else
+                if (argument == "-skingui") {
+                        gui_to_use = "SkinGUI";
+                }
+#endif
                 else {
                         // File