clean up palette pages

2 files changed, 65 insertions, 144 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp
index 0f8fcf66..8a8e86d0 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.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 <QPalette>
 #include <QColorDialog>
 #include <QSettings>
@@ -33,114 +5,91 @@
 #include "paletteeditdialog.h"
 #include "ui_paletteeditdialog.h"
 
-PaletteEditDialog::PaletteEditDialog(const QPalette &palette, QStyle *currentStyle, QWidget *parent) :
-    QDialog(parent),
-    m_ui(new Ui::PaletteEditDialog)
-{
-    m_currentStyle = currentStyle;
-    m_ui->setupUi(this);
-    m_ui->tableWidget->setColumnCount(3);
-    m_ui->tableWidget->setRowCount(QPalette::NColorRoles);
-    m_ui->tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().lineSpacing() + 10);
-    m_ui->tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-    m_ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-
-    QStringList labels;
-    labels << tr("Active") << tr("Inactive") << tr("Disabled");
-    m_ui->tableWidget->setHorizontalHeaderLabels(labels);
-    setPalette(palette);
-
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    restoreGeometry(settings.value("PaletteEditor/geometry").toByteArray());
+PaletteEditDialog::PaletteEditDialog(const QPalette &palette, QStyle *currentStyle, QWidget *parent) : QDialog(parent), m_ui(new Ui::PaletteEditDialog){
+  m_currentStyle = currentStyle;
+  m_ui->setupUi(this);
+  m_ui->tableWidget->setColumnCount(3);
+  m_ui->tableWidget->setRowCount(QPalette::NColorRoles);
+  m_ui->tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().lineSpacing() + 10);
+  m_ui->tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
+  m_ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+  QStringList labels;
+  labels << tr("Active") << tr("Inactive") << tr("Disabled");
+  m_ui->tableWidget->setHorizontalHeaderLabels(labels);
+  setPalette(palette);
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  restoreGeometry(settings.value("PaletteEditor/geometry").toByteArray());
 }
 
-PaletteEditDialog::~PaletteEditDialog()
-{
-    delete m_ui;
+PaletteEditDialog::~PaletteEditDialog(){
+  delete m_ui;
 }
 
-QPalette PaletteEditDialog::selectedPalette() const
-{
-    QPalette palette;
-    for(int i = 0; i < QPalette::NColorRoles; i++)
-    {
-        palette.setBrush(QPalette::Active, QPalette::ColorRole(i), m_ui->tableWidget->item(i,0)->backgroundColor());
-        palette.setBrush(QPalette::Inactive, QPalette::ColorRole(i), m_ui->tableWidget->item(i,1)->backgroundColor());
-        palette.setBrush(QPalette::Disabled, QPalette::ColorRole(i), m_ui->tableWidget->item(i,2)->backgroundColor());
+QPalette PaletteEditDialog::selectedPalette() const{
+  QPalette palette;
+  for(int i = 0; i < QPalette::NColorRoles; i++){
+    palette.setBrush(QPalette::Active, QPalette::ColorRole(i), m_ui->tableWidget->item(i,0)->backgroundColor());
+    palette.setBrush(QPalette::Inactive, QPalette::ColorRole(i), m_ui->tableWidget->item(i,1)->backgroundColor());
+    palette.setBrush(QPalette::Disabled, QPalette::ColorRole(i), m_ui->tableWidget->item(i,2)->backgroundColor());
     }
-    return palette;
+  return palette;
 }
 
-void PaletteEditDialog::setPalette(const QPalette &palette)
-{
-    for(int i = 0; i < QPalette::NColorRoles; i++)
-    {
-        if(!m_ui->tableWidget->item(i,0))
-            m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem());
-        if(!m_ui->tableWidget->item(i,1))
-            m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem());
+void PaletteEditDialog::setPalette(const QPalette &palette){
+  for(int i = 0; i < QPalette::NColorRoles; i++){
+    if(!m_ui->tableWidget->item(i,0))
+      m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem());
+      if(!m_ui->tableWidget->item(i,1))
+        m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem());
         if(!m_ui->tableWidget->item(i,2))
-            m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem());
-
-        m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i)));
-        m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i)));
-        m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i)));
+          m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem());
+          m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i)));
+          m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i)));
+          m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i)));
     }
