commit/resourceMonitor: 2 new changesets

From: commits-noreply@xxxxxxxxxxxxx
To: nvda-addons-commits@xxxxxxxxxxxxx
Date: Sun, 18 Aug 2013 16:14:16 -0000
2 new commits in resourceMonitor:

https://bitbucket.org/nvdaaddonteam/resourcemonitor/commits/ffe868a9b55b/
Changeset:   ffe868a9b55b
Branch:      None
User:        josephsl
Date:        2013-08-18 17:36:28
Summary:     Bump to 3.0-dev.

Affected #:  1 file

diff --git a/buildVars.py b/buildVars.py
index d6df2a3..7080ffc 100644
--- a/buildVars.py
+++ b/buildVars.py
@@ -10,12 +10,12 @@ addon_info = {
        "addon-name" : "resourceMonitor",
        # Add-on description
        # TRANSLATORS: Summary for this add-on to be shown on installation and 
add-on information.
-       "addon-summary" : _("Resource Monitor - allows easy access to system 
information."),
+       "addon-summary" : _("Resource Monitor - allows easy access to system 
information"),
        # Add-on description
        # Translators: Long description to be shown for this add-on on 
installation and add-on information
-       "addon-description" : _("A handy resource monitor to report CPU load, 
memory usage, battery and disk usage status."),
+       "addon-description" : _("A handy resource monitor to report CPU load, 
memory usage, battery, disk usage status and more."),
        # version
-       "addon-version" : "2.5-dev",
+       "addon-version" : "3.0-dev",
        # Author(s)
        "addon-author" : "Alex Hall <mehgcap@xxxxxxxxx>, Joseph Lee 
<joseph.lee22590@xxxxxxxxx>, beqa gozalishvili <beqaprogger@xxxxxxxxx> and 
other NVDA contributors",
        # URL for the add-on documentation support


https://bitbucket.org/nvdaaddonteam/resourcemonitor/commits/f3669cd8c1c9/
Changeset:   f3669cd8c1c9
Branch:      winVersions
User:        josephsl
Date:        2013-08-18 18:13:58
Summary:     3.0-dev - allows users to find out currently installed Windows 
version.

Affected #:  2 files

diff --git a/addon/globalPlugins/resourceMonitor/__init__.py 
b/addon/globalPlugins/resourceMonitor/__init__.py
index bf03380..09c3828 100644
--- a/addon/globalPlugins/resourceMonitor/__init__.py
+++ b/addon/globalPlugins/resourceMonitor/__init__.py
@@ -100,6 +100,20 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
        # Translators: Input help mode message about memory info command in 
Resource Monitor.
        script_announceRamInfo.__doc__=_("Presents the used and total space for 
both physical and virtual ram.")
 
+       def script_announceWinVer(self, gesture):
+               # Obtain winversion.
+               winMajor, winMinor, sp, server = sys.getwindowsversion().major, 
sys.getwindowsversion().minor, sys.getwindowsversion().service_pack, 
sys.getwindowsversion().product_type
+               info = "Windows version: "
+               if winMajor == 5: # XP (5.1) or Server 2003 (5.2).
+                       if winMinor == 1: info+= "Windows XP" # Since most XP 
systems use 32-bit editions.
+                       elif winMinor == 2: info+= "Windows Server 2003"
+               elif winMajor == 6: # Vista/Server 2008 (6.0), 7/2008 R2 (6.1), 
8/2012 (6.2), 8.1/2012 R2 (6.3).
+                       if winMinor == 0: info+= "Windows Vista" if server == 1 
else "Windows Server 2008" # Vista.
+                       elif winMinor == 1: info+= "Windows 7" if server == 1 
else "Windows Server 2008 R2" # Windows 7
+                       elif winMinor == 2: info+= "Windows 8" if server == 1 
else "Windows Server 2012" # Windows 8.
+               ui.message(info)
+       script_announceWinVer.__doc__="Announces the version of Windows you are 
using."
+
        def script_announceResourceSummary(self, gesture):
                cpuLoad=psutil.cpu_percent()
                ram=psutil.phymem_usage()
@@ -128,4 +142,5 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
                "KB:NVDA+shift+3":"announceDriveInfo",
                "KB:NVDA+shift+4":"announceBatteryInfo",
                "KB:NVDA+shift+5":"announceRamInfo",
+               "KB:NVDA+shift+6":"announceWinVer",
        }

diff --git a/readme.md b/readme.md
index 370532f..160477c 100644
--- a/readme.md
+++ b/readme.md
@@ -12,11 +12,12 @@ This plugin gives information about CPU load, memory usage, 
battery and disk usa
 * NVDA+Shift+2/5 Presents the used and total space for both physical and 
virtual ram,
 * NVDA+Shift+3 Presents the used and total space of the static and removable 
drives on this computer,
 * NVDA+Shift+4 Presents battery percentage, charging status, remaining time 
(if not charging), and a warning if the battery is low or critical,
+* NVDA+Shift+6 Presents currently installed Windows version.
 
 ## Changes for 3.0 ##
 
 * Updated psutil dependency to 1.0.1.
-
+* Announcement of current Windows version (NVDA+Shift+6).
 
 ## Changes for 2.4 ##

Repository URL: https://bitbucket.org/nvdaaddonteam/resourcemonitor/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
commit/resourceMonitor: 2 new changesets

Other related posts:
