diff --git a/data/icons/16x16/actions/package-available-locked.png b/data/icons/16x16/actions/package-available-locked.png new file mode 100644 index 0000000..12e824e Binary files /dev/null and b/data/icons/16x16/actions/package-available-locked.png differ diff --git a/data/icons/16x16/actions/package-available.png b/data/icons/16x16/actions/package-available.png new file mode 100644 index 0000000..0fcb7b4 Binary files /dev/null and b/data/icons/16x16/actions/package-available.png differ diff --git a/data/icons/16x16/actions/package-broken.png b/data/icons/16x16/actions/package-broken.png new file mode 100644 index 0000000..32b2dbf Binary files /dev/null and b/data/icons/16x16/actions/package-broken.png differ diff --git a/data/icons/16x16/actions/package-downgrade.png b/data/icons/16x16/actions/package-downgrade.png new file mode 100644 index 0000000..4f0c250 Binary files /dev/null and b/data/icons/16x16/actions/package-downgrade.png differ diff --git a/data/icons/16x16/actions/package-install.png b/data/icons/16x16/actions/package-install.png new file mode 100644 index 0000000..3dd117f Binary files /dev/null and b/data/icons/16x16/actions/package-install.png differ diff --git a/data/icons/16x16/actions/package-installed-locked.png b/data/icons/16x16/actions/package-installed-locked.png new file mode 100644 index 0000000..d067ded Binary files /dev/null and b/data/icons/16x16/actions/package-installed-locked.png differ diff --git a/data/icons/16x16/actions/package-installed-outdated.png b/data/icons/16x16/actions/package-installed-outdated.png new file mode 100644 index 0000000..b0d80c4 Binary files /dev/null and b/data/icons/16x16/actions/package-installed-outdated.png differ diff --git a/data/icons/16x16/actions/package-installed-updated.png b/data/icons/16x16/actions/package-installed-updated.png new file mode 100644 index 0000000..71fcaab Binary files /dev/null and b/data/icons/16x16/actions/package-installed-updated.png differ diff --git a/data/icons/16x16/actions/package-new.png b/data/icons/16x16/actions/package-new.png new file mode 100644 index 0000000..5dc871c Binary files /dev/null and b/data/icons/16x16/actions/package-new.png differ diff --git a/data/icons/16x16/actions/package-purge.png b/data/icons/16x16/actions/package-purge.png new file mode 100644 index 0000000..a1b72b2 Binary files /dev/null and b/data/icons/16x16/actions/package-purge.png differ diff --git a/data/icons/16x16/actions/package-reinstall.png b/data/icons/16x16/actions/package-reinstall.png new file mode 100644 index 0000000..46930b8 Binary files /dev/null and b/data/icons/16x16/actions/package-reinstall.png differ diff --git a/data/icons/16x16/actions/package-remove.png b/data/icons/16x16/actions/package-remove.png new file mode 100644 index 0000000..8362194 Binary files /dev/null and b/data/icons/16x16/actions/package-remove.png differ diff --git a/data/icons/16x16/actions/package-supported.png b/data/icons/16x16/actions/package-supported.png new file mode 100644 index 0000000..faffcc3 Binary files /dev/null and b/data/icons/16x16/actions/package-supported.png differ diff --git a/data/icons/16x16/actions/package-upgrade.png b/data/icons/16x16/actions/package-upgrade.png new file mode 100644 index 0000000..bef932b Binary files /dev/null and b/data/icons/16x16/actions/package-upgrade.png differ diff --git a/data/icons/16x16/status/collection-available.png b/data/icons/16x16/status/collection-available.png deleted file mode 100644 index 33fbc15..0000000 Binary files a/data/icons/16x16/status/collection-available.png and /dev/null differ diff --git a/data/icons/16x16/status/collection-installed.png b/data/icons/16x16/status/collection-installed.png deleted file mode 100644 index b82b293..0000000 Binary files a/data/icons/16x16/status/collection-installed.png and /dev/null differ diff --git a/data/icons/16x16/status/package-add.png b/data/icons/16x16/status/package-add.png deleted file mode 100644 index 70f6d44..0000000 Binary files a/data/icons/16x16/status/package-add.png and /dev/null differ diff --git a/data/icons/16x16/status/package-available.png b/data/icons/16x16/status/package-available.png deleted file mode 100644 index 971c875..0000000 Binary files a/data/icons/16x16/status/package-available.png and /dev/null differ diff --git a/data/icons/16x16/status/package-blocked.png b/data/icons/16x16/status/package-blocked.png deleted file mode 100644 index 998104c..0000000 Binary files a/data/icons/16x16/status/package-blocked.png and /dev/null differ diff --git a/data/icons/16x16/status/package-cleanup.png b/data/icons/16x16/status/package-cleanup.png deleted file mode 100644 index c3d05e6..0000000 Binary files a/data/icons/16x16/status/package-cleanup.png and /dev/null differ diff --git a/data/icons/16x16/status/package-delete.png b/data/icons/16x16/status/package-delete.png deleted file mode 100644 index 48c5ed0..0000000 Binary files a/data/icons/16x16/status/package-delete.png and /dev/null differ diff --git a/data/icons/16x16/status/package-download.png b/data/icons/16x16/status/package-download.png deleted file mode 100644 index 14c0ac9..0000000 Binary files a/data/icons/16x16/status/package-download.png and /dev/null differ diff --git a/data/icons/16x16/status/package-downloaded.png b/data/icons/16x16/status/package-downloaded.png deleted file mode 100644 index 5948f5e..0000000 Binary files a/data/icons/16x16/status/package-downloaded.png and /dev/null differ diff --git a/data/icons/16x16/status/package-info.png b/data/icons/16x16/status/package-info.png deleted file mode 100644 index 176aa88..0000000 Binary files a/data/icons/16x16/status/package-info.png and /dev/null differ diff --git a/data/icons/16x16/status/package-installed.png b/data/icons/16x16/status/package-installed.png deleted file mode 100644 index 6b40a1d..0000000 Binary files a/data/icons/16x16/status/package-installed.png and /dev/null differ diff --git a/data/icons/16x16/status/package-search.png b/data/icons/16x16/status/package-search.png deleted file mode 100644 index 545837a..0000000 Binary files a/data/icons/16x16/status/package-search.png and /dev/null differ diff --git a/data/icons/16x16/status/package-sources.png b/data/icons/16x16/status/package-sources.png deleted file mode 100644 index 50c8400..0000000 Binary files a/data/icons/16x16/status/package-sources.png and /dev/null differ diff --git a/data/icons/16x16/status/package-update.png b/data/icons/16x16/status/package-update.png deleted file mode 100644 index 54cfc3b..0000000 Binary files a/data/icons/16x16/status/package-update.png and /dev/null differ diff --git a/data/icons/16x16/status/refresh-cache.png b/data/icons/16x16/status/refresh-cache.png deleted file mode 100644 index 674f6ea..0000000 Binary files a/data/icons/16x16/status/refresh-cache.png and /dev/null differ diff --git a/data/icons/16x16/status/rollback.png b/data/icons/16x16/status/rollback.png deleted file mode 100644 index 62ec854..0000000 Binary files a/data/icons/16x16/status/rollback.png and /dev/null differ diff --git a/data/icons/16x16/status/service-pack.png b/data/icons/16x16/status/service-pack.png deleted file mode 100644 index 1cc5af2..0000000 Binary files a/data/icons/16x16/status/service-pack.png and /dev/null differ diff --git a/data/icons/16x16/status/setup.png b/data/icons/16x16/status/setup.png deleted file mode 100644 index 50cbd12..0000000 Binary files a/data/icons/16x16/status/setup.png and /dev/null differ diff --git a/data/icons/16x16/status/update-bugfix.png b/data/icons/16x16/status/update-bugfix.png deleted file mode 100644 index 0602ef5..0000000 Binary files a/data/icons/16x16/status/update-bugfix.png and /dev/null differ diff --git a/data/icons/16x16/status/update-enhancement.png b/data/icons/16x16/status/update-enhancement.png deleted file mode 100644 index 8b3bbc9..0000000 Binary files a/data/icons/16x16/status/update-enhancement.png and /dev/null differ diff --git a/data/icons/16x16/status/update-high.png b/data/icons/16x16/status/update-high.png deleted file mode 100644 index c79d595..0000000 Binary files a/data/icons/16x16/status/update-high.png and /dev/null differ diff --git a/data/icons/16x16/status/update-low.png b/data/icons/16x16/status/update-low.png deleted file mode 100644 index f0e7c2a..0000000 Binary files a/data/icons/16x16/status/update-low.png and /dev/null differ diff --git a/data/icons/16x16/status/update-normal.png b/data/icons/16x16/status/update-normal.png deleted file mode 100644 index d6e38e5..0000000 Binary files a/data/icons/16x16/status/update-normal.png and /dev/null differ diff --git a/data/icons/16x16/status/update-security.png b/data/icons/16x16/status/update-security.png deleted file mode 100644 index da1134c..0000000 Binary files a/data/icons/16x16/status/update-security.png and /dev/null differ diff --git a/data/icons/16x16/status/wait.png b/data/icons/16x16/status/wait.png deleted file mode 100644 index 0357a30..0000000 Binary files a/data/icons/16x16/status/wait.png and /dev/null differ diff --git a/data/icons/22x22/status/collection-available.png b/data/icons/22x22/status/collection-available.png deleted file mode 100644 index 810c39e..0000000 Binary files a/data/icons/22x22/status/collection-available.png and /dev/null differ diff --git a/data/icons/22x22/status/collection-installed.png b/data/icons/22x22/status/collection-installed.png deleted file mode 100644 index c1ba053..0000000 Binary files a/data/icons/22x22/status/collection-installed.png and /dev/null differ diff --git a/data/icons/22x22/status/package-add.png b/data/icons/22x22/status/package-add.png deleted file mode 100644 index 30f886e..0000000 Binary files a/data/icons/22x22/status/package-add.png and /dev/null differ diff --git a/data/icons/22x22/status/package-available.png b/data/icons/22x22/status/package-available.png deleted file mode 100644 index 0e2e4cd..0000000 Binary files a/data/icons/22x22/status/package-available.png and /dev/null differ diff --git a/data/icons/22x22/status/package-blocked.png b/data/icons/22x22/status/package-blocked.png deleted file mode 100644 index 3af34ee..0000000 Binary files a/data/icons/22x22/status/package-blocked.png and /dev/null differ diff --git a/data/icons/22x22/status/package-cleanup.png b/data/icons/22x22/status/package-cleanup.png deleted file mode 100644 index f0a51e3..0000000 Binary files a/data/icons/22x22/status/package-cleanup.png and /dev/null differ diff --git a/data/icons/22x22/status/package-delete.png b/data/icons/22x22/status/package-delete.png deleted file mode 100644 index b1a7d10..0000000 Binary files a/data/icons/22x22/status/package-delete.png and /dev/null differ diff --git a/data/icons/22x22/status/package-download.png b/data/icons/22x22/status/package-download.png deleted file mode 100644 index ea950a1..0000000 Binary files a/data/icons/22x22/status/package-download.png and /dev/null differ diff --git a/data/icons/22x22/status/package-downloaded.png b/data/icons/22x22/status/package-downloaded.png deleted file mode 100644 index c257b9e..0000000 Binary files a/data/icons/22x22/status/package-downloaded.png and /dev/null differ diff --git a/data/icons/22x22/status/package-info.png b/data/icons/22x22/status/package-info.png deleted file mode 100644 index 52de5e8..0000000 Binary files a/data/icons/22x22/status/package-info.png and /dev/null differ diff --git a/data/icons/22x22/status/package-installed.png b/data/icons/22x22/status/package-installed.png deleted file mode 100644 index dc76287..0000000 Binary files a/data/icons/22x22/status/package-installed.png and /dev/null differ diff --git a/data/icons/22x22/status/package-search.png b/data/icons/22x22/status/package-search.png deleted file mode 100644 index 32451aa..0000000 Binary files a/data/icons/22x22/status/package-search.png and /dev/null differ diff --git a/data/icons/22x22/status/package-sources.png b/data/icons/22x22/status/package-sources.png deleted file mode 100644 index 0eed75d..0000000 Binary files a/data/icons/22x22/status/package-sources.png and /dev/null differ diff --git a/data/icons/22x22/status/package-update.png b/data/icons/22x22/status/package-update.png deleted file mode 100644 index 41e5bce..0000000 Binary files a/data/icons/22x22/status/package-update.png and /dev/null differ diff --git a/data/icons/22x22/status/refresh-cache.png b/data/icons/22x22/status/refresh-cache.png deleted file mode 100644 index bdac66e..0000000 Binary files a/data/icons/22x22/status/refresh-cache.png and /dev/null differ diff --git a/data/icons/22x22/status/rollback.png b/data/icons/22x22/status/rollback.png deleted file mode 100644 index bdd914a..0000000 Binary files a/data/icons/22x22/status/rollback.png and /dev/null differ diff --git a/data/icons/22x22/status/service-pack.png b/data/icons/22x22/status/service-pack.png deleted file mode 100644 index f6590b2..0000000 Binary files a/data/icons/22x22/status/service-pack.png and /dev/null differ diff --git a/data/icons/22x22/status/setup.png b/data/icons/22x22/status/setup.png deleted file mode 100644 index 9e77923..0000000 Binary files a/data/icons/22x22/status/setup.png and /dev/null differ diff --git a/data/icons/22x22/status/update-bugfix.png b/data/icons/22x22/status/update-bugfix.png deleted file mode 100644 index ec8b3b6..0000000 Binary files a/data/icons/22x22/status/update-bugfix.png and /dev/null differ diff --git a/data/icons/22x22/status/update-enhancement.png b/data/icons/22x22/status/update-enhancement.png deleted file mode 100644 index 15078ab..0000000 Binary files a/data/icons/22x22/status/update-enhancement.png and /dev/null differ diff --git a/data/icons/22x22/status/update-high.png b/data/icons/22x22/status/update-high.png deleted file mode 100644 index 552a1a3..0000000 Binary files a/data/icons/22x22/status/update-high.png and /dev/null differ diff --git a/data/icons/22x22/status/update-low.png b/data/icons/22x22/status/update-low.png deleted file mode 100644 index 875685a..0000000 Binary files a/data/icons/22x22/status/update-low.png and /dev/null differ diff --git a/data/icons/22x22/status/update-normal.png b/data/icons/22x22/status/update-normal.png deleted file mode 100644 index 485cfda..0000000 Binary files a/data/icons/22x22/status/update-normal.png and /dev/null differ diff --git a/data/icons/22x22/status/update-security.png b/data/icons/22x22/status/update-security.png deleted file mode 100644 index 84161a5..0000000 Binary files a/data/icons/22x22/status/update-security.png and /dev/null differ diff --git a/data/icons/22x22/status/wait.png b/data/icons/22x22/status/wait.png deleted file mode 100644 index fd62b44..0000000 Binary files a/data/icons/22x22/status/wait.png and /dev/null differ diff --git a/data/icons/24x24/status/collection-available.png b/data/icons/24x24/status/collection-available.png deleted file mode 100644 index f712992..0000000 Binary files a/data/icons/24x24/status/collection-available.png and /dev/null differ diff --git a/data/icons/24x24/status/collection-installed.png b/data/icons/24x24/status/collection-installed.png deleted file mode 100644 index 2d41440..0000000 Binary files a/data/icons/24x24/status/collection-installed.png and /dev/null differ diff --git a/data/icons/24x24/status/package-add.png b/data/icons/24x24/status/package-add.png index 5af1d5f..d69b6c8 100644 Binary files a/data/icons/24x24/status/package-add.png and b/data/icons/24x24/status/package-add.png differ diff --git a/data/icons/24x24/status/package-available.png b/data/icons/24x24/status/package-available.png deleted file mode 100644 index b31dc9c..0000000 Binary files a/data/icons/24x24/status/package-available.png and /dev/null differ diff --git a/data/icons/24x24/status/package-blocked.png b/data/icons/24x24/status/package-blocked.png deleted file mode 100644 index 639d8c3..0000000 Binary files a/data/icons/24x24/status/package-blocked.png and /dev/null differ diff --git a/data/icons/24x24/status/package-cleanup.png b/data/icons/24x24/status/package-cleanup.png index 7cf1caa..c6c9055 100644 Binary files a/data/icons/24x24/status/package-cleanup.png and b/data/icons/24x24/status/package-cleanup.png differ diff --git a/data/icons/24x24/status/package-delete.png b/data/icons/24x24/status/package-delete.png index 372e5f4..f25da2f 100644 Binary files a/data/icons/24x24/status/package-delete.png and b/data/icons/24x24/status/package-delete.png differ diff --git a/data/icons/24x24/status/package-download.png b/data/icons/24x24/status/package-download.png index 91be1bf..4603b75 100644 Binary files a/data/icons/24x24/status/package-download.png and b/data/icons/24x24/status/package-download.png differ diff --git a/data/icons/24x24/status/package-downloaded.png b/data/icons/24x24/status/package-downloaded.png deleted file mode 100644 index c90fa5c..0000000 Binary files a/data/icons/24x24/status/package-downloaded.png and /dev/null differ diff --git a/data/icons/24x24/status/package-info.png b/data/icons/24x24/status/package-info.png deleted file mode 100644 index 58411b7..0000000 Binary files a/data/icons/24x24/status/package-info.png and /dev/null differ diff --git a/data/icons/24x24/status/package-installed.png b/data/icons/24x24/status/package-installed.png deleted file mode 100644 index 5ecc030..0000000 Binary files a/data/icons/24x24/status/package-installed.png and /dev/null differ diff --git a/data/icons/24x24/status/package-search.png b/data/icons/24x24/status/package-search.png index b43b113..44bed0f 100644 Binary files a/data/icons/24x24/status/package-search.png and b/data/icons/24x24/status/package-search.png differ diff --git a/data/icons/24x24/status/package-setup.png b/data/icons/24x24/status/package-setup.png new file mode 100644 index 0000000..c1577b9 Binary files /dev/null and b/data/icons/24x24/status/package-setup.png differ diff --git a/data/icons/24x24/status/package-sources.png b/data/icons/24x24/status/package-sources.png deleted file mode 100644 index 4b0c7ab..0000000 Binary files a/data/icons/24x24/status/package-sources.png and /dev/null differ diff --git a/data/icons/24x24/status/package-update.png b/data/icons/24x24/status/package-update.png index 163764b..d2e1718 100644 Binary files a/data/icons/24x24/status/package-update.png and b/data/icons/24x24/status/package-update.png differ diff --git a/data/icons/24x24/status/package-wait.png b/data/icons/24x24/status/package-wait.png new file mode 100644 index 0000000..6ac944b Binary files /dev/null and b/data/icons/24x24/status/package-wait.png differ diff --git a/data/icons/24x24/status/refresh-cache.png b/data/icons/24x24/status/refresh-cache.png index 241682b..c1b082e 100644 Binary files a/data/icons/24x24/status/refresh-cache.png and b/data/icons/24x24/status/refresh-cache.png differ diff --git a/data/icons/24x24/status/rollback.png b/data/icons/24x24/status/rollback.png deleted file mode 100644 index 305d040..0000000 Binary files a/data/icons/24x24/status/rollback.png and /dev/null differ diff --git a/data/icons/24x24/status/service-pack.png b/data/icons/24x24/status/service-pack.png deleted file mode 100644 index f4c6677..0000000 Binary files a/data/icons/24x24/status/service-pack.png and /dev/null differ diff --git a/data/icons/24x24/status/setup.png b/data/icons/24x24/status/setup.png deleted file mode 100644 index 4c85f23..0000000 Binary files a/data/icons/24x24/status/setup.png and /dev/null differ diff --git a/data/icons/24x24/status/update-bugfix.png b/data/icons/24x24/status/update-bugfix.png deleted file mode 100644 index 10cbd5e..0000000 Binary files a/data/icons/24x24/status/update-bugfix.png and /dev/null differ diff --git a/data/icons/24x24/status/update-enhancement.png b/data/icons/24x24/status/update-enhancement.png deleted file mode 100644 index 244aae7..0000000 Binary files a/data/icons/24x24/status/update-enhancement.png and /dev/null differ diff --git a/data/icons/24x24/status/update-high.png b/data/icons/24x24/status/update-high.png deleted file mode 100644 index 291958f..0000000 Binary files a/data/icons/24x24/status/update-high.png and /dev/null differ diff --git a/data/icons/24x24/status/update-low.png b/data/icons/24x24/status/update-low.png deleted file mode 100644 index cc73681..0000000 Binary files a/data/icons/24x24/status/update-low.png and /dev/null differ diff --git a/data/icons/24x24/status/update-normal.png b/data/icons/24x24/status/update-normal.png deleted file mode 100644 index db71dbd..0000000 Binary files a/data/icons/24x24/status/update-normal.png and /dev/null differ diff --git a/data/icons/24x24/status/update-security.png b/data/icons/24x24/status/update-security.png deleted file mode 100644 index f2cf156..0000000 Binary files a/data/icons/24x24/status/update-security.png and /dev/null differ diff --git a/data/icons/24x24/status/wait.png b/data/icons/24x24/status/wait.png deleted file mode 100644 index 298a3fe..0000000 Binary files a/data/icons/24x24/status/wait.png and /dev/null differ diff --git a/data/icons/48x48/status/collection-available.png b/data/icons/48x48/status/collection-available.png deleted file mode 100644 index 551dca3..0000000 Binary files a/data/icons/48x48/status/collection-available.png and /dev/null differ diff --git a/data/icons/48x48/status/collection-installed.png b/data/icons/48x48/status/collection-installed.png deleted file mode 100644 index b60c006..0000000 Binary files a/data/icons/48x48/status/collection-installed.png and /dev/null differ diff --git a/data/icons/48x48/status/package-add.png b/data/icons/48x48/status/package-add.png deleted file mode 100644 index 948a7c7..0000000 Binary files a/data/icons/48x48/status/package-add.png and /dev/null differ diff --git a/data/icons/48x48/status/package-available.png b/data/icons/48x48/status/package-available.png deleted file mode 100644 index 7eb00b4..0000000 Binary files a/data/icons/48x48/status/package-available.png and /dev/null differ diff --git a/data/icons/48x48/status/package-blocked.png b/data/icons/48x48/status/package-blocked.png deleted file mode 100644 index 3179f6a..0000000 Binary files a/data/icons/48x48/status/package-blocked.png and /dev/null differ diff --git a/data/icons/48x48/status/package-cleanup.png b/data/icons/48x48/status/package-cleanup.png deleted file mode 100644 index 5d6fc99..0000000 Binary files a/data/icons/48x48/status/package-cleanup.png and /dev/null differ diff --git a/data/icons/48x48/status/package-delete.png b/data/icons/48x48/status/package-delete.png deleted file mode 100644 index 0cebdc1..0000000 Binary files a/data/icons/48x48/status/package-delete.png and /dev/null differ diff --git a/data/icons/48x48/status/package-download.png b/data/icons/48x48/status/package-download.png deleted file mode 100644 index 309167c..0000000 Binary files a/data/icons/48x48/status/package-download.png and /dev/null differ diff --git a/data/icons/48x48/status/package-downloaded.png b/data/icons/48x48/status/package-downloaded.png deleted file mode 100644 index 9eac622..0000000 Binary files a/data/icons/48x48/status/package-downloaded.png and /dev/null differ diff --git a/data/icons/48x48/status/package-info.png b/data/icons/48x48/status/package-info.png deleted file mode 100644 index bb0c6de..0000000 Binary files a/data/icons/48x48/status/package-info.png and /dev/null differ diff --git a/data/icons/48x48/status/package-installed.png b/data/icons/48x48/status/package-installed.png deleted file mode 100644 index 25556b1..0000000 Binary files a/data/icons/48x48/status/package-installed.png and /dev/null differ diff --git a/data/icons/48x48/status/package-search.png b/data/icons/48x48/status/package-search.png deleted file mode 100644 index 7edf5b2..0000000 Binary files a/data/icons/48x48/status/package-search.png and /dev/null differ diff --git a/data/icons/48x48/status/package-sources.png b/data/icons/48x48/status/package-sources.png deleted file mode 100644 index 4afc4ea..0000000 Binary files a/data/icons/48x48/status/package-sources.png and /dev/null differ diff --git a/data/icons/48x48/status/package-update.png b/data/icons/48x48/status/package-update.png deleted file mode 100644 index 2e0db6c..0000000 Binary files a/data/icons/48x48/status/package-update.png and /dev/null differ diff --git a/data/icons/48x48/status/refresh-cache.png b/data/icons/48x48/status/refresh-cache.png deleted file mode 100644 index ca56719..0000000 Binary files a/data/icons/48x48/status/refresh-cache.png and /dev/null differ diff --git a/data/icons/48x48/status/rollback.png b/data/icons/48x48/status/rollback.png deleted file mode 100644 index df4b180..0000000 Binary files a/data/icons/48x48/status/rollback.png and /dev/null differ diff --git a/data/icons/48x48/status/service-pack.png b/data/icons/48x48/status/service-pack.png deleted file mode 100644 index 1da37f7..0000000 Binary files a/data/icons/48x48/status/service-pack.png and /dev/null differ diff --git a/data/icons/48x48/status/setup.png b/data/icons/48x48/status/setup.png deleted file mode 100644 index b1c242c..0000000 Binary files a/data/icons/48x48/status/setup.png and /dev/null differ diff --git a/data/icons/48x48/status/update-bugfix.png b/data/icons/48x48/status/update-bugfix.png deleted file mode 100644 index 5456998..0000000 Binary files a/data/icons/48x48/status/update-bugfix.png and /dev/null differ diff --git a/data/icons/48x48/status/update-enhancement.png b/data/icons/48x48/status/update-enhancement.png deleted file mode 100644 index 084b754..0000000 Binary files a/data/icons/48x48/status/update-enhancement.png and /dev/null differ diff --git a/data/icons/48x48/status/update-high.png b/data/icons/48x48/status/update-high.png deleted file mode 100644 index 2d4ecae..0000000 Binary files a/data/icons/48x48/status/update-high.png and /dev/null differ diff --git a/data/icons/48x48/status/update-low.png b/data/icons/48x48/status/update-low.png deleted file mode 100644 index e7ad608..0000000 Binary files a/data/icons/48x48/status/update-low.png and /dev/null differ diff --git a/data/icons/48x48/status/update-normal.png b/data/icons/48x48/status/update-normal.png deleted file mode 100644 index 95a86cb..0000000 Binary files a/data/icons/48x48/status/update-normal.png and /dev/null differ diff --git a/data/icons/48x48/status/update-security.png b/data/icons/48x48/status/update-security.png deleted file mode 100644 index 6223571..0000000 Binary files a/data/icons/48x48/status/update-security.png and /dev/null differ diff --git a/data/icons/48x48/status/wait.png b/data/icons/48x48/status/wait.png deleted file mode 100644 index 52cc9d7..0000000 Binary files a/data/icons/48x48/status/wait.png and /dev/null differ diff --git a/data/icons/scalable/status/collection-available.svg b/data/icons/scalable/status/collection-available.svg deleted file mode 100644 index 6b63c71..0000000 --- a/data/icons/scalable/status/collection-available.svg +++ /dev/null @@ -1,1458 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/collection-installed.svg b/data/icons/scalable/status/collection-installed.svg deleted file mode 100644 index 6af4862..0000000 --- a/data/icons/scalable/status/collection-installed.svg +++ /dev/null @@ -1,1442 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-add.svg b/data/icons/scalable/status/package-add.svg deleted file mode 100644 index eae1f40..0000000 --- a/data/icons/scalable/status/package-add.svg +++ /dev/null @@ -1,350 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-available.svg b/data/icons/scalable/status/package-available.svg deleted file mode 100644 index cb88f1e..0000000 --- a/data/icons/scalable/status/package-available.svg +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-blocked.svg b/data/icons/scalable/status/package-blocked.svg deleted file mode 100644 index 13da994..0000000 --- a/data/icons/scalable/status/package-blocked.svg +++ /dev/null @@ -1,938 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-cleanup.svg b/data/icons/scalable/status/package-cleanup.svg deleted file mode 100644 index 77737df..0000000 --- a/data/icons/scalable/status/package-cleanup.svg +++ /dev/null @@ -1,550 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-delete.svg b/data/icons/scalable/status/package-delete.svg deleted file mode 100644 index 25e2f67..0000000 --- a/data/icons/scalable/status/package-delete.svg +++ /dev/null @@ -1,554 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-download.svg b/data/icons/scalable/status/package-download.svg deleted file mode 100644 index ea3563d..0000000 --- a/data/icons/scalable/status/package-download.svg +++ /dev/null @@ -1,1154 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-downloaded.svg b/data/icons/scalable/status/package-downloaded.svg deleted file mode 100644 index 33413f7..0000000 --- a/data/icons/scalable/status/package-downloaded.svg +++ /dev/null @@ -1,532 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-info.svg b/data/icons/scalable/status/package-info.svg deleted file mode 100644 index f69d51e..0000000 --- a/data/icons/scalable/status/package-info.svg +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-installed.svg b/data/icons/scalable/status/package-installed.svg deleted file mode 100644 index a2292ad..0000000 --- a/data/icons/scalable/status/package-installed.svg +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-search.svg b/data/icons/scalable/status/package-search.svg deleted file mode 100644 index a3afc2e..0000000 --- a/data/icons/scalable/status/package-search.svg +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-sources.svg b/data/icons/scalable/status/package-sources.svg deleted file mode 100644 index 0285875..0000000 --- a/data/icons/scalable/status/package-sources.svg +++ /dev/null @@ -1,985 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/package-update.svg b/data/icons/scalable/status/package-update.svg deleted file mode 100644 index f889666..0000000 --- a/data/icons/scalable/status/package-update.svg +++ /dev/null @@ -1,551 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/refresh-cache.svg b/data/icons/scalable/status/refresh-cache.svg deleted file mode 100644 index 9f0eb6a..0000000 --- a/data/icons/scalable/status/refresh-cache.svg +++ /dev/null @@ -1,1100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/rollback.svg b/data/icons/scalable/status/rollback.svg deleted file mode 100644 index a9aa37b..0000000 --- a/data/icons/scalable/status/rollback.svg +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/service-pack.svg b/data/icons/scalable/status/service-pack.svg deleted file mode 100644 index 8bcfeee..0000000 --- a/data/icons/scalable/status/service-pack.svg +++ /dev/null @@ -1,1379 +0,0 @@ - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/data/icons/scalable/status/setup.svg b/data/icons/scalable/status/setup.svg deleted file mode 100644 index fb5ac39..0000000 --- a/data/icons/scalable/status/setup.svg +++ /dev/null @@ -1,344 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-bugfix.svg b/data/icons/scalable/status/update-bugfix.svg deleted file mode 100644 index 10baea7..0000000 --- a/data/icons/scalable/status/update-bugfix.svg +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-enhancement.svg b/data/icons/scalable/status/update-enhancement.svg deleted file mode 100644 index e83aa30..0000000 --- a/data/icons/scalable/status/update-enhancement.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-high.svg b/data/icons/scalable/status/update-high.svg deleted file mode 100644 index 9dfd574..0000000 --- a/data/icons/scalable/status/update-high.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-low.svg b/data/icons/scalable/status/update-low.svg deleted file mode 100644 index 437112b..0000000 --- a/data/icons/scalable/status/update-low.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-normal.svg b/data/icons/scalable/status/update-normal.svg deleted file mode 100644 index ecf1e1c..0000000 --- a/data/icons/scalable/status/update-normal.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/update-security.svg b/data/icons/scalable/status/update-security.svg deleted file mode 100644 index a7b3691..0000000 --- a/data/icons/scalable/status/update-security.svg +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/status/wait.svg b/data/icons/scalable/status/wait.svg deleted file mode 100644 index ddf7438..0000000 --- a/data/icons/scalable/status/wait.svg +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui/dialogs.glade b/gui/dialogs.glade index 8c7b60c..a4aeaca 100644 --- a/gui/dialogs.glade +++ b/gui/dialogs.glade @@ -3,12 +3,10 @@ False - 5 False True center-on-parent dialog - True False error ok @@ -16,10 +14,10 @@ False vertical - 2 False + end False @@ -36,28 +34,19 @@ False - 5 False True center-on-parent dialog - True ok False vertical - 2 False end - - - - - - False @@ -71,18 +60,15 @@ False - 5 False center-on-parent dialog - True question yes-no False vertical - 2 False @@ -102,21 +88,19 @@ False - 5 False center-on-parent dialog - True warning ok False vertical - 2 False + end False diff --git a/gui/manager.glade b/gui/manager.glade index 1d23f8a..ba77ebc 100644 --- a/gui/manager.glade +++ b/gui/manager.glade @@ -3,19 +3,17 @@ False - 5 Choose True center-on-parent + system-software-install dialog - True False ManagerWindow False vertical - 2 False @@ -69,7 +67,6 @@ False False False - False @@ -108,13 +105,12 @@ False - 3 + 5 Summary True center-on-parent - /usr/share/pamac/icons/22x22/status/package-info.png + system-software-install dialog - True False ManagerWindow @@ -122,7 +118,7 @@ True False vertical - 3 + 5 True @@ -249,161 +245,13 @@ - - 250 - 60 - False - Progress - False - True - center-on-parent - 250 - 60 - /usr/share/pamac/icons/22x22/status/setup.png - dialog - False - ManagerWindow - False - - - True - False - 5 - 5 - 5 - 5 - vertical - 3 - - - True - False - 6 - - - True - False - /usr/share/pamac/icons/24x24/status/setup.png - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 0.050000000000000003 - True - end - - - False - True - 1 - - - - - True - False - end - - - gtk-cancel - True - True - True - 1 - - - - False - True - 0 - - - - - False - True - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 800 - 500 False Package Manager center - 800 - 500 - /usr/share/pamac/icons/22x22/status/package-sources.png + 900 + 550 + system-software-install @@ -414,8 +262,6 @@ True True - 5 - 5 True @@ -664,9 +510,8 @@ True packages_list 0 - True - False + @@ -675,30 +520,15 @@ True - fixed - 80 + autosize State True True 1 - - 5 - 0 - - + - 2 - 3 - - - - - 5 - 1 - - - 4 + 2 @@ -706,8 +536,7 @@ True - fixed - 250 + autosize Name True True @@ -725,8 +554,7 @@ True - fixed - 80 + autosize Version True True @@ -734,7 +562,7 @@ - 7 + 5 @@ -742,8 +570,7 @@ True - fixed - 80 + autosize Size True True @@ -751,7 +578,7 @@ - 5 + 3 @@ -1042,7 +869,7 @@ True True 5 - 0 + 2 @@ -1054,9 +881,6 @@ True False - 5 - 5 - 2 5 True end @@ -1132,22 +956,160 @@ False True - 1 + 3 + + 250 + 60 + False + 5 + Progress + False + True + center-on-parent + 250 + 60 + system-software-install + dialog + False + ManagerWindow + False + + + True + False + vertical + 5 + + + True + False + 5 + + + True + False + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 0.050000000000000003 + True + end + + + False + True + 1 + + + + + True + False + end + + + gtk-cancel + True + True + True + 1 + + + + False + True + 0 + + + + + False + True + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/gui/updater.glade b/gui/updater.glade index 8cf9af0..caf558a 100644 --- a/gui/updater.glade +++ b/gui/updater.glade @@ -3,9 +3,10 @@ False + 5 Update Manager center - /usr/share/pamac/icons/22x22/status/package-update.png + system-software-update @@ -13,19 +14,18 @@ True True vertical - 4 + 8 True False - 7 - 7 - 10 + 5 True False - /usr/share/pamac/icons/48x48/status/package-update.png + 48 + system-software-update False @@ -55,10 +55,7 @@ True True - 7 - 7 - 2 - 7 + 5 end @@ -109,7 +106,6 @@ False True - 4 end 0 @@ -131,7 +127,6 @@ False False 0 - False @@ -161,7 +156,6 @@ True True - 6 2 diff --git a/pamac-daemon.py b/pamac-daemon.py index b69bafd..bf97f8b 100755 --- a/pamac-daemon.py +++ b/pamac-daemon.py @@ -28,7 +28,7 @@ class PamacDBusService(dbus.service.Object): self.previous_action = '' self.action = _('Preparing')+'...' self.previous_icon = '' - self.icon = '/usr/share/pamac/icons/24x24/status/setup.png' + self.icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' self.previous_target = '' self.target = '' self.previous_percent = 0 @@ -76,7 +76,7 @@ class PamacDBusService(dbus.service.Object): self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png' elif ID is 5: self.action = _('Resolving dependencies')+'...' - self.icon = '/usr/share/pamac/icons/24x24/status/setup.png' + self.icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' elif ID is 6: if self.warning: self.EmitLogWarning(self.warning) @@ -107,7 +107,7 @@ class PamacDBusService(dbus.service.Object): print(formatted_event) elif ID is 15: self.action = _('Downgrading')+'...' - self.icon = '/usr/share/pamac/icons/24x24/status/rollback.png' + self.icon = '/usr/share/pamac/icons/24x24/status/package-add.png' print('Downgrading a package') #elif ID is 16: #formatted_event = 'Downgraded {pkgname} ({oldversion} -> {newversion})'.format(pkgname = tupel[1].name, oldversion = tupel[1].version, newversion = tupel[0].version) @@ -131,7 +131,7 @@ class PamacDBusService(dbus.service.Object): print('Loading packages files') elif ID is 30: self.action = _('Configuring')+'...' - self.icon = '/usr/share/pamac/icons/24x24/status/setup.png' + self.icon = '/usr/share/pamac/icons/24x24/status/package-setup.png' self.EmitPercent(2) print('Configuring a package') elif ID is 31: @@ -300,8 +300,8 @@ class PamacDBusService(dbus.service.Object): if self.error: self.EmitTransactionError(self.error) else: - self.EmitTransactionDone('') self.CheckUpdates() + self.EmitTransactionDone('') self.task = Process(target=refresh) self.task.start() success('') diff --git a/pamac-tray.py b/pamac-tray.py index 0e18ce1..141d656 100755 --- a/pamac-tray.py +++ b/pamac-tray.py @@ -5,6 +5,8 @@ from gi.repository import Gtk, GObject from subprocess import Popen import dbus import threading +from pamac import common +from time import sleep # i18n import gettext @@ -16,54 +18,60 @@ GObject.threads_init() icon = '' info = '' -update_icon = '/usr/share/pamac/icons/scalable/status/update-normal.svg' +update_icon = 'software-update-available' update_info = _('{number} available updates') one_update_info = _('1 available update') -noupdate_icon = '/usr/share/pamac/icons/scalable/status/update-enhancement.svg' +noupdate_icon = '' noupdate_info = _('Your system is up-to-date') class Tray: def __init__(self): self.statusIcon = Gtk.StatusIcon() - self.statusIcon.set_visible(True) - self.menu = Gtk.Menu() - self.menuItem = Gtk.ImageMenuItem(_('Install/Check for updates')) - self.menuItem.connect('activate', self.execute_update, self.statusIcon) - self.menu.append(self.menuItem) - self.menuItem = Gtk.ImageMenuItem(_('Run pamac-manager')) - self.menuItem.connect('activate', self.execute_manager, self.statusIcon) - self.menu.append(self.menuItem) - self.menuItem = Gtk.ImageMenuItem(_('Quit')) - self.menuItem.connect('activate', self.quit_tray, self.statusIcon) - self.menu.append(self.menuItem) + #~ self.menu = Gtk.Menu() + #~ self.menuItem = Gtk.ImageMenuItem(_('Install/Check for updates')) + #~ self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-update', 16, 0))) + #~ self.menuItem.connect('activate', self.execute_update, self.statusIcon) + #~ self.menu.append(self.menuItem) + #~ self.menuItem = Gtk.ImageMenuItem(_('Manage packages')) + #~ self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-install', 16, 0))) + #~ self.menuItem.connect('activate', self.execute_manager, self.statusIcon) + #~ self.menu.append(self.menuItem) + #~ self.menuItem = Gtk.ImageMenuItem(_('Quit')) + #~ self.menuItem.set_image(Gtk.Image.new_from_stock('gtk-quit', Gtk.IconSize.MENU)) + #~ self.menuItem.connect('activate', self.quit_tray, self.statusIcon) + #~ self.menu.append(self.menuItem) - self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu) - self.statusIcon.connect('activate', self.activate_cb, self.menu) + #~ self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu) + self.statusIcon.connect('activate', self.activate_cb)#, self.menu) - def execute_update(self, widget, event, data = None): - Popen(['/usr/bin/pamac-updater']) + #~ def execute_update(self, widget, event, data = None): + #~ Popen(['/usr/bin/pamac-updater']) - def execute_manager(self, widget, event, data = None): - Popen(['/usr/bin/pamac-manager']) + #~ def execute_manager(self, widget, event, data = None): + #~ Popen(['/usr/bin/pamac-manager']) - def quit_tray(self, widget, data = None): - t.shutdown() - Gtk.main_quit() + #~ def quit_tray(self, widget, data = None): + #~ t.shutdown() + #~ Gtk.main_quit() - def popup_menu_cb(self, widget, button, time, data = None): - if button == 3: - if data: - data.show_all() - data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time) + #~ def popup_menu_cb(self, widget, button, time, data = None): + #~ if button == 3: + #~ if data: + #~ data.show_all() + #~ data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time) def activate_cb(self, widget, data = None): - Popen(['notify-send', '-i', icon, '-u', 'normal', 'Pamac', info]) + if icon == update_icon: + Popen(['/usr/bin/pamac-updater']) def update_icon(self, icon, info): - self.statusIcon.set_from_file(icon) + self.statusIcon.set_from_icon_name(icon) self.statusIcon.set_tooltip_markup(info) + def set_visible(self, boolean): + self.statusIcon.set_visible(boolean) + class PeriodicTask(threading.Thread): """Thread that executes a task every N seconds""" def __init__(self): @@ -99,10 +107,14 @@ def set_icon(updates): info = one_update_info else: info = update_info.format(number = updates) - Popen(['notify-send', '-i', icon, '-u', 'normal', 'Pamac', info]) + tray.set_visible(True) + sleep(2) + if not common.pid_file_exists(): + Popen(['notify-send', '-i', 'system-software-update', '-u', 'normal', _('Update Manager'), info]) else: icon = noupdate_icon info = noupdate_info + tray.set_visible(False) print(info) tray.update_icon(icon, info) diff --git a/pamac.pot b/pamac.pot index 9d2cb9c..5adef06 100644 --- a/pamac.pot +++ b/pamac.pot @@ -20,7 +20,7 @@ msgstr "" msgid "Authentication is required" msgstr "" -#: pamac-daemon.py:29 pamac/main.py:505 +#: pamac-daemon.py:29 pamac/main.py:503 msgid "Preparing" msgstr "" @@ -80,11 +80,11 @@ msgstr "" msgid "Downloading {size}" msgstr "" -#: pamac-daemon.py:203 pamac/main.py:439 pamac/main.py:1099 +#: pamac-daemon.py:203 pamac/main.py:437 pamac/main.py:1126 msgid "Refreshing" msgstr "" -#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:533 +#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:531 msgid "{pkgname} is not a valid path or package name" msgstr "" @@ -96,35 +96,27 @@ msgstr "" msgid "Authentication failed" msgstr "" -#: pamac-tray.py:20 +#: pamac-tray.py:22 msgid "{number} available updates" msgstr "" -#: pamac-tray.py:21 +#: pamac-tray.py:23 msgid "1 available update" msgstr "" -#: pamac-tray.py:23 +#: pamac-tray.py:25 msgid "Your system is up-to-date" msgstr "" -#: pamac-tray.py:31 -msgid "Install/Check for updates" +#: pamac-tray.py:113 gui/updater.glade:7 +msgid "Update Manager" msgstr "" -#: pamac-tray.py:34 -msgid "Run pamac-manager" -msgstr "" - -#: pamac-tray.py:37 -msgid "Quit" -msgstr "" - -#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:897 +#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:915 msgid "Nothing to do" msgstr "" -#: pamac-install.py:87 pamac/main.py:1150 +#: pamac-install.py:87 pamac/main.py:1177 msgid "Pamac is already running" msgstr "" @@ -134,205 +126,205 @@ msgid "" "Please update your system first" msgstr "" -#: pamac/main.py:89 pamac/main.py:1052 +#: pamac/main.py:88 pamac/main.py:1083 msgid "local" msgstr "" -#: pamac/main.py:180 pamac/main.py:954 pamac/main.py:1003 +#: pamac/main.py:178 pamac/main.py:973 pamac/main.py:1034 msgid "No package found" msgstr "" -#: pamac/main.py:231 +#: pamac/main.py:229 msgid "Licenses" msgstr "" -#: pamac/main.py:236 +#: pamac/main.py:234 msgid "Depends On" msgstr "" -#: pamac/main.py:241 pamac/main.py:1035 pamac/main.py:1224 +#: pamac/main.py:239 pamac/main.py:1066 pamac/main.py:1251 msgid "Installed" msgstr "" -#: pamac/main.py:244 +#: pamac/main.py:242 msgid "Optional Deps" msgstr "" -#: pamac/main.py:247 +#: pamac/main.py:245 msgid "Required By" msgstr "" -#: pamac/main.py:249 +#: pamac/main.py:247 msgid "Provides" msgstr "" -#: pamac/main.py:251 +#: pamac/main.py:249 msgid "Replaces" msgstr "" -#: pamac/main.py:253 +#: pamac/main.py:251 msgid "Conflicts With" msgstr "" -#: pamac/main.py:258 +#: pamac/main.py:256 msgid "Repository" msgstr "" -#: pamac/main.py:260 gui/manager.glade:538 +#: pamac/main.py:258 gui/manager.glade:384 msgid "Groups" msgstr "" -#: pamac/main.py:262 +#: pamac/main.py:260 msgid "Compressed Size" msgstr "" -#: pamac/main.py:263 +#: pamac/main.py:261 msgid "Download Size" msgstr "" -#: pamac/main.py:265 +#: pamac/main.py:263 msgid "Installed Size" msgstr "" -#: pamac/main.py:266 +#: pamac/main.py:264 msgid "Packager" msgstr "" -#: pamac/main.py:267 +#: pamac/main.py:265 msgid "Architecture" msgstr "" -#: pamac/main.py:270 +#: pamac/main.py:268 msgid "Install Date" msgstr "" -#: pamac/main.py:272 +#: pamac/main.py:270 msgid "Explicitly installed" msgstr "" -#: pamac/main.py:274 +#: pamac/main.py:272 msgid "Installed as a dependency for another package" msgstr "" -#: pamac/main.py:276 +#: pamac/main.py:274 msgid "Unknown" msgstr "" -#: pamac/main.py:277 +#: pamac/main.py:275 msgid "Install Reason" msgstr "" -#: pamac/main.py:282 +#: pamac/main.py:280 msgid "Signatures" msgstr "" -#: pamac/main.py:286 +#: pamac/main.py:284 msgid "Backup files" msgstr "" -#: pamac/main.py:326 +#: pamac/main.py:324 msgid "Transaction Summary" msgstr "" -#: pamac/main.py:328 pamac/main.py:1041 pamac/main.py:1224 +#: pamac/main.py:326 pamac/main.py:1072 pamac/main.py:1251 msgid "To install" msgstr "" -#: pamac/main.py:334 +#: pamac/main.py:332 msgid "To reinstall" msgstr "" -#: pamac/main.py:340 +#: pamac/main.py:338 msgid "To downgrade" msgstr "" -#: pamac/main.py:346 pamac/main.py:1043 pamac/main.py:1224 +#: pamac/main.py:344 pamac/main.py:1074 pamac/main.py:1251 msgid "To remove" msgstr "" -#: pamac/main.py:353 +#: pamac/main.py:351 msgid "To update" msgstr "" -#: pamac/main.py:364 pamac/main.py:461 +#: pamac/main.py:362 pamac/main.py:459 msgid "Total download size: " msgstr "" -#: pamac/main.py:454 pamac/main.py:1236 +#: pamac/main.py:452 pamac/main.py:1263 msgid "Your system is up-to-date" msgstr "" -#: pamac/main.py:463 +#: pamac/main.py:461 msgid "1 available update" msgstr "" -#: pamac/main.py:465 +#: pamac/main.py:463 msgid "{number} available updates" msgstr "" -#: pamac/main.py:551 pamac/main.py:552 +#: pamac/main.py:549 pamac/main.py:550 msgid "" "The transaction cannot be performed because it needs to remove {pkgname1} " "which is a locked package" msgstr "" -#: pamac/main.py:583 pamac/main.py:584 pamac/main.py:686 pamac/main.py:687 +#: pamac/main.py:585 pamac/main.py:586 pamac/main.py:697 pamac/main.py:698 msgid "{pkgname1} will be replaced by {pkgname2}" msgstr "" -#: pamac/main.py:701 pamac/main.py:702 pamac/main.py:726 pamac/main.py:727 -#: pamac/main.py:747 pamac/main.py:748 pamac/main.py:778 pamac/main.py:779 -#: pamac/main.py:803 pamac/main.py:804 pamac/main.py:824 pamac/main.py:825 +#: pamac/main.py:714 pamac/main.py:715 pamac/main.py:739 pamac/main.py:740 +#: pamac/main.py:760 pamac/main.py:761 pamac/main.py:791 pamac/main.py:792 +#: pamac/main.py:816 pamac/main.py:817 pamac/main.py:837 pamac/main.py:838 msgid "{pkgname1} conflicts with {pkgname2}" msgstr "" -#: pamac/main.py:759 pamac/main.py:760 +#: pamac/main.py:772 pamac/main.py:773 msgid "" "{pkgname1} conflicts with {pkgname2}\n" "None of them will be installed" msgstr "" -#: pamac/main.py:856 +#: pamac/main.py:874 msgid "" "{pkgname} is provided by {number} packages.\n" "Please choose the one(s) you want to install:" msgstr "" -#: pamac/main.py:939 +#: pamac/main.py:957 msgid "" "{pkgname} has {number} uninstalled optional deps.\n" "Please choose the one(s) you want to install:" msgstr "" -#: pamac/main.py:957 +#: pamac/main.py:976 msgid "Unselect" msgstr "" -#: pamac/main.py:961 +#: pamac/main.py:982 msgid "Remove" msgstr "" -#: pamac/main.py:964 +#: pamac/main.py:987 msgid "Reinstall" msgstr "" -#: pamac/main.py:975 +#: pamac/main.py:1000 msgid "Install optional deps" msgstr "" -#: pamac/main.py:979 +#: pamac/main.py:1006 msgid "Install" msgstr "" -#: pamac/main.py:990 +#: pamac/main.py:1019 msgid "Install with optional deps" msgstr "" -#: pamac/main.py:1037 pamac/main.py:1224 +#: pamac/main.py:1068 pamac/main.py:1251 msgid "Uninstalled" msgstr "" -#: pamac/main.py:1039 pamac/main.py:1224 +#: pamac/main.py:1070 pamac/main.py:1251 msgid "Orphans" msgstr "" @@ -346,62 +338,58 @@ msgstr "" msgid "%.2f MiB" msgstr "" -#: gui/manager.glade:7 +#: gui/manager.glade:6 msgid "Choose" msgstr "" -#: gui/manager.glade:112 +#: gui/manager.glade:109 msgid "Summary" msgstr "" -#: gui/manager.glade:256 -msgid "Progress" -msgstr "" - -#: gui/manager.glade:402 +#: gui/manager.glade:250 msgid "Package Manager" msgstr "" -#: gui/manager.glade:492 +#: gui/manager.glade:338 msgid "Search" msgstr "" -#: gui/manager.glade:585 gui/manager.glade:680 +#: gui/manager.glade:431 gui/manager.glade:524 msgid "State" msgstr "" -#: gui/manager.glade:632 +#: gui/manager.glade:478 msgid "Repos" msgstr "" -#: gui/manager.glade:711 +#: gui/manager.glade:540 msgid "Name" msgstr "" -#: gui/manager.glade:730 +#: gui/manager.glade:558 msgid "Version" msgstr "" -#: gui/manager.glade:747 +#: gui/manager.glade:574 msgid "Size" msgstr "" -#: gui/manager.glade:848 +#: gui/manager.glade:675 msgid "Infos" msgstr "" -#: gui/manager.glade:908 +#: gui/manager.glade:735 msgid "Deps" msgstr "" -#: gui/manager.glade:973 +#: gui/manager.glade:800 msgid "Details" msgstr "" -#: gui/manager.glade:1021 +#: gui/manager.glade:848 msgid "Files" msgstr "" -#: gui/updater.glade:6 -msgid "Update Manager" +#: gui/manager.glade:970 +msgid "Progress" msgstr "" diff --git a/pamac/main.py b/pamac/main.py index 49ed99f..44387ed 100644 --- a/pamac/main.py +++ b/pamac/main.py @@ -175,7 +175,7 @@ def refresh_packages_list(): packages_list.clear() packages_list_clearing = False if not pkg_name_list: - packages_list.append([_('No package found'), False, False, False, search_icon, '', 0, '']) + packages_list.append([_('No package found'), False, None, '', 0, '']) else: #installed = set(transaction.localpkgs.keys()) - transaction.to_remove #uninstalled = (set(transaction.syncpkgs.keys()) - installed) - transaction.to_add @@ -183,16 +183,16 @@ def refresh_packages_list(): name_list = sorted(pkg_name_list) for name in name_list: if name in config.holdpkg: - packages_list.append([name, True, False, True, locked_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) + packages_list.append([name, True, locked_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) elif name in transaction.to_add: - packages_list.append([name, False, True, True, to_install_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize, transaction.syncpkgs[name].version]) + packages_list.append([name, False, to_install_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize, transaction.syncpkgs[name].version]) elif name in transaction.to_remove: - packages_list.append([name, True, True, False, to_remove_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) + packages_list.append([name, True, to_remove_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) elif name in transaction.localpkgs.keys(): - packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) + packages_list.append([name, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize, transaction.localpkgs[name].version]) #elif name in uninstalled: else: - packages_list.append([name, False, True, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize, transaction.syncpkgs[name].version]) + packages_list.append([name, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].isize), transaction.syncpkgs[name].isize, transaction.syncpkgs[name].version]) Window.get_window().set_cursor(None) def set_packages_list(): @@ -501,7 +501,7 @@ def do_sysupgrade(): def finalize(): progress_label.set_text(_('Preparing')+'...') - action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/setup.png') + action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/package-setup.png') progress_bar.set_text('') progress_bar.set_fraction(0) ProgressWindow.show_all() @@ -843,7 +843,10 @@ def check_conflicts(): for pkg in pkg_list: wont_be_removed.add(pkg.name) wont_be_removed -= to_replace + print(depends) + print(transaction.to_remove) transaction.to_remove -= wont_be_removed + print(transaction.to_remove) if mode: Window.get_window().set_cursor(None) @@ -948,8 +951,7 @@ class Handler: menu = Gtk.Menu() def on_list_treeview_button_press_event(self, treeview, event): def mark_to_reinstall(widget, treeiter): - packages_list[treeiter][3] = True - packages_list[treeiter][4] = to_install_icon + packages_list[treeiter][2] = to_reinstall_icon transaction.to_add.add(packages_list[treeiter][0]) def select_optdeps(widget, pkgname, optdeps): choose_label.set_markup(_('{pkgname} has {number} uninstalled optional deps.\nPlease choose the one(s) you want to install:').format(pkgname = pkgname, number = str(len(optdeps)))) @@ -961,23 +963,30 @@ class Handler: transaction.to_add.add(long_string.split(':')[0]) def install_with_optdeps(widget, treeiter, pkgname, optdeps): select_optdeps(widget, pkgname, optdeps) - mark_to_reinstall(widget, treeiter) + packages_list[treeiter][2] = to_install_icon + transaction.to_add.add(packages_list[treeiter][0]) # Check if right mouse button was clicked if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: treepath, viewcolumn, x, y = treeview.get_path_at_pos(int(event.x), int(event.y)) treeiter = packages_list.get_iter(treepath) if treeiter: - if packages_list[treeiter][0] != _('No package found'): + if packages_list[treeiter][0] != _('No package found') and not packages_list[treeiter][0] in config.holdpkg: self.menu = Gtk.Menu() if packages_list[treeiter][0] in transaction.to_remove | transaction.to_add: - item = Gtk.MenuItem(_('Unselect')) - item.connect('activate', self.on_select_toggle_toggled, treeiter) + item = Gtk.ImageMenuItem(_('Unselect')) + item.set_image(Gtk.Image.new_from_stock('gtk-undo', Gtk.IconSize.MENU)) + item.set_always_show_image(True) + item.connect('activate', self.on_list_treeview_row_activated, treeiter, viewcolumn) self.menu.append(item) elif packages_list[treeiter][0] in transaction.localpkgs.keys(): - item = Gtk.MenuItem(_('Remove')) - item.connect('activate', self.on_select_toggle_toggled, treeiter) + item = Gtk.ImageMenuItem(_('Remove')) + item.set_image(Gtk.Image.new_from_pixbuf(to_remove_icon)) + item.set_always_show_image(True) + item.connect('activate', self.on_list_treeview_row_activated, treeiter, viewcolumn) self.menu.append(item) - item = Gtk.MenuItem(_('Reinstall')) + item = Gtk.ImageMenuItem(_('Reinstall')) + item.set_image(Gtk.Image.new_from_pixbuf(to_reinstall_icon)) + item.set_always_show_image(True) item.connect('activate', mark_to_reinstall, treeiter) self.menu.append(item) optdeps_strings = transaction.localpkgs[packages_list[treeiter][0]].optdepends @@ -988,12 +997,16 @@ class Handler: if not optdep in transaction.localpkgs.keys(): available_optdeps.append(optdep_string) if available_optdeps: - item = Gtk.MenuItem(_('Install optional deps')) + item = Gtk.ImageMenuItem(_('Install optional deps')) + item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) + item.set_always_show_image(True) item.connect('activate', select_optdeps, packages_list[treeiter][0], available_optdeps) self.menu.append(item) else: item = Gtk.ImageMenuItem(_('Install')) - item.connect('activate', self.on_select_toggle_toggled, treeiter) + item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) + item.set_always_show_image(True) + item.connect('activate', self.on_list_treeview_row_activated, treeiter, viewcolumn) self.menu.append(item) optdeps_strings = transaction.syncpkgs[packages_list[treeiter][0]].optdepends if optdeps_strings: @@ -1003,7 +1016,9 @@ class Handler: if not optdep in transaction.localpkgs.keys(): available_optdeps.append(optdep_string) if available_optdeps: - item = Gtk.MenuItem(_('Install with optional deps')) + item = Gtk.ImageMenuItem(_('Install with optional deps')) + item.set_image(Gtk.Image.new_from_pixbuf(to_install_icon)) + item.set_always_show_image(True) item.connect('activate', install_with_optdeps, treeiter, packages_list[treeiter][0], available_optdeps) self.menu.append(item) treeview.grab_focus() @@ -1071,29 +1086,25 @@ class Handler: current_filter = ('repo', repos_list[line][0]) set_packages_list() - def on_select_toggle_toggled(self, widget, line): - if packages_list[line][1] is True: - if packages_list[line][0] in transaction.to_add: - packages_list[line][3] = True - packages_list[line][4] = installed_icon - transaction.to_add.discard(packages_list[line][0]) - elif packages_list[line][0] in transaction.to_remove: - packages_list[line][3] = True - packages_list[line][4] = installed_icon - transaction.to_remove.discard(packages_list[line][0]) - else: - packages_list[line][3] = False - packages_list[line][4] = to_remove_icon - transaction.to_remove.add(packages_list[line][0]) - if packages_list[line][1] is False: - if packages_list[line][0] in transaction.to_add: - packages_list[line][3] = False - packages_list[line][4] = uninstalled_icon - transaction.to_add.discard(packages_list[line][0]) - else: - packages_list[line][3] = True - packages_list[line][4] = to_install_icon - transaction.to_add.add(packages_list[line][0]) + def on_list_treeview_row_activated(self, treeview, treeiter, column): + if not packages_list[treeiter][0] in config.holdpkg: + if packages_list[treeiter][1] is True: + if packages_list[treeiter][0] in transaction.to_add: + packages_list[treeiter][2] = installed_icon + transaction.to_add.discard(packages_list[treeiter][0]) + elif packages_list[treeiter][0] in transaction.to_remove: + packages_list[treeiter][2] = installed_icon + transaction.to_remove.discard(packages_list[treeiter][0]) + else: + packages_list[treeiter][2] = to_remove_icon + transaction.to_remove.add(packages_list[treeiter][0]) + if packages_list[treeiter][1] is False: + if packages_list[treeiter][0] in transaction.to_add: + packages_list[treeiter][2] = uninstalled_icon + transaction.to_add.discard(packages_list[treeiter][0]) + else: + packages_list[treeiter][2] = to_install_icon + transaction.to_add.add(packages_list[treeiter][0]) def on_cellrenderertoggle2_toggled(self, widget, line): choose_list[line][0] = not choose_list[line][0] @@ -1217,15 +1228,15 @@ def main(_mode): global installed_icon global uninstalled_icon global to_install_icon + global to_reinstall_icon global to_remove_icon global locked_icon - global search_icon - installed_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-installed.png') - uninstalled_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-available.png') - to_install_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-add.png') - to_remove_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-delete.png') - locked_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-blocked.png') - search_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-search.png') + installed_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-installed-updated.png') + uninstalled_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-available.png') + to_install_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-install.png') + to_reinstall_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-reinstall.png') + to_remove_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-remove.png') + locked_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/16x16/actions/package-installed-locked.png') global pkg_name_list pkg_name_list = set() global current_filter diff --git a/po/fr.po b/po/fr.po index 0417bb0..d26a2f6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -304,7 +304,7 @@ msgstr "{pkgname} est fourni par {number} paquets.\nVeuillez choisir celui ou msgid "" "{pkgname} has {number} uninstalled optional deps.\n" "Please choose the one(s) you want to install:" -msgstr "{pkgname} a {number} dépendances optionelles non installées.⏎\nVeuillez choisir celui ou ceux que vous voulez installer:" +msgstr "{pkgname} a {number} dépendances optionelles non installées.\nVeuillez choisir celui ou ceux que vous voulez installer:" #: pamac/main.py:957 msgid "Unselect"