Use ThemeEngine to read theme colors

Author: adazem009

src/app/qml/main.qml

@@ -18,7 +18,7 @@ ApplicationWindow {
     title: Qt.application.displayName
     color: Material.background
     Material.accent: "orange"
-    Material.theme: Material.Dark
+    Material.theme: ThemeEngine.theme == ThemeEngine.DarkTheme ? Material.Dark : Material.Light
     onActiveFocusItemChanged: UiEngine.activeFocusItem = activeFocusItem
 
     menuBar: CustomMenuBar {

src/uicomponents/CustomDialog.qml

@@ -124,11 +124,10 @@ Item {
             property alias buttonBoxLoader: buttonBoxLoader
             anchors.fill: parent
             // TODO: Read colors from ThemeEngine
-            color: /*ThemeEngine.bgColor*/ Material.background
-            //Material.background: ThemeEngine.bgColor
+            color: ThemeEngine.bgColor
+            Material.background: ThemeEngine.bgColor
             //Material.accent: ThemeEngine.currentAccentColor
-            //Material.theme: ThemeEngine.theme === ThemeEngine.DarkTheme ? Material.Dark : Material.Light
-            Material.theme: Material.Dark
+            Material.theme: ThemeEngine.theme === ThemeEngine.DarkTheme ? Material.Dark : Material.Light
 
             ColumnLayout {
                 id: contentLayout

src/uicomponents/CustomMenu.qml

@@ -2,6 +2,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import ScratchCPP.Ui
 
 Menu {
     property bool isSubMenu: false
@@ -27,8 +28,8 @@ Menu {
     font.pointSize: 10
     background: Rectangle {
         // Load colors from theme
-        color: /*ThemeEngine.bgColor*/ Material.background
-        border.color: /*ThemeEngine.borderColor*/ Qt.rgba(1, 1, 1, 0.25)
+        color: ThemeEngine.bgColor
+        border.color: ThemeEngine.borderColor
         radius: 10
         implicitHeight: 40
     }

src/uicomponents/CustomMenuBar.qml

@@ -2,6 +2,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import ScratchCPP.Ui
 import ScratchCPP.UiComponents
 
 MenuBar {
@@ -72,7 +73,7 @@ MenuBar {
     }
 
     background: Rectangle {
-        color: Material.backgroundColor // Load the color from the theme
+        color: ThemeEngine.bgColor // Load the color from the theme
     }
 
     delegate: MenuBarItem {
@@ -94,8 +95,6 @@ MenuBar {
         topPadding: 5
         bottomPadding: 5
         font.pointSize: 10
-        Material.background: Qt.rgba(0, 0, 0, 0)
-        Material.foreground: Material.theme == Material.Dark ? "white" : "black"
         contentItem: Label {
             text: replaceText(menuBarItem.text)
             font: menuBarItem.font

src/uicomponents/internal/CustomDialogButtonBox.qml

@@ -5,13 +5,12 @@ import QtQuick.Controls
 import ScratchCPP.Ui
 
 DialogButtonBox {
-    property color bgColor: /*ThemeEngine.bgColor*/ Material.background
     property int radius: 10
     signal focusOut()
     id: dialogButtonBox
     font.capitalization: Font.MixedCase
     background: Rectangle {
-        color: bgColor
+        color: "transparent"
         radius: radius
     }