aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-01-07 18:19:48 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-01-07 18:19:48 +0000
commit760353b7f61085aaf2d6956f77ff4dccf938d8e0 (patch)
tree59090ab4ed5861e6b795360cb32dcb5da4573c99
parentc1253d36fb9c5bfbf2a536896246433ed130e661 (diff)
downloadrpmdrake-760353b7f61085aaf2d6956f77ff4dccf938d8e0.tar
rpmdrake-760353b7f61085aaf2d6956f77ff4dccf938d8e0.tar.gz
rpmdrake-760353b7f61085aaf2d6956f77ff4dccf938d8e0.tar.bz2
rpmdrake-760353b7f61085aaf2d6956f77ff4dccf938d8e0.tar.xz
rpmdrake-760353b7f61085aaf2d6956f77ff4dccf938d8e0.zip
generic name for fixed fonts is "monospace"
-rwxr-xr-xrpmdrake12
1 files changed, 6 insertions, 6 deletions
diff --git a/rpmdrake b/rpmdrake
index c7dff970..1b4f47a5 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -458,7 +458,7 @@ or you already installed all of them."));
exists $pkgs->{$key}{description} && (!@$max_info_in_descr || exists $pkgs->{$key}{files})
or slow_func($tree->window, sub { extract_header($pkgs->{$key}, $urpm) });
my $tag_tag = { 'foreground' => 'royalblue3', 'weight' => Gtk2::Pango->WEIGHT_BOLD };
- my $tag_fix = { 'font' => 'fixed' };
+ my $tag_fix = { 'font' => 'monospace' };
my @files = ([ N("Files:\n"), $tag_tag ], [ $pkgs->{$key}{files} || N("(Not available)"), $tag_fix ]);
my @chglo = ([ N("Changelog:\n"), $tag_tag ], @{$pkgs->{$key}{changelog} || [[ N("(Not available)") ]]});
my @max_info = if_(@$max_info_in_descr,
@@ -851,10 +851,10 @@ sub dialog_rpmnew {
gtkpack_(Gtk2::VBox->new(0, 5),
1, create_vpaned(
create_vpaned(gtkpack_(Gtk2::VBox->new(0, 0),
- 0, gtkset_markup(Gtk2::Label->new, "<span font_desc=\"fixed\">$file:</span>"),
+ 0, gtkset_markup(Gtk2::Label->new, "<span font_desc=\"monospace\">$file:</span>"),
1, create_scrolled_window($texts{file} = Gtk2::TextView->new)),
gtkpack_(Gtk2::VBox->new(0, 0),
- 0, gtkset_markup(Gtk2::Label->new, "<span font_desc=\"fixed\">$rpmnew:</span>"),
+ 0, gtkset_markup(Gtk2::Label->new, "<span font_desc=\"monospace\">$rpmnew:</span>"),
1, create_scrolled_window($texts{rpmnew} = Gtk2::TextView->new)),
resize1 => 1),
gtkpack_(Gtk2::VBox->new(0, 0),
@@ -870,10 +870,10 @@ sub dialog_rpmnew {
clicked => sub { $save_wsize->(); Gtk2->main_quit }),
)));
my %contents = (file => scalar(cat_($file)), rpmnew => scalar(cat_($rpmnew)));
- gtktext_insert($texts{$_}, [ [ $contents{$_}, { 'font' => 'fixed' } ] ]) foreach keys %contents;
+ gtktext_insert($texts{$_}, [ [ $contents{$_}, { 'font' => 'monospace' } ] ]) foreach keys %contents;
my @regexps = ([ '^(--- )|(\+\+\+ )', 'blue' ], [ '^@@ ', 'darkcyan' ], [ '^-', 'red3' ], [ '^\+', 'green3' ]);
my $line2col = sub { $_[0] =~ /$_->[0]/ and return $_->[1] foreach @regexps; 'black' };
- gtktext_insert($texts{diff}, [ map { [ $_, { 'font' => 'fixed', 'foreground' => $line2col->($_) } ] } `diff -u $file $rpmnew` ]);
+ gtktext_insert($texts{diff}, [ map { [ $_, { 'font' => 'monospace', 'foreground' => $line2col->($_) } ] } `diff -u $file $rpmnew` ]);
$d->{rwindow}->set_default_size(@inspect_wsize);
$d->main;
};
@@ -883,7 +883,7 @@ sub dialog_rpmnew {
my $f = $_;
[ gtkpack__(Gtk2::HBox->new(0, 0),
gtkset_selectable(gtkset_markup(Gtk2::Label->new,
- "$pkg:<span font_desc=\"fixed\">$f</span>"), 1)),
+ "$pkg:<span font_desc=\"monospace\">$f</span>"), 1)),
my $b = gtksignal_connect(Gtk2::Button->new(but(N("Inspect..."))),
clicked => sub {
$inspect->($f);