JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
_gauge->SetMinSize (wxSize (0, -1));
_gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
_message = new StaticText (_container, wxT(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
_gauge->SetMinSize (wxSize (0, -1));
_gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
_message = new StaticText (_container, wxT(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
- _gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+ _gauge_message->Add (_message, 1, wxEXPAND | wxALL, 6);
_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
++n;
_buttons = new wxBoxSizer (wxHORIZONTAL);
_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
++n;
_buttons = new wxBoxSizer (wxHORIZONTAL);
- _buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
+ _buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
_details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
_details->Enable (false);
_details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
_details->Enable (false);
- _buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
+ _buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
_notify = new CheckBox (_container, _("Notify when complete"));
_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
_notify->SetValue (Config::instance()->default_notify());
_notify = new CheckBox (_container, _("Notify when complete"));
_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
_notify->SetValue (Config::instance()->default_notify());
_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
- if (_gauge && _job->running() && !_job->progress()) {
- _gauge->Pulse ();
+ if (_gauge && _job->running()) {
+ auto elapsed = _job->seconds_since_last_progress_update();
+ if (!_job->progress() || !elapsed || *elapsed > 2) {
+ _gauge->Pulse ();
+ }
- whole += _job->status ();
+ auto s = _job->status ();
+ /* Watch out for < > in the error string */
+ boost::algorithm::replace_all (s, "<", "<");
+ boost::algorithm::replace_all (s, ">", ">");
+ whole += s;
if (whole != _last_message) {
_message->SetLabelMarkup (std_to_wx (whole));
/* This hack fixes the size of _message on OS X */
if (whole != _last_message) {
_message->SetLabelMarkup (std_to_wx (whole));
/* This hack fixes the size of _message on OS X */