projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
wx
/
nag_dialog.cc
diff --git
a/src/wx/nag_dialog.cc
b/src/wx/nag_dialog.cc
index 85f2d0110828afe240fbd6458566298d695a8c8d..edaf8f83f6a41f97d0da29b7ae6d422be5478d3b 100644
(file)
--- a/
src/wx/nag_dialog.cc
+++ b/
src/wx/nag_dialog.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2017-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2017-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,25
+18,31
@@
*/
*/
+
#include "nag_dialog.h"
#include "wx_util.h"
#include "static_text.h"
#include "check_box.h"
#include "nag_dialog.h"
#include "wx_util.h"
#include "static_text.h"
#include "check_box.h"
+
using std::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using std::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
+
+static constexpr int width = 400;
+
+
NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
: wxDialog (parent, wxID_ANY, _("Important notice"))
, _nag (nag)
{
NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
: wxDialog (parent, wxID_ANY, _("Important notice"))
, _nag (nag)
{
-
wxBoxSizer*
sizer = new wxBoxSizer (wxVERTICAL);
- _text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize
(400
, 300));
+
auto
sizer = new wxBoxSizer (wxVERTICAL);
+ _text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize
(width
, 300));
sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
wxCheckBox*
b = new CheckBox (this, _("Don't show this message again"));
+
auto
b = new CheckBox (this, _("Don't show this message again"));
sizer->Add (b, 0, wxALL, 6);
b->Bind (wxEVT_CHECKBOX, bind (&NagDialog::shut_up, this, _1));
sizer->Add (b, 0, wxALL, 6);
b->Bind (wxEVT_CHECKBOX, bind (&NagDialog::shut_up, this, _1));
@@
-44,24
+50,27
@@
NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool
if (can_cancel) {
flags |= wxCANCEL;
}
if (can_cancel) {
flags |= wxCANCEL;
}
-
wxSizer*
buttons = CreateSeparatedButtonSizer (flags);
+
auto
buttons = CreateSeparatedButtonSizer (flags);
if (buttons) {
sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
}
if (buttons) {
sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
}
+ _text->SetLabelMarkup (message);
+ _text->Wrap (width);
+
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
-
- _text->SetLabelMarkup (message);
}
}
+
void
NagDialog::shut_up (wxCommandEvent& ev)
{
Config::instance()->set_nagged (_nag, ev.IsChecked());
}
void
NagDialog::shut_up (wxCommandEvent& ev)
{
Config::instance()->set_nagged (_nag, ev.IsChecked());
}
+
/** @return true if the user clicked Cancel */
bool
NagDialog::maybe_nag (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)
/** @return true if the user clicked Cancel */
bool
NagDialog::maybe_nag (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel)