Add label text3

This commit is contained in:
Raymundo Cassani 2020-05-31 10:19:36 -04:00
parent 55686f931c
commit b58c9ebe9d

View File

@ -44,10 +44,6 @@ MyDesklet.prototype = {
this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-ram", "line_color_ram", 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-hdd", "line_color_hdd", this.on_setting_changed); this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-hdd", "line_color_hdd", this.on_setting_changed);
// initialize desklet GUI // initialize desklet GUI
this.setupUI(); this.setupUI();
}, },
@ -58,8 +54,10 @@ MyDesklet.prototype = {
this.canvas.remove_all_children(); this.canvas.remove_all_children();
this.text1 = new St.Label(); this.text1 = new St.Label();
this.text2 = new St.Label(); this.text2 = new St.Label();
this.text3 = new St.Label();
this.canvas.add_actor(this.text1); this.canvas.add_actor(this.text1);
this.canvas.add_actor(this.text2); this.canvas.add_actor(this.text2);
this.canvas.add_actor(this.text3);
this.setContent(this.canvas); this.setContent(this.canvas);
// flag to indicate the first loop of the Desklet // flag to indicate the first loop of the Desklet
@ -110,6 +108,7 @@ MyDesklet.prototype = {
var v_midlines = this.v_midlines; var v_midlines = this.v_midlines;
let text1_size = 5 * unit_size / 3; let text1_size = 5 * unit_size / 3;
let text2_size = 4 * unit_size / 3; let text2_size = 4 * unit_size / 3;
let text3_size = 3 * unit_size / 3;
var radius = 2 * unit_size / 3;; var radius = 2 * unit_size / 3;;
var degrees = Math.PI / 180.0; var degrees = Math.PI / 180.0;
@ -120,6 +119,7 @@ MyDesklet.prototype = {
var value = 0.0; var value = 0.0;
var text1 = ''; var text1 = '';
var text2 = ''; var text2 = '';
var text3 = '';
var line_colors = this.parse_rgba_seetings(this.line_color); var line_colors = this.parse_rgba_seetings(this.line_color);
// current values // current values
@ -137,8 +137,8 @@ MyDesklet.prototype = {
value = ram_use / 100; value = ram_use / 100;
text1 = "RAM"; text1 = "RAM";
text2 = Math.round(ram_use).toString() + "%" text2 = Math.round(ram_use).toString() + "%"
+ ram_values[1].toFixed(1) + " / " + ram_values[0].toFixed(1) text3 = ram_values[1].toFixed(1) + " / "
+ " GB"; + ram_values[0].toFixed(1) + " GB";
break; break;
case "hdd": case "hdd":
@ -149,8 +149,9 @@ MyDesklet.prototype = {
value = hdd_use / 100; value = hdd_use / 100;
text1 = hdd_values[0]; text1 = hdd_values[0];
text2 = Math.round(hdd_use).toString() + "%" text2 = Math.round(hdd_use).toString() + "%"
+ hdd_values[3].toFixed(1) + " GB free of " text3 = hdd_values[3].toFixed(0) + " GB free of "
+ hdd_values[2].toFixed(1) + " GB"; + hdd_values[2].toFixed(0) + " GB";
break; break;
} }
@ -227,10 +228,14 @@ MyDesklet.prototype = {
this.text1.set_text(text1); this.text1.set_text(text1);
this.text1.style = "font-size: " + text1_size + "px;" this.text1.style = "font-size: " + text1_size + "px;"
+ "color: " + this.text_color + ";"; + "color: " + this.text_color + ";";
this.text2.set_position(5 * unit_size, unit_size); this.text2.set_position(6 * unit_size, unit_size);
this.text2.set_text(text2); this.text2.set_text(text2);
this.text2.style = "font-size: " + text2_size + "px;" this.text2.style = "font-size: " + text2_size + "px;"
+ "color: " + this.text_color + ";"; + "color: " + this.text_color + ";";
this.text3.set_position(10 * unit_size, unit_size * 1.4);
this.text3.set_text(text3);
this.text3.style = "font-size: " + text3_size + "px;"
+ "color: " + this.text_color + ";";
// update canvas // update canvas
canvas.invalidate(); canvas.invalidate();