From 40755a826d9f28be8ac69cfbab48a5ad1ad18961 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Sep 2018 13:07:06 +0100 Subject: [PATCH] Initial nag for interface complexity. --- src/lib/config.cc | 2 +- src/lib/config.h | 2 + src/tools/dcpomatic.cc | 9 ++++ src/wx/initial_setup_dialog.cc | 79 ++++++++++++++++++++++++++++++++++ src/wx/initial_setup_dialog.h | 33 ++++++++++++++ src/wx/wscript | 1 + 6 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 src/wx/initial_setup_dialog.cc create mode 100644 src/wx/initial_setup_dialog.h 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(); _gdc_username = optional(); _gdc_password = optional(); - _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 + + 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 . + +*/ + +#include "initial_setup_dialog.h" +#include "lib/config.h" +#include + +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 ( + _( + "Welcome to DCP-o-matic!\n\n" + "DCP-o-matic can work in two modes: 'simple' or 'full'.\n\n" + "Simple mode is ideal for producing straightforward DCPs without too many confusing " + "options.\n\n" + "Full mode 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 + + 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 . + +*/ + +#include + +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 -- 2.30.2