*merge with mvo

4 files changed, 65 insertions, 6 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 18e5d260..8ae98b55 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -720,11 +720,10 @@ class SoftwareProperties(SimpleGladeApp):
         self.source_store.append([not source.disabled, contents,
                                   source, False, True])
 
-    if len(self.source_store) < 1:
+    (path_x, path_y) = self.treeview_sources.get_cursor()
+    if len(self.source_store) < 1 or path_x <0:
         self.button_remove.set_sensitive(False)
         self.button_edit.set_sensitive(False)
-    else:
-        self.treeview_sources.set_cursor(0)
     self.distro.get_sources(self.sourceslist)
     self.distro_to_widgets()
     
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 0962c6c8..5bdea61a 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -363,7 +363,8 @@ class UpdateManager(SimpleGladeApp):
     self.treeview_update.append_column(column_install)
     column_install.set_visible(True)
     self.treeview_update.append_column(column)
-    self.treeview_update.set_search_column(LIST_NAME)	
+    self.treeview_update.set_search_column(LIST_NAME)
+    self.treeview_update.connect("button-press-event", self.show_context_menu)
 
 
     # proxy stuff
@@ -543,6 +544,51 @@ class UpdateManager(SimpleGladeApp):
       changes = self.cache.all_changes[name]
       self.set_changes_buffer(changes_buffer, changes[0], name, changes[1])
 
+  def show_context_menu(self, widget, event):
+    """
+    Show a context menu if a right click was performed on an update entry
+    """
+    if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
+        menu = gtk.Menu()
+        item_select_none = gtk.MenuItem(_("Select _None"))
+        item_select_none.connect("activate", self.select_none_updgrades)
+        menu.add(item_select_none)
+        if self.list.num_updates == 0 or len(self.packages) == 0:
+            item_select_none.set_property("sensitive", False)
+        item_select_all = gtk.MenuItem(_("Select _All"))
+        item_select_all.connect("activate", self.select_all_updgrades)
+        menu.add(item_select_all)
+        if self.list.num_updates == len(self.packages) or\
+           self.list.num_updates == 0:
+            item_select_all.set_property("sensitive", False)
+        menu.popup(None, None, None, 0, event.time)
+        menu.show_all()
+        return True
+
+  def select_all_updgrades(self, widget):
+    """
+    Select all updates
+    """
+    iter = self.store.get_iter_first()
+    while iter != None:
+        pkg = self.store.get_value(iter, LIST_PKG)
+        if pkg != None:
+            self.store.set_value(iter, LIST_INSTALL, True)
+            self.add_update(pkg)
+        iter = self.store.iter_next(iter)
+
+  def select_none_updgrades(self, widget):
+    """
+    Select none updates
+    """
+    iter = self.store.get_iter_first()
+    while iter != None:
+        pkg = self.store.get_value(iter, LIST_PKG)
+        if pkg != None:
+            self.store.set_value(iter, LIST_INSTALL, False)
+            self.remove_update(pkg)
+        iter = self.store.iter_next(iter)
+
   def remove_update(self, pkg):
     name = pkg.name
     if name in self.packages:
@@ -607,7 +653,6 @@ class UpdateManager(SimpleGladeApp):
       apt_pkg.PkgSystemUnLock()
     except SystemError:
       pass
-#    cmd = ["gksu","--",
     cmd = ["gksu", "--desktop", "/usr/share/applications/synaptic.desktop", 
            "--", "/usr/sbin/synaptic", "--hide-main-window",  
            "--non-interactive", "--parent-window-id", "%s" % (id) ]
diff --git a/debian/changelog b/debian/changelog
index 3686ed50..9de7e07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+update-manager (0.44.3) edgy; urgency=low
+
+  * help/C/update-manager-C.omf:
+    - fix url (thanks to daniel holbach, lp: #45548)
+
+ --
+
+update-manager (0.44.2) edgy; urgency=low
+
+  * added select all/unselect all (thanks to Sebastian Heinlein)
+  * wording fixes
+  * fix update counting bug 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 Aug 2006 17:52:09 +0200
+
 update-manager (0.44.1) edgy; urgency=low
 
   * make UpdateManager check for new distribution releases by
diff --git a/help/C/update-manager-C.omf b/help/C/update-manager-C.omf
index a4e6aabc..733461cd 100644
--- a/help/C/update-manager-C.omf
+++ b/help/C/update-manager-C.omf
@@ -9,7 +9,7 @@
   <description> This document explains how to use the Update Manager. </description>
   <type>manual </type>
   <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-  <identifier url=""/>
+  <identifier url="file:/usr/share/omf/update-manager/update-manager-C.omf"/>
   <language code="C"/>
   <relation seriesid="e7ae3bcc-8ce0-11d9-8fa9-d1fb3a9076bb"/>
   <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"