From 80ea4ea70f95f0170083fff00ab4480fa62e2cd9 Mon Sep 17 00:00:00 2001 From: guinux Date: Sat, 9 Sep 2017 10:23:59 +0200 Subject: [PATCH] add appstream support and redesign ui --- data/applications/pamac-manager.desktop | 3 +- data/applications/pamac-updater.desktop | 3 +- po/pamac.pot | 88 +- po/pot_head | 6 +- resources/choose_ignorepkgs_dialog.ui | 2 +- resources/choose_provider_dialog.ui | 2 +- resources/history_dialog.ui | 2 +- resources/manager_window.ui | 1087 +++++++----- resources/package-generic.png | Bin 0 -> 4206 bytes resources/pamac.manager.gresource.xml | 1 + resources/preferences_dialog.ui | 95 +- resources/progress_box.ui | 2 +- resources/progress_dialog.ui | 2 +- resources/transaction_sum_dialog.ui | 2 +- src/Makefile | 2 + src/manager.vala | 9 +- src/manager_window.vala | 1108 +++++++----- src/package.vala | 12 +- src/preferences_dialog.vala | 11 +- src/system_daemon.vala | 8 +- src/transaction.vala | 19 +- src/user_daemon.vala | 336 +++- vapi/appstream-glib.vapi | 2077 +++++++++++++++++++++++ 23 files changed, 3924 insertions(+), 953 deletions(-) create mode 100644 resources/package-generic.png create mode 100644 vapi/appstream-glib.vapi diff --git a/data/applications/pamac-manager.desktop b/data/applications/pamac-manager.desktop index 1df7512..0d963ab 100644 --- a/data/applications/pamac-manager.desktop +++ b/data/applications/pamac-manager.desktop @@ -134,6 +134,5 @@ Icon=system-software-install Exec=pamac-manager Terminal=false Type=Application -Categories=GNOME;GTK;System; -#NotShowIn=KDE; +Categories=GNOME;GTK;System;Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; StartupNotify=true diff --git a/data/applications/pamac-updater.desktop b/data/applications/pamac-updater.desktop index 63cc633..1740f9b 100644 --- a/data/applications/pamac-updater.desktop +++ b/data/applications/pamac-updater.desktop @@ -130,6 +130,5 @@ Icon=system-software-update Exec=pamac-updater Terminal=false Type=Application -Categories=GNOME;GTK;System; -#NotShowIn=KDE +Categories=GNOME;GTK;System;Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; StartupNotify=true diff --git a/po/pamac.pot b/po/pamac.pot index 554843c..d8345f0 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -1,13 +1,13 @@ # Translation of Pamac. -# Copyright (C) 2013-2016 Manjaro Developers +# Copyright (C) 2013-2017 Manjaro Developers # This file is distributed under the same license as the Pamac package. -# Guillaume Benoit , 2013-2016. +# Guillaume Benoit , 2013-2017. # msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: guillaume@manjaro.org\n" -"POT-Creation-Date: 2016-04-24 08:44+0200\n" +"POT-Creation-Date: 2017-09-09 09:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -170,6 +170,10 @@ msgstr "" msgid "To reinstall" msgstr "" +#: ../src/transaction.vala +msgid "To upgrade" +msgstr "" + #: ../src/transaction.vala ../src/manager_window.vala msgid "Total download size" msgstr "" @@ -333,7 +337,7 @@ msgid "Warning" msgstr "" #: ../src/transaction.vala ../resources/progress_dialog.ui -#: ../resources/history_dialog.ui +#: ../resources/history_dialog.ui ../resources/preferences_dialog.ui msgid "_Close" msgstr "" @@ -349,6 +353,10 @@ msgstr "" msgid "Pamac is already running" msgstr "" +#: ../src/installer.vala ../src/manager_window.vala +msgid "Waiting for another package manager to quit" +msgstr "" + #: ../src/tray.vala ../src/manager_window.vala msgid "Your system is up-to-date" msgstr "" @@ -373,6 +381,10 @@ msgstr[1] "" msgid "Details" msgstr "" +#: ../src/manager_window.vala +msgid "No package found" +msgstr "" + #: ../src/manager_window.vala msgid "Deselect" msgstr "" @@ -389,10 +401,6 @@ msgstr "" msgid "Remove" msgstr "" -#: ../src/manager_window.vala -msgid "Waiting for another package manager to quit" -msgstr "" - #: ../src/manager_window.vala #, c-format msgid "%u pending operation" @@ -400,7 +408,7 @@ msgid_plural "%u pending operations" msgstr[0] "" msgstr[1] "" -#: ../src/manager_window.vala +#: ../src/manager_window.vala ../resources/manager_window.ui msgid "Installed" msgstr "" @@ -413,7 +421,47 @@ msgid "Foreign" msgstr "" #: ../src/manager_window.vala -msgid "Pending" +msgid "Accessories" +msgstr "" + +#: ../src/manager_window.vala +msgid "Audio & Video" +msgstr "" + +#: ../src/manager_window.vala +msgid "Development" +msgstr "" + +#: ../src/manager_window.vala +msgid "Education" +msgstr "" + +#: ../src/manager_window.vala +msgid "Games" +msgstr "" + +#: ../src/manager_window.vala +msgid "Graphics" +msgstr "" + +#: ../src/manager_window.vala +msgid "Internet" +msgstr "" + +#: ../src/manager_window.vala +msgid "Office" +msgstr "" + +#: ../src/manager_window.vala +msgid "Science" +msgstr "" + +#: ../src/manager_window.vala +msgid "Settings" +msgstr "" + +#: ../src/manager_window.vala +msgid "System Tools" msgstr "" #: ../src/manager_window.vala @@ -594,7 +642,7 @@ msgstr "" msgid "View History" msgstr "" -#: ../resources/manager_window.ui +#: ../resources/manager_window.ui ../resources/preferences_dialog.ui msgid "Preferences" msgstr "" @@ -603,11 +651,7 @@ msgid "About" msgstr "" #: ../resources/manager_window.ui -msgid "Search" -msgstr "" - -#: ../resources/manager_window.ui -msgid "State" +msgid "Categories" msgstr "" #: ../resources/manager_window.ui @@ -618,6 +662,18 @@ msgstr "" msgid "Updates" msgstr "" +#: ../resources/manager_window.ui +msgid "Pending" +msgstr "" + +#: ../resources/manager_window.ui +msgid "Search" +msgstr "" + +#: ../resources/manager_window.ui +msgid "State" +msgstr "" + #: ../resources/manager_window.ui msgid "Version" msgstr "" diff --git a/po/pot_head b/po/pot_head index 9ab3ae1..4a7812e 100644 --- a/po/pot_head +++ b/po/pot_head @@ -1,13 +1,13 @@ # Translation of Pamac. -# Copyright (C) 2013-2016 Manjaro Developers +# Copyright (C) 2013-2017 Manjaro Developers # This file is distributed under the same license as the Pamac package. -# Guillaume Benoit , 2013-2016. +# Guillaume Benoit , 2013-2017. # msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: guillaume@manjaro.org\n" -"POT-Creation-Date: 2016-04-24 08:44+0200\n" +"POT-Creation-Date: 2017-09-09 09:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/choose_ignorepkgs_dialog.ui b/resources/choose_ignorepkgs_dialog.ui index fb9ebfe..22c8761 100644 --- a/resources/choose_ignorepkgs_dialog.ui +++ b/resources/choose_ignorepkgs_dialog.ui @@ -1,7 +1,7 @@ - +