From ea8a932c20d36eb774cb89bf8046059483f15db6 Mon Sep 17 00:00:00 2001 From: Raymundo Cassani Date: Fri, 29 May 2020 18:13:58 -0400 Subject: [PATCH] Add defaults colors depending on the variable to monitor --- .../system-monitor-graph@rcassani/desklet.js | 26 +++++++++----- .../settings-schema.json | 34 ++++++++++++++----- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/files/system-monitor-graph@rcassani/desklet.js b/files/system-monitor-graph@rcassani/desklet.js index a46b10a..20f6296 100644 --- a/files/system-monitor-graph@rcassani/desklet.js +++ b/files/system-monitor-graph@rcassani/desklet.js @@ -28,13 +28,18 @@ MyDesklet.prototype = { this.settings.bindProperty(Settings.BindingDirection.IN, "refresh-interval", "refresh_interval", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "duration", "duration", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "custom-line-color", "custom_line_color", this.on_setting_changed); - this.settings.bindProperty(Settings.BindingDirection.IN, "line-color", "line_color", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "background-color", "background_color", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "h-midlines", "h_midlines", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "v-midlines", "v_midlines", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "scale-size", "scale_size", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "midline-color", "midline_color", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "text-color", "text_color", this.on_setting_changed); + this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-ram", "line_color_ram", this.on_setting_changed); + this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-cpu", "line_color_cpu", this.on_setting_changed); + + + + // initialize desklet GUI this.setupUI(); @@ -71,6 +76,17 @@ MyDesklet.prototype = { let cpu_values = this.get_cpu_times(); this.cpu_tot = cpu_values[0]; this.cpu_idl = cpu_values[1]; + // set colors + switch (this.type) { + case "cpu": + this.line_color = this.line_color_cpu; + break; + case "ram": + this.line_color = this.line_color_ram; + break; + case "hdd": + this.line_color = this.line_color_hdd; + } this.first_run = false; } @@ -96,7 +112,7 @@ MyDesklet.prototype = { var value = 0.0; var text1 = ''; var text2 = ''; - var line_colors; + var line_colors = this.parse_rgba_seetings(this.line_color); // current values switch (this.type) { @@ -111,7 +127,6 @@ MyDesklet.prototype = { value = cpu_use / 100; text1 = "CPU"; text2 = Math.round(cpu_use).toString() + "%"; - line_colors = [0.09, 0.57, 0.81]; break; case "ram": @@ -137,11 +152,6 @@ MyDesklet.prototype = { values.shift(); this.values = values; - // overrides the line_color if custom_line_color - if (this.custom_line_color){ - line_colors = this.parse_rgba_seetings(this.line_color); - } - var background_colors = this.parse_rgba_seetings(this.background_color); var midline_colors = this.parse_rgba_seetings(this.midline_color); diff --git a/files/system-monitor-graph@rcassani/settings-schema.json b/files/system-monitor-graph@rcassani/settings-schema.json index a20b81b..36fcd0e 100644 --- a/files/system-monitor-graph@rcassani/settings-schema.json +++ b/files/system-monitor-graph@rcassani/settings-schema.json @@ -15,9 +15,19 @@ "tooltip": "Select the system variable to monitor.", "options" : { "CPU" : "cpu", - "RAM": "ram" + "RAM" : "ram", + "HHD" : "hdd" } }, + "filesystem": { + "type": "filechooser", + "default": "/", + "description": "Filesystem to monitor", + "tooltip": "Select the file system, which you want to monitor.", + "allow-none" : true, + "select-dir" : true, + "dependency": "type=hdd" + }, "duration": { "type": "combobox", "default": 60, @@ -63,17 +73,23 @@ "default": "rgba(255,255,255,1)", "description": "Text color" }, - "custom-line-color": { - "type": "checkbox", - "default": false, - "description": "Use a custom line color", - "value": false + "line-color-cpu": { + "type": "colorchooser", + "default": "rgba(23,147,208,1.0)", + "description": "Line color CPU", + "dependency": "type=cpu" }, - "line-color": { + "line-color-ram": { "type": "colorchooser", "default": "rgba(137,190,67,1.0)", - "description": "Line color", - "dependency": "custom-line-color" + "description": "Line color RAM", + "dependency": "type=ram" + }, + "line-color-hdd": { + "type": "colorchooser", + "default": "rgba(197,86,33,1.0)", + "description": "Line color HDD", + "dependency": "type=hdd" }, "midline-color": { "type": "colorchooser",