Split job status onto two lines (#610).

diff --git a/ChangeLog b/ChangeLog
index 3d7a6c3caab0cbac9f81f8467c87c6627cc14dfd..74c28cd357a547e2901effd4ca71e1f55e0459e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-06-18  c.hetherington  <cth@carlh.net>
 
+       * Split job status onto two lines (#610).
+
        * Fix audio channel counts in DCP names when
        processors are in use (#609).
 

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 3a72a5a309a8956b829d6d1d4a2dbaca83b129cd..826c468110f7749d7e2c08a1a772fe4d82cf60c8 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -50,8 +50,8 @@ public:
                _gauge = new wxGauge (panel, wxID_ANY, 100);
                /* This seems to be required to allow the gauge to shrink under OS X */
                _gauge->SetMinSize (wxSize (0, -1));
-               gauge_message->Add (_gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
-               _message = new wxStaticText (panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+               gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
+               _message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
                gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
                table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
                ++n;
@@ -89,7 +89,11 @@ private:
 
        void progress ()
        {
-               string whole = "<b>" + _job->name () + "</b>: " + _job->sub_name() + " " + _job->status ();
+               string whole = "<b>" + _job->name () + "</b>\n";
+               if (!_job->sub_name().empty ()) {
+                       whole += _job->sub_name() + " ";
+               }
+               whole += _job->status ();
                if (whole != _last_message) {
                        _message->SetLabelMarkup (whole);
                        _last_message = whole;