Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 767c7ca5a1993ace67f1fb31a341e80a29d9de47..13c3bc7ab691d2896e3bf4b6982ae02f75e04d27 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -30,42 +30,49 @@ using boost::shared_ptr;
 
 JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
        : _job (job)
+       , _table (table)
        , _parent (parent)
+       , _container (container)
 {
-       int n = 0;
+
+}
+
+void
+JobView::setup ()
+{
+       int n = insert_position ();
 
        _gauge_message = new wxBoxSizer (wxVERTICAL);
-       _gauge = new wxGauge (container, wxID_ANY, 100);
+       _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 "), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE);
+       _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);
+       _table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
        ++n;
 
-       _cancel = new wxButton (container, wxID_ANY, _("Cancel"));
-       _cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobView::cancel_clicked, this);
-       table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
-       ++n;
+       _buttons = new wxBoxSizer (wxHORIZONTAL);
 
-       _pause = new wxButton (container, wxID_ANY, _("Pause"));
-       _pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobView::pause_clicked, this);
-       table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
-       ++n;
+       _cancel = new wxButton (_container, wxID_ANY, _("Cancel"));
+       _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 = new wxButton (_container, wxID_ANY, _("Details..."));
+       _details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
        _details->Enable (false);
-       table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
-       ++n;
+       _buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
 
-       _progress_connection = job->Progress.connect (boost::bind (&JobView::progress, this));
-       _finished_connection = job->Finished.connect (boost::bind (&JobView::finished, this));
+       finish_setup (_container, _buttons);
+
+       _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));
 
        progress ();
 
-       table->Layout ();
+       _table->Layout ();
 }
 
 void
@@ -86,6 +93,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;
        }
@@ -104,7 +114,6 @@ JobView::finished ()
        }
 
        _cancel->Enable (false);
-       _pause->Enable (false);
        if (!_job->error_details().empty ()) {
                _details->Enable (true);
        }
@@ -121,17 +130,22 @@ JobView::details_clicked (wxCommandEvent &)
 void
 JobView::cancel_clicked (wxCommandEvent &)
 {
-       _job->cancel ();
+       if (confirm_dialog (_parent, _("Are you sure you want to cancel this job?"))) {
+               _job->cancel ();
+       }
 }
 
 void
-JobView::pause_clicked (wxCommandEvent &)
+JobView::insert (int pos)
 {
-       if (_job->paused()) {
-               _job->resume ();
-               _pause->SetLabel (_("Pause"));
-       } else {
-               _job->pause ();
-               _pause->SetLabel (_("Resume"));
-       }
+       _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);
 }