diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-03 17:10:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-03 17:10:49 +0000 |
| commit | 0a0515d22c34bc101a05085a5e62b0e2ca265a89 (patch) | |
| tree | 0dfbff39c99caf134c1a69ee8918f6a3604caaf9 | |
| parent | da53f0d0452b778d7bf3e6c47171722225265f85 (diff) | |
| download | control-center-0a0515d22c34bc101a05085a5e62b0e2ca265a89.tar control-center-0a0515d22c34bc101a05085a5e62b0e2ca265a89.tar.gz control-center-0a0515d22c34bc101a05085a5e62b0e2ca265a89.tar.bz2 control-center-0a0515d22c34bc101a05085a5e62b0e2ca265a89.tar.xz control-center-0a0515d22c34bc101a05085a5e62b0e2ca265a89.zip | |
pass the style to gtkicons_labels_widget instead of directly passing the font
=> fix the font in non iso1/iso15
| -rwxr-xr-x | control-center | 8 | ||||
| -rw-r--r-- | drakconf.spec | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/control-center b/control-center index 83826f0f..5e3b8941 100755 --- a/control-center +++ b/control-center @@ -444,14 +444,8 @@ $darea1->signal_connect( expose_event => sub { my $cursor = new Gtk::Gdk::Cursor 15; -######## removed for the now. The gtk sources don't uses this, so it should work. ######## -# fontsets *must* be used in order to allow proper font selection for non -# latin1 languages; never use a simple font, *always* load a fontset -# $window_global->font(Gtk::Gdk::Font->fontset_load(_("-*-times-bold-r-normal-*-14-*-*-*-p-*-iso8859-1,*-r-*"))); - foreach (@tree) { - my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $window_global->style->font, - #"-urw-times-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"), + my $w = gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $darea1->style, $pixmap_back_right, 540, 460, 55, 50, 50, 50, 50, 50, \&compute_exec_string, $exec_hash); $notebook_global->append_page($w); } diff --git a/drakconf.spec b/drakconf.spec index 4c3b4c15..4d27b3b8 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -2,7 +2,7 @@ # do not edit here, but in cvs/soft/control-center %define name drakconf %define version 0.96 -%define release 7mdk +%define release 8mdk Summary: The Mandrake Control Center Name: %{name} @@ -19,7 +19,7 @@ Group: System/Configuration/Other Url: http://www.mandrakelinux.com/en/cvs.php3 Obsoletes: DrakConf Provides: DrakConf -Requires: mandrake-release, drakxtools >= 1.1.7-74mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode, drakfloppy >= 0.43-8mdk, +Requires: mandrake-release, drakxtools >= 1.1.7-88mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode, drakfloppy >= 0.43-8mdk, Requires: popt >= 1.6, harddrake >= 0.9.3-23mdk, XFree86-100dpi-fonts, menudrake >= 0.6.5 Requires: rxvt BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -103,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/security/console.apps/mcc %changelog +* Sun Mar 3 2002 Pixel <pixel@mandrakesoft.com> 0.96-8mdk +- pass the style to gtkicons_labels_widget instead of directly passing the font + => fix the font in non iso1/iso15 + * Thu Feb 28 2002 dam's <damien@mandrakesoft.com> 0.96-7mdk - corrected bad style/fonts. |