Skip to content

Commit 9e06835

Browse files
redtidejohanmalm
redtide
authored and
johanmalm
committed
Qt: replaced QTabWidget with QListWidget and QStackedWidget
1 parent 0983b0f commit 9e06835

File tree

3 files changed

+195
-89
lines changed

3 files changed

+195
-89
lines changed

‎tweaks-qt/main.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44

55
int main(int argc, char *argv[])
66
{
7-
QApplication a(argc, argv);
7+
QApplication app(argc, argv);
8+
app.setApplicationName(QStringLiteral("labwc-tweaks"));
9+
810
MainDialog w;
911
w.show();
10-
return a.exec();
12+
13+
return app.exec();
1114
}

‎tweaks-qt/maindialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ MainDialog::MainDialog(QWidget *parent)
1818
{
1919
ui->setupUi(this);
2020

21+
ui->list->setFixedWidth(ui->list->sizeHintForColumn(0) + 2 * ui->list->frameWidth());
22+
2123
std::string config_file = std::getenv("HOME");
2224
config_file += "/.config/labwc/rc.xml";
2325
xml_init(config_file.data());

‎tweaks-qt/maindialog.ui

Lines changed: 188 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,191 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>658</width>
10-
<height>535</height>
9+
<width>640</width>
10+
<height>480</height>
1111
</rect>
1212
</property>
13-
<property name="windowTitle">
14-
<string>Dialog</string>
15-
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout">
13+
<layout class="QVBoxLayout" name="layout">
14+
<property name="leftMargin">
15+
<number>6</number>
16+
</property>
17+
<property name="topMargin">
18+
<number>6</number>
19+
</property>
20+
<property name="rightMargin">
21+
<number>6</number>
22+
</property>
23+
<property name="bottomMargin">
24+
<number>6</number>
25+
</property>
1726
<item>
18-
<widget class="QTabWidget" name="tabWidget">
19-
<property name="minimumSize">
20-
<size>
21-
<width>640</width>
22-
<height>480</height>
23-
</size>
24-
</property>
25-
<property name="currentIndex">
26-
<number>0</number>
27-
</property>
28-
<widget class="QWidget" name="tab">
29-
<attribute name="title">
30-
<string>Appearance</string>
31-
</attribute>
32-
<layout class="QFormLayout" name="formLayout">
33-
<item row="1" column="0">
34-
<widget class="QLabel" name="label_2">
27+
<widget class="QWidget" name="widget" native="true">
28+
<layout class="QHBoxLayout" name="horizontalLayout">
29+
<property name="leftMargin">
30+
<number>6</number>
31+
</property>
32+
<property name="topMargin">
33+
<number>6</number>
34+
</property>
35+
<property name="rightMargin">
36+
<number>6</number>
37+
</property>
38+
<property name="bottomMargin">
39+
<number>6</number>
40+
</property>
41+
<item>
42+
<widget class="QListWidget" name="list">
43+
<property name="sizePolicy">
44+
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
45+
<horstretch>0</horstretch>
46+
<verstretch>0</verstretch>
47+
</sizepolicy>
48+
</property>
49+
<property name="sizeAdjustPolicy">
50+
<enum>QAbstractScrollArea::AdjustToContents</enum>
51+
</property>
52+
<property name="currentRow">
53+
<number>0</number>
54+
</property>
55+
<item>
3556
<property name="text">
36-
<string>Corner Radius</string>
57+
<string>Appearance</string>
3758
</property>
38-
</widget>
39-
</item>
40-
<item row="0" column="0">
41-
<widget class="QLabel" name="label">
42-
<property name="text">
43-
<string>Openbox Theme</string>
59+
<property name="icon">
60+
<iconset theme="applications-graphics"/>
4461
</property>
45-
</widget>
46-
</item>
47-
<item row="0" column="1">
48-
<widget class="QComboBox" name="openboxTheme"/>
49-
</item>
50-
<item row="1" column="1">
51-
<widget class="QSpinBox" name="cornerRadius"/>
52-
</item>
53-
</layout>
54-
</widget>
55-
<widget class="QWidget" name="tab_2">
56-
<attribute name="title">
57-
<string>Mouse &amp;&amp; Touchpad</string>
58-
</attribute>
59-
<layout class="QFormLayout" name="formLayout_2">
60-
<item row="0" column="0">
61-
<widget class="QLabel" name="label_3">
62+
</item>
63+
<item>
6264
<property name="text">
63-
<string>Cursor Theme</string>
65+
<string>Mouse &amp; Touchpad</string>
6466
</property>
65-
</widget>
66-
</item>
67-
<item row="0" column="1">
68-
<widget class="QComboBox" name="cursorTheme"/>
69-
</item>
70-
<item row="1" column="0">
71-
<widget class="QLabel" name="label_4">
72-
<property name="text">
73-
<string>Cursor Size</string>
67+
<property name="icon">
68+
<iconset theme="input-mouse"/>
7469
</property>
75-
</widget>
76-
</item>
77-
<item row="1" column="1">
78-
<widget class="QSpinBox" name="cursorSize"/>
79-
</item>
80-
<item row="2" column="0">
81-
<widget class="QLabel" name="label_5">
70+
</item>
71+
<item>
8272
<property name="text">
83-
<string>Natural Scroll</string>
73+
<string>Language &amp; Region</string>
8474
</property>
85-
</widget>
86-
</item>
87-
<item row="2" column="1">
88-
<widget class="QComboBox" name="naturalScroll"/>
89-
</item>
90-
</layout>
91-
</widget>
92-
<widget class="QWidget" name="tab_3">
93-
<attribute name="title">
94-
<string>Language &amp;&amp; Region</string>
95-
</attribute>
96-
<layout class="QFormLayout" name="formLayout_3">
97-
<item row="0" column="0">
98-
<widget class="QLabel" name="label_6">
99-
<property name="text">
100-
<string>Keyboard Layout</string>
75+
<property name="icon">
76+
<iconset theme="preferences-desktop-locale"/>
10177
</property>
78+
</item>
79+
</widget>
80+
</item>
81+
<item>
82+
<widget class="QStackedWidget" name="stack">
83+
<widget class="QWidget" name="page1">
84+
<layout class="QFormLayout" name="layPage1">
85+
<property name="leftMargin">
86+
<number>6</number>
87+
</property>
88+
<property name="topMargin">
89+
<number>6</number>
90+
</property>
91+
<property name="rightMargin">
92+
<number>6</number>
93+
</property>
94+
<property name="bottomMargin">
95+
<number>6</number>
96+
</property>
97+
<item row="0" column="0">
98+
<widget class="QLabel" name="label">
99+
<property name="text">
100+
<string>Openbox Theme</string>
101+
</property>
102+
</widget>
103+
</item>
104+
<item row="0" column="1">
105+
<widget class="QComboBox" name="openboxTheme"/>
106+
</item>
107+
<item row="1" column="0">
108+
<widget class="QLabel" name="label_2">
109+
<property name="text">
110+
<string>Corner Radius</string>
111+
</property>
112+
</widget>
113+
</item>
114+
<item row="1" column="1">
115+
<widget class="QSpinBox" name="cornerRadius"/>
116+
</item>
117+
</layout>
102118
</widget>
103-
</item>
104-
<item row="0" column="1">
105-
<widget class="QComboBox" name="keyboardLayout"/>
106-
</item>
107-
</layout>
108-
</widget>
119+
<widget class="QWidget" name="page2">
120+
<layout class="QFormLayout" name="layPage2">
121+
<property name="leftMargin">
122+
<number>6</number>
123+
</property>
124+
<property name="topMargin">
125+
<number>6</number>
126+
</property>
127+
<property name="rightMargin">
128+
<number>6</number>
129+
</property>
130+
<property name="bottomMargin">
131+
<number>6</number>
132+
</property>
133+
<item row="0" column="0">
134+
<widget class="QLabel" name="label_3">
135+
<property name="text">
136+
<string>Cursor Theme</string>
137+
</property>
138+
</widget>
139+
</item>
140+
<item row="0" column="1">
141+
<widget class="QComboBox" name="cursorTheme"/>
142+
</item>
143+
<item row="1" column="0">
144+
<widget class="QLabel" name="label_4">
145+
<property name="text">
146+
<string>Cursor Size</string>
147+
</property>
148+
</widget>
149+
</item>
150+
<item row="1" column="1">
151+
<widget class="QSpinBox" name="cursorSize"/>
152+
</item>
153+
<item row="2" column="0">
154+
<widget class="QLabel" name="label_5">
155+
<property name="text">
156+
<string>Natural Scroll</string>
157+
</property>
158+
</widget>
159+
</item>
160+
<item row="2" column="1">
161+
<widget class="QComboBox" name="naturalScroll"/>
162+
</item>
163+
</layout>
164+
</widget>
165+
<widget class="QWidget" name="page3">
166+
<layout class="QFormLayout" name="layPage3">
167+
<property name="leftMargin">
168+
<number>6</number>
169+
</property>
170+
<property name="topMargin">
171+
<number>6</number>
172+
</property>
173+
<property name="rightMargin">
174+
<number>6</number>
175+
</property>
176+
<property name="bottomMargin">
177+
<number>6</number>
178+
</property>
179+
<item row="0" column="0">
180+
<widget class="QLabel" name="label_6">
181+
<property name="text">
182+
<string>Keyboard Layout</string>
183+
</property>
184+
</widget>
185+
</item>
186+
<item row="0" column="1">
187+
<widget class="QComboBox" name="keyboardLayout"/>
188+
</item>
189+
</layout>
190+
</widget>
191+
</widget>
192+
</item>
193+
</layout>
109194
</widget>
110195
</item>
111196
<item>
@@ -157,5 +242,21 @@
157242
</hint>
158243
</hints>
159244
</connection>
245+
<connection>
246+
<sender>list</sender>
247+
<signal>currentRowChanged(int)</signal>
248+
<receiver>stack</receiver>
249+
<slot>setCurrentIndex(int)</slot>
250+
<hints>
251+
<hint type="sourcelabel">
252+
<x>145</x>
253+
<y>248</y>
254+
</hint>
255+
<hint type="destinationlabel">
256+
<x>459</x>
257+
<y>248</y>
258+
</hint>
259+
</hints>
260+
</connection>
160261
</connections>
161262
</ui>

0 commit comments

Comments
 (0)