From 3a3e9b14a5f97580fb3b8c1c9d60913c2800d606 Mon Sep 17 00:00:00 2001 From: guinux Date: Sat, 30 Mar 2013 10:03:15 +0100 Subject: [PATCH] esthetic improvements and prepare translation --- gui/dialogs.glade | 3 - gui/manager.glade | 789 +++++++++++++++++++++++----------------------- gui/updater.glade | 21 +- pamac-daemon | 5 +- pamac/main.py | 13 +- po/manager.pot | 78 +++++ po/updater.pot | 22 ++ 7 files changed, 510 insertions(+), 421 deletions(-) create mode 100644 po/manager.pot create mode 100644 po/updater.pot diff --git a/gui/dialogs.glade b/gui/dialogs.glade index afda014..8c7b60c 100644 --- a/gui/dialogs.glade +++ b/gui/dialogs.glade @@ -4,7 +4,6 @@ False 5 - False True center-on-parent @@ -73,7 +72,6 @@ False 5 - False center-on-parent dialog @@ -105,7 +103,6 @@ False 5 - False center-on-parent dialog diff --git a/gui/manager.glade b/gui/manager.glade index 1871fd1..c448bf9 100644 --- a/gui/manager.glade +++ b/gui/manager.glade @@ -1,17 +1,405 @@ + + False + 5 + Choose + True + center-on-parent + dialog + True + False + ManagerWindow + + + False + vertical + 2 + + + False + end + + + gtk-ok + True + True + True + True + + + + False + True + 0 + + + + + False + True + end + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + in + 300 + 250 + + + True + True + choose_list + False + False + False + False + + + + + + + + + + + 0 + + + + + + 1 + + + + + + + + + True + True + 2 + + + + + + ChooseButton + + + + False + 3 + Summary + True + center-on-parent + /usr/share/pamac/icons/22x22/status/package-info.png + dialog + True + False + ManagerWindow + + + True + False + vertical + 3 + + + True + False + + + False + True + 0 + + + + + True + False + True + True + in + 300 + 250 + + + True + True + True + True + transaction_sum + False + False + False + False + + + + + + + + 0 + 600 + + + 0 + + + + + + + + + + 1 + + + + + + + + + True + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + False + 7 + True + end + + + gtk-cancel + True + True + True + True + False + True + + + + False + True + 0 + + + + + gtk-ok + True + True + False + True + + + + False + True + 1 + + + + + False + True + 3 + + + + + + + 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 - Pamac + Package Manager center 800 500 @@ -78,7 +466,6 @@ - column @@ -178,7 +565,6 @@ - column @@ -227,7 +613,6 @@ - column @@ -734,402 +1119,6 @@ - - False - 5 - - True - center-on-parent - dialog - True - False - ManagerWindow - - - False - vertical - 2 - - - False - end - - - gtk-ok - True - True - True - True - - - - False - True - 0 - - - - - False - True - end - 0 - - - - - True - False - label - - - False - True - 1 - - - - - True - True - in - 300 - 250 - - - True - True - choose_list - False - False - False - 0 - - - - - - column - - - - - - 0 - - - - - - 1 - - - - - - - - - True - True - 2 - - - - - - ChooseButton - - - - False - 3 - - True - center-on-parent - /usr/share/pamac/icons/22x22/status/package-info.png - dialog - True - False - ManagerWindow - - - True - False - vertical - 3 - - - True - False - label - - - False - True - 0 - - - - - True - False - True - True - in - 300 - 250 - - - True - True - True - True - transaction_sum - False - False - False - 0 - - - - - - column - - - 0 - 600 - - - 0 - - - - - - - column - - - - 1 - - - - - - - - - True - True - 1 - - - - - True - False - label - - - False - True - 2 - - - - - True - False - 7 - True - end - - - gtk-cancel - True - True - True - True - False - True - - - - False - True - 0 - - - - - gtk-ok - True - True - False - True - - - - False - True - 1 - - - - - False - True - 3 - - - - - - - 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 - label - - - 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 8ccf556..8cf9af0 100644 --- a/gui/updater.glade +++ b/gui/updater.glade @@ -37,7 +37,6 @@ True False - label False @@ -132,12 +131,12 @@ False False 0 + False - column @@ -148,7 +147,6 @@ - column @@ -171,7 +169,6 @@ True False - label False @@ -182,14 +179,6 @@ - - - - - - - - @@ -198,4 +187,12 @@ + + + + + + + + diff --git a/pamac-daemon b/pamac-daemon index d523a63..85c908c 100755 --- a/pamac-daemon +++ b/pamac-daemon @@ -110,7 +110,7 @@ class PamacDBusService(dbus.service.Object): else : self.action = '' #self.EmitTarget('') - #self.EmitPercent(str(0)) + #self.EmitPercent(0) if self.action != self.previous_action: self.previous_action = self.action self.EmitAction(self.action) @@ -179,7 +179,8 @@ class PamacDBusService(dbus.service.Object): def cb_progress(self, _target, _percent, n, i): self.target = _target+' ('+str(i)+'/'+str(n)+')' - self.percent = round(_percent/100, 2) + #self.percent = round(_percent/100, 2) + self.percent = round(i/n, 2) if self.target != self.previous_target: self.previous_target = self.target self.EmitTarget(self.target) diff --git a/pamac/main.py b/pamac/main.py index 66fbae7..2ef91ca 100644 --- a/pamac/main.py +++ b/pamac/main.py @@ -63,7 +63,7 @@ update_bottom_label = interface.get_object('update_bottom_label') def action_signal_handler(action): if action: progress_label.set_text(action) - if ('Installing' in action) or ('Removing' in action) or ('Updating' in action) or ('Configuring' in action): + if ('Installing' in action) or ('Removing' in action) or ('Upgrading' in action) or ('Configuring' in action): ProgressCancelButton.set_visible(False) else: ProgressCancelButton.set_visible(True) @@ -205,6 +205,7 @@ def set_list_dict_uninstalled(): pkg_name_list.append(pkg_object.name) pkg_installed_dict[pkg_object.name] = False pkg_object_dict[pkg_object.name] = pkg_object + pkg_name_list = sorted(pkg_name_list) def set_list_dict_local(): global pkg_name_list @@ -245,6 +246,7 @@ def set_list_dict_to_install(): pkg_name_list.append(pkg_object.name) pkg_installed_dict[pkg_object.name] = False pkg_object_dict[pkg_object.name] = pkg_object + pkg_name_list = sorted(pkg_name_list) def set_list_dict_to_remove(): global pkg_name_list @@ -259,6 +261,7 @@ def set_list_dict_to_remove(): pkg_name_list.append(pkg_object.name) pkg_installed_dict[pkg_object.name] = True pkg_object_dict[pkg_object.name] = pkg_object + pkg_name_list = sorted(pkg_name_list) def set_list_dict_repos(repo): global pkg_name_list @@ -330,7 +333,9 @@ def set_packages_list(): def set_infos_list(pkg): name_label.set_markup('{} {}'.format(pkg.name, pkg.version)) desc_label.set_markup(pkg.desc) - link_label.set_markup('{url}'.format(url = pkg.url)) + # fix & in url + url = pkg.url.replace('&', '&') + link_label.set_markup('{_url}'.format(_url = url)) licenses_label.set_markup('Licenses: {}'.format(' '.join(pkg.licenses))) def set_deps_list(pkg, style): @@ -448,7 +453,7 @@ def handle_error(error): transaction_type = None transaction.get_handle() transaction.update_db() - refresh_packages_list() + set_packages_list() if mode == 'updater': have_updates() @@ -475,7 +480,7 @@ def handle_reply(reply): transaction.update_db() if (transaction_type == "install") or (transaction_type == "remove"): transaction_type = None - refresh_packages_list() + set_packages_list() else: transaction_type = None if have_updates(): diff --git a/po/manager.pot b/po/manager.pot new file mode 100644 index 0000000..b9ca37f --- /dev/null +++ b/po/manager.pot @@ -0,0 +1,78 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-03-29 16:23+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gui/manager.glade:7 +msgid "Choose" +msgstr "" + +#: gui/manager.glade:889 +msgid "Deps" +msgstr "" + +#: gui/manager.glade:954 +msgid "Details" +msgstr "" + +#: gui/manager.glade:1002 +msgid "Files" +msgstr "" + +#: gui/manager.glade:539 +msgid "Groups" +msgstr "" + +#: gui/manager.glade:829 +msgid "Infos" +msgstr "" + +#: gui/manager.glade:680 +msgid "Installed" +msgstr "" + +#: gui/manager.glade:710 +msgid "Name" +msgstr "" + +#: gui/manager.glade:402 +msgid "Package Manager" +msgstr "" + +#: gui/manager.glade:256 +msgid "Progress" +msgstr "" + +#: gui/manager.glade:635 +msgid "Repos" +msgstr "" + +#: gui/manager.glade:492 +msgid "Search" +msgstr "" + +#: gui/manager.glade:728 +msgid "Size" +msgstr "" + +#: gui/manager.glade:587 +msgid "State" +msgstr "" + +#: gui/manager.glade:112 +msgid "Summary" +msgstr "" diff --git a/po/updater.pot b/po/updater.pot new file mode 100644 index 0000000..70c0ab0 --- /dev/null +++ b/po/updater.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-03-30 05:46+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gui/updater.glade:6 +msgid "Update Manager" +msgstr ""