aleskva
/
pamac-classic
forked from cromer/pamac-classic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some cosmetics

This commit is contained in:
guinux 2016-05-20 10:21:45 +02:00
parent 1bacbf34ef
commit 393a8ec940
4 changed files with 56 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/manager_window.ui
View File

@ -889,6 +889,7 @@
<object class="GtkButtonBox" id="transaction_infos_buttonbox"> <object class="GtkButtonBox" id="transaction_infos_buttonbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="layout_style">start</property> <property name="layout_style">start</property>
<child> <child>

2
resources/progress_box.ui
View File

@ -6,7 +6,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkLabel" id="action_label"> <object class="GtkLabel" id="action_label">
<property name="visible">True</property> <property name="visible">True</property>

130
resources/updater_window.ui
View File

@ -109,7 +109,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkScrolledWindow" id="repos_scrolledwindow"> <object class="GtkScrolledWindow" id="repos_scrolledwindow">
<property name="width_request">600</property> <property name="width_request">750</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child> <child>
@ -161,7 +161,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn6"> <object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="sizing">fixed</property> <property name="sizing">fixed</property>
<property name="fixed_width">150</property> <property name="fixed_width">250</property>
<property name="min_width">20</property> <property name="min_width">20</property>
<property name="title" translatable="yes">Version</property> <property name="title" translatable="yes">Version</property>
<child> <child>
@ -218,7 +218,7 @@
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="aur_scrolledwindow"> <object class="GtkScrolledWindow" id="aur_scrolledwindow">
<property name="width_request">600</property> <property name="width_request">750</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child> <child>
@ -271,7 +271,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn8"> <object class="GtkTreeViewColumn" id="treeviewcolumn8">
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="sizing">fixed</property> <property name="sizing">fixed</property>
<property name="fixed_width">200</property> <property name="fixed_width">250</property>
<property name="min_width">20</property> <property name="min_width">20</property>
<property name="title" translatable="yes">Version</property> <property name="title" translatable="yes">Version</property>
<child> <child>
@ -305,99 +305,73 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="transaction_infobox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">6</property> <property name="border_width">6</property>
<property name="margin_right">6</property> <property name="spacing">12</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="bottom_label"> <placeholder/>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="transaction_infobox"> <object class="GtkButtonBox" id="transaction_infos_buttonbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="valign">end</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child> <child>
<placeholder/> <object class="GtkButton" id="details_button">
</child> <property name="label" translatable="yes">Details</property>
<child>
<object class="GtkButtonBox" id="transaction_infos_buttonbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="spacing">6</property> <property name="receives_default">True</property>
<property name="layout_style">start</property> <signal name="clicked" handler="on_details_button_clicked" swapped="no"/>
<child>
<object class="GtkButton" id="details_button">
<property name="label" translatable="yes">Details</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_details_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_button">
<property name="label" translatable="yes">_Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_apply_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_button">
<property name="label" translatable="yes">_Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_apply_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>

9
src/updater_window.vala
View File

@ -45,8 +45,6 @@ namespace Pamac {
[GtkChild] [GtkChild]
Gtk.CellRendererToggle aur_select_update; Gtk.CellRendererToggle aur_select_update;
[GtkChild] [GtkChild]
Gtk.Label bottom_label;
[GtkChild]
Gtk.Box transaction_infobox; Gtk.Box transaction_infobox;
[GtkChild] [GtkChild]
Gtk.Button details_button; Gtk.Button details_button;
@ -67,7 +65,6 @@ namespace Pamac {
Object (application: application); Object (application: application);
button_back.visible = false; button_back.visible = false;
bottom_label.visible = false;
apply_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); apply_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
apply_button.sensitive = false; apply_button.sensitive = false;
stackswitcher.visible = false; stackswitcher.visible = false;
@ -264,7 +261,6 @@ namespace Pamac {
repos_scrolledwindow.visible = true; repos_scrolledwindow.visible = true;
aur_updates_list.clear (); aur_updates_list.clear ();
aur_scrolledwindow.visible = false; aur_scrolledwindow.visible = false;
bottom_label.visible = false;
uint64 dsize = 0; uint64 dsize = 0;
uint repos_updates_nb = 0; uint repos_updates_nb = 0;
uint aur_updates_nb = 0; uint aur_updates_nb = 0;
@ -296,10 +292,9 @@ namespace Pamac {
} }
set_transaction_infobox_visible (); set_transaction_infobox_visible ();
if (dsize != 0) { if (dsize != 0) {
bottom_label.set_markup("<b>%s: %s</b>".printf (dgettext (null, "Total download size"), format_size(dsize))); transaction.progress_box.action_label.set_markup("<b>%s: %s</b>".printf (dgettext (null, "Total download size"), format_size(dsize)));
bottom_label.visible = true;
} else { } else {
bottom_label.visible = false; transaction.progress_box.action_label.label = "";
} }
if (aur_updates_nb != 0) { if (aur_updates_nb != 0) {
aur_scrolledwindow.visible = true; aur_scrolledwindow.visible = true;