summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-03-20 13:26:51 +0100
committerAndras Timar <atimar@suse.com>2012-03-20 13:26:51 +0100
commit0778689797eda887dd2f73fbcbed6b478633e734 (patch)
tree6e77769924469ff0d221bd05beef38d269b7766c /solenv/bin
parent638f45f5a6ed26880fd8a53521b1f1be63ed0d0f (diff)
remove unused Language selection dialog from MSI
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/make_installer.pl14
-rw-r--r--solenv/bin/modules/installer/windows/idtglobal.pm72
2 files changed, 0 insertions, 86 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1d1b7a78eba6..73d6b1e0fd05 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 baa4e77ac308..176e8352e7f1 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.