projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing GUI-side verification note descriptions.
[dcpomatic.git]
/
src
/
wx
/
servers_list_dialog.cc
diff --git
a/src/wx/servers_list_dialog.cc
b/src/wx/servers_list_dialog.cc
index 0c46b1ecf6731688e4947963b27d0c1bbbf9eeb7..016275c88f18e20dd18b70f2e7025bcca4b37c19 100644
(file)
--- a/
src/wx/servers_list_dialog.cc
+++ b/
src/wx/servers_list_dialog.cc
@@
-1,40
+1,43
@@
/*
Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2015 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.
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
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 "servers_list_dialog.h"
#include "wx_util.h"
#include "servers_list_dialog.h"
#include "wx_util.h"
-#include "lib/server_finder.h"
-#include "lib/server_description.h"
+#include "lib/
encode_
server_finder.h"
+#include "lib/
encode_
server_description.h"
#include <boost/lexical_cast.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
+
using std::list;
using std::string;
using boost::lexical_cast;
using std::list;
using std::string;
using boost::lexical_cast;
+
ServersListDialog::ServersListDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Encoding Servers"))
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
SetSizer (s);
ServersListDialog::ServersListDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Encoding Servers"))
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
SetSizer (s);
- _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (
4
00, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+ _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (
5
00, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
{
wxListItem ip;
{
wxListItem ip;
@@
-48,7
+51,7
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Threads"));
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Threads"));
- ip.SetWidth (1
0
0);
+ ip.SetWidth (1
5
0);
_list->InsertColumn (1, ip);
}
_list->InsertColumn (1, ip);
}
@@
-63,7
+66,9
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
s->Layout ();
s->SetSizeHints (this);
s->Layout ();
s->SetSizeHints (this);
- _server_finder_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&ServersListDialog::servers_list_changed, this));
+ _server_finder_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
+ boost::bind (&ServersListDialog::servers_list_changed, this)
+ );
servers_list_changed ();
}
servers_list_changed ();
}
@@
-73,14
+78,18
@@
ServersListDialog::servers_list_changed ()
_list->DeleteAllItems ();
int n = 0;
_list->DeleteAllItems ();
int n = 0;
- BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) {
+
+ for (auto i: EncodeServerFinder::instance()->servers()) {
wxListItem list_item;
list_item.SetId (n);
_list->InsertItem (list_item);
_list->SetItem (n, 0, std_to_wx (i.host_name ()));
wxListItem list_item;
list_item.SetId (n);
_list->InsertItem (list_item);
_list->SetItem (n, 0, std_to_wx (i.host_name ()));
- _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (i.threads ())));
-
+ if (i.current_link_version()) {
+ _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (i.threads ())));
+ } else {
+ _list->SetItem (n, 1, _("Incorrect version"));
+ }
++n;
}
}
++n;
}
}