Merge remote-tracking branch 'origin/master'

1 files changed, 66 insertions, 118 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
index a9f40080..a44e75e4 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.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 <QSettings>
 #include <QApplication>
 #include <QDialogButtonBox>
@@ -33,108 +5,84 @@
 #include "interfacepage.h"
 #include "ui_interfacepage.h"
 
-InterfacePage::InterfacePage(QWidget *parent) :
-    TabPage(parent),
-    m_ui(new Ui::InterfacePage)
-{
-    m_ui->setupUi(this);
-
-    m_ui->buttonLayoutComboBox->addItem("Windows", QDialogButtonBox::WinLayout);
-    m_ui->buttonLayoutComboBox->addItem("Mac OS X", QDialogButtonBox::MacLayout);
-    m_ui->buttonLayoutComboBox->addItem("KDE", QDialogButtonBox::KdeLayout);
-    m_ui->buttonLayoutComboBox->addItem("GNOME", QDialogButtonBox::GnomeLayout);
-
-    m_ui->toolButtonStyleComboBox->addItem(tr("Only display the icon"), Qt::ToolButtonIconOnly);
-    m_ui->toolButtonStyleComboBox->addItem(tr("Only display the text"), Qt::ToolButtonTextOnly);
-    m_ui->toolButtonStyleComboBox->addItem(tr("The text appears beside the icon"), Qt::ToolButtonTextBesideIcon);
-    m_ui->toolButtonStyleComboBox->addItem(tr("The text appears under the icon"), Qt::ToolButtonTextUnderIcon);
-    m_ui->toolButtonStyleComboBox->addItem(tr("Follow the application style"), Qt::ToolButtonFollowStyle);
-
-    readSettings();
+InterfacePage::InterfacePage(QWidget *parent) : TabPage(parent), m_ui(new Ui::InterfacePage){
+  m_ui->setupUi(this);
+
+  m_ui->buttonLayoutComboBox->addItem("Windows", QDialogButtonBox::WinLayout);
+  m_ui->buttonLayoutComboBox->addItem("Mac OS X", QDialogButtonBox::MacLayout);
+  m_ui->buttonLayoutComboBox->addItem("KDE", QDialogButtonBox::KdeLayout);
+  m_ui->buttonLayoutComboBox->addItem("GNOME", QDialogButtonBox::GnomeLayout);
+  m_ui->toolButtonStyleComboBox->addItem(tr("Only display the icon"), Qt::ToolButtonIconOnly);
+  m_ui->toolButtonStyleComboBox->addItem(tr("Only display the text"), Qt::ToolButtonTextOnly);
+  m_ui->toolButtonStyleComboBox->addItem(tr("The text appears beside the icon"), Qt::ToolButtonTextBesideIcon);
+  m_ui->toolButtonStyleComboBox->addItem(tr("The text appears under the icon"), Qt::ToolButtonTextUnderIcon);
+  m_ui->toolButtonStyleComboBox->addItem(tr("Follow the application style"), Qt::ToolButtonFollowStyle);
+  readSettings();
 }
 
-InterfacePage::~InterfacePage()
-{
-    delete m_ui;
+InterfacePage::~InterfacePage(){
+  delete m_ui;
 }
 
-void InterfacePage::writeSettings()
-{
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    settings.beginGroup("Interface");
-    settings.setValue("double_click_interval", m_ui->doubleClickIntervalSpinBox->value());
-    settings.setValue("cursor_flash_time", m_ui->cursorFlashTimeSpinBox->value());
-    settings.setValue("buttonbox_layout", m_ui->buttonLayoutComboBox->currentData());
-    settings.setValue("menus_have_icons", m_ui->menuIconsCheckBox->isChecked());
-    settings.setValue("activate_item_on_single_click", m_ui->singleClickCheckBox->checkState());
-    settings.setValue("dialog_buttons_have_icons", m_ui->dialogIconsCheckBox->checkState());
-    settings.setValue("toolbutton_style", m_ui->toolButtonStyleComboBox->currentData());
-    settings.setValue("wheel_scroll_lines", m_ui->wheelScrollLinesSpinBox->value());
-
-    QStringList effects;
-    if(m_ui->guiEffectsCheckBox->isChecked())
-        effects << "General";
-
+void InterfacePage::writeSettings(){
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  settings.beginGroup("Interface");
+  settings.setValue("double_click_interval", m_ui->doubleClickIntervalSpinBox->value());
+  settings.setValue("cursor_flash_time", m_ui->cursorFlashTimeSpinBox->value());
+  settings.setValue("buttonbox_layout", m_ui->buttonLayoutComboBox->currentData());
+  settings.setValue("menus_have_icons", m_ui->menuIconsCheckBox->isChecked());
+  settings.setValue("activate_item_on_single_click", m_ui->singleClickCheckBox->checkState());
+  settings.setValue("dialog_buttons_have_icons", m_ui->dialogIconsCheckBox->checkState());
+  settings.setValue("toolbutton_style", m_ui->toolButtonStyleComboBox->currentData());
+  settings.setValue("wheel_scroll_lines", m_ui->wheelScrollLinesSpinBox->value());
+  QStringList effects;
+  if(m_ui->guiEffectsCheckBox->isChecked())
+    effects << "General";
     if(m_ui->menuEffectComboBox->currentIndex() == 1)
-        effects << "AnimateMenu";
+       effects << "AnimateMenu";
     else if(m_ui->menuEffectComboBox->currentIndex() == 2)
-        effects << "FadeMenu";
-
-    if(m_ui->comboBoxEffectComboBox->currentIndex() == 1)
+      effects << "FadeMenu";
+      if(m_ui->comboBoxEffectComboBox->currentIndex() == 1)
         effects << "AnimateCombo";
-
-    if(m_ui->toolTipEffectComboBox->currentIndex() == 1)
-        effects << "AnimateTooltip";
-    else if(m_ui->toolTipEffectComboBox->currentIndex() == 2)
-        effects << "FadeTooltip";
-
-    if(m_ui->toolBoxEffectComboBox->currentIndex() == 1)
-        effects << "AnimateToolBox";
-
-    settings.setValue("gui_effects", effects);
-    settings.endGroup();
+        if(m_ui->toolTipEffectComboBox->currentIndex() == 1)
+          effects << "AnimateTooltip";
+        else if(m_ui->toolTipEffectComboBox->currentIndex() == 2)
+          effects << "FadeTooltip";
+          if(m_ui->toolBoxEffectComboBox->currentIndex() == 1)
+            effects << "AnimateToolBox";
+            settings.setValue("gui_effects", effects);
+            settings.endGroup();
 }
 
-void InterfacePage::readSettings()
-{
-    QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
-    settings.beginGroup("Interface");
-    m_ui->doubleClickIntervalSpinBox->setValue(qApp->doubleClickInterval());
-    m_ui->cursorFlashTimeSpinBox->setValue(qApp->cursorFlashTime());
-
-    m_ui->guiEffectsCheckBox->setChecked(qApp->isEffectEnabled(Qt::UI_General));
-
-    int layout = settings.value("buttonbox_layout", style()->styleHint(QStyle::SH_DialogButtonLayout)).toInt();
-    int index = m_ui->buttonLayoutComboBox->findData(layout);
-    if(index >= 0)
-        m_ui->buttonLayoutComboBox->setCurrentIndex(index);
-
+void InterfacePage::readSettings(){
+  QSettings settings(lthemeengine::configFile(), QSettings::IniFormat);
+  settings.beginGroup("Interface");
+  m_ui->doubleClickIntervalSpinBox->setValue(qApp->doubleClickInterval());
+  m_ui->cursorFlashTimeSpinBox->setValue(qApp->cursorFlashTime());
+  m_ui->guiEffectsCheckBox->setChecked(qApp->isEffectEnabled(Qt::UI_General));
+  int layout = settings.value("buttonbox_layout", style()->styleHint(QStyle::SH_DialogButtonLayout)).toInt();
+  int index = m_ui->buttonLayoutComboBox->findData(layout);
+  if(index >= 0)
+    m_ui->buttonLayoutComboBox->setCurrentIndex(index);
     if(qApp->isEffectEnabled(Qt::UI_AnimateMenu))
-        m_ui->menuEffectComboBox->setCurrentIndex(1);
+      m_ui->menuEffectComboBox->setCurrentIndex(1);
     else if(qApp->isEffectEnabled(Qt::UI_FadeMenu))
-        m_ui->menuEffectComboBox->setCurrentIndex(2);
-
+      m_ui->menuEffectComboBox->setCurrentIndex(2);
     if(qApp->isEffectEnabled(Qt::UI_AnimateCombo))
-        m_ui->comboBoxEffectComboBox->setCurrentIndex(1);
-
-    if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip))
+      m_ui->comboBoxEffectComboBox->setCurrentIndex(1);
+      if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip))
         m_ui->toolTipEffectComboBox->setCurrentIndex(1);
-    else  if(qApp->isEffectEnabled(Qt::UI_FadeTooltip))
+      else  if(qApp->isEffectEnabled(Qt::UI_FadeTooltip))
         m_ui->toolTipEffectComboBox->setCurrentIndex(2);
-
-    if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox))
-        m_ui->toolBoxEffectComboBox->setCurrentIndex(1);
-
-    m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt());
-    m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt());
-    m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus));
-
-    int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt();
-    index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle);
-    if(index >= 0)
-        m_ui->toolButtonStyleComboBox->setCurrentIndex(index);
-
-    m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt());
-
-    settings.endGroup();
+        if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox))
+          m_ui->toolBoxEffectComboBox->setCurrentIndex(1);
+          m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt());
+          m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt());
+          m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus));
+          int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt();
+          index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle);
+          if(index >= 0)
+            m_ui->toolButtonStyleComboBox->setCurrentIndex(index);
+            m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt());
+            settings.endGroup();
 }