aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-04 16:07:57 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-04 16:07:57 +0000
commitde14f38ad4e95ab19e300c6e7d6cb5a1582fba91 (patch)
treef5dd7f12381598db4d585a17a0f181a089e594dd
parentacda47a463aed3e9bc8add4a29147766b7c58caf (diff)
downloadrpmdrake-de14f38ad4e95ab19e300c6e7d6cb5a1582fba91.tar
rpmdrake-de14f38ad4e95ab19e300c6e7d6cb5a1582fba91.tar.gz
rpmdrake-de14f38ad4e95ab19e300c6e7d6cb5a1582fba91.tar.bz2
rpmdrake-de14f38ad4e95ab19e300c6e7d6cb5a1582fba91.tar.xz
rpmdrake-de14f38ad4e95ab19e300c6e7d6cb5a1582fba91.zip
(mainwindow) by default do not enable to alter the 'update' flag
(unless --expert is given)
-rw-r--r--NEWS3
-rw-r--r--Rpmdrake/edit_urpm_sources.pm9
2 files changed, 9 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 45116f3d..e998920f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
- all
be able to handle --expert
+- edit-urpm-sources:
+ o by default do not enable to alter the 'update' flag (unless
+ --expert is given)
- gurpmi.addmedia
o instead of discarding --update when using --distrib, give it a meaning:
only add media flagged "update"
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index fc618907..c04eb2be 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -51,6 +51,7 @@ my %col = (
is_update => 1,
type => 2,
name => 3,
+ activatable => 4
},
);
@@ -970,7 +971,7 @@ sub mainwindow() {
),
);
- my $list = Gtk2::ListStore->new("Glib::Boolean", "Glib::Boolean", "Glib::String", "Glib::String");
+ my $list = Gtk2::ListStore->new("Glib::Boolean", "Glib::Boolean", "Glib::String", "Glib::String", "Glib::Boolean");
$list_tv = Gtk2::TreeView->new_with_model($list);
$list_tv->get_selection->set_mode('multiple');
my ($dw_button, $edit_button, $remove_button, $up_button);
@@ -1016,7 +1017,7 @@ sub mainwindow() {
);
$list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Enabled"), my $tr = Gtk2::CellRendererToggle->new, 'active' => $col{mainw}{is_enabled}));
- $list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Updates"), my $cu = Gtk2::CellRendererToggle->new, 'active' => $col{mainw}{is_update}));
+ $list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Updates"), my $cu = Gtk2::CellRendererToggle->new, 'active' => $col{mainw}{is_update}, activatable => $col{mainw}{activatable}));
$list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Type"), Gtk2::CellRendererText->new, 'text' => $col{mainw}{type}));
$list_tv->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Medium"), Gtk2::CellRendererText->new, 'text' => $col{mainw}{name}));
@@ -1074,7 +1075,9 @@ sub mainwindow() {
$list->append_set($col{mainw}{is_enabled} => !$_->{ignore},
$col{mainw}{is_update} => ! !$_->{update},
$col{mainw}{type} => get_medium_type($_),
- $col{mainw}{name} => $name);
+ $col{mainw}{name} => $name,
+ $col{mainw}{activatable} => to_bool($::expert),
+ );
}
$reorder_ok = 1;
};