diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-04 09:20:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-04 09:20:28 +0000 |
| commit | 0acdcc34f5d582474d586f75d5be627155ad9e08 (patch) | |
| tree | 0d5d2ba3fc8b6fa1ff67e78a3622fdf729c8e964 /src | |
| parent | 072b0b1de6c1bd0b58079affc7e807cc29eb0631 (diff) | |
Don't truncate job statuses in the command line interface, only in the GUI.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/job.cc | 6 | ||||
| -rw-r--r-- | src/wx/job_manager_view.cc | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 68aa6230a..547b484a3 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -332,11 +332,7 @@ Job::status () const } else if (finished_ok ()) { s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for)); } else if (finished_in_error ()) { - string es = error_summary (); - if (es.length() > 25) { - es = es.substr (0, 25) + "..."; - } - s << String::compose (_("Error (%1)"), es); + s << String::compose (_("Error (%1)"), error_summary ()); } else if (finished_cancelled ()) { s << _("Cancelled"); } diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 783535a12..3593d2357 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -108,9 +108,18 @@ private: } } + void update_status () + { + string s = _job->status (); + if (s.length() > 25) { + s = s.substr (0, 25) + "..."; + } + checked_set (_message, s); + } + void progress () { - checked_set (_message, _job->status ()); + update_status (); update_job_name (); if (_job->progress ()) { _gauge->SetValue (min (100.0f, _job->progress().get() * 100)); @@ -121,7 +130,7 @@ private: void finished () { - checked_set (_message, _job->status ()); + update_status (); update_job_name (); if (!_job->finished_cancelled ()) { |