summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakfont
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone/drakfont')
-rwxr-xr-xperl-install/standalone/drakfont169
1 files changed, 84 insertions, 85 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index cea0564d5..8222810a5 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -87,22 +87,22 @@ use lib qw(/usr/lib/libDrakX);
use standalone; #- warning, standalone must be loaded very first, for 'explanations'
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
use common;
use run_program;
require_root_capability();
-$ugtk2::wm_icon = "drakfont";
+$ugtk3::wm_icon = "drakfont";
# global variables needed by each functions
my $xlsfonts = 0;
my $windows = 0;
my $replace;
-my $so = 1;
-my $gs = 1;
-my $abi = 1;
+my $so = to_bool(-f '/usr/bin/ooffice');
+my $gs = to_bool(-f '/usr/bin/gs');
+my $abi = to_bool(-f '/usr/bin/abiword');
my $printer = 1;
my $mode = -1;
my @application;
@@ -154,8 +154,8 @@ my $ttf2pt1 = '/usr/sbin/ttf2pt1';
my $pfm2afm = '/usr/sbin/pfm2afm';
my $type1inst = '/usr/sbin/type1inst';
my $chkfontpath = '/usr/sbin/chkfontpath';
-# mkttfdir only knows about iso-8859-1, using ttmkfdir -u instead -- pablo
-my $ttmkfdir = '/usr/sbin/ttmkfdir';
+# mkttfdir only knows about iso-8859-1, using ttmkfdir instead -- pablo
+my $ttmkfdir = '/usr/bin/ttmkfdir';
my $fccache = '/usr/bin/fc-cache';
my @font_list; # list of fonts to install
@@ -176,7 +176,7 @@ sub list_fontpath() {
sub chk_empty_xfs_path() {
foreach my $tmp_path (@installed_fonts_path) {
if (every { /^fonts/ || /^type/ } all($tmp_path)) {
- system("$chkfontpath -r $tmp_path ")
+ system($chkfontpath, '-r', $tmp_path)
or print "PERL::system command failed during chkfontpath\n";
}
}
@@ -214,7 +214,7 @@ sub search_windows_font() {
return 0;
}
foreach my $font (@fonts) {
- progress($pbar, 0.25 / $nb_dir, N("parse all fonts"));
+ progress($pbar, 0.25 / $nb_dir, N("parse all fonts")) if $interactive;
my $font_name = basename($font);
!$replace && any { /^\Q$font_name\E$/ } @installed_fonts and next;
any { /^\Q$font_name\E$/ } @font_list or push @font_list, $font;
@@ -308,7 +308,8 @@ sub convert_ttf_fonts {
sub move_fonts {
my ($src_dir, $dest_dir, @extensions) = @_;
my @fonts = map { s!.*/!!; $_ } map { glob("$src_dir/*.$_") } @extensions;
- system("cd $src_dir && mv @fonts $dest_dir") if @fonts;
+ return if !@fonts;
+ system('mv', "$src_dir/$_", "$src_dir/$dest_dir") foreach @fonts;
}
sub my_rm_rf {
@@ -324,7 +325,7 @@ sub put_font_dir_real {
system("cd $drakfont_dir/$subdir && $fccache && $command");
interactive_progress($pbar2, $progress, $title);
symlinkf("$drakfont_dir/$subdir", "/etc/X11/fontpath.d/drakfont_$subdir");
- system("rm -f $font_dir/fonts.cache-1");
+ my_rm_rf("$font_dir/fonts.cache-1");
}
sub put_font_dir() {
@@ -332,7 +333,7 @@ sub put_font_dir() {
if (@font_list) {
dir_created();
foreach my $i (@font_list) {
- cp_af($i, $drakfont_dir . "/tmp/tmp");
+ cp_af($i, $drakfont_dir . "/tmp/tmp") if !$::testing;
interactive_progress($pbar1, 1 / @font_list, N("Fonts copy"));
}
interactive_progress($pbar1, 0.01, N("done"));
@@ -345,7 +346,7 @@ sub put_font_dir() {
}
system('cd ' . $temp_dir . ' && cp *.ttf ../../ttf; chmod 644 ../../ttf/*ttf') if glob("$temp_dir/*.ttf");
interactive_progress($pbar2, 0.20, N("please wait during ttmkfdir..."));
- put_font_dir_real("ttf", "$ttmkfdir -u > fonts.dir", 0.10, N("True Type install done"));
+ put_font_dir_real("ttf", "$ttmkfdir > fonts.dir", 0.10, N("True Type install done"));
if ($gs) {
convert_ttf_fonts([ glob("$drakfont_dir/tmp/tmp/*.ttf") ], 1);
@@ -373,13 +374,13 @@ sub put_font_dir() {
my $dir = "$drakfont_dir/$subdir";
move_fonts("$drakfont_dir/tmp/tmp", "../../$subdir", $subdir);
run_program::run($_, $dir) foreach qw(mkfontscale mkfontdir), $fccache;
- symlinkf($dir, '/etc/X11/fontpath.d/drakfont_' . basename ($dir));
+ symlinkf($dir, '/etc/X11/fontpath.d/drakfont_' . basename($dir));
}
interactive_progress($pbar2, 1, N("done"));
interactive_progress($pbar3, 0.25, N("Suppress Temporary Files"));
- my_rm_rf("$drakfont_dir/tmp/");
- system('xset fp rehash');
+ my_rm_rf("$drakfont_dir/tmp/") if !$::testing;
+ system(qw(xset fp rehash));
interactive_progress($pbar3, 0.30, N("done"));
}
}
@@ -411,13 +412,13 @@ sub remove_fonts() {
foreach my $i (@font_list) {
local $_ = $i;
if (/.pfb$/ || /.gsf$/ || /.pfm$/ || /.pfa$/) {
- system("mv $_ $drakfont_dir/remove ");
+ system('mv', $_, "$drakfont_dir/remove");
} else {
next if $::testing;
if (/.ttf$/) {
my_rm_rf($_);
# rebuild of the fonts.dir and fc-cache files
- system("cd `dirname $_` && $fccache && $ttmkfdir -u > fonts.dir");
+ system("cd `dirname $_` && $fccache && $ttmkfdir > fonts.dir");
} else { my_rm_rf($i) }
}
$i =~ s!/\w*\.\w*!!gi;
@@ -430,7 +431,7 @@ sub remove_fonts() {
system("cd $i && type1inst") or print "PERL::system command failed during cd or type1inst\n";
interactive_progress($pbar2, 1 / @list_dir, N("Suppress Fonts Files"));
}
- system('xset fp rehash');
+ system(qw(xset fp rehash));
-e "/usr/share/ghostscript" and my_rm_rf("$drakfont_dir/remove") if !$::testing;
interactive_progress($pbar2, 0.01, N("done"));
}
@@ -475,9 +476,9 @@ sub backend_mod() {
sub interactive_mode() {
$interactive = 1;
- $window1 = ugtk2->new(N("Font Installation"));
- $::main_window = $window1->{real_window};
- $window1->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
+ $window1 = ugtk3->new(N("Font Installation"));
+ mygtk3::register_main_window($window1->{real_window});
+ $window1->{rwindow}->signal_connect(delete_event => sub { ugtk3->exit(0) });
$window1->{rwindow}->set_position('center') if !$::isEmbedded;
my $button = {};
@@ -485,15 +486,15 @@ sub interactive_mode() {
local $::Wizard_no_previous = 1;
gtkadd($window1->{window},
- gtkpack_(Gtk2::VBox->new(0, 2),
- if_(!$::isEmbedded, 0, Gtk2::Banner->new("drakfont", N("DrakFont"))),
+ gtkpack_(Gtk3::VBox->new(0, 2),
+ if_(!$::isEmbedded, 0, Gtk3::Banner->new("drakfont", N("DrakFont"))),
0, gtknew('Title2', label => N("Font List")),
- 1, Gtk2::FontSelection->new,
+ 1, Gtk3::FontSelection->new,
0, gtkadd(create_hbox(),
- gtksignal_connect(Gtk2::Button->new(N("Get Windows Fonts")), clicked => sub { $windows = 1; import_status(); $windows = 0 }),
+ gtksignal_connect(Gtk3::Button->new(N("Get Windows Fonts")), clicked => sub { $windows = 1; import_status(); $windows = 0 }),
),
0, create_okcancel(my $oc = {
- ok_clicked => sub { Gtk2->main_quit },
+ ok_clicked => sub { Gtk3->main_quit },
},
undef, undef, '',
if_(0, [ N("About"), \&help, 1 ]),
@@ -509,7 +510,7 @@ sub interactive_mode() {
$window1->{rwindow}->show_all;
$window1->{rwindow}->realize;
$window1->main;
- ugtk2->exit(0);
+ ugtk3->exit(0);
}
$list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend_mod() : interactive_mode();
@@ -518,16 +519,13 @@ sub help() {
my $license = formatAlaTeX(translate($::license));
$license =~ s/\n/\n\n/sg; # nicer formatting
my $w = gtknew('AboutDialog', name => N("Drakfont"),
- version => mandrake_release_info()->{version},
- copyright => N("Copyright (C) %s by Mandriva", '2001-2008'),
+ version => mageia_release_info()->{version},
+ copyright => N("Copyright (C) %s by %s", 'Mandriva', '2001-2008') . "\n" . N("Copyright (C) %s by %s", N("Mageia"), '2011') . "\n",
license => $license, wrap_license => 1,
comments => N("Font installer."),
- website => 'http://mandrivalinux.com',
- website_label => N("Mandriva Linux"),
- authors => 'Sébastien Dupont
-Damien Chaumette
-Thierry Vignaud <vignaud@mandriva.com>',
- artists => 'Hélène Durosini <ln@mandriva.com>',
+ website => 'http://www.mageia.org',
+ website_label => N("Mageia"),
+ authors => [ 'Sébastien Dupont', 'Damien Chaumette', 'Thierry Vignaud <thierry.vignaud.com>' ],
translator_credits =>
#-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
N("_: Translator(s) name(s) & email(s)\n"),
@@ -541,25 +539,25 @@ sub appli_choice() {
dialog(N("Options"),
[
0, gtknew('Title2', label => N("Choose the applications that will support the fonts:")),
- 0, Gtk2::WrappedLabel->new(formatAlaTeX(license_msg())),
+ 0, Gtk3::WrappedLabel->new(formatAlaTeX(license_msg())),
(map {
my ($label, $ref) = @$_;
- (0, gtkpack_(Gtk2::HBox->new,
+ (0, gtkpack_(Gtk3::HBox->new,
0, $label,
- 1, Gtk2::HBox->new,
+ 1, Gtk3::HBox->new,
# BUG: that code never had supported canceling
- 0, gtksignal_connect(gtkset_active(Gtk2::CheckButton->new, $$ref), toggled => sub { $$ref = $$ref ? 0 : 1 }),
+ 0, gtksignal_connect(gtkset_active(Gtk3::CheckButton->new, $$ref), toggled => sub { $$ref = $$ref ? 0 : 1 }),
),
);
} ([ N("Ghostscript"), \$gs ],
- [ N("OpenOffice.org"), \$so ],
+ [ N("LibreOffice"), \$so ],
[ N("Abiword"), \$abi ],
[ N("Generic Printers"), \$printer ],
),
),
],
[
- gtksignal_connect(Gtk2::Button->new(N("Ok")),
+ gtksignal_connect(Gtk3::Button->new(N("Ok")),
clicked => \&exitdialog,
),
],
@@ -569,10 +567,10 @@ sub appli_choice() {
sub font_choice() {
my $file_dialog;
my $_select_font_msg = N("Select the font file or directory and click on 'Add'");
- $file_dialog = Gtk2::FileChooserDialog->new(N("File Selection"), $::main_window, 'open', N("Cancel") => 'cancel', N("Ok") => 'ok'); # 'select_folder'
+ $file_dialog = Gtk3::FileChooserDialog->new(N("File Selection"), $::main_window, 'open', N("Cancel") => 'cancel', N("Ok") => 'ok'); # 'select_folder'
$file_dialog->set_select_multiple(1);
- my $filter = Gtk2::FileFilter->new;
+ my $filter = Gtk3::FileFilter->new;
$filter->set_name(N("Fonts"));
$filter->add_pattern("*.$_") foreach @font_extensions, map { uc($_) } @font_extensions;
$file_dialog->add_filter($filter);
@@ -584,8 +582,8 @@ sub font_choice() {
$file_dialog->destroy;
return;
} elsif ($answer eq 'ok') {
- my @files = $file_dialog->get_filenames;
- foreach my $file_name (difference2(\@files, \@install)) {
+ my $files = $file_dialog->get_filenames;
+ foreach my $file_name (difference2($files, \@install)) {
push @install, $file_name;
$model->append_set(undef, [ 0 => $file_name ]);
}
@@ -604,7 +602,7 @@ sub list_remove() { #- TODO : multi-selection
$treeStore->remove($iter);
}
-sub exitdialog() { Gtk2->main_quit }
+sub exitdialog() { Gtk3->main_quit }
sub dialog {
my ($title, $widgets, $buttons, $o_main_loop, $o_options) = @_;
@@ -613,14 +611,14 @@ sub dialog {
local $::main_window = $dialog;
$dialog->signal_connect(delete_event => \&exitdialog);
$dialog->set_size_request(@{$o_options->{size}}) if ref $o_options->{size};
- gtkpack_($dialog->vbox, @$widgets);
- gtkpack($dialog->action_area, @$buttons) if $buttons;
+ gtkpack_($dialog->get_child, @$widgets);
+ gtkpack($dialog->get_action_area, @$buttons) if $buttons;
$dialog->show_all;
if ($o_main_loop) {
gtkflush();
$o_main_loop->();
} else {
- Gtk2->main;
+ Gtk3->main;
}
$dialog->destroy if $dialog;
undef $dialog;
@@ -628,14 +626,14 @@ sub dialog {
sub advanced_install() {
my $button;
- $model = Gtk2::TreeStore->new("Glib::String");
- $list = Gtk2::TreeView->new_with_model($model);
- $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
+ $model = Gtk3::TreeStore->new("Glib::String");
+ $list = Gtk3::TreeView->new_with_model($model);
+ $list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0));
$list->set_headers_visible(0);
$list->get_selection->set_mode('browse');
$list->set_rules_hint(1);
$model->signal_connect("row-inserted" => sub { $button and $button->set_sensitive(1) });
- $model->signal_connect("row-deleted" => sub { $button and $button->set_sensitive($model->get_iter_first) });
+ $model->signal_connect("row-deleted" => sub { $button and $button->set_sensitive($model->get_iter_first || 0) });
dialog(N("Import fonts"),
[
@@ -643,14 +641,14 @@ sub advanced_install() {
1, gtknew('HBox', children => [
1, create_scrolled_window($list),
0, gtknew('VBox', children_tight => [
- gtksignal_connect(Gtk2::Button->new(N("Add")), clicked => \&font_choice),
- gtksignal_connect(Gtk2::Button->new(N("Remove")), clicked => \&list_remove),
+ gtksignal_connect(Gtk3::Button->new(N("Add")), clicked => \&font_choice),
+ gtksignal_connect(Gtk3::Button->new(N("Remove")), clicked => \&list_remove),
]),
]),
],
[
- gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&exitdialog),
- gtksignal_connect($button = gtkset_sensitive(Gtk2::Button->new(N("Install")), 0),
+ gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => \&exitdialog),
+ gtksignal_connect($button = gtkset_sensitive(Gtk3::Button->new(N("Install")), 0),
clicked => sub {
import_status() if @install;
}),
@@ -663,16 +661,17 @@ sub advanced_install() {
sub list_to_remove() {
#my @files_path = grep(!/fonts/, all($current_path)); garbage ?
gtkflush();
- my (@tux) = $left_list->get_selection->get_selected_rows; #- get tree & paths
+ my ($indices) = $left_list->get_selection->get_selected_rows;
+ my (@tux) = @$indices; #- get tree & paths
push @uninstall, map { $left_model->get($left_model->get_iter($_), 0) } @tux;
#push @uninstall, $current_path . "/" . $files_path[$_] foreach @number_to_remove; garbage ?
show_list_to_remove();
}
sub show_list_to_remove() {
- my $model = Gtk2::TreeStore->new("Glib::String");
- my $list = Gtk2::TreeView->new_with_model($model);
- $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
+ my $model = Gtk3::TreeStore->new("Glib::String");
+ my $list = Gtk3::TreeView->new_with_model($model);
+ $list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0));
$list->set_headers_visible(0);
$list->get_selection->set_mode('browse');
$list->set_rules_hint(1);
@@ -681,13 +680,13 @@ sub show_list_to_remove() {
dialog(N("Warning"),
[
- 0, Gtk2::Label->new(N("Are you sure you want to uninstall the following fonts?")),
- 1, gtkpack_(Gtk2::HBox->new(0, 4), 1, create_scrolled_window($list)),
+ 0, Gtk3::Label->new(N("Are you sure you want to uninstall the following fonts?")),
+ 1, gtkpack_(Gtk3::HBox->new(0, 4), 1, create_scrolled_window($list)),
],
[
- gtksignal_connect(Gtk2::Button->new(N("Yes")),
+ gtksignal_connect(Gtk3::Button->new(N("Yes")),
clicked => sub { import_status_uninstall(); exitdialog() }),
- gtksignal_connect(Gtk2::Button->new(N("No")),
+ gtksignal_connect(Gtk3::Button->new(N("No")),
clicked => \&exitdialog
),
],
@@ -701,9 +700,9 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect
chk_empty_xfs_path();
#- left part
- $left_model = Gtk2::TreeStore->new("Glib::String");
- $left_list = Gtk2::TreeView->new_with_model($left_model);
- $left_list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
+ $left_model = Gtk3::TreeStore->new("Glib::String");
+ $left_list = Gtk3::TreeView->new_with_model($left_model);
+ $left_list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0));
$left_list->set_headers_visible(0);
$left_list->set_rules_hint(1);
$left_list->get_selection->set_mode('multiple');
@@ -711,29 +710,29 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect
$left_model->append_set(undef, [ 0 => $_ ]) foreach sort @installed_fonts_path;
#- right part
- $right_model = Gtk2::TreeStore->new("Glib::String");
- $right_list = Gtk2::TreeView->new_with_model($right_model);
- $right_list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
+ $right_model = Gtk3::TreeStore->new("Glib::String");
+ $right_list = Gtk3::TreeView->new_with_model($right_model);
+ $right_list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0));
$right_list->set_headers_visible(0);
$right_list->get_selection->set_mode('multiple');
$right_list->set_rules_hint(1);
dialog(N("Uninstall"),
[
- 1, gtkpack_(Gtk2::HBox->new(0, 4),
+ 1, gtkpack_(Gtk3::HBox->new(0, 4),
1, create_scrolled_window($left_list),
#1, create_scrolled_window($right_list)
),
],
[
- gtksignal_connect(Gtk2::Button->new(N("Unselect All")),
+ gtksignal_connect(Gtk3::Button->new(N("Unselect All")),
clicked => sub { $left_list->get_selection->unselect_all }
),
- gtksignal_connect(Gtk2::Button->new(N("Select All")),
+ gtksignal_connect(Gtk3::Button->new(N("Select All")),
clicked => sub { $left_list->get_selection->select_all }
),
- gtksignal_connect(Gtk2::Button->new(N("Remove")), clicked => sub { exitdialog(); list_to_remove() }),
- gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&exitdialog),
+ gtksignal_connect(Gtk3::Button->new(N("Remove")), clicked => sub { exitdialog(); list_to_remove() }),
+ gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => \&exitdialog),
],
undef,
{ size => [ -1, 300 ] }
@@ -742,10 +741,10 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect
}
sub import_status() {
- $pbar = Gtk2::ProgressBar->new;
- $pbar1 = Gtk2::ProgressBar->new;
- $pbar2 = Gtk2::ProgressBar->new;
- $pbar3 = Gtk2::ProgressBar->new;
+ $pbar = Gtk3::ProgressBar->new;
+ $pbar1 = Gtk3::ProgressBar->new;
+ $pbar2 = Gtk3::ProgressBar->new;
+ $pbar3 = Gtk3::ProgressBar->new;
dialog(N("Importing fonts"),
[
0, create_packtable({ col_spacings => 10, row_spacings => 50 },
@@ -762,9 +761,9 @@ sub import_status() {
}
sub import_status_uninstall() {
- $pbar = Gtk2::ProgressBar->new;
- $pbar1 = Gtk2::ProgressBar->new;
- $pbar2 = Gtk2::ProgressBar->new;
+ $pbar = Gtk3::ProgressBar->new;
+ $pbar1 = Gtk3::ProgressBar->new;
+ $pbar2 = Gtk3::ProgressBar->new;
dialog(N("Removing fonts"),
[
0, create_packtable({ col_spacings => 10, row_spacings => 50 },
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-04 04:08:33 +0000