Merge pull request linuxmint#341 from pdcurtis/bumblebee-3.1.2

bumblebee@pdcurtis Update to version 3.1.2

bumblebee@pdcurtis/README.md

@@ -1,44 +1,43 @@
-# Bumblebee And NVidia Display Applet (BAND) 
+# Bumblebee And NVidia Display applet (BAND)
 
 ## Summary
 
 The Bumblebee And NVidia Display (Band) Applet is a relatively simple applet I wrote for my Chillblast Defiant laptop which has an Core i7 Haswell architecture and Optimus technology to switch between the integrated Intel 4600 graphics and discrete nVidia GTX 765M graphics. The switching is done by use of Bumblebee. This Applet allows one to monitor whether the power consuming discrete graphics is on and display the GPU temperature, but only when it is enabled. Monitoring the temperature requires the graphics processor to be turned on every time it is measured - some applets do this all the time and that uses a significant extra amount of power.
 
 ## Rationale
 
-It is useful to have continuous indication of whether the Discrete Graphics Processor Unit is in use and its temperature which is a concern on some laptops. The latest versions of Cinnamon provide more support so the option of running programs is now less important. 
+It is useful to have continuous indication of whether the Discrete Graphics Processor Unit is in use and its temperature which is a concern on some laptops.
 
-## Warning
+The latest versions of Cinnamon provide more support to Bumblebee but the option of running programs from the applet is still important if you want to use primus instead of optirun or use additional parameters to optimise the transport mechanism used by VirtualGL to copy the image generated by the nVidia GPU to your display which can offer significant improvements in speed. I wrote about this at http:https://www.pcurtis.com/defiant.htm#bumblebee_options
 
-I no longer run Bumbleebee on a regular basis so it is possible for errors to have crept in without my knowing during the recent changes to how applets are handled. Please report any errors by creating an Issue in the cinnamon-spices-applets Github repository at https://github.com/linuxmint/cinnamon-spices-applets and I will try to fix or revert to an earlier known working version within a few days. Also see requirements below.
+## Status
 
+I have just reloaded Bumblebee using the instructions at http:https://www.webupd8.org/2016/08/how-to-install-and-configure-bumblebee.html under Mint 17.3 (32 bit) and 18.1 (64 bit) (I have a dual boot system) and it all seems to still work fine under both.
+
 ## Features
 
 The Right Click (Context menu) gives the ability to easily run the nVidia Settings program without use of the terminal and also the System Monitor and Power Statistics, all useful for monitoring Bumblebee and Power consumption which is paramount when using a laptop on batteries.
 
-The standard Left Click menu provides a configurable list of programs which one can run using the discrete nVidia graphics through Bumblebee - this otherwise requires them to be called through optirun in a terminal or via a modified launcher. This list is configured using the standard applet configuration mechanism. Currently there are two examples - glxspheres64 is a very good test of the speed of the graphics but may need to be installed. The other example is the nVidia Settings program which is also on the right click menu so it can be overwritten. There are 5 'slots' currently and if you do not require a slot set the Display Name to null or leave it completely empty. One can also configure the update rate of the applet in settings.
-
-The current version has improved error checking to ensure bumblebee is loaded and does not fill the error logs with messages when that is the case. It displays a message of ERROR if bumblebee if bumblebee is not loaded and a message when you hover.To Follow
+The standard Left Click menu provides a configurable list of programs which one can run using the discrete nVidia graphics through Bumblebee - this otherwise requires them to be called through optirun in a terminal or via a modified launcher. This list is configured using the standard applet configuration mechanism. Currently there are two examples - glxspheres64 is a very good test of the speed of the graphics but may need to be installed. The other example is the nVidia Settings program. There are 5 'slots' currently and if you do not require a slot set the Display Name to null or leave it completely empty. One can also configure the update rate of the applet in settings.
 
