From 18b08bf64704f4bf28403eaccb38705d457a4cba Mon Sep 17 00:00:00 2001
From: quadbyte <studio@quadbyte.net>
Date: Mon, 11 Aug 2025 18:20:12 -0400
Subject: [PATCH] Default Settings and colors

- Replaced Dinslaken by Tokyo
- Renamed Colors.highlight to Colors.hover
---
 Assets/Colors/default.json          | 2 +-
 Modules/Bar/TrayMenu.qml            | 4 ++--
 Modules/Bar/WiFiMenu.qml            | 2 +-
 Modules/Settings/SettingsWindow.qml | 2 +-
 Services/Colors.qml                 | 8 ++++----
 Services/Settings.qml               | 2 +-
 Widgets/NComboBox.qml               | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Assets/Colors/default.json b/Assets/Colors/default.json
index 74a6369c..ddd0a7a1 100644
--- a/Assets/Colors/default.json
+++ b/Assets/Colors/default.json
@@ -17,7 +17,7 @@
   "error": "#eb6f92",
   "warning": "#f6c177",
 
-  "highlight": "#c4a7e7",
+  "hover": "#c4a7e7",
   "onAccent": "#191724",
   "outline": "#44415a",
 
diff --git a/Modules/Bar/TrayMenu.qml b/Modules/Bar/TrayMenu.qml
index 953f0751..2d04dcb3 100644
--- a/Modules/Bar/TrayMenu.qml
+++ b/Modules/Bar/TrayMenu.qml
@@ -112,7 +112,7 @@ PopupWindow {
       Rectangle {
         id: bg
         anchors.fill: parent
-        color: mouseArea.containsMouse ? Colors.highlight : "transparent"
+        color: mouseArea.containsMouse ? Colors.hover : "transparent"
         radius: Style.radiusSmall * scaling
         visible: !(modelData?.isSeparator ?? false)
 
@@ -347,7 +347,7 @@ PopupWindow {
           Rectangle {
             id: bg
             anchors.fill: parent
-            color: mouseArea.containsMouse ? Colors.highlight : "transparent"
+            color: mouseArea.containsMouse ? Colors.hover : "transparent"
             radius: Style.radiusSmall * scaling
             visible: !(modelData?.isSeparator ?? false)
             property color hoverTextColor: mouseArea.containsMouse ? Colors.onAccent : Colors.textPrimary
diff --git a/Modules/Bar/WiFiMenu.qml b/Modules/Bar/WiFiMenu.qml
index ed5dca60..6775d180 100644
--- a/Modules/Bar/WiFiMenu.qml
+++ b/Modules/Bar/WiFiMenu.qml
@@ -114,7 +114,7 @@ NLoader {
                   Layout.fillWidth: true
                   Layout.preferredHeight: Style.baseWidgetSize * 1.5 * scaling
                   radius: Style.radiusMedium * scaling
-                  color: modelData.connected ? Colors.accentPrimary : (networkMouseArea.containsMouse ? Colors.highlight : "transparent")
+                  color: modelData.connected ? Colors.accentPrimary : (networkMouseArea.containsMouse ? Colors.hover : "transparent")
 
                   RowLayout {
                     anchors.fill: parent
diff --git a/Modules/Settings/SettingsWindow.qml b/Modules/Settings/SettingsWindow.qml
index 9227cb34..405f7b5f 100644
--- a/Modules/Settings/SettingsWindow.qml
+++ b/Modules/Settings/SettingsWindow.qml
@@ -108,7 +108,7 @@ NLoader {
                   width: parent.width
                   height: 32 * scaling // Back to original height
                   radius: Style.radiusSmall * scaling
-                  color: selected ? Colors.accentPrimary : (tabItem.hovering ? Colors.highlight : "transparent")
+                  color: selected ? Colors.accentPrimary : (tabItem.hovering ? Colors.hover : "transparent")
                   border.color: "transparent"
                   border.width: 0
 
diff --git a/Services/Colors.qml b/Services/Colors.qml
index 25e6b74a..0bd125a6 100644
--- a/Services/Colors.qml
+++ b/Services/Colors.qml
@@ -31,8 +31,8 @@ Singleton {
   property color error: themeData.error
   property color warning: themeData.warning
 
-  // Highlights
-  property color highlight: themeData.highlight
+  // Hover
+  property color hover: themeData.hover
 
   // Additional Theme Properties
   property color onAccent: themeData.onAccent
@@ -85,8 +85,8 @@ Singleton {
       property string error: "#eb6f92"
       property string warning: "#f6c177"
 
-      // Highlights
-      property string highlight: "#c4a7e7"
+      // Hover
+      property string hover: "#c4a7e7"
 
       // Additional Theme Properties
       property string onAccent: "#191724"
diff --git a/Services/Settings.qml b/Services/Settings.qml
index 647bdec7..f13de436 100644
--- a/Services/Settings.qml
+++ b/Services/Settings.qml
@@ -85,7 +85,7 @@ Singleton {
       property JsonObject location
 
       location: JsonObject {
-        property string name: "Dinslaken"
+        property string name: "Tokyo"
         property bool useFahrenheit: false
         property bool reverseDayMonth: false
         property bool use12HourClock: false
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 459117af..bf971c00 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -28,7 +28,7 @@ ComboBox {
     implicitWidth: 120 * scaling
     implicitHeight: Style.baseWidgetSize * scaling
     color: Colors.surfaceVariant
-    border.color: root.activeFocus ? Colors.highlight : Colors.outline
+    border.color: root.activeFocus ? Colors.hover : Colors.outline
     border.width: Math.max(1, Style.borderThin * scaling)
     radius: Style.radiusMedium * scaling
   }
@@ -93,7 +93,7 @@ ComboBox {
 
     background: Rectangle {
       width: root.width - Style.spacingMedium * scaling * 3
-      color: highlighted ? Colors.highlight : "transparent"
+      color: highlighted ? Colors.hover : "transparent"
       radius: Style.radiusSmall * scaling
     }
   }