← Back to branch summary

~ubuntu-branches/ubuntu/wily/smplayer/wily

« back to all changes in this revision

Viewing changes to src/prefinterface.cpp

  • Committer: Package Import Robot
  • Author(s): Mateusz Łukasik, Mateusz Łukasik, Alessio Treglia
  • Date: 2014-09-10 13:50:48 UTC
  • mfrom: (1.3.3)
  • mto: This revision was merged to the branch mainline in revision 27.
  • Revision ID: package-import@ubuntu.com-20140910135048-t043hd88bhpfvfow
[ Mateusz Łukasik ]
* New upstream release.

[ Alessio Treglia ]
* Repackaging upstream sources to get rid of
  zlib/contrib/dotzlib/DotZLib.chm.
* Enable parallel builds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/prefinterface.cpp
59
59
        qDebug("icon_dir: %s", icon_dir.absolutePath().toUtf8().data());
60
60
        QStringList iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
61
61
        for (int n=0; n < iconsets.count(); n++) {
 
62
                QString theme_dir = Paths::configPath() + "/themes/" + iconsets[n];
 
63
                #ifdef USE_RESOURCES
 
64
                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
 
65
                #endif
 
66
 
62
67
                #ifdef SKINS
63
 
                QString css_file = Paths::configPath() + "/themes/" + iconsets[n] + "/main.css";
 
68
                QString css_file = theme_dir + "/main.css";
64
69
                bool is_skin = QFile::exists(css_file);
65
70
                //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
66
71
                if (is_skin) {
76
81
        qDebug("icon_dir: %s", icon_dir.absolutePath().toUtf8().data());
77
82
        iconsets = icon_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
78
83
        for (int n=0; n < iconsets.count(); n++) {
 
84
                QString theme_dir = Paths::themesPath() + "/" + iconsets[n];
 
85
                #ifdef USE_RESOURCES
 
86
                if (!QFile::exists(theme_dir + "/" + iconsets[n] + ".rcc")) continue;
 
87
                #endif
 
88
 
79
89
                #ifdef SKINS
80
 
                QString css_file = Paths::themesPath() + "/" + iconsets[n] + "/main.css";
 
90
                QString css_file = theme_dir + "/main.css";
81
91
                bool is_skin = QFile::exists(css_file);
82
92
                //qDebug("***** %s %d", css_file.toUtf8().constData(), is_skin);
83
 
                if ((is_skin) && (iconset_combo->findText( iconsets[n] ) == -1)) {
 
93
                if ((is_skin) && (skin_combo->findText( iconsets[n] ) == -1)) {
84
94
                        skin_combo->addItem( iconsets[n] );
85
95
                        n_skins++;
86
96
                }