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

smplayer/vendor/current/src/prefinterface.cpp

@@ -60 +60 @@
         QStringList iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
+                QString theme_dir = Paths::configPath() + "/themes/" + iconsets[n];
+                #ifdef USE_RESOURCES
+                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
+                #endif
+
                 #ifdef SKINS
-                QString css_file = Paths::configPath() + "/themes/" + iconsets[n] + "/main.css";
+                QString css_file = theme_dir + "/main.css";
                 bool is_skin = QFile::exists(css_file);
                 //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
@@ -77 +82 @@
         iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
         for (int n=0; n < iconsets.count(); n++) {
+                QString theme_dir = Paths::themesPath() + "/" + iconsets[n];
+                #ifdef USE_RESOURCES
+                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
+                #endif
+
                 #ifdef SKINS
-                QString css_file = Paths::themesPath() + "/" + iconsets[n] + "/main.css";
+                QString css_file = theme_dir + "/main.css";
                 bool is_skin = QFile::exists(css_file);
                 //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
-                if ((is_skin) && (iconset_combo->findText( iconsets[n] ) == -1)) {
+                if ((is_skin) && (skin_combo->findText( iconsets[n] ) == -1)) {
                         skin_combo->addItem( iconsets[n] );
                         n_skins++;