aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorq5sys <jt@obs-sec.com>2017-07-20 19:17:47 -0400
committerq5sys <jt@obs-sec.com>2017-07-20 19:17:47 -0400
commit31b4ea8e7b0dc1b8945f6af741a4517a75c2a0e1 (patch)
treed2fe8230f076e354d9a2d1379d7f7667115bc866
parentGet the compositing working much smoother now. (diff)
downloadlumina-31b4ea8e7b0dc1b8945f6af741a4517a75c2a0e1.tar.gz
lumina-31b4ea8e7b0dc1b8945f6af741a4517a75c2a0e1.tar.bz2
lumina-31b4ea8e7b0dc1b8945f6af741a4517a75c2a0e1.zip
clean up appearance source files
-rw-r--r--src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp532
-rw-r--r--src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h32
2 files changed, 200 insertions, 364 deletions
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
index b9175d6e..95f2c9b7 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp
@@ -1,31 +1,3 @@
-/*
- * Copyright (c) 2014-2017, Ilya Kotov <forkotov02@hotmail.ru>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
#include <QStyleFactory>
#include <QMdiSubWindow>
#include <QSettings>
@@ -40,379 +12,273 @@
#include "ui_appearancepage.h"
#include "ui_previewform.h"
-AppearancePage::AppearancePage(QWidget *parent) :
- TabPage(parent),
- m_ui(new Ui::AppearancePage)
-{
- m_ui->setupUi(this);
- QStringList keys = QStyleFactory::keys();
- keys.removeAll("lthemeengine-style"); //hide lthemeengine proxy style
- m_ui->styleComboBox->addItems(keys);
-
- connect(m_ui->paletteComboBox, SIGNAL(activated(int)), SLOT(updatePalette()));
- connect(m_ui->customPaletteButton, SIGNAL(clicked()), SLOT(updatePalette()));
- connect(m_ui->defaultPaletteButton, SIGNAL(clicked()), SLOT(updatePalette()));
-
- m_previewWidget = new QWidget(this);
- m_previewUi = new Ui::PreviewForm();
- m_previewUi->setupUi(m_previewWidget);
- QMdiSubWindow *w = m_ui->mdiArea->addSubWindow(m_previewWidget, Qt::CustomizeWindowHint
- | Qt::WindowMinMaxButtonsHint
- | Qt::WindowTitleHint);
- w->move(10, 10);
-
- QMenu *menu = new QMenu(this);
- menu->addAction(QIcon::fromTheme("list-add"), tr("Create"), this, SLOT(createColorScheme()));
- m_changeColorSchemeAction = menu->addAction(tr("Edit"), this, SLOT(changeColorScheme()));
- menu->addAction(tr("Create a Copy"), this, SLOT(copyColorScheme()));
- m_renameColorSchemeAction = menu->addAction(tr("Rename"), this, SLOT(renameColorScheme()));
- menu->addSeparator();
- m_removeColorSchemeAction = menu->addAction(tr("Remove"), this, SLOT(removeColorScheme()));
- m_ui->colorSchemeButton->setMenu(menu);
-
- m_changeColorSchemeAction->setIcon(QIcon::fromTheme("accessories-text-editor"));
- m_removeColorSchemeAction->setIcon(QIcon::fromTheme("list-remove"));
- connect(menu, SIGNAL(aboutToShow()), SLOT(updateActions()));
-
- readSettings();
+AppearancePage::AppearancePage(QWidget *parent) : TabPage(parent), m_ui(new Ui::AppearancePage){
+ m_ui->setupUi(this);
+ QStringList keys = QStyleFactory::keys();
+ keys.removeAll("lthemeengine-style"); //hide lthemeengine proxy style
+ m_ui->styleComboBox->addItems(keys);
+ connect(m_ui->paletteComboBox, SIGNAL(activated(int)), SLOT(updatePalette()));
+ connect(m_ui->customPaletteButton, SIGNAL(clicked()), SLOT(updatePalette()));
+ connect(m_ui->defaultPaletteButton, SIGNAL(clicked()), SLOT(updatePalette()));
+ m_previewWidget = new QWidget(this);
+ m_previewUi = new Ui::PreviewForm();
+ m_previewUi->setupUi(m_previewWidget);
+ QMdiSubWindow *w = m_ui->mdiArea->addSubWindow(m_previewWidget, Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+ w->move(10, 10);
+
+ QMenu *menu = new QMenu(this);
+ menu->addAction(QIcon::fromTheme("list-add"), tr("Create"), this, SLOT(createColorScheme()));
+ m_changeColorSchemeAction = menu->addAction(tr("Edit"), this, SLOT(changeColorScheme()));
+ menu->addAction(tr("Create a Copy"), this, SLOT(copyColorScheme()));
+ m_renameColorSchemeAction = menu->addAction(tr("Rename"), this, SLOT(renameColorScheme()));
+ menu->addSeparator();
+ m_removeColorSchemeAction = menu->addAction(tr("Remove"), this, SLOT(removeColorScheme()));
+ m_ui->colorSchemeButton->setMenu(menu);
+ m_changeColorSchemeAction->setIcon(QIcon::fromTheme("accessories-text-editor"));
+ m_removeColorSchemeAction->setIcon(QIcon::fromTheme("list-remove"));
+ connect(menu, SIGNAL(aboutToShow()), SLOT(updateActions()));
+
+ readSettings();
}
-AppearancePage::~AppearancePage()
-{
- if(m_selectedStyle)
- delete m_selectedStyle;
+AppearancePage::~AppearancePage(){
+ if(m_selectedStyle)
+ delete m_selectedStyle;
delete m_ui;
delete m_previewUi;
}
-void AppearancePage::writeSettings()
-{
- QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
- settings.beginGroup("Appearance");
- settings.setValue("style", m_ui->styleComboBox->currentText());
- settings.setValue("custom_palette", m_ui->customPaletteButton->isChecked());
- settings.setValue("color_scheme_path", m_ui->colorSchemeComboBox->currentData().toString());
- settings.endGroup();
+void AppearancePage::writeSettings(){
+ QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+ settings.beginGroup("Appearance");
+ settings.setValue("style", m_ui->styleComboBox->currentText());
+ settings.setValue("custom_palette", m_ui->customPaletteButton->isChecked());
+ settings.setValue("color_scheme_path", m_ui->colorSchemeComboBox->currentData().toString());
+ settings.endGroup();
}
-void AppearancePage::on_styleComboBox_activated(const QString &text)
-{
- QStyle *style = QStyleFactory::create(text);
- if(!style)
- return;
+void AppearancePage::on_styleComboBox_activated(const QString &text){
+ QStyle *style = QStyleFactory::create(text);
+ if(!style)
+ return;
setStyle(m_previewWidget, style);
-
if(m_selectedStyle)
- delete m_selectedStyle;
- m_selectedStyle = style;
-
- updatePalette();
+ delete m_selectedStyle;
+ m_selectedStyle = style;
+ updatePalette();
}
-void AppearancePage::on_colorSchemeComboBox_activated(int)
-{
- m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
- updatePalette();
+void AppearancePage::on_colorSchemeComboBox_activated(int){
+ m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
+ updatePalette();
}
-void AppearancePage::createColorScheme()
-{
- QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"));
- if(name.isEmpty())
- return;
-
+void AppearancePage::createColorScheme(){
+ QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"));
+ if(name.isEmpty())
+ return;
if(!name.endsWith(".conf", Qt::CaseInsensitive))
- name.append(".conf");
-
- if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1)
- {
- QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists")
- .arg(name.section('.',0,0)));
+ name.append(".conf");
+ if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+ QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
return;
- }
-
+ }
QString schemePath = lthemeengine::userColorSchemePath() + "/" + name;
-
createColorScheme(schemePath, palette());
m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath);
}
-void AppearancePage::changeColorScheme()
-{
- if(m_ui->colorSchemeComboBox->currentIndex() < 0)
- return;
-
- if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable())
- {
- QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only")
- .arg(m_ui->colorSchemeComboBox->currentText()));
- return;
+void AppearancePage::changeColorScheme(){
+ if(m_ui->colorSchemeComboBox->currentIndex() < 0)
+ return;
+ if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+ QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
+ return;
}
-
PaletteEditDialog d(m_customPalette, m_selectedStyle, this);
connect(&d, SIGNAL(paletteChanged(QPalette)), SLOT(setPreviewPalette(QPalette)));
- if(d.exec() == QDialog::Accepted)
- {
- m_customPalette = d.selectedPalette();
- createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette);
+ if(d.exec() == QDialog::Accepted){
+ m_customPalette = d.selectedPalette();
+ createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette);
}
updatePalette();
}
-void AppearancePage::removeColorScheme()
-{
- int index = m_ui->colorSchemeComboBox->currentIndex();
- if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1)
- return;
-
- if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable())
- {
- QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only")
- .arg(m_ui->colorSchemeComboBox->currentText()));
- return;
+void AppearancePage::removeColorScheme(){
+ int index = m_ui->colorSchemeComboBox->currentIndex();
+ if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1)
+ return;
+ if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+ QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
+ return;
}
-
- int button = QMessageBox::question(this, tr("Confirm Remove"),
- tr("Are you sure you want to remove color scheme \"%1\"?")
- .arg(m_ui->colorSchemeComboBox->currentText()),
- QMessageBox::Yes | QMessageBox::No);
+ int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove color scheme \"%1\"?").arg(m_ui->colorSchemeComboBox->currentText()), QMessageBox::Yes | QMessageBox::No);
if(button != QMessageBox::Yes)
- return;
-
- if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString()))
- {
+ return;
+ if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString())){
m_ui->colorSchemeComboBox->removeItem(index);
on_colorSchemeComboBox_activated(0);
- }
+ }
}
-void AppearancePage::copyColorScheme()
-{
- if(m_ui->colorSchemeComboBox->currentIndex() < 0)
- return;
-
- QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),
- QLineEdit::Normal,
- tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText()));
+void AppearancePage::copyColorScheme(){
+ if(m_ui->colorSchemeComboBox->currentIndex() < 0)
+ return;
+ QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),QLineEdit::Normal, tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText()));
if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText())
- return;
-
- if(!name.endsWith(".conf", Qt::CaseInsensitive))
- name.append(".conf");
-
- if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1)
- {
- QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists")
- .arg(name.section('.',0,0)));
- return;
- }
-
- QString newPath = lthemeengine::userColorSchemePath() + "/" + name;
- QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
- m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath);
+ return;
+ if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf");
+ if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+ QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
+ return;
+ }
+ QString newPath = lthemeengine::userColorSchemePath() + "/" + name;
+ QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
+ m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath);
}
-void AppearancePage::renameColorScheme()
-{
- int index = m_ui->colorSchemeComboBox->currentIndex();
-
+void AppearancePage::renameColorScheme(){
+ int index = m_ui->colorSchemeComboBox->currentIndex();
if(index < 0)
+ return;
+ if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+ QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText()));
return;
-
- if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable())
- {
- QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only")
- .arg(m_ui->colorSchemeComboBox->currentText()));
- return;
- }
-
- QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),
- QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText());
- if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText())
- return;
-
- if(!name.endsWith(".conf", Qt::CaseInsensitive))
- name.append(".conf");
-
- if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1)
- {
- QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists")
- .arg(name.section('.',0,0)));
+ }
+ QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"), QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText());
+ if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText())
return;
- }
-
- QString newPath = lthemeengine::userColorSchemePath() + "/" + name;
- QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
- m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0));
- m_ui->colorSchemeComboBox->setItemData(index, newPath);
+ if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf");
+ if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){
+ QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0)));
+ return;
+ }
+ QString newPath = lthemeengine::userColorSchemePath() + "/" + name;
+ QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath);
+ m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0));
+ m_ui->colorSchemeComboBox->setItemData(index, newPath);
}
-void AppearancePage::updatePalette()
-{
+void AppearancePage::updatePalette(){
if(!m_selectedStyle)
- return;
-
- setPreviewPalette(m_ui->customPaletteButton->isChecked() ?
- m_customPalette : m_selectedStyle->standardPalette());
+ return;
+ setPreviewPalette(m_ui->customPaletteButton->isChecked() ? m_customPalette : m_selectedStyle->standardPalette());
}
-void AppearancePage::setPreviewPalette(const QPalette &p)
-{
- QPalette previewPalette = palette();
-
- QPalette::ColorGroup colorGroup = QPalette::Disabled;
-
- if(m_ui->paletteComboBox->currentIndex() == 0)
- {
- colorGroup = QPalette::Active;
- }
- else if(m_ui->paletteComboBox->currentIndex() == 1)
- {
- colorGroup = QPalette::Inactive;
+void AppearancePage::setPreviewPalette(const QPalette &p){
+ QPalette previewPalette = palette();
+ QPalette::ColorGroup colorGroup = QPalette::Disabled;
+ if(m_ui->paletteComboBox->currentIndex() == 0){
+ colorGroup = QPalette::Active;
}
-
- for (int i = 0; i < QPalette::NColorRoles; i++)
- {
- QPalette::ColorRole role = QPalette::ColorRole(i);
- previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role));
- previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role));
- }
-
- setPalette(m_ui->mdiArea, previewPalette);
+ else if(m_ui->paletteComboBox->currentIndex() == 1){
+ colorGroup = QPalette::Inactive;
+ }
+ for (int i = 0; i < QPalette::NColorRoles; i++){
+ QPalette::ColorRole role = QPalette::ColorRole(i);
+ previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role));
+ previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role));
+ }
+ setPalette(m_ui->mdiArea, previewPalette);
}
-void AppearancePage::updateActions()
-{
- if(m_ui->colorSchemeComboBox->count() == 0 ||
- !QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable())
- {
- m_changeColorSchemeAction->setVisible(false);
- m_renameColorSchemeAction->setVisible(false);
- m_removeColorSchemeAction->setVisible(false);
- }
- else
- {
- m_changeColorSchemeAction->setVisible(true);
- m_renameColorSchemeAction->setVisible(true);
- m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1);
+void AppearancePage::updateActions(){
+ if(m_ui->colorSchemeComboBox->count() == 0 || !QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){
+ m_changeColorSchemeAction->setVisible(false);
+ m_renameColorSchemeAction->setVisible(false);
+ m_removeColorSchemeAction->setVisible(false);
}
+ else{
+ m_changeColorSchemeAction->setVisible(true);
+ m_renameColorSchemeAction->setVisible(true);
+ m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1);
+ }
}
-void AppearancePage::readSettings()
-{
- QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
- settings.beginGroup("Appearance");
- QString style = settings.value("style", "Fusion").toString();
- m_ui->styleComboBox->setCurrentText(style);
-
- m_ui->customPaletteButton->setChecked(settings.value("custom_palette", false).toBool());
- QString colorSchemePath = settings.value("color_scheme_path").toString();
-
- QDir("/").mkpath(lthemeengine::userColorSchemePath());
- findColorSchemes(lthemeengine::userColorSchemePath());
- findColorSchemes(lthemeengine::sharedColorSchemePath().join(", "));
-
- if(m_ui->colorSchemeComboBox->count() == 0)
- {
- m_customPalette = palette(); //load fallback palette
- }
- else
- {
- int index = m_ui->colorSchemeComboBox->findData(colorSchemePath);
- if(index >= 0)
- m_ui->colorSchemeComboBox->setCurrentIndex(index);
- m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
+void AppearancePage::readSettings(){
+ QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+ settings.beginGroup("Appearance");
+ QString style = settings.value("style", "Fusion").toString();
+ m_ui->styleComboBox->setCurrentText(style);
+ m_ui->customPaletteButton->setChecked(settings.value("custom_palette", false).toBool());
+ QString colorSchemePath = settings.value("color_scheme_path").toString();
+ QDir("/").mkpath(lthemeengine::userColorSchemePath());
+ findColorSchemes(lthemeengine::userColorSchemePath());
+ findColorSchemes(lthemeengine::sharedColorSchemePath().join(", "));
+ if(m_ui->colorSchemeComboBox->count() == 0){
+ m_customPalette = palette(); //load fallback palette
}
-
+ else{
+ int index = m_ui->colorSchemeComboBox->findData(colorSchemePath);
+ if(index >= 0)
+ m_ui->colorSchemeComboBox->setCurrentIndex(index);
+ m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString());
+ }
on_styleComboBox_activated(m_ui->styleComboBox->currentText());
-
settings.endGroup();
}
-void AppearancePage::setStyle(QWidget *w, QStyle *s)
-{
- foreach (QObject *o, w->children())
- {
- if(o->isWidgetType())
- {
- setStyle(qobject_cast<QWidget *>(o), s);
- }
+void AppearancePage::setStyle(QWidget *w, QStyle *s){
+ foreach (QObject *o, w->children()){
+ if(o->isWidgetType()){
+ setStyle(qobject_cast<QWidget *>(o), s);
}
- w->setStyle(s);
+ }
+ w->setStyle(s);
}
-void AppearancePage::setPalette(QWidget *w, QPalette p)
-{
- foreach (QObject *o, w->children())
- {
- if(o->isWidgetType())
- {
- setPalette(qobject_cast<QWidget *>(o), p);
- }
+void AppearancePage::setPalette(QWidget *w, QPalette p){
+ foreach (QObject *o, w->children()){
+ if(o->isWidgetType()){
+ setPalette(qobject_cast<QWidget *>(o), p);
+ }
}
- w->setPalette(p);
+ w->setPalette(p);
}
-void AppearancePage::findColorSchemes(const QString &path)
-{
- QDir dir(path);
- dir.setFilter(QDir::Files);
- dir.setNameFilters(QStringList() << "*.conf");
-
- foreach (QFileInfo info, dir.entryInfoList())
- {
- m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath());
+void AppearancePage::findColorSchemes(const QString &path){
+ QDir dir(path);
+ dir.setFilter(QDir::Files);
+ dir.setNameFilters(QStringList() << "*.conf");
+ foreach (QFileInfo info, dir.entryInfoList()){
+ m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath());
}
}
-QPalette AppearancePage::loadColorScheme(const QString &filePath)
-{
- QPalette customPalette;
- QSettings settings(filePath, QSettings::IniFormat);
- settings.beginGroup("ColorScheme");
- QStringList activeColors = settings.value("active_colors").toStringList();
- QStringList inactiveColors = settings.value("inactive_colors").toStringList();
- QStringList disabledColors = settings.value("disabled_colors").toStringList();
- settings.endGroup();
-
- if(activeColors.count() == QPalette::NColorRoles &&
- inactiveColors.count() == QPalette::NColorRoles &&
- disabledColors.count() == QPalette::NColorRoles)
- {
- for (int i = 0; i < QPalette::NColorRoles; i++)
- {
- QPalette::ColorRole role = QPalette::ColorRole(i);
- customPalette.setColor(QPalette::Active, role, QColor(activeColors.at(i)));
- customPalette.setColor(QPalette::Inactive, role, QColor(inactiveColors.at(i)));
- customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i)));
- }
+QPalette AppearancePage::loadColorScheme(const QString &filePath){
+ QPalette customPalette;
+ QSettings settings(filePath, QSettings::IniFormat);
+ settings.beginGroup("ColorScheme");
+ QStringList activeColors = settings.value("active_colors").toStringList();
+ QStringList inactiveColors = settings.value("inactive_colors").toStringList();
+ QStringList disabledColors = settings.value("disabled_colors").toStringList();
+ settings.endGroup();
+ if(activeColors.count() == QPalette::NColorRoles && inactiveColors.count() == QPalette::NColorRoles && disabledColors.count() == QPalette::NColorRoles){
+ for (int i = 0; i < QPalette::NColorRoles; i++){
+ QPalette::ColorRole role = QPalette::ColorRole(i);
+ customPalette.setColor(QPalette::Active, role, QColor(activeColors.at(i)));
+ customPalette.setColor(QPalette::Inactive, role, QColor(inactiveColors.at(i)));
+ customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i)));
+ }
}
- else
- {
- customPalette = palette(); //load fallback palette
- }
-
+ else{
+ customPalette = palette(); //load fallback palette
+ }
return customPalette;
}
-void AppearancePage::createColorScheme(const QString &name, const QPalette &palette)
-{
- QSettings settings(name, QSettings::IniFormat);
- settings.beginGroup("ColorScheme");
-
- QStringList activeColors, inactiveColors, disabledColors;
- for (int i = 0; i < QPalette::NColorRoles; i++)
- {
- QPalette::ColorRole role = QPalette::ColorRole(i);
- activeColors << palette.color(QPalette::Active, role).name();
- inactiveColors << palette.color(QPalette::Inactive, role).name();
- disabledColors << palette.color(QPalette::Disabled, role).name();
+void AppearancePage::createColorScheme(const QString &name, const QPalette &palette){
+ QSettings settings(name, QSettings::IniFormat);
+ settings.beginGroup("ColorScheme");
+ QStringList activeColors, inactiveColors, disabledColors;
+ for (int i = 0; i < QPalette::NColorRoles; i++){
+ QPalette::ColorRole role = QPalette::ColorRole(i);
+ activeColors << palette.color(QPalette::Active, role).name();
+ inactiveColors << palette.color(QPalette::Inactive, role).name();
+ disabledColors << palette.color(QPalette::Disabled, role).name();
}
-
- settings.setValue("active_colors",activeColors);
- settings.setValue("inactive_colors",inactiveColors);
- settings.setValue("disabled_colors",disabledColors);
-
- settings.endGroup();
-
+ settings.setValue("active_colors",activeColors);
+ settings.setValue("inactive_colors",inactiveColors);
+ settings.setValue("disabled_colors",disabledColors);
+ settings.endGroup();
}
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h
index 3a7752c7..23bab52f 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h
@@ -1,31 +1,3 @@
-/*
- * Copyright (c) 2014-2017, Ilya Kotov <forkotov02@hotmail.ru>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
#ifndef APPEARANCEPAGE_H
#define APPEARANCEPAGE_H
@@ -39,14 +11,12 @@ class PreviewForm;
class QStyle;
class QAction;
-class AppearancePage : public TabPage
-{
+class AppearancePage : public TabPage{
Q_OBJECT
public:
explicit AppearancePage(QWidget *parent = 0);
~AppearancePage();
-
void writeSettings();
private slots:
bgstack15