Merge branch 'master' of github.com:trueos/lumina

1 files changed, 24 insertions, 39 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 a44e75e4..38f6ef8f 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp
@@ -36,22 +36,15 @@ void InterfacePage::writeSettings(){
   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";
-    else if(m_ui->menuEffectComboBox->currentIndex() == 2)
-      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->guiEffectsCheckBox->isChecked()){ effects << "General";}
+  if(m_ui->menuEffectComboBox->currentIndex() == 1){ effects << "AnimateMenu"; }
+  else if(m_ui->menuEffectComboBox->currentIndex() == 2){ 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();
 }
 
 void InterfacePage::readSettings(){
@@ -62,27 +55,19 @@ void InterfacePage::readSettings(){
   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);
-    else if(qApp->isEffectEnabled(Qt::UI_FadeMenu))
-      m_ui->menuEffectComboBox->setCurrentIndex(2);
-    if(qApp->isEffectEnabled(Qt::UI_AnimateCombo))
-      m_ui->comboBoxEffectComboBox->setCurrentIndex(1);
-      if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip))
-        m_ui->toolTipEffectComboBox->setCurrentIndex(1);
-      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(index >= 0){ m_ui->buttonLayoutComboBox->setCurrentIndex(index); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(1); }
+  else if(qApp->isEffectEnabled(Qt::UI_FadeMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(2); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateCombo)){ m_ui->comboBoxEffectComboBox->setCurrentIndex(1); }
+  if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip)){ m_ui->toolTipEffectComboBox->setCurrentIndex(1); }
+  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();
 }