X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fserver_dialog.cc;h=abad589891231e0de8e876039df6b03424e43855;hb=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef;hp=c1dbc4bca18e588eeb20e0ce137e9bb26a97a8f8;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index c1dbc4bca..abad58989 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -1,34 +1,34 @@ /* Copyright (C) 2012 Carl Hetherington - 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 . */ -#include "lib/server.h" +#include "lib/encode_server.h" #include "server_dialog.h" #include "wx_util.h" +using std::string; using boost::shared_ptr; +using boost::optional; ServerDialog::ServerDialog (wxWindow* parent) - : wxDialog (parent, wxID_ANY, _("Server")) + : TableDialog (parent, _("Server"), 2, 1, 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 +37,20 @@ 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); + add (_("Host name or IP address"), true); + _host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size)); - 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()); - } - - 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 +optional 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 ()); } -