+The current version has improved error checking to ensure bumblebee is loaded and does not fill the error logs with messages when that is the case. It displays a message of ERROR if bumblebee is not loaded and a message when you hover. The check is actually for bbswitch which is also loaded by Nvidia Prime so this check may need to be updated.
 
 ## Requirements
 
 The applet requires at least Cinnamon 1.8 and 2.0 is desirable to access the configuration from within the applet. 
 
-The Bumblebee and the nVidia graphics packages obviously need to be installed but no other packages are needed. 
+The Bumblebee and the nVidia graphics packages obviously need to be installed but no other packages are essential.
 
 glxsheres64 only needs to be installed if you want to use the applet to test the relative performances of the Intel and nVidia graphics processors. glxsheres64 is part of the VirtualGL package which needs to be installed from http:https://sourceforge.net/projects/virtualgl/files/VirtualGL/ - download the latest version and install using gdebi (should be the default for a right click on the downloaded file). It should run about five times faster when the nVidia GPU is active and is a very good test as to how good your cooling is for both the CPU and nVidia GPU when it is active.
 
 ## Translations and other Contributions
 
-The internal changes required in the applet to allow translations have been implemented but no translations are available at this time. Translations are usually contributed by people fluent in the language and will be very much appreciated. Users please note I am unable to take responsibility for the accuracy of translations!
-
-I no longer run Bumblebee on a regular basis and would greatly appreciate input from a regular user of Bumblebee and this applet.
+The internal changes required in the applet to allow translations have been implemented and Chinese and Croatian translations are already available. Translations are contributed by people fluent in the language and are very much appreciated but users please note I am unable to take responsibility for the accuracy of translations!
 
 Although comments and suggestions are always welcome any contributions which are contemplated should follow discussion. 
 
 ## Manual Installation:
- 
+
  * Make sure Bumblebee is installed and working.
  * Download from the Spices Web Site
  * Unzip and extract folder ```bumblebee@pdcurtis``` to ```~/.local/share/cinnamon/applets/```

bumblebee@pdcurtis/files/bumblebee@pdcurtis/README.md

@@ -1,44 +1,43 @@
-# Bumblebee And NVidia Display Applet (BAND) 
+# Bumblebee And NVidia Display applet (BAND)
 
 ## Summary
 
 The Bumblebee And NVidia Display (Band) Applet is a relatively simple applet I wrote for my Chillblast Defiant laptop which has an Core i7 Haswell architecture and Optimus technology to switch between the integrated Intel 4600 graphics and discrete nVidia GTX 765M graphics. The switching is done by use of Bumblebee. This Applet allows one to monitor whether the power consuming discrete graphics is on and display the GPU temperature, but only when it is enabled. Monitoring the temperature requires the graphics processor to be turned on every time it is measured - some applets do this all the time and that uses a significant extra amount of power.
 
 ## Rationale
 
-It is useful to have continuous indication of whether the Discrete Graphics Processor Unit is in use and its temperature which is a concern on some laptops. The latest versions of Cinnamon provide more support so the option of running programs is now less important. 
+It is useful to have continuous indication of whether the Discrete Graphics Processor Unit is in use and its temperature which is a concern on some laptops.
 
-## Warning
+The latest versions of Cinnamon provide more support to Bumblebee but the option of running programs from the applet is still important if you want to use primus instead of optirun or use additional parameters to optimise the transport mechanism used by VirtualGL to copy the image generated by the nVidia GPU to your display which can offer significant improvements in speed. I wrote about this at http:https://www.pcurtis.com/defiant.htm#bumblebee_options
 
-I no longer run Bumbleebee on a regular basis so it is possible for errors to have crept in without my knowing during the recent changes to how applets are handled. Please report any errors by creating an Issue in the cinnamon-spices-applets Github repository at https://github.com/linuxmint/cinnamon-spices-applets and I will try to fix or revert to an earlier known working version within a few days. Also see requirements below.
+## Status
 
