From e378c11e193a55042a9798e0736cd2233ce8ba69 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Jan 2022 20:47:27 +0100 Subject: [PATCH] Add option to export config as a .zip (#1776). --- src/lib/config.cc | 19 +++++++++++++++++++ src/lib/config.h | 4 ++++ src/tools/dcpomatic.cc | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/src/lib/config.cc b/src/lib/config.cc index da7082a8e..f8639692f 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -34,6 +34,7 @@ #include "ratio.h" #include "types.h" #include "util.h" +#include "zipper.h" #include #include #include @@ -1477,3 +1478,21 @@ Config::add_custom_language (dcp::LanguageTag tag) } } + +void +save_all_config_as_zip (boost::filesystem::path zip_file) +{ + Zipper zipper (zip_file); + + auto config = Config::instance(); + zipper.add ("config.xml", dcp::file_to_string(config->config_read_file())); + if (boost::filesystem::exists(config->cinemas_file())) { + zipper.add ("cinemas.xml", dcp::file_to_string(config->cinemas_file())); + } + if (boost::filesystem::exists(config->dkdm_recipients_file())) { + zipper.add ("dkdm_recipients.xml", dcp::file_to_string(config->dkdm_recipients_file())); + } + + zipper.close (); +} + diff --git a/src/lib/config.h b/src/lib/config.h index bdf6c8395..956d8aa9b 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -44,6 +44,10 @@ class Film; class DKDMGroup; class DKDMRecipient; + +extern void save_all_config_as_zip (boost::filesystem::path zip_file); + + /** @class Config * @brief A singleton class holding configuration. */ diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1daa75de0..2482a9cb5 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -257,6 +257,7 @@ enum { ID_tools_check_for_updates, ID_tools_send_translations, ID_tools_restore_default_preferences, + ID_tools_export_preferences, ID_help_report_a_problem, /* IDs for shortcuts (with no associated menu item) */ ID_add_file, @@ -339,6 +340,7 @@ public: Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_send_translations, this), ID_tools_send_translations); Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_restore_default_preferences, this), ID_tools_restore_default_preferences); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_export_preferences, this), ID_tools_export_preferences); Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT); Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem); @@ -738,6 +740,21 @@ private: } } + void tools_export_preferences () + { + auto dialog = new wxFileDialog ( + this, _("Specify ZIP file"), wxEmptyString, wxT("dcpomatic_config.zip"), wxT("ZIP files (*.zip)|*.zip"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + int const r = dialog->ShowModal (); + dialog->Destroy (); + + if (r == wxID_OK) { + save_all_config_as_zip (wx_to_std(dialog->GetPath())); + } + } + void jobs_make_dcp () { double required; @@ -1366,6 +1383,8 @@ private: add_item (tools, _("Send translations..."), ID_tools_send_translations, 0); tools->AppendSeparator (); add_item (tools, _("Restore default preferences"), ID_tools_restore_default_preferences, ALWAYS); + tools->AppendSeparator (); + add_item (tools, _("Export preferences..."), ID_tools_export_preferences, ALWAYS); wxMenu* help = new wxMenu; #ifdef __WXOSX__ -- 2.30.2