summaryrefslogtreecommitdiff
path: root/lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch
diff options
context:
space:
mode:
Diffstat (limited to 'lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch')
-rw-r--r--lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch161
1 files changed, 161 insertions, 0 deletions
diff --git a/lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch b/lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch
new file mode 100644
index 00000000..b56428e9
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/revert1-c66eb66b58328beb1cac4b3576f30bb68001021c.patch
@@ -0,0 +1,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>