forked from cromer/pamac-classic
fix #96, do not auto-hide progress window if details are visible
This commit is contained in:
parent
9e8ec2e729
commit
bc5633c157
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* pamac-vala
|
* pamac-vala
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Guillaume Benoit <guillaume@manjaro.org>
|
* Copyright (C) 2014-2016 Guillaume Benoit <guillaume@manjaro.org>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -1196,7 +1196,13 @@ namespace Pamac {
|
|||||||
} else {
|
} else {
|
||||||
finished (true);
|
finished (true);
|
||||||
progress_dialog.spawn_in_term ({"echo", dgettext (null, "Transaction successfully finished") + ".\n"});
|
progress_dialog.spawn_in_term ({"echo", dgettext (null, "Transaction successfully finished") + ".\n"});
|
||||||
progress_dialog.hide ();
|
if (progress_dialog.expander.get_expanded ()) {
|
||||||
|
progress_dialog.action_label.set_text (dgettext (null, "Transaction successfully finished"));
|
||||||
|
progress_dialog.cancel_button.set_visible (false);
|
||||||
|
progress_dialog.close_button.set_visible (true);
|
||||||
|
} else {
|
||||||
|
progress_dialog.hide ();
|
||||||
|
}
|
||||||
while (Gtk.events_pending ()) {
|
while (Gtk.events_pending ()) {
|
||||||
Gtk.main_iteration ();
|
Gtk.main_iteration ();
|
||||||
}
|
}
|
||||||
@ -1225,17 +1231,18 @@ namespace Pamac {
|
|||||||
Timeout.add (1000, () => {
|
Timeout.add (1000, () => {
|
||||||
finished (true);
|
finished (true);
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
progress_dialog.spawn_in_term ({"echo", dgettext (null, "Transaction successfully finished") + ".\n"});
|
string action = dgettext (null, "Transaction successfully finished");
|
||||||
progress_dialog.hide ();
|
progress_dialog.spawn_in_term ({"echo", action + ".\n"});
|
||||||
while (Gtk.events_pending ()) {
|
progress_dialog.action_label.set_text (action);
|
||||||
Gtk.main_iteration ();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
progress_dialog.progressbar.set_fraction (0);
|
|
||||||
progress_dialog.cancel_button.set_visible (false);
|
|
||||||
progress_dialog.close_button.set_visible (true);
|
|
||||||
progress_dialog.spawn_in_term ({"echo"});
|
progress_dialog.spawn_in_term ({"echo"});
|
||||||
}
|
}
|
||||||
|
progress_dialog.progressbar.set_fraction (1);
|
||||||
|
progress_dialog.cancel_button.set_visible (false);
|
||||||
|
progress_dialog.close_button.set_visible (true);
|
||||||
|
while (Gtk.events_pending ()) {
|
||||||
|
Gtk.main_iteration ();
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user