-
-    QStringList labels;
-    labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark")
-           << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow")
-           << tr("Highlight") << tr("Highlighted text")  << tr("Link")  << tr("Visited link")
-           << tr("Alternate background") << tr("Default") << tr("Tooltip background")  << tr("Tooltip text");
-    m_ui->tableWidget->setVerticalHeaderLabels(labels);
+  QStringList labels;
+  labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark") << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow") << tr("Highlight") << tr("Highlighted text")  << tr("Link")  << tr("Visited link") << tr("Alternate background") << tr("Default") << tr("Tooltip background")  << tr("Tooltip text");
+  m_ui->tableWidget->setVerticalHeaderLabels(labels);
 }
 
-void PaletteEditDialog::hideEvent(QHideEvent *)
-{
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    settings.setValue("PaletteEditor/geometry", saveGeometry());
+void PaletteEditDialog::hideEvent(QHideEvent *){
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  settings.setValue("PaletteEditor/geometry", saveGeometry());
 }
 
-void PaletteEditDialog::on_tableWidget_itemClicked(QTableWidgetItem *item)
-{
-    QColor color = QColorDialog::getColor(item->backgroundColor(), this, tr("Select Color"));
-    if(color.isValid())
-    {
-        item->setBackgroundColor(color);
-        emit paletteChanged(selectedPalette());
+void PaletteEditDialog::on_tableWidget_itemClicked(QTableWidgetItem *item){
+  QColor color = QColorDialog::getColor(item->backgroundColor(), this, tr("Select Color"));
+  if(color.isValid()){
+    item->setBackgroundColor(color);
+    emit paletteChanged(selectedPalette());
     }
 }
 
-void PaletteEditDialog::on_resetPaletteButton_clicked()
-{
-    setPalette(m_currentStyle->standardPalette());
-    emit paletteChanged(selectedPalette());
+void PaletteEditDialog::on_resetPaletteButton_clicked(){
+  setPalette(m_currentStyle->standardPalette());
+  emit paletteChanged(selectedPalette());
 }
 
-void PaletteEditDialog::on_buildInactiveButton_clicked()
-{
-    QPalette palette = selectedPalette();
-    for(int i = 0; i < QPalette::NColorRoles; i++)
-    {
-        palette.setColor(QPalette::Inactive, QPalette::ColorRole(i),
-                         palette.color(QPalette::Active, QPalette::ColorRole(i)));
+void PaletteEditDialog::on_buildInactiveButton_clicked(){
+  QPalette palette = selectedPalette();
+  for(int i = 0; i < QPalette::NColorRoles; i++){
+    palette.setColor(QPalette::Inactive, QPalette::ColorRole(i),
+    palette.color(QPalette::Active, QPalette::ColorRole(i)));
     }
-    setPalette(palette);
-    emit paletteChanged(selectedPalette());
+  setPalette(palette);
+  emit paletteChanged(selectedPalette());
 }
 
-void PaletteEditDialog::on_buildDisabledButton_clicked()
-{
-    QPalette palette = selectedPalette();
-    for(int i = 0; i < QPalette::NColorRoles; i++)
-    {
-        palette.setColor(QPalette::Disabled, QPalette::ColorRole(i),
-                         palette.color(QPalette::Active, QPalette::ColorRole(i)));
+void PaletteEditDialog::on_buildDisabledButton_clicked(){
+  QPalette palette = selectedPalette();
+  for(int i = 0; i < QPalette::NColorRoles; i++){
+    palette.setColor(QPalette::Disabled, QPalette::ColorRole(i),
+    palette.color(QPalette::Active, QPalette::ColorRole(i)));
     }
-    palette.setColor(QPalette::Disabled, QPalette::ButtonText, Qt::darkGray);
-    palette.setColor(QPalette::Disabled, QPalette::WindowText, Qt::darkGray);
-    palette.setColor(QPalette::Disabled, QPalette::Text, Qt::darkGray);
-    palette.setColor(QPalette::Disabled, QPalette::HighlightedText, Qt::darkGray);
-    setPalette(palette);
-    emit paletteChanged(selectedPalette());
+  palette.setColor(QPalette::Disabled, QPalette::ButtonText, Qt::darkGray);
+  palette.setColor(QPalette::Disabled, QPalette::WindowText, Qt::darkGray);
+  palette.setColor(QPalette::Disabled, QPalette::Text, Qt::darkGray);
+  palette.setColor(QPalette::Disabled, QPalette::HighlightedText, Qt::darkGray);
+  setPalette(palette);
+  emit paletteChanged(selectedPalette());
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.h
index c8691a3c..040692f6 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.h
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.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 PALETTEEDITDIALOG_H
 #define PALETTEEDITDIALOG_H