Remove unused variable.

[dcpomatic.git] / src / wx / config_dialog.cc

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 4b55c12545c0223b38c03cc5c2bd39b7624b4a6f..b0bd6f2ee5514c31b332ffc650846a03b704a721 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -70,8 +70,9 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 
        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);
@@ -103,17 +104,17 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
        }
 
        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);
@@ -144,7 +145,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
        _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 ()));
@@ -154,20 +155,22 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
        _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) {
@@ -222,7 +225,7 @@ ConfigDialog::j2k_bandwidth_changed (wxCommandEvent &)
 }
 
 void
-ConfigDialog::add_server_to_control (Server* s)
+ConfigDialog::add_server_to_control (ServerDescription* s)
 {
        wxListItem item;
        int const n = _servers->GetItemCount ();
@@ -237,10 +240,13 @@ ConfigDialog::add_server_clicked (wxCommandEvent &)
 {
        ServerDialog* d = new ServerDialog (this, 0);
        d->ShowModal ();
-       Server* s = d->server ();
+       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
@@ -256,7 +262,15 @@ ConfigDialog::edit_server_clicked (wxCommandEvent &)
        item.SetColumn (0);
        _servers->GetItem (item);
 
-       /* XXX: partial */
+       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
@@ -266,12 +280,18 @@ ConfigDialog::remove_server_clicked (wxCommandEvent &)
        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