X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=fd3ea6bf782c2e7af7304095846f34cd358e4dd5;hp=1b9e281a749c2ab58c9c7cf77b526072654c5ae5;hb=68f662ac50a00ad986e3bd258c3f7daac374ab26;hpb=df13b914914ed7440be29edc51e4c23370ccb622

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 1b9e281a7..fd3ea6bf7 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,17 +39,17 @@ using boost::weak_ptr;
 class JobRecord
 {
 public:
-	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause)
+	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
 		: _job (job)
 		, _window (window)
 		, _panel (panel)
 		, _table (table)
-		, _pause (0)
 	{
 		int n = 0;
 		
 		_name = new wxStaticText (panel, wxID_ANY, "");
-		_name->SetLabelMarkup ("<b>" + _job->name () + "</b>");
+		string const jn = "<b>" + _job->name () + "</b>";
+		_name->SetLabelMarkup (std_to_wx (jn));
 		table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 		++n;
 	
@@ -68,12 +68,10 @@ public:
 		table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 		++n;
 	
-		if (pause) {
-			_pause = new wxButton (_panel, wxID_ANY, _("Pause"));
-			_pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
-			table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			++n;
-		}
+		_pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+		_pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
+		table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+		++n;
 	
 		_details = new wxButton (_panel, wxID_ANY, _("Details..."));
 		_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
@@ -90,7 +88,7 @@ public:
 
 	void maybe_pulse ()
 	{
-		if (_job->running() && _job->progress_unknown ()) {
+		if (_job->running() && !_job->progress ()) {
 			_gauge->Pulse ();
 		}
 	}
@@ -112,14 +110,11 @@ private:
 
 	void progress ()
 	{
-		float const p = _job->progress ();
-		if (p >= 0) {
-			checked_set (_message, _job->status ());
-			update_job_name ();
-			int const pp = min (100.0f, p * 100);
-			_gauge->SetValue (pp);
-		}
-
+		checked_set (_message, _job->status ());
+		update_job_name ();
+		if (_job->progress ()) {
+			_gauge->SetValue (min (100.0f, _job->progress().get() * 100));
+ 		}
 		_table->Layout ();
 		_window->FitInside ();
 	}
@@ -134,9 +129,7 @@ private:
 		}
 		
 		_cancel->Enable (false);
-		if (_pause) {
-			_pause->Enable (false);
-		}
+		_pause->Enable (false);
 		if (!_job->error_details().empty ()) {
 			_details->Enable (true);
 		}
@@ -182,39 +175,43 @@ private:
 };
 
 /** Must be called in the GUI thread */
-JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons)
+JobManagerView::JobManagerView (wxWindow* parent)
 	: wxScrolledWindow (parent)
-	, _buttons (buttons)
 {
 	_panel = new wxPanel (this);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
 
-	int N = 5;
-	if (buttons & PAUSE) {
-		++N;
-	}
-	
-	_table = new wxFlexGridSizer (N, 6, 6);
+	_table = new wxFlexGridSizer (6, 6, 6);
 	_table->AddGrowableCol (1, 1);
 	_panel->SetSizer (_table);
 
 	SetScrollRate (0, 32);
+	EnableScrolling (false, true);
 
 	Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this));
 	_timer.reset (new wxTimer (this));
 	_timer->Start (1000);
-	
+
+	Bind (wxEVT_SIZE, boost::bind (&JobManagerView::sized, this, _1));
 	JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
 }
 
+void
+JobManagerView::sized (wxSizeEvent& ev)
+{
+	_table->FitInside (_panel);
+	_table->Layout ();
+	ev.Skip ();
+}
+
 void
 JobManagerView::job_added (weak_ptr<Job> j)
 {
 	shared_ptr<Job> job = j.lock ();
 	if (job) {
-		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table, _buttons & PAUSE)));
+		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
 	}
 }