diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-02-04 05:39:38 +0300 |
|---|---|---|
| committer | Matthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr> | 2022-03-18 19:43:15 +0300 |
| commit | c342c304ace72e76680d6c9b594c56d88ccefeec (patch) | |
| tree | 4190e5f92ff998091fbe3c554a9c2196667a6bae /src/gui/tray/Window.qml | |
| parent | 90f59eca217ff1715379c9f612f5e2d131039810 (diff) | |
Added dark mode
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Diffstat (limited to 'src/gui/tray/Window.qml')
| -rw-r--r-- | src/gui/tray/Window.qml | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index a6f97a680..2cc13dd7b 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -111,6 +111,7 @@ Window { radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
border.width: Style.trayWindowBorderWidth
border.color: Style.menuBorder
+ color: Style.backgroundColor
Accessible.role: Accessible.Grouping
Accessible.name: qsTr("Nextcloud desktop main dialog")
@@ -137,6 +138,7 @@ Window { Layout.preferredHeight: Style.trayWindowHeaderHeight
display: AbstractButton.IconOnly
flat: true
+ palette: Style.systemPalette
Accessible.role: Accessible.ButtonMenu
Accessible.name: qsTr("Current account")
@@ -168,9 +170,11 @@ Window { width: (Style.currentAccountButtonWidth - 2)
height: Math.min(implicitHeight, maxMenuHeight)
closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
+ palette: Style.palette
background: Rectangle {
border.color: Style.menuBorder
+ color: Style.backgroundColor
radius: Style.currentAccountButtonRadius
}
@@ -216,6 +220,7 @@ Window { id: addAccountButton
height: Style.addAccountButtonHeight
hoverEnabled: true
+ palette: Theme.systemPalette
background: Item {
height: parent.height
@@ -234,14 +239,14 @@ Window { Image {
Layout.leftMargin: 12
verticalAlignment: Qt.AlignCenter
- source: "qrc:///client/theme/black/add.svg"
+ source: Systray.darkMode ? "qrc:///client/theme/white/add.svg" : "qrc:///client/theme/black/add.svg"
sourceSize.width: Style.headerButtonIconSize
sourceSize.height: Style.headerButtonIconSize
}
Label {
Layout.leftMargin: 14
text: qsTr("Add account")
- color: "black"
+ color: Style.ncTextColor
font.pixelSize: Style.topLinePixelSize
}
// Filler on the right
@@ -267,6 +272,7 @@ Window { MenuItem {
id: syncPauseButton
font.pixelSize: Style.topLinePixelSize
+ palette.windowText: Style.ncTextColor
hoverEnabled: true
onClicked: Systray.pauseResumeSync()
@@ -289,6 +295,7 @@ Window { id: settingsButton
text: qsTr("Settings")
font.pixelSize: Style.topLinePixelSize
+ palette.windowText: Style.ncTextColor
hoverEnabled: true
onClicked: Systray.openSettings()
@@ -311,6 +318,7 @@ Window { id: exitButton
text: qsTr("Exit");
font.pixelSize: Style.topLinePixelSize
+ palette.windowText: Style.ncTextColor
hoverEnabled: true
onClicked: Systray.shutdown()
@@ -411,6 +419,7 @@ Window { text: UserModel.currentUser.name
elide: Text.ElideRight
color: UserModel.currentUser.headerTextColor
+
font.pixelSize: Style.topLinePixelSize
font.bold: true
}
@@ -566,6 +575,7 @@ Window { background: Rectangle {
border.color: Style.menuBorder
+ color: Style.backgroundColor
radius: 2
}
@@ -578,10 +588,22 @@ Window { id: appEntry
text: appName
font.pixelSize: Style.topLinePixelSize
+ palette.windowText: Style.ncTextColor
icon.source: appIconUrl
+ icon.color: Style.ncTextColor
onTriggered: UserAppsModel.openAppUrl(appUrl)
hoverEnabled: true
+ background: Item {
+ height: parent.height
+ width: parent.width
+ Rectangle {
+ anchors.fill: parent
+ anchors.margins: 1
+ color: parent.parent.hovered || parent.parent.visualFocus ? Style.lightHover : "transparent"
+ }
+ }
+
Accessible.role: Accessible.MenuItem
Accessible.name: qsTr("Open %1 in browser").arg(appName)
Accessible.onPressAction: appEntry.triggered()
@@ -713,16 +735,16 @@ Window { delegate: UnifiedSearchResultListItem {
width: unifiedSearchResultsListView.width
- height: trayWindowBackground.Style.unifiedSearchItemHeight
+ height: Style.unifiedSearchItemHeight
isSearchInProgress: unifiedSearchResultsListView.model.isSearchInProgress
- textLeftMargin: trayWindowBackground.Style.unifiedSearchResultTextLeftMargin
- textRightMargin: trayWindowBackground.Style.unifiedSearchResultTextRightMargin
- iconWidth: trayWindowBackground.Style.unifiedSearchResulIconWidth
- iconLeftMargin: trayWindowBackground.Style.unifiedSearchResulIconLeftMargin
- titleFontSize: trayWindowBackground.Style.unifiedSearchResulTitleFontSize
- sublineFontSize: trayWindowBackground.Style.unifiedSearchResulSublineFontSize
- titleColor: trayWindowBackground.Style.unifiedSearchResulTitleColor
- sublineColor: trayWindowBackground.Style.unifiedSearchResulSublineColor
+ textLeftMargin: Style.unifiedSearchResultTextLeftMargin
+ textRightMargin: Style.unifiedSearchResultTextRightMargin
+ iconWidth: Style.unifiedSearchResulIconWidth
+ iconLeftMargin: Style.unifiedSearchResulIconLeftMargin
+ titleFontSize: Style.unifiedSearchResulTitleFontSize
+ sublineFontSize: Style.unifiedSearchResulSublineFontSize
+ titleColor: Style.ncTextColor
+ sublineColor: Style.ncSecondaryTextColor
currentFetchMoreInProgressProviderId: unifiedSearchResultsListView.model.currentFetchMoreInProgressProviderId
fetchMoreTriggerClicked: unifiedSearchResultsListView.model.fetchMoreTriggerClicked
resultClicked: unifiedSearchResultsListView.model.resultClicked
|