allow to specify font size in output of l2pango_font

destroy and recreate steps window when charset changed because gtk won't update the font size otherwise

3 files changed, 15 insertions, 21 deletions

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index d6762ed41..b4176c975 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -69,7 +69,7 @@ sub load_font {
     Gtk2::Rc->parse_string(q(
 style "default-font" 
 {
-   font_name = ") . lang::l2pango_font($o->{locale}{lang}) . q( 12"
+   font_name = ") . lang::l2pango_font($o->{locale}{lang}) . q("
 }
 widget "*" style "default-font"
 
@@ -118,6 +118,7 @@ sub create_steps_window {
 
     return if $::stepswidth == 0;
 
+    $o->{steps_window} and $o->{steps_window}->destroy;
     my $w = bless {}, 'ugtk2';
     $w->{rwindow} = $w->{window} = Gtk2::Window->new('toplevel');
     $w->{rwindow}->set_uposition(8, 160);
@@ -132,7 +133,7 @@ sub create_steps_window {
 	$_ eq 'setRootPassword'
 	  and gtkpack__($vb, '', '', $steps{conf} = Gtk2::Label->new(N("System configuration")), '');
 	$steps{steps}{$_} = { img => gtkcreate_img('steps_off.png'),
-			      txt => Gtk2::Label->new($o->{steps}{$_}{text}) };
+			      txt => Gtk2::Label->new(translate($o->{steps}{$_}{text})) };
 	gtkpack__($vb, gtkpack__(Gtk2::HBox->new(0, 7), $steps{steps}{$_}{img}, $steps{steps}{$_}{txt}));
 					      
     }
@@ -157,14 +158,6 @@ sub update_steps_position {
     }
 }
 
-sub update_steps_labels {
-    my ($o) = @_;
-    return if !$steps{steps};
-    $steps{inst}->set_label(N("System installation"));
-    $steps{conf}->set_label(N("System configuration"));
-    $steps{steps}{$_}{txt}->set_label(translate($o->{steps}{$_}{text})) foreach keys %{$steps{steps}};
-}
-
 #------------------------------------------------------------------------------
 sub create_logo_window {
     my ($o) = @_;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index aed4a50ca..1131332e0 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -151,7 +151,7 @@ sub charsetChanged {
     my ($o) = @_;
     Gtk2->set_locale;
     install_gtk::load_font($o);
-    install_gtk::update_steps_labels($o);
+    install_gtk::create_steps_window($o);
 }
 
 #-######################################################################################
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index b03de9c1e..d642106f5 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -643,19 +643,20 @@ sub charset2kde_font {
 # on the "charset" defined by language array. This allows to selecting
 # an appropriate font for each language.
 my %charset2pango_font = (
-  'tis620' =>      "Norasi",
-  'utf_ar' =>      "KacstBook",
-  'utf_cyr2' =>    "URW Bookman L",
-  'utf_he' =>      "ClearlyU",
-  'utf_hy' =>      "Artsounk",
-  'utf_ka' =>      "ClearlyU",
-  'utf_ta' =>      "TSCu_Paranar",
-  'utf_vi' =>      "ClearlyU",
-  'iso-8859-7' =>  "Kerkis",
+  'tis620' =>      "Norasi 14",
+  'utf_ar' =>      "KacstBook 14",
+  'utf_cyr2' =>    "URW Bookman L 14",
+  'utf_he' =>      "ClearlyU 12",
+  'utf_hy' =>      "Artsounk 14",
+  'utf_ka' =>      "ClearlyU 14",
+  'utf_ta' =>      "TSCu_Paranar 14",
+  'utf_vi' =>      "ClearlyU 14",
+  'iso-8859-7' =>  "Kerkis 14",
+  'jisx0208' =>    "Sans 18",
   #- Nimbus Sans L is missing some chars used by some cyrillic languages,
   #- but tose haven't yet DrakX translations; it also misses vietnamese
   #- latin chars; all other latin and cyrillic are covered.
-  'default' =>     "Nimbus Sans L"
+  'default' =>     "Nimbus Sans L 12"
 );
 
 sub charset2pango_font {