esthetic improvements and prepare translation

This commit is contained in:
guinux 2013-03-30 10:03:15 +01:00
parent ee592092ad
commit 3a3e9b14a5
7 changed files with 510 additions and 421 deletions

View File

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

View File

@ -1,17 +1,405 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ChooseDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Choose</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ChooseButton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_ChooseButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="choose_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<property name="min_content_width">300</property>
<property name="min_content_height">250</property>
<child>
<object class="GtkTreeView" id="treeview5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">choose_list</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="enable_search">False</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection5"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
<object class="GtkCellRendererToggle" id="cellrenderertoggle2">
<signal name="toggled" handler="on_cellrenderertoggle2_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="cellrenderertext7"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ChooseButton</action-widget>
</action-widgets>
</object>
<object class="GtkWindow" id="ConfDialog">
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="title" translatable="yes">Summary</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon">/usr/share/pamac/icons/22x22/status/package-info.png</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<child>
<object class="GtkBox" id="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkLabel" id="sum_top_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="min_content_width">300</property>
<property name="min_content_height">250</property>
<child>
<object class="GtkTreeView" id="treeview4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">transaction_sum</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="enable_search">False</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="_action">
<child>
<object class="GtkCellRendererText" id="cellrenderertext5">
<property name="yalign">0</property>
<property name="weight">600</property>
</object>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="_packages">
<child>
<object class="GtkCellRendererText" id="cellrenderertext6"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="sum_bottom_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">7</property>
<property name="homogeneous">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="TransCancelButton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_TransCancelButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="TransValidButton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_TransValidButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="ProgressWindow">
<property name="width_request">250</property>
<property name="height_request">60</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Progress</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">250</property>
<property name="default_height">60</property>
<property name="icon">/usr/share/pamac/icons/22x22/status/setup.png</property>
<property name="type_hint">dialog</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<property name="has_resize_grip">False</property>
<child>
<object class="GtkBox" id="box8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="action_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">/usr/share/pamac/icons/24x24/status/setup.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="progresslabel2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="progressbar2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pulse_step">0.050000000000000003</property>
<property name="show_text">True</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ProgressCancelButton">
<property name="label">gtk-cancel</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">1</property>
<signal name="clicked" handler="on_ProgressCancelButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="choose_list">
<columns>
<!-- column-name gboolean1 -->
<column type="gboolean"/>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="deps_list">
<columns>
<!-- column-name dep_type -->
<column type="gchararray"/>
<!-- column-name deps -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="details_list">
<columns>
<!-- column-name info_type -->
<column type="gchararray"/>
<!-- column-name _info -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes"> </col>
<col id="1" translatable="yes"> </col>
</row>
</data>
</object>
<object class="GtkListStore" id="files_list"> <object class="GtkListStore" id="files_list">
<columns> <columns>
<!-- column-name file --> <!-- column-name file -->
<column type="gchararray"/> <column type="gchararray"/>
</columns> </columns>
</object> </object>
<object class="GtkListStore" id="groups_list">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow" id="ManagerWindow"> <object class="GtkWindow" id="ManagerWindow">
<property name="width_request">800</property> <property name="width_request">800</property>
<property name="height_request">500</property> <property name="height_request">500</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Pamac</property> <property name="title" translatable="yes">Package Manager</property>
<property name="window_position">center</property> <property name="window_position">center</property>
<property name="default_width">800</property> <property name="default_width">800</property>
<property name="default_height">500</property> <property name="default_height">500</property>
@ -78,7 +466,6 @@
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn" id="Terms"> <object class="GtkTreeViewColumn" id="Terms">
<property name="title" translatable="yes">column</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext8"/> <object class="GtkCellRendererText" id="cellrenderertext8"/>
<attributes> <attributes>
@ -178,7 +565,6 @@
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn" id="State"> <object class="GtkTreeViewColumn" id="State">
<property name="title" translatable="yes">column</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext9"/> <object class="GtkCellRendererText" id="cellrenderertext9"/>
<attributes> <attributes>
@ -227,7 +613,6 @@
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn" id="Repos"> <object class="GtkTreeViewColumn" id="Repos">
<property name="title" translatable="yes">column</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext10"/> <object class="GtkCellRendererText" id="cellrenderertext10"/>
<attributes> <attributes>
@ -734,402 +1119,6 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkDialog" id="ChooseDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes"> </property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ChooseButton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_ChooseButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="choose_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>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<property name="min_content_width">300</property>
<property name="min_content_height">250</property>
<child>
<object class="GtkTreeView" id="treeview5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">choose_list</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="enable_search">False</property>
<property name="search_column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection5"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="title" translatable="yes">column</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderertoggle2">
<signal name="toggled" handler="on_cellrenderertoggle2_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="cellrenderertext7"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ChooseButton</action-widget>
</action-widgets>
</object>
<object class="GtkWindow" id="ConfDialog">
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="title" translatable="yes"> </property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon">/usr/share/pamac/icons/22x22/status/package-info.png</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<child>
<object class="GtkBox" id="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkLabel" id="sum_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>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="min_content_width">300</property>
<property name="min_content_height">250</property>
<child>
<object class="GtkTreeView" id="treeview4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">transaction_sum</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="enable_search">False</property>
<property name="search_column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="_action">
<property name="title" translatable="yes">column</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext5">
<property name="yalign">0</property>
<property name="weight">600</property>
</object>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="_packages">
<property name="title" translatable="yes">column</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext6"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="sum_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>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">7</property>
<property name="homogeneous">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="TransCancelButton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_TransCancelButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="TransValidButton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_TransValidButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="ProgressWindow">
<property name="width_request">250</property>
<property name="height_request">60</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Progress</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">250</property>
<property name="default_height">60</property>
<property name="icon">/usr/share/pamac/icons/22x22/status/setup.png</property>
<property name="type_hint">dialog</property>
<property name="deletable">False</property>
<property name="transient_for">ManagerWindow</property>
<property name="has_resize_grip">False</property>
<child>
<object class="GtkBox" id="box8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="action_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">/usr/share/pamac/icons/24x24/status/setup.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="progresslabel2">
<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>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="progressbar2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pulse_step">0.050000000000000003</property>
<property name="text" translatable="yes"> </property>
<property name="show_text">True</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ProgressCancelButton">
<property name="label">gtk-cancel</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">1</property>
<signal name="clicked" handler="on_ProgressCancelButton_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="choose_list">
<columns>
<!-- column-name gboolean1 -->
<column type="gboolean"/>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="deps_list">
<columns>
<!-- column-name dep_type -->
<column type="gchararray"/>
<!-- column-name deps -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="details_list">
<columns>
<!-- column-name info_type -->
<column type="gchararray"/>
<!-- column-name _info -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes"> </col>
<col id="1" translatable="yes"> </col>
</row>
</data>
</object>
<object class="GtkListStore" id="groups_list">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="packages_list"> <object class="GtkListStore" id="packages_list">
<columns> <columns>
<!-- column-name name --> <!-- column-name name -->

View File

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

View File

@ -110,7 +110,7 @@ class PamacDBusService(dbus.service.Object):
else : else :
self.action = '' self.action = ''
#self.EmitTarget('') #self.EmitTarget('')
#self.EmitPercent(str(0)) #self.EmitPercent(0)
if self.action != self.previous_action: if self.action != self.previous_action:
self.previous_action = self.action self.previous_action = self.action
self.EmitAction(self.action) self.EmitAction(self.action)
@ -179,7 +179,8 @@ class PamacDBusService(dbus.service.Object):
def cb_progress(self, _target, _percent, n, i): def cb_progress(self, _target, _percent, n, i):
self.target = _target+' ('+str(i)+'/'+str(n)+')' 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: if self.target != self.previous_target:
self.previous_target = self.target self.previous_target = self.target
self.EmitTarget(self.target) self.EmitTarget(self.target)

View File

@ -63,7 +63,7 @@ update_bottom_label = interface.get_object('update_bottom_label')
def action_signal_handler(action): def action_signal_handler(action):
if action: if action:
progress_label.set_text(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) ProgressCancelButton.set_visible(False)
else: else:
ProgressCancelButton.set_visible(True) ProgressCancelButton.set_visible(True)
@ -205,6 +205,7 @@ def set_list_dict_uninstalled():
pkg_name_list.append(pkg_object.name) pkg_name_list.append(pkg_object.name)
pkg_installed_dict[pkg_object.name] = False pkg_installed_dict[pkg_object.name] = False
pkg_object_dict[pkg_object.name] = pkg_object pkg_object_dict[pkg_object.name] = pkg_object
pkg_name_list = sorted(pkg_name_list)
def set_list_dict_local(): def set_list_dict_local():
global pkg_name_list global pkg_name_list
@ -245,6 +246,7 @@ def set_list_dict_to_install():
pkg_name_list.append(pkg_object.name) pkg_name_list.append(pkg_object.name)
pkg_installed_dict[pkg_object.name] = False pkg_installed_dict[pkg_object.name] = False
pkg_object_dict[pkg_object.name] = pkg_object pkg_object_dict[pkg_object.name] = pkg_object
pkg_name_list = sorted(pkg_name_list)
def set_list_dict_to_remove(): def set_list_dict_to_remove():
global pkg_name_list global pkg_name_list
@ -259,6 +261,7 @@ def set_list_dict_to_remove():
pkg_name_list.append(pkg_object.name) pkg_name_list.append(pkg_object.name)
pkg_installed_dict[pkg_object.name] = True pkg_installed_dict[pkg_object.name] = True
pkg_object_dict[pkg_object.name] = pkg_object pkg_object_dict[pkg_object.name] = pkg_object
pkg_name_list = sorted(pkg_name_list)
def set_list_dict_repos(repo): def set_list_dict_repos(repo):
global pkg_name_list global pkg_name_list
@ -330,7 +333,9 @@ def set_packages_list():
def set_infos_list(pkg): def set_infos_list(pkg):
name_label.set_markup('<big><b>{} {}</b></big>'.format(pkg.name, pkg.version)) name_label.set_markup('<big><b>{} {}</b></big>'.format(pkg.name, pkg.version))
desc_label.set_markup(pkg.desc) 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))) licenses_label.set_markup('Licenses: {}'.format(' '.join(pkg.licenses)))
def set_deps_list(pkg, style): def set_deps_list(pkg, style):
@ -448,7 +453,7 @@ def handle_error(error):
transaction_type = None transaction_type = None
transaction.get_handle() transaction.get_handle()
transaction.update_db() transaction.update_db()
refresh_packages_list() set_packages_list()
if mode == 'updater': if mode == 'updater':
have_updates() have_updates()
@ -475,7 +480,7 @@ def handle_reply(reply):
transaction.update_db() transaction.update_db()
if (transaction_type == "install") or (transaction_type == "remove"): if (transaction_type == "install") or (transaction_type == "remove"):
transaction_type = None transaction_type = None
refresh_packages_list() set_packages_list()
else: else:
transaction_type = None transaction_type = None
if have_updates(): if have_updates():

78
po/manager.pot Normal file
View File

@ -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 ""

22
po/updater.pot Normal file
View File

@ -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 ""