*Screenshots* *Screenshots*
=====> To this 
=====> To this
=====> To this
*Screenshots*
=====> To this
*Screenshots*
*Screenshots*
*Screenshots*
+*Screenshots*
+
+ *Above Screenshot is with Matcha dark sea theme*
](https://extensions.gnome.org/extension/3724/net-speed-simplified/) or [Install Using Terminal](#installing-the-extension-using-terminal)
> Web Link : [prateekmedia.github/netspeedsimplified](https://prateekmedia.github.io/netspeedsimplified)
@@ -18,7 +18,7 @@
***Tested on GNOME 3.36 and 3.38***
-#### Whats new in this repo version:
+#### Whats new in v11:
- [x] Add Preference Dialog with lots of default customizations.
- [x] Add Lock Mouse Actions button in Prefrences to disable any mouse click behaviour.
@@ -35,7 +35,7 @@
- [x] Used ES6 classes for less code and more efficent javascript
- [x] Right Click to toggle visibility of total data used //If you will Right click on 5th mode i.e. total speed mode then total speed counter will reset to 0 MB.
-#### Changelog Till October 29 :
+#### Changelog Till v10 :
- [x] If network is not connected, then after 12 sec display text "--" for 1st mode, "----" for 2nd mode, "------" for 3rd mode, "--------" for 4th mode, for fifth mode it will display total data used(MB), Normal Right click functionality will show total data used except in 5th mode
- [x] Easy Vertical Aligment for Dash to panel or Big Screen users, to enable this Right Click on any mode continuosly for four times to enable/disable vertical align.
*(If you have vertical align enabled then in mode 5 you will see " -v" written after total net speed)*,
From e6e1adce913f45158e81822c2604fff0c25c6123 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sat, 31 Oct 2020 23:24:45 +0530
Subject: [PATCH 161/344] Add Refresh time adjuster and improve support for
gnome 3.38
---
extension.js | 143 ++++++++++--------
prefs.js | 36 +++++
schemas/gschemas.compiled | Bin 608 -> 664 bytes
....extensions.netspeedsimplified.gschema.xml | 3 +
4 files changed, 118 insertions(+), 64 deletions(-)
diff --git a/extension.js b/extension.js
index 95c0916..2f849bc 100644
--- a/extension.js
+++ b/extension.js
@@ -1,15 +1,17 @@
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Main = imports.ui.main;
-const Gio = imports.gi.Gio;
-const Mainloop = imports.mainloop;
+const Clutter = imports.gi.Clutter,
+ St = imports.gi.St,
+ Main = imports.ui.main,
+ Gio = imports.gi.Gio,
+ GLib = imports.gi.GLib,
+ Mainloop = imports.mainloop;
+
+var refreshTime;
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
const Convenience = Me.imports.convenience;
const schema = 'org.gnome.shell.extensions.netspeedsimplified';
-const refreshTime=1.5;
const rCConst=3; //Right Click 4 timees to change Vertical Alignment
const lCConst=5; //Left Click 6 timees to change icon set
@@ -101,41 +103,41 @@ function parseStat() {
lClickCount = 0;
}
}
- while (line = dstream.read_line(null)) {
- line = String(line);
- line = line.trim();
- let fields = line.split(/\W+/);
- if (fields.length<=2) break;
-
- if (fields[0] != "lo" &&
- !fields[0].match(/^virbr[0-9]+/) &&
- !fields[0].match(/^br[0-9]+/) &&
- !fields[0].match(/^vnet[0-9]+/) &&
- !fields[0].match(/^tun[0-9]+/) &&
- !fields[0].match(/^tap[0-9]+/) &&
- !isNaN(parseInt(fields[1]))) {
- count = count + parseInt(fields[1]) + parseInt(fields[9]);
- countUp = countUp + parseInt(fields[9]);
- }
+ while (line = dstream.read_line(null)) {
+ line = String(line);
+ line = line.trim();
+ let fields = line.split(/\W+/);
+ if (fields.length<=2) break;
+
+ if (fields[0] != "lo" &&
+ !fields[0].match(/^virbr[0-9]+/) &&
+ !fields[0].match(/^br[0-9]+/) &&
+ !fields[0].match(/^vnet[0-9]+/) &&
+ !fields[0].match(/^tun[0-9]+/) &&
+ !fields[0].match(/^tap[0-9]+/) &&
+ !isNaN(parseInt(fields[1]))) {
+ count = count + parseInt(fields[1]) + parseInt(fields[9]);
+ countUp = countUp + parseInt(fields[9]);
}
- fstream.close(null);
-
- if (lastCount === 0) lastCount = count;
- if (lastCountUp === 0) lastCountUp = countUp;
-
- let speed = (count - lastCount) / refreshTime,
- speedUp = (countUp - lastCountUp) / refreshTime,
- dot;
- dot = (speed > lastSpeed) ? "⇅" : ""
- if (resetNextCount == true) {
- resetNextCount = false;
- resetCount = count;
- }
+ }
+ fstream.close(null);
+
+ if (lastCount === 0) lastCount = count;
+ if (lastCountUp === 0) lastCountUp = countUp;
+
+ let speed = (count - lastCount) / refreshTime,
+ speedUp = (countUp - lastCountUp) / refreshTime,
+ dot;
+ dot = (speed > lastSpeed) ? "⇅" : ""
+ if (resetNextCount == true) {
+ resetNextCount = false;
+ resetCount = count;
+ }
- newLine = (isVertical && (mode ==2 || mode ==3)) ? "\n" : "";
- var speedy = speedToString(count - resetCount, 1);
- function sped(exta = extRaw, spda = speedy){ return exta + spda; }
- function commonSigma(thr = true /*If true will return a result else will return empty string*/){
+ newLine = (isVertical && (mode ==2 || mode ==3)) ? "\n" : "";
+ var speedy = speedToString(count - resetCount, 1);
+ function sped(exta = extRaw, spda = speedy){ return exta + spda; }
+ function commonSigma(thr = true /*If true will return a result else will return empty string*/){
let sigma = `${DIcons[2]} `;
extRaw = " | " + sigma;
if (thr && mode !=4){
@@ -155,21 +157,21 @@ function parseStat() {
return toReturn;
}
else return "";
- }
- if (useOldIcon) spaCe = "" ;
- else spaCe = " ";
- (speed || speedUp) ? h = 0 : h++
- if(h<=8){
- reuseable_text = (mode >= 0 && mode <= 1) ? `${dot} ${speedToString(speed)} ${commonSigma(togglebool)}` :
- (mode >= 2 && mode <= 3) ? `${DIcons[0]} ${spaCe}${speedToString(speed - speedUp)} ${newLine}${DIcons[1]} ${spaCe}${speedToString(speedUp)} ${commonSigma(togglebool)}` :
- (mode == 4) ? commonSigma(): "Mode Unavailable"
- }
- else reuseable_text = (mode !=4) ? "--".repeat(mode+1) + newLine + commonSigma(togglebool) : commonSigma(togglebool)
- ioSpeed.set_text(reuseable_text);
- lastCount = count;
- lastCountUp = countUp;
- lastSpeed = speed;
- button.set_child(chooseLabel());
+ }
+ if (useOldIcon) spaCe = "" ;
+ else spaCe = " ";
+ (speed || speedUp) ? h = 0 : h++
+ if(h<=8){
+ reuseable_text = (mode >= 0 && mode <= 1) ? `${dot} ${speedToString(speed)} ${commonSigma(togglebool)}` :
+ (mode >= 2 && mode <= 3) ? `${DIcons[0]} ${spaCe}${speedToString(speed - speedUp)} ${newLine}${DIcons[1]} ${spaCe}${speedToString(speedUp)} ${commonSigma(togglebool)}` :
+ (mode == 4) ? commonSigma(): "Mode Unavailable"
+ }
+ else reuseable_text = (mode !=4) ? "--".repeat(mode+1) + newLine + commonSigma(togglebool) : commonSigma(togglebool)
+ ioSpeed.set_text(reuseable_text);
+ lastCount = count;
+ lastCountUp = countUp;
+ lastSpeed = speed;
+ button.set_child(chooseLabel());
} catch (e) {
ioSpeed.set_text(e.message);
}
@@ -206,6 +208,7 @@ function chooseIconSet(){
}
function enable() {
+ refreshTime = settings.get_double('refreshtime');;
mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s)
fontmode = settings.get_int('fontmode');
togglebool = settings.get_boolean('togglebool');
@@ -214,17 +217,29 @@ function enable() {
lckMuseAct = settings.get_boolean('lockmouseactions');
fontmode = settings.get_int('fontmode');
- button = new St.Bin({
- style_class: 'panel-button',
- reactive: true,
- can_focus: true,
- x_fill: true,
- y_fill: false,
- x_expand: true,
- y_expand: false,
- track_hover: true
- });
+ var [ok, out, err, exit] = GLib.spawn_command_line_sync("gnome-shell --version");
+ output = out.toString().split(" ")[2];
+ if (parseFloat(output) <=3.36) {
+ button = new St.Bin({
+ style_class: 'panel-button',
+ reactive: true,
+ can_focus: true,
+ x_fill: true,
+ y_fill: false,
+ track_hover: true
+ });
+ }
+ else{
+ button = new St.Bin({
+ style_class: 'panel-button',
+ reactive: true,
+ can_focus: true,
+ x_expand: true,
+ y_expand: false,
+ track_hover: true
+ });
+ }
ioSpeed = new St.Label({
text: '---',
y_align: Clutter.ActorAlign.CENTER,
diff --git a/prefs.js b/prefs.js
index 87ce1a1..970aa9b 100644
--- a/prefs.js
+++ b/prefs.js
@@ -30,6 +30,29 @@ Prefs.prototype =
buildPrefsWidget: function()
{
let thset = this.settings;
+ function vBoxSpinBtn(staRt, getDouble, whichHbox, getLbl = ""){
+ if (staRt){;
+ boolComp = (thset.get_double(getDouble) === thset.get_default_value(getDouble).unpack());
+ getLbl = boolComp ? getLbl :
+ `${getLbl}`
+ tootext = boolComp ? "" : "The Value is Changed"
+ whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
+ }
+ else{
+ whichSpinBtn.set_value(thset.get_double(getDouble));
+ whichSpinBtn.connect('value-changed', () => {
+ this.rTValue = parseFloat(whichSpinBtn.get_value().toFixed(1));
+ if(thset.get_double(getDouble) !== this.rTValue){
+ thset.set_double(getDouble , this.rTValue);
+ }
+ });
+ whichHbox.pack_start(whichLbl, true, true, 0);
+ whichHbox.add(whichSpinBtn);
+
+ vbox.add(whichHbox);
+ vbox.add(new Gtk.Separator({visible : true}));
+ }
+ }
function vBoxAddSeleCt(stArt, getInt, whichHbox, getLbl = "", getTooTip = ""){
if (stArt) {
boolComp = (thset.get_int(getInt) == thset.get_default_value(getInt).unpack());
@@ -78,6 +101,19 @@ Prefs.prototype =
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_left: 20});
let footer = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
+//Refresh time
+ let hboxRTime = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
+ vBoxSpinBtn(true, "refreshtime", hboxRTime, "Refresh Time");
+ whichSpinBtn = new Gtk.SpinButton({
+ adjustment: new Gtk.Adjustment({
+ lower: 1.0, upper: 10.0, step_increment: .1, page_increment: 1, page_size: 0,
+ }),
+ climb_rate: 1,
+ digits: 1,
+ numeric: true,
+ });
+ vBoxSpinBtn(false, "refreshtime", hboxRTime);
+
//For Modes
let hboxMode = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
vBoxAddSeleCt(true, "mode", hboxMode, "Mode (1-5)", "Choose which mode to load");
diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
index 87a834ec45e4bca0d25156c75b984a2952992937..ff07c0dca7692f3a4b5a9ff665785c038636b83c 100644
GIT binary patch
literal 664
zcmZ`$!AiqG6ntuHtG(2NAm|4qsL53X@o1GErHJ%knrz#}BwMm;QLKVT!Gk9$`VF2u
z=}E7CffvCq5J7|<1f7?*D2PjDXPEc)C7E5Tc!~64LxVK~-s)>>bZCOJ(?nlb{aQKg
zslq>buU>H*>qRQj8TfpJ2oI^G;WT0u2}d_Y7&>C#h*(P%YbO>)w}c3^j9Q_rOA(+S
z%bMtOy7LT12FMOD4$cAhN5=*J9)4Gr+SCO<0yhgU7kSiKPr`o!KLhzG{mMS;BK$Y-
z2QYhEIc1+U_Y;0P3vAq7cGzc~fnNmA1Iz1kpX{^d{w44V;M?0h_E{I;m%y9A!*x5y
zKI=UE9q=JA%#$@ynL6Mu;Iur`gySMSHx18C!*hSabN`0t5^19vjZoB-3V9-;tl6RR
zcO$i@h36ZNedtTw7KxF*$F1m#R3Oq?e@h0Mb0
](https://extensions.gnome.org/extension/3724/net-speed-simplified/) or [Install Using Terminal](#installing-the-extension-using-terminal)
+[](https://extensions.gnome.org/extension/3724/net-speed-simplified/) or [Install Using Terminal](#installing-the-extension-using-terminal)
> Web Link : [prateekmedia.github/netspeedsimplified](https://prateekmedia.github.io/netspeedsimplified)
> Forked from : [biji.gnome/simplenetspeed](https://github.com/biji/simplenetspeed)
-
+
*Screenshots*
@@ -37,10 +37,10 @@
#### Changelog Till v10 :
- [x] If network is not connected, then after 12 sec display text "--" for 1st mode, "----" for 2nd mode, "------" for 3rd mode, "--------" for 4th mode, for fifth mode it will display total data used(MB), Normal Right click functionality will show total data used except in 5th mode
-- [x] Easy Vertical Aligment for Dash to panel or Big Screen users, to enable this Right Click on any mode continuosly for four times to enable/disable vertical align.
+- [x] Easy Vertical Aligment for Dash to panel or Big Screen users, to enable this Right Click on any mode continuosly for four times to enable/disable vertical align or simply go to prefrences tab for this extension.
*(If you have vertical align enabled then in mode 5 you will see " -v" written after total net speed)*,
***Tip : You can also change font size in vertical alignment to your liking by middle mouse click on the speed***
-- [x] Easy Switch to Old Icons from simplenetspeed extension, to enable this Left Click continuosly for six or seven times to enable/disable old icons.
+- [x] Easy Switch to Old Icons from simplenetspeed extension, go to prefrences tab for this extension to enable/disable old icons.
*(If you have old icons enabled then in mode 5 you will see " -o" written after total net speed)*
#### Todo :
@@ -49,8 +49,7 @@
if you face any **issues** you can **[open pull request](https://github.com/prateekmedia/netspeedsimplified/pulls)** and can type your issue with images or error codes
> **Left click to change modes**,
-
-> **Left click continuosly for 6/7 times to toggle old icons like simplenetspeed extension, You will se "-o" written in 5th mode after total download data if this is enabled**
+
*Modes available:*
1. Total net speed in bits per second
From de402bf84978aa4271e226dfece2430965e4e08f Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sun, 1 Nov 2020 08:33:30 +0530
Subject: [PATCH 163/344] Remove Left click changes icon & other improvement
---
extension.js | 19 ++-----------------
prefs.js | 4 +++-
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/extension.js b/extension.js
index 2f849bc..6874b11 100644
--- a/extension.js
+++ b/extension.js
@@ -14,7 +14,6 @@ const Convenience = Me.imports.convenience;
const schema = 'org.gnome.shell.extensions.netspeedsimplified';
const rCConst=3; //Right Click 4 timees to change Vertical Alignment
-const lCConst=5; //Left Click 6 timees to change icon set
let settings,
button, timeout,
@@ -23,9 +22,9 @@ let settings,
mode, // 0: kb/s 1: KB/s 2: U:kb/s D:kb/s 3: U:KB/s D:KB/s 4: Total KB
fontmode,
resetNextCount=false, resetCount=0,
- reuseable_text, newLine, h=8, tTime=0, ltTime=0, useOldIcon;
+ reuseable_text, newLine, h=8, tTime=0, useOldIcon;
-var extRaw, rClickCount=0, lClickCount=0, isVertical, togglebool, DIcons=[], lckMuseAct;
+var extRaw, rClickCount=0, isVertical, togglebool, DIcons=[], lckMuseAct;
function init() {
settings = Convenience.getSettings(schema);
@@ -50,7 +49,6 @@ function changeMode(widget, event) {
mode++;
if (mode > 4) mode = 0;
settings.set_int('mode', mode);
- lClickCount++;
}
parseStat();
log('mode:' + mode + ' font:' + fontmode);
@@ -90,19 +88,6 @@ function parseStat() {
rClickCount = 0;
}
}
- if (lClickCount != 0) {
- ltTime++;
- if (lClickCount>=lCConst){
- useOldIcon = !useOldIcon;
- settings.set_boolean('useoldicon', useOldIcon);
- chooseIconSet();
- lClickCount =0;
- }
- if(ltTime>lCConst){
- ltTime = 0;
- lClickCount = 0;
- }
- }
while (line = dstream.read_line(null)) {
line = String(line);
line = line.trim();
diff --git a/prefs.js b/prefs.js
index 970aa9b..3c568e9 100644
--- a/prefs.js
+++ b/prefs.js
@@ -30,6 +30,7 @@ Prefs.prototype =
buildPrefsWidget: function()
{
let thset = this.settings;
+
function vBoxSpinBtn(staRt, getDouble, whichHbox, getLbl = ""){
if (staRt){;
boolComp = (thset.get_double(getDouble) === thset.get_default_value(getDouble).unpack());
@@ -53,6 +54,7 @@ Prefs.prototype =
vbox.add(new Gtk.Separator({visible : true}));
}
}
+
function vBoxAddSeleCt(stArt, getInt, whichHbox, getLbl = "", getTooTip = ""){
if (stArt) {
boolComp = (thset.get_int(getInt) == thset.get_default_value(getInt).unpack());
@@ -157,4 +159,4 @@ Prefs.prototype =
return frame;
}
-}
\ No newline at end of file
+}
From acbfd2153682d6017ae8dac04ec0a229b9e3a367 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sun, 1 Nov 2020 09:07:42 +0530
Subject: [PATCH 164/344] Update metadata.json
---
metadata.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/metadata.json b/metadata.json
index f824cba..af14a1e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,5 +1,5 @@
{
- "description": "Fork of Simple Net speed by bijignome \n\nTested on gnome 3.36 and 3.38\n\nAdded Preference Menu and slight code improvements\n\nWhats New:\n Clean UI, Reduce refresh time, Fix repetitive code in stylesheet.css, \nRight Click to view total downloaded data in bits and bytes, Lesser Code Better Code,\n new Sigma and Up and down Arrow icons, dynamic width,\n used kb/s instead of Kbps, added spaces where needed,\n If you don't have active net connection for 12 seconds then this extension will show '--' instead of 0 B/s,\n Added vertical align support for dash to panel or big screen users(to use it just right click 4 time continuously on any mode to toggle vertical align), \nAdded old icons from simplenetspeed extension(to use it left click 6/7 times continuously to toggle old icons) and more coming\n\nLeft Click To change modes.\n\nLeft Click six times continuously to toggle Old Icons\n\nModes Available:\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up and down speed in bits per second\n4. Up and down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter\n\nRight Click To toggle visibility of Total Up and Down or Reset counter for 5th mode.\n\nRight Click four times continuously to toggle Vertical alignment\n\nMiddle Click to change font size.",
+ "description": "Fork of Simple Net speed by bijignome \n\nTested on gnome 3.36 and 3.38\n\nAdded Preference Menu with changable refresh rate and slight code improvements\n\nWhats New:\n Clean UI, Reduce refresh time, Fix repetitive code in stylesheet.css, \nRight Click to view total downloaded data in bits and bytes, Lesser Code Better Code,\n new Sigma and Up and down Arrow icons, dynamic width,\n used kb/s instead of Kbps, added spaces where needed,\n If you don't have active net connection for 12 seconds then this extension will show '--' instead of 0 B/s,\n Added vertical align support for dash to panel or big screen users(to use it just right click 4 time continuously on any mode to toggle vertical align), \nAdded old icons from simplenetspeed extension(to use it go to preferences and toggle Use old icons) and more coming\n\nLeft Click To change modes.\n\nModes Available:\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up and down speed in bits per second\n4. Up and down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter\n\nRight Click To toggle visibility of Total Up and Down or Reset counter for 5th mode.\n\nRight Click four times continuously to toggle Vertical alignment\n\nMiddle Click to change font size.",
"name": "Net speed Simplified",
"shell-version": [
"3.14",
@@ -26,5 +26,5 @@
],
"url": "https://github.com/prateekmedia/netspeedsimplified",
"uuid": "netspeedsimplified@prateekmedia.extension",
- "version": 11
+ "version": 13
}
From af54689a73a097cd2eac174cdf7b8dcba78d2393 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sun, 1 Nov 2020 09:19:54 +0530
Subject: [PATCH 165/344] Update Install method
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a0765a5..ee1aae8 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ if you face any **issues** you can **[open pull request](https://github.com/prat
* Please Mark this extension page as Watch if you want to know about the updates
- ***to install( reload required )( Requirements : git )***
- ```git clone --single-branch --branch main https://github.com/prateekmedia/netspeedsimplified ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension```
+ ```mkdir ~/.local/share/gnome-shell/extensions/; git clone --single-branch --branch main https://github.com/prateekmedia/netspeedsimplified ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension```
*Or*
@@ -84,7 +84,7 @@ if you face any **issues** you can **[open pull request](https://github.com/prat
You can do that manually using extensions app or [website](https://extensions.gnome.org/local) or Using Gnome tweaks tool's extension tab
- ***to reinstall or update( reload required )( Requirements : git )***
- ```rm -rf ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension && git clone --single-branch --branch main https://github.com/prateekmedia/netspeedsimplified ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension```
+ ```rm -rf ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension; git clone --single-branch --branch main https://github.com/prateekmedia/netspeedsimplified ~/.local/share/gnome-shell/extensions/netspeedsimplified@prateekmedia.extension```
*Or*
From 89d7f82c3ec78709ee047a3523386bad02137909 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sun, 1 Nov 2020 09:26:10 +0530
Subject: [PATCH 166/344] Update Screenshot
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ee1aae8..e5a0cb8 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
> Forked from : [biji.gnome/simplenetspeed](https://github.com/biji/simplenetspeed)
-
+
*Screenshots*
From 23dc3cfce217be27b6961042b0c9797c625bb5be Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Sun, 1 Nov 2020 11:30:56 +0530
Subject: [PATCH 167/344] Update support for Gnome shells
---
extension.js | 94 +++++++++---------
prefs.js | 17 +++-
schemas/gschemas.compiled | Bin 664 -> 789 bytes
....extensions.netspeedsimplified.gschema.xml | 10 +-
4 files changed, 69 insertions(+), 52 deletions(-)
diff --git a/extension.js b/extension.js
index 6874b11..dd6f30b 100644
--- a/extension.js
+++ b/extension.js
@@ -2,7 +2,8 @@ const Clutter = imports.gi.Clutter,
St = imports.gi.St,
Main = imports.ui.main,
Gio = imports.gi.Gio,
- GLib = imports.gi.GLib,
+ Lang = imports.lang,
+ PanelMenu = imports.ui.panelMenu,
Mainloop = imports.mainloop;
var refreshTime;
@@ -13,18 +14,42 @@ const Convenience = Me.imports.convenience;
const schema = 'org.gnome.shell.extensions.netspeedsimplified';
-const rCConst=3; //Right Click 4 timees to change Vertical Alignment
+const ButtonName = "ShowNetSpeedButton";
+
+const rCConst=4; //Right Click 4 times to change Vertical Alignment
let settings,
button, timeout,
- ioSpeed, spaCe,
+ spaCe,
lastCount = 0, lastSpeed = 0, lastCountUp = 0,
mode, // 0: kb/s 1: KB/s 2: U:kb/s D:kb/s 3: U:KB/s D:KB/s 4: Total KB
fontmode,
resetNextCount=false, resetCount=0,
- reuseable_text, newLine, h=8, tTime=0, useOldIcon;
+ reuseable_text, newLine, h=8, tTime=0, chooseIconSet;
+
+var extRaw, rClickCount=0, isVertical, togglebool, DIcons=[], DWPos=[], lckMuseAct;
+
+const ShowNetBtn = new Lang.Class({
+ Name: ButtonName,
+ Extends: PanelMenu.Button,
+
+ _init: function () {
+ this.parent(0.0, ButtonName);
+
+ ioSpeed = new St.Label({
+ text: '---',
+ y_align: Clutter.ActorAlign.CENTER,
+ style_class: 'forall'
+ });
+
+
+ (!lckMuseAct) ? this.connect('button-press-event', changeMode) : null
+
+ this.add_child(chooseLabel());
+ },
+
+});
-var extRaw, rClickCount=0, isVertical, togglebool, DIcons=[], lckMuseAct;
function init() {
settings = Convenience.getSettings(schema);
@@ -138,12 +163,12 @@ function parseStat() {
}
else if (mode == 4){
let toReturn = (isVertical) ? sped(sigma) + "\n -v" : sped(sigma);
- toReturn = (useOldIcon) ? toReturn + " -o" : toReturn
+ toReturn = (chooseIconSet !=0) ? toReturn + " -o" : toReturn
return toReturn;
}
else return "";
}
- if (useOldIcon) spaCe = "" ;
+ if (chooseIconSet !=0) spaCe = "" ;
else spaCe = " ";
(speed || speedUp) ? h = 0 : h++
if(h<=8){
@@ -156,7 +181,7 @@ function parseStat() {
lastCount = count;
lastCountUp = countUp;
lastSpeed = speed;
- button.set_child(chooseLabel());
+ button.add_child(chooseLabel());
} catch (e) {
ioSpeed.set_text(e.message);
}
@@ -188,59 +213,34 @@ function speedToString(amount, rMode = 0) {
return String(amount.toFixed(digits)) + " " + speed_map[unit];
}
-function chooseIconSet(){
- DIcons = (useOldIcon) ? ["↓","↑","∑"] : ["🡳","🡱","Σ"];
+function chooseArrayVal(){
+ DIcons = (chooseIconSet ==0) ? ["🡳","🡱","Σ"] :
+ (chooseIconSet ==1) ? ["↓","↑","∑"] :
+ ["","",""]
+ DWPos = ["right", "left", "center"]
}
function enable() {
- refreshTime = settings.get_double('refreshtime');;
- mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s)
+ refreshTime = settings.get_double('refreshtime');
+ mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s);
fontmode = settings.get_int('fontmode');
+ whePosition = settings.get_int('wpos');
togglebool = settings.get_boolean('togglebool');
isVertical = settings.get_boolean('isvertical');
- useOldIcon = settings.get_boolean('useoldicon');
+ chooseIconSet = settings.get_int('chooseiconset');
lckMuseAct = settings.get_boolean('lockmouseactions');
fontmode = settings.get_int('fontmode');
- var [ok, out, err, exit] = GLib.spawn_command_line_sync("gnome-shell --version");
- output = out.toString().split(" ")[2];
-
- if (parseFloat(output) <=3.36) {
- button = new St.Bin({
- style_class: 'panel-button',
- reactive: true,
- can_focus: true,
- x_fill: true,
- y_fill: false,
- track_hover: true
- });
- }
- else{
- button = new St.Bin({
- style_class: 'panel-button',
- reactive: true,
- can_focus: true,
- x_expand: true,
- y_expand: false,
- track_hover: true
- });
- }
- ioSpeed = new St.Label({
- text: '---',
- y_align: Clutter.ActorAlign.CENTER,
- style_class: 'forall'
- });
-
- (!lckMuseAct) ? button.connect('button-press-event', changeMode) : null
- button.set_child(chooseLabel());
+ button = new ShowNetBtn();
- chooseIconSet();
+ chooseArrayVal();
+ whePos = DWPos[whePosition]
- Main.panel._rightBox.insert_child_at_index(button, 0);
+ Main.panel.addToStatusArea(ButtonName, button, 3, whePos);
timeout = Mainloop.timeout_add_seconds(refreshTime, parseStat);
}
function disable() {
Mainloop.source_remove(timeout);
- Main.panel._rightBox.remove_child(button);
+ button.destroy();
}
diff --git a/prefs.js b/prefs.js
index 3c568e9..31871a7 100644
--- a/prefs.js
+++ b/prefs.js
@@ -103,6 +103,14 @@ Prefs.prototype =
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_left: 20});
let footer = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
+ //For Position
+ let hboxWPos = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
+ vBoxAddSeleCt(true, "wpos", hboxWPos, "Position", "Choose where to Place the extension");
+ whichVlue.append_text("Right");
+ whichVlue.append_text("Left");
+ whichVlue.append_text("Center");
+ vBoxAddSeleCt(false, "wpos", hboxWPos);
+
//Refresh time
let hboxRTime = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
vBoxSpinBtn(true, "refreshtime", hboxRTime, "Refresh Time");
@@ -142,11 +150,14 @@ Prefs.prototype =
//For Default sigma View
let hboxToggleBool = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddTgglBtn(hboxToggleBool, "Toggle Right Click Behaviour", "togglebool", "Enabling it will show sigma by default");
+ vBoxAddTgglBtn(hboxToggleBool, "Show Total Download speed", "togglebool", "Enabling it will show sigma by default");
//For Toggling Old Icons
- let hboxOldIcons = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddTgglBtn(hboxOldIcons, "Display Old Icons", "useoldicon", "Enabling it will show Old Icons of simplenetspeed");
+ let hboxIconset = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
+ vBoxAddSeleCt(true, "chooseiconset", hboxIconset, "Choose Icons Set", "Choose which icon set to display");
+ whichVlue.append_text(' 🡳, 🡱, Σ ');
+ whichVlue.append_text(' ↓, ↑, ∑ ');
+ vBoxAddSeleCt(false, "chooseiconset", hboxIconset);
//For Lock Mouse Actions
let hboxLckMuseAct = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
index ff07c0dca7692f3a4b5a9ff665785c038636b83c..76e96fabdb984621ca438701792bf4fe6754685e 100644
GIT binary patch
literal 789
zcmZWnF;CS{82wP5JRv4HkeD#y&?eZrJK&}v%)}srrM>UH8{6KO-s@8nG;t(hVlYM*
zet=Fc=pqcPghZWOSX~GS3?vSE&h0C{=uJ=0>A7FO@Am6=Z#k)SQaTx~8{h}E4lXq&
zxHTj48>`-1@-eIMU!AVLV;J=
+
*Screenshots*
- *Above Screenshot is with Matcha dark sea theme*
+
*Screenshots*
From 3d2ad7b1688f792ba15701f76a1c0527c74f8f5a Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:31:07 +0530
Subject: [PATCH 171/344] Update chngelog
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5478ba6..691ad89 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,11 @@
***Tested on GNOME 3.36 and 3.38***
-#### Whats new in v11:
+#### Whats new in v11 and above:
- [x] Add Preference Dialog with lots of default customizations.
- [x] Add Lock Mouse Actions button in Prefrences to disable any mouse click behaviour.
+- [x] Add Position menu to decide where to place the indicator on the Panel.
+- [x] Add Refresh time field by which you can change refresh time value between 1.0 sec to 10.0 sec.
#### Feature Highlights :
- [x] Reduce Refresh time
From 66c4d3f1af6c8665f421e85cbcc5af076d2ae407 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:23:02 +0530
Subject: [PATCH 172/344] Add Advanced features and code improvements
---
extension.js | 16 +-
prefs.js | 162 ++++++++----------
schemas/gschemas.compiled | Bin 789 -> 867 bytes
....extensions.netspeedsimplified.gschema.xml | 4 +
4 files changed, 84 insertions(+), 98 deletions(-)
diff --git a/extension.js b/extension.js
index dd6f30b..a764a66 100644
--- a/extension.js
+++ b/extension.js
@@ -214,17 +214,16 @@ function speedToString(amount, rMode = 0) {
}
function chooseArrayVal(){
- DIcons = (chooseIconSet ==0) ? ["🡳","🡱","Σ"] :
- (chooseIconSet ==1) ? ["↓","↑","∑"] :
- ["","",""]
- DWPos = ["right", "left", "center"]
+ DIcons = (chooseIconSet ==1) ? ["↓","↑","∑"] :
+ ["🡳","🡱","Σ"]
}
function enable() {
- refreshTime = settings.get_double('refreshtime');
- mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s);
+ refreshTime = settings.get_double('refreshtime');
+ mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s);
fontmode = settings.get_int('fontmode');
- whePosition = settings.get_int('wpos');
+ whePos = ["right", "left", "center"][settings.get_int('wpos')]
+ whePosExt = [3,0][settings.get_int('wposext')];
togglebool = settings.get_boolean('togglebool');
isVertical = settings.get_boolean('isvertical');
chooseIconSet = settings.get_int('chooseiconset');
@@ -234,9 +233,8 @@ function enable() {
button = new ShowNetBtn();
chooseArrayVal();
- whePos = DWPos[whePosition]
- Main.panel.addToStatusArea(ButtonName, button, 3, whePos);
+ Main.panel.addToStatusArea(ButtonName, button, whePosExt, whePos);
timeout = Mainloop.timeout_add_seconds(refreshTime, parseStat);
}
diff --git a/prefs.js b/prefs.js
index 31871a7..30460ce 100644
--- a/prefs.js
+++ b/prefs.js
@@ -31,15 +31,24 @@ Prefs.prototype =
{
let thset = this.settings;
- function vBoxSpinBtn(staRt, getDouble, whichHbox, getLbl = ""){
- if (staRt){;
+ function newGtkBox(){
+ return new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
+ }
+
+ function vBoxSpinBtn(getDouble, whichHbox, getLbl = "", lwer , uper, stpInc = 1, digs = 0, nume = true, pgeInc = 1, pgeSiz = 0, clmrate = 1){
boolComp = (thset.get_double(getDouble) === thset.get_default_value(getDouble).unpack());
getLbl = boolComp ? getLbl :
- `${getLbl}`
+ `${getLbl}`
tootext = boolComp ? "" : "The Value is Changed"
whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
- }
- else{
+ whichSpinBtn = new Gtk.SpinButton({
+ adjustment: new Gtk.Adjustment({
+ lower: lwer, upper: uper, step_increment: stpInc, page_increment: pgeInc, page_size: pgeSiz,
+ }),
+ climb_rate: clmrate,
+ digits: digs,
+ numeric: nume,
+ });
whichSpinBtn.set_value(thset.get_double(getDouble));
whichSpinBtn.connect('value-changed', () => {
this.rTValue = parseFloat(whichSpinBtn.get_value().toFixed(1));
@@ -52,32 +61,31 @@ Prefs.prototype =
vbox.add(whichHbox);
vbox.add(new Gtk.Separator({visible : true}));
- }
}
- function vBoxAddSeleCt(stArt, getInt, whichHbox, getLbl = "", getTooTip = ""){
- if (stArt) {
- boolComp = (thset.get_int(getInt) == thset.get_default_value(getInt).unpack());
- getLbl = boolComp ? getLbl :
- `${getLbl}`
- tootext = boolComp ? "" : "The Value is Changed"
- whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
- whichVlue = new Gtk.ComboBoxText({
- halign: Gtk.Align.END,
- tooltip_text: getTooTip
- });
- }
- else {
- whichVlue.set_active(Math.round(thset.get_int(getInt)));
- whichVlue.connect('changed', (widget) => {
- let valueMode = widget.get_active();
- thset.set_int(getInt, valueMode);
- })
- whichHbox.add(whichLbl);
- whichHbox.pack_end(whichVlue, true, true, 0);
- vbox.add(whichHbox);
- vbox.add(new Gtk.Separator({visible : true}));
- }
+ function vBoxAddSeleCt(getInt, whichHbox, getLbl, aRray = [], getTooTip = ""){
+ boolComp = (thset.get_int(getInt) == thset.get_default_value(getInt).unpack());
+ getLbl = boolComp ? getLbl :
+ `${getLbl}`
+ tootext = boolComp ? "" : "The Value is Changed"
+
+ whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
+ whichVlue = new Gtk.ComboBoxText({halign: Gtk.Align.END, tooltip_text: getTooTip});
+
+ for (i in aRray){
+ whichVlue.append_text(aRray[i]);
+ }
+
+ whichVlue.set_active(Math.round(thset.get_int(getInt)));
+ whichVlue.connect('changed', (widget) => {
+ let valueMode = widget.get_active();
+ thset.set_int(getInt, valueMode);
+ })
+ whichHbox.add(whichLbl);
+ whichHbox.pack_end(whichVlue, true, true, 0);
+
+ vbox.add(whichHbox);
+ vbox.add(new Gtk.Separator({visible : true}));
}
function vBoxAddTgglBtn(whichHbox, getLbl, getBool,getTooTip = ""){
@@ -103,71 +111,47 @@ Prefs.prototype =
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_left: 20});
let footer = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
- //For Position
- let hboxWPos = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddSeleCt(true, "wpos", hboxWPos, "Position", "Choose where to Place the extension");
- whichVlue.append_text("Right");
- whichVlue.append_text("Left");
- whichVlue.append_text("Center");
- vBoxAddSeleCt(false, "wpos", hboxWPos);
-
-//Refresh time
- let hboxRTime = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxSpinBtn(true, "refreshtime", hboxRTime, "Refresh Time");
- whichSpinBtn = new Gtk.SpinButton({
- adjustment: new Gtk.Adjustment({
- lower: 1.0, upper: 10.0, step_increment: .1, page_increment: 1, page_size: 0,
- }),
- climb_rate: 1,
- digits: 1,
- numeric: true,
- });
- vBoxSpinBtn(false, "refreshtime", hboxRTime);
-
- //For Modes
- let hboxMode = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddSeleCt(true, "mode", hboxMode, "Mode (1-5)", "Choose which mode to load");
- whichVlue.append_text("Mode 1");
- whichVlue.append_text("Mode 2");
- whichVlue.append_text("Mode 3");
- whichVlue.append_text("Mode 4");
- whichVlue.append_text("Mode 5");
- vBoxAddSeleCt(false, "mode", hboxMode);
-
- //For FontModes
- let hboxFontMode = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddSeleCt(true, "fontmode", hboxFontMode, "Font Mode", "Choose which font to display");
- whichVlue.append_text("Default");
- whichVlue.append_text("Smallest");
- whichVlue.append_text("Smaller");
- whichVlue.append_text("Small");
- whichVlue.append_text("Large");
- vBoxAddSeleCt(false, "fontmode", hboxFontMode);
-
-//For Vertical Alignment
- let hboxVertical = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddTgglBtn(hboxVertical, "Vertical Align", "isvertical", "Changing it will toggle Vertical Alignment");
-
-//For Default sigma View
- let hboxToggleBool = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddTgglBtn(hboxToggleBool, "Show Total Download speed", "togglebool", "Enabling it will show sigma by default");
-
-//For Toggling Old Icons
- let hboxIconset = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddSeleCt(true, "chooseiconset", hboxIconset, "Choose Icons Set", "Choose which icon set to display");
- whichVlue.append_text(' 🡳, 🡱, Σ ');
- whichVlue.append_text(' ↓, ↑, ∑ ');
- vBoxAddSeleCt(false, "chooseiconset", hboxIconset);
-
-//For Lock Mouse Actions
- let hboxLckMuseAct = new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
- vBoxAddTgglBtn(hboxLckMuseAct, "Lock Mouse Actions", "lockmouseactions", "Enabling it will Lock Mouse Actions");
+ //For Position
+ let hboxWPos = newGtkBox();
+ vBoxAddSeleCt("wpos", hboxWPos, "Position on the Panel", ["Right","Left","Center"], "Choose where to Place the extension on the Panel");
+
+ //For Position Extras
+ let hboxWPosExt = newGtkBox();
+ vBoxAddSeleCt("wposext", hboxWPosExt, "Position(Advanced)", ["Prefer Right Side", "Prefer Left Side"], "Choose further where to Place the extension");
+
+ //Refresh time
+ let hboxRTime = newGtkBox();
+ vBoxSpinBtn("refreshtime", hboxRTime, "Refresh Time", 1.0, 10.0, .1, 1);
+
+ //For Modes
+ let hboxMode = newGtkBox();
+ vBoxAddSeleCt("mode", hboxMode, "Mode", ["Mode 1", "Mode 2", "Mode 3", "Mode 4", "Mode 5"], "Choose which mode to load");
+
+ //For FontModes
+ let hboxFontMode = newGtkBox();
+ vBoxAddSeleCt("fontmode", hboxFontMode, "Font Mode", ["Default", "Smallest","Smaller","Small","Large"], "Choose which font to display");
+
+ //For Vertical Alignment
+ let hboxVertical = newGtkBox();
+ vBoxAddTgglBtn(hboxVertical, "Vertical Align", "isvertical", "Changing it will toggle Vertical Alignment");
+
+ //For Default sigma View
+ let hboxToggleBool = newGtkBox();
+ vBoxAddTgglBtn(hboxToggleBool, "Show Total Download speed", "togglebool", "Enabling it will show sigma by default");
+
+ //For Toggling Old Icons
+ let hboxIconset = newGtkBox();
+ vBoxAddSeleCt("chooseiconset", hboxIconset, "Choose Icons Set", [" 🡳, 🡱, Σ ", " ↓, ↑, ∑ "], "Choose which icon set to display");
+
+ //For Lock Mouse Actions
+ let hboxLckMuseAct = newGtkBox();
+ vBoxAddTgglBtn(hboxLckMuseAct, "Lock Mouse Actions", "lockmouseactions", "Enabling it will Lock Mouse Actions");
frame.add(label);
frame.add(vbox);
frame.add(footer);
frame.show_all();
-
+
return frame;
}
}
diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
index 76e96fabdb984621ca438701792bf4fe6754685e..d68e952dbd0f7f81b649bad4176e367644d02d60 100644
GIT binary patch
literal 867
zcmZ`%F^JSa6#aU)?s`7mZ!*VcF3MEigTDb!4i_KkQ}^M|z{g;8
zbx@0J$O?E3`1I=QE-mUq$Pd9O@aEaHPoH`Teg(bKbps to kbp/s
- [x] New sigma icon that respects vertical alignment(old: ∑ , new: Σ)
- [x] New Speed up and down icons for mode 3 & 4. (old: ↓ and ↑ , new: 🡳 and 🡱)
- [x] Added space b/w speed and their units
-- [x] Human readable stylesheet // used minimum width and removed repetitive codes
+- [x] Human readable stylesheet // used min-width and removed repetitive codes
- [x] Used ES6 classes for less code and more efficent javascript
- [x] Right Click to toggle visibility of total data used //If you will Right click on 5th mode i.e. total speed mode then total speed counter will reset to 0 MB.
+- [x] Add Preference Menu to customize the whole extension as you need
#### Changelog Till v10 :
- [x] If network is not connected, then after 12 sec display text "--" for 1st mode, "----" for 2nd mode, "------" for 3rd mode, "--------" for 4th mode, for fifth mode it will display total data used(MB), Normal Right click functionality will show total data used except in 5th mode
From 422381ac23dc39e1a96678bc48406afe910ef8c9 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:37:28 +0530
Subject: [PATCH 174/344] Remove TODO from Readme
---
README.md | 3 ---
1 file changed, 3 deletions(-)
diff --git a/README.md b/README.md
index 760a67c..29d412c 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,6 @@
- [x] Easy Switch to Old Icons from simplenetspeed extension, go to prefrences tab for this extension to enable/disable old icons.
*(If you have old icons enabled then in mode 5 you will see " -o" written after total net speed)*
-#### Todo :
-***Nothing TODO***
-
if you face any **issues** you can **[open pull request](https://github.com/prateekmedia/netspeedsimplified/pulls)** and can type your issue with images or error codes
> **Left click to change modes**,
From 75665bba5a3aaeaa2a96716701fdd88c488c7a9b Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Wed, 4 Nov 2020 14:12:48 +0530
Subject: [PATCH 175/344] Improve Code and Syntax
---
extension.js | 11 +++--------
prefs.js | 28 ++++++++++++++--------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/extension.js b/extension.js
index a764a66..09a24fa 100644
--- a/extension.js
+++ b/extension.js
@@ -27,7 +27,7 @@ let settings,
resetNextCount=false, resetCount=0,
reuseable_text, newLine, h=8, tTime=0, chooseIconSet;
-var extRaw, rClickCount=0, isVertical, togglebool, DIcons=[], DWPos=[], lckMuseAct;
+var extRaw, rClickCount=0, isVertical, togglebool, DIcons=[], lckMuseAct;
const ShowNetBtn = new Lang.Class({
Name: ButtonName,
@@ -208,16 +208,11 @@ function speedToString(amount, rMode = 0) {
return Number.isInteger(parseFloat(amnt.toFixed(digitsToFix)));
}
digits = ChkifInt(amount) ? 0 : //For Integer like 21.0
- ((mode==4 || rMode !=0) && !ChkifInt(amount*10)) ? 2 /* For floats like 21.1 */ : 1 //For floats like 21.22
+ ((mode==4 || rMode !=0) && !ChkifInt(amount*10)) ? 2 /* For floats like 21.11 */ : 1 //For floats like 21.2
return String(amount.toFixed(digits)) + " " + speed_map[unit];
}
-function chooseArrayVal(){
- DIcons = (chooseIconSet ==1) ? ["↓","↑","∑"] :
- ["🡳","🡱","Σ"]
-}
-
function enable() {
refreshTime = settings.get_double('refreshtime');
mode = settings.get_int('mode'); // default mode using bit (b/s, kb/s);
@@ -229,10 +224,10 @@ function enable() {
chooseIconSet = settings.get_int('chooseiconset');
lckMuseAct = settings.get_boolean('lockmouseactions');
fontmode = settings.get_int('fontmode');
+ DIcons = [ ["🡳","🡱","Σ"] , ["↓","↑","∑"] ][chooseIconSet]
button = new ShowNetBtn();
- chooseArrayVal();
Main.panel.addToStatusArea(ButtonName, button, whePosExt, whePos);
timeout = Mainloop.timeout_add_seconds(refreshTime, parseStat);
diff --git a/prefs.js b/prefs.js
index 30460ce..d88fb88 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1,5 +1,4 @@
const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
const Extension = imports.misc.extensionUtils.getCurrentExtension();
const Lib = Extension.imports.lib;
@@ -35,15 +34,14 @@ Prefs.prototype =
return new Gtk.Box({orientation: Gtk.Orientation.HORIZONTAL, margin_top : 10, margin_bottom : 10});
}
- function vBoxSpinBtn(getDouble, whichHbox, getLbl = "", lwer , uper, stpInc = 1, digs = 0, nume = true, pgeInc = 1, pgeSiz = 0, clmrate = 1){
+ function vBoxSpinBtn(getDouble, whichHbox, getLbl = "", getTooTip = "", lwer , uper, stpInc = 1, digs = 0, nume = true, pgeInc = 1, pgeSiz = 0, clmrate = 1){
boolComp = (thset.get_double(getDouble) === thset.get_default_value(getDouble).unpack());
getLbl = boolComp ? getLbl :
`${getLbl}`
- tootext = boolComp ? "" : "The Value is Changed"
- whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
+ whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: getTooTip });
whichSpinBtn = new Gtk.SpinButton({
adjustment: new Gtk.Adjustment({
- lower: lwer, upper: uper, step_increment: stpInc, page_increment: pgeInc, page_size: pgeSiz,
+ lower: lwer, upper: uper, step_increment: stpInc, page_increment: pgeInc, page_size: pgeSiz
}),
climb_rate: clmrate,
digits: digs,
@@ -69,8 +67,8 @@ Prefs.prototype =
`${getLbl}`
tootext = boolComp ? "" : "The Value is Changed"
- whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
- whichVlue = new Gtk.ComboBoxText({halign: Gtk.Align.END, tooltip_text: getTooTip});
+ whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0,tooltip_text: getTooTip});
+ whichVlue = new Gtk.ComboBoxText({halign: Gtk.Align.END, tooltip_text: tootext });
for (i in aRray){
whichVlue.append_text(aRray[i]);
@@ -88,14 +86,14 @@ Prefs.prototype =
vbox.add(new Gtk.Separator({visible : true}));
}
- function vBoxAddTgglBtn(whichHbox, getLbl, getBool,getTooTip = ""){
+ function vBoxAddTgglBtn(whichHbox, getLbl, getBool, getTooTip = ""){
boolComp = (thset.get_boolean(getBool) == thset.get_default_value(getBool).unpack());
getLbl = boolComp ? getLbl :
`${getLbl}`
tootext = boolComp ? "" : "The Value is Changed"
- whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: tootext });
- whichVlue = new Gtk.Switch({active: thset.get_boolean(getBool), tooltip_text: getTooTip });
- whichVlue.connect('notify::active', (widget, whichVlue) => {
+ whichLbl = new Gtk.Label({label: getLbl, use_markup: true, xalign: 0, tooltip_text: getTooTip });
+ whichVlue = new Gtk.Switch({active: thset.get_boolean(getBool), tooltip_text: tootext });
+ whichVlue.connect('notify::active', (widget) => {
thset.set_boolean(getBool, widget.active);
})
@@ -109,7 +107,8 @@ Prefs.prototype =
let frame = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, border_width: 10});
let label = new Gtk.Label({ label: "Default Settings", use_markup: true, xalign:0});
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_left: 20});
- let footer = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
+ let footer1 = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
+ let footer2 = new Gtk.Label({ label: "Pro Tip : Hover over any Label To know more about it",use_markup: true, margin_top: 20});
//For Position
let hboxWPos = newGtkBox();
@@ -121,7 +120,7 @@ Prefs.prototype =
//Refresh time
let hboxRTime = newGtkBox();
- vBoxSpinBtn("refreshtime", hboxRTime, "Refresh Time", 1.0, 10.0, .1, 1);
+ vBoxSpinBtn("refreshtime", hboxRTime, "Refresh Time", "Change Refresh time value from anywhere b/w 1 to 10", 1.0, 10.0, .1, 1);
//For Modes
let hboxMode = newGtkBox();
@@ -149,7 +148,8 @@ Prefs.prototype =
frame.add(label);
frame.add(vbox);
- frame.add(footer);
+ frame.add(footer1);
+ frame.add(footer2);
frame.show_all();
return frame;
From 5650e7bd0697742fd96732d48ef9ec69614d0c29 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Wed, 4 Nov 2020 14:32:01 +0530
Subject: [PATCH 176/344] Bump version to 15
---
metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata.json b/metadata.json
index 62292bd..1978716 100644
--- a/metadata.json
+++ b/metadata.json
@@ -26,5 +26,5 @@
],
"url": "https://github.com/prateekmedia/netspeedsimplified",
"uuid": "netspeedsimplified@prateekmedia.extension",
- "version": 14
+ "version": 15
}
From b0f2c7866bdc905dac7fcb76f7e9d14982b39c24 Mon Sep 17 00:00:00 2001
From: Prateek SU <41370460+prateekmedia@users.noreply.github.com>
Date: Wed, 11 Nov 2020 02:57:52 -0500
Subject: [PATCH 177/344] Add Real time changes in settings
After installing this update, whenever you will change something in settings it will show effect on extension in RealTime..
---
extension.js | 8 +++++++-
prefs.js | 9 +++++----
schemas/gschemas.compiled | Bin 867 -> 915 bytes
...ll.extensions.netspeedsimplified.gschema.xml | 3 +++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/extension.js b/extension.js
index 09a24fa..55a5a45 100644
--- a/extension.js
+++ b/extension.js
@@ -6,7 +6,7 @@ const Clutter = imports.gi.Clutter,
PanelMenu = imports.ui.panelMenu,
Mainloop = imports.mainloop;
-var refreshTime;
+var refreshTime, toRestart;
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
@@ -93,6 +93,7 @@ function chooseLabel() {
}
function parseStat() {
+ toRestart = settings.get_boolean('restartextension');
try {
let input_file = Gio.file_new_for_path('/proc/net/dev');
let fstream = input_file.read(null);
@@ -182,6 +183,11 @@ function parseStat() {
lastCountUp = countUp;
lastSpeed = speed;
button.add_child(chooseLabel());
+ if (toRestart != false){
+ settings.set_boolean('restartextension', false);
+ disable();
+ enable();
+ }
} catch (e) {
ioSpeed.set_text(e.message);
}
diff --git a/prefs.js b/prefs.js
index d88fb88..002bf98 100644
--- a/prefs.js
+++ b/prefs.js
@@ -52,6 +52,7 @@ Prefs.prototype =
this.rTValue = parseFloat(whichSpinBtn.get_value().toFixed(1));
if(thset.get_double(getDouble) !== this.rTValue){
thset.set_double(getDouble , this.rTValue);
+ thset.set_boolean('restartextension' , true);
}
});
whichHbox.pack_start(whichLbl, true, true, 0);
@@ -78,6 +79,7 @@ Prefs.prototype =
whichVlue.connect('changed', (widget) => {
let valueMode = widget.get_active();
thset.set_int(getInt, valueMode);
+ thset.set_boolean('restartextension' , true);
})
whichHbox.add(whichLbl);
whichHbox.pack_end(whichVlue, true, true, 0);
@@ -95,6 +97,7 @@ Prefs.prototype =
whichVlue = new Gtk.Switch({active: thset.get_boolean(getBool), tooltip_text: tootext });
whichVlue.connect('notify::active', (widget) => {
thset.set_boolean(getBool, widget.active);
+ thset.set_boolean('restartextension' , true);
})
whichHbox.pack_start(whichLbl, true, true, 0);
@@ -107,8 +110,7 @@ Prefs.prototype =
let frame = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, border_width: 10});
let label = new Gtk.Label({ label: "Default Settings", use_markup: true, xalign:0});
let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_left: 20});
- let footer1 = new Gtk.Label({ label: "To See the changes Disable and then re-enable the extension",use_markup: true, margin_top: 20});
- let footer2 = new Gtk.Label({ label: "Pro Tip : Hover over any Label To know more about it",use_markup: true, margin_top: 20});
+ let mfooter = new Gtk.Label({ label: "Pro Tip : Hover over any Label To know more about it",use_markup: true, margin_top: 20});
//For Position
let hboxWPos = newGtkBox();
@@ -148,8 +150,7 @@ Prefs.prototype =
frame.add(label);
frame.add(vbox);
- frame.add(footer1);
- frame.add(footer2);
+ frame.add(mfooter);
frame.show_all();
return frame;
diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled
index d68e952dbd0f7f81b649bad4176e367644d02d60..2369bf9f71f227a1165876efc18a258d30bb9c80 100644
GIT binary patch
literal 915
zcmah`F^kkd6n=WQ?z-p6SqKMWXOW;L_7-QS=+%cDSC~s?H-kxL$&BkMDu_0MonWDb
z_X89JD{a(T5KG0z!p24fn{7nDZ?f4twD7TCzHh(0nV0w8*|ntBN#$f3%ixQR4)(St
zxN}(KH==pB>T@>W-~PGrm}%4}<(%9Hf88U3pO|_W4J%Ws$mXgjBDLjIWwohnR4Hdi
zN@Z4;qe2g~%8-u;4m9k~^A2JTm