ColorSet concept in Theme
ClosedPublic
Actions

Authored by mart on Sep 22 2017, 4:47 PM.

Details

Reviewers

hein

Group Reviewers

Kirigami

Commits

R169:5b08a7b6cd50: ColorSet concept in Theme

Summary

Theme is now an attached property rather than a singleton (in 2.2 import)
a "colorSet" property can be defined on it and all its color properties
will change to that given set (which follows KColorScheme ColorSet)
all child items will inherit the theme of ancestor objects, until instructed not to

Test Plan

Kirigami Gallery

Diff Detail

Repository

R169 Kirigami

Branch

arcpatch-D7939

Lint

No Linters Available

Unit

No Unit Test Coverage

mart created this revision.Sep 22 2017, 4:47 PM

Restricted Application added a project: Kirigami. · View Herald TranscriptSep 22 2017, 4:47 PM

Restricted Application added a subscriber: plasma-devel. · View Herald Transcript

mart added a reviewer: Kirigami.Sep 22 2017, 4:49 PM

mart added a reviewer: hein.Sep 22 2017, 4:54 PM

Merge branch 'master' into mart/colorcontext
add a rangeslider to the gallery
some comments

remove binary file
give focus on press by default

bind missing colors
add missing roles
complete colors definition for fallback qml themes
active coloring when pressed
Merge branch 'master' into mart/colorcontext
support static linking with included pri and qmake
better docs
package extra icons
use the Material ripple for list items
PlatformThemeFactory->KirigamiPluginFactory
finish rename files
replace deprecated values
all colors in the smallest fallback Theme.qml
more documentation

support for custom colors
support "color" property for icons

finalize signatures for signals
todo on font change

hein accepted this revision.Oct 3 2017, 2:33 PM

This revision is now accepted and ready to land.Oct 3 2017, 2:33 PM

Merge branch 'master' into arcpatch-D7939

Closed by commit R169:5b08a7b6cd50: ColorSet concept in Theme (authored by mart). · Explain WhyOct 3 2017, 2:45 PM

This revision was automatically updated to reflect the committed changes.

ratijas added a subscriber: ratijas.Jun 1 2023, 12:24 PM

ratijas added inline comments.

src/libkirigami/platformtheme.h
224–225 ↗	(On Diff #20247)	What was this TODO all about?

meven added a subscriber: meven.Jun 15 2023, 7:40 AM

meven added inline comments.

src/libkirigami/platformtheme.h
224–225 ↗	(On Diff #20247)	I am guessing adding making `colorsChanged(Kirigami::PlatformTheme::ColorSet colorSet)`.

Large Diff

This large diff affects 113 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (13 lines)
M		KF5Kirigami2Config.cmake.in (10 lines)
M		KF5Kirigami2Macros.cmake (5 lines)
M		README.md (6 lines)
M		autotests/tst_keynavigation.qml (2 lines)
M		autotests/tst_listskeynavigation.qml (2 lines)
M		autotests/tst_pagerow.qml (2 lines)
M		examples/applicationitemapp/main.qml (2 lines)
M		examples/galleryapp/CMakeLists.txt (32 lines)
M		examples/galleryapp/resources.qrc (1 line)
M		examples/gallerydata/contents/ui/DesktopExampleApp.qml (2 lines)
M		examples/gallerydata/contents/ui/ExampleApp.qml (2 lines)
M		examples/gallerydata/contents/ui/MainPage.qml (8 lines)
M		examples/gallerydata/contents/ui/gallery/ButtonGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml (2 lines)
A	M	examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml (180 lines)
M		examples/gallerydata/contents/ui/gallery/ColorsGallery.qml (106 lines)
M		examples/gallerydata/contents/ui/gallery/LayersGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/ListViewGallery.qml (4 lines)
M		examples/gallerydata/contents/ui/gallery/ListViewHeaderItemsGallery.qml (4 lines)
M		examples/gallerydata/contents/ui/gallery/MetricsGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/MiscGallery.qml (4 lines)
M		examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/SliderGallery.qml (3 lines)
M		examples/gallerydata/contents/ui/gallery/SwitchGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/TabBarGallery.qml (2 lines)
M		examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml (2 lines)
M		examples/gallerydata/metadata.desktop (7 lines)
M		examples/minimalqmake/Page1Form.ui.qml (2 lines)
M		examples/minimalqmake/kirigami-icons.qrc (1 line)
M		examples/minimalqmake/main.qml (2 lines)
M		examples/multiplatformnotesapp/NotesGeneral.qml (4 lines)
P		examples/multiplatformnotesapp/notesDesktop.qml (18 lines) Copied from src/styles/org.kde.desktop/ApplicationWindow.qml
P		examples/multiplatformnotesapp/notesMobile.qml (19 lines) Copied from src/styles/org.kde.desktop/ApplicationWindow.qml
M		examples/simpleexamples/AbstractApplicationWindow.qml (2 lines)
M		examples/simpleexamples/FixedSidebar.qml (2 lines)
M		examples/simpleexamples/MultipleColumnsGallery.qml (2 lines)
M		examples/simpleexamples/SplitDrawer.qml (2 lines)
M		examples/simpleexamples/TabBarHeader.qml (2 lines)
M		examples/simpleexamples/customdrawer.qml (2 lines)
M		examples/simpleexamples/minimal.qml (2 lines)
M		examples/simpleexamples/pushpopclear.qml (2 lines)
M		examples/simpleexamples/simpleChatApp.qml (8 lines)
M		kirigami.pri (12 lines)
M		src/CMakeLists.txt (12 lines)
M		src/controls/AbstractApplicationHeader.qml (2 lines)
M		src/controls/AbstractApplicationItem.qml (8 lines)
M		src/controls/AbstractApplicationWindow.qml (8 lines)
M		src/controls/AbstractItemViewHeader.qml (2 lines)
M		src/controls/ApplicationItem.qml (4 lines)
M		src/controls/ApplicationWindow.qml (4 lines)
M		src/controls/BasicListItem.qml (4 lines)
M		src/controls/ContextDrawer.qml (8 lines)
M		src/controls/GlobalDrawer.qml (14 lines)
M		src/controls/Heading.qml (4 lines)
M		src/controls/Icon.qml (21 lines)
M		src/controls/ItemViewHeader.qml (2 lines)
M		src/controls/Label.qml (2 lines)
M		src/controls/OverlayDrawer.qml (8 lines)
M		src/controls/OverlaySheet.qml (4 lines)
M		src/controls/Page.qml (24 lines)
M		src/controls/PageRow.qml (2 lines)
M		src/controls/ScrollablePage.qml (5 lines)
M		src/controls/Separator.qml (4 lines)
M		src/controls/Theme.qml (22 lines)
M		src/controls/ToolBarApplicationHeader.qml (2 lines)
M		src/controls/Units.qml (2 lines)
M		src/controls/plugins.qmltypes (1 line)
M		src/controls/private/ActionButton.qml (14 lines)
M		src/controls/private/CornerShadow.qml (2 lines)
M		src/controls/private/DefaultListItemBackground.qml (6 lines)
M		src/controls/private/EdgeShadow.qml (2 lines)
M		src/controls/private/PrivateActionToolButton.qml (2 lines)
M		src/controls/private/RefreshableScrollView.qml (6 lines)
M		src/controls/private/SwipeItemEventFilter.qml (2 lines)
M		src/controls/templates/AbstractApplicationHeader.qml (2 lines)
M		src/controls/templates/AbstractListItem.qml (11 lines)
M		src/controls/templates/ApplicationHeader.qml (2 lines)
M		src/controls/templates/OverlayDrawer.qml (9 lines)
M		src/controls/templates/OverlaySheet.qml (9 lines)
M		src/controls/templates/SwipeListItem.qml (6 lines)
M		src/controls/templates/private/BackButton.qml (2 lines)
M		src/controls/templates/private/ContextIcon.qml (2 lines)
M		src/controls/templates/private/MenuIcon.qml (2 lines)
M		src/controls/templates/private/PassiveNotification.qml (2 lines)
M		src/controls/templates/private/ScrollView.qml (2 lines)
M		src/desktopicon.h (19 lines)
M		src/desktopicon.cpp (61 lines)
M		src/kirigamiplugin.cpp (22 lines)
A	M	src/libkirigami/CMakeLists.txt (85 lines)
A	M	src/libkirigami/basictheme.cpp (295 lines)
A	M	src/libkirigami/basictheme_p.h (105 lines)
A	M	src/libkirigami/kirigamipluginfactory.h (65 lines)
A	M	src/libkirigami/kirigamipluginfactory.cpp (39 lines)
A	M	src/libkirigami/platformtheme.h (239 lines)
A	M	src/libkirigami/platformtheme.cpp (455 lines)
M		src/styles/Material/AbstractListItem.qml (43 lines)
M		src/styles/Material/Label.qml (2 lines)
M		src/styles/Material/SwipeListItem.qml (2 lines)
M		src/styles/Material/Theme.qml (37 lines)
M		src/styles/Plasma/Icon.qml (4 lines)
M		src/styles/Plasma/Theme.qml (45 lines)
M		src/styles/org.kde.desktop/AbstractApplicationHeader.qml (2 lines)
M		src/styles/org.kde.desktop/AbstractListItem.qml (2 lines)
M		src/styles/org.kde.desktop/ApplicationWindow.qml (2 lines)
M		src/styles/org.kde.desktop/OverlayDrawer.qml (8 lines)
M		src/styles/org.kde.desktop/SwipeListItem.qml (2 lines)
M		src/styles/org.kde.desktop/Theme.qml (27 lines)
M		tests/KeyboardListTest.qml (2 lines)
M		tests/KeyboardTest.qml (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	19797	9b8def0		Sep 22 2017, 4:47 PM	★	★
Diff 2	20005	c6fc7a9	- Merge branch 'master' into mart/colorcontext	Sep 27 2017, 4:48 PM	★	★
Diff 3	20006	c6fc7a9	- remove binary file	Sep 27 2017, 4:59 PM	★	★
Diff 4	20106	2ed823a	- bind missing colors	Sep 29 2017, 5:20 PM	★	★
Diff 5	20110	2ed823a	- support for custom colors	Sep 29 2017, 6:18 PM	★	★
Diff 6	20247	c6fc7a9	- finalize signatures for signals	Oct 2 2017, 1:50 PM	★	★
Diff 7	20297	23ca207	- Merge branch 'master' into arcpatch-D7939	Oct 3 2017, 2:44 PM	★	★
Diff 8	20298	23ca207	R169:5b08a7b6cd501e71c30d4447494eec6a61c22051	Oct 3 2017, 2:44 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
15cc32910dc8	47974486bf32	77e971502982 23ca2077027b	Marco Martin	Merge branch 'master' into arcpatch-D7939	Oct 3 2017, 2:44 PM
77e971502982	26f4128d8195	c6fc7a96aceb	Marco Martin	ColorSet concept in Theme (Show More…)	Oct 3 2017, 2:41 PM

ColorSet concept in ThemeClosedPublicActions

Details

Diff Detail

Large Diff

Revision ContentsChangeset List

Diff 20297

CMakeLists.txt

KF5Kirigami2Config.cmake.in

KF5Kirigami2Macros.cmake

README.md

autotests/tst_keynavigation.qml

autotests/tst_listskeynavigation.qml

autotests/tst_pagerow.qml

examples/applicationitemapp/main.qml

examples/galleryapp/CMakeLists.txt

examples/galleryapp/resources.qrc

examples/gallerydata/contents/ui/DesktopExampleApp.qml

examples/gallerydata/contents/ui/ExampleApp.qml

examples/gallerydata/contents/ui/MainPage.qml

examples/gallerydata/contents/ui/gallery/ButtonGallery.qml

examples/gallerydata/contents/ui/gallery/CheckBoxGallery.qml

examples/gallerydata/contents/ui/gallery/ColorSetGallery.qml

examples/gallerydata/contents/ui/gallery/ColorsGallery.qml

examples/gallerydata/contents/ui/gallery/LayersGallery.qml

examples/gallerydata/contents/ui/gallery/ListViewGallery.qml

examples/gallerydata/contents/ui/gallery/ListViewHeaderItemsGallery.qml

examples/gallerydata/contents/ui/gallery/MetricsGallery.qml

examples/gallerydata/contents/ui/gallery/MiscGallery.qml

examples/gallerydata/contents/ui/gallery/MultipleColumnsGallery.qml

examples/gallerydata/contents/ui/gallery/NonScrollableGallery.qml

examples/gallerydata/contents/ui/gallery/ProgressBarGallery.qml

examples/gallerydata/contents/ui/gallery/RadioButtonGallery.qml

examples/gallerydata/contents/ui/gallery/SliderGallery.qml

examples/gallerydata/contents/ui/gallery/SwitchGallery.qml

examples/gallerydata/contents/ui/gallery/TabBarGallery.qml

examples/gallerydata/contents/ui/gallery/TextFieldGallery.qml

examples/gallerydata/metadata.desktop

examples/minimalqmake/Page1Form.ui.qml

examples/minimalqmake/kirigami-icons.qrc

examples/minimalqmake/main.qml

examples/multiplatformnotesapp/NotesGeneral.qml

examples/multiplatformnotesapp/notesDesktop.qml

examples/multiplatformnotesapp/notesMobile.qml

examples/simpleexamples/AbstractApplicationWindow.qml

examples/simpleexamples/FixedSidebar.qml

examples/simpleexamples/MultipleColumnsGallery.qml

examples/simpleexamples/SplitDrawer.qml

examples/simpleexamples/TabBarHeader.qml

examples/simpleexamples/customdrawer.qml

examples/simpleexamples/minimal.qml

examples/simpleexamples/pushpopclear.qml

examples/simpleexamples/simpleChatApp.qml

kirigami.pri

src/CMakeLists.txt

src/controls/AbstractApplicationHeader.qml

src/controls/AbstractApplicationItem.qml

src/controls/AbstractApplicationWindow.qml

src/controls/AbstractItemViewHeader.qml

src/controls/ApplicationItem.qml

src/controls/ApplicationWindow.qml

src/controls/BasicListItem.qml

src/controls/ContextDrawer.qml

src/controls/GlobalDrawer.qml

src/controls/Heading.qml

src/controls/Icon.qml

src/controls/ItemViewHeader.qml

src/controls/Label.qml

src/controls/OverlayDrawer.qml

src/controls/OverlaySheet.qml

src/controls/Page.qml

src/controls/PageRow.qml

src/controls/ScrollablePage.qml

src/controls/Separator.qml

src/controls/Theme.qml

src/controls/ToolBarApplicationHeader.qml

src/controls/Units.qml

src/controls/plugins.qmltypes

src/controls/private/ActionButton.qml

src/controls/private/CornerShadow.qml

src/controls/private/DefaultListItemBackground.qml

ColorSet concept in Theme
ClosedPublic
Actions

Revision Contents
Changeset List