X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fserver_dialog.cc;h=abad589891231e0de8e876039df6b03424e43855;hb=edfb627f1226814ac804473b54d781ffd6db2700;hp=7b394a484addd3a75114cd7fdb61c25b54a75285;hpb=7333d9ee1ff505cbd635cbca23c83656a705a4a4;p=dcpomatic.git

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 7b394a484..abad58989 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -1,81 +1,56 @@
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #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;
+using boost::optional;
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
+ServerDialog::ServerDialog (wxWindow* parent)
+	: TableDialog (parent, _("Server"), 2, 1, 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
+optional<string>
+ServerDialog::get () const
 {
-	return _server;
+	return wx_to_std (_host->GetValue ());
 }
-