Skip to content

Mouse page #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johanmalm merged 2 commits into from
Nov 23, 2025
Merged

Mouse page #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d4ffa4
Create mouse.{ui,h,cpp}
johanmalm Nov 23, 2025
0246b78
mouse: change naturalScroll from QComboBox to QCheckBox
johanmalm Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ set(PROJECT_SOURCES

src/appearance.cpp src/appearance.h src/appearance.ui
src/behaviour.cpp src/behaviour.h src/behaviour.ui
src/mouse.cpp src/mouse.h src/mouse.ui
)
set(PROJECT_OTHER_FILES
.github/workflows/build.yml
Expand Down
27 changes: 4 additions & 23 deletions src/maindialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,7 @@ void MainDialog::activate()
{
ui->pageAppearance->activate();
ui->pageBehaviour->activate();

/* # MOUSE & TOUCHPAD */

/* Cursor Theme */
QStringList cursorThemes = findIconThemes(LAB_ICON_THEME_TYPE_CURSOR);
ui->cursorTheme->addItems(cursorThemes);
ui->cursorTheme->setCurrentIndex(cursorThemes.indexOf(getStr("XCURSOR_THEME")));

/* Cursor Size */
ui->cursorSize->setValue(getInt("XCURSOR_SIZE"));

/* Natural Scroll */
ui->naturalScroll->addItem("no");
ui->naturalScroll->addItem("yes");
ui->naturalScroll->setCurrentIndex(getBool("/labwc_config/libinput/device/naturalScroll"));
ui->pageMouse->activate();

/* # LANGUAGE */

Expand All @@ -91,14 +77,7 @@ void MainDialog::onApply()
{
ui->pageAppearance->onApply();
ui->pageBehaviour->onApply();

/* ~/.config/labwc/rc.xml */
setBoolfromString("/labwc_config/libinput/device/naturalScroll", TEXT(ui->naturalScroll));
xml_save();

/* ~/.config/labwc/environment */
environmentSet("XCURSOR_THEME", TEXT(ui->cursorTheme));
environmentSetInt("XCURSOR_SIZE", ui->cursorSize->value());
ui->pageMouse->onApply();

/*
* We include variants in XKB_DEFAULT_LAYOUT, for example "latam(deadtilde),ru(phonetic),gr",
Expand All @@ -114,6 +93,8 @@ void MainDialog::onApply()
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 */
Expand Down
47 changes: 1 addition & 46 deletions src/maindialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,52 +90,7 @@
<widget class="QStackedWidget" name="stack">
<widget class="Appearance" name="pageAppearance"/>
<widget class="Behaviour" name="pageBehaviour"/>
<widget class="QWidget" name="page2">
<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="QComboBox" name="naturalScroll"/>
</item>
</layout>
</widget>
<widget class="Mouse" name="pageMouse"/>
<widget class="QWidget" name="page3">
<layout class="QFormLayout" name="layPage3">
<property name="leftMargin">
Expand Down
40 changes: 40 additions & 0 deletions src/mouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include "mouse.h"
#include "environment.h"
#include "find-themes.h"
#include "macros.h"
#include "settings.h"
#include "./ui_mouse.h"

Mouse::Mouse(QWidget *parent) : QWidget(parent), ui(new Ui::pageMouse)
{
ui->setupUi(this);
}

Mouse::~Mouse()
{
delete ui;
}

void Mouse::activate()
{
/* Cursor Theme */
QStringList cursorThemes = findIconThemes(LAB_ICON_THEME_TYPE_CURSOR);
ui->cursorTheme->addItems(cursorThemes);
ui->cursorTheme->setCurrentIndex(cursorThemes.indexOf(getStr("XCURSOR_THEME")));

/* Cursor Size */
ui->cursorSize->setValue(getInt("XCURSOR_SIZE"));

/* Natural Scroll */
ui->naturalScroll->setChecked(getBool("/labwc_config/libinput/device/naturalScroll"));
}

void Mouse::onApply()
{
/* ~/.config/labwc/rc.xml */
setBool("/labwc_config/libinput/device/naturalScroll", ui->naturalScroll->isChecked());

/* ~/.config/labwc/environment */
environmentSet("XCURSOR_THEME", TEXT(ui->cursorTheme));
environmentSetInt("XCURSOR_SIZE", ui->cursorSize->value());
}
25 changes: 25 additions & 0 deletions src/mouse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#ifndef MOUSE_H
#define MOUSE_H
#include <QWidget>

QT_BEGIN_NAMESPACE
namespace Ui {
class pageMouse;
}
QT_END_NAMESPACE

class Mouse : public QWidget
{
Q_OBJECT

public:
Mouse(QWidget *parent = nullptr);
~Mouse();

void activate();
void onApply();

private:
Ui::pageMouse *ui;
};
#endif // MOUSE_H
60 changes: 60 additions & 0 deletions src/mouse.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?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"/>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>