+I have just reloaded Bumblebee using the instructions at http:https://www.webupd8.org/2016/08/how-to-install-and-configure-bumblebee.html under Mint 17.3 (32 bit) and 18.1 (64 bit) (I have a dual boot system) and it all seems to still work fine under both.
+
 ## Features
 
 The Right Click (Context menu) gives the ability to easily run the nVidia Settings program without use of the terminal and also the System Monitor and Power Statistics, all useful for monitoring Bumblebee and Power consumption which is paramount when using a laptop on batteries.
 
-The standard Left Click menu provides a configurable list of programs which one can run using the discrete nVidia graphics through Bumblebee - this otherwise requires them to be called through optirun in a terminal or via a modified launcher. This list is configured using the standard applet configuration mechanism. Currently there are two examples - glxspheres64 is a very good test of the speed of the graphics but may need to be installed. The other example is the nVidia Settings program which is also on the right click menu so it can be overwritten. There are 5 'slots' currently and if you do not require a slot set the Display Name to null or leave it completely empty. One can also configure the update rate of the applet in settings.
-
-The current version has improved error checking to ensure bumblebee is loaded and does not fill the error logs with messages when that is the case. It displays a message of ERROR if bumblebee if bumblebee is not loaded and a message when you hover.To Follow
+The standard Left Click menu provides a configurable list of programs which one can run using the discrete nVidia graphics through Bumblebee - this otherwise requires them to be called through optirun in a terminal or via a modified launcher. This list is configured using the standard applet configuration mechanism. Currently there are two examples - glxspheres64 is a very good test of the speed of the graphics but may need to be installed. The other example is the nVidia Settings program. There are 5 'slots' currently and if you do not require a slot set the Display Name to null or leave it completely empty. One can also configure the update rate of the applet in settings.
 
+The current version has improved error checking to ensure bumblebee is loaded and does not fill the error logs with messages when that is the case. It displays a message of ERROR if bumblebee is not loaded and a message when you hover. The check is actually for bbswitch which is also loaded by Nvidia Prime so this check may need to be updated.
 
 ## Requirements
 
 The applet requires at least Cinnamon 1.8 and 2.0 is desirable to access the configuration from within the applet. 
 
-The Bumblebee and the nVidia graphics packages obviously need to be installed but no other packages are needed. 
+The Bumblebee and the nVidia graphics packages obviously need to be installed but no other packages are essential.
 
 glxsheres64 only needs to be installed if you want to use the applet to test the relative performances of the Intel and nVidia graphics processors. glxsheres64 is part of the VirtualGL package which needs to be installed from http:https://sourceforge.net/projects/virtualgl/files/VirtualGL/ - download the latest version and install using gdebi (should be the default for a right click on the downloaded file). It should run about five times faster when the nVidia GPU is active and is a very good test as to how good your cooling is for both the CPU and nVidia GPU when it is active.
 
 ## Translations and other Contributions
 
-The internal changes required in the applet to allow translations have been implemented but no translations are available at this time. Translations are usually contributed by people fluent in the language and will be very much appreciated. Users please note I am unable to take responsibility for the accuracy of translations!
-
-I no longer run Bumblebee on a regular basis and would appreciate input from a regular user of Bumblebee and this applet.
+The internal changes required in the applet to allow translations have been implemented and Chinese and Croatian translations are already available. Translations are contributed by people fluent in the language and are very much appreciated but users please note I am unable to take responsibility for the accuracy of translations!
 
 Although comments and suggestions are always welcome any contributions which are contemplated should follow discussion. 
 
 ## Manual Installation:
- 
+
  * Make sure Bumblebee is installed and working.
  * Download from the Spices Web Site
  * Unzip and extract folder ```bumblebee@pdcurtis``` to ```~/.local/share/cinnamon/applets/```

bumblebee@pdcurtis/files/bumblebee@pdcurtis/applet.js

