);
if (d->ShowModal () == wxID_OK) {
- boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath()));
+ boost::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(d->GetPath()), boost::filesystem::copy_option::overwrite_if_exists);
}
d->Destroy ();
}
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("defaults"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("servers"), wxBITMAP_TYPE_PNG);
}
#endif
boost::bind (&Config::servers, Config::instance()),
boost::bind (&Config::set_servers, Config::instance(), _1),
boost::bind (&EncodingServersPage::server_column, this, _1),
- false,
+ EditableListTitle::INVISIBLE,
EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
);
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG);
}
#endif
_tms_protocol = new wxChoice (_panel, wxID_ANY);
table->Add (_tms_protocol, 1, wxEXPAND);
+ _tms_passive = new CheckBox(_panel, _("Passive mode"));
+ table->Add(_tms_passive, 1, wxEXPAND);
+ table->AddSpacer(0);
+
add_label_to_sizer (table, _panel, _("IP address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_ip = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_ip, 1, wxEXPAND);
_upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this));
_tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this));
+ _tms_passive->bind(&TMSPage::tms_passive_changed, this);
+
_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
_tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this));
checked_set (_upload, config->upload_after_make_dcp());
checked_set (_tms_protocol, static_cast<int>(config->tms_protocol()));
+ checked_set(_tms_passive, config->tms_protocol() == FileTransferProtocol::FTP && config->tms_passive());
checked_set (_tms_ip, config->tms_ip ());
checked_set (_tms_path, config->tms_path ());
checked_set (_tms_user, config->tms_user ());
checked_set (_tms_password, config->tms_password ());
+
+ _tms_passive->Enable(config->tms_protocol() == FileTransferProtocol::FTP);
}
void upload_changed ()
Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
}
+ void tms_passive_changed()
+ {
+ Config::instance()->set_tms_passive(_tms_passive->get());
+ }
+
void tms_ip_changed ()
{
Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
}
CheckBox* _upload;
+ CheckBox* _tms_passive;
wxChoice* _tms_protocol;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("email"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("kdm_email"), wxBITMAP_TYPE_PNG);
}
#endif
[] (string s, int) {
return s;
},
- true,
+ EditableListTitle::VISIBLE,
EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
);
table->Add (_cc, 1, wxEXPAND | wxALL);
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("notifications"), wxBITMAP_TYPE_PNG);
}
#endif
[] (string s, int) {
return s;
},
- true,
+ EditableListTitle::VISIBLE,
EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
);
table->Add (_cc, 1, wxEXPAND | wxALL);
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("cover_sheet"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("identifiers"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG);
}
#endif