Separate readable error from technical detail in some places.

[dcpomatic.git] / src / wx / job_view.cc

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 798e353a9b443b3e99bb1056d7b4977dca8f7c95..a36d6de8a56680834d2697251d49e0fd2865f5f6 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -33,6 +33,7 @@ JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wx
        , _table (table)
        , _parent (parent)
        , _container (container)
+       , _gauge (0)
 {
 
 }
@@ -47,25 +48,25 @@ JobView::setup ()
        /* 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);
 
-       _table->Insert (n, buttons, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+       _table->Insert (n, _buttons, 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));
@@ -78,7 +79,7 @@ JobView::setup ()
 void
 JobView::maybe_pulse ()
 {
-       if (_job->running() && !_job->progress ()) {
+       if (_gauge && _job->running() && !_job->progress()) {
                _gauge->Pulse ();
        }
 }
@@ -93,6 +94,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;
        }
@@ -121,7 +125,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
@@ -131,3 +135,18 @@ JobView::cancel_clicked (wxCommandEvent &)
                _job->cancel ();
        }
 }
+
+void
+JobView::insert (int pos)
+{
+       _table->Insert (pos, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
+       _table->Insert (pos + 1, _buttons, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+       _table->Layout ();
+}
+
+void
+JobView::detach ()
+{
+       _table->Detach (_gauge_message);
+       _table->Detach (_buttons);
+}