Merge 1.0 in.

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

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 0ae34b1fcac3888ddc2d4da2feda6ce71d052139..c1dbc4bca18e588eeb20e0ce137e9bb26a97a8f8 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,35 +21,34 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
-ServerDialog::ServerDialog (wxWindow* parent, Server* server)
-       : wxDialog (parent, wxID_ANY, wxString (_("Server")))
+using boost::shared_ptr;
+
+ServerDialog::ServerDialog (wxWindow* parent)
+       : wxDialog (parent, wxID_ANY, _("Server"))
 {
-       if (server) {
-               _server = server;
-       } else {
-               _server = new Server ("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);
+
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
 
-       add_label_to_sizer (table, this, "Threads to use");
+       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);
+
+       add_label_to_sizer (table, this, _("Threads to use"), true);
        _threads = new wxSpinCtrl (this, wxID_ANY);
        table->Add (_threads, 1, wxEXPAND);
 
-       _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 ());
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 1, wxEXPAND);
+       overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
@@ -62,20 +61,18 @@ ServerDialog::ServerDialog (wxWindow* parent, Server* server)
 }
 
 void
-ServerDialog::host_changed (wxCommandEvent &)
-{
-       _server->set_host_name (wx_to_std (_host->GetValue ()));
-}
-
-void
-ServerDialog::threads_changed (wxCommandEvent &)
+ServerDialog::set (ServerDescription server)
 {
-       _server->set_threads (_threads->GetValue ());
+       _host->SetValue (std_to_wx (server.host_name ()));
+       _threads->SetValue (server.threads ());
 }
 
-Server *
-ServerDialog::server () const
+ServerDescription
+ServerDialog::get () const
 {
-       return _server;
+       ServerDescription server;
+       server.set_host_name (wx_to_std (_host->GetValue ()));
+       server.set_threads (_threads->GetValue ());
+       return server;
 }