Define all QML windows as ApplicationWindows, define palettes here

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/ConflictItemFileInfo.qml b/src/gui/ConflictItemFileInfo.qml
index 1e8202a62b29c2eb5ab7a1d4f0781dab6774854c..be345f7e8a9455de30c7aa03e72f3a16db708edd 100644 (file)
--- 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 d4520d6f816a5c7263a184ae771cca33684424b3..1e27d86776ec4bae4010ad4363b713d6d8475b9c 100644 (file)
--- 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 39c9590e26b31738e57777fc6b7485615988e7f4..abcf3e850f90ec660e1191f54f5856d772f16a83 100644 (file)
--- 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 553ded55f21255509e2fbbf7a5dd76e6eb76dab8..1fbc2d58267bba8e0e4abc124c01356478e3b3b9 100644 (file)
--- 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 07d8c90b8fd47059278aaa0e3eef0df3020da123..f0773d7a4077ea9ea39dc232a0c73c5516d29513 100644 (file)
--- 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 88ff4047240768afbe2467e42de02b6e86638af0..2cac0580b9798a75d283be507fdcabe01e3748dc 100644 (file)
--- 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 67943f3af5762bdc88726f97a2355ea80c70bc4c..436a79e5bd6c6dc1adc5dc3809f426f66d54b0d5 100644 (file)
--- 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 7e57ee7e64cecd23c19e41bb1aeaaf18029e78c5..d8cc49bead3a5b9107fa09d165d69ac17f1a80be 100644 (file)
--- 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 b4f9771d32eb4fb7b9cda9deb25e612dfe551535..5c47163b5465c9c6efec449428c9cace3b7e09d1 100644 (file)
--- 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 24df88bcdf8d986aaeb3afad1424e9a7f9105a81..6345bf79d0fc1fb7d82dc25096ada3dd384c74a3 100644 (file)
--- 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 4e347a2f8c75c9113c040856d80c680226b2bd02..b7b100dfdae21d625fd6801a620d2c5f7d27a6f8 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -37,6 +37,26 @@ ApplicationWindow {
     color:      "transparent"\r
     flags:      Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint\r
 \r
+    // TODO: Rather than setting all these palette colours manually,\r
+    // create a custom style and do it for all components globally\r
+    palette {\r
+        text: Style.ncTextColor\r
+        windowText: Style.ncTextColor\r
+        buttonText: Style.ncTextColor\r
+        brightText: Style.ncTextBrightColor\r
+        highlight: Style.lightHover\r
+        highlightedText: Style.ncTextColor\r
+        light: Style.lightHover\r
+        midlight: Style.ncSecondaryTextColor\r
+        mid: Style.darkerHover\r
+        dark: Style.menuBorder\r
+        button: Style.buttonBackgroundColor\r
+        window: Style.backgroundColor\r
+        base: Style.backgroundColor\r
+        toolTipBase: Style.backgroundColor\r
+        toolTipText: Style.ncTextColor\r
+    }\r
+\r
     readonly property int maxMenuHeight: Style.trayWindowHeight - Style.trayWindowHeaderHeight - 2 * Style.trayWindowBorderWidth\r
 \r
     Component.onCompleted: Systray.forceWindowInit(trayWindow)\r
@@ -285,26 +305,6 @@ ApplicationWindow {
                         height: Math.min(implicitHeight, maxMenuHeight)\r
                         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
-                        // TODO: Rather than setting all these palette colours manually,\r
-                        // create a custom style and do it for all components globally\r
-                        palette {\r
-                            text: Style.ncTextColor\r
-                            windowText: Style.ncTextColor\r
-                            buttonText: Style.ncTextColor\r
-                            brightText: Style.ncTextBrightColor\r
-                            highlight: Style.lightHover\r
-                            highlightedText: Style.ncTextColor\r
-                            light: Style.lightHover\r
-                            midlight: Style.lightHover\r
-                            mid: Style.ncSecondaryTextColor\r
-                            dark: Style.menuBorder\r
-                            button: Style.menuBorder\r
-                            window: Style.backgroundColor\r
-                            base: Style.backgroundColor\r
-                            toolTipBase: Style.backgroundColor\r
-                            toolTipText: Style.ncTextColor\r
-                        }\r
-\r
                         background: Rectangle {\r
                             border.color: Style.menuBorder\r
                             color: Style.backgroundColor\r
@@ -669,26 +669,6 @@ ApplicationWindow {
                         height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight\r
                         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
-                        // TODO: Rather than setting all these palette colours manually,\r
-                        // create a custom style and do it for all components globally\r
-                        palette {\r
-                            text: Style.ncTextColor\r
-                            windowText: Style.ncTextColor\r
-                            buttonText: Style.ncTextColor\r
-                            brightText: Style.ncTextBrightColor\r
-                            highlight: Style.lightHover\r
-                            highlightedText: Style.ncTextColor\r
-                            light: Style.lightHover\r
-                            midlight: Style.lightHover\r
-                            mid: Style.ncSecondaryTextColor\r
-                            dark: Style.menuBorder\r
-                            button: Style.menuBorder\r
-                            window: Style.backgroundColor\r
-                            base: Style.backgroundColor\r
-                            toolTipBase: Style.backgroundColor\r
-                            toolTipText: Style.ncTextColor\r
-                        }\r
-\r
                         background: Rectangle {\r
                             border.color: Style.menuBorder\r
                             color: Style.backgroundColor\r