Merge pull request #13 from Ory0n/gnome-3.34

Gnome 3.38

Author: 0ry0n

README.md

@@ -15,27 +15,27 @@ You can get this extension:
 ### Using the latest release
 1. Unzip the file `Resource_Monitor-x.zip`.
 2. Move the `Resource_Monitor-x` folder to `~/.local/share/gnome-shell/extensions/Resource_Monitor@Ory0n`.
-3. Activate the extensions with Gnome Tweak Tool.
+3. Activate the extensions with Gnome Extensions.
 
 For example...
 ```
 unzip Resource_Monitor-x.zip
 mv Resource_Monitor-x ~/.local/share/gnome-shell/extensions/Resource_Monitor@Ory0n
 
-gnome-shell-extension-tool -e Resource_Monitor@Ory0n
+gnome-extensions enable Resource_Monitor@Ory0n
 ```
 
 ### Cloning the repository
 1. Clone the Master repository.
 2. Move the `Resource_Monitor` folder to `~/.local/share/gnome-shell/extensions/Resource_Monitor@Ory0n`.
-3. Activate the extensions with Gnome Tweak Tool.
+3. Activate the extensions with Gnome Extensions.
 
 For example...
 ```
 git clone https://github.com/Ory0n/Resource_Monitor
 mv Resource_Monitor ~/.local/share/gnome-shell/extensions/Resource_Monitor@Ory0n
 
-gnome-shell-extension-tool -e Resource_Monitor@Ory0n
+gnome-extensions enable Resource_Monitor@Ory0n
 ```
 Might require a Gnome restart. Press `ALT+F2` and type `r` and hit enter.
 
@@ -44,6 +44,7 @@ Might require a Gnome restart. Press `ALT+F2` and type `r` and hit enter.
 
 - **Refresh Time:** Choose the refresh interval, from 1 to 30 seconds.
 - **Display Icons:** Display or hide the icons.
+- **Display Decimals:** Display or hide decimal numbers.
 - **Display Cpu:** Display or hide the Cpu field.
 - **Modify Width Cpu:** Resize the Cpu field.
 - **Display Ram:** Display or hide the Ram field.
