[Jcl-checkins-diff] SF.net SVN: jcl:[2616] trunk

[<cyc...@us...>]

Revision: 2616
          http://jcl.svn.sourceforge.net/jcl/?rev=2616&view=rev
Author:   cycocrew
Date:     2009-02-03 17:46:50 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Updated Windows 7 Editions

Modified Paths:
--------------
    trunk/help/SysInfo.dtx
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/common/JclSysInfo.pas

Modified: trunk/help/SysInfo.dtx
===================================================================
--- trunk/help/SysInfo.dtx	2009-02-01 13:48:46 UTC (rev 2615)
+++ trunk/help/SysInfo.dtx	2009-02-03 17:46:50 UTC (rev 2616)
@@ -594,12 +594,12 @@
   Windows Vista Ultimate
 @@TWindowsEdition.weWin7Starter
   Windows 7 Starter
-@@TWindowsEdition.weWin7HomeBasic
-  Windows 7 Home Basic
 @@TWindowsEdition.weWin7HomePremium
   Windows 7 Home Premium
-@@TWindowsEdition.weWin7Business
-  Windows 7 Business
+@@TWindowsEdition.weWin7Professional
+  Windows 7 Professional
+@@TWindowsEdition.weWin7Enterprise
+  Windows 7 Enterprise
 @@TWindowsEdition.weWin7Ultimate
   Windows 7 Ultimate
 --------------------------------------------------------------------------------

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2009-02-01 13:48:46 UTC (rev 2615)
+++ trunk/jcl/source/common/JclResources.pas	2009-02-03 17:46:50 UTC (rev 2616)
@@ -1942,9 +1942,9 @@
   RsEditionWinVistaEnterprise   = 'Enterprise';
   RsEditionWinVistaUltimate     = 'Ultimate';
   RsEditionWin7Starter          = 'Starter';
-  RsEditionWin7HomeBasic        = 'Home Basic';
   RsEditionWin7HomePremium      = 'Home Premium';
-  RsEditionWin7Business         = 'Business';
+  RsEditionWin7Professional     = 'Professional';
+  RsEditionWin7Enterprise       = 'Enterprise';
   RsEditionWin7Ultimate         = 'Ultimate';
 
   RsProductTypeWorkStation      = 'Workstation';

Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas	2009-02-01 13:48:46 UTC (rev 2615)
+++ trunk/jcl/source/common/JclSysInfo.pas	2009-02-03 17:46:50 UTC (rev 2616)
@@ -280,8 +280,8 @@
     weWinXPProK, weWinXPHomeKN, weWinXPProKN, weWinXPStarter, weWinXPMediaCenter,
     weWinXPTablet, weWinVistaStarter, weWinVistaHomeBasic, weWinVistaHomeBasicN,
     weWinVistaHomePremium, weWinVistaBusiness, weWinVistaBusinessN,
-    weWinVistaEnterprise, weWinVistaUltimate, weWin7Starter, weWin7HomeBasic,
-    weWin7HomePremium, weWin7Business, weWin7Ultimate);
+    weWinVistaEnterprise, weWinVistaUltimate, weWin7Starter, weWin7HomePremium,
+    weWin7Professional, weWin7Enterprise, weWin7Ultimate);
   TNtProductType =
    (ptUnknown, ptWorkStation, ptServer, ptAdvancedServer,
     ptPersonal, ptProfessional, ptDatacenterServer, ptEnterprise, ptWebEdition);
@@ -3385,15 +3385,15 @@
    if (pos('Starter', Edition) > 0) then
       Result := weWin7Starter
    else
-   if (pos('Home Basic', Edition) > 0) then
-      Result := weWin7HomeBasic
-   else
    if (pos('Home Premium', Edition) > 0) then
       Result := weWin7HomePremium
    else
-   if (pos('Business', Edition) > 0) then
-      Result := weWin7Business
+   if (pos('Professional', Edition) > 0) then
+      Result := weWin7Professional
    else
+   if (pos('Enterprise', Edition) > 0) then
+      Result := weWin7Enterprise
+   else
    if (pos('Ultimate', Edition) > 0) then
       Result := weWin7Ultimate;
   end;
@@ -3598,12 +3598,12 @@
       Result := RsEditionWinVistaUltimate;
     weWin7Starter:
       Result := RsEditionWin7Starter;
-    weWin7HomeBasic:
-      Result := RsEditionWin7HomeBasic;
     weWin7HomePremium:
       Result := RsEditionWin7HomePremium;
-    weWin7Business:
-      Result := RsEditionWin7Business;
+    weWin7Professional:
+      Result := RsEditionWin7Professional;
+    weWin7Enterprise:
+      Result := RsEditionWin7Enterprise;
     weWin7Ultimate:
       Result := RsEditionWin7Ultimate;
   else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.