#include <iostream>
#include <boost/lexical_cast.hpp>
+#include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
#include "lib/config.h"
#include "lib/server.h"
-#include "lib/screen.h"
#include "lib/format.h"
#include "lib/scaler.h"
#include "lib/filter.h"
#include "wx_util.h"
#include "filter_dialog.h"
#include "server_dialog.h"
+#include "dir_picker_ctrl.h"
using namespace std;
-using namespace boost;
+using boost::bind;
ConfigDialog::ConfigDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("DVD-o-matic Configuration"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
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, "Colour look-up table");
_colour_lut = new wxComboBox (this, wxID_ANY);
- _colour_lut->Append (wxT ("sRGB"));
- _colour_lut->Append (wxT ("Rec 709"));
+ for (int i = 0; i < 2; ++i) {
+ _colour_lut->Append (std_to_wx (colour_lut_index_to_name (i)));
+ }
_colour_lut->SetSelection (0);
table->Add (_colour_lut, 1, wxEXPAND);
table->AddSpacer (0);
}
add_label_to_sizer (table, this, "Encoding Servers");
- _servers = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL);
+ _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 (100);
+ ip.SetWidth (120);
_servers->InsertColumn (0, ip);
ip.SetId (1);
ip.SetText (_("Threads"));
- ip.SetWidth (90);
+ ip.SetWidth (80);
_servers->InsertColumn (1, ip);
- table->Add (_servers, 1, wxEXPAND);
+ table->Add (_servers, 1, wxEXPAND | wxALL);
{
wxSizer* s = new wxBoxSizer (wxVERTICAL);
_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);
+ _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);
+
_colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (ConfigDialog::colour_lut_changed), 0, this);
_j2k_bandwidth->SetRange (50, 250);
- _j2k_bandwidth->SetValue (config->j2k_bandwidth() / 1e6);
+ _j2k_bandwidth->SetValue (rint ((double) config->j2k_bandwidth() / 1e6));
_j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::j2k_bandwidth_changed), 0, this);
_reference_scaler->SetSelection (Scaler::as_index (config->reference_scaler ()));
_reference_filters->SetLabel (std_to_wx (p.first + " " + p.second));
_reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this);
- vector<Server*> servers = config->servers ();
- for (vector<Server*>::iterator i = servers.begin(); i != servers.end(); ++i) {
+ vector<ServerDescription*> servers = config->servers ();
+ for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
add_server_to_control (*i);
}
server_selection_changed (ev);
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- overall_sizer->Add (table, 1, wxEXPAND);
+ overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
if (buttons) {
Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
}
+void
+ConfigDialog::default_directory_changed (wxCommandEvent &)
+{
+ Config::instance()->set_default_directory (wx_to_std (_default_directory->GetPath ()));
+}
+
void
ConfigDialog::colour_lut_changed (wxCommandEvent &)
{
}
void
-ConfigDialog::add_server_to_control (Server* s)
+ConfigDialog::add_server_to_control (ServerDescription* s)
{
wxListItem item;
int const n = _servers->GetItemCount ();
{
ServerDialog* d = new ServerDialog (this, 0);
d->ShowModal ();
- Server* s = d->server ();
+ ServerDescription* s = d->server ();
d->Destroy ();
add_server_to_control (s);
- vector<Server*> o = Config::instance()->servers ();
+ vector<ServerDescription*> o = Config::instance()->servers ();
o.push_back (s);
Config::instance()->set_servers (o);
}
item.SetColumn (0);
_servers->GetItem (item);
- vector<Server*> servers = Config::instance()->servers ();
- vector<Server*>::iterator j = servers.begin();
- while (j != servers.end() && (*j)->host_name() != wx_to_std (item.GetText ())) {
- ++j;
- }
+ vector<ServerDescription*> servers = Config::instance()->servers ();
+ assert (i >= 0 && i < int (servers.size ()));
- if (j == servers.end()) {
- return;
- }
-
- ServerDialog* d = new ServerDialog (this, *j);
+ ServerDialog* d = new ServerDialog (this, servers[i]);
d->ShowModal ();
d->Destroy ();
- _servers->SetItem (i, 0, std_to_wx ((*j)->host_name ()));
- _servers->SetItem (i, 1, std_to_wx (boost::lexical_cast<string> ((*j)->threads ())));
+ _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 ())));
}
void
if (i >= 0) {
_servers->DeleteItem (i);
}
+
+ vector<ServerDescription*> o = Config::instance()->servers ();
+ o.erase (o.begin() + i);
+ Config::instance()->set_servers (o);
}
void
ConfigDialog::edit_reference_filters_clicked (wxCommandEvent &)
{
FilterDialog* d = new FilterDialog (this, Config::instance()->reference_filters ());
- d->ActiveChanged.connect (sigc::mem_fun (*this, &ConfigDialog::reference_filters_changed));
+ d->ActiveChanged.connect (boost::bind (&ConfigDialog::reference_filters_changed, this, _1));
d->ShowModal ();
d->Destroy ();
}
projects / dcpomatic.git / blobdiff