← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty

« back to all changes in this revision

Viewing changes to src/kvirc/kernel/KviTheme.cpp

  • Committer: Package Import Robot
  • Author(s): Kai Wasserbäch
  • Date: 2011-09-29 16:27:07 UTC
  • mfrom: (0.3.15 upstream)
  • Revision ID: package-import@ubuntu.com-20110929162707-t29s6itjnsg2syuf
Tags: 4:4.1.3+20110929.svn5980-1
The "Balance of Power" release.

* Synced to upstream's SVN revision 5980.
* debian/control:
  - Vcs-* fields updated.
  - Remove libcrypto++-dev from B-Ds, was dropped upstream.
  - Bumped B-D on debhelper to >= 8.9.4.
* debian/rules:
  - Remove a now obsolete flag.
  - Upstream fixed a typo in a configuration variable name (now
    WANT_COEXISTENCE), updated invocation.
* debian/compat: Now at 9.
* Make KVIrc multiarch ready:
  - debian/{kvirc,libkvilib4,kvirc-modules}.install: Split out binaries
    under /usr/lib.
  - debian/rules: Add -DLIB_SUFFIX to dh_auto_configure invocation.
  - debian/control:
    + Added new packages (needed for split).
    + Added Multi-Arch fields
    + Added Pre-Depends: multiarch-support and ${misc:Pre-Depends} where
      needed.
    + Bumped B-D on CMake.
  - debian/{kvirc,libkvilib4,kvirc-modules}.lintian-overrides: Moved and
    updated overrides to match new locations (one could be dropped in the
    process).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kvirc/kernel/KviTheme.cpp
45
45
KviThemeInfo::KviThemeInfo()
46
46
: KviHeapObject()
47
47
{
 
48
        m_bBuiltin = false;
48
49
}
49
50
 
50
51
KviThemeInfo::~KviThemeInfo()
56
57
bool KviThemeInfo::load(const QString &szThemeFileName,bool bBuiltin)
57
58
{
58
59
        m_bBuiltin = bBuiltin;
59
 
        m_szThemeFileName = szThemeFileName;
 
60
        m_szSubdirectory = szThemeFileName;
 
61
        
60
62
        QString szThemePath;
61
63
        getCompleteDirPath(szThemePath);
62
64
 
63
 
        QString szThemeInfoFileName;
64
 
        //szThemeInfoFileName.append(KVI_PATH_SEPARATOR_CHAR);
65
 
        szThemeInfoFileName.append(KVI_THEMEINFO_FILE_NAME);
66
 
 
67
 
        QString szThemeDataFileName;
68
 
        //szThemeDataFileName.append(KVI_PATH_SEPARATOR_CHAR);
69
 
        szThemeDataFileName.append(KVI_THEMEDATA_FILE_NAME);
70
 
 
71
 
        QString t1=szThemePath+szThemeInfoFileName;
72
 
        if(!KviFileUtils::fileExists(szThemePath+szThemeInfoFileName))
 
65
        QString szThemeInfoFileName = szThemePath + KVI_THEMEINFO_FILE_NAME;
 
66
        QString szThemeDataFileName = szThemePath + KVI_THEMEDATA_FILE_NAME;
 
67
 
 
68
        if(!KviFileUtils::fileExists(szThemeInfoFileName))
73
69
        {
74
70
                m_szLastError = __tr2qs("The theme information file does not exist");
75
71
                return false;
76
72
        }
77
73
 
78
 
        if(!KviFileUtils::fileExists(szThemePath+szThemeDataFileName))
 
74
        if(!KviFileUtils::fileExists(szThemeDataFileName))
79
75
        {
80
76
                m_szLastError = __tr2qs("The theme data file does not exist");
81
77
                return false;
82
78
        }
83
79
 
84
80
 
85
 
        KviConfigurationFile cfg(szThemePath+szThemeInfoFileName,KviConfigurationFile::Read);
 
81
        KviConfigurationFile cfg(szThemeInfoFileName,KviConfigurationFile::Read);
86
82
 
87
83
        cfg.setGroup(KVI_THEMEINFO_CONFIG_GROUP);
88
84
 
273
269
 
274
270
                return true;
275
271
        }
 
272
 
276
273
        void installedThemes(QStringList &slThemes,bool bBuiltin)
277
274
        {
278
 
            QString szThemePath;
279
 
            if(bBuiltin) g_pApp->getGlobalKvircDirectory(szThemePath,KviApplication::Themes);
280
 
            else g_pApp->getLocalKvircDirectory(szThemePath,KviApplication::Themes);
281
 
            QDir d(szThemePath);
282
 
            QStringList sl = d.entryList(QDir::Dirs);
283
 
             for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
284
 
            {
285
 
                    QString a=*it;
286
 
                    if(*it == ".")continue;
287
 
                    if(*it == "..")continue;
288
 
                    slThemes.append(*it);
289
 
            }
 
275
                QString szThemePath;
 
276
                if(bBuiltin)
 
277
                        g_pApp->getGlobalKvircDirectory(szThemePath,KviApplication::Themes);
 
278
                else
 
279
                        g_pApp->getLocalKvircDirectory(szThemePath,KviApplication::Themes);
 
280
                QDir d(szThemePath);
 
281
                QStringList sl = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
282
                for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
 
283
                {
 
284
                        slThemes.append(*it);
 
285
                }
290
286
        }
291
287
};