summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xperl-install/standalone/drakfont17
1 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index f0c9f3f6a..86c472a2f 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -246,7 +246,6 @@ sub search_dir_font {
if (!(-e $fn )) { print "$_ :: no such file or directory \n" } else {
if ( -d $fn ) {
$dir = $fn;
-# fixme : faire test avant sur les repertoiers ne pas avoir plusieurs fosi le meme rep!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
foreach my $i (all($fn)) {
if (is_a_font($i)) {
push @font_list_tmp, "$i";
@@ -302,9 +301,10 @@ sub put_font_dir {
dir_created();
foreach my $i (@font_list) {
cp_af($i, $drakfont_dir . "/tmp/tmp");
- $interactive and progress($pbar1, 100/@font_list, _("Fonts copy"));
+# $interactive and progress($pbar1, 0.1/@font_list, _("Fonts copy"));
+# $pbar1->update( 20/@font_list );
}
- $interactive and progress($pbar1, 100/@font_list, _("done"));
+# $interactive and progress($pbar1, 100/@font_list, _("done"));
system ("cd $drakfont_dir/tmp/tmp && cp *.ttf ../../ttf");
system ("cd $drakfont_dir/ttf && $ttmkfdir > fonts.dir" );
my $restart_xfs = "$chkfontpath -a $drakfont_dir/ttf";
@@ -712,12 +712,12 @@ sub advanced_install {
}
sub import_status {
- my $adj = new Gtk::Adjustment( 0, 1, 100, 0, 0, 0 );
- my $adj1 = new Gtk::Adjustment( 0, 1, 100, 0, 0, 0 );
- my $adj2 = new Gtk::Adjustment( 0, 1, 100, 0, 0, 0 );
- my $adj3 = new Gtk::Adjustment( 0, 1, 100, 0, 0, 0 );
+ my $adj = new Gtk::Adjustment(0, 0, 100, 0, 0, 0);
+ my $adj1 = new Gtk::Adjustment(0, 0, 100, 0, 0, 0);
+ my $adj2 = new Gtk::Adjustment(0, 0, 100, 0, 0, 0);
+ my $adj3 = new Gtk::Adjustment(0, 0, 100, 0, 0, 0);
my $table;
- $pbar = new_with_adjustment Gtk::ProgressBar($adj);
+ $pbar = new_with_adjustment Gtk::ProgressBar($adj);
$pbar1 = new_with_adjustment Gtk::ProgressBar($adj1);
$pbar2 = new_with_adjustment Gtk::ProgressBar($adj2);
$pbar3 = new_with_adjustment Gtk::ProgressBar($adj3);
@@ -740,6 +740,7 @@ sub progress {
my ($bar, $incr, $label_text) = @_;
my $new_val;
my $adjt;
+# $pbar1->update( 20/@font_list );
$new_val = $pbar->get_value() + $incr;
$adjt = $bar->adjustment;
$bar->set_value($new_val);