~monish-gupta1/computer-janitor/bug-726616

« back to all changes in this revision

Viewing changes to computerjanitorapp/gtk/dialogs.py

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw, Loïc Minier, Barry Warsaw
  • Date: 2011-02-17 17:24:44 UTC
  • Revision ID: james.westby@ubuntu.com-20110217172444-5xfgrtagtonne6vq
Tags: 2.1.0-0ubuntu3
[ Loïc Minier ]
* debian/control: computer-janitor-gtk depends gir1.2-pango-1.0 not
  gir1.2-pango-2.0.  (LP: #720529)

[ Barry Warsaw ]
* setup.py, computer-janitor-gtk.install: Install 24x24.png into
  /usr/share/computer-janitor which is where gtk expects it to be.
  (LP: #720743)
* Fix various apt_cache deprecation warnings.
* debian/rules:
  - Switch to dh_python2.
  - Run the unit tests at build time.
  - Add --keep to dh_installchangelogs.
  - Remove override_dh_pysupport.
* debian/control:
  - Add Build-Depends on python-dbus and update-manager-core so that the
    unit tests can be run at build time.  Remove B-D on python-support.
    Change B-D to python-all for tests under all available Python versions.
  - Fix typo in descriptions.
  - Remove XB-Python-Version and add X-Python-Version for dh_python2.
* Note: 2.1.0-0ubuntu2 was a quick fix upload to the archive containing
  the above debian/control file fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
63
63
        if other_cruft_count > 0:
64
64
            messages.insert(1, _('Non-package items to remove: %(others)s.'))
65
65
            ok_button = _('Clean up')
66
 
        message = interpolate(NL.join(messages),
67
 
                              dict(packages=package_cruft_count,
68
 
                                   others=other_cruft_count))
 
66
        secondary_message = interpolate(NL.join(messages),
 
67
                                        dict(packages=package_cruft_count,
 
68
                                             others=other_cruft_count))
69
69
        # XXX ^^ barry 2010-08-23: LP: #622720
70
70
        if ok_button is None:
71
71
            # The user de-selected all cruft from the ui, so there's actually
77
77
                message_format=_('There is nothing to clean up'),
78
78
                )
79
79
            dialog.set_title(_('Clean up'))
80
 
            dialog.format_secondary_markup(message)
81
80
            dialog.add_button(_('Ok'), Gtk.ResponseType.YES)
82
81
            dialog.show_all()
83
82
            dialog.run()
93
92
            buttons=Gtk.ButtonsType.NONE,
94
93
            message_format=message)
95
94
        dialog.set_title(_('Clean up'))
96
 
        dialog.format_secondary_markup(message)
 
95
        dialog.format_secondary_markup(secondary_message)
97
96
        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CLOSE)
98
97
        dialog.add_button(ok_button, Gtk.ResponseType.YES)
99
98
        # Show the dialog and get the user's response.