projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb2c727
)
White space / C++11 tidying.
author
Carl Hetherington
<cth@carlh.net>
Fri, 19 Mar 2021 09:36:32 +0000
(10:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 19 Mar 2021 09:36:32 +0000
(10:36 +0100)
src/wx/job_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/job_view.cc
b/src/wx/job_view.cc
index 52c975beefaa38d5754d7292dfbba1b535b28260..2754948ae609c0c2283f903714946649f180d673 100644
(file)
--- a/
src/wx/job_view.cc
+++ b/
src/wx/job_view.cc
@@
-18,6
+18,7
@@
*/
*/
+
#include "job_view.h"
#include "wx_util.h"
#include "message_dialog.h"
#include "job_view.h"
#include "wx_util.h"
#include "message_dialog.h"
@@
-34,12
+35,14
@@
#include <wx/wx.h>
#include <boost/algorithm/string.hpp>
#include <wx/wx.h>
#include <boost/algorithm/string.hpp>
+
using std::string;
using std::min;
using std::shared_ptr;
using boost::bind;
using std::dynamic_pointer_cast;
using std::string;
using std::min;
using std::shared_ptr;
using boost::bind;
using std::dynamic_pointer_cast;
+
JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
, _table (table)
JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
, _table (table)
@@
-50,6
+53,7
@@
JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wx
}
}
+
void
JobView::setup ()
{
void
JobView::setup ()
{
@@
-95,6
+99,7
@@
JobView::setup ()
_table->Layout ();
}
_table->Layout ();
}
+
void
JobView::maybe_pulse ()
{
void
JobView::maybe_pulse ()
{
@@
-103,6
+108,7
@@
JobView::maybe_pulse ()
}
}
}
}
+
void
JobView::progress ()
{
void
JobView::progress ()
{
@@
-110,7
+116,7
@@
JobView::progress ()
if (!_job->sub_name().empty ()) {
whole += _job->sub_name() + " ";
}
if (!_job->sub_name().empty ()) {
whole += _job->sub_name() + " ";
}
-
string
s = _job->status ();
+
auto
s = _job->status ();
/* Watch out for < > in the error string */
boost::algorithm::replace_all (s, "<", "<");
boost::algorithm::replace_all (s, ">", ">");
/* Watch out for < > in the error string */
boost::algorithm::replace_all (s, "<", "<");
boost::algorithm::replace_all (s, ">", ">");
@@
-128,6
+134,7
@@
JobView::progress ()
}
}
}
}
+
void
JobView::finished ()
{
void
JobView::finished ()
{
@@
-162,14
+169,16
@@
JobView::finished ()
}
}
}
}
+
void
JobView::details_clicked (wxCommandEvent &)
{
void
JobView::details_clicked (wxCommandEvent &)
{
-
string
s = _job->error_summary();
+
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 &)
{
void
JobView::cancel_clicked (wxCommandEvent &)
{
@@
-178,6
+187,7
@@
JobView::cancel_clicked (wxCommandEvent &)
}
}
}
}
+
void
JobView::insert (int pos)
{
void
JobView::insert (int pos)
{
@@
-186,6
+196,7
@@
JobView::insert (int pos)
_table->Layout ();
}
_table->Layout ();
}
+
void
JobView::detach ()
{
void
JobView::detach ()
{
@@
-193,6
+204,7
@@
JobView::detach ()
_table->Detach (_controls);
}
_table->Detach (_controls);
}
+
void
JobView::notify_clicked ()
{
void
JobView::notify_clicked ()
{