X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fserver_dialog.cc;h=37f68da295e6fc9715c169366698a87ad8aa2b86;hb=2ed96cf8baea81ab3b6331ae029bfa76ef2522e1;hp=ad0f7a567e7fcab00c1f46d6d56129a7f6587806;hpb=1e8f1be709e8a3fa58f1147db2e58a39396313d8;p=dcpomatic.git

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index ad0f7a567..37f68da29 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,61 +21,35 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
-ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
-	: wxDialog (parent, wxID_ANY, wxString (_("Server")))
-{
-	if (server) {
-		_server = server;
-	} else {
-		_server = new ServerDescription ("localhost", 1);
-	}
-		
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4);
-	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);
-
-	add_label_to_sizer (table, this, "Threads to use");
-	_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 ());
+using std::string;
+using boost::shared_ptr;
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND);
+ServerDialog::ServerDialog (wxWindow* parent)
+	: TableDialog (parent, _("Server"), 2, true)
+{
+        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);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
 
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
-}
+	add (_("Host name or IP address"), true);
+	_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
 
-void
-ServerDialog::host_changed (wxCommandEvent &)
-{
-	_server->set_host_name (wx_to_std (_host->GetValue ()));
+	layout ();
 }
 
 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 ());
 }