instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 17 --
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 10 -
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 3
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt | 1
solenv/bin/make_installer.pl | 14 -
solenv/bin/modules/installer/windows/idtglobal.pm | 72
----------
6 files changed, 117 deletions(-)
New commits:
commit 0778689797eda887dd2f73fbcbed6b478633e734
Author: Andras Timar <ati...@suse.com>
Date: Tue Mar 20 13:26:51 2012 +0100
remove unused Language selection dialog from MSI
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index a7cc609..8d351fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -646,12 +646,6 @@ en-US = "Cancel"
[OOO_CONTROL_266]
en-US = "&Next >"
-[OOO_CONTROL_267]
-en-US = "Please select the product language for [ProductName]."
-
-[OOO_CONTROL_268]
-en-US = "{&MSSansBold8}Language Selection"
-
[OOO_CONTROL_269]
en-US = "Repair or remove the program."
@@ -723,14 +717,3 @@ en-US = "Create a start link on desktop"
[OOO_CONTROL_320]
en-US = "Remove all older product versions"
-
-[OOO_CONTROL_LANG_1033]
-en-US = "English"
-
-[OOO_CONTROL_LANG_1031]
-en-US = "German"
-
-[OOO_CONTROL_LANG_1034]
-en-US = "Spanish"
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index bd48e9a..a3a8347 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -192,16 +192,6 @@ InstallWelcome TextLine2 Text 135 55
228 45 65539 OOO_CONTROL_127
LanguageInfo1 Icon Icon 15 15 24 24 5242881
CautionIco
LanguageInfo1 OK PushButton 100 57 66 17 3
OOO_CONTROL_10
LanguageInfo1 Text Text 48 15 194 30 3
OOO_CONTROL_317
-LanguageSelection Back PushButton 164 243 66 17
3 OOO_CONTROL_122 CheckBox1
-LanguageSelection Banner Bitmap 297 0 77 44 1
BannerBmp
-LanguageSelection BannerLine Line 0 44 374 0
1
-LanguageSelection Branding1 Text 4 229 88 13
3 {&MSSWhiteSerif8}[ProductName]
-LanguageSelection Branding2 Text 3 228 88 13
65537 [ProductName]
-LanguageSelection Cancel PushButton 301 243 66 17
3 OOO_CONTROL_131 Back
-LanguageSelection DlgDesc Text 21 23 292 25 65539
OOO_CONTROL_267
-LanguageSelection DlgLine Line 90 234 284 0 1
-LanguageSelection DlgTitle Text 13 6 292 25
65539 OOO_CONTROL_268
-LanguageSelection Next PushButton 230 243 66 17
3 OOO_CONTROL_134 Cancel
LicenseAgreement Agree RadioButtonGroup 8 190 330
40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17
3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 297 0 77 44 1
BannerBmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 56bf6b9..fb788fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -71,9 +71,6 @@ InstallWelcome Cancel SpawnDialog CancelSetup
1 0
InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0
InstallWelcome Next NewDialog CustomerInformation HIDEEULA = 1 0
LanguageInfo1 OK EndDialog Return 1 0
-LanguageSelection Back NewDialog CustomerInformation 1
1
-LanguageSelection Cancel SpawnDialog CancelSetup 1 1
-LanguageSelection Next NewDialog SetupType 1 1
LicenseAgreement Back NewDialog InstallWelcome 1 0
LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
LicenseAgreement Next NewDialog CustomerInformation
AgreeToLicense = "Yes" 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index 48f5d2a..d202b7c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -17,7 +17,6 @@ FileTypeDialog 50 50 374 266 3
[ProductName] - [STR_INSTALLATION_WIZARD] CheckBo
InstallChangeFolder 50 50 374 266 3 [ProductName] -
[STR_INSTALLATION_WIZARD] TailText OK Cancel
InstallWelcome 50 50 374 266 3 [ProductName] -
[STR_INSTALLATION_WIZARD] Next Next Cancel
LanguageInfo1 50 50 260 85 3 [ProductName] -
[STR_INSTALLATION_WIZARD] OK OK OK
-LanguageSelection 50 50 374 266 3 [ProductName] -
[STR_INSTALLATION_WIZARD] Next Next Cancel
LicenseAgreement 50 50 374 266 2 [ProductName] -
[STR_INSTALLATION_WIZARD] Agree Next Cancel
MaintenanceType 50 50 374 266 3 [ProductName] -
[STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
MaintenanceWelcome 50 50 374 266 3 [ProductName] -
[STR_INSTALLATION_WIZARD] Next Next Cancel
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1d1b7a7..73d6b1e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1714,20 +1714,6 @@ for ( my $n = 0; $n <=
$#installer::globals::languageproducts; $n++ )
installer::windows::idtglobal::prepare_language_idt_directory($languageidtdir,
$newidtdir, $onelanguage, $filesinproductlanguageresolvedarrayref,
\@iconfilecollector, $binarytablefiles, $allvariableshashref);
- if ( ! $installer::globals::languagepack && !
$installer::globals::helppack )
- {
- # For multilingual installation sets, the dialog for the
language selection can now be prepared, with
- # a checkbox for each available language. This has to happen
before the following translation.
- # The new controls have to be added into the Control.idt
-
- my $controlidttablename = $languageidtdir .
$installer::globals::separator . "Control.idt";
- my $controlidttable =
installer::files::read_file($controlidttablename);
-
installer::windows::idtglobal::add_language_checkboxes_to_database($controlidttable,
$languagesarrayref);
- installer::files::save_file($controlidttablename,
$controlidttable);
- $infoline = "Added checkboxes for language selection dialog
into table $controlidttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
# Now all files are copied into a language specific directory
# The template idt files can be translated
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index baa4e77..176e835 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1106,78 +1106,6 @@ sub add_licensefile_to_database
}
}
-################################################################################################
-# Including the checkboxes for the language selection dialog
-# into the table control.idt . This is only relevant for
-# multilingual installation sets.
-#
-# old:
-# LanguageSelection CheckBox1 CheckBox 22 60 15 24 3 IS1033
CheckBox2
-# LanguageSelection Text1 Text 40 60 70 15 65539
OOO_CONTROL_LANG_1033
-# LanguageSelection CheckBox2 CheckBox 22 90 15 24 3 IS1031
Next
-# LanguageSelection Text2 Text 40 90 70 15 65539
OOO_CONTROL_LANG_1031
-# new:
-# LanguageSelection CheckBox1 CheckBox 22 60 15 24 3 IS1033 Text
CheckBox2
-# LanguageSelection CheckBox2 CheckBox 22 90 15 24 3 IS1031 Text
Next
-################################################################################################
-
-sub add_language_checkboxes_to_database
-{
- my ($controltable, $languagesarrayref) = @_;
-
- # for each language, two lines have to be inserted
-
- for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
- {
- my $last = 0;
- if ( $i == $#{$languagesarrayref} ) { $last = 1; } # special
handling for the last
-
- my $onelanguage = ${$languagesarrayref}[$i];
- my $windowslanguage =
installer::windows::language::get_windows_language($onelanguage);
-
- my $checkboxattribute = "3";
-
- my $count = $i + 1;
- my $nextcount = $i + 2;
- my $checkboxcount = "CheckBox" . $count;
-
- my $multiplier = 20;
- my $offset = 60;
- if ( $#{$languagesarrayref} > 7 )
- {
- $multiplier = 15; # smaller differences for more than 7 languages
- $offset = 50; # smaller offset for more than 7 languages
- }
-
- my $yvalue = $offset + $i * $multiplier;
-
- my $property = "IS" . $windowslanguage;
-
- my $controlnext = "";
- if ( $last ) { $controlnext = "Next"; }
- else { $controlnext = "CheckBox" . $nextcount; }
-
- my $stringname = "OOO_CONTROL_LANG_" . $windowslanguage;
-
- my $line1 = "LanguageSelection" . "\t" . $checkboxcount . "\t" .
"CheckBox" . "\t" .
- "22" . "\t" . $yvalue . "\t" . "200" . "\t" . "15" . "\t"
. $checkboxattribute . "\t" .
- $property . "\t" . $stringname . "\t" . $controlnext .
"\t" . "\n";
-
- push(@{$controltable}, $line1);
-
- # my $textcount = "Text" . $count;
- # my $stringname = "OOO_CONTROL_LANG_" . $windowslanguage;
- #
- # $yvalue = $yvalue + 2; # text 2 pixel lower than checkbox
- #
- # my $line2 = "LanguageSelection" . "\t" . $textcount . "\t" . "Text" .
"\t" .
- # "40" . "\t" . $yvalue . "\t" . "70" . "\t" . "15" . "\t" .
"65539" . "\t" .
- # "\t" . $stringname . "\t" . "\t" . "\n";
- #
- # push(@{$controltable}, $line2);
- }
-}
-
###################################################################
# Determining the last position in a sequencetable
# into the tables CustomAc.idt and InstallE.idt.
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
