Merge 1.0

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

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 46e3f7127acb77eaebf82da981c8b788d883a3e5..04da9ad7d1496516f729bce120960dc4fe67d3ca 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,35 +21,29 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
-ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
+using std::string;
+using boost::shared_ptr;
+
+ServerDialog::ServerDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Server"))
 {
-       if (server) {
-               _server = server;
-       } else {
-               _server = new ServerDescription (N_("localhost"), 1);
-       }
-               
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        table->AddGrowableCol (1, 1);
 
-       add_label_to_sizer (table, this, _("Host name or IP address"));
-       _host = new wxTextCtrl (this, wxID_ANY);
-       table->Add (_host, 1, wxEXPAND);
+        wxClientDC dc (parent);
+       /* XXX: bit of a mystery why we need such a long string here */
+        wxSize size = dc.GetTextExtent (wxT ("255.255.255.255.255.255.255.255"));
+        size.SetHeight (-1);
 
-       add_label_to_sizer (table, this, _("Threads to use"));
-       _threads = new wxSpinCtrl (this, wxID_ANY);
-       table->Add (_threads, 1, wxEXPAND);
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
 
-       _host->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ServerDialog::host_changed), 0, this);
-       _threads->SetRange (0, 256);
-       _threads->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ServerDialog::threads_changed), 0, this);
-
-       _host->SetValue (std_to_wx (_server->host_name ()));
-       _threads->SetValue (_server->threads ());
+       add_label_to_sizer (table, this, _("Host name or IP address"), true);
+       _host = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
+       table->Add (_host, 1, wxEXPAND | wxALL);
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+       overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
@@ -62,20 +56,14 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
 }
 
 void
-ServerDialog::host_changed (wxCommandEvent &)
-{
-       _server->set_host_name (wx_to_std (_host->GetValue ()));
-}
-
-void
-ServerDialog::threads_changed (wxCommandEvent &)
+ServerDialog::set (string server)
 {
-       _server->set_threads (_threads->GetValue ());
+       _host->SetValue (std_to_wx (server));
 }
 
-ServerDescription *
-ServerDialog::server () const
+string
+ServerDialog::get () const
 {
-       return _server;
+       return wx_to_std (_host->GetValue ());
 }