#include "lib/filter.h"
#include "config_dialog.h"
#include "wx_util.h"
-//#include "filter_dialog.h"
+#include "filter_dialog.h"
+#include "server_dialog.h"
using namespace std;
using namespace boost;
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);
_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);
_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);
}
_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);
- _servers->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (ConfigDialog::server_selection_changed));
+ _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);
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_tms_password (wx_to_std (_tms_password->GetValue ()));
}
-
void
ConfigDialog::num_local_encoding_threads_changed (wxCommandEvent &)
{
}
void
-ConfigDialog::add_server_to_control (Server* s)
+ConfigDialog::add_server_to_control (ServerDescription* s)
{
wxListItem item;
int const n = _servers->GetItemCount ();
void
ConfigDialog::add_server_clicked (wxCommandEvent &)
{
- Server s ("localhost", 1);
- add_server_to_control (&s);
+ ServerDialog* d = new ServerDialog (this, 0);
+ d->ShowModal ();
+ ServerDescription* s = d->server ();
+ d->Destroy ();
+
+ add_server_to_control (s);
+ vector<ServerDescription*> o = Config::instance()->servers ();
+ o.push_back (s);
+ Config::instance()->set_servers (o);
+}
+
+void
+ConfigDialog::edit_server_clicked (wxCommandEvent &)
+{
+ int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (i == -1) {
+ return;
+ }
+
+ wxListItem item;
+ item.SetId (i);
+ item.SetColumn (0);
+ _servers->GetItem (item);
+
+ vector<ServerDescription*> servers = Config::instance()->servers ();
+ assert (i >= 0 && i < int (servers.size ()));
+
+ ServerDialog* d = new ServerDialog (this, servers[i]);
+ d->ShowModal ();
+ d->Destroy ();
+
+ _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::server_selection_changed (wxListEvent& ev)
{
-// _remove_server->Enable (ev.GetIndex() >= 0);
+ int const i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ _edit_server->Enable (i >= 0);
+ _remove_server->Enable (i >= 0);
}
void
void
ConfigDialog::edit_reference_filters_clicked (wxCommandEvent &)
{
-// FilterDialog d (Config::instance()->reference_filters ());
-// d.ActiveChanged.connect (sigc::mem_fun (*this, &ConfigDialog::reference_filters_changed));
-// d.run ();
+ FilterDialog* d = new FilterDialog (this, Config::instance()->reference_filters ());
+ d->ActiveChanged.connect (sigc::mem_fun (*this, &ConfigDialog::reference_filters_changed));
+ d->ShowModal ();
+ d->Destroy ();
}
void
projects / dcpomatic.git / blobdiff