Skip to content

Remove QComboBox strings in ui files and also get rid of call to related clear() method #156

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 4 commits into from
Dec 20, 2025
+8 −72
Merged

Remove QComboBox strings in ui files and also get rid of call to related clear() method #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc0bc2f
appearance.ui: remove QComboBox strings (as populated in .cpp file)
johanmalm Dec 20, 2025
af5cede
appearance.cpp: remove call to combo box clear() method as no longer …
johanmalm Dec 20, 2025
0446553
mouse.ui: remove QComboBox strings
johanmalm Dec 20, 2025
1cee05a
mouse.cpp: remove call to combo box clear() method
johanmalm Dec 20, 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
2 changes: 0 additions & 2 deletions src/appearance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ void Appearance::activate()
ui->iconTheme->setCurrentIndex(themes.indexOf(getStr("/labwc_config/theme/icon")));

/* Decoration */
ui->decoration->clear(); // remove 2 empty values created for some reason
ui->decoration->setToolTip(tr("Specify decorations for xdg-shell windows"));

QVector<QSharedPointer<Pair>> decorations;
Expand All @@ -62,7 +61,6 @@ void Appearance::activate()
}

/* Maximized Decoration */
ui->maximizedDecoration->clear(); // remove 2 empty values created for some reason
ui->maximizedDecoration->setToolTip(tr("Specify if server side decorations are shown for maximized windows."));

QVector<QSharedPointer<Pair>> maximized_decorations;
Expand Down
28 changes: 3 additions & 25 deletions src/appearance.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,7 @@
</widget>
</item>
<item row="4" column="3">
<widget class="QComboBox" name="decoration">
<item>
<property name="text">
<string>Server</string>
</property>
</item>
<item>
<property name="text">
<string>Client</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="decoration"/>
</item>
<item row="4" column="4" colspan="2">
<spacer name="horizontalSpacer">
Expand All @@ -169,18 +158,7 @@
</widget>
</item>
<item row="5" column="3">
<widget class="QComboBox" name="maximizedDecoration">
<item>
<property name="text">
<string>Titlebar</string>
</property>
</item>
<item>
<property name="text">
<string>None</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="maximizedDecoration"/>
</item>
<item row="5" column="4" colspan="2">
<spacer name="horizontalSpacer_2">
Expand Down Expand Up @@ -215,4 +193,4 @@
</widget>
<resources/>
<connections/>
</ui>
</ui>
10 changes: 0 additions & 10 deletions src/mouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ void Mouse::activate()
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"))));
Expand All @@ -56,8 +54,6 @@ void Mouse::activate()
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("left-right-middle"))));
maps.append(QSharedPointer<Pair>(new Pair("lmr", tr("left-middle-right"))));
Expand Down Expand Up @@ -95,8 +91,6 @@ void Mouse::activate()
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"))));
Expand All @@ -114,8 +108,6 @@ void Mouse::activate()
}

/* 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"))));
Expand All @@ -133,8 +125,6 @@ void Mouse::activate()
}

/* Send Events Mode */
ui->sendEventsMode->clear();

// Note: Cannot support 'No' until the device="" option is supported because otherwise all
// devices (including keyboard) will be disabled which is unlikely to be the desired outcome.
QVector<QSharedPointer<Pair>> sendeventsmodes;
Expand Down
40 changes: 5 additions & 35 deletions src/mouse.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,7 @@
</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>
<widget class="QComboBox" name="accelProfile"/>
</item>
<item row="6" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QLabel" name="label_sendEventsMode">
Expand All @@ -117,23 +106,7 @@
</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>
<widget class="QComboBox" name="sendEventsMode"/>
</item>
<item row="7" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QLabel" name="label_tap">
Expand Down Expand Up @@ -163,8 +136,7 @@
</widget>
</item>
<item row="8" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QComboBox" name="tapButtonMap">
</widget>
<widget class="QComboBox" name="tapButtonMap"/>
</item>
<item row="9" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QLabel" name="label_tapAndDrag">
Expand Down Expand Up @@ -272,8 +244,7 @@
</widget>
</item>
<item row="13" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QComboBox" name="clickMethod">
</widget>
<widget class="QComboBox" name="clickMethod"/>
</item>
<item row="14" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QLabel" name="label_scrollMethod">
Expand All @@ -283,8 +254,7 @@
</widget>
</item>
<item row="14" column="1" colspan="4" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QComboBox" name="scrollMethod">
</widget>
<widget class="QComboBox" name="scrollMethod"/>
</item>
<item row="15" column="0" alignment="Qt::AlignmentFlag::AlignLeft">
<widget class="QLabel" name="label_scrollFactor">
Expand Down