X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fserver_dialog.cc;h=37f68da295e6fc9715c169366698a87ad8aa2b86;hb=0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6;hp=c1dbc4bca18e588eeb20e0ce137e9bb26a97a8f8;hpb=11619ba7fd5537407798c01c6ca299fb64422338;p=dcpomatic.git

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index c1dbc4bca..37f68da29 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,14 +21,12 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
+using std::string;
 using boost::shared_ptr;
 
 ServerDialog::ServerDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Server"))
+	: TableDialog (parent, _("Server"), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
         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"));
@@ -37,42 +35,21 @@ ServerDialog::ServerDialog (wxWindow* parent)
         wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
         wxArrayString list;
 
-	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);
-
-	_threads->SetRange (0, 256);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
+	add (_("Host name or IP address"), true);
+	_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
 
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 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 ());
 }