Skip to content

Commit e0df2ec

Browse files
Octol1ttleOctol1ttle
committed
feat: add button to disable the cat button in main window
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
1 parent c5075d1 commit e0df2ec

4 files changed

Lines changed: 58 additions & 44 deletions

File tree

‎launcher/Application.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
650650
m_settings->registerSetting("IconTheme", QString());
651651
m_settings->registerSetting("ApplicationTheme", QString());
652652
m_settings->registerSetting("BackgroundCat", QString("kitteh"));
653+
m_settings->registerSetting("CatButtonVisible", true);
653654

654655
// Remembered state
655656
m_settings->registerSetting("LastUsedGroupForNewInstance", QString());

‎launcher/ui/MainWindow.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@ void MainWindow::updateMainToolBar()
593593
{
594594
ui->menuBar->setVisible(APPLICATION->settings()->get("MenuBarInsteadOfToolBar").toBool());
595595
ui->mainToolBar->setVisible(ui->menuBar->isNativeMenuBar() || !APPLICATION->settings()->get("MenuBarInsteadOfToolBar").toBool());
596+
ui->actionCAT->setVisible(APPLICATION->settings()->get("CatButtonVisible").toBool());
596597
}
597598

598599
void MainWindow::updateLaunchButton()

‎launcher/ui/widgets/AppearanceWidget.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ void AppearanceWidget::applySettings()
102102
settings->set("CatOpacity", m_ui->catOpacitySlider->value());
103103
auto catFit = m_ui->catFitComboBox->currentIndex();
104104
settings->set("CatFit", catFit == 0 ? "fit" : catFit == 1 ? "fill" : "strech");
105+
settings->set("CatButtonVisible", !m_ui->hideCatButtonCheckBox->isChecked());
105106
}
106107

107108
void AppearanceWidget::loadSettings()
@@ -122,6 +123,7 @@ void AppearanceWidget::loadSettings()
122123

123124
auto catFit = settings->get("CatFit").toString();
124125
m_ui->catFitComboBox->setCurrentIndex(catFit == "fit" ? 0 : catFit == "fill" ? 1 : 2);
126+
m_ui->hideCatButtonCheckBox->setChecked(!settings->get("CatButtonVisible").toBool());
125127
}
126128

127129
void AppearanceWidget::retranslateUi()

‎launcher/ui/widgets/AppearanceWidget.ui‎

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,13 @@
2828
<layout class="QVBoxLayout" name="verticalLayout_2">
2929
<item>
3030
<layout class="QGridLayout" name="gridLayout">
31-
<item row="2" column="3">
32-
<widget class="QPushButton" name="catPackFolder">
33-
<property name="toolTip">
34-
<string>View cat packs folder.</string>
35-
</property>
36-
<property name="text">
37-
<string>Open Folder</string>
38-
</property>
39-
</widget>
40-
</item>
41-
<item row="0" column="3">
42-
<widget class="QPushButton" name="widgetStyleFolder">
43-
<property name="toolTip">
44-
<string>View widget themes folder.</string>
45-
</property>
31+
<item row="1" column="0">
32+
<widget class="QLabel" name="iconsLabel">
4633
<property name="text">
47-
<string>Open Folder</string>
48-
</property>
49-
</widget>
50-
</item>
51-
<item row="1" column="3">
52-
<widget class="QPushButton" name="iconsFolder">
53-
<property name="toolTip">
54-
<string>View icon themes folder.</string>
34+
<string>&amp;Icons:</string>
5535
</property>
56-
<property name="text">
57-
<string>Open Folder</string>
36+
<property name="buddy">
37+
<cstring>iconsComboBox</cstring>
5838
</property>
5939
</widget>
6040
</item>
@@ -68,8 +48,15 @@
6848
</property>
6949
</widget>
7050
</item>
71-
<item row="2" column="2">
72-
<widget class="QComboBox" name="catPackComboBox"/>
51+
<item row="0" column="3">
52+
<widget class="QPushButton" name="widgetStyleFolder">
53+
<property name="toolTip">
54+
<string>View widget themes folder.</string>
55+
</property>
56+
<property name="text">
57+
<string>Open Folder</string>
58+
</property>
59+
</widget>
7360
</item>
7461
<item row="1" column="2">
7562
<widget class="QComboBox" name="iconsComboBox">
@@ -84,6 +71,9 @@
8471
</property>
8572
</widget>
8673
</item>
74+
<item row="2" column="2">
75+
<widget class="QComboBox" name="catPackComboBox"/>
76+
</item>
8777
<item row="0" column="2">
8878
<widget class="QComboBox" name="widgetStyleComboBox">
8979
<property name="sizePolicy">
@@ -97,16 +87,13 @@
9787
</property>
9888
</widget>
9989
</item>
100-
<item row="3" column="2">
101-
<widget class="QPushButton" name="reloadThemesButton">
102-
<property name="sizePolicy">
103-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
104-
<horstretch>0</horstretch>
105-
<verstretch>0</verstretch>
106-
</sizepolicy>
90+
<item row="1" column="3">
91+
<widget class="QPushButton" name="iconsFolder">
92+
<property name="toolTip">
93+
<string>View icon themes folder.</string>
10794
</property>
10895
<property name="text">
109-
<string>Reload All</string>
96+
<string>Open Folder</string>
11097
</property>
11198
</widget>
11299
</item>
@@ -120,16 +107,40 @@
120107
</property>
121108
</widget>
122109
</item>
123-
<item row="1" column="0">
124-
<widget class="QLabel" name="iconsLabel">
125-
<property name="text">
126-
<string>&amp;Icons:</string>
110+
<item row="2" column="3">
111+
<widget class="QPushButton" name="catPackFolder">
112+
<property name="toolTip">
113+
<string>View cat packs folder.</string>
127114
</property>
128-
<property name="buddy">
129-
<cstring>iconsComboBox</cstring>
115+
<property name="text">
116+
<string>Open Folder</string>
130117
</property>
131118
</widget>
132119
</item>
120+
<item row="4" column="2">
121+
<layout class="QHBoxLayout" name="horizontalLayout_8">
122+
<item>
123+
<widget class="QPushButton" name="reloadThemesButton">
124+
<property name="sizePolicy">
125+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
126+
<horstretch>0</horstretch>
127+
<verstretch>0</verstretch>
128+
</sizepolicy>
129+
</property>
130+
<property name="text">
131+
<string>Reload All</string>
132+
</property>
133+
</widget>
134+
</item>
135+
<item>
136+
<widget class="QCheckBox" name="hideCatButtonCheckBox">
137+
<property name="text">
138+
<string>Hide cat button</string>
139+
</property>
140+
</widget>
141+
</item>
142+
</layout>
143+
</item>
133144
</layout>
134145
</item>
135146
</layout>
@@ -346,8 +357,8 @@
346357
</property>
347358
<property name="sizeHint" stdset="0">
348359
<size>
349-
<width>81</width>
350-
<height>32</height>
360+
<width>68</width>
361+
<height>22</height>
351362
</size>
352363
</property>
353364
<property name="currentIndex">
@@ -620,7 +631,6 @@
620631
<tabstop>iconsFolder</tabstop>
621632
<tabstop>catPackComboBox</tabstop>
622633
<tabstop>catPackFolder</tabstop>
623-
<tabstop>reloadThemesButton</tabstop>
624634
<tabstop>consoleFont</tabstop>
625635
<tabstop>fontSizeBox</tabstop>
626636
<tabstop>catFitComboBox</tabstop>

0 commit comments

Comments
 (0)