aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-08-04 13:58:16 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-08-04 13:58:16 +0000
commitb212cb2a6a94898bb44c8928d872ee14d40394c5 (patch)
tree2a180f09c8d1cc7985f668e03eb584f12c76c0b8
parent72b1887f6bb3610c0ad7329684de3d5fd2911eb2 (diff)
downloadrpmdrake-b212cb2a6a94898bb44c8928d872ee14d40394c5.tar
rpmdrake-b212cb2a6a94898bb44c8928d872ee14d40394c5.tar.gz
rpmdrake-b212cb2a6a94898bb44c8928d872ee14d40394c5.tar.bz2
rpmdrake-b212cb2a6a94898bb44c8928d872ee14d40394c5.tar.xz
rpmdrake-b212cb2a6a94898bb44c8928d872ee14d40394c5.zip
revert "use checkboxes instead of icons"
-rwxr-xr-xrpmdrake7
-rw-r--r--rpmdrake.spec7
2 files changed, 9 insertions, 5 deletions
diff --git a/rpmdrake b/rpmdrake
index 38f3c56f..f0b30a78 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -621,12 +621,13 @@ or you already installed all of them."));
rebuild_tree => sub {},
};
- my $tree_model = Gtk2::TreeStore->new("Glib::String", "Glib::Boolean", "Glib::String", ("Glib::Boolean") x 2);
+ my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String");
$tree = Gtk2::TreeView->new_with_model($tree_model);
$tree->get_selection->set_mode('browse');
$tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
- $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk2::CellRendererToggle->new, 'active' => 1, 'activatable' => 3, 'inconsistent' => 4));
+ $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1));
+ $pixcolumn->{is_pix} = 1;
$tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2));
$tree->set_headers_visible(0);
@@ -875,7 +876,7 @@ Is it ok to continue?", $urpm->translate_why_removed($urpm->{state}, @{$urpm->{a
$w->{window}->set_default_size($typical_width*2.7, 500);
$w->{rwindow}->show_all;
$options->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, textcolumn => $textcolumn, pixcolumn => $pixcolumn,
- info => $info, status => $status, renderer => $renderer };
+ info => $info, status => $status };
ask_browse_tree_info_given_widgets($options);
}
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 1a12aa4c..bf2364a2 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -8,7 +8,7 @@
%define name rpmdrake
%define version 2.1
-%define release 29mdk
+%define release 30mdk
Name: %{name}
Version: %{version}
@@ -16,7 +16,7 @@ Release: %{release}
License: GPL
Source0: %name-%version.tar.bz2
Summary: Mandrake Linux graphical front end for choosing packages for installion/removal
-Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.3-15mdk gurpmi >= 4.3-9mdk perl-URPM >= 0.90-7mdk drakxtools >= 9.2-0.24mdk rpmtools >= 4.5
+Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.3-15mdk gurpmi >= 4.3-9mdk perl-URPM >= 0.90-7mdk drakxtools > 9.2-0.26md rpmtools >= 4.5
Requires: perl-Gtk2 >= 0.90-2mdk perl-Locale-gettext >= 1.01-7mdk
BuildRequires: libcurl2-devel >= 7.10.3-2mdk gettext openssl-devel perl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorarch}/*.pm
%changelog
+* Mon Aug 4 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-30mdk
+- revert "use checkboxes instead of icons"
+
* Fri Jul 25 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 2.1-29mdk
- use checkboxes instead of icons
- fix mouse selection