Various small fixes.

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

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 31b3ce5dc5ee85da3286dd11a7303a33fee790c3..04da9ad7d1496516f729bce120960dc4fe67d3ca 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,6 +21,7 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
+using std::string;
 using boost::shared_ptr;
 
 ServerDialog::ServerDialog (wxWindow* parent)
@@ -29,18 +30,20 @@ ServerDialog::ServerDialog (wxWindow* parent)
        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"), true);
-       _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"), true);
-       _threads = new wxSpinCtrl (this, wxID_ANY);
-       table->Add (_threads, 1, wxEXPAND);
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
 
-       _threads->SetRange (0, 256);
+       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) {
@@ -53,18 +56,14 @@ ServerDialog::ServerDialog (wxWindow* parent)
 }
 
 void
-ServerDialog::set (ServerDescription server)
+ServerDialog::set (string server)
 {
-       _host->SetValue (std_to_wx (server.host_name ()));
-       _threads->SetValue (server.threads ());
+       _host->SetValue (std_to_wx (server));
 }
 
-ServerDescription
+string
 ServerDialog::get () const
 {
-       ServerDescription server;
-       server.set_host_name (wx_to_std (_host->GetValue ()));
-       server.set_threads (_threads->GetValue ());
-       return server;
+       return wx_to_std (_host->GetValue ());
 }