appearance: change dropShadow from QComboBox to QCheckBox

Author: johanmalm

src/appearance.cpp

@@ -25,9 +25,7 @@ void Appearance::activate()
     ui->cornerRadius->setValue(getInt("/labwc_config/theme/cornerRadius"));
 
     /* Drop Shadows */
-    ui->dropShadows->addItem("no");
-    ui->dropShadows->addItem("yes");
-    ui->dropShadows->setCurrentIndex(getBool("/labwc_config/theme/dropShadows"));
+    ui->dropShadows->setChecked(getBool("/labwc_config/theme/dropShadows"));
 
     /* Icon Theme */
     QStringList themes = findIconThemes(LAB_ICON_THEME_TYPE_ICON);
@@ -39,6 +37,6 @@ void Appearance::onApply()
 {
     setInt("/labwc_config/theme/cornerRadius", ui->cornerRadius->value());
     setStr("/labwc_config/theme/name", TEXT(ui->openboxTheme));
-    setBool("/labwc_config/theme/dropShadows", TEXT(ui->dropShadows));
+    setBool("/labwc_config/theme/dropShadows", ui->dropShadows->isChecked());
     setStr("/labwc_config/theme/icon", TEXT(ui->iconTheme));
 }

src/appearance.ui

@@ -44,14 +44,14 @@
     <widget class="QSpinBox" name="cornerRadius"/>
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label_8">
+    <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Drop Shadows</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QComboBox" name="dropShadows"/>
+    <widget class="QCheckBox" name="dropShadows"/>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_1">

src/maindialog.cpp

@@ -93,7 +93,7 @@ void MainDialog::onApply()
     ui->pageBehaviour->onApply();
 
     /* ~/.config/labwc/rc.xml */
-    setBool("/labwc_config/libinput/device/naturalScroll", TEXT(ui->naturalScroll));
+    setBoolfromString("/labwc_config/libinput/device/naturalScroll", TEXT(ui->naturalScroll));
     xml_save();
 
     /* ~/.config/labwc/environment */

src/settings.cpp

@@ -248,8 +248,7 @@ int parseBool(const char *str, int defaultValue)
     return defaultValue;
 }
 
-// TODO: make this more bool-ish
-void setBool(QString name, QString value)
+void setBool(QString name, int value)
 {
     std::shared_ptr<Setting> setting = retrieve(name);
     if (setting == nullptr) {
@@ -259,11 +258,16 @@ void setBool(QString name, QString value)
     if (setting->valueType() != LAB_VALUE_TYPE_BOOL) {
         qDebug() << "setBool(): not valid bool setting" << name << value;
     }
-    int boolValue = parseBool(value.toStdString().c_str(), -1);
-    if (boolValue != std::get<int>(setting->value())) {
-        info("'{} has changed to '{}'", name.toStdString(), value.toStdString());
+    if (value != std::get<int>(setting->value())) {
+        info("'{} has changed to '{}'", name.toStdString(), value);
         xpath_add_node(name.toStdString().c_str());
-        xml_set(name.toStdString().c_str(), value.toStdString().c_str());
+        xml_set(name.toStdString().c_str(), value ? "yes" : "no");
         setting->setValue(value);
     }
 }
+
+void setBoolfromString(QString name, QString value)
+{
+    int boolValue = parseBool(value.toStdString().c_str(), -1);
+    setBool(name, boolValue);
+}

src/settings.h

@@ -63,4 +63,5 @@ int getBool(QString name);
 void setInt(QString name, int value);
 void setStr(QString name, QString value);
 int parseBool(const char *str, int defaultValue);
-void setBool(QString name, QString value);
+void setBool(QString name, int value);
+void setBoolfromString(QString name, QString value);