White space: job_view.{cc,h}

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 4734ccc6246936831819a8d43da6743dce41821a..62539e5ddc29263a4b9c32bb63eff20242ccbef4 100644 (file)
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -46,117 +46,117 @@ using std::string;
 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)
+JobView::JobView(shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
+       : _job(job)
+       , _table(table)
+       , _parent(parent)
+       , _container(container)
+       , _gauge(0)
 {
 
 }
 
 
 void
-JobView::setup ()
+JobView::setup()
 {
-       int n = insert_position ();
+       int n = insert_position();
 
-       _gauge_message = new wxBoxSizer (wxVERTICAL);
-       _gauge = new wxGauge (_container, wxID_ANY, 100);
+       _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);
+       _gauge->SetMinSize(wxSize(0, -1));
+       _gauge_message->Add(_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
        _message = new StaticText(_container, char_to_wx(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
-       _gauge_message->Add (_message, 1, wxEXPAND | wxALL, 6);
-       _table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
+       _gauge_message->Add(_message, 1, wxEXPAND | wxALL, 6);
+       _table->Insert(n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
        ++n;
 
-       _buttons = new wxBoxSizer (wxHORIZONTAL);
+       _buttons = new wxBoxSizer(wxHORIZONTAL);
 
-       _cancel = new Button (_container, _("Cancel"));
-       _cancel->Bind (wxEVT_BUTTON, &JobView::cancel_clicked, this);
-       _buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
+       _cancel = new Button(_container, _("Cancel"));
+       _cancel->Bind(wxEVT_BUTTON, &JobView::cancel_clicked, this);
+       _buttons->Add(_cancel, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
-       _details = new Button (_container, _("Details..."));
-       _details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
-       _details->Enable (false);
-       _buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
+       _details = new Button(_container, _("Details..."));
+       _details->Bind(wxEVT_BUTTON, &JobView::details_clicked, this);
+       _details->Enable(false);
+       _buttons->Add(_details, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
-       finish_setup (_container, _buttons);
+       finish_setup(_container, _buttons);
 
-       _controls = new wxBoxSizer (wxVERTICAL);
-       _controls->Add (_buttons);
-       _notify = new CheckBox (_container, _("Notify when complete"));
+       _controls = new wxBoxSizer(wxVERTICAL);
+       _controls->Add(_buttons);
+       _notify = new CheckBox(_container, _("Notify when complete"));
        _notify->bind(&JobView::notify_clicked, this);
-       _notify->SetValue (Config::instance()->default_notify());
-       _controls->Add (_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
+       _notify->SetValue(Config::instance()->default_notify());
+       _controls->Add(_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
 
-       _table->Insert (n, _controls, 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));
+       _progress_connection = _job->Progress.connect(boost::bind(&JobView::progress, this));
+       _finished_connection = _job->Finished.connect(boost::bind(&JobView::finished, this));
 
-       progress ();
+       progress();
 
-       _table->Layout ();
+       _table->Layout();
 }
 
 
 void
-JobView::maybe_pulse ()
+JobView::maybe_pulse()
 {
        if (_gauge && _job->running()) {
                auto elapsed = _job->seconds_since_last_progress_update();
                if (!_job->progress() || !elapsed || *elapsed > 4) {
-                       _gauge->Pulse ();
+                       _gauge->Pulse();
                }
        }
 }
 
 
 void
-JobView::progress ()
+JobView::progress()
 {
-       string whole = "<b>" + _job->name () + "</b>\n";
-       if (!_job->sub_name().empty ()) {
+       string whole = "<b>" + _job->name() + "</b>\n";
+       if (!_job->sub_name().empty()) {
                whole += _job->sub_name() + " ";
        }
-       auto s = _job->status ();
+       auto s = _job->status();
        /* Watch out for < > in the error string */
-       boost::algorithm::replace_all (s, "<", "&lt;");
-       boost::algorithm::replace_all (s, ">", "&gt;");
+       boost::algorithm::replace_all(s, "<", "&lt;");
+       boost::algorithm::replace_all(s, ">", "&gt;");
 #ifdef DCPOMATIC_LINUX
        boost::algorithm::replace_all(s, "_", "__");
 #endif
        whole += s;
        if (whole != _last_message) {
-               _message->SetLabelMarkup (std_to_wx (whole));
+               _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 ();
+               _message->InvalidateBestSize();
+               _message->SetSize(_message->GetBestSize());
+               _gauge_message->Layout();
                _last_message = whole;
        }
-       if (_job->progress ()) {
-               _gauge->SetValue (min (100.0f, _job->progress().get() * 100));
+       if (_job->progress()) {
+               _gauge->SetValue(min(100.0f, _job->progress().get() * 100));
        }
 }
 
 
 void
-JobView::finished ()
+JobView::finished()
 {
-       progress ();
+       progress();
 
-       if (!_job->finished_cancelled ()) {
-               _gauge->SetValue (100);
+       if (!_job->finished_cancelled()) {
+               _gauge->SetValue(100);
        }
 
-       _cancel->Enable (false);
-       _notify->Enable (false);
-       if (!_job->error_details().empty ()) {
-               _details->Enable (true);
+       _cancel->Enable(false);
+       _notify->Enable(false);
+       if (!_job->error_details().empty()) {
+               _details->Enable(true);
        }
 
        if (_job->message()) {
@@ -170,51 +170,51 @@ JobView::finished ()
                }
                if (Config::instance()->notification(Config::EMAIL)) {
                        string body = Config::instance()->notification_email();
-                       boost::algorithm::replace_all (body, "$JOB_NAME", _job->name());
-                       boost::algorithm::replace_all (body, "$JOB_STATUS", _job->status());
-                       JobManager::instance()->add_after (_job, shared_ptr<Job> (new SendNotificationEmailJob (body)));
+                       boost::algorithm::replace_all(body, "$JOB_NAME", _job->name());
+                       boost::algorithm::replace_all(body, "$JOB_STATUS", _job->status());
+                       JobManager::instance()->add_after(_job, shared_ptr<Job>(new SendNotificationEmailJob(body)));
                }
        }
 }
 
 
 void
-JobView::details_clicked (wxCommandEvent &)
+JobView::details_clicked(wxCommandEvent &)
 {
        auto s = _job->error_summary();
-       s[0] = toupper (s[0]);
-       error_dialog (_parent, std_to_wx(s), std_to_wx(_job->error_details()));
+       s[0] = toupper(s[0]);
+       error_dialog(_parent, std_to_wx(s), std_to_wx(_job->error_details()));
 }
 
 
 void
-JobView::cancel_clicked (wxCommandEvent &)
+JobView::cancel_clicked(wxCommandEvent &)
 {
-       if (confirm_dialog (_parent, _("Are you sure you want to cancel this job?"))) {
-               _job->cancel ();
+       if (confirm_dialog(_parent, _("Are you sure you want to cancel this job?"))) {
+               _job->cancel();
        }
 }
 
 
 void
-JobView::insert (int pos)
+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 ();
+       _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 ()
+JobView::detach()
 {
-       _table->Detach (_gauge_message);
-       _table->Detach (_controls);
+       _table->Detach(_gauge_message);
+       _table->Detach(_controls);
 }
 
 
 void
-JobView::notify_clicked ()
+JobView::notify_clicked()
 {
-       Config::instance()->set_default_notify (_notify->GetValue ());
+       Config::instance()->set_default_notify(_notify->GetValue());
 }

diff --git a/src/wx/job_view.h b/src/wx/job_view.h
index 74518c9babc639722cbeca7a441a7f8c380dc44c..f5cffbefb0eb9d23308f8a49723da0e9b95218c7 100644 (file)
--- a/src/wx/job_view.h
+++ b/src/wx/job_view.h
@@ -42,26 +42,26 @@ class wxWindow;
 class JobView
 {
 public:
-       JobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
-       virtual ~JobView () {}
+       JobView(std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
+       virtual ~JobView() {}
 
-       JobView (JobView const&) = delete;
-       JobView& operator= (JobView const&) = delete;
+       JobView(JobView const&) = delete;
+       JobView& operator=(JobView const&) = delete;
 
-       virtual int insert_position () const = 0;
-       virtual void job_list_changed () {}
+       virtual int insert_position() const = 0;
+       virtual void job_list_changed() {}
 
-       void setup ();
-       void maybe_pulse ();
-       void insert (int pos);
-       void detach ();
+       void setup();
+       void maybe_pulse();
+       void insert(int pos);
+       void detach();
 
-       std::shared_ptr<Job> job () const {
+       std::shared_ptr<Job> job() const {
                return _job;
        }
 
 protected:
-       virtual void finished ();
+       virtual void finished();
 
        std::shared_ptr<Job> _job;
        wxFlexGridSizer* _table;
@@ -72,12 +72,12 @@ protected:
 
 private:
 
-       virtual void finish_setup (wxWindow *, wxSizer *) {}
+       virtual void finish_setup(wxWindow *, wxSizer *) {}
 
-       void progress ();
-       void details_clicked (wxCommandEvent &);
-       void cancel_clicked (wxCommandEvent &);
-       void notify_clicked ();
+       void progress();
+       void details_clicked(wxCommandEvent &);
+       void cancel_clicked(wxCommandEvent &);
+       void notify_clicked();
 
        wxWindow* _parent;
        wxWindow* _container;