5 files changed, 37 insertions, 4 deletions
diff --git a/src/lib/config.h b/src/lib/config.h
index 62fcebbc3..cbb83ad86 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -104,7 +104,7 @@ public:
 	}
 
 	/** @param p New server port */
-	void set_sever_port (int p) {
+	void set_server_port (int p) {
 		_server_port = p;
 		Changed ();
 	}
diff --git a/src/lib/server.h b/src/lib/server.h
index f7a0abb80..d06df34e9 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -48,6 +48,14 @@ public:
 		return _threads;
 	}
 
+	void set_host_name (std::string n) {
+		_host_name = n;
+	}
+
+	void set_threads (int t) {
+		_threads = t;
+	}
+
 	std::string as_metadata () const;
 	
 	static Server * create_from_metadata (std::string v);
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 2ff016a20..4b55c1254 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -32,6 +32,7 @@
 #include "config_dialog.h"
 #include "wx_util.h"
 #include "filter_dialog.h"
+#include "server_dialog.h"
 
 using namespace std;
 using namespace boost;
@@ -118,6 +119,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 		wxSizer* s = new wxBoxSizer (wxVERTICAL);
 		_add_server = new wxButton (this, wxID_ANY, _("Add"));
 		s->Add (_add_server);
+		_edit_server = new wxButton (this, wxID_ANY, _("Edit"));
+		s->Add (_edit_server);
 		_remove_server = new wxButton (this, wxID_ANY, _("Remove"));
 		s->Add (_remove_server);
 		table->Add (s, 0);
@@ -200,7 +203,6 @@ ConfigDialog::tms_password_changed (wxCommandEvent &)
 	Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
 }
 
-
 void
 ConfigDialog::num_local_encoding_threads_changed (wxCommandEvent &)
 {
@@ -233,8 +235,28 @@ ConfigDialog::add_server_to_control (Server* s)
 void
 ConfigDialog::add_server_clicked (wxCommandEvent &)
 {
-	Server s ("localhost", 1);
-	add_server_to_control (&s);
+	ServerDialog* d = new ServerDialog (this, 0);
+	d->ShowModal ();
+	Server* s = d->server ();
+	d->Destroy ();
+	
+	add_server_to_control (s);
+}
+
+void
+ConfigDialog::edit_server_clicked (wxCommandEvent &)
+{
+	int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (i == -1) {
+		return;
+	}
+
+	wxListItem item;
+	item.SetId (i);
+	item.SetColumn (0);
+	_servers->GetItem (item);
+
+	/* XXX: partial */
 }
 
 void
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 000cf7d69..c9ca8034f 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -48,6 +48,7 @@ private:
 	void edit_reference_filters_clicked (wxCommandEvent &);
 	void reference_filters_changed (std::vector<Filter const *>);
 	void add_server_clicked (wxCommandEvent &);
+	void edit_server_clicked (wxCommandEvent &);
 	void remove_server_clicked (wxCommandEvent &);
 	void server_selection_changed (wxListEvent &);
 
@@ -65,6 +66,7 @@ private:
 	wxButton* _reference_filters_button;
 	wxListCtrl* _servers;
 	wxButton* _add_server;
+	wxButton* _edit_server;
 	wxButton* _remove_server;
 };
 
diff --git a/src/wx/wscript b/src/wx/wscript
index 78a787a86..48701407e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -18,6 +18,7 @@ def build(bld):
                  filter_dialog.cc
                  filter_view.cc
                  dcp_range_dialog.cc
+                 server_dialog.cc
                  """
 
 #                 alignment.cc