@@ -64,6 +65,11 @@ Might require a Gnome restart. Press `ALT+F2` and type `r` and hit enter.
 Use the GitHub [Issues](https://github.com/Ory0n/Resource_Monitor/issues) tracker to report issues or ask for features.
 
 # Change Log
+**version 9 (Nov 6, 2020)**
+- Added support for gnome 3.38.
+- Added Display Decimals function.
+- Text Bug fixed.
+
 **version 8 (Apr 6, 2020)**
 - Added support for gnome 3.36.
 - Added CPU temperature monitoring.

extension.js

@@ -37,6 +37,7 @@ var IndicatorName = Me.metadata['name'];
 
 const INTERVAL = 'interval';
 const ICONS = 'icons';
+const DECIMALS = 'decimals';
 const CPU = 'cpu';
 const RAM = 'ram';
 const DISK = 'disk';
@@ -105,6 +106,11 @@ var ResourceMonitor = GObject.registerClass(
       this.sigId[this.numSigId++] = this._settings.connect(`changed::${ICONS}`, this.iconsChange.bind(this));
       this.iconsChange();
 
+      // Decimals
+      this.displayDecimals;
+      this.sigId[this.numSigId++] = this._settings.connect(`changed::${DECIMALS}`, this.decimalsChange.bind(this));
+      this.decimalsChange();
+
       // Cpu
       this.enCpu;
       this.sigId[this.numSigId++] = this._settings.connect(`changed::${CPU}`, this.cpuChange.bind(this));
@@ -394,6 +400,10 @@ var ResourceMonitor = GObject.registerClass(
     	}
     }
 
+    decimalsChange() {
+      this.displayDecimals = this._settings.get_boolean(DECIMALS);
+    }
+
     cpuChange() {
     	this.enCpu = this._settings.get_boolean(CPU);
     	if (this.enCpu) {
@@ -610,7 +620,11 @@ var ResourceMonitor = GObject.registerClass(
       this.cpuTotOld = cpuTot;
       this.idleOld = idle;
 
-      this.cpu.text = `${cpuCurr.toFixed(1)}`;
+      if (this.displayDecimals) {
+        this.cpu.text = `${cpuCurr.toFixed(1)}`;
+      } else {
+        this.cpu.text = `${cpuCurr.toFixed(0)}`;
+      }
     }
 
     refreshRam() {
@@ -638,7 +652,11 @@ var ResourceMonitor = GObject.registerClass(
 
       used = total - free - buffer - cached;
 
-      this.ram.text = `${(100*used/total).toFixed(1)}`;
+      if (this.displayDecimals) {
+        this.ram.text = `${(100*used/total).toFixed(1)}`;
+      } else {
+        this.ram.text = `${(100*used/total).toFixed(0)}`;
+      }
     }
 
     refreshDisk() {
@@ -699,7 +717,11 @@ var ResourceMonitor = GObject.registerClass(
 
       this.idleDiskOld = idle;
 
-      this.disk.text = `${rw[0].toFixed(1)}|${rw[1].toFixed(1)}`;
+      if (this.displayDecimals) {
+        this.disk.text = `${rw[0].toFixed(1)}|${rw[1].toFixed(1)}`;
+      } else {
+        this.disk.text = `${rw[0].toFixed(0)}|${rw[1].toFixed(0)}`;
+      }
     }
 
     refreshEth() {
@@ -748,7 +770,11 @@ var ResourceMonitor = GObject.registerClass(
 
       this.idleEthOld = idle;
 
-      this.eth.text = `${du[0].toFixed(1)}|${du[1].toFixed(1)}`;
+      if (this.displayDecimals) {
+        this.eth.text = `${du[0].toFixed(1)}|${du[1].toFixed(1)}`;
+      } else {
+        this.eth.text = `${du[0].toFixed(0)}|${du[1].toFixed(0)}`;
+      }
     }
 
     refreshWlan() {
@@ -797,7 +823,11 @@ var ResourceMonitor = GObject.registerClass(
 
       this.idleWlanOld = idle;
 
-      this.wlan.text = `${du[0].toFixed(1)}|${du[1].toFixed(1)}`;
+      if (this.displayDecimals) {
+        this.wlan.text = `${du[0].toFixed(1)}|${du[1].toFixed(1)}`;
+      } else {
+        this.wlan.text = `${du[0].toFixed(0)}|${du[1].toFixed(0)}`;
+      }
     }
 
     refreshCpuTemperature() {
@@ -809,10 +839,14 @@ var ResourceMonitor = GObject.registerClass(
           var temperature = parseInt(contents[1]) / 1000;
 
           if (this.cpuTemperatureFahrenheit) {
-            temperature = (temperature * 1,8) + 32;
+            temperature = (temperature * 1.8) + 32;
           }
 
-          this.cpuTemperature.text = `[${temperature.toFixed(1)}`;
+          if (this.displayDecimals) {
+            this.cpuTemperature.text = `[${temperature.toFixed(1)}`;
+          } else {
+            this.cpuTemperature.text = `[${temperature.toFixed(0)}`;
+          }
         });
       } else {
         this.cpuTemperature.text = '[Error';

metadata.json

@@ -5,11 +5,12 @@
   "shell-version": [
     "3.32",
     "3.34",
-    "3.36"
+    "3.36",
+    "3.38"
   ],
   "gettext-domain": "com-github-Ory0n-Resource_Monitor",
   "settings-schema": "com.github.Ory0n.Resource_Monitor",
   "url": "https://github.com/Ory0n/Resource_Monitor/",
   "author": "Giuseppe Silvestro",
-  "version": 9
+  "version": 10
 }

prefs.js

@@ -114,6 +114,36 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
       this._settings.bind('icons', valueIcons, 'active', Gio.SettingsBindFlags.DEFAULT);
       gridIcons.attach(valueIcons, 1, 0, 1, 1);
 
+      // DECIMALS
+      let alignmentDecimals = new Gtk.Alignment({
+        left_padding: 12,
+        right_padding: 12
+      });
+
+      globalFrame.add(new Gtk.Label({
+        label: '<b>%s</b>'.format(_('Decimals')),
+        use_markup: true,
+        halign: Gtk.Align.START
+      }));
+      globalFrame.add(alignmentDecimals);
+
+      let gridDecimals = new Gtk.Grid({
+        row_spacing: 6
+      });
+      alignmentDecimals.add(gridDecimals);
+
+      gridDecimals.attach(new Gtk.Label({
+        label: '%s'.format(_('Display')),
+        halign: Gtk.Align.START,
+        hexpand: true
+      }), 0, 0, 1, 1);
+
+      let valueDecimals = new Gtk.Switch({
+        halign: Gtk.Align.END
+      });
+      this._settings.bind('decimals', valueDecimals, 'active', Gio.SettingsBindFlags.DEFAULT);
+      gridDecimals.attach(valueDecimals, 1, 0, 1, 1);
+
       this.append_page(globalFrame, new Gtk.Label({
         label: '<b>%s</b>'.format(_('Global')),
         use_markup: true,
@@ -154,8 +184,8 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
 
       let widthCpu = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
-          lower: 22,
-          upper: 40,
+          lower: 1,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -206,8 +236,8 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
 
       let widthRam = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
-          lower: 22,
-          upper: 40,
+          lower: 1,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -259,8 +289,8 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
 
       let widthDisk = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
-          lower: 22,
-          upper: 80,
+          lower: 1,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -401,8 +431,8 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
 
       let widthEth = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
-          lower: 22,
-          upper: 80,
+          lower: 1,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -454,7 +484,7 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
       let widthWlan = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
           lower: 22,
-          upper: 80,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -518,8 +548,8 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
 
       let widthTemperature = new Gtk.SpinButton({
         adjustment: new Gtk.Adjustment({
-          lower: 22,
-          upper: 44,
+          lower: 1,
+          upper: 500,
           step_increment: 1
         }),
         halign: Gtk.Align.END,
@@ -528,7 +558,7 @@ const ResourceMonitorPrefsWidget = GObject.registerClass(
       this._settings.bind('widthcputemperature', widthTemperature, 'value', Gio.SettingsBindFlags.DEFAULT);
 
       gridTemperature.attach(new Gtk.Label({
-        label: '%s'.format(_('Fahrenait Unit')),
+        label: '%s'.format(_('Fahrenheit Unit')),
         halign: Gtk.Align.START,
         hexpand: true
       }), 0, 3, 1, 1);

schemas/com.github.Ory0n.Resource_Monitor.gschema.xml

@@ -123,5 +123,11 @@
       <description>
       </description>
     </key>
+    <key name="decimals" type="b">
+      <default>true</default>
+      <summary>Show Decimals</summary>
+      <description>
+      </description>
+    </key>
   </schema>
 </schemalist>

schemas/gschemas.compiled

@@ -18,12 +18,14 @@
  */
 
  .unit {
-   font-size: 8pt;
-   font-weight: normal;
-   padding-top: 5px;
+   font-size: 0.625em;
+   padding-top: 0.4em;
+   min-width: 1em;
  }
 
 .label {
   text-align: right;
-  padding-right: 1px;
+  font-size: 1em;
+  padding-right: 0.125em;
+  min-width: 1em;
 }