* @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"
+#include <iostream>
using std::string;
using std::list;
: _job (job)
, _window (window)
, _panel (panel)
- , _table (table)
{
int n = 0;
-
- _name = new wxStaticText (panel, wxID_ANY, "");
- string const jn = "<b>" + _job->name () + "</b>";
- _name->SetLabelMarkup (std_to_wx (jn));
- table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
- ++n;
-
+
+ _gauge_message = new wxBoxSizer (wxVERTICAL);
_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));
- table->Insert (n, _gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+ _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;
-
- _message = new wxStaticText (panel, wxID_ANY, std_to_wx (""));
- table->Insert (n, _message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
- ++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, 6);
+ 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, 6);
+ 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, 6);
+ table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
++n;
-
- job->Progress.connect (boost::bind (&JobRecord::progress, this));
- job->Finished.connect (boost::bind (&JobRecord::finished, this));
-
+
+ _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this));
+ _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this));
+
+ progress ();
+
table->Layout ();
- panel->FitInside ();
}
void maybe_pulse ()
private:
- void update_job_name ()
+ void progress ()
{
- string n = "<b>" + _job->name () + "</b>";
+ string whole = "<b>" + _job->name () + "</b>\n";
if (!_job->sub_name().empty ()) {
- n += "\n" + _job->sub_name ();
+ whole += _job->sub_name() + " ";
}
-
- if (n != _last_name) {
- _name->SetLabelMarkup (std_to_wx (n));
- _last_name = n;
- }
- }
-
- void update_status ()
- {
- string s = _job->status ();
- if (s.length() > 25) {
- s = s.substr (0, 25) + "...";
+ whole += _job->status ();
+ if (whole != _last_message) {
+ _message->SetLabelMarkup (std_to_wx (whole));
+ _gauge_message->Layout ();
+ _last_message = whole;
}
- checked_set (_message, s);
- }
-
- void progress ()
- {
- update_status ();
- update_job_name ();
if (_job->progress ()) {
_gauge->SetValue (min (100.0f, _job->progress().get() * 100));
- }
- _table->Layout ();
- _window->FitInside ();
+ }
}
void finished ()
{
- update_status ();
- update_job_name ();
-
+ progress ();
+
if (!_job->finished_cancelled ()) {
_gauge->SetValue (100);
}
-
+
_cancel->Enable (false);
_pause->Enable (false);
if (!_job->error_details().empty ()) {
_details->Enable (true);
}
-
- _table->Layout ();
- _window->FitInside ();
}
void details_clicked (wxCommandEvent &)
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 ();
_pause->SetLabel (_("Resume"));
}
}
-
+
boost::shared_ptr<Job> _job;
wxScrolledWindow* _window;
wxPanel* _panel;
- wxFlexGridSizer* _table;
- wxStaticText* _name;
+ wxBoxSizer* _gauge_message;
wxGauge* _gauge;
wxStaticText* _message;
wxButton* _cancel;
wxButton* _pause;
wxButton* _details;
- std::string _last_name;
+ std::string _last_message;
+
+ boost::signals2::scoped_connection _progress_connection;
+ boost::signals2::scoped_connection _finished_connection;
};
/** Must be called in the GUI thread */
sizer->Add (_panel, 1, wxEXPAND);
SetSizer (sizer);
- _table = new wxFlexGridSizer (6, 6, 6);
- _table->AddGrowableCol (1, 1);
+ _table = new wxFlexGridSizer (4, 4, 6);
+ _table->AddGrowableCol (0, 1);
_panel->SetSizer (_table);
SetScrollRate (0, 32);
_timer.reset (new wxTimer (this));
_timer->Start (1000);
- Bind (wxEVT_SIZE, boost::bind (&JobManagerView::sized, this, _1));
JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
}
-void
-JobManagerView::sized (wxSizeEvent& ev)
-{
- _table->FitInside (_panel);
- _table->Layout ();
- ev.Skip ();
-}
-
void
JobManagerView::job_added (weak_ptr<Job> j)
{
projects / dcpomatic.git / blobdiff