X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=acf42bc8b92a3a6a38cc3b4a72cbd2366a801871;hb=1158dd504d0838b0c359b2cf1d63615c4ecb0a53;hp=f9a8fb08956f0df2a92f2f9d60595cad2893a5d6;hpb=1fb11836b91977a949bef5eae807d57b13fe9bf8;p=dcpomatic.git

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index f9a8fb089..acf42bc8b 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,17 +22,20 @@
 #include "wx_util.h"
 #include "lib/job.h"
 #include "lib/compose.hpp"
+#include "lib/config.h"
 #include <wx/wx.h>
 
 using std::string;
 using std::min;
 using boost::shared_ptr;
+using boost::bind;
 
 JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: _job (job)
 	, _table (table)
 	, _parent (parent)
 	, _container (container)
+	, _gauge (0)
 {
 
 }
@@ -42,32 +45,37 @@ JobView::setup ()
 {
 	int n = insert_position ();
 
-	std::cout << "insert @ " << n << "\n";
-
 	_gauge_message = new wxBoxSizer (wxVERTICAL);
 	_gauge = new wxGauge (_container, 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, 0, wxEXPAND | wxLEFT | wxRIGHT);
-	_message = new wxStaticText (_container, wxID_ANY, wxT (" \n "));
+	_message = new wxStaticText (_container, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
 	_gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
 	++n;
 
-	wxBoxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
+	_buttons = new wxBoxSizer (wxHORIZONTAL);
 
 	_cancel = new wxButton (_container, wxID_ANY, _("Cancel"));
-	_cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobView::cancel_clicked, this);
-	buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
+	_cancel->Bind (wxEVT_BUTTON, &JobView::cancel_clicked, this);
+	_buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
 
 	_details = new wxButton (_container, wxID_ANY, _("Details..."));
-	_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobView::details_clicked, this);
+	_details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
 	_details->Enable (false);
-	buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
+	_buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
+
+	finish_setup (_container, _buttons);
 
-	finish_setup (_container, buttons);
+	_controls = new wxBoxSizer (wxVERTICAL);
+	_controls->Add (_buttons);
+	_notify = new wxCheckBox (_container, wxID_ANY, _("Notify when complete"));
+	_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
+	_notify->SetValue (Config::instance()->default_notify());
+	_controls->Add (_notify);
 
-	_table->Insert (n, buttons, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+	_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
 
 	_progress_connection = _job->Progress.connect (boost::bind (&JobView::progress, this));
 	_finished_connection = _job->Finished.connect (boost::bind (&JobView::finished, this));
@@ -80,7 +88,7 @@ JobView::setup ()
 void
 JobView::maybe_pulse ()
 {
-	if (_job->running() && !_job->progress ()) {
+	if (_gauge && _job->running() && !_job->progress()) {
 		_gauge->Pulse ();
 	}
 }
@@ -95,6 +103,9 @@ JobView::progress ()
 	whole += _job->status ();
 	if (whole != _last_message) {
 		_message->SetLabelMarkup (std_to_wx (whole));
+		/* This hack fixes the size of _message on OS X */
+		_message->InvalidateBestSize ();
+		_message->SetSize (_message->GetBestSize ());
 		_gauge_message->Layout ();
 		_last_message = whole;
 	}
@@ -113,9 +124,19 @@ JobView::finished ()
 	}
 
 	_cancel->Enable (false);
+	_notify->Enable (false);
 	if (!_job->error_details().empty ()) {
 		_details->Enable (true);
 	}
+
+	if (_notify->GetValue()) {
+		if (Config::instance()->notification(Config::MESSAGE_BOX)) {
+			wxMessageBox (std_to_wx(_job->name() + ": " + _job->status()), _("DCP-o-matic"), wxICON_INFORMATION);
+		}
+		if (Config::instance()->notification(Config::EMAIL)) {
+
+		}
+	}
 }
 
 void
@@ -123,7 +144,7 @@ JobView::details_clicked (wxCommandEvent &)
 {
 	string s = _job->error_summary();
 	s[0] = toupper (s[0]);
-	error_dialog (_parent, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details())));
+	error_dialog (_parent, std_to_wx(s), std_to_wx(_job->error_details()));
 }
 
 void
@@ -133,3 +154,24 @@ JobView::cancel_clicked (wxCommandEvent &)
 		_job->cancel ();
 	}
 }
+
+void
+JobView::insert (int pos)
+{
+	_table->Insert (pos, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
+	_table->Insert (pos + 1, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+	_table->Layout ();
+}
+
+void
+JobView::detach ()
+{
+	_table->Detach (_gauge_message);
+	_table->Detach (_controls);
+}
+
+void
+JobView::notify_clicked ()
+{
+	Config::instance()->set_default_notify (_notify->GetValue ());
+}