From 11ba10afcae374a87ab0e639fbfb77866b5850b5 Mon Sep 17 00:00:00 2001
From: stefonarch <standreas@riseup.net>
Date: Fri, 5 Dec 2025 11:43:34 +0100
Subject: [PATCH 1/3] Added set/get float write and updated mouse page

---
 src/maindialog.cpp  |  25 +++-
 src/maindialog1.cpp | 156 ++++++++++++++++++++
 src/mouse.cpp       | 139 +++++++++++++++++
 src/mouse.ui        | 352 +++++++++++++++++++++++++++++++++++++++++---
 src/mouse.ui.~      |  67 +++++++++
 src/settings.cpp    | 144 ++++++++++++++----
 src/settings.h      |  11 +-
 src/xml.cpp         |  13 +-
 src/xml.h           |   1 +
 9 files changed, 846 insertions(+), 62 deletions(-)
 create mode 100644 src/maindialog1.cpp
 create mode 100644 src/mouse.ui.~

diff --git a/src/maindialog.cpp b/src/maindialog.cpp
index f5072d7..e6ac6db 100644
--- a/src/maindialog.cpp
+++ b/src/maindialog.cpp
@@ -29,15 +29,15 @@
 
 MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
 {
-    resize(640, 480);
+    //resize(640, 480);
 
     QVBoxLayout *verticalLayout = new QVBoxLayout(this);
-    verticalLayout->setContentsMargins(6, 6, 6, 6);
+    //verticalLayout->setContentsMargins(6, 6, 6, 6);
 
     QWidget *widget = new QWidget(this);
 
     QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
-    horizontalLayout->setContentsMargins(6, 6, 6, 6);
+    //horizontalLayout->setContentsMargins(6, 6, 6, 6);
 
     // List Widget on the Left
     QListWidget *list = new QListWidget(widget);
@@ -59,13 +59,22 @@ MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
     item3->setText(tr("Language & Region"));
 
     QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    sizePolicy.setHorizontalStretch(0);
-    sizePolicy.setVerticalStretch(0);
-    sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
+    //sizePolicy.setHorizontalStretch(0);
+    //sizePolicy.setVerticalStretch(0);
+    //sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
     list->setSizePolicy(sizePolicy);
     list->setSizeAdjustPolicy(QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents);
-    list->setCurrentRow(0);
-    list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
+    //list->setCurrentRow(0);
+    //list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
+
+    list->setViewMode(QListView::IconMode);
+    list->setMovement(QListView::Static);
+    list->setResizeMode(QListView::Adjust);
+    list->setWrapping(true);
+    list->setIconSize(QSize(48, 48));
+    list->setWordWrap(true);             // prevents text from wrapping inside
+    list->setUniformItemSizes(true);      // keeps all items same layout
+
 
     horizontalLayout->addWidget(list);
 
diff --git a/src/maindialog1.cpp b/src/maindialog1.cpp
new file mode 100644
index 0000000..e6ac6db
--- /dev/null
+++ b/src/maindialog1.cpp
@@ -0,0 +1,156 @@
+#include <QtCore/QVariant>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QWidget>
+#include <language.h>
+#include <mouse.h>
+#include "appearance.h"
+#include "behaviour.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QString>
+#include <QStandardPaths>
+#include <QTextStream>
+#include <string>
+#include <unistd.h>
+#include "environment.h"
+#include "find-themes.h"
+#include "log.h"
+#include "macros.h"
+#include "maindialog.h"
+#include "xml.h"
+
+MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
+{
+    //resize(640, 480);
+
+    QVBoxLayout *verticalLayout = new QVBoxLayout(this);
+    //verticalLayout->setContentsMargins(6, 6, 6, 6);
+
+    QWidget *widget = new QWidget(this);
+
+    QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
+    //horizontalLayout->setContentsMargins(6, 6, 6, 6);
+
+    // List Widget on the Left
+    QListWidget *list = new QListWidget(widget);
+
+    QListWidgetItem *item0 = new QListWidgetItem(list);
+    item0->setIcon(QIcon::fromTheme("applications-graphics"));
+    item0->setText(tr("Appearance"));
+
+    QListWidgetItem *item1 = new QListWidgetItem(list);
+    item1->setIcon(QIcon::fromTheme("preferences-desktop"));
+    item1->setText(tr("Behaviour"));
+
+    QListWidgetItem *item2 = new QListWidgetItem(list);
+    item2->setIcon(QIcon::fromTheme("input-mouse"));
+    item2->setText(tr("Mouse & Touchpad"));
+
+    QListWidgetItem *item3 = new QListWidgetItem(list);
+    item3->setIcon(QIcon::fromTheme("preferences-desktop-locale"));
+    item3->setText(tr("Language & Region"));
+
+    QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+    //sizePolicy.setHorizontalStretch(0);
+    //sizePolicy.setVerticalStretch(0);
+    //sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
+    list->setSizePolicy(sizePolicy);
+    list->setSizeAdjustPolicy(QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents);
+    //list->setCurrentRow(0);
+    //list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
+
+    list->setViewMode(QListView::IconMode);
+    list->setMovement(QListView::Static);
+    list->setResizeMode(QListView::Adjust);
+    list->setWrapping(true);
+    list->setIconSize(QSize(48, 48));
+    list->setWordWrap(true);             // prevents text from wrapping inside
+    list->setUniformItemSizes(true);      // keeps all items same layout
+
+
+    horizontalLayout->addWidget(list);
+
+    // The stack containing all the pages
+    QStackedWidget *stack = new QStackedWidget(widget);
+
+    m_pageAppearance = new Appearance();
+    stack->addWidget(m_pageAppearance);
+
+    m_pageBehaviour = new Behaviour();
+    stack->addWidget(m_pageBehaviour);
+
+    m_pageMouse = new Mouse();
+    stack->addWidget(m_pageMouse);
+
+    m_pageLanguage = new Language();
+    stack->addWidget(m_pageLanguage);
+
+    horizontalLayout->addWidget(stack);
+
+    verticalLayout->addWidget(widget);
+
+    m_buttonBox = new QDialogButtonBox(this);
+    m_buttonBox->setOrientation(Qt::Orientation::Horizontal);
+    m_buttonBox->setStandardButtons(QDialogButtonBox::StandardButton::Apply
+                                  | QDialogButtonBox::StandardButton::Close);
+    m_buttonBox->setCenterButtons(false);
+
+    verticalLayout->addWidget(m_buttonBox);
+
+    // Change pages when list items are clicked
+    QObject::connect(list, SIGNAL(currentRowChanged(int)), stack, SLOT(setCurrentIndex(int)));
+
+    // Close Button
+    QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+    // Apply Button
+    QObject::connect(m_buttonBox, &QDialogButtonBox::clicked, [&](QAbstractButton *button) {
+        if (m_buttonBox->standardButton(button) == QDialogButtonBox::Apply) {
+            onApply();
+        }
+    });
+
+    activate();
+}
+
+MainDialog::~MainDialog()
+{
+    xml_finish();
+}
+
+void MainDialog::activate()
+{
+    m_pageAppearance->activate();
+    m_pageBehaviour->activate();
+    m_pageMouse->activate();
+    m_pageLanguage->activate();
+}
+
+void MainDialog::onApply()
+{
+    m_pageAppearance->onApply();
+    m_pageBehaviour->onApply();
+    m_pageMouse->onApply();
+    m_pageLanguage->onApply();
+
+    // TODO: Get filename in a more consistent way - share common code with main.cpp
+    std::string config_home = std::getenv("HOME") + std::string("/.config/labwc");
+    std::string config_dir = std::getenv("LABWC_CONFIG_DIR") ?: config_home;
+    std::string environment_file = config_dir + "/environment";
+
+    xml_save();
+    environmentSave(environment_file);
+
+    /* reconfigure labwc */
+    if (!fork()) {
+        execl("/bin/sh", "/bin/sh", "-c", "labwc -r", (void *)NULL);
+    }
+}
diff --git a/src/mouse.cpp b/src/mouse.cpp
index ed1300d..41e2c79 100644
--- a/src/mouse.cpp
+++ b/src/mouse.cpp
@@ -2,6 +2,7 @@
 #include "environment.h"
 #include "find-themes.h"
 #include "macros.h"
+#include "pair.h"
 #include "settings.h"
 #include "./ui_mouse.h"
 
@@ -27,12 +28,150 @@ void Mouse::activate()
 
     /* Natural Scroll */
     ui->naturalScroll->setChecked(getBool("/labwc_config/libinput/device/naturalScroll"));
+
+    /* Left Handed */
+    ui->leftHanded->setChecked(getBool("/labwc_config/libinput/device/leftHanded"));
+
+    /* Pointer Speed */
+    ui->pointerSpeed->setValue(getFloat("/labwc_config/libinput/device/pointerSpeed"));
+
+    /* Accel Profiles */
+    ui->accelProfile->clear(); // remove 2 empty values created for some reason
+
+    QVector<QSharedPointer<Pair>> profiles;
+    profiles.append(QSharedPointer<Pair>(new Pair("flat", tr("flat"))));
+    profiles.append(QSharedPointer<Pair>(new Pair("adaptive", tr("adaptive"))));
+
+    QString current_profile = getStr("/labwc_config/libinput/device/accelProfile");
+    int profile_index = -1;
+    foreach (auto profile, profiles) {
+        ui->accelProfile->addItem(profile.get()->description(), QVariant(profile.get()->value()));
+        ++profile_index;
+        if (current_profile == profile.get()->value()) {
+            ui->accelProfile->setCurrentIndex(profile_index);
+        }
+    }
+
+    /* Tap to click */
+    ui->tap->setChecked(getBool("/labwc_config/libinput/device/tap"));
+
+    /* Tap Button Map */
+    ui->tapButtonMap->clear(); // remove 2 empty values created for some reason
+
+    QVector<QSharedPointer<Pair>> maps;
+    maps.append(QSharedPointer<Pair>(new Pair("lrm", tr("lrm"))));
+    maps.append(QSharedPointer<Pair>(new Pair("lmr", tr("lmr"))));
+
+    QString current_map = getStr("/labwc_config/libinput/device/tapButtonMap");
+    int map_index = -1;
+    foreach (auto map, maps) {
+        ui->tapButtonMap->addItem(map.get()->description(), QVariant(map.get()->value()));
+        ++map_index;
+        if (current_map == map.get()->value()) {
+            ui->tapButtonMap->setCurrentIndex(map_index);
+        }
+    }
+
+    /* Tap And Drag */
+    ui->tapAndDrag->setChecked(getBool("/labwc_config/libinput/device/tapAndDrag"));
+
+    /* Drag Lock */
+    ui->dragLock->setChecked(getBool("/labwc_config/libinput/device/dragLock"));
+
+    // Disable it when tapAndDrag is unchecked
+    ui->dragLock->setEnabled(ui->tapAndDrag->isChecked());
+    ui->label_dragLock->setEnabled(ui->tapAndDrag->isChecked());
+
+    connect(ui->tapAndDrag, &QCheckBox::toggled,ui->dragLock, &QWidget::setEnabled);
+    connect(ui->tapAndDrag, &QCheckBox::toggled,ui->label_dragLock, &QWidget::setEnabled);
+
+    /* 3 Finger Drag */
+    ui->threeFingerDrag->setChecked(getBool("/labwc_config/libinput/device/threeFingerDrag"));
+
+    /* Middle Emulation */
+    ui->middleEmulation->setChecked(getBool("/labwc_config/libinput/device/middleEmulation"));
+
+    /* Disable While Typing */
+    ui->disableWhileTyping->setChecked(getBool("/labwc_config/libinput/device/disableWhileTyping"));
+
+   /* Click Method */
+    ui->clickMethod->clear();
+
+    QVector<QSharedPointer<Pair>> clickmethods;
+    clickmethods.append(QSharedPointer<Pair>(new Pair("none", tr("none"))));
+    clickmethods.append(QSharedPointer<Pair>(new Pair("buttonAreas", tr("Button area"))));
+    clickmethods.append(QSharedPointer<Pair>(new Pair("clickFinger", tr("Clickfinger"))));
+
+    QString current_clickmethod = getStr("/labwc_config/libinput/device/clickMethod");
+    int clickmethod_index = -1;
+    foreach (auto clickmethod, clickmethods) {
+        ui->clickMethod->addItem(clickmethod.get()->description(), QVariant(clickmethod.get()->value()));
+        ++clickmethod_index;
+        if (current_clickmethod == clickmethod.get()->value()) {
+            ui->clickMethod->setCurrentIndex(clickmethod_index);
+        }
+    }
+
+    /* Scroll Method */
+    ui->scrollMethod->clear();
+
+    QVector<QSharedPointer<Pair>> scrollmethods;
+    scrollmethods.append(QSharedPointer<Pair>(new Pair("twoFinger", tr("Two Finger"))));
+    scrollmethods.append(QSharedPointer<Pair>(new Pair("edge", tr("Edge"))));
+    scrollmethods.append(QSharedPointer<Pair>(new Pair("none", tr("None"))));
+
+    QString current_scrollmethod = getStr("/labwc_config/libinput/device/scrollMethod");
+    int scrollmethod_index = -1;
+    foreach (auto scrollmethod, scrollmethods) {
+        ui->scrollMethod->addItem(scrollmethod.get()->description(), QVariant(scrollmethod.get()->value()));
+        ++scrollmethod_index;
+        if (current_scrollmethod == scrollmethod.get()->value()) {
+            ui->scrollMethod->setCurrentIndex(scrollmethod_index);
+        }
+    }
+
+     /* Send Events Mode */
+    ui->sendEventsMode->clear();
+
+    QVector<QSharedPointer<Pair>> sendeventsmodes;
+    sendeventsmodes.append(QSharedPointer<Pair>(new Pair("enabled", tr("Enabled"))));
+    //sendeventsmodes.append(QSharedPointer<Pair>(new Pair("no", tr("no")))); will disable also keyboard
+    // we cannot write "<touchpad>no" here as we get <sendEventsMode>&lt;touchpad&gt;disabledOnExternalMouse</sendEventsMode>
+    // implement write to <libinput><category=touchpad> ?
+    sendeventsmodes.append(QSharedPointer<Pair>(new Pair("disabledOnExternalMouse", tr("Disable with external mouse"))));
+
+    QString current_sendeventsmode = getStr("/labwc_config/libinput/device/sendEventsMode");
+    int sendeventsmode_index = -1;
+    foreach (auto sendeventsmode, sendeventsmodes) {
+        ui->sendEventsMode->addItem(sendeventsmode.get()->description(), QVariant(sendeventsmode.get()->value()));
+        ++sendeventsmode_index;
+        if (current_sendeventsmode == sendeventsmode.get()->value()) {
+            ui->sendEventsMode->setCurrentIndex(sendeventsmode_index);
+        }
+    }
+
+    /* Scroll Factor */
+    ui->scrollFactor->setValue(getFloat("/labwc_config/libinput/device/scrollFactor"));
 }
 
 void Mouse::onApply()
 {
     /* ~/.config/labwc/rc.xml */
     setBool("/labwc_config/libinput/device/naturalScroll", ui->naturalScroll->isChecked());
+    setBool("/labwc_config/libinput/device/leftHanded", ui->leftHanded->isChecked());
+    setFloat("/labwc_config/libinput/device/pointerSpeed", ui->pointerSpeed->value());
+    setStr("/labwc_config/libinput/device/accelProfile", DATA(ui->accelProfile));
+    setBool("/labwc_config/libinput/device/tap", ui->tap->isChecked());
+    setStr("/labwc_config/libinput/device/tapButtonMap", DATA(ui->tapButtonMap));
+    setBool("/labwc_config/libinput/device/tapAndDrag", ui->tapAndDrag->isChecked());
+    setBool("/labwc_config/libinput/device/dragLock", ui->dragLock->isChecked());
+    setBool("/labwc_config/libinput/device/threeFingerDrag", ui->threeFingerDrag->isChecked());
+    setBool("/labwc_config/libinput/device/middleEmulation", ui->middleEmulation->isChecked());
+    setBool("/labwc_config/libinput/device/disableWhileTyping", ui->disableWhileTyping->isChecked());
+    setStr("/labwc_config/libinput/device/clickMethod", DATA(ui->clickMethod));
+    setStr("/labwc_config/libinput/device/scrollMethod", DATA(ui->scrollMethod));
+    setStr("/labwc_config/libinput/device/sendEventsMode", DATA(ui->sendEventsMode));
+    setFloat("/labwc_config/libinput/device/scrollFactor", ui->scrollFactor->value());
 
     /* ~/.config/labwc/environment */
     environmentSet("XCURSOR_THEME", TEXT(ui->cursorTheme));
diff --git a/src/mouse.ui b/src/mouse.ui
index c16c270..bc0a4c6 100644
--- a/src/mouse.ui
+++ b/src/mouse.ui
@@ -6,51 +6,39 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>251</width>
-    <height>153</height>
+    <width>400</width>
+    <height>500</height>
    </rect>
   </property>
-  <layout class="QFormLayout" name="layPage2">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>6</number>
-   </property>
-   <property name="rightMargin">
-    <number>6</number>
-   </property>
-   <property name="bottomMargin">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
+  <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0,1">
+   <item row="0" column="0" alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Cursor Theme</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QComboBox" name="cursorTheme"/>
    </item>
-   <item row="1" column="0">
+   <item row="1" column="0" alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Cursor Size</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QSpinBox" name="cursorSize"/>
    </item>
-   <item row="2" column="0">
+   <item row="2" column="0" alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Natural Scroll</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QCheckBox" name="naturalScroll">
      <property name="minimumSize">
       <size>
@@ -60,6 +48,328 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_leftHanded">
+     <property name="text">
+      <string>Left Handed</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="leftHanded">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_pointerSpeed">
+     <property name="text">
+      <string>Pointer Speed</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QDoubleSpinBox" name="pointerSpeed">
+     <property name="decimals">
+      <number>2</number>
+     </property>
+     <property name="minimum">
+      <double>-1.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>1.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.100000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_accelProfile">
+     <property name="text">
+      <string>Acceleration Profile</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QComboBox" name="accelProfile">
+     <item>
+      <property name="text">
+       <string>flat</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>adaptive</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="6" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_sendEventsMode">
+     <property name="text">
+      <string>Touchpad</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QComboBox" name="sendEventsMode">
+     <item>
+      <property name="text">
+       <string>enabled</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>disabled</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>disabled-on-external-mouse</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="7" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_tap">
+     <property name="text">
+      <string>Tap to Click</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="tap">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_tapButtonMap">
+     <property name="text">
+      <string>Tap Button Map</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QComboBox" name="tapButtonMap">
+     <item>
+      <property name="text">
+       <string>lrm</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>lmr</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="9" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_tapAndDrag">
+     <property name="text">
+      <string>Tap and Drag</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="tapAndDrag">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="9" column="3" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_dragLock">
+     <property name="text">
+      <string>Drag Lock</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="dragLock">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_threeFingerDrag">
+     <property name="text">
+      <string>Three Finger Drag</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="threeFingerDrag">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_middleEmulation">
+     <property name="text">
+      <string>Middle Button Emulation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="middleEmulation">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_disableWhileTyping">
+     <property name="text">
+      <string>Disable While Typing</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QCheckBox" name="disableWhileTyping">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_clickMethod">
+     <property name="text">
+      <string>Click Method</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QComboBox" name="clickMethod">
+     <item>
+      <property name="text">
+       <string>none</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>buttonareas</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>clickfinger</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="14" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_scrollMethod">
+     <property name="text">
+      <string>Scroll Method</string>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QComboBox" name="scrollMethod">
+     <item>
+      <property name="text">
+       <string>twofinger</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>edge</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>onbuttondown</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>none</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="15" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+    <widget class="QLabel" name="label_scrollFactor">
+     <property name="text">
+      <string>Scroll Factor</string>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
+    <widget class="QDoubleSpinBox" name="scrollFactor">
+     <property name="decimals">
+      <number>2</number>
+     </property>
+     <property name="minimum">
+      <double>0.100000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>5.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.100000000000000</double>
+     </property>
+     <property name="value">
+      <double>1.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/mouse.ui.~ b/src/mouse.ui.~
new file mode 100644
index 0000000..c16c270
--- /dev/null
+++ b/src/mouse.ui.~
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>pageMouse</class>
+ <widget class="QWidget" name="pageMouse">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>251</width>
+    <height>153</height>
+   </rect>
+  </property>
+  <layout class="QFormLayout" name="layPage2">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Cursor Theme</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="cursorTheme"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Cursor Size</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="cursorSize"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Natural Scroll</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QCheckBox" name="naturalScroll">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>33</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/settings.cpp b/src/settings.cpp
index 1fc3812..4cc1ac6 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -39,13 +39,61 @@ void initSettings(std::vector<std::shared_ptr<Setting>> *settings)
     settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/naturalScroll",
                                                   LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
 
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/leftHanded",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/pointerSpeed",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_FLOAT, 0.0f));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/accelProfile",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_STRING,
+                                                  "Flat"));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/tap",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/tapButtonMap",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_STRING,
+                                                  "lrm"));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/tapAndDrag",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/dragLock",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/threeFingerDrag",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/middleEmulation",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/disableWhileTyping",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/clickMethod",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_STRING,
+                                                  "none"));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/scrollMethod",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_STRING,
+                                                  "twoFinger"));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/sendEventsMode",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_STRING,
+                                                  "yes"));
+
+    settings->push_back(std::make_shared<Setting>("/labwc_config/libinput/device/scrollFactor",
+                                                  LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_FLOAT, 0.0f));
+
     // Language
     settings->push_back(std::make_shared<Setting>("XKB_DEFAULT_LAYOUT", LAB_FILE_TYPE_ENVIRONMENT,
+
                                                   LAB_VALUE_TYPE_STRING, "us"));
 }
 
 Setting::Setting(QString name, enum settingFileType fileType, enum settingValueType valueType,
-                 std::variant<int, QString> defaultValue)
+                 std::variant<int, float, QString> defaultValue)
     : m_name(name), m_fileType(fileType), m_valueType(valueType), m_value(defaultValue)
 {
     m_valueOrigin = LAB_VALUE_ORIGIN_DEFAULT;
@@ -53,35 +101,44 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
     // Use values from rc.xml if different from default
     if (m_fileType == LAB_FILE_TYPE_RCXML) {
         switch (m_valueType) {
-        case LAB_VALUE_TYPE_STRING: {
-            QString value = QString(xml_get(m_name.toStdString().c_str()));
-            if (!value.isNull() && (value != std::get<QString>(m_value))) {
-                m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
-                m_value = value;
-                info("[user-override] {}: {}", m_name.toStdString(), value.toStdString());
+            case LAB_VALUE_TYPE_INT: {
+                int value = xml_get_int(m_name.toStdString().c_str());
+                if (value != std::get<int>(m_value)) {
+                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
+                    m_value = value;
+                    info("[user-override] {}: {}", m_name.toStdString(), value);
+                }
+                break;
             }
-            break;
-        }
-        case LAB_VALUE_TYPE_INT: {
-            int value = xml_get_int(m_name.toStdString().c_str());
-            if (value != std::get<int>(m_value)) {
-                m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
-                m_value = value;
-                info("[user-override] {}: {}", m_name.toStdString(), value);
+            case LAB_VALUE_TYPE_FLOAT: {
+                float value = xml_get_float(m_name.toStdString().c_str());
+                if (value != std::get<float>(m_value)) {
+                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
+                    m_value = value;
+                    info("[user-override] {}: {}", m_name.toStdString(), value);
+                }
+                break;
             }
-            break;
-        }
-        case LAB_VALUE_TYPE_BOOL: {
-            int value = xml_get_bool_text(m_name.toStdString().c_str());
-            if (value != -1 && value != std::get<int>(m_value)) {
-                m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
-                m_value = value;
-                info("[user-override] {}: {}", m_name.toStdString(), value);
+            case LAB_VALUE_TYPE_BOOL: {
+                int value = xml_get_bool_text(m_name.toStdString().c_str());
+                if (value != std::get<int>(m_value)) {
+                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
+                    m_value = value;
+                    info("[user-override] {}: {}", m_name.toStdString(), value);
+                }
+                break;
             }
-            break;
-        }
-        default:
-            break;
+            case LAB_VALUE_TYPE_STRING: {
+                const char *value = xml_get(m_name.toStdString().c_str());
+                if (value && QString(value) != std::get<QString>(m_value)) {
+                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
+                    m_value = QString(value);
+                    info("[user-override] {}: {}", m_name.toStdString(), value);
+                }
+                break;
+            }
+            default:
+                break;
         }
     }
 
@@ -121,7 +178,7 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
     }
 }
 
-void Setting::setValue(std::variant<int, QString> value)
+void Setting::setValue(std::variant<int, float, QString> value)
 {
     if (value != m_value) {
         m_valueOrigin = LAB_VALUE_ORIGIN_CHANGED_IN_THIS_SESSION;
@@ -165,6 +222,19 @@ int getInt(QString name)
     return std::get<int>(setting->value());
 }
 
+float getFloat(QString name)
+{
+    std::shared_ptr<Setting> setting = retrieve(name);
+    if (setting == nullptr) {
+        qDebug() << "warning: no settings with name" << name;
+        return -65535;
+    }
+    if (setting->valueType() != LAB_VALUE_TYPE_FLOAT) {
+        qDebug() << "getFloat(): not valid float setting" << name;
+    }
+    return std::get<float>(setting->value());
+}
+
 /* Return -1 for error, which works will with setCurrentIndex() */
 int getBool(QString name)
 {
@@ -197,6 +267,24 @@ void setInt(QString name, int value)
     }
 }
 
+void setFloat(QString name, float value)
+{
+    std::shared_ptr<Setting> setting = retrieve(name);
+    if (setting == nullptr) {
+        qDebug() << "warning: no settings with name" << name;
+        return;
+    }
+    if (setting->valueType() != LAB_VALUE_TYPE_FLOAT) {
+        qDebug() << "setFloat(): not valid float setting" << name << value;
+    }
+    if (value != std::get<float>(setting->value())) {
+        info("'{} has changed to '{}'", name.toStdString(), value);
+        xpath_add_node(name.toStdString().c_str());
+        xml_set_num(name.toStdString().c_str(), value);
+        setting->setValue(value);
+    }
+}
+
 void setStr(QString name, QString value)
 {
     std::shared_ptr<Setting> setting = retrieve(name);
diff --git a/src/settings.h b/src/settings.h
index 4352003..51b8e6f 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -22,6 +22,7 @@ enum settingValueType {
     LAB_VALUE_TYPE_INT,
     LAB_VALUE_TYPE_BOOL,
     LAB_VALUE_TYPE_STRING,
+    LAB_VALUE_TYPE_FLOAT
 };
 
 static inline QString settingFileTypeName(enum settingFileType type)
@@ -37,15 +38,15 @@ class Setting
 {
 public:
     Setting(QString name, enum settingFileType fileType, enum settingValueType valueType,
-            std::variant<int, QString> defaultValue);
-    void setValue(std::variant<int, QString> value);
+            std::variant<int, float, QString> defaultValue);
+    void setValue(std::variant<int, float, QString> value);
 
 private:
     QString m_name;
     enum settingFileType m_fileType;
     enum settingValueOrigin m_valueOrigin;
     enum settingValueType m_valueType;
-    std::variant<int, QString> m_value;
+    std::variant<int, float, QString> m_value;
 
 public:
     // Getters
@@ -53,15 +54,17 @@ class Setting
     enum settingFileType fileType() const { return m_fileType; }
     enum settingValueOrigin valueOrigin() const { return m_valueOrigin; }
     enum settingValueType valueType() const { return m_valueType; }
-    std::variant<int, QString> value() const { return m_value; }
+    std::variant<int, float, QString> value() const { return m_value; }// this too or not?
 };
 
 void initSettings(std::vector<std::shared_ptr<Setting>> *settings);
 QString getStr(QString name);
 int getInt(QString name);
 int getBool(QString name);
+float getFloat(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, int value);
 void setBoolfromString(QString name, QString value);
+void setFloat(QString name, float value);
diff --git a/src/xml.cpp b/src/xml.cpp
index c4963ac..689b3fd 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -193,7 +193,7 @@ void xml_set(const char *nodename, const char *value)
 void xml_set_num(const char *nodename, double value)
 {
     char buf[64];
-    snprintf(buf, sizeof(buf), "%.0f", value);
+    snprintf(buf, sizeof(buf), "%g", value);
     ctx.nodename = nodename;
     ctx.value = buf;
     ctx.mode = XML_MODE_SETTING;
@@ -218,6 +218,17 @@ int xml_get_int(const char *nodename)
     return ctx.value ? atoi(ctx.value) : 0;
 }
 
+float xml_get_float(const char *nodename)
+{
+    ctx.value = NULL;
+    ctx.nodename = nodename;
+    ctx.mode = XML_MODE_GETTING;
+    xml_tree_walk(xmlDocGetRootElement(ctx.doc));
+
+    return ctx.value ? atof(ctx.value) : 0.0f;
+}
+
+
 int xml_get_bool_text(const char *nodename)
 {
     const char *value = xml_get(nodename);
diff --git a/src/xml.h b/src/xml.h
index 26b35b4..70f3460 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -11,6 +11,7 @@ void xml_set_num(const char *nodename, double value);
 const char *xml_get(const char *nodename);
 int xml_get_int(const char *nodename);
 int xml_get_bool_text(const char *nodename);
+float xml_get_float(const char *nodename);
 
 /**
  * xpath_get_content() - Get content of node specified by xpath

From 120e609a1e84d9d5d52bf9a30a84e4a8fb863f12 Mon Sep 17 00:00:00 2001
From: stefonarch <standreas@riseup.net>
Date: Sat, 6 Dec 2025 20:59:26 +0100
Subject: [PATCH 2/3] Realign mouse.ui left; drop waste

---
 src/maindialog.cpp  |  25 +++----
 src/maindialog1.cpp | 156 --------------------------------------------
 src/mouse.ui        |  36 +++++-----
 src/mouse.ui.~      |  67 -------------------
 src/settings.cpp    |  18 ++---
 5 files changed, 35 insertions(+), 267 deletions(-)
 delete mode 100644 src/maindialog1.cpp
 delete mode 100644 src/mouse.ui.~

diff --git a/src/maindialog.cpp b/src/maindialog.cpp
index e6ac6db..f5072d7 100644
--- a/src/maindialog.cpp
+++ b/src/maindialog.cpp
@@ -29,15 +29,15 @@
 
 MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
 {
-    //resize(640, 480);
+    resize(640, 480);
 
     QVBoxLayout *verticalLayout = new QVBoxLayout(this);
-    //verticalLayout->setContentsMargins(6, 6, 6, 6);
+    verticalLayout->setContentsMargins(6, 6, 6, 6);
 
     QWidget *widget = new QWidget(this);
 
     QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
-    //horizontalLayout->setContentsMargins(6, 6, 6, 6);
+    horizontalLayout->setContentsMargins(6, 6, 6, 6);
 
     // List Widget on the Left
     QListWidget *list = new QListWidget(widget);
@@ -59,22 +59,13 @@ MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
     item3->setText(tr("Language & Region"));
 
     QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    //sizePolicy.setHorizontalStretch(0);
-    //sizePolicy.setVerticalStretch(0);
-    //sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
     list->setSizePolicy(sizePolicy);
     list->setSizeAdjustPolicy(QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents);
-    //list->setCurrentRow(0);
-    //list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
-
-    list->setViewMode(QListView::IconMode);
-    list->setMovement(QListView::Static);
-    list->setResizeMode(QListView::Adjust);
-    list->setWrapping(true);
-    list->setIconSize(QSize(48, 48));
-    list->setWordWrap(true);             // prevents text from wrapping inside
-    list->setUniformItemSizes(true);      // keeps all items same layout
-
+    list->setCurrentRow(0);
+    list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
 
     horizontalLayout->addWidget(list);
 
diff --git a/src/maindialog1.cpp b/src/maindialog1.cpp
deleted file mode 100644
index e6ac6db..0000000
--- a/src/maindialog1.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <QtCore/QVariant>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QListWidget>
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
-#include <language.h>
-#include <mouse.h>
-#include "appearance.h"
-#include "behaviour.h"
-
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QString>
-#include <QStandardPaths>
-#include <QTextStream>
-#include <string>
-#include <unistd.h>
-#include "environment.h"
-#include "find-themes.h"
-#include "log.h"
-#include "macros.h"
-#include "maindialog.h"
-#include "xml.h"
-
-MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
-{
-    //resize(640, 480);
-
-    QVBoxLayout *verticalLayout = new QVBoxLayout(this);
-    //verticalLayout->setContentsMargins(6, 6, 6, 6);
-
-    QWidget *widget = new QWidget(this);
-
-    QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
-    //horizontalLayout->setContentsMargins(6, 6, 6, 6);
-
-    // List Widget on the Left
-    QListWidget *list = new QListWidget(widget);
-
-    QListWidgetItem *item0 = new QListWidgetItem(list);
-    item0->setIcon(QIcon::fromTheme("applications-graphics"));
-    item0->setText(tr("Appearance"));
-
-    QListWidgetItem *item1 = new QListWidgetItem(list);
-    item1->setIcon(QIcon::fromTheme("preferences-desktop"));
-    item1->setText(tr("Behaviour"));
-
-    QListWidgetItem *item2 = new QListWidgetItem(list);
-    item2->setIcon(QIcon::fromTheme("input-mouse"));
-    item2->setText(tr("Mouse & Touchpad"));
-
-    QListWidgetItem *item3 = new QListWidgetItem(list);
-    item3->setIcon(QIcon::fromTheme("preferences-desktop-locale"));
-    item3->setText(tr("Language & Region"));
-
-    QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    //sizePolicy.setHorizontalStretch(0);
-    //sizePolicy.setVerticalStretch(0);
-    //sizePolicy.setHeightForWidth(list->sizePolicy().hasHeightForWidth());
-    list->setSizePolicy(sizePolicy);
-    list->setSizeAdjustPolicy(QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents);
-    //list->setCurrentRow(0);
-    //list->setFixedWidth(list->sizeHintForColumn(0) + 2 * list->frameWidth());
-
-    list->setViewMode(QListView::IconMode);
-    list->setMovement(QListView::Static);
-    list->setResizeMode(QListView::Adjust);
-    list->setWrapping(true);
-    list->setIconSize(QSize(48, 48));
-    list->setWordWrap(true);             // prevents text from wrapping inside
-    list->setUniformItemSizes(true);      // keeps all items same layout
-
-
-    horizontalLayout->addWidget(list);
-
-    // The stack containing all the pages
-    QStackedWidget *stack = new QStackedWidget(widget);
-
-    m_pageAppearance = new Appearance();
-    stack->addWidget(m_pageAppearance);
-
-    m_pageBehaviour = new Behaviour();
-    stack->addWidget(m_pageBehaviour);
-
-    m_pageMouse = new Mouse();
-    stack->addWidget(m_pageMouse);
-
-    m_pageLanguage = new Language();
-    stack->addWidget(m_pageLanguage);
-
-    horizontalLayout->addWidget(stack);
-
-    verticalLayout->addWidget(widget);
-
-    m_buttonBox = new QDialogButtonBox(this);
-    m_buttonBox->setOrientation(Qt::Orientation::Horizontal);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::StandardButton::Apply
-                                  | QDialogButtonBox::StandardButton::Close);
-    m_buttonBox->setCenterButtons(false);
-
-    verticalLayout->addWidget(m_buttonBox);
-
-    // Change pages when list items are clicked
-    QObject::connect(list, SIGNAL(currentRowChanged(int)), stack, SLOT(setCurrentIndex(int)));
-
-    // Close Button
-    QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-    // Apply Button
-    QObject::connect(m_buttonBox, &QDialogButtonBox::clicked, [&](QAbstractButton *button) {
-        if (m_buttonBox->standardButton(button) == QDialogButtonBox::Apply) {
-            onApply();
-        }
-    });
-
-    activate();
-}
-
-MainDialog::~MainDialog()
-{
-    xml_finish();
-}
-
-void MainDialog::activate()
-{
-    m_pageAppearance->activate();
-    m_pageBehaviour->activate();
-    m_pageMouse->activate();
-    m_pageLanguage->activate();
-}
-
-void MainDialog::onApply()
-{
-    m_pageAppearance->onApply();
-    m_pageBehaviour->onApply();
-    m_pageMouse->onApply();
-    m_pageLanguage->onApply();
-
-    // TODO: Get filename in a more consistent way - share common code with main.cpp
-    std::string config_home = std::getenv("HOME") + std::string("/.config/labwc");
-    std::string config_dir = std::getenv("LABWC_CONFIG_DIR") ?: config_home;
-    std::string environment_file = config_dir + "/environment";
-
-    xml_save();
-    environmentSave(environment_file);
-
-    /* reconfigure labwc */
-    if (!fork()) {
-        execl("/bin/sh", "/bin/sh", "-c", "labwc -r", (void *)NULL);
-    }
-}
diff --git a/src/mouse.ui b/src/mouse.ui
index bc0a4c6..aeb9182 100644
--- a/src/mouse.ui
+++ b/src/mouse.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>500</height>
+    <width>506</width>
+    <height>653</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0,1">
-   <item row="0" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="0" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Cursor Theme</string>
@@ -21,7 +21,7 @@
    <item row="0" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QComboBox" name="cursorTheme"/>
    </item>
-   <item row="1" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="1" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Cursor Size</string>
@@ -31,7 +31,7 @@
    <item row="1" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QSpinBox" name="cursorSize"/>
    </item>
-   <item row="2" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="2" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Natural Scroll</string>
@@ -48,7 +48,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="3" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_leftHanded">
      <property name="text">
       <string>Left Handed</string>
@@ -65,7 +65,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="4" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_pointerSpeed">
      <property name="text">
       <string>Pointer Speed</string>
@@ -88,7 +88,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="5" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_accelProfile">
      <property name="text">
       <string>Acceleration Profile</string>
@@ -109,7 +109,7 @@
      </item>
     </widget>
    </item>
-   <item row="6" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="6" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_sendEventsMode">
      <property name="text">
       <string>Touchpad</string>
@@ -135,7 +135,7 @@
      </item>
     </widget>
    </item>
-   <item row="7" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="7" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_tap">
      <property name="text">
       <string>Tap to Click</string>
@@ -155,7 +155,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="8" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_tapButtonMap">
      <property name="text">
       <string>Tap Button Map</string>
@@ -176,7 +176,7 @@
      </item>
     </widget>
    </item>
-   <item row="9" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="9" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_tapAndDrag">
      <property name="text">
       <string>Tap and Drag</string>
@@ -223,7 +223,7 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="10" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_threeFingerDrag">
      <property name="text">
       <string>Three Finger Drag</string>
@@ -240,7 +240,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="11" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_middleEmulation">
      <property name="text">
       <string>Middle Button Emulation</string>
@@ -257,7 +257,7 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="12" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_disableWhileTyping">
      <property name="text">
       <string>Disable While Typing</string>
@@ -274,7 +274,7 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="13" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_clickMethod">
      <property name="text">
       <string>Click Method</string>
@@ -300,7 +300,7 @@
      </item>
     </widget>
    </item>
-   <item row="14" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="14" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_scrollMethod">
      <property name="text">
       <string>Scroll Method</string>
@@ -331,7 +331,7 @@
      </item>
     </widget>
    </item>
-   <item row="15" column="0" alignment="Qt::AlignmentFlag::AlignRight">
+   <item row="15" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
     <widget class="QLabel" name="label_scrollFactor">
      <property name="text">
       <string>Scroll Factor</string>
diff --git a/src/mouse.ui.~ b/src/mouse.ui.~
deleted file mode 100644
index c16c270..0000000
--- a/src/mouse.ui.~
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>pageMouse</class>
- <widget class="QWidget" name="pageMouse">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>251</width>
-    <height>153</height>
-   </rect>
-  </property>
-  <layout class="QFormLayout" name="layPage2">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>6</number>
-   </property>
-   <property name="rightMargin">
-    <number>6</number>
-   </property>
-   <property name="bottomMargin">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Cursor Theme</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="cursorTheme"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Cursor Size</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QSpinBox" name="cursorSize"/>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Natural Scroll</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QCheckBox" name="naturalScroll">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>33</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/settings.cpp b/src/settings.cpp
index 4cc1ac6..cf50b84 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -101,6 +101,15 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
     // Use values from rc.xml if different from default
     if (m_fileType == LAB_FILE_TYPE_RCXML) {
         switch (m_valueType) {
+           case LAB_VALUE_TYPE_STRING: {
+                const char *value = xml_get(m_name.toStdString().c_str());
+                if (value && QString(value) != std::get<QString>(m_value)) {
+                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
+                    m_value = QString(value);
+                    info("[user-override] {}: {}", m_name.toStdString(), value);
+                }
+                break;
+            }
             case LAB_VALUE_TYPE_INT: {
                 int value = xml_get_int(m_name.toStdString().c_str());
                 if (value != std::get<int>(m_value)) {
@@ -128,15 +137,6 @@ Setting::Setting(QString name, enum settingFileType fileType, enum settingValueT
                 }
                 break;
             }
-            case LAB_VALUE_TYPE_STRING: {
-                const char *value = xml_get(m_name.toStdString().c_str());
-                if (value && QString(value) != std::get<QString>(m_value)) {
-                    m_valueOrigin = LAB_VALUE_ORIGIN_USER_OVERRIDE;
-                    m_value = QString(value);
-                    info("[user-override] {}: {}", m_name.toStdString(), value);
-                }
-                break;
-            }
             default:
                 break;
         }

From 741d90bb5c0d097fe41f52991ae7a79c5db35d77 Mon Sep 17 00:00:00 2001
From: stefonarch <standreas@riseup.net>
Date: Sun, 7 Dec 2025 08:37:38 +0100
Subject: [PATCH 3/3] Readd removed lines

---
 src/settings.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/settings.h b/src/settings.h
index 17bcb15..51b8e6f 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -66,3 +66,5 @@ void setInt(QString name, int value);
 void setStr(QString name, QString value);
 int parseBool(const char *str, int defaultValue);
 void setBool(QString name, int value);
+void setBoolfromString(QString name, QString value);
+void setFloat(QString name, float value);