X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=2dfb4113168259ac9a9181fba79db0f9bf206fd5;hb=c2a97b6f83a32483817d02194a1e7c8d6828b0bb;hp=24cacf6b01ec88bd43b91745416e035220b3f6b0;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 24cacf6b0..2dfb41131 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -21,12 +21,13 @@
  *  @brief Class generating a GTK widget to show the progress of jobs.
  */
 
+#include "job_manager_view.h"
+#include "wx_util.h"
 #include "lib/job_manager.h"
 #include "lib/job.h"
 #include "lib/util.h"
 #include "lib/exceptions.h"
-#include "job_manager_view.h"
-#include "wx_util.h"
+#include "lib/compose.hpp"
 
 using std::string;
 using std::list;
@@ -51,7 +52,7 @@ public:
 		/* This seems to be required to allow the gauge to shrink under OS X */
 		_gauge->SetMinSize (wxSize (0, -1));
 		gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
-		_message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+		_message = new wxStaticText (panel, wxID_ANY, wxT (" \n "));
 		gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 		table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
 		++n;
@@ -75,6 +76,8 @@ public:
 		_progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this));
 		_finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this));
 
+		progress ();
+
 		table->Layout ();
 	}
 
@@ -95,7 +98,7 @@ private:
 		}
 		whole += _job->status ();
 		if (whole != _last_message) {
-			_message->SetLabelMarkup (whole);
+			_message->SetLabelMarkup (std_to_wx (whole));
 			_last_message = whole;
 		}
 		if (_job->progress ()) {