@@ -139,7 +139,7 @@ MyApplet.prototype = {
  // Finally setup to start the update loop for the applet display running
  this.set_applet_label(" " ); // show nothing until system stable
  this.set_applet_tooltip(_("Waiting for Bumblebee"));
- Mainloop.timeout_add_seconds(20, Lang.bind(this, this.updateLoop)); // Timer to allow bumbleebee to initiate
+ Mainloop.timeout_add_seconds(10, Lang.bind(this, this.updateLoop)); // Timer to allow bumbleebee to initiate
 
  } catch (e) {
  global.logError(e);
@@ -350,7 +350,7 @@ function main(metadata, orientation, panelHeight, instance_id) {
  return myApplet;
 }
 /*
-Version v30_3.1.1
+Version 3.1.2
 v20_0.9.0 Beta 12-12-2013
 v20_0.9.1 Added System Monitor and Power Statistics to right click menu
 v20_0.9.2 Added Left Click Menu with 5 Program Launch Items with configuration in Settings - Release Candidate 14-12-2013 
@@ -378,5 +378,9 @@ v30_3.1.0 Changed help file from help.txt to README.md
  Add po folder to applet
  Create bumblebee.pot using cinnamon-json-makepot --js po/bumblebee.pot
  Version and changes information update in applet.js and changelog.txt
- NOTE: Only partially tested as I no longer run Bumblebee
+ 3.1.2 Changes to README.md to: 
+ - Strengthen Rationale for Applet
+ - Add Status section noting testing under Mint 17.3 and 18.1 with Cinnamon 3.2
+ - Acknowledge first translations.
+ Set up default programs on left click menu
 */

bumblebee@pdcurtis/files/bumblebee@pdcurtis/changelog.txt

@@ -1,4 +1,4 @@
-Version v30_3.1.1
+Version 3.1.2
 v20_0.9.0 Beta 12-12-2013
 v20_0.9.1 Added System Monitor and Power Statistics to right click menu
 v20_0.9.2 Added Left Click Menu with 5 Program Launch Items with configuration in Settings - Release Candidate 14-12-2013 
@@ -26,4 +26,8 @@ v30_3.1.0 Changed help file from help.txt to README.md
  Add po folder to applet
  Create bumblebee.pot using cinnamon-json-makepot --js po/bumblebee.pot
  Version and changes information update in applet.js and changelog.txt
- NOTE: Only partially tested as I no longer run Bumblebee
+ 3.1.2 Changes to README.md to: 
+ Strengthen Rationale for Applet
+ Add Status section noting testing under Mint 17.3 and 18.1 with Cinnamon 3.2
+ Acknowledge first translations.
+ Set up default programs on left click menu

bumblebee@pdcurtis/files/bumblebee@pdcurtis/metadata.json

@@ -1,7 +1,7 @@
 {
  "uuid": "bumblebee@pdcurtis", 
  "max-instances": "1", 
- "name": "Bumblebee and nVidia Display", 
- "version": "3.1.1", 
+ "name": "Bumblebee And NVidia Display (BAND)", 
+ "version": "3.1.2", 
  "description": "Displays Status of Bumblebee and nVidia GPU Temperature"
 }

bumblebee@pdcurtis/files/bumblebee@pdcurtis/settings-schema.json

@@ -20,26 +20,26 @@
 
  "description1": {
  "type": "entry",
- "default": "null",
+ "default": "nVidia Settings Program",
  "description": "Display Name of Program 1 to be run using Optimus technology",
  "tooltip": "Put the name of the program here or null if you do not want it displayed"
  },
  "commandString1": {
  "type": "entry",
- "default": "null",
+ "default": "optirun -b none nvidia-settings -c :8",
  "description": "Command String for Program 1",
  "tooltip": "Put the command string to run the program here starting with optirun or primusrun"
  },
 
  "description2": {
  "type": "entry",
- "default": "null",
+ "default": "Run glxspheres64 GPU test program",
  "description": "Display Name of Program 2 to be run using Optimus technology",
  "tooltip": "Put the name of the program here or none if you do not want it displayed"
  },
  "commandString2": {
  "type": "entry",
- "default": "",
+ "default": "optirun /opt/VirtualGL/bin/glxspheres64",
  "description": "Command String for Program 2",
  "tooltip": "Put the command string to run the program here starting with optirun or primusrun"
  },