#include "isdcf_metadata_dialog.h"
#include "preset_colour_conversion_dialog.h"
#include "server_dialog.h"
+#include "make_signer_chain_dialog.h"
using std::vector;
using std::string;
{}
protected:
+ wxPanel* make_panel (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
+ return panel;
+ }
+
wxSize _panel_size;
int _border;
};
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- s->Add (table, 1, wxALL | wxEXPAND, _border);
+ panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
_set_language = new wxCheckBox (panel, wxID_ANY, _("Set language"));
table->Add (_set_language, 1);
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- s->Add (table, 1, wxALL | wxEXPAND, _border);
+ panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
{
add_label_to_sizer (table, panel, _("Default duration of still images"), true);
_issuer = new wxTextCtrl (panel, wxID_ANY);
table->Add (_issuer, 1, wxEXPAND);
- add_label_to_sizer (table, panel, _("Default creator"), true);
- _creator = new wxTextCtrl (panel, wxID_ANY);
- table->Add (_creator, 1, wxEXPAND);
-
Config* config = Config::instance ();
_still_length->SetRange (1, 3600);
_isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent));
- vector<Ratio const *> ratio = Ratio::all ();
- int n = 0;
- for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
- _scale->Append (std_to_wx ((*i)->nickname ()));
- if (*i == config->default_scale ()) {
- _scale->SetSelection (n);
+ vector<VideoContentScale> scales = VideoContentScale::all ();
+ for (size_t i = 0; i < scales.size(); ++i) {
+ _scale->Append (std_to_wx (scales[i].name ()));
+ if (scales[i] == config->default_scale ()) {
+ _scale->SetSelection (i);
}
- _container->Append (std_to_wx ((*i)->nickname ()));
- if (*i == config->default_container ()) {
- _container->SetSelection (n);
+ }
+
+ vector<Ratio const *> ratios = Ratio::all ();
+ for (size_t i = 0; i < ratios.size(); ++i) {
+ _container->Append (std_to_wx (ratios[i]->nickname ()));
+ if (ratios[i] == config->default_container ()) {
+ _container->SetSelection (i);
}
- ++n;
}
_scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
_container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
vector<DCPContentType const *> const ct = DCPContentType::all ();
- n = 0;
- for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
- _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
- if (*i == config->default_dcp_content_type ()) {
- _dcp_content_type->SetSelection (n);
+ for (size_t i = 0; i < ct.size(); ++i) {
+ _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ()));
+ if (ct[i] == config->default_dcp_content_type ()) {
+ _dcp_content_type->SetSelection (i);
}
- ++n;
}
_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
_audio_delay->SetValue (config->default_audio_delay ());
_audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this));
- _issuer->SetValue (std_to_wx (config->dcp_metadata().issuer));
+ _issuer->SetValue (std_to_wx (config->dcp_issuer ()));
_issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this));
- _creator->SetValue (std_to_wx (config->dcp_metadata().creator));
- _creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::creator_changed, this));
return panel;
}
void scale_changed ()
{
- vector<Ratio const *> ratio = Ratio::all ();
- Config::instance()->set_default_scale (ratio[_scale->GetSelection()]);
+ vector<VideoContentScale> scale = VideoContentScale::all ();
+ Config::instance()->set_default_scale (scale[_scale->GetSelection()]);
}
void container_changed ()
void issuer_changed ()
{
- dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
- m.issuer = wx_to_std (_issuer->GetValue ());
- Config::instance()->set_dcp_metadata (m);
- }
-
- void creator_changed ()
- {
- dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
- m.creator = wx_to_std (_creator->GetValue ());
- Config::instance()->set_dcp_metadata (m);
+ Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
}
wxSpinCtrl* _j2k_bandwidth;
wxChoice* _container;
wxChoice* _dcp_content_type;
wxTextCtrl* _issuer;
- wxTextCtrl* _creator;
};
class EncodingServersPage : public wxPreferencesPage, public Page
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
_use_any_servers = new wxCheckBox (panel, wxID_ANY, _("Use all servers"));
- s->Add (_use_any_servers, 0, wxALL, _border);
+ panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
vector<string> columns;
columns.push_back (wx_to_std (_("IP address / host name")));
boost::bind (&EncodingServersPage::server_column, this, _1)
);
- s->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
+ panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
_use_any_servers->SetValue (Config::instance()->use_any_servers ());
_use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this));
#endif
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
vector<string> columns;
columns.push_back (wx_to_std (_("Name")));
300
);
- s->Add (list, 1, wxEXPAND | wxALL, _border);
+ panel->GetSizer()->Add (list, 1, wxEXPAND | wxALL, _border);
return panel;
}
table->AddGrowableCol (1, 1);
overall_sizer->Add (table, 1, wxALL | wxEXPAND, _border);
+ _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates..."));
+ table->Add (_remake_certificates, 0);
+ table->AddSpacer (0);
+
add_label_to_sizer (table, _panel, _("Private key for leaf certificate"), true);
{
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_remove_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remove_certificate, this));
_certificates->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&KeysPage::update_sensitivity, this));
_certificates->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&KeysPage::update_sensitivity, this));
+ _remake_certificates->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remake_certificates, this));
_load_signer_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_signer_private_key, this));
_load_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_certificate, this));
_load_decryption_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_private_key, this));
}
}
+ void remake_certificates ()
+ {
+ MakeSignerChainDialog* d = new MakeSignerChainDialog (_panel);
+ if (d->ShowModal () == wxID_OK) {
+ _signer.reset (
+ new dcp::Signer (
+ openssl_path (),
+ d->organisation (),
+ d->organisational_unit (),
+ d->root_common_name (),
+ d->intermediate_common_name (),
+ d->leaf_common_name ()
+ )
+ );
+
+ Config::instance()->set_signer (_signer);
+ update_certificate_list ();
+ update_signer_private_key ();
+ }
+
+ d->Destroy ();
+ }
+
void update_sensitivity ()
{
_remove_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1);
wxListCtrl* _certificates;
wxButton* _add_certificate;
wxButton* _remove_certificate;
+ wxButton* _remake_certificates;
wxStaticText* _signer_private_key;
wxButton* _load_signer_private_key;
wxStaticText* _decryption_certificate;
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- s->Add (table, 1, wxALL | wxEXPAND, _border);
+ panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
add_label_to_sizer (table, panel, _("IP address"), true);
_tms_ip = new wxTextCtrl (panel, wxID_ANY);
wxWindow* CreateWindow (wxWindow* parent)
{
+#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
-#ifdef DCPOMATIC_OSX
wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, wxSize (480, 128));
-#else
+#else
wxPanel* panel = new wxPanel (parent);
-#endif
+#endif
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
panel->SetSizer (s);
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- s->Add (table, 1, wxEXPAND | wxALL, _border);
+ panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
_mail_server = new wxTextCtrl (panel, wxID_ANY);
table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
- s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
+ panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
- s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
+ panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
Config* config = Config::instance ();
_mail_server->SetValue (std_to_wx (config->mail_server ()));
wxButton* _reset_kdm_email;
};
+/** @class AdvancedPage
+ * @brief Advanced page of the preferences dialog.
+ */
class AdvancedPage : public wxStockPreferencesPage, public Page
{
public:
wxWindow* CreateWindow (wxWindow* parent)
{
- wxPanel* panel = new wxPanel (parent);
-
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- panel->SetSizer (s);
+ wxPanel* panel = make_panel (parent);
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
- s->Add (table, 1, wxALL | wxEXPAND, _border);
+ panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
{
add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- add_label_to_sizer (table, panel, _("Log"), true);
- _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
- table->Add (_log_general, 1, wxEXPAND | wxALL);
- _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
- table->AddSpacer (0);
- table->Add (_log_warning, 1, wxEXPAND | wxALL);
- _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
- table->AddSpacer (0);
- table->Add (_log_error, 1, wxEXPAND | wxALL);
- _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
- table->AddSpacer (0);
- table->Add (_log_timing, 1, wxEXPAND | wxALL);
+#ifdef __WXOSX__
+ wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log:"));
+ table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
+#else
+ wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log"));
+ table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6);
+#endif
+
+ {
+ wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
+ _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
+ t->Add (_log_general, 1, wxEXPAND | wxALL);
+ _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
+ t->Add (_log_warning, 1, wxEXPAND | wxALL);
+ _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
+ t->Add (_log_error, 1, wxEXPAND | wxALL);
+ _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
+ t->Add (_log_timing, 1, wxEXPAND | wxALL);
+ table->Add (t, 0, wxALL, 6);
+ }
+#ifdef DCPOMATIC_WINDOWS
+ _win32_console = new wxCheckBox (panel, wxID_ANY, _("Open console window"));
+ table->Add (_win32_console, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+#endif
+
Config* config = Config::instance ();
_maximum_j2k_bandwidth->SetRange (1, 500);
_log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_log_timing->SetValue (config->log_types() & Log::TYPE_TIMING);
_log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+#ifdef DCPOMATIC_WINDOWS
+ _win32_console->SetValue (config->win32_console());
+ _win32_console->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::win32_console_changed, this));
+#endif
return panel;
}
}
Config::instance()->set_log_types (types);
}
+
+#ifdef DCPOMATIC_WINDOWS
+ void win32_console_changed ()
+ {
+ Config::instance()->set_win32_console (_win32_console->GetValue ());
+ }
+#endif
wxSpinCtrl* _maximum_j2k_bandwidth;
wxCheckBox* _allow_any_dcp_frame_rate;
wxCheckBox* _log_warning;
wxCheckBox* _log_error;
wxCheckBox* _log_timing;
+#ifdef DCPOMATIC_WINDOWS
+ wxCheckBox* _win32_console;
+#endif
};
wxPreferencesEditor*
the containing window doesn't shrink too much when we select those panels.
This is obviously an unpleasant hack.
*/
- wxSize ps = wxSize (480, -1);
+ wxSize ps = wxSize (520, -1);
int const border = 16;
#else
wxSize ps = wxSize (-1, -1);
projects / dcpomatic.git / blobdiff