clean up main pages

3 files changed, 52 insertions, 164 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp
index 1961d17d..55d0fc36 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.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 <QApplication>
 #include <QLibraryInfo>
 #include <QLocale>
@@ -36,49 +8,34 @@
 #include <QStyleFactory>
 #include "mainwindow.h"
 
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    QTranslator translator;
-    QString locale = lthemeengine::systemLanguageID();
-    translator.load(QString(":/lthemeengine_") + locale);
-    app.installTranslator(&translator);
-
-    QTranslator qt_translator;
-    qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + locale);
-    app.installTranslator(&qt_translator);
-
-    qDebug("Configuration path: %s", qPrintable(lthemeengine::configPath()));
-    qDebug("Shared QSS path: %s", qPrintable(lthemeengine::sharedStyleSheetPath().join(", ")));
-
-    //checking environment
-    QStringList errorMessages;
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-
-    if(env.contains("QT_STYLE_OVERRIDE"))
-    {
-        errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable");
+int main(int argc, char **argv){
+  QApplication app(argc, argv);
+  QTranslator translator;
+  QString locale = lthemeengine::systemLanguageID();
+  translator.load(QString(":/lthemeengine_") + locale);
+  app.installTranslator(&translator);
+  QTranslator qt_translator;
+  qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + locale);
+  app.installTranslator(&qt_translator);
+  qDebug("Configuration path: %s", qPrintable(lthemeengine::configPath()));
+  qDebug("Shared QSS path: %s", qPrintable(lthemeengine::sharedStyleSheetPath().join(", ")));
+  //checking environment
+  QStringList errorMessages;
+  QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+  if(env.contains("QT_STYLE_OVERRIDE")){
+    errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable");
     }
-
-    if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine")
-    {
-        errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment "
-                                               "variable is not set correctly");
+  if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){
+    errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly");
     }
-
-    if(!QStyleFactory::keys().contains("lthemeengine-style"))
-    {
-        errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>");
+  if(!QStyleFactory::keys().contains("lthemeengine-style")){
+    errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>");
     }
-
-    if(!errorMessages.isEmpty())
-    {
-        QMessageBox::critical(0, app.translate("main", "Error"), errorMessages.join("<br><br>"));
-        return 0;
+  if(!errorMessages.isEmpty()){
+    QMessageBox::critical(0, app.translate("main", "Error"), errorMessages.join("<br><br>"));
+    return 0;
     }
-
-    MainWindow w;
-    w.show();
-
-    return app.exec();
+  MainWindow w;
+  w.show();
+  return app.exec();
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp
index ed658e2e..c93b1052 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.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 <QApplication>
 #include <QSettings>
 #include "lthemeengine.h"
@@ -37,54 +9,41 @@
 #include "qsspage.h"
 #include "ui_mainwindow.h"
 
-MainWindow::MainWindow(QWidget *parent) :
-    QWidget(parent),
-    m_ui(new Ui::MainWindow)
-{
-    m_ui->setupUi(this);
-    m_ui->tabWidget->addTab(new AppearancePage(this), tr("Appearance"));
-    m_ui->tabWidget->addTab(new FontsPage(this), tr("Fonts"));
-    m_ui->tabWidget->addTab(new IconThemePage(this), tr("Icon Theme"));
-    m_ui->tabWidget->addTab(new InterfacePage(this), tr("Interface"));
+MainWindow::MainWindow(QWidget *parent) : QWidget(parent), m_ui(new Ui::MainWindow){
+  m_ui->setupUi(this);
+  m_ui->tabWidget->addTab(new AppearancePage(this), tr("Appearance"));
+  m_ui->tabWidget->addTab(new FontsPage(this), tr("Fonts"));
+  m_ui->tabWidget->addTab(new IconThemePage(this), tr("Icon Theme"));
+  m_ui->tabWidget->addTab(new InterfacePage(this), tr("Interface"));
 #ifdef USE_WIDGETS
-    m_ui->tabWidget->addTab(new QSSPage(this), tr("Style Sheets"));
+  m_ui->tabWidget->addTab(new QSSPage(this), tr("Style Sheets"));
 #endif
-
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    restoreGeometry(settings.value("SettingsWindow/geometry").toByteArray());
-
-    setWindowIcon(QIcon::fromTheme("preferences-desktop-theme"));
-
-    m_ui->versionLabel->setText(tr("Version: %1").arg(LTHEMEENGINE_VERSION_STR));
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  restoreGeometry(settings.value("SettingsWindow/geometry").toByteArray());
+  setWindowIcon(QIcon::fromTheme("preferences-desktop-theme"));
+  m_ui->versionLabel->setText(tr("Version: %1").arg(LTHEMEENGINE_VERSION_STR));
 }
 
-MainWindow::~MainWindow()
-{
-    delete m_ui;
+MainWindow::~MainWindow(){
+  delete m_ui;
 }
 
-void MainWindow::closeEvent(QCloseEvent *)
-{
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    settings.setValue("SettingsWindow/geometry", saveGeometry());
+void MainWindow::closeEvent(QCloseEvent *){
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  settings.setValue("SettingsWindow/geometry", saveGeometry());
 }
 
-void MainWindow::on_buttonBox_clicked(QAbstractButton *button)
-{
-    int id = m_ui->buttonBox->standardButton(button);
-    if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Apply)
-    {
-        for(int i = 0; i < m_ui->tabWidget->count(); ++i)
-        {
-            TabPage *p = qobject_cast<TabPage*>(m_ui->tabWidget->widget(i));
-            if(p)
-                p->writeSettings();
+void MainWindow::on_buttonBox_clicked(QAbstractButton *button){
+  int id = m_ui->buttonBox->standardButton(button);
+  if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Apply){
+    for(int i = 0; i < m_ui->tabWidget->count(); ++i){
+      TabPage *p = qobject_cast<TabPage*>(m_ui->tabWidget->widget(i));
+      if(p)
+        p->writeSettings();
         }
     }
-
-    if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Cancel)
-    {
-        close();
-        qApp->quit();
+  if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Cancel){
+    close();
+    qApp->quit();
     }
 }
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.h
index f532141c..749949a6 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.h
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.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 MAINWINDOW_H
 #define MAINWINDOW_H