diff --git a/sandbox/Controls.qml b/sandbox/Controls.qml index f134f5ff..e0b22d29 100644 --- a/sandbox/Controls.qml +++ b/sandbox/Controls.qml @@ -9,7 +9,6 @@ GridLayout { columns: 6 columnSpacing: 5 rowSpacing: 5 - property ThemePalette theme StatusIconTabButton { icon.name: "chat" diff --git a/sandbox/Layout.qml b/sandbox/Layout.qml index 01d005aa..baeec06e 100644 --- a/sandbox/Layout.qml +++ b/sandbox/Layout.qml @@ -11,7 +11,6 @@ GridLayout { columns: 6 columnSpacing: 5 rowSpacing: 5 - property ThemePalette theme Button { id: btn diff --git a/sandbox/Others.qml b/sandbox/Others.qml index b87353c6..a680059e 100644 --- a/sandbox/Others.qml +++ b/sandbox/Others.qml @@ -8,10 +8,9 @@ GridLayout { columns: 6 columnSpacing: 5 rowSpacing: 5 - property ThemePalette theme StatusLoadingIndicator { - color: parent.theme.directColor4 + color: Theme.palette.directColor4 } StatusLetterIdenticon { diff --git a/sandbox/main.qml b/sandbox/main.qml index 6ba995db..3470c156 100644 --- a/sandbox/main.qml +++ b/sandbox/main.qml @@ -175,7 +175,6 @@ StatusWindow { id: controlsComponent Controls { anchors.centerIn: parent - theme: Theme.palette } } @@ -183,7 +182,6 @@ StatusWindow { id: layoutComponent Layout { anchors.centerIn: parent - theme: Theme.palette } } @@ -191,7 +189,6 @@ StatusWindow { id: othersComponent Others { anchors.centerIn: parent - theme: Theme.palette } } diff --git a/src/StatusQ/Core/Theme/Theme.qml b/src/StatusQ/Core/Theme/Theme.qml index 1b142cad..ce0ec346 100644 --- a/src/StatusQ/Core/Theme/Theme.qml +++ b/src/StatusQ/Core/Theme/Theme.qml @@ -4,10 +4,7 @@ import QtQuick 2.13 QtObject { id: appTheme - // Replace it with: - // property QtObject palette: StatusLightTheme {} - // for reloading - property ThemePalette palette: StatusLightTheme {} + property QtObject palette: StatusLightTheme {} function setTheme(theme) { palette = theme