← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/smplayer.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/smplayer.cpp
27
27
#include "clhelp.h"
28
28
#include "cleanconfig.h"
29
29
#include "myapplication.h"
 
30
#include "images.h"
30
31
 
31
32
#ifdef MPCGUI
32
33
#include "mpcgui.h"
119
120
                        QString theme_dir = Paths::themesPath() + "/" + theme;
120
121
                        qDebug("SMPlayer::gui: user_theme_dir: %s", user_theme_dir.toUtf8().constData());
121
122
                        qDebug("SMPlayer::gui: theme_dir: %s", theme_dir.toUtf8().constData());
 
123
                        #ifdef USE_RESOURCES
 
124
                        QString user_theme_resource = user_theme_dir +"/"+ theme +".rcc";
 
125
                        QString theme_resource = theme_dir +"/"+ theme +".rcc";
 
126
                        qDebug("SMPlayer::gui: user_theme_resource: %s", user_theme_resource.toUtf8().constData());
 
127
                        qDebug("SMPlayer::gui: theme_resource: %s", theme_resource.toUtf8().constData());
 
128
                        if ((QFile::exists(user_theme_resource)) || (QFile::exists(theme_resource))) {
 
129
                        #else
122
130
                        if ((QDir(theme_dir).exists()) || (QDir(user_theme_dir).exists())) {
 
131
                        #endif
123
132
                                if (pref->iconset.isEmpty()) pref->iconset = theme;
124
133
                        } else {
 
134
                                #ifdef USE_RESOURCES
 
135
                                qDebug("SMPlayer::gui: skin resource file doesn't exist. Falling back to default gui.");
 
136
                                #else
125
137
                                qDebug("SMPlayer::gui: skin folder doesn't exist. Falling back to default gui.");
 
138
                                #endif
126
139
                                gui_to_use = "DefaultGUI";
127
140
                                pref->iconset = "";
128
141
                                pref->gui = gui_to_use;