summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-07 13:07:06 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-07 13:07:06 +0100
commit40755a826d9f28be8ac69cfbab48a5ad1ad18961 (patch)
tree2898a7fe201add5dde1146a2603eb1a292e096ef /src
parentcf7af490abb124631a775f5031f43ed58c0c1e4a (diff)
Initial nag for interface complexity.
Diffstat (limited to 'src')
-rw-r--r--src/lib/config.cc2
-rw-r--r--src/lib/config.h2
-rw-r--r--src/tools/dcpomatic.cc9
-rw-r--r--src/wx/initial_setup_dialog.cc79
-rw-r--r--src/wx/initial_setup_dialog.h33
-rw-r--r--src/wx/wscript1
6 files changed, 125 insertions, 1 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 22eb5b0e2..8c76671d4 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -162,7 +162,7 @@ Config::set_defaults ()
_christie_password = optional<string>();
_gdc_username = optional<string>();
_gdc_password = optional<string>();
- _interface_complexity = INTERFACE_FULL;
+ _interface_complexity = INTERFACE_SIMPLE;
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
diff --git a/src/lib/config.h b/src/lib/config.h
index 58db9c280..c5ce59fbf 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -360,6 +360,8 @@ public:
NAG_ENCRYPTED_METADATA,
NAG_REMAKE_DECRYPTION_CHAIN,
NAG_BAD_SIGNER_CHAIN,
+ /* Not really a nag but it's the same idea */
+ NAG_INITIAL_SETUP,
NAG_COUNT
};
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3d4e5121d..ded95eb44 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -45,6 +45,7 @@
#include "wx/export_dialog.h"
#include "wx/paste_dialog.h"
#include "wx/focus_manager.h"
+#include "wx/initial_setup_dialog.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
@@ -1394,6 +1395,14 @@ private:
if (splash) {
splash->Destroy ();
}
+
+ if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
+ InitialSetupDialog* d = new InitialSetupDialog ();
+ d->ShowModal ();
+ d->Destroy ();
+ Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
+ }
+
_frame->Show ();
if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) {
diff --git a/src/wx/initial_setup_dialog.cc b/src/wx/initial_setup_dialog.cc
new file mode 100644
index 000000000..af2917990
--- /dev/null
+++ b/src/wx/initial_setup_dialog.cc
@@ -0,0 +1,79 @@
+/*
+ Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+ 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.
+
+ 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "initial_setup_dialog.h"
+#include "lib/config.h"
+#include <boost/bind.hpp>
+
+InitialSetupDialog::InitialSetupDialog ()
+ : wxDialog (0, wxID_ANY, _("DCP-o-matic setup"))
+{
+ wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ wxStaticText* text1 = new wxStaticText (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(600, -1));
+ sizer->Add (text1, 1, wxEXPAND | wxALL, 12);
+
+ text1->SetLabelMarkup (
+ _(
+ "<span weight=\"bold\" size=\"larger\">Welcome to DCP-o-matic!</span>\n\n"
+ "DCP-o-matic can work in two modes: '<i>simple</i>' or '<i>full</i>'.\n\n"
+ "<i>Simple mode</i> is ideal for producing straightforward DCPs without too many confusing "
+ "options.\n\n"
+ "<i>Full mode</i> gives you the most control over the DCPs you make.\n\n"
+ "Please choose which mode you would like to start DCP-o-matic in:\n\n"
+ )
+ );
+
+ _simple = new wxRadioButton (this, wxID_ANY, _("Simple mode"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+ sizer->Add (_simple, 0, wxLEFT, 24);
+ _full = new wxRadioButton (this, wxID_ANY, _("Full mode"));
+ sizer->Add (_full, 0, wxLEFT, 24);
+
+ if (Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
+ _simple->SetValue (true);
+ } else {
+ _full->SetValue (true);
+ }
+
+ wxStaticText* text2 = new wxStaticText (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
+ sizer->Add (text2, 0, wxEXPAND | wxALL, 12);
+
+ text2->SetLabelMarkup (_("\nYou can change the mode at any time from the General page of Preferences."));
+
+ _simple->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));
+ _full->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));
+
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+ if (buttons) {
+ sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+
+ sizer->Layout ();
+ SetSizerAndFit (sizer);
+}
+
+void
+InitialSetupDialog::interface_complexity_changed ()
+{
+ if (_simple->GetValue()) {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
+ } else {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
+ }
+}
diff --git a/src/wx/initial_setup_dialog.h b/src/wx/initial_setup_dialog.h
new file mode 100644
index 000000000..3dfdbe2b0
--- /dev/null
+++ b/src/wx/initial_setup_dialog.h
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+ 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.
+
+ 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <wx/wx.h>
+
+class InitialSetupDialog : public wxDialog
+{
+public:
+ InitialSetupDialog ();
+
+private:
+ void interface_complexity_changed ();
+
+ wxRadioButton* _simple;
+ wxRadioButton* _full;
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index 91dc4ba87..f262d0cf9 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -71,6 +71,7 @@ sources = """
gain_calculator_dialog.cc
gdc_certificate_panel.cc
hints_dialog.cc
+ initial_setup_dialog.cc
job_view.cc
job_view_dialog.cc
job_manager_view.cc