X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=e01b9896259ab2121da9a9a4e768ec94eab058d9;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=ddedb71ecc351bdaae0697ce58eb3193fad201cd;hpb=fa1a42e87704a93266245b0e7cf0dce2b5c42f66;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index ddedb71ec..e01b98962 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 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 . */ @@ -50,7 +51,9 @@ public: } }; -ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optional recipient, vector trusted_devices) +ScreenDialog::ScreenDialog ( + wxWindow* parent, wxString title, string name, string notes, optional recipient, vector trusted_devices + ) : wxDialog (parent, wxID_ANY, title) , _recipient (recipient) , _trusted_devices (trusted_devices) @@ -66,6 +69,11 @@ ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optio _sizer->Add (_name, wxGBPosition (r, 1)); ++r; + add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition (r, 0)); + _notes = new wxTextCtrl (this, wxID_ANY, std_to_wx (notes), wxDefaultPosition, wxSize (320, -1)); + _sizer->Add (_notes, wxGBPosition (r, 1)); + ++r; + wxClientDC dc (this); wxFont font = _name->GetFont (); font.SetFamily (wxFONTFAMILY_TELETYPE); @@ -127,6 +135,12 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } +string +ScreenDialog::notes () const +{ + return wx_to_std (_notes->GetValue()); +} + optional ScreenDialog::recipient () const {