projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1b7e04a
)
Fix various bad automatic merges in i18n files.
author
Carl Hetherington
<cth@carlh.net>
Mon, 3 Oct 2016 08:14:58 +0000
(09:14 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 3 Oct 2016 08:14:58 +0000
(09:14 +0100)
13 files changed:
src/tools/dcpomatic_batch.cc
patch
|
blob
|
history
src/wx/job_manager_view.cc
patch
|
blob
|
history
src/wx/job_manager_view.h
patch
|
blob
|
history
src/wx/job_view.cc
patch
|
blob
|
history
src/wx/job_view.h
patch
|
blob
|
history
src/wx/job_view_dialog.cc
patch
|
blob
|
history
src/wx/po/de_DE.po
patch
|
blob
|
history
src/wx/po/es_ES.po
patch
|
blob
|
history
src/wx/po/fr_FR.po
patch
|
blob
|
history
src/wx/po/nl_NL.po
patch
|
blob
|
history
src/wx/po/ru_RU.po
patch
|
blob
|
history
src/wx/po/zh_CN.po
patch
|
blob
|
history
src/wx/wscript
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_batch.cc
b/src/tools/dcpomatic_batch.cc
index ca9ec3a6be3fdd8b00a1473c57307558f7e2e133..baac049c06f828b7479e877ba36f122e89f5cbe3 100644
(file)
--- a/
src/tools/dcpomatic_batch.cc
+++ b/
src/tools/dcpomatic_batch.cc
@@
-111,7
+111,7
@@
public:
s->Add (panel, 1, wxEXPAND);
SetSizer (s);
s->Add (panel, 1, wxEXPAND);
SetSizer (s);
- JobManagerView* job_manager_view = new JobManagerView (panel,
fals
e);
+ JobManagerView* job_manager_view = new JobManagerView (panel,
tru
e);
_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
diff --git
a/src/wx/job_manager_view.cc
b/src/wx/job_manager_view.cc
index e70622b30e8b0cb6c0e66b85f45e4265949ee437..6cea40c8912859b36d55b2dad5df61dc022446b3 100644
(file)
--- a/
src/wx/job_manager_view.cc
+++ b/
src/wx/job_manager_view.cc
@@
-23,7
+23,8
@@
*/
#include "job_manager_view.h"
*/
#include "job_manager_view.h"
-#include "job_view.h"
+#include "batch_job_view.h"
+#include "normal_job_view.h"
#include "wx_util.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include "wx_util.h"
#include "lib/job_manager.h"
#include "lib/job.h"
@@
-41,21
+42,20
@@
using boost::shared_ptr;
using boost::weak_ptr;
/** @param parent Parent window.
using boost::weak_ptr;
/** @param parent Parent window.
- * @param latest_at_top true to put the last-added job at the top of the view,
- * false to put it at the bottom.
+ * @param batch true to use BatchJobView, false to use NormalJobView.
*
* Must be called in the GUI thread.
*/
*
* Must be called in the GUI thread.
*/
-JobManagerView::JobManagerView (wxWindow* parent, bool
latest_at_top
)
+JobManagerView::JobManagerView (wxWindow* parent, bool
batch
)
: wxScrolledWindow (parent)
: wxScrolledWindow (parent)
- , _
latest_at_top (latest_at_top
)
+ , _
batch (batch
)
{
_panel = new wxPanel (this);
wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
sizer->Add (_panel, 1, wxEXPAND);
SetSizer (sizer);
{
_panel = new wxPanel (this);
wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
sizer->Add (_panel, 1, wxEXPAND);
SetSizer (sizer);
- _table = new wxFlexGridSizer (
4, 4
, 6);
+ _table = new wxFlexGridSizer (
2, 6
, 6);
_table->AddGrowableCol (0, 1);
_panel->SetSizer (_table);
_table->AddGrowableCol (0, 1);
_panel->SetSizer (_table);
@@
-74,7
+74,14
@@
JobManagerView::job_added (weak_ptr<Job> j)
{
shared_ptr<Job> job = j.lock ();
if (job) {
{
shared_ptr<Job> job = j.lock ();
if (job) {
- _job_records.push_back (shared_ptr<JobView> (new JobView (job, this, _panel, _table, _latest_at_top)));
+ shared_ptr<JobView> v;
+ if (_batch) {
+ v.reset (new BatchJobView (job, this, _panel, _table));
+ } else {
+ v.reset (new NormalJobView (job, this, _panel, _table));
+ }
+ v->setup ();
+ _job_records.push_back (v);
}
FitInside();
}
FitInside();
diff --git
a/src/wx/job_manager_view.h
b/src/wx/job_manager_view.h
index d887718d34b0f18eea8e3fdd6a53e448cfa74581..7784c71eed3cc639a1393dc9001055c1fd5f7167 100644
(file)
--- a/
src/wx/job_manager_view.h
+++ b/
src/wx/job_manager_view.h
@@
-35,7
+35,7
@@
class JobView;
class JobManagerView : public wxScrolledWindow
{
public:
class JobManagerView : public wxScrolledWindow
{
public:
- JobManagerView (wxWindow *, bool
latest_at_top
);
+ JobManagerView (wxWindow *, bool
batch
);
private:
void job_added (boost::weak_ptr<Job>);
private:
void job_added (boost::weak_ptr<Job>);
@@
-44,7
+44,7
@@
private:
wxPanel* _panel;
wxFlexGridSizer* _table;
boost::shared_ptr<wxTimer> _timer;
wxPanel* _panel;
wxFlexGridSizer* _table;
boost::shared_ptr<wxTimer> _timer;
- bool _
latest_at_top
;
+ bool _
batch
;
std::list<boost::shared_ptr<JobView> > _job_records;
};
std::list<boost::shared_ptr<JobView> > _job_records;
};
diff --git
a/src/wx/job_view.cc
b/src/wx/job_view.cc
index 83d3159b09dcd15b90d5c19a2cad1717e1e662d0..f9a8fb08956f0df2a92f2f9d60595cad2893a5d6 100644
(file)
--- a/
src/wx/job_view.cc
+++ b/
src/wx/job_view.cc
@@
-28,45
+28,53
@@
using std::string;
using std::min;
using boost::shared_ptr;
using std::min;
using boost::shared_ptr;
-/** @param top Put this view at the top of table, otherwise put it at the bottom */
-JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table, bool top)
+JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
: _job (job)
: _job (job)
+ , _table (table)
, _parent (parent)
, _parent (parent)
+ , _container (container)
{
{
- int n = top ? 0 : (table->GetEffectiveRowsCount() * table->GetEffectiveColsCount());
+
+}
+
+void
+JobView::setup ()
+{
+ int n = insert_position ();
+
+ std::cout << "insert @ " << n << "\n";
_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
@@
-105,7
+113,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);
}
@@
-126,15
+133,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"));
- }
-}
diff --git
a/src/wx/job_view.h
b/src/wx/job_view.h
index 96233f7322b5e78b1d113eb7c1ba870e750eff49..8cd34fdabec809c75d9226fbc9b670e551ae7167 100644
(file)
--- a/
src/wx/job_view.h
+++ b/
src/wx/job_view.h
@@
-18,6
+18,9
@@
*/
*/
+#ifndef DCPOMATIC_JOB_VIEW_H
+#define DCPOMATIC_JOB_VIEW_H
+
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
@@
-31,32
+34,44
@@
class wxBoxSizer;
class wxGauge;
class wxStaticText;
class wxButton;
class wxGauge;
class wxStaticText;
class wxButton;
+class wxSizer;
class JobView : public boost::noncopyable
{
public:
class JobView : public boost::noncopyable
{
public:
- JobView (boost::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table, bool top);
+ JobView (boost::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
+ virtual ~JobView () {}
+
+ void setup ();
void maybe_pulse ();
void maybe_pulse ();
+protected:
+ virtual void finished ();
+
+ boost::shared_ptr<Job> _job;
+ wxFlexGridSizer* _table;
+
private:
private:
+ virtual int insert_position () const = 0;
+ virtual void finish_setup (wxWindow *, wxSizer *) {}
+
void progress ();
void progress ();
- void finished ();
void details_clicked (wxCommandEvent &);
void cancel_clicked (wxCommandEvent &);
void details_clicked (wxCommandEvent &);
void cancel_clicked (wxCommandEvent &);
- void pause_clicked (wxCommandEvent &);
- boost::shared_ptr<Job> _job;
wxWindow* _parent;
wxWindow* _parent;
+ wxWindow* _container;
wxBoxSizer* _gauge_message;
wxGauge* _gauge;
wxStaticText* _message;
wxButton* _cancel;
wxBoxSizer* _gauge_message;
wxGauge* _gauge;
wxStaticText* _message;
wxButton* _cancel;
- wxButton* _pause;
wxButton* _details;
std::string _last_message;
boost::signals2::scoped_connection _progress_connection;
boost::signals2::scoped_connection _finished_connection;
};
wxButton* _details;
std::string _last_message;
boost::signals2::scoped_connection _progress_connection;
boost::signals2::scoped_connection _finished_connection;
};
+
+#endif
diff --git
a/src/wx/job_view_dialog.cc
b/src/wx/job_view_dialog.cc
index e629cce626a4771f9c3d7ce0511fed86a824474e..c1c1c0c55d01f4f77bb5ef84b8356ef287e39bca 100644
(file)
--- a/
src/wx/job_view_dialog.cc
+++ b/
src/wx/job_view_dialog.cc
@@
-19,14
+19,14
@@
*/
#include "job_view_dialog.h"
*/
#include "job_view_dialog.h"
-#include "job_view.h"
+#include "
normal_
job_view.h"
using boost::shared_ptr;
JobViewDialog::JobViewDialog (wxWindow* parent, wxString title, shared_ptr<Job> job)
: TableDialog (parent, title, 4, 0, false)
{
using boost::shared_ptr;
JobViewDialog::JobViewDialog (wxWindow* parent, wxString title, shared_ptr<Job> job)
: TableDialog (parent, title, 4, 0, false)
{
- _view = new
JobView (job, this, this, _table, tru
e);
+ _view = new
NormalJobView (job, this, this, _tabl
e);
layout ();
SetMinSize (wxSize (960, -1));
layout ();
SetMinSize (wxSize (960, -1));
diff --git
a/src/wx/po/de_DE.po
b/src/wx/po/de_DE.po
index 1612313236f37be60950b0e4ab419bee21e45742..83f71dfa92086fa9ddb68c0bfc4595fa13109e57 100644
(file)
--- a/
src/wx/po/de_DE.po
+++ b/
src/wx/po/de_DE.po
@@
-226,11
+226,8
@@
msgid "Appearance..."
msgstr "Darstellung..."
#: src/wx/job_view.cc:125
msgstr "Darstellung..."
#: src/wx/job_view.cc:125
-#, fuzzy
msgid "Are you sure you want to cancel this job?"
msgstr ""
msgid "Are you sure you want to cancel this job?"
msgstr ""
-"Bitte bestätigen Sie das Versenden von Emails an die folgenden Adressen!\n"
-"\n"
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
diff --git
a/src/wx/po/es_ES.po
b/src/wx/po/es_ES.po
index 10a4346e95c677efa18a4709bd60ffb8cec91b80..a10d96cd26076cc77f208fd321f47b4f4a5ed452 100644
(file)
--- a/
src/wx/po/es_ES.po
+++ b/
src/wx/po/es_ES.po
@@
-224,11
+224,8
@@
msgid "Appearance..."
msgstr "Apariencia…"
#: src/wx/job_view.cc:125
msgstr "Apariencia…"
#: src/wx/job_view.cc:125
-#, fuzzy
msgid "Are you sure you want to cancel this job?"
msgstr ""
msgid "Are you sure you want to cancel this job?"
msgstr ""
-"¿Estás seguro de que quieres enviar correos a las direcciones siguientes?\n"
-"\n"
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
diff --git
a/src/wx/po/fr_FR.po
b/src/wx/po/fr_FR.po
index 81a30b9190b6f85b04c2e1054244f695e7494a5b..dc3e73a16e57ca4fd4d2fcb0261744055fd8639a 100644
(file)
--- a/
src/wx/po/fr_FR.po
+++ b/
src/wx/po/fr_FR.po
@@
-225,11
+225,8
@@
msgid "Appearance..."
msgstr "Apparence..."
#: src/wx/job_view.cc:125
msgstr "Apparence..."
#: src/wx/job_view.cc:125
-#, fuzzy
msgid "Are you sure you want to cancel this job?"
msgstr ""
msgid "Are you sure you want to cancel this job?"
msgstr ""
-"Etes-vous certain de vouloir envoyer des courriels aux adresses suivantes ?\n"
-"\n"
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
diff --git
a/src/wx/po/nl_NL.po
b/src/wx/po/nl_NL.po
index a1320098da591faf7d8f6c542bdb4b8792dd96a0..c75ecac6a15bac3db79d08449b839698d6000390 100644
(file)
--- a/
src/wx/po/nl_NL.po
+++ b/
src/wx/po/nl_NL.po
@@
-225,11
+225,8
@@
msgid "Appearance..."
msgstr "Uiterlijk..."
#: src/wx/job_view.cc:125
msgstr "Uiterlijk..."
#: src/wx/job_view.cc:125
-#, fuzzy
msgid "Are you sure you want to cancel this job?"
msgstr ""
msgid "Are you sure you want to cancel this job?"
msgstr ""
-"Weet u zeker dat u emails naar de volgende adressen wilt verzenden?\n"
-"\n"
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
diff --git
a/src/wx/po/ru_RU.po
b/src/wx/po/ru_RU.po
index e3e5e3f879a932dd88f11a8af2f43fc6bf83f1cb..16497194006f1f0f83254bbb547db295f3d76839 100644
(file)
--- a/
src/wx/po/ru_RU.po
+++ b/
src/wx/po/ru_RU.po
@@
-1388,9
+1388,8
@@
msgid "SMPTE"
msgstr "SMPTE"
#: src/wx/audio_dialog.cc:320
msgstr "SMPTE"
#: src/wx/audio_dialog.cc:320
-#, fuzzy, c-format
msgid "Sample peak is %.2fdB at %s on %s"
msgid "Sample peak is %.2fdB at %s on %s"
-msgstr "
Пиковая громкость %.2fдБ на %s
"
+msgstr ""
#: src/wx/save_template_dialog.cc:29
msgid "Save template"
#: src/wx/save_template_dialog.cc:29
msgid "Save template"
diff --git
a/src/wx/po/zh_CN.po
b/src/wx/po/zh_CN.po
index 576162efbc482f3c9ea73cad4382d14df9511037..b6d7d4e2bd422f5900d7a3f38cc40799c5ad380f 100644
(file)
--- a/
src/wx/po/zh_CN.po
+++ b/
src/wx/po/zh_CN.po
@@
-226,11
+226,8
@@
msgid "Appearance..."
msgstr "显示..."
#: src/wx/job_view.cc:125
msgstr "显示..."
#: src/wx/job_view.cc:125
-#, fuzzy
msgid "Are you sure you want to cancel this job?"
msgstr ""
msgid "Are you sure you want to cancel this job?"
msgstr ""
-"你确定要发送邮件到以下地址?\n"
-"\n"
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
#: src/wx/confirm_kdm_email_dialog.cc:35
msgid ""
diff --git
a/src/wx/wscript
b/src/wx/wscript
index e001c51b7a6f429fbb9246dacd4f7a083461ace0..fd1528b276a62e9ca9316c792ab652b912e526ef 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-31,6
+31,7
@@
sources = """
audio_mapping_view.cc
audio_panel.cc
audio_plot.cc
audio_mapping_view.cc
audio_panel.cc
audio_plot.cc
+ batch_job_view.cc
cinema_dialog.cc
colour_conversion_editor.cc
config_dialog.cc
cinema_dialog.cc
colour_conversion_editor.cc
config_dialog.cc
@@
-71,6
+72,7
@@
sources = """
move_to_dialog.cc
name_format_editor.cc
new_film_dialog.cc
move_to_dialog.cc
name_format_editor.cc
new_film_dialog.cc
+ normal_job_view.cc
playhead_to_timecode_dialog.cc
playhead_to_frame_dialog.cc
repeat_dialog.cc
playhead_to_timecode_dialog.cc
playhead_to_frame_dialog.cc
repeat_dialog.cc