Merge branch 'settingsWindow' into organize
Merge.
This commit is contained in:
@@ -8,6 +8,7 @@ import qs.Modules.Notifications.Sidebar.Utils as Utils
|
||||
import qs.Modules.Dashboard as Dashboard
|
||||
import qs.Modules.Osd as Osd
|
||||
import qs.Modules.Launcher as Launcher
|
||||
import qs.Modules.Settings as Settings
|
||||
|
||||
Shape {
|
||||
id: root
|
||||
@@ -77,4 +78,13 @@ Shape {
|
||||
startX: root.width
|
||||
startY: root.panels.notifications.height
|
||||
}
|
||||
|
||||
Settings.Background {
|
||||
id: settings
|
||||
|
||||
wrapper: root.panels.settings
|
||||
|
||||
startX: ( root.width - wrapper.width ) / 2 - rounding
|
||||
startY: 0
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,6 +113,7 @@ Variants {
|
||||
property bool osd
|
||||
property bool launcher
|
||||
property bool notif: NotifServer.popups.length > 0
|
||||
property bool settings
|
||||
|
||||
Component.onCompleted: Visibilities.load(scope.modelData, this)
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import qs.Modules.Dashboard as Dashboard
|
||||
import qs.Modules.Osd as Osd
|
||||
import qs.Components.Toast as Toasts
|
||||
import qs.Modules.Launcher as Launcher
|
||||
import qs.Modules.Settings as Settings
|
||||
import qs.Config
|
||||
|
||||
Item {
|
||||
@@ -26,6 +27,7 @@ Item {
|
||||
readonly property alias osd: osd
|
||||
readonly property alias toasts: toasts
|
||||
readonly property alias launcher: launcher
|
||||
readonly property alias settings: settings
|
||||
|
||||
anchors.fill: parent
|
||||
// anchors.margins: 8
|
||||
@@ -121,4 +123,14 @@ Item {
|
||||
anchors.bottom: utilities.top
|
||||
anchors.right: parent.right
|
||||
}
|
||||
|
||||
Settings.Wrapper {
|
||||
id: settings
|
||||
|
||||
visibilities: root.visibilities
|
||||
panels: root
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user