summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakfont
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone/drakfont')
-rwxr-xr-xperl-install/standalone/drakfont8
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 8a0d7277f..a842764a8 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -427,7 +427,7 @@ sub remove_fonts() {
}
sub license_msg() {
- print N("Before installing any fonts, be sure that you have the right to use and install them on your system.\n\nYou can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server.") . "\n";
+ print N("Before installing any fonts, be sure that you have the right to use and install them on your system.\n\n-You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server.") . "\n";
}
sub backend_mod() {
@@ -483,9 +483,6 @@ sub interactive_mode() {
if_(!$::isEmbedded, 0, Gtk2::Banner->new("drakfont", N("DrakFont"))),
0, Gtk2::WrappedLabel->new(N("Font List")),
1, Gtk2::FontSelection->new,
- 0, gtkadd(create_hbox(),
- gtksignal_connect(Gtk2::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 },
},
@@ -494,6 +491,7 @@ sub interactive_mode() {
[ N("Options"), \&appli_choice, 1 ],
[ N("Uninstall"), \&uninstall, 1 ],
[ N("Import"), \&advanced_install, 1 ],
+ [ N("Get Windows Fonts"), sub { $windows = 1; import_status(); $windows = 0 }, 1 ],
),
),
);
@@ -556,7 +554,7 @@ sub appli_choice() {
dialog(N("Options"),
[
0, N("Choose the applications that will support the fonts:"),
- 0, Gtk2::WrappedLabel->new(license_msg()),
+ 0, Gtk2::WrappedLabel->new(N("Before installing any fonts, be sure that you have the right to use and install them on your system.\n\nYou can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server.")),
(map {
my ($label, $ref) = @$_;
(0, gtkpack_(Gtk2::HBox->new,