← Back to branch summary

~azzar1/update-manager/add-livepatch-reminder

« back to all changes in this revision

Viewing changes to UpdateManager/UpdatesAvailable.py

  • Committer: Balint Reczey
  • Date: 2018-03-21 14:33:29 UTC
  • mfrom: (2809.1.3 master)
  • Revision ID: balint.reczey@canonical.com-20180321143329-efhkfhuwy3wgdg0p
Merge lp:~rbalint/update-manager/remove-autoremovable-kernels

Show diffs side-by-side

added added

removed removed

Lines of Context:
UpdateManager/UpdatesAvailable.py
282
282
        self.pkg_cell_area = CellAreaPackage(False)
283
283
        pkg_column = Gtk.TreeViewColumn.new_with_area(self.pkg_cell_area)
284
284
        self.pkg_cell_area.column = pkg_column
285
 
        pkg_column.set_title(_("Install"))
 
285
        pkg_column.set_title(_("Install or remove"))
286
286
        pkg_column.set_property("spacing", 4)
287
287
        pkg_column.set_expand(True)
288
288
        self.treeview_update.append_column(pkg_column)
955
955
                if keep_packages:
956
956
                    item.pkg.mark_keep()
957
957
                elif item.pkg.name not in self.list.held_back:
958
 
                    item.pkg.mark_install()
 
958
                    if not item.to_remove:
 
959
                        item.pkg.mark_install()
 
960
                    else:
 
961
                        item.pkg.mark_delete()
959
962
            except SystemError:
960
963
                pass
961
964
 
1051
1054
            self._add_groups(self.list.security_groups)
1052
1055
        if self.list.security_groups and self.list.update_groups:
1053
1056
            self._add_header(_("Other updates"), self.list.update_groups)
 
1057
        elif self.list.update_groups and self.list.kernel_autoremove_groups:
 
1058
            self._add_header(_("Updates"), self.list.update_groups)
1054
1059
        if self.list.update_groups:
1055
1060
            self._add_groups(self.list.update_groups)
 
1061
        if self.list.kernel_autoremove_groups:
 
1062
            self._add_header(
 
1063
                _("Unused kernel updates to be removed"),
 
1064
                self.list.kernel_autoremove_groups)
 
1065
            self._add_groups(self.list.kernel_autoremove_groups)
1056
1066
 
1057
1067
        self.treeview_update.set_model(self.store)
1058
 
        self.pkg_cell_area.indent_toplevel = bool(self.list.security_groups)
 
1068
        self.pkg_cell_area.indent_toplevel = (
 
1069
            bool(self.list.security_groups) or
 
1070
            bool(self.list.kernel_autoremove_groups))
1059
1071
        self.update_close_button()
1060
1072
        self.update_count()
1061
1073
        self.setBusy(False)