diff --git a/battery@schorschii/files/battery@schorschii/desklet.js b/battery@schorschii/files/battery@schorschii/desklet.js index 50382bcd8..56336b620 100644 --- a/battery@schorschii/files/battery@schorschii/desklet.js +++ b/battery@schorschii/files/battery@schorschii/desklet.js @@ -71,7 +71,7 @@ MyDesklet.prototype = { setupUI: function() { // defaults and initial values this.default_size_font = 25; - this.default_size_battery_width = 149; + this.default_size_battery_width = 150; this.default_size_battery_height = 74; this.default_size_symbol = 36; this.default_segment_offset = 14; @@ -240,6 +240,7 @@ MyDesklet.prototype = { let symbolSize = this.default_size_symbol * scale; let segmentWidthMax = segmentWidth * 0.95; let segmentWidthCalced = segmentWidthMax * (this.currentCapacity / 100); + let xCorrection = -3 * scale; // set images let bar_img = "green.svg"; @@ -267,13 +268,17 @@ MyDesklet.prototype = { // plug/warn/flash icon if(symbol_img != "") { this.imageIcon = getImageAtScale(DESKLET_ROOT + "/img/" + symbol_img, symbolSize, symbolSize); - this.imageIcon.set_position((segmentWidth / 2) - (symbolSize / 2), (segmentHeight / 2) - (symbolSize / 2)); + this.imageIcon.set_position( + (segmentWidth / 2) - (symbolSize / 2) + xCorrection, + (segmentHeight / 2) - (symbolSize / 2) + ); } // label for percent string this.labelText = new St.Label({style_class:"text"}); - this.labelText.set_position((segmentWidth / 2) - ((newFontSize * global.ui_scale * currentCapacityText.length / 1.25) / 2), (segmentHeight / 2) - (newFontSize * global.ui_scale / 1.7)); - this.labelText.style = "font-size: " + newFontSizeRounded.toString() + "px;"; + this.labelText.set_position(0, (segmentHeight / 2) - (newFontSize * global.ui_scale / 1.7)); + this.labelText.style = "width: " + segmentWidthMax.toString() + "px; " + + "font-size: " + newFontSizeRounded.toString() + "px;"; if(showText) this.labelText.set_text(currentCapacityText); else diff --git a/battery@schorschii/files/battery@schorschii/metadata.json b/battery@schorschii/files/battery@schorschii/metadata.json index a7e2f52db..53670665d 100644 --- a/battery@schorschii/files/battery@schorschii/metadata.json +++ b/battery@schorschii/files/battery@schorschii/metadata.json @@ -2,6 +2,6 @@ "uuid": "battery@schorschii", "max-instances": "10", "description": "A battery desklet in iOS style with multi-battery support.", - "version": "2.7", + "version": "2.8", "name": "Battery Level Indicator" } diff --git a/battery@schorschii/files/battery@schorschii/stylesheet.css b/battery@schorschii/files/battery@schorschii/stylesheet.css index 9354d7e71..328835ae2 100644 --- a/battery@schorschii/files/battery@schorschii/stylesheet.css +++ b/battery@schorschii/files/battery@schorschii/stylesheet.css @@ -4,6 +4,6 @@ font-family: "DejaVu Sans", Sans-serif; font-weight: 100; font-size: 24px; - + text-align: center; /* text-shadow: 0px 0px 5px rgba(0,0,0,0.85); */ } diff --git a/calendar@schorschii/files/calendar@schorschii/desklet.js b/calendar@schorschii/files/calendar@schorschii/desklet.js index bb9274b3f..357048760 100644 --- a/calendar@schorschii/files/calendar@schorschii/desklet.js +++ b/calendar@schorschii/files/calendar@schorschii/desklet.js @@ -84,11 +84,11 @@ MyDesklet.prototype = { // defaults and initial values this.default_size_font_month_big = 45; this.default_size_font_month_sub = 14; - this.default_size_battery_width = 130; - this.default_size_battery_height = 140; - this.default_month_big_top = 50; - this.default_month_sub_top = 105; - this.default_month_top_top = 27; + this.default_size_calendar_width = 150; + this.default_size_calendar_height = 162; + this.default_month_top_top = 35; + this.default_month_big_top = 61; + this.default_month_sub_top = 125; this.dayofmonth = 0; this.monthofyear = 0; this.dayofweek = 0; this.year = 0; this.dayofweek_string = ""; this.monthofyear_string = ""; this.last_notification_amount = 0; @@ -197,9 +197,9 @@ MyDesklet.prototype = { // calc new sizes based on scale factor let scale = this.scale_size * global.ui_scale; - let desklet_width = this.default_size_battery_width * scale; - let desklet_height = this.default_size_battery_height * scale; - let label_width = Math.round(this.default_size_battery_width * this.scale_size); + let desklet_width = this.default_size_calendar_width * scale; + let desklet_height = this.default_size_calendar_height * scale; + let label_width = Math.round(this.default_size_calendar_width * this.scale_size); let size_font_month_big = Math.round(this.default_size_font_month_big * this.scale_size); let size_font_month_sub = Math.round(this.default_size_font_month_sub * this.scale_size); let month_big_top = this.default_month_big_top * scale; diff --git a/calendar@schorschii/files/calendar@schorschii/metadata.json b/calendar@schorschii/files/calendar@schorschii/metadata.json index 8d3aaa8a1..10ea361e6 100644 --- a/calendar@schorschii/files/calendar@schorschii/metadata.json +++ b/calendar@schorschii/files/calendar@schorschii/metadata.json @@ -3,5 +3,5 @@ "max-instances": "10", "description": "A calendar desklet that can display the number of today's appointments from an ical/ics file.", "name": "Calendar", - "version": "1.5" + "version": "1.6" } diff --git a/diskspace@schorschii/files/diskspace@schorschii/desklet.js b/diskspace@schorschii/files/diskspace@schorschii/desklet.js index 7b3e60215..10efde6cc 100644 --- a/diskspace@schorschii/files/diskspace@schorschii/desklet.js +++ b/diskspace@schorschii/files/diskspace@schorschii/desklet.js @@ -72,9 +72,9 @@ MyDesklet.prototype = { setupUI: function() { // defaults and initial values - this.default_size = 160; - this.default_size_font = 32; - this.default_size_font_sub = 16; + this.default_size = 150; + this.default_size_font = 31; + this.default_size_font_sub = 15; // create and set root element this.canvas = new Clutter.Actor(); diff --git a/diskspace@schorschii/files/diskspace@schorschii/metadata.json b/diskspace@schorschii/files/diskspace@schorschii/metadata.json index cb851cf74..5a43d80c4 100644 --- a/diskspace@schorschii/files/diskspace@schorschii/metadata.json +++ b/diskspace@schorschii/files/diskspace@schorschii/metadata.json @@ -2,6 +2,6 @@ "max-instances": "10", "description": "Displays the usage of a filesystem or RAM.", "name": "Disk Space", - "version": "1.16", + "version": "1.17", "uuid": "diskspace@schorschii" } diff --git a/diskspace@schorschii/files/diskspace@schorschii/settings-schema.json b/diskspace@schorschii/files/diskspace@schorschii/settings-schema.json index dbbe1add9..88f013033 100644 --- a/diskspace@schorschii/files/diskspace@schorschii/settings-schema.json +++ b/diskspace@schorschii/files/diskspace@schorschii/settings-schema.json @@ -114,7 +114,7 @@ "default": 1, "min": 0.4, "max": 10, - "step": 0.2, + "step": 0.05, "units": "scale factor", "description": "Desklet size", "tooltip": "Increase or decrease the size of this desklet using this scale factor." diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js b/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js index ab07beb83..d0dcaa381 100644 --- a/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js +++ b/hostcheck@schorschii/files/hostcheck@schorschii/desklet.js @@ -54,9 +54,10 @@ MyDesklet.prototype = { setupUI: function() { // defaults and initial values - this.defaultWidth = 120; - this.defaultHeight = 38; - this.defaultInset = 8; // 2*Padding + this.defaultWidth = 140; + this.defaultHeight = 42; + this.defaultInset = 10; // 2*Padding + this.defaultFontSize = 16; // create objects this.statusLabel = new St.Label({style_class:"statusbox"}); @@ -156,17 +157,18 @@ MyDesklet.prototype = { showStatus: function() { // refresh desklet content // calc new sizes based on scale factor - let absolute_size_x = (this.defaultWidth * this.scale_size * global.ui_scale) + (this.defaultInset * this.scale_size * global.ui_scale); - let absolute_size_y = (this.defaultHeight * this.scale_size * global.ui_scale) + (this.defaultInset * this.scale_size * global.ui_scale); + let absolute_width = (this.defaultWidth * this.scale_size * global.ui_scale) + (this.defaultInset * this.scale_size * global.ui_scale); + let absolute_height = (this.defaultHeight * this.scale_size * global.ui_scale) + (this.defaultInset * this.scale_size * global.ui_scale); let label_size_x = this.defaultWidth * this.scale_size * global.ui_scale; - let label_size_y = this.defaultHeight * this.scale_size * global.ui_scale + let label_size_y = this.defaultHeight * this.scale_size * global.ui_scale; + let font_size = Math.round(this.defaultFontSize * this.scale_size * global.ui_scale); // modify label let statusString = this.statusTagString + " (" + this.interval + _('s') + ")\n" + this.host; this.statusLabel.set_text(statusString); this.statusLabel.style_class = "statusbox "+this.colorClass; - this.statusLabel.style = "width:"+label_size_x+"px; height:"+label_size_y+"px;"; + this.statusLabel.style = "width:"+label_size_x+"px; height:"+label_size_y+"px; font-size:"+font_size+"px"; // modify desklet canvas - this.canvas.set_size(absolute_size_x, absolute_size_y); + this.canvas.set_size(absolute_width, absolute_height); // desktop notification if(this.prevStatusTagString != "" && this.prevStatusTagString != this.statusTagString) { diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json b/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json index c4923ffd6..3e890f83b 100644 --- a/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json +++ b/hostcheck@schorschii/files/hostcheck@schorschii/metadata.json @@ -2,6 +2,6 @@ "max-instances": "10", "description": "Checks a host via ping or HTTP(S) and displays if it is available.", "name": "Host Check", - "version": "1.2", + "version": "1.3", "uuid": "hostcheck@schorschii" } diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/settings-schema.json b/hostcheck@schorschii/files/hostcheck@schorschii/settings-schema.json index 617587e16..3e3028a5b 100644 --- a/hostcheck@schorschii/files/hostcheck@schorschii/settings-schema.json +++ b/hostcheck@schorschii/files/hostcheck@schorschii/settings-schema.json @@ -43,7 +43,7 @@ "default": 1, "min": 0.5, "max": 10, - "step": 0.2, + "step": 0.05, "units": "scale factor", "description": "Desklet size", "tooltip": "Increase or decrease the size of this desklet using this scale factor." diff --git a/hostcheck@schorschii/files/hostcheck@schorschii/stylesheet.css b/hostcheck@schorschii/files/hostcheck@schorschii/stylesheet.css index ac671222d..3f4f8288b 100644 --- a/hostcheck@schorschii/files/hostcheck@schorschii/stylesheet.css +++ b/hostcheck@schorschii/files/hostcheck@schorschii/stylesheet.css @@ -1,16 +1,17 @@ .statusbox { font-family: "Ubuntu", sans-serif; font-weight: bold; - font-size: 15px; + font-size: 16px; text-align: center; vertical-align: middle; - width: 120px; - height: 38px; + width: 140px; + height: 42px; background-color: #DDDDDD; color: black; border-radius: 4px; box-shadow: 0px 0px 5px black; - padding: 4px; + padding: 5px; + padding-top: 7px; } .statusbox.green { background-color: #2BB938;