1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
diff '--color=auto' -Nur a/lxqt-config-appearance/styleconfig.cpp b/lxqt-config-appearance/styleconfig.cpp
--- a/lxqt-config-appearance/styleconfig.cpp 2025-04-17 10:06:55.000000000 +0100
+++ b/lxqt-config-appearance/styleconfig.cpp 2025-05-01 02:24:05.123354907 +0100
@@ -54,7 +54,6 @@
connect(ui->qtComboBox, QOverload<int>::of(&QComboBox::activated), this, &StyleConfig::settingsChanged);
connect(ui->toolButtonStyle, QOverload<int>::of(&QComboBox::activated), this, &StyleConfig::settingsChanged);
- connect(ui->toolBarIconSize, QOverload<int>::of(&QComboBox::activated), this, &StyleConfig::settingsChanged);
connect(ui->singleClickActivate, &QAbstractButton::clicked, this, &StyleConfig::settingsChanged);
connect(ui->winColorLabel, &ColorLabel::colorChanged, this, &StyleConfig::settingsChanged);
@@ -110,33 +109,6 @@
val = Qt::ToolButtonTextBesideIcon;
ui->toolButtonStyle->setCurrentIndex(val);
- // toolbar icon size
- int index = mSettings->value(QLatin1String("tool_bar_icon_size")).toInt();
- if (index < 16) // consult the active Qt style
- index = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
- switch (index)
- {
- case 16:
- index = 0;
- break;
- case 22:
- index = 1;
- break;
- case 24:
- index = 2;
- break;
- case 32:
- index = 3;
- break;
- case 48:
- index = 4;
- break;
- default:
- index = 2;
- break;
- }
- ui->toolBarIconSize->setCurrentIndex(index);
-
// activate item views with single click
ui->singleClickActivate->setChecked( mSettings->value(QStringLiteral("single_click_activate"), false).toBool());
@@ -291,37 +263,6 @@
mSettings->sync();
emit updateOtherSettings();
}
-
- // toolbar icon size
- index = ui->toolBarIconSize->currentIndex();
- switch (index)
- {
- case 0:
- index = 16;
- break;
- case 1:
- index = 22;
- break;
- case 2:
- index = 24;
- break;
- case 3:
- index = 32;
- break;
- case 4:
- index = 48;
- break;
- default:
- index = 24;
- break;
- }
- if(index != mSettings->value(QLatin1String("tool_bar_icon_size")).toInt())
- {
- mSettings->setValue(QStringLiteral("tool_bar_icon_size"), index);
- // TODO: Do we want to apply it to GTK somehow?
- /*mSettings->sync();
- emit updateOtherSettings();*/
- }
}
void StyleConfig::savePalette()
diff '--color=auto' -Nur a/lxqt-config-appearance/styleconfig.ui b/lxqt-config-appearance/styleconfig.ui
--- a/lxqt-config-appearance/styleconfig.ui 2025-04-17 10:06:55.000000000 +0100
+++ b/lxqt-config-appearance/styleconfig.ui 2025-05-01 02:24:05.123354907 +0100
@@ -280,9 +280,6 @@
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
- <property name="toolTip">
- <string>May be overridden by Qt style or app</string>
- </property>
<property name="text">
<string>Toolbar button style:</string>
</property>
@@ -290,9 +287,6 @@
</item>
<item row="3" column="1">
<widget class="QComboBox" name="toolButtonStyle">
- <property name="toolTip">
- <string>May be overridden by Qt style or app</string>
- </property>
<item>
<property name="text">
<string>Only display the icon</string>
@@ -320,53 +314,8 @@
</item>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_15">
- <property name="toolTip">
- <string>May be overridden by Qt style or app</string>
- </property>
- <property name="text">
- <string>Toolbar icon size:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QComboBox" name="toolBarIconSize">
- <property name="toolTip">
- <string>May be overridden by Qt style or app</string>
- </property>
- <item>
- <property name="text">
- <string>16</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>22</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>24</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>32</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>48</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="5" column="0" colspan="2">
+ <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="singleClickActivate">
- <property name="toolTip">
- <string>May be overridden by Qt style or app</string>
- </property>
<property name="text">
<string>Activate item on single click</string>
</property>
|
