projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some debug code.
[dcpomatic.git]
/
src
/
wx
/
job_view.cc
diff --git
a/src/wx/job_view.cc
b/src/wx/job_view.cc
index 136b18ed39fb75eedf782e1b2ac1caae171a7a2f..798e353a9b443b3e99bb1056d7b4977dca8f7c95 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)
JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
+ , _table (table)
, _parent (parent)
, _parent (parent)
+ , _container (container)
{
{
- int n = 0;
+
+}
+
+void
+JobView::setup ()
+{
+ int n = insert_position ();
_gauge_message = new wxBoxSizer (wxVERTICAL);
_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);
/* 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 "));
_gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
_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;
++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;
+ wxBoxSizer* 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_COMMAND_BUTTON_CLICKED, &JobView::cancel_clicked, this);
+ buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
- _details = new wxButton (container, wxID_ANY, _("Details..."));
+ _details = new wxButton (
_
container, wxID_ANY, _("Details..."));
_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobView::details_clicked, this);
_details->Enable (false);
_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &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);
+
+ finish_setup (_container, buttons);
- _progress_connection = job->Progress.connect (boost::bind (&JobView::progress, this));
- _finished_connection = job->Finished.connect (boost::bind (&JobView::finished, this));
+ _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 ();
progress ();
- table->Layout ();
+
_
table->Layout ();
}
void
}
void
@@
-104,7
+111,6
@@
JobView::finished ()
}
_cancel->Enable (false);
}
_cancel->Enable (false);
- _pause->Enable (false);
if (!_job->error_details().empty ()) {
_details->Enable (true);
}
if (!_job->error_details().empty ()) {
_details->Enable (true);
}
@@
-125,15
+131,3
@@
JobView::cancel_clicked (wxCommandEvent &)
_job->cancel ();
}
}
_job->cancel ();
}
}
-
-void
-JobView::pause_clicked (wxCommandEvent &)
-{
- if (_job->paused()) {
- _job->resume ();
- _pause->SetLabel (_("Pause"));
- } else {
- _job->pause ();
- _pause->SetLabel (_("Resume"));
- }
-}