Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Konsole
Commits
fe64881f
Commit
fe64881f
authored
Dec 17, 2021
by
Nate Graham
Browse files
Make use of new colorful preferences icons in settings windows
CCBUG: 414214
CCBUG: 414215
CCBUG: 414213
parent
3cb75fd7
Pipeline
#111558
passed with stage
in 2 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/MainWindow.cpp
View file @
fe64881f
...
...
@@ -773,13 +773,13 @@ void MainWindow::showSettingsDialog(const bool showProfilePage)
auto
*
profileSettings
=
new
ProfileSettings
(
confDialog
);
auto
*
profilePage
=
new
KPageWidgetItem
(
profileSettings
,
profilePageName
);
profilePage
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"preferences-
system-profiles
"
)));
profilePage
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"preferences-
desktop-theme
"
)));
confDialog
->
addPage
(
profilePage
,
true
);
connect
(
confDialog
,
&
QDialog
::
accepted
,
profileSettings
,
&
ProfileSettings
::
slotAccepted
);
const
QString
tabBarPageName
=
i18nc
(
"@title Preferences page name"
,
"Tab Bar / Splitters"
);
auto
tabBarPage
=
new
KPageWidgetItem
(
new
TabBarSettings
(
confDialog
),
tabBarPageName
);
tabBarPage
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
system-run
"
)));
tabBarPage
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
preferences-tabs
"
)));
confDialog
->
addPage
(
tabBarPage
,
true
);
const
QString
temporaryFilesPageName
=
i18nc
(
"@title Preferences page name"
,
"Temporary Files"
);
...
...
src/widgets/EditProfileDialog.cpp
View file @
fe64881f
...
...
@@ -118,7 +118,7 @@ EditProfileDialog::EditProfileDialog(QWidget *parent)
_tabsUi
->
setupUi
(
tabsPageWidget
);
auto
*
tabsPageItem
=
addPage
(
tabsPageWidget
,
tabsPageName
);
tabsPageItem
->
setHeader
(
tabsPageName
);
tabsPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
tab-duplicate
"
),
defaultIcon
));
tabsPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
preferences-tabs
"
),
defaultIcon
));
_pages
[
tabsPageItem
]
=
Page
(
&
EditProfileDialog
::
setupTabsPage
);
LabelsAligner
tabsAligner
(
tabsPageWidget
);
...
...
@@ -151,7 +151,7 @@ EditProfileDialog::EditProfileDialog(QWidget *parent)
_scrollingUi
->
setupUi
(
scrollingPageWidget
);
auto
*
scrollingPageItem
=
addPage
(
scrollingPageWidget
,
scrollingPageName
);
scrollingPageItem
->
setHeader
(
scrollingPageName
);
scrollingPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
transform-move-vertica
l"
),
defaultIcon
));
scrollingPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
preferences-scrol
l"
),
defaultIcon
));
_pages
[
scrollingPageItem
]
=
Page
(
&
EditProfileDialog
::
setupScrollingPage
);
// adjust "history size" label height to match history size widget's first radio button
...
...
@@ -193,7 +193,7 @@ EditProfileDialog::EditProfileDialog(QWidget *parent)
_advancedUi
->
setupUi
(
advancedPageWidget
);
auto
*
advancedPageItem
=
addPage
(
advancedPageWidget
,
advancedPageName
);
advancedPageItem
->
setHeader
(
advancedPageName
);
advancedPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
configure
"
),
defaultIcon
));
advancedPageItem
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"
preferences-other
"
),
defaultIcon
));
_pages
[
advancedPageItem
]
=
Page
(
&
EditProfileDialog
::
setupAdvancedPage
);
// there are various setupXYZPage() methods to load the items
...
...
Nate Graham
@ngraham
mentioned in merge request
!538 (closed)
·
Dec 17, 2021
mentioned in merge request
!538 (closed)
mentioned in merge request !538
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment