/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
/** @file src/config_dialog.cc
- * @brief A dialogue to edit DVD-o-matic configuration.
+ * @brief A dialogue to edit DCP-o-matic configuration.
*/
#include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include <wx/stdpaths.h>
+#include <wx/preferences.h>
+#include <wx/filepicker.h>
+#include <wx/spinctrl.h>
+#include <libdcp/colour_matrix.h>
#include "lib/config.h"
-#include "lib/server.h"
-#include "lib/format.h"
+#include "lib/ratio.h"
#include "lib/scaler.h"
#include "lib/filter.h"
+#include "lib/dcp_content_type.h"
+#include "lib/colour_conversion.h"
#include "config_dialog.h"
#include "wx_util.h"
+#include "editable_list.h"
#include "filter_dialog.h"
-#include "server_dialog.h"
#include "dir_picker_ctrl.h"
-#include "dci_metadata_dialog.h"
+#include "isdcf_metadata_dialog.h"
+#include "preset_colour_conversion_dialog.h"
+#include "server_dialog.h"
-using namespace std;
+using std::vector;
+using std::string;
+using std::list;
+using std::cout;
using boost::bind;
+using boost::shared_ptr;
+using boost::lexical_cast;
-ConfigDialog::ConfigDialog (wxWindow* parent)
- : wxDialog (parent, wxID_ANY, _("DVD-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+class Page
{
- wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
- table->AddGrowableCol (1, 1);
-
- _set_language = new wxCheckBox (this, wxID_ANY, _("Set language"));
- table->Add (_set_language, 1, wxEXPAND);
- _language = new wxChoice (this, wxID_ANY);
- _language->Append (wxT ("English"));
- _language->Append (wxT ("Français"));
- _language->Append (wxT ("Italiano"));
- _language->Append (wxT ("Español"));
- _language->Append (wxT ("Svenska"));
- table->Add (_language, 1, wxEXPAND);
- table->AddSpacer (0);
-
- table->AddSpacer (0);
- wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DVD-o-matic to see language changes)"));
- wxFont font = restart->GetFont();
- font.SetStyle (wxFONTSTYLE_ITALIC);
- font.SetPointSize (font.GetPointSize() - 1);
- restart->SetFont (font);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("TMS IP address"));
- _tms_ip = new wxTextCtrl (this, wxID_ANY);
- table->Add (_tms_ip, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("TMS target path"));
- _tms_path = new wxTextCtrl (this, wxID_ANY);
- table->Add (_tms_path, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("TMS user name"));
- _tms_user = new wxTextCtrl (this, wxID_ANY);
- table->Add (_tms_user, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("TMS password"));
- _tms_password = new wxTextCtrl (this, wxID_ANY);
- table->Add (_tms_password, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("Threads to use for encoding on this host"));
- _num_local_encoding_threads = new wxSpinCtrl (this);
- table->Add (_num_local_encoding_threads, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("Default directory for new films"));
-#ifdef __WXMSW__
- _default_directory = new DirPickerCtrl (this);
-#else
- _default_directory = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
-#endif
- table->Add (_default_directory, 1, wxEXPAND);
- table->AddSpacer (0);
-
- add_label_to_sizer (table, this, _("Default DCI name details"));
- _default_dci_metadata_button = new wxButton (this, wxID_ANY, _("Edit..."));
- table->Add (_default_dci_metadata_button);
- table->AddSpacer (1);
+public:
+ Page (wxSize panel_size, int border)
+ : _panel_size (panel_size)
+ , _border (border)
+ {}
+
+protected:
+ wxSize _panel_size;
+ int _border;
+};
+
+class GeneralPage : public wxStockPreferencesPage, public Page
+{
+public:
+ GeneralPage (wxSize panel_size, int border)
+ : wxStockPreferencesPage (Kind_General)
+ , Page (panel_size, border)
+ {}
- add_label_to_sizer (table, this, _("Reference scaler for A/B"));
- _reference_scaler = new wxChoice (this, wxID_ANY);
- vector<Scaler const *> const sc = Scaler::all ();
- for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
- _reference_scaler->Append (std_to_wx ((*i)->name ()));
- }
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
- table->Add (_reference_scaler, 1, wxEXPAND);
- table->AddSpacer (0);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ s->Add (table, 1, wxALL | wxEXPAND, _border);
+
+ _set_language = new wxCheckBox (panel, wxID_ANY, _("Set language"));
+ table->Add (_set_language, 1);
+ _language = new wxChoice (panel, wxID_ANY);
+ _language->Append (wxT ("Deutsch"));
+ _language->Append (wxT ("English"));
+ _language->Append (wxT ("Español"));
+ _language->Append (wxT ("Français"));
+ _language->Append (wxT ("Italiano"));
+ _language->Append (wxT ("Nederlands"));
+ _language->Append (wxT ("Svenska"));
+ table->Add (_language);
+
+ wxStaticText* restart = add_label_to_sizer (table, panel, _("(restart DCP-o-matic to see language changes)"), false);
+ wxFont font = restart->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ restart->SetFont (font);
+ table->AddSpacer (0);
+
+ add_label_to_sizer (table, panel, _("Threads to use for encoding on this host"), true);
+ _num_local_encoding_threads = new wxSpinCtrl (panel);
+ table->Add (_num_local_encoding_threads, 1);
- {
- add_label_to_sizer (table, this, _("Reference filters for A/B"));
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _reference_filters = new wxStaticText (this, wxID_ANY, wxT (""));
- s->Add (_reference_filters, 1, wxEXPAND);
- _reference_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
- s->Add (_reference_filters_button, 0);
- table->Add (s, 1, wxEXPAND);
+
+ _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup"));
+ table->Add (_check_for_updates, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
+
+ _check_for_test_updates = new wxCheckBox (panel, wxID_ANY, _("Check for testing updates as well as stable ones"));
+ table->Add (_check_for_test_updates, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ Config* config = Config::instance ();
+
+ _set_language->SetValue (config->language ());
+
+ if (config->language().get_value_or ("") == "fr") {
+ _language->SetSelection (3);
+ } else if (config->language().get_value_or ("") == "it") {
+ _language->SetSelection (4);
+ } else if (config->language().get_value_or ("") == "es") {
+ _language->SetSelection (2);
+ } else if (config->language().get_value_or ("") == "sv") {
+ _language->SetSelection (6);
+ } else if (config->language().get_value_or ("") == "de") {
+ _language->SetSelection (0);
+ } else if (config->language().get_value_or ("") == "nl") {
+ _language->SetSelection (5);
+ } else {
+ _language->SetSelection (1);
+ }
+
+ setup_language_sensitivity ();
+
+ _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this));
+ _language->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&GeneralPage::language_changed, this));
+
+ _num_local_encoding_threads->SetRange (1, 128);
+ _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
+ _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
+
+ _check_for_updates->SetValue (config->check_for_updates ());
+ _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this));
+ _check_for_test_updates->SetValue (config->check_for_test_updates ());
+ _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this));
+
+ return panel;
}
- add_label_to_sizer (table, this, _("Encoding Servers"));
- _servers = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (220, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
- wxListItem ip;
- ip.SetId (0);
- ip.SetText (_("IP address"));
- ip.SetWidth (120);
- _servers->InsertColumn (0, ip);
- ip.SetId (1);
- ip.SetText (_("Threads"));
- ip.SetWidth (80);
- _servers->InsertColumn (1, ip);
- table->Add (_servers, 1, wxEXPAND | wxALL);
+private:
+ void setup_language_sensitivity ()
+ {
+ _language->Enable (_set_language->GetValue ());
+ }
+ void set_language_changed ()
{
- wxSizer* s = new wxBoxSizer (wxVERTICAL);
- _add_server = new wxButton (this, wxID_ANY, _("Add"));
- s->Add (_add_server);
- _edit_server = new wxButton (this, wxID_ANY, _("Edit"));
- s->Add (_edit_server);
- _remove_server = new wxButton (this, wxID_ANY, _("Remove"));
- s->Add (_remove_server);
- table->Add (s, 0);
+ setup_language_sensitivity ();
+ if (_set_language->GetValue ()) {
+ language_changed ();
+ } else {
+ Config::instance()->unset_language ();
+ }
}
-
- Config* config = Config::instance ();
- _set_language->SetValue (config->language ());
+ void language_changed ()
+ {
+ switch (_language->GetSelection ()) {
+ case 0:
+ Config::instance()->set_language ("de");
+ break;
+ case 1:
+ Config::instance()->set_language ("en");
+ break;
+ case 2:
+ Config::instance()->set_language ("es");
+ break;
+ case 3:
+ Config::instance()->set_language ("fr");
+ break;
+ case 4:
+ Config::instance()->set_language ("it");
+ break;
+ case 5:
+ Config::instance()->set_language ("nl");
+ break;
+ case 6:
+ Config::instance()->set_language ("sv");
+ break;
+ }
+ }
+
+ void check_for_updates_changed ()
+ {
+ Config::instance()->set_check_for_updates (_check_for_updates->GetValue ());
+ }
+
+ void check_for_test_updates_changed ()
+ {
+ Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ());
+ }
- if (config->language().get_value_or ("") == "fr") {
- _language->SetSelection (1);
- } else if (config->language().get_value_or ("") == "it") {
- _language->SetSelection (2);
- } else if (config->language().get_value_or ("") == "es") {
- _language->SetSelection (3);
- } else if (config->language().get_value_or ("") == "sv") {
- _language->SetSelection (4);
- } else {
- _language->SetSelection (0);
+ void num_local_encoding_threads_changed ()
+ {
+ Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
}
- setup_language_sensitivity ();
+ wxCheckBox* _set_language;
+ wxChoice* _language;
+ wxSpinCtrl* _num_local_encoding_threads;
+ wxCheckBox* _check_for_updates;
+ wxCheckBox* _check_for_test_updates;
+};
- _set_language->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (ConfigDialog::set_language_changed), 0, this);
- _language->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::language_changed), 0, this);
- _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
- _tms_ip->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_ip_changed), 0, this);
- _tms_path->SetValue (std_to_wx (config->tms_path ()));
- _tms_path->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_path_changed), 0, this);
- _tms_user->SetValue (std_to_wx (config->tms_user ()));
- _tms_user->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_user_changed), 0, this);
- _tms_password->SetValue (std_to_wx (config->tms_password ()));
- _tms_password->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ConfigDialog::tms_password_changed), 0, this);
+class DefaultsPage : public wxPreferencesPage, public Page
+{
+public:
+ DefaultsPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("Defaults");
+ }
- _num_local_encoding_threads->SetRange (1, 128);
- _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
- _num_local_encoding_threads->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::num_local_encoding_threads_changed), 0, this);
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
- _default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
- _default_directory->Connect (wxID_ANY, wxEVT_COMMAND_DIRPICKER_CHANGED, wxCommandEventHandler (ConfigDialog::default_directory_changed), 0, this);
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
- _default_dci_metadata_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_default_dci_metadata_clicked), 0, this);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ s->Add (table, 1, wxALL | wxEXPAND, _border);
+
+ {
+ add_label_to_sizer (table, panel, _("Default duration of still images"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _still_length = new wxSpinCtrl (panel);
+ s->Add (_still_length);
+ add_label_to_sizer (s, panel, _("s"), false);
+ table->Add (s, 1);
+ }
+
+ add_label_to_sizer (table, panel, _("Default directory for new films"), true);
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+ _directory = new DirPickerCtrl (panel);
+#else
+ _directory = new wxDirPickerCtrl (panel, wxDD_DIR_MUST_EXIST);
+#endif
+ table->Add (_directory, 1, wxEXPAND);
+
+ add_label_to_sizer (table, panel, _("Default ISDCF name details"), true);
+ _isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit..."));
+ table->Add (_isdcf_metadata_button);
+
+ add_label_to_sizer (table, panel, _("Default container"), true);
+ _container = new wxChoice (panel, wxID_ANY);
+ table->Add (_container);
+
+ add_label_to_sizer (table, panel, _("Default content type"), true);
+ _dcp_content_type = new wxChoice (panel, wxID_ANY);
+ table->Add (_dcp_content_type);
+
+ {
+ add_label_to_sizer (table, panel, _("Default JPEG2000 bandwidth"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _j2k_bandwidth = new wxSpinCtrl (panel);
+ s->Add (_j2k_bandwidth);
+ add_label_to_sizer (s, panel, _("Mbit/s"), false);
+ table->Add (s, 1);
+ }
+
+ {
+ add_label_to_sizer (table, panel, _("Default audio delay"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _audio_delay = new wxSpinCtrl (panel);
+ s->Add (_audio_delay);
+ add_label_to_sizer (s, panel, _("ms"), false);
+ table->Add (s, 1);
+ }
+
+ add_label_to_sizer (table, panel, _("Default issuer"), 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);
+ _still_length->SetValue (config->default_still_length ());
+ _still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::still_length_changed, this));
+
+ _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
+ _directory->Bind (wxEVT_COMMAND_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this));
+
+ _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) {
+ _container->Append (std_to_wx ((*i)->nickname ()));
+ if (*i == config->default_container ()) {
+ _container->SetSelection (n);
+ }
+ ++n;
+ }
+
+ _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);
+ }
+ ++n;
+ }
+
+ _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
+
+ _j2k_bandwidth->SetRange (50, 250);
+ _j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000);
+ _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
+
+ _audio_delay->SetRange (-1000, 1000);
+ _audio_delay->SetValue (config->default_audio_delay ());
+ _audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this));
- _reference_scaler->SetSelection (Scaler::as_index (config->reference_scaler ()));
- _reference_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::reference_scaler_changed), 0, this);
+ _issuer->SetValue (std_to_wx (config->dcp_metadata().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));
- pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ());
- _reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second));
- _reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this);
+ return panel;
+ }
- vector<ServerDescription*> servers = config->servers ();
- for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
- add_server_to_control (*i);
+private:
+ void j2k_bandwidth_changed ()
+ {
+ Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
- _add_server->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::add_server_clicked), 0, this);
- _edit_server->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_server_clicked), 0, this);
- _remove_server->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::remove_server_clicked), 0, this);
+ void audio_delay_changed ()
+ {
+ Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
+ }
- _servers->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (ConfigDialog::server_selection_changed), 0, this);
- _servers->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (ConfigDialog::server_selection_changed), 0, this);
- wxListEvent ev;
- server_selection_changed (ev);
+ void directory_changed ()
+ {
+ Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
+ }
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+ void edit_isdcf_metadata_clicked (wxWindow* parent)
+ {
+ ISDCFMetadataDialog* d = new ISDCFMetadataDialog (parent, Config::instance()->default_isdcf_metadata ());
+ d->ShowModal ();
+ Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ());
+ d->Destroy ();
+ }
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
- if (buttons) {
- overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ void still_length_changed ()
+ {
+ Config::instance()->set_default_still_length (_still_length->GetValue ());
+ }
+
+ void container_changed ()
+ {
+ vector<Ratio const *> ratio = Ratio::all ();
+ Config::instance()->set_default_container (ratio[_container->GetSelection()]);
+ }
+
+ void dcp_content_type_changed ()
+ {
+ vector<DCPContentType const *> ct = DCPContentType::all ();
+ Config::instance()->set_default_dcp_content_type (ct[_dcp_content_type->GetSelection()]);
}
- SetSizer (overall_sizer);
- overall_sizer->Layout ();
- overall_sizer->SetSizeHints (this);
-}
+ void issuer_changed ()
+ {
+ libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+ m.issuer = wx_to_std (_issuer->GetValue ());
+ Config::instance()->set_dcp_metadata (m);
+ }
+
+ void creator_changed ()
+ {
+ libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+ m.creator = wx_to_std (_creator->GetValue ());
+ Config::instance()->set_dcp_metadata (m);
+ }
+
+ wxSpinCtrl* _j2k_bandwidth;
+ wxSpinCtrl* _audio_delay;
+ wxButton* _isdcf_metadata_button;
+ wxSpinCtrl* _still_length;
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+ DirPickerCtrl* _directory;
+#else
+ wxDirPickerCtrl* _directory;
+#endif
+ wxChoice* _container;
+ wxChoice* _dcp_content_type;
+ wxTextCtrl* _issuer;
+ wxTextCtrl* _creator;
+};
-void
-ConfigDialog::language_changed (wxCommandEvent &)
+class EncodingServersPage : public wxPreferencesPage, public Page
{
- switch (_language->GetSelection ()) {
- case 0:
- Config::instance()->set_language ("en");
- break;
- case 1:
- Config::instance()->set_language ("fr");
- break;
- case 2:
- Config::instance()->set_language ("it");
- break;
- case 3:
- Config::instance()->set_language ("es");
- break;
- case 4:
- Config::instance()->set_language ("sv");
- break;
+public:
+ EncodingServersPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("Servers");
}
-}
-void
-ConfigDialog::tms_ip_changed (wxCommandEvent &)
-{
- Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
-}
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
-void
-ConfigDialog::tms_path_changed (wxCommandEvent &)
-{
- Config::instance()->set_tms_path (wx_to_std (_tms_path->GetValue ()));
-}
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
+
+ _use_any_servers = new wxCheckBox (panel, wxID_ANY, _("Use all servers"));
+ s->Add (_use_any_servers, 0, wxALL, _border);
+
+ vector<string> columns;
+ columns.push_back (wx_to_std (_("IP address / host name")));
+ _servers_list = new EditableList<string, ServerDialog> (
+ panel,
+ columns,
+ boost::bind (&Config::servers, Config::instance()),
+ boost::bind (&Config::set_servers, Config::instance(), _1),
+ boost::bind (&EncodingServersPage::server_column, this, _1)
+ );
+
+ s->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));
-void
-ConfigDialog::tms_user_changed (wxCommandEvent &)
-{
- Config::instance()->set_tms_user (wx_to_std (_tms_user->GetValue ()));
-}
+ return panel;
+ }
-void
-ConfigDialog::tms_password_changed (wxCommandEvent &)
-{
- Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
-}
+private:
-void
-ConfigDialog::num_local_encoding_threads_changed (wxCommandEvent &)
-{
- Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
-}
+ void use_any_servers_changed ()
+ {
+ Config::instance()->set_use_any_servers (_use_any_servers->GetValue ());
+ }
-void
-ConfigDialog::default_directory_changed (wxCommandEvent &)
-{
- Config::instance()->set_default_directory (wx_to_std (_default_directory->GetPath ()));
-}
+ string server_column (string s)
+ {
+ return s;
+ }
-void
-ConfigDialog::add_server_to_control (ServerDescription* s)
-{
- wxListItem item;
- int const n = _servers->GetItemCount ();
- item.SetId (n);
- _servers->InsertItem (item);
- _servers->SetItem (n, 0, std_to_wx (s->host_name ()));
- _servers->SetItem (n, 1, std_to_wx (boost::lexical_cast<string> (s->threads ())));
-}
+ wxCheckBox* _use_any_servers;
+ EditableList<string, ServerDialog>* _servers_list;
+};
-void
-ConfigDialog::add_server_clicked (wxCommandEvent &)
+class ColourConversionsPage : public wxPreferencesPage, public Page
{
- ServerDialog* d = new ServerDialog (this, 0);
- d->ShowModal ();
- ServerDescription* s = d->server ();
- d->Destroy ();
+public:
+ ColourConversionsPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
- add_server_to_control (s);
- vector<ServerDescription*> o = Config::instance()->servers ();
- o.push_back (s);
- Config::instance()->set_servers (o);
-}
+ wxString GetName () const
+ {
+ return _("Colour Conversions");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("colour_conversions", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
+
+ vector<string> columns;
+ columns.push_back (wx_to_std (_("Name")));
+ wxPanel* list = new EditableList<PresetColourConversion, PresetColourConversionDialog> (
+ panel,
+ columns,
+ boost::bind (&Config::colour_conversions, Config::instance()),
+ boost::bind (&Config::set_colour_conversions, Config::instance(), _1),
+ boost::bind (&ColourConversionsPage::colour_conversion_column, this, _1),
+ 300
+ );
+
+ s->Add (list, 1, wxEXPAND | wxALL, _border);
+ return panel;
+ }
-void
-ConfigDialog::edit_server_clicked (wxCommandEvent &)
+private:
+ string colour_conversion_column (PresetColourConversion c)
+ {
+ return c.name;
+ }
+};
+
+class TMSPage : public wxPreferencesPage, public Page
{
- int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (i == -1) {
- return;
+public:
+ TMSPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("TMS");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE);
}
+#endif
- wxListItem item;
- item.SetId (i);
- item.SetColumn (0);
- _servers->GetItem (item);
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+ wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ panel->SetSizer (s);
- vector<ServerDescription*> servers = Config::instance()->servers ();
- assert (i >= 0 && i < int (servers.size ()));
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+ s->Add (table, 1, wxALL | wxEXPAND, _border);
+
+ add_label_to_sizer (table, panel, _("IP address"), true);
+ _tms_ip = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_tms_ip, 1, wxEXPAND);
+
+ add_label_to_sizer (table, panel, _("Target path"), true);
+ _tms_path = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_tms_path, 1, wxEXPAND);
+
+ add_label_to_sizer (table, panel, _("User name"), true);
+ _tms_user = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_tms_user, 1, wxEXPAND);
+
+ add_label_to_sizer (table, panel, _("Password"), true);
+ _tms_password = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_tms_password, 1, wxEXPAND);
+
+ Config* config = Config::instance ();
+
+ _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
+ _tms_ip->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_ip_changed, this));
+ _tms_path->SetValue (std_to_wx (config->tms_path ()));
+ _tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_path_changed, this));
+ _tms_user->SetValue (std_to_wx (config->tms_user ()));
+ _tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_user_changed, this));
+ _tms_password->SetValue (std_to_wx (config->tms_password ()));
+ _tms_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_password_changed, this));
+
+ return panel;
+ }
- ServerDialog* d = new ServerDialog (this, servers[i]);
- d->ShowModal ();
- d->Destroy ();
+private:
+ void tms_ip_changed ()
+ {
+ Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
+ }
+
+ void tms_path_changed ()
+ {
+ Config::instance()->set_tms_path (wx_to_std (_tms_path->GetValue ()));
+ }
+
+ void tms_user_changed ()
+ {
+ Config::instance()->set_tms_user (wx_to_std (_tms_user->GetValue ()));
+ }
+
+ void tms_password_changed ()
+ {
+ Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
+ }
- _servers->SetItem (i, 0, std_to_wx (servers[i]->host_name ()));
- _servers->SetItem (i, 1, std_to_wx (boost::lexical_cast<string> (servers[i]->threads ())));
-}
+ wxTextCtrl* _tms_ip;
+ wxTextCtrl* _tms_path;
+ wxTextCtrl* _tms_user;
+ wxTextCtrl* _tms_password;
+};
-void
-ConfigDialog::remove_server_clicked (wxCommandEvent &)
+class KDMEmailPage : public wxPreferencesPage, public Page
{
- int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (i >= 0) {
- _servers->DeleteItem (i);
+public:
+
+ KDMEmailPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("KDM Email");
}
- vector<ServerDescription*> o = Config::instance()->servers ();
- o.erase (o.begin() + i);
- Config::instance()->set_servers (o);
-}
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
-void
-ConfigDialog::server_selection_changed (wxListEvent &)
-{
- int const i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- _edit_server->Enable (i >= 0);
- _remove_server->Enable (i >= 0);
-}
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ /* 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
+ wxPanel* panel = new wxPanel (parent);
+#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, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border);
+
+ add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
+ _mail_server = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_mail_server, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, panel, _("Mail user name"), true);
+ _mail_user = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_mail_user, 1, wxEXPAND | wxALL);
+
+ add_label_to_sizer (table, panel, _("Mail password"), true);
+ _mail_password = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_mail_password, 1, wxEXPAND | wxALL);
+
+ wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false);
+ wxFont font = plain->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ plain->SetFont (font);
+ table->AddSpacer (0);
+
+ add_label_to_sizer (table, panel, _("From address"), true);
+ _kdm_from = new wxTextCtrl (panel, wxID_ANY);
+ table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+
+ _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
+ s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border);
+
+ Config* config = Config::instance ();
+ _mail_server->SetValue (std_to_wx (config->mail_server ()));
+ _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this));
+ _mail_user->SetValue (std_to_wx (config->mail_user ()));
+ _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this));
+ _mail_password->SetValue (std_to_wx (config->mail_password ()));
+ _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
+ _kdm_from->SetValue (std_to_wx (config->kdm_from ()));
+ _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+ _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
+ _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+
+ return panel;
+ }
-void
-ConfigDialog::reference_scaler_changed (wxCommandEvent &)
-{
- int const n = _reference_scaler->GetSelection ();
- if (n >= 0) {
- Config::instance()->set_reference_scaler (Scaler::from_index (n));
+private:
+ void mail_server_changed ()
+ {
+ Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
+ }
+
+ void mail_user_changed ()
+ {
+ Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
+ }
+
+ void mail_password_changed ()
+ {
+ Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+ }
+
+ void kdm_from_changed ()
+ {
+ Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
}
-}
-void
-ConfigDialog::edit_reference_filters_clicked (wxCommandEvent &)
-{
- FilterDialog* d = new FilterDialog (this, Config::instance()->reference_filters ());
- d->ActiveChanged.connect (boost::bind (&ConfigDialog::reference_filters_changed, this, _1));
- d->ShowModal ();
- d->Destroy ();
-}
+ void kdm_email_changed ()
+ {
+ Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+ }
-void
-ConfigDialog::reference_filters_changed (vector<Filter const *> f)
-{
- Config::instance()->set_reference_filters (f);
- pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ());
- _reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second));
-}
+ wxTextCtrl* _mail_server;
+ wxTextCtrl* _mail_user;
+ wxTextCtrl* _mail_password;
+ wxTextCtrl* _kdm_from;
+ wxTextCtrl* _kdm_email;
+};
-void
-ConfigDialog::edit_default_dci_metadata_clicked (wxCommandEvent &)
+class AdvancedPage : public wxStockPreferencesPage, public Page
{
- DCIMetadataDialog* d = new DCIMetadataDialog (this, Config::instance()->default_dci_metadata ());
- d->ShowModal ();
- Config::instance()->set_default_dci_metadata (d->dci_metadata ());
- d->Destroy ();
-}
+public:
-void
-ConfigDialog::set_language_changed (wxCommandEvent& ev)
-{
- setup_language_sensitivity ();
- if (_set_language->GetValue ()) {
- language_changed (ev);
- } else {
- Config::instance()->unset_language ();
+ AdvancedPage (wxSize panel_size, int border)
+ : wxStockPreferencesPage (Kind_Advanced)
+ , Page (panel_size, border)
+ {}
+
+ wxWindow* CreateWindow (wxWindow* parent)
+ {
+ wxPanel* panel = new wxPanel (parent);
+
+ 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, wxALL | wxEXPAND, _border);
+
+ {
+ add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _maximum_j2k_bandwidth = new wxSpinCtrl (panel);
+ s->Add (_maximum_j2k_bandwidth, 1);
+ add_label_to_sizer (s, panel, _("Mbit/s"), false);
+ table->Add (s, 1);
+ }
+
+ _allow_any_dcp_frame_rate = new wxCheckBox (panel, wxID_ANY, _("Allow any DCP frame rate"));
+ 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);
+
+ Config* config = Config::instance ();
+
+ _maximum_j2k_bandwidth->SetRange (1, 500);
+ _maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000);
+ _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
+ _allow_any_dcp_frame_rate->SetValue (config->allow_any_dcp_frame_rate ());
+ _allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+ _log_general->SetValue (config->log_types() & Log::TYPE_GENERAL);
+ _log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+ _log_warning->SetValue (config->log_types() & Log::TYPE_WARNING);
+ _log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+ _log_error->SetValue (config->log_types() & Log::TYPE_ERROR);
+ _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));
+
+ return panel;
}
-}
-void
-ConfigDialog::setup_language_sensitivity ()
+private:
+
+ void maximum_j2k_bandwidth_changed ()
+ {
+ Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
+ }
+
+ void allow_any_dcp_frame_rate_changed ()
+ {
+ Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
+ }
+
+ void log_changed ()
+ {
+ int types = 0;
+ if (_log_general->GetValue ()) {
+ types |= Log::TYPE_GENERAL;
+ }
+ if (_log_warning->GetValue ()) {
+ types |= Log::TYPE_WARNING;
+ }
+ if (_log_error->GetValue ()) {
+ types |= Log::TYPE_ERROR;
+ }
+ if (_log_timing->GetValue ()) {
+ types |= Log::TYPE_TIMING;
+ }
+ Config::instance()->set_log_types (types);
+ }
+
+ wxSpinCtrl* _maximum_j2k_bandwidth;
+ wxCheckBox* _allow_any_dcp_frame_rate;
+ wxCheckBox* _log_general;
+ wxCheckBox* _log_warning;
+ wxCheckBox* _log_error;
+ wxCheckBox* _log_timing;
+};
+
+wxPreferencesEditor*
+create_config_dialog ()
{
- _language->Enable (_set_language->GetValue ());
+ wxPreferencesEditor* e = new wxPreferencesEditor ();
+
+#ifdef DCPOMATIC_OSX
+ /* Width that we force some of the config panels to be on OSX so that
+ the containing window doesn't shrink too much when we select those panels.
+ This is obviously an unpleasant hack.
+ */
+ wxSize ps = wxSize (480, -1);
+ int const border = 16;
+#else
+ wxSize ps = wxSize (-1, -1);
+ int const border = 8;
+#endif
+
+ e->AddPage (new GeneralPage (ps, border));
+ e->AddPage (new DefaultsPage (ps, border));
+ e->AddPage (new EncodingServersPage (ps, border));
+ e->AddPage (new ColourConversionsPage (ps, border));
+ e->AddPage (new TMSPage (ps, border));
+ e->AddPage (new KDMEmailPage (ps, border));
+ e->AddPage (new AdvancedPage (ps, border));
+ return e;
}