Changeset 168 for smplayer/vendor/current/src/smplayer.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/smplayer.cpp (modified) (2 diffs)

smplayer/vendor/current/src/smplayer.cpp ¶

@@ -28 +28 @@
 #include "cleanconfig.h"
 #include "myapplication.h"
+#include "images.h"
 
 #ifdef MPCGUI
@@ -120 +121 @@
                         qDebug("SMPlayer::gui: user_theme_dir: %s", user_theme_dir.toUtf8().constData());
                         qDebug("SMPlayer::gui: theme_dir: %s", theme_dir.toUtf8().constData());
+                        #ifdef USE_RESOURCES
+                        QString user_theme_resource = user_theme_dir +"/"+ theme +".rcc";
+                        QString theme_resource = theme_dir +"/"+ theme +".rcc";
+                        qDebug("SMPlayer::gui: user_theme_resource: %s", user_theme_resource.toUtf8().constData());
+                        qDebug("SMPlayer::gui: theme_resource: %s", theme_resource.toUtf8().constData());
+                        if ((QFile::exists(user_theme_resource)) || (QFile::exists(theme_resource))) {
+                        #else
                         if ((QDir(theme_dir).exists()) || (QDir(user_theme_dir).exists())) {
+                        #endif
                                 if (pref->iconset.isEmpty()) pref->iconset = theme;
                         } else {
+                                #ifdef USE_RESOURCES
+                                qDebug("SMPlayer::gui: skin resource file doesn't exist. Falling back to default gui.");
+                                #else
                                 qDebug("SMPlayer::gui: skin folder doesn't exist. Falling back to default gui.");
+                                #endif
                                 gui_to_use = "DefaultGUI";
                                 pref->iconset = "";