From: Claudio Cambra Date: Thu, 25 May 2023 02:32:20 +0000 (+0800) Subject: Define all QML windows as ApplicationWindows, define palettes here X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~26^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4272a5d26895508b8abf0106d9629bf2645a7f66;p=nextcloud-desktop.git Define all QML windows as ApplicationWindows, define palettes here Signed-off-by: Claudio Cambra --- diff --git a/src/gui/ConflictItemFileInfo.qml b/src/gui/ConflictItemFileInfo.qml index 1e8202a62..be345f7e8 100644 --- a/src/gui/ConflictItemFileInfo.qml +++ b/src/gui/ConflictItemFileInfo.qml @@ -37,26 +37,6 @@ Item { leftPadding: 0 spacing: 0 - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - onToggled: function() { selectedChanged() } diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index d4520d6f8..1e27d8677 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -22,7 +22,7 @@ import Style 1.0 import com.nextcloud.desktopclient 1.0 import "./tray" -QtWindow.Window { +ApplicationWindow { id: conflictsDialog required property var allConflicts @@ -36,6 +36,26 @@ QtWindow.Window { minimumHeight: Style.minimumHeightResolveConflictsDialog title: qsTr('Solve sync conflicts') + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + onClosing: function(close) { Systray.destroyDialog(self); close.accepted = true @@ -74,26 +94,6 @@ QtWindow.Window { Layout.fillWidth: true - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - text: qsTr('All local versions') leftPadding: 0 @@ -112,26 +112,6 @@ QtWindow.Window { Layout.fillWidth: true - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - text: qsTr('All server versions') leftPadding: 0 @@ -186,26 +166,6 @@ QtWindow.Window { DialogButtonBox { Layout.fillWidth: true - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - Button { text: qsTr("Resolve conflicts") DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole diff --git a/src/gui/filedetails/FileDetailsWindow.qml b/src/gui/filedetails/FileDetailsWindow.qml index 39c9590e2..abcf3e850 100644 --- a/src/gui/filedetails/FileDetailsWindow.qml +++ b/src/gui/filedetails/FileDetailsWindow.qml @@ -33,6 +33,26 @@ ApplicationWindow { title: qsTr("File details of %1 · %2").arg(fileDetailsPage.fileDetails.name).arg(Systray.windowTitle) + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + FileDetailsView { id: fileDetailsPage anchors.fill: parent diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 553ded55f..1fbc2d582 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -160,26 +160,6 @@ Page { padding: Style.standardSpacing * 2 - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - background: Rectangle { color: Style.backgroundColor visible: root.backgroundsVisible @@ -323,24 +303,7 @@ Page { sourceComponent: CheckBox { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox spacing: moreMenu.indicatorSpacing padding: moreMenu.itemPadding indicator.width: moreMenu.indicatorItemWidth @@ -440,23 +403,7 @@ Page { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox spacing: moreMenu.indicatorSpacing padding: moreMenu.itemPadding @@ -484,23 +431,7 @@ Page { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox spacing: moreMenu.indicatorSpacing padding: moreMenu.itemPadding @@ -609,23 +540,7 @@ Page { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox spacing: moreMenu.indicatorSpacing padding: moreMenu.itemPadding @@ -820,23 +735,7 @@ Page { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the checkbox spacing: moreMenu.indicatorSpacing padding: moreMenu.itemPadding diff --git a/src/gui/filedetails/ShareView.qml b/src/gui/filedetails/ShareView.qml index 07d8c90b8..f0773d7a4 100644 --- a/src/gui/filedetails/ShareView.qml +++ b/src/gui/filedetails/ShareView.qml @@ -93,26 +93,6 @@ ColumnLayout { modal: true closePolicy: Popup.NoAutoClose - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - visible: false onAccepted: { diff --git a/src/gui/tray/ActivityItem.qml b/src/gui/tray/ActivityItem.qml index 88ff40472..2cac0580b 100644 --- a/src/gui/tray/ActivityItem.qml +++ b/src/gui/tray/ActivityItem.qml @@ -18,26 +18,6 @@ ItemDelegate { readonly property bool isTalkReplyPossible: model.conversationToken !== "" property bool isTalkReplyOptionVisible: model.messageSent !== "" - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - padding: Style.standardSpacing Accessible.role: Accessible.ListItem diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index 67943f3af..436a79e5b 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -14,26 +14,6 @@ ScrollView { signal openFile(string filePath) signal activityItemClicked(int index) - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - contentWidth: availableWidth padding: 0 focus: false diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index 7e57ee7e6..d8cc49bea 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -22,7 +22,7 @@ import QtMultimedia 5.15 import QtQuick.Controls 2.15 import QtGraphicalEffects 1.15 -Window { +ApplicationWindow { id: root color: "transparent" flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint @@ -55,6 +55,26 @@ Window { width: root.windowWidth height: rootBackground.height + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + Component.onCompleted: { Systray.forceWindowInit(root); Systray.positionNotificationWindow(root); diff --git a/src/gui/tray/EditFileLocallyLoadingDialog.qml b/src/gui/tray/EditFileLocallyLoadingDialog.qml index b4f9771d3..5c47163b5 100644 --- a/src/gui/tray/EditFileLocallyLoadingDialog.qml +++ b/src/gui/tray/EditFileLocallyLoadingDialog.qml @@ -5,7 +5,7 @@ import com.nextcloud.desktopclient 1.0 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -Window { +ApplicationWindow { id: root flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint @@ -19,6 +19,26 @@ Window { readonly property real fontPixelSize: Style.topLinePixelSize * 1.5 readonly property real iconWidth: fontPixelSize * 2 + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + Component.onCompleted: { Systray.forceWindowInit(root); x = Screen.width / 2 - width / 2 diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index 24df88bcd..6345bf79d 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -71,24 +71,7 @@ RowLayout { // TODO: Rather than setting all these palette colours manually, // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the progress bar - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - + palette.window: Style.ncTextColor // NOTE: Fusion theme uses darker window colour for the border of the progress bar value: syncStatus.syncProgress } } diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 4e347a2f8..b7b100dfd 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -37,6 +37,26 @@ ApplicationWindow { color: "transparent" flags: Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint + // TODO: Rather than setting all these palette colours manually, + // create a custom style and do it for all components globally + palette { + text: Style.ncTextColor + windowText: Style.ncTextColor + buttonText: Style.ncTextColor + brightText: Style.ncTextBrightColor + highlight: Style.lightHover + highlightedText: Style.ncTextColor + light: Style.lightHover + midlight: Style.ncSecondaryTextColor + mid: Style.darkerHover + dark: Style.menuBorder + button: Style.buttonBackgroundColor + window: Style.backgroundColor + base: Style.backgroundColor + toolTipBase: Style.backgroundColor + toolTipText: Style.ncTextColor + } + readonly property int maxMenuHeight: Style.trayWindowHeight - Style.trayWindowHeaderHeight - 2 * Style.trayWindowBorderWidth Component.onCompleted: Systray.forceWindowInit(trayWindow) @@ -285,26 +305,6 @@ ApplicationWindow { height: Math.min(implicitHeight, maxMenuHeight) closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - background: Rectangle { border.color: Style.menuBorder color: Style.backgroundColor @@ -669,26 +669,6 @@ ApplicationWindow { height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape - // TODO: Rather than setting all these palette colours manually, - // create a custom style and do it for all components globally - palette { - text: Style.ncTextColor - windowText: Style.ncTextColor - buttonText: Style.ncTextColor - brightText: Style.ncTextBrightColor - highlight: Style.lightHover - highlightedText: Style.ncTextColor - light: Style.lightHover - midlight: Style.lightHover - mid: Style.ncSecondaryTextColor - dark: Style.menuBorder - button: Style.menuBorder - window: Style.backgroundColor - base: Style.backgroundColor - toolTipBase: Style.backgroundColor - toolTipText: Style.ncTextColor - } - background: Rectangle { border.color: Style.menuBorder color: Style.backgroundColor