Include tidying.

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

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 72efae59385270747d77c48e1327234bbe3588a6..2dfb4113168259ac9a9181fba79db0f9bf206fd5 100644 (file)
--- 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;
@@ -43,7 +44,6 @@ public:
                : _job (job)
                , _window (window)
                , _panel (panel)
-               , _table (table)
        {
                int n = 0;
 
@@ -51,31 +51,33 @@ public:
                _gauge = new wxGauge (panel, 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, 1, wxEXPAND | wxLEFT | wxRIGHT);
-               _message = new wxStaticText (panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+               gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
+               _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;
-       
+
                _cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
                _cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::cancel_clicked, this);
                table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
                ++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, 3);
                ++n;
-       
+
                _details = new wxButton (_panel, wxID_ANY, _("Details..."));
                _details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
                _details->Enable (false);
                table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
                ++n;
-       
+
                _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this));
                _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this));
-       
+
+               progress ();
+
                table->Layout ();
        }
 
@@ -90,9 +92,13 @@ private:
 
        void progress ()
        {
-               string whole = "<b>" + _job->name () + "</b>: " + _job->sub_name() + " " + _job->status ();
+               string whole = "<b>" + _job->name () + "</b>\n";
+               if (!_job->sub_name().empty ()) {
+                       whole += _job->sub_name() + " ";
+               }
+               whole += _job->status ();
                if (whole != _last_message) {
-                       _message->SetLabelMarkup (whole);
+                       _message->SetLabelMarkup (std_to_wx (whole));
                        _last_message = whole;
                }
                if (_job->progress ()) {
@@ -103,11 +109,11 @@ private:
        void finished ()
        {
                progress ();
-               
+
                if (!_job->finished_cancelled ()) {
                        _gauge->SetValue (100);
                }
-               
+
                _cancel->Enable (false);
                _pause->Enable (false);
                if (!_job->error_details().empty ()) {
@@ -121,7 +127,7 @@ private:
                s[0] = toupper (s[0]);
                error_dialog (_window, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details())));
        }
-       
+
        void cancel_clicked (wxCommandEvent &)
        {
                _job->cancel ();
@@ -137,11 +143,10 @@ private:
                        _pause->SetLabel (_("Resume"));
                }
        }
-       
+
        boost::shared_ptr<Job> _job;
        wxScrolledWindow* _window;
        wxPanel* _panel;
-       wxFlexGridSizer* _table;
        wxGauge* _gauge;
        wxStaticText* _message;
        wxButton* _cancel;