modules-right: merged resources

7 files changed, 78 insertions, 121 deletions

diff --git a/bar/Bar.qml b/bar/Bar.qml
index 4f523ea..95a15a5 100644
--- a/bar/Bar.qml
+++ b/bar/Bar.qml
@@ -110,24 +110,21 @@ Scope {
                     // Tray {
                     //     id: tray
                     // }
-                    TimeDate {
-                        id: timeDate
-                    }
-                    Network {
-                        id: network
-                    }
-                    Temp {
-                        id: temp
-                    }
-                    Gpu {
-                        id: gpu
-                    }
-                    Memory {
-                        id: memory
-                    }
-                    Cpu {
-                        id: cpu
-                    }
+                    TimeDate {}
+                    Network {}
+                    // Temp {
+                    //     id: temp
+                    // }
+                    // Gpu {
+                    //     id: gpu
+                    // }
+                    // Memory {
+                    //     id: memory
+                    // }
+                    // Cpu {
+                    //     id: cpu
+                    // }
+                    Resources {}
 
                     Item {
                         id: rightSpacer
diff --git a/bar/Cpu.qml b/bar/Cpu.qml
deleted file mode 100644
index 5f54a9b..0000000
--- a/bar/Cpu.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-import qs.components
-import qs.config
-import qs.services as Services
-
-Item {
-    implicitWidth: resource.implicitWidth
-    implicitHeight: resource.implicitHeight
-
-    SimpleResource {
-        id: resource
-
-        text: Math.round(Services.Resource.cpuUsage * 100) + "%"
-        icon: Icons.resource.cpu
-    }
-}
diff --git a/bar/Gpu.qml b/bar/Gpu.qml
deleted file mode 100644
index 8e701db..0000000
--- a/bar/Gpu.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-import qs.services as Services
-import qs.components
-import qs.config as Config
-
-Item {
-    implicitWidth: resource.implicitWidth
-    implicitHeight: resource.implicitHeight
-
-    SimpleResource {
-        id: resource
-        icon: Config.Icons.resource.gpu
-        text: Services.Resource.gpuUsage + "%"
-    }
-}
diff --git a/bar/Memory.qml b/bar/Memory.qml
deleted file mode 100644
index 0745a65..0000000
--- a/bar/Memory.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-// TODO: sort all header
-import qs.services as Services
-import qs.components
-import qs.config as Config
-
-Item {
-    implicitWidth: resource.implicitWidth
-    implicitHeight: resource.implicitHeight
-
-    SimpleResource {
-        id: resource
-
-        icon: Config.Icons.resource.memory
-        text: Math.round(Services.Resource.memoryUsedPercentage * 100) + "%"
-    }
-}
diff --git a/bar/Resources.qml b/bar/Resources.qml
new file mode 100644
index 0000000..af62e18
--- /dev/null
+++ b/bar/Resources.qml
@@ -0,0 +1,41 @@
+import QtQuick
+import QtQuick.Layouts
+
+import qs.components
+import qs.config as Config
+import qs.services as Services
+
+Item {
+    implicitWidth: container.implicitWidth
+    implicitHeight: container.implicitHeight
+
+    Rectangle {
+        id: container
+        implicitWidth: layout.implicitWidth + Config.General.rectMargin * 2
+        implicitHeight: Config.Bar.height - Config.General.rectMargin
+
+        color: Config.Colors.alt
+        radius: Config.Style.rounding.large
+
+        RowLayout {
+            id: layout
+            anchors.centerIn: parent
+            SimpleResource {
+                text: Math.round(Services.Resource.cpuUsage * 100) + "%"
+                icon: Config.Icons.resource.cpu
+            }
+            SimpleResource {
+                icon: Config.Icons.resource.memory
+                text: Math.round(Services.Resource.memoryUsedPercentage * 100) + "%"
+            }
+            SimpleResource {
+                icon: Config.Icons.resource.gpu
+                text: Services.Resource.gpuUsage + "%"
+            }
+            SimpleResource {
+                icon: Config.Icons.resource.temp
+                text: Math.round(Services.Resource.cpuTemp * 100) + "°C"
+            }
+        }
+    }
+}
diff --git a/bar/Temp.qml b/bar/Temp.qml
deleted file mode 100644
index 6daa5ae..0000000
--- a/bar/Temp.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-
-import qs.services as Services
-import qs.components
-import qs.config as Config
-
-Item {
-    implicitWidth: resource.implicitWidth
-    implicitHeight: resource.implicitHeight
-
-    SimpleResource {
-        id: resource
-        icon: Config.Icons.resource.temp
-        text: Math.round(Services.Resource.cpuTemp * 100) + "°C"
-    }
-}
diff --git a/components/SimpleResource.qml b/components/SimpleResource.qml
index dba6a2d..c1c5bd1 100644
--- a/components/SimpleResource.qml
+++ b/components/SimpleResource.qml
@@ -10,38 +10,28 @@ Item {
     required property string text
     required property string icon
 
-    implicitWidth: container.implicitWidth
-    implicitHeight: container.implicitHeight
-
-    Rectangle {
-        id: container
-        implicitWidth: layout.implicitWidth + General.rectMargin * 2
-        implicitHeight: Bar.height - General.rectMargin
-
-        color: Colors.alt
-        radius: Style.rounding.large
-
-        RowLayout {
-            id: layout
-            anchors.centerIn: parent
-
-            spacing: Bar.resourceIconTextSpacing
-
-            Item {
-                Layout.fillWidth: true
-            }
-
-            Icon {
-                text: root.icon
-            }
-            IText {
-                animate: true
-                text: root.text
-            }
-
-            Item {
-                Layout.fillWidth: true
-            }
+    implicitWidth: layout.implicitWidth
+    implicitHeight: layout.implicitHeight
+
+    RowLayout {
+        id: layout
+
+        spacing: Bar.resourceIconTextSpacing
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        Icon {
+            text: root.icon
+        }
+        IText {
+            animate: true
+            text: root.text
+        }
+
+        Item {
+            Layout.fillWidth: true
         }
     }
 }