From 0db8ae1436a822e81a396f500843db646d98455d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Jun 2015 17:11:04 +0100 Subject: Split job status onto two lines (#610). --- src/wx/job_manager_view.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 3a72a5a30..826c46811 100644 --- 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 = "" + _job->name () + ": " + _job->sub_name() + " " + _job->status (); + string whole = "" + _job->name () + "\n"; + if (!_job->sub_name().empty ()) { + whole += _job->sub_name() + " "; + } + whole += _job->status (); if (whole != _last_message) { _message->SetLabelMarkup (whole); _last_message = whole; -- cgit v1.2.3