From bfe6f1c3925b3bf331c7420e30b4fe159f0450ad Mon Sep 17 00:00:00 2001 From: Kacper Paczos Date: Tue, 24 Oct 2023 23:44:56 +0200 Subject: [PATCH] New default look --- sysmonitor@orcus/CHANGELOG.md | 3 + .../sysmonitor@orcus/3.2/settings-schema.json | 230 +++++++++++++----- .../files/sysmonitor@orcus/metadata.json | 2 +- 3 files changed, 176 insertions(+), 59 deletions(-) diff --git a/sysmonitor@orcus/CHANGELOG.md b/sysmonitor@orcus/CHANGELOG.md index fad6371011e..92fdc2966ff 100644 --- a/sysmonitor@orcus/CHANGELOG.md +++ b/sysmonitor@orcus/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.6.6 +* New default look + ### 1.6.5 * Fixed crash in network provider when glibtop failed to retrieve network interface list and a fallback method was used diff --git a/sysmonitor@orcus/files/sysmonitor@orcus/3.2/settings-schema.json b/sysmonitor@orcus/files/sysmonitor@orcus/3.2/settings-schema.json index 57e2a2024c5..9528e350c37 100644 --- a/sysmonitor@orcus/files/sysmonitor@orcus/3.2/settings-schema.json +++ b/sysmonitor@orcus/files/sysmonitor@orcus/3.2/settings-schema.json @@ -1,112 +1,190 @@ { "layout": { "type": "layout", - "pages": ["common", "cpu", "mem", "swap", "net", "load"], + "pages": [ + "common", + "cpu", + "mem", + "swap", + "net", + "load" + ], "common": { "type": "page", "title": "Common", - "sections": ["common_g", "common_c"] + "sections": [ + "common_g", + "common_c" + ] }, "common_g": { "type": "section", "title": "General", - "keys": ["onclick_program", "smooth", "draw_border", "graph_width", "graph_spacing", "refresh_rate", "use_padding", "padding_lr", "padding_tb"] + "keys": [ + "onclick_program", + "smooth", + "draw_border", + "graph_width", + "graph_spacing", + "refresh_rate", + "use_padding", + "padding_lr", + "padding_tb" + ] }, "common_c": { "type": "section", "title": "Colors", - "keys": ["bg_color", "border_color"] + "keys": [ + "bg_color", + "border_color" + ] }, "cpu": { "type": "page", "title": "CPU", - "sections": ["cpu_g", "cpu_c"] + "sections": [ + "cpu_g", + "cpu_c" + ] }, "cpu_g": { "type": "section", "title": "General", - "keys": ["cpu_enabled", "cpu_override_graph_width", "cpu_graph_width", "cpu_tooltip_decimals"] + "keys": [ + "cpu_enabled", + "cpu_override_graph_width", + "cpu_graph_width", + "cpu_tooltip_decimals" + ] }, "cpu_c": { "type": "section", "title": "Colors", - "keys": ["cpu_color_0", "cpu_color_1", "cpu_color_2", "cpu_color_3"] + "keys": [ + "cpu_color_0", + "cpu_color_1", + "cpu_color_2", + "cpu_color_3" + ] }, "mem": { "type": "page", "title": "Memory", - "sections": ["mem_g", "mem_c"] + "sections": [ + "mem_g", + "mem_c" + ] }, "mem_g": { "type": "section", "title": "General", - "keys": ["mem_enabled", "mem_override_graph_width", "mem_graph_width"] + "keys": [ + "mem_enabled", + "mem_override_graph_width", + "mem_graph_width" + ] }, "mem_c": { "type": "section", "title": "Colors", - "keys": ["mem_color_0", "mem_color_1"] + "keys": [ + "mem_color_0", + "mem_color_1" + ] }, "swap": { "type": "page", "title": "Swap", - "sections": ["swap_g", "swap_c"] + "sections": [ + "swap_g", + "swap_c" + ] }, "swap_g": { "type": "section", "title": "General", - "keys": ["swap_enabled", "swap_override_graph_width", "swap_graph_width"] + "keys": [ + "swap_enabled", + "swap_override_graph_width", + "swap_graph_width" + ] }, "swap_c": { "type": "section", "title": "Colors", - "keys": ["swap_color_0"] + "keys": [ + "swap_color_0" + ] }, "net": { "type": "page", "title": "Network", - "sections": ["net_g", "net_c"] + "sections": [ + "net_g", + "net_c" + ] }, "net_g": { "type": "section", "title": "General", - "keys": ["net_enabled", "net_override_graph_width", "net_graph_width", "net_minimum_graph_scale"] + "keys": [ + "net_enabled", + "net_override_graph_width", + "net_graph_width", + "net_minimum_graph_scale" + ] }, "net_c": { "type": "section", "title": "Colors", - "keys": ["net_color_0", "net_color_1"] + "keys": [ + "net_color_0", + "net_color_1" + ] }, "load": { "type": "page", "title": "Load", - "sections": ["load_g", "load_c"] + "sections": [ + "load_g", + "load_c" + ] }, "load_g": { "type": "section", "title": "General", - "keys": ["load_enabled", "load_override_graph_width", "load_graph_width"] + "keys": [ + "load_enabled", + "load_override_graph_width", + "load_graph_width" + ] }, "load_c": { "type": "section", "title": "Colors", - "keys": ["load_color_0"] + "keys": [ + "load_color_0" + ] } }, "onclick_program": { "type": "entry", "default": "gnome-system-monitor", - "description": "Program to launch on click" + "description": "Program to launch on click", + "value": "gnome-system-monitor" }, "smooth": { "type": "switch", "default": true, - "description": "Smooth graphs" + "description": "Smooth graphs", + "value": true }, "draw_border": { "type": "switch", "default": false, - "description": "Draw border" + "description": "Draw border", + "value": true }, "graph_width": { "type": "spinbutton", @@ -116,7 +194,8 @@ "step": 1, "description": "Common graph width", "units": "pixels", - "tooltip": "If the applet is in a vertical panel, this sets the graph height. The graph width is then the panel width minus padding" + "tooltip": "If the applet is in a vertical panel, this sets the graph height. The graph width is then the panel width minus padding", + "value": 40 }, "graph_spacing": { "type": "spinbutton", @@ -126,7 +205,8 @@ "step": 1, "description": "Graph spacing", "units": "pixels", - "tooltip": "The number of pixels between each graph. Can be set to -1 to allow single line borders between graphs if borders are enabled" + "tooltip": "The number of pixels between each graph. Can be set to -1 to allow single line borders between graphs if borders are enabled", + "value": 4.0 }, "refresh_rate": { "type": "spinbutton", @@ -135,12 +215,14 @@ "max": 60000, "step": 50, "description": "Refresh rate", - "units": "ms" + "units": "ms", + "value": 1000 }, "use_padding": { "type": "switch", "default": false, - "description": "Use custom applet padding" + "description": "Use custom applet padding", + "value": true }, "padding_lr": { "type": "spinbutton", @@ -150,7 +232,8 @@ "step": 1, "description": "Left/right padding", "units": "pixels", - "dependency": "use_padding" + "dependency": "use_padding", + "value": 4.0 }, "padding_tb": { "type": "spinbutton", @@ -160,27 +243,32 @@ "step": 1, "description": "Top/bottom padding", "units": "pixels", - "dependency": "use_padding" + "dependency": "use_padding", + "value": 4.0 }, "bg_color": { "type": "colorchooser", "default": "rgba(0,0,0,0)", - "description": "Background color" + "description": "Background color", + "value": "rgba(0,0,0,0)" }, "border_color": { "type": "colorchooser", "default": "rgb(128,128,128)", - "description": "Border color" + "description": "Border color", + "value": "rgb(128,128,128)" }, "cpu_enabled": { "type": "switch", "default": true, - "description": "Enable" + "description": "Enable", + "value": true }, "cpu_override_graph_width": { "type": "switch", "default": false, - "description": "Override graph width" + "description": "Override graph width", + "value": false }, "cpu_graph_width": { "type": "spinbutton", @@ -190,7 +278,8 @@ "step": 1, "description": "Graph width", "units": "pixels", - "dependency": "cpu_override_graph_width" + "dependency": "cpu_override_graph_width", + "value": 40 }, "cpu_tooltip_decimals": { "type": "spinbutton", @@ -199,37 +288,44 @@ "max": 10, "step": 1, "description": "Show this many decimals in the tooltip", - "units": "decimals" + "units": "decimals", + "value": 0 }, "cpu_color_0": { "type": "colorchooser", "default": "rgb(252,233,79)", - "description": "User color" + "description": "User color", + "value": "rgb(252,233,79)" }, "cpu_color_1": { "type": "colorchooser", "default": "rgb(252,175,62)", - "description": "Nice color" + "description": "Nice color", + "value": "rgb(252,175,62)" }, "cpu_color_2": { "type": "colorchooser", "default": "rgb(239,41,41)", - "description": "Kernel color" + "description": "Kernel color", + "value": "rgb(239,41,41)" }, "cpu_color_3": { "type": "colorchooser", "default": "rgb(94,0,0)", - "description": "IOWait color" + "description": "IOWait color", + "value": "rgb(94,0,0)" }, "mem_enabled": { "type": "switch", "default": true, - "description": "Enable" + "description": "Enable", + "value": true }, "mem_override_graph_width": { "type": "switch", "default": false, - "description": "Override graph width" + "description": "Override graph width", + "value": false }, "mem_graph_width": { "type": "spinbutton", @@ -239,27 +335,32 @@ "step": 1, "description": "Graph width", "units": "pixels", - "dependency": "mem_override_graph_width" + "dependency": "mem_override_graph_width", + "value": 40 }, "mem_color_0": { "type": "colorchooser", "default": "rgb(118,210,255)", - "description": "Used color" + "description": "Used color", + "value": "rgb(118,210,255)" }, "mem_color_1": { "type": "colorchooser", "default": "rgb(52,101,164)", - "description": "Cached color" + "description": "Cached color", + "value": "rgb(52,101,164)" }, "swap_enabled": { "type": "switch", "default": true, - "description": "Enable" + "description": "Enable", + "value": true }, "swap_override_graph_width": { "type": "switch", "default": false, - "description": "Override graph width" + "description": "Override graph width", + "value": false }, "swap_graph_width": { "type": "spinbutton", @@ -269,22 +370,26 @@ "step": 1, "description": "Graph width", "units": "pixels", - "dependency": "swap_override_graph_width" + "dependency": "swap_override_graph_width", + "value": 40 }, "swap_color_0": { "type": "colorchooser", "default": "rgb(114,159,207)", - "description": "Used color" + "description": "Used color", + "value": "rgb(114,159,207)" }, "net_enabled": { "type": "switch", "default": true, - "description": "Enable" + "description": "Enable", + "value": true }, "net_override_graph_width": { "type": "switch", "default": false, - "description": "Override graph width" + "description": "Override graph width", + "value": false }, "net_graph_width": { "type": "spinbutton", @@ -294,7 +399,8 @@ "step": 1, "description": "Graph width", "units": "pixels", - "dependency": "net_override_graph_width" + "dependency": "net_override_graph_width", + "value": 40 }, "net_minimum_graph_scale": { "type": "spinbutton", @@ -304,27 +410,32 @@ "step": 10, "description": "Minimum graph scale", "units": "Mb/s", - "tooltip": "The minimum scale for the graph in Megabits per second.\nThe graph will not scale below this minimum, but it will automatically scale if the network speed exceeds this value.\n\nTo always automatically scale, set the value to 0." + "tooltip": "The minimum scale for the graph in Megabits per second.\nThe graph will not scale below this minimum, but it will automatically scale if the network speed exceeds this value.\n\nTo always automatically scale, set the value to 0.", + "value": 0 }, "net_color_0": { "type": "colorchooser", "default": "rgb(138,226,52)", - "description": "Download color" + "description": "Download color", + "value": "rgb(138,226,52)" }, "net_color_1": { "type": "colorchooser", "default": "rgb(239,41,41)", - "description": "Upload color" + "description": "Upload color", + "value": "rgb(239,41,41)" }, "load_enabled": { "type": "switch", "default": true, - "description": "Enable" + "description": "Enable", + "value": true }, "load_override_graph_width": { "type": "switch", "default": false, - "description": "Override graph width" + "description": "Override graph width", + "value": false }, "load_graph_width": { "type": "spinbutton", @@ -334,11 +445,14 @@ "step": 1, "description": "Graph width", "units": "pixels", - "dependency": "load_override_graph_width" + "dependency": "load_override_graph_width", + "value": 40 }, "load_color_0": { "type": "colorchooser", "default": "rgb(204,0,0)", - "description": "Color" - } + "description": "Color", + "value": "rgb(204,0,0)" + }, + "__md5__": "9911223138f00e8c746a460d9c0f715a" } diff --git a/sysmonitor@orcus/files/sysmonitor@orcus/metadata.json b/sysmonitor@orcus/files/sysmonitor@orcus/metadata.json index ccc5a6784fc..c509319047a 100644 --- a/sysmonitor@orcus/files/sysmonitor@orcus/metadata.json +++ b/sysmonitor@orcus/files/sysmonitor@orcus/metadata.json @@ -2,7 +2,7 @@ "description": "Displays CPU, memory, swap and network usage and load in graphs", "uuid": "sysmonitor@orcus", "name": "System Monitor", - "version": "1.6.5", + "version": "1.6.6", "max-instances": -1, "multiversion": true }