projects
/
jspeed
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added zpos attribute to all elements. Changed architecture to allow detailscreen...
[jspeed]
/
src
/
themeselector.cpp
diff --git
a/src/themeselector.cpp
b/src/themeselector.cpp
index
7f22a09
..
e66d925
100644
(file)
--- a/
src/themeselector.cpp
+++ b/
src/themeselector.cpp
@@
-28,7
+28,7
@@
#include <QtGui/QMessageBox>
#include "themeselector.h"
#include "buttonselector.h"
#include <QtGui/QMessageBox>
#include "themeselector.h"
#include "buttonselector.h"
-#include "theme.h"
+#include "themeloader.h"
#include "settings.h"
ThemeSelector::ThemeSelector(QWidget* parent): QDialog(parent)
#include "settings.h"
ThemeSelector::ThemeSelector(QWidget* parent): QDialog(parent)
@@
-80,7
+80,7
@@
void ThemeSelector::loadFromFile()
{
QString filename = QFileDialog::getOpenFileName(this, tr("Open file"),
QDir::home().path(),
{
QString filename = QFileDialog::getOpenFileName(this, tr("Open file"),
QDir::home().path(),
- tr("Theme files") + "(*" + Theme::getThemeSuffix() + ")");
+ tr("Theme files") + "(*" + ThemeLoader::getThemeSuffix() + ")");
if(filename.isEmpty())
{
if(filename.isEmpty())
{
@@
-101,7
+101,7
@@
void ThemeSelector::loadFromFile()
basename = filename.mid(i + 1);
}
basename = filename.mid(i + 1);
}
- QString targetFile = Theme::getThemeDir() + basename;
+ QString targetFile = ThemeLoader::getThemeDir() + basename;
qDebug() << targetFile;
qDebug() << targetFile;
@@
-132,16
+132,16
@@
void ThemeSelector::loadThemes()
{
selector_->clear();
selector_->addItem(tr("Default"), "default");
{
selector_->clear();
selector_->addItem(tr("Default"), "default");
- QDir themeDir(Theme::getThemeDir());
+ QDir themeDir(ThemeLoader::getThemeDir());
if(!themeDir.exists() || !themeDir.isReadable())
{
if(!themeDir.exists() || !themeDir.isReadable())
{
- qDebug() << "Warning: theme dir (" + Theme::getThemeDir() + ") doesn't exist or is read protected";
+ qDebug() << "Warning: theme dir (" + ThemeLoader::getThemeDir() + ") doesn't exist or is read protected";
return;
}
QStringList filters;
return;
}
QStringList filters;
- filters << "*" + Theme::getThemeSuffix();
+ filters << "*" + ThemeLoader::getThemeSuffix();
themeDir.setNameFilters(filters);
themeDir.setFilter(QDir::Files);
QStringList files = themeDir.entryList();
themeDir.setNameFilters(filters);
themeDir.setFilter(QDir::Files);
QStringList files = themeDir.entryList();
@@
-165,7
+165,7
@@
void ThemeSelector::getThemeDetails(QString filename,
QString& name,
QString& id)
{
QString& name,
QString& id)
{
- static QRegExp cleaner(QRegExp::escape(Theme::getThemeSuffix()) + "$");
+ static QRegExp cleaner(QRegExp::escape(ThemeLoader::getThemeSuffix()) + "$");
filename = filename.replace(cleaner, "");
id = filename;
filename = filename.replace(cleaner, "");
id = filename;