[Libreoffice-commits] .: instsetoo_native/inc_openoffice scp2/source

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |    3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt |    1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |    5 -
 scp2/source/ooo/registryitem_ooo.scp                               |   38 ++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e
Author: Andras Timar <atimar at suse.com>
Date:   Tue May 8 10:10:37 2012 +0200

    fdo#39833 add "Support assistive technology tools" option to Windows installer
    
    Change-Id: I52d2e0426d7f2822a05a74a82ca079fb80a87007

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index cfa9084..c795ec3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -657,3 +657,6 @@ en-US = "No applications have been selected for installation. Click OK, then sel
 
 [OOO_CONTROL_319]
 en-US  = "Create a start link on desktop"
+
+[OOO_CONTROL_320]
+en-US  = "Support assistive technology tools"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index 2705fc3..20d80fb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -2,3 +2,4 @@ Property	Value
 s72	S64
 CheckBox	Property
 CREATEDESKTOPLINK	1
+ENABLEATTOOLS	1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7fb391d..80d431e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -222,7 +222,7 @@ ReadyToInstall	Banner	Bitmap	0	0	374	44	1		BannerBmp
 ReadyToInstall	BannerLine	Line	0	44	374	0	1				
 ReadyToInstall	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
 ReadyToInstall	Branding2	Text	3	228	88	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
+ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	DesktopLink	
 ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
 ReadyToInstall	DlgLine	Line	90	234	284	0	1				
 ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
@@ -231,7 +231,8 @@ ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170
 ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
 ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
 ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToInstall	DesktopLink	CheckBox	21	100	300	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319		
+ReadyToInstall	DesktopLink	CheckBox	21	100	300	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319	EnableATTools	
+ReadyToInstall	EnableATTools	CheckBox	21	125	300	10	3	ENABLEATTOOLS	OOO_CONTROL_320	Back	
 ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
 ReadyToRemove	Banner	Bitmap	0	0	374	44	1		BannerBmp		
 ReadyToRemove	BannerLine	Line	0	44	374	0	1				
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 803f979..32bb699 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -674,3 +674,41 @@ RegistryItem gid_Regitem_Software_RegisteredApplications
     Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities";
 	Styles = ();
 End
+
+Module gid_Module_Enable_AT_Tools_For_All_Users
+    ParentID = gid_Module_Root;
+    Name = "gid_Module_Enable_AT_Tools_For_All_Users";
+    Description = "gid_Module_Enable_AT_Tools_For_All_Users";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End 
+
+Module gid_Module_Enable_AT_Tools_For_Current_User
+    ParentID = gid_Module_Root;
+    Name = "gid_Module_Enable_AT_Tools_For_Current_User";
+    Description = "gid_Module_Enable_AT_Tools_For_Current_User";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End 
+
+RegistryItem gid_Regitem_Enable_AT_Tools_For_All_Users
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";
+	ModuleID = gid_Module_Enable_AT_Tools_For_All_Users;
+	Name = "SAL_ACCESSIBILITY_ENABLED";
+    Value = "1";
+	Styles = ();
+    ComponentCondition = "(ALLUSERS=1) AND (ENABLEATTOOLS=1)";
+End
+
+RegistryItem gid_Regitem_Enable_AT_Tools_For_Current_User
+	ParentID = PREDEFINED_HKEY_CURRENT_USER;
+	Subkey = "Environment";
+	ModuleID = gid_Module_Enable_AT_Tools_For_Current_User;
+	Name = "SAL_ACCESSIBILITY_ENABLED";
+    Value = "1";
+	Styles = ();
+    ComponentCondition = "(ALLUSERS<>1) AND (ENABLEATTOOLS=1)";
+End