esthetic improvements and prepare translation

gui/dialogs.glade

@@ -4,7 +4,6 @@
   <object class="GtkMessageDialog" id="ErrorDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes"> </property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -73,7 +72,6 @@
   <object class="GtkMessageDialog" id="QuestionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes"> </property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -105,7 +103,6 @@
   <object class="GtkMessageDialog" id="WarningDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes"> </property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>

gui/updater.glade

@@ -37,7 +37,6 @@
               <object class="GtkLabel" id="update_top_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">label</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -132,12 +131,12 @@
                 <property name="headers_visible">False</property>
                 <property name="headers_clickable">False</property>
                 <property name="search_column">0</property>
+                <property name="show_expanders">False</property>
                 <child internal-child="selection">
                   <object class="GtkTreeSelection" id="treeview-selection1"/>
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="title" translatable="yes">column</property>
                     <child>
                       <object class="GtkCellRendererText" id="_name"/>
                       <attributes>
@@ -148,7 +147,6 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                    <property name="title" translatable="yes">column</property>
                     <child>
                       <object class="GtkCellRendererText" id="_size"/>
                       <attributes>
@@ -171,7 +169,6 @@
           <object class="GtkLabel" id="update_bottom_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">label</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -182,19 +179,19 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="update_list">
+  <object class="GtkListStore" id="transaction_add">
     <columns>
-      <!-- column-name name -->
+      <!-- column-name action -->
       <column type="gchararray"/>
-      <!-- column-name size -->
+      <!-- column-name packages -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="transaction_add">
+  <object class="GtkListStore" id="update_list">
     <columns>
-      <!-- column-name action -->
+      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name packages -->
+      <!-- column-name size -->
       <column type="gchararray"/>
     </columns>
   </object>

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)

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('<big><b>{}  {}</b></big>'.format(pkg.name, pkg.version))
 	desc_label.set_markup(pkg.desc)
-	link_label.set_markup('<a href=\"{url}\" title=\"{url}\">{url}</a>'.format(url = pkg.url))
+	# fix & in url
+	url = pkg.url.replace('&', '&amp;')
+	link_label.set_markup('<a href=\"{_url}\">{_url}</a>'.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():

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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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 ""

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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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 ""