Settings cleanup/scaling

Modules/Settings/Tabs/General.qml

@@ -14,8 +14,7 @@ ColumnLayout {
 
     Layout.fillWidth: true
     Layout.fillHeight: true
-    padding: 16
-    rightPadding: 12
+    padding: Style.marginMedium * scaling
     clip: true
     ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
     ScrollBar.vertical.policy: ScrollBar.AsNeeded
@@ -30,38 +29,31 @@ ColumnLayout {
       }
 
       ColumnLayout {
-        spacing: 4
+        spacing: Style.marginTiny * scaling
         Layout.fillWidth: true
 
         NText {
           text: "General Settings"
-          font.pointSize: 18
+          font.pointSize: Style.fontSizeXL * scaling
           font.weight: Style.fontWeightBold
           color: Colors.textPrimary
-          Layout.bottomMargin: 8
+          Layout.bottomMargin: Style.marginSmall * scaling
         }
 
         // Profile section
         ColumnLayout {
-          spacing: 8
+          spacing: Style.marginSmall * scaling
           Layout.fillWidth: true
-          Layout.topMargin: 8
-
-          NText {
-            text: "Profile"
-            font.pointSize: 13
-            font.weight: Style.fontWeightBold
-            color: Colors.textPrimary
-          }
+          Layout.topMargin: Style.marginSmall * scaling
 
           RowLayout {
             Layout.fillWidth: true
-            spacing: 16
+            spacing: Style.marginLarge * scaling
 
             // Avatar preview
             NImageRounded {
-              width: 64
-              height: 64
+              width: 64 * scaling
+              height: 64 * scaling
               imagePath: Settings.data.general.avatarImage
               fallbackIcon: "person"
               borderColor: Colors.accentPrimary
@@ -69,16 +61,16 @@ ColumnLayout {
             }
             ColumnLayout {
               Layout.fillWidth: true
-              spacing: 4
+              spacing: Style.marginTiny * scaling
               NText {
-                text: "Profile Image"
+                text: "Profile Picture"
                 color: Colors.textPrimary
                 font.weight: Style.fontWeightBold
               }
               NText {
                 text: "Your profile picture displayed in various places throughout the shell"
                 color: Colors.textSecondary
-                font.pointSize: 12
+                font.pointSize: Style.fontSizeSmall * scaling
               }
               NTextInput {
                 text: Settings.data.general.avatarImage
@@ -95,20 +87,20 @@ ColumnLayout {
 
       NDivider {
         Layout.fillWidth: true
-        Layout.topMargin: 26
-        Layout.bottomMargin: 18
+        Layout.topMargin: Style.marginLarge * 2 * scaling
+        Layout.bottomMargin: Style.marginLarge * scaling
       }
 
       ColumnLayout {
-        spacing: 4
+        spacing: Style.marginMedium * scaling
         Layout.fillWidth: true
 
         NText {
           text: "User Interface"
-          font.pointSize: 18
+          font.pointSize: Style.fontSizeXL * scaling
           font.weight: Style.fontWeightBold
           color: Colors.textPrimary
-          Layout.bottomMargin: 8
+          Layout.bottomMargin: Style.marginSmall * scaling
         }
 
         NToggle {
@@ -120,15 +112,6 @@ ColumnLayout {
           }
         }
 
-        NToggle {
-          label: "Show Dock"
-          description: "Display a dock at the bottom of the screen for quick access to applications"
-          value: Settings.data.general.showDock
-          onToggled: function (v) {
-            Settings.data.general.showDock = v
-          }
-        }
-
         NToggle {
           label: "Dim Desktop"
           description: "Dim the desktop when panels or menus are open"