From 2a569aa08d8827a9a14dcd6db2c4ea1bbc8a32fd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Dec 2024 23:25:09 +0100 Subject: Split KDMOutputPanel into TallKDMOutputPanel and a base. The TallKDMOutputPanel is just responsible for layout out the controls. --- src/tools/dcpomatic_kdm.cc | 4 +- src/wx/kdm_dialog.cc | 4 +- src/wx/kdm_output_panel.cc | 45 ++--------------- src/wx/kdm_output_panel.h | 23 +++++---- src/wx/tall_kdm_output_panel.cc | 106 ++++++++++++++++++++++++++++++++++++++++ src/wx/tall_kdm_output_panel.h | 29 +++++++++++ src/wx/wscript | 1 + 7 files changed, 157 insertions(+), 55 deletions(-) create mode 100644 src/wx/tall_kdm_output_panel.cc create mode 100644 src/wx/tall_kdm_output_panel.h (limited to 'src') diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 64c7ca7e3..8ac4b997a 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -28,13 +28,13 @@ #include "wx/file_picker_ctrl.h" #include "wx/full_config_dialog.h" #include "wx/job_view_dialog.h" -#include "wx/kdm_output_panel.h" #include "wx/kdm_timing_panel.h" #include "wx/nag_dialog.h" #include "wx/new_dkdm_folder_dialog.h" #include "wx/report_problem_dialog.h" #include "wx/screens_panel.h" #include "wx/static_text.h" +#include "wx/tall_kdm_output_panel.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "wx/wx_variant.h" @@ -225,7 +225,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); - _output = new KDMOutputPanel (overall_panel); + _output = new TallKDMOutputPanel(overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new Button (overall_panel, _("Create KDMs")); diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 1a9c564d4..f96c89c98 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -24,10 +24,10 @@ #include "invalid_certificate_period_dialog.h" #include "kdm_cpl_panel.h" #include "kdm_dialog.h" -#include "kdm_output_panel.h" #include "kdm_timing_panel.h" #include "screens_panel.h" #include "static_text.h" +#include "tall_kdm_output_panel.h" #include "wx_util.h" #include "wx_variant.h" #include "lib/cinema.h" @@ -113,7 +113,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) h = new StaticText (this, _("Output")); h->SetFont (subheading_font); right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); - _output = new KDMOutputPanel (this); + _output = new TallKDMOutputPanel(this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); _make = new Button (this, _("Make KDMs")); diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 78186e4cb..3548d4dee 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -66,36 +66,13 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) , _forensic_mark_audio (true) , _forensic_mark_audio_up_to (12) { - auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); - table->AddGrowableCol (1); - - add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); - - auto type = new wxBoxSizer (wxHORIZONTAL); _type = new KDMChoice (this); - type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); _type->set(Config::instance()->default_kdm_type()); - auto advanced = new Button (this, _("Advanced...")); - type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); - table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); - - add_label_to_sizer(table, this, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + _advanced = new Button(this, _("Advanced...")); _annotation_text = new wxTextCtrl(this, wxID_ANY); - table->Add(_annotation_text, 1, wxEXPAND); - add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); - table->Add (_container_name_format->panel(), 1, wxEXPAND); - auto format = create_label (this, _("Filename format"), true); - auto align = new wxBoxSizer (wxHORIZONTAL); -#ifdef DCPOMATIC_OSX - align->Add (format, 0, wxTOP, 2); - table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); -#else - align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP); - table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); -#endif dcp::NameFormat::Map titles; titles['f'] = wx_to_std (_("film name")); titles['c'] = wx_to_std (_("cinema")); @@ -109,10 +86,8 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) ex['b'] = "2012/03/15 12:30"; ex['e'] = "2012/03/22 02:30"; _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); - table->Add (_filename_format->panel(), 1, wxEXPAND); _write_to = new CheckBox (this, _("Write to")); - table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER _folder = new DirPickerCtrl (this); @@ -127,22 +102,12 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); } - table->Add (_folder, 1, wxEXPAND); - - auto write_options = new wxBoxSizer(wxVERTICAL); _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs")); - write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); - write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - table->AddSpacer (0); - table->Add (write_options); _email = new CheckBox (this, _("Send by email")); - table->Add (_email, 1, wxEXPAND); - auto add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses...")); - table->Add (add_email_addresses); + _add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses...")); switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { case Config::KDM_WRITE_FLAT: @@ -161,13 +126,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) _write_to->bind(&KDMOutputPanel::write_to_changed, this); _email->bind(&KDMOutputPanel::email_changed, this); - add_email_addresses->Bind (wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this)); + _add_email_addresses->Bind(wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this)); _write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); _write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); - advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); - - SetSizer (table); + _advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); } diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 3b82321c6..087c9d250 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -70,13 +70,7 @@ public: boost::signals2::signal MethodChanged; -private: - void kdm_write_type_changed (); - void advanced_clicked (); - void write_to_changed (); - void email_changed (); - void add_email_addresses_clicked (); - +protected: KDMChoice* _type; wxTextCtrl* _annotation_text; NameFormatEditor* _container_name_format; @@ -90,9 +84,18 @@ private: wxRadioButton* _write_flat; wxRadioButton* _write_folder; wxRadioButton* _write_zip; + wxButton* _advanced; CheckBox* _email; - bool _forensic_mark_video; - bool _forensic_mark_audio; - boost::optional _forensic_mark_audio_up_to; + wxButton* _add_email_addresses; + bool _forensic_mark_video = true; + bool _forensic_mark_audio = true; + boost::optional _forensic_mark_audio_up_to = 12; std::vector _extra_addresses; + +private: + void kdm_write_type_changed (); + void advanced_clicked (); + void write_to_changed (); + void email_changed (); + void add_email_addresses_clicked (); }; diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc new file mode 100644 index 000000000..1fb5cd958 --- /dev/null +++ b/src/wx/tall_kdm_output_panel.cc @@ -0,0 +1,106 @@ +/* + Copyright (C) 2015-2022 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 "check_box.h" +#include "confirm_kdm_email_dialog.h" +#include "dcpomatic_button.h" +#include "extra_kdm_email_dialog.h" +#include "kdm_advanced_dialog.h" +#include "kdm_choice.h" +#include "tall_kdm_output_panel.h" +#include "kdm_timing_panel.h" +#include "name_format_editor.h" +#include "wx_util.h" +#include "lib/cinema.h" +#include "lib/config.h" +#include "lib/send_kdm_email_job.h" +#include +#include +#include +#ifdef DCPOMATIC_USE_OWN_PICKER +#include "dir_picker_ctrl.h" +#else +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS +#endif +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS + + +using std::exception; +using std::function; +using std::list; +using std::make_pair; +using std::make_shared; +using std::pair; +using std::shared_ptr; +using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + +TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent) + : KDMOutputPanel(parent) +{ + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol (1); + + add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + + auto type = new wxBoxSizer (wxHORIZONTAL); + type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + type->Add (_advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + + add_label_to_sizer(table, this, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + table->Add(_annotation_text, 1, wxEXPAND); + + add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); + table->Add (_container_name_format->panel(), 1, wxEXPAND); + + auto format = create_label (this, _("Filename format"), true); + auto align = new wxBoxSizer (wxHORIZONTAL); +#ifdef DCPOMATIC_OSX + align->Add (format, 0, wxTOP, 2); + table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP); + table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif + table->Add (_filename_format->panel(), 1, wxEXPAND); + table->Add (_write_to, 1, wxEXPAND); + table->Add (_folder, 1, wxEXPAND); + + auto write_options = new wxBoxSizer(wxVERTICAL); + write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + table->AddSpacer (0); + table->Add (write_options); + + table->Add (_email, 1, wxEXPAND); + table->Add (_add_email_addresses); + + SetSizer (table); +} diff --git a/src/wx/tall_kdm_output_panel.h b/src/wx/tall_kdm_output_panel.h new file mode 100644 index 000000000..9fdad586f --- /dev/null +++ b/src/wx/tall_kdm_output_panel.h @@ -0,0 +1,29 @@ +/* + Copyright (C) 2015-2022 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 "kdm_output_panel.h" + + +class TallKDMOutputPanel : public KDMOutputPanel +{ +public: + TallKDMOutputPanel(wxWindow* parent); +}; diff --git a/src/wx/wscript b/src/wx/wscript index 5a19c0df3..9fc5a24ef 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -162,6 +162,7 @@ sources = """ system_font_dialog.cc system_information_dialog.cc table_dialog.cc + tall_kdm_output_panel.cc templates_dialog.cc text_panel.cc text_view.cc -- cgit v1.2.3 From 2d5a2f8b4ce4b33f9e2541caa2c5681537b692a1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 00:52:59 +0100 Subject: Add guard for kdm_output_panel.h --- src/wx/kdm_output_panel.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 087c9d250..447588fe7 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -19,6 +19,10 @@ */ +#ifndef DCPOMATIC_KDM_OUTPUT_PANEL_H +#define DCPOMATIC_KDM_OUTPUT_PANEL_H + + #include "wx_util.h" #include "lib/kdm_with_metadata.h" #include @@ -99,3 +103,6 @@ private: void email_changed (); void add_email_addresses_clicked (); }; + + +#endif -- cgit v1.2.3 From 9fcea2bd3871062e920e2b1cb76ea9235dfd157e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 00:53:27 +0100 Subject: Allow KDM output panel widgets to be created with specific parents. --- src/wx/kdm_output_panel.cc | 82 ++++++++++++++++++++++++----------------- src/wx/kdm_output_panel.h | 3 ++ src/wx/tall_kdm_output_panel.cc | 3 ++ 3 files changed, 54 insertions(+), 34 deletions(-) (limited to 'src') diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 3548d4dee..3788c3fce 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -66,63 +66,50 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) , _forensic_mark_audio (true) , _forensic_mark_audio_up_to (12) { - _type = new KDMChoice (this); - _type->set(Config::instance()->default_kdm_type()); - _advanced = new Button(this, _("Advanced...")); - _annotation_text = new wxTextCtrl(this, wxID_ANY); - _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); - dcp::NameFormat::Map titles; - titles['f'] = wx_to_std (_("film name")); - titles['c'] = wx_to_std (_("cinema")); - titles['s'] = wx_to_std (_("screen")); - titles['b'] = wx_to_std (_("from date/time")); - titles['e'] = wx_to_std (_("to date/time")); - dcp::NameFormat::Map ex; - ex['f'] = "Bambi"; - ex['c'] = "Lumière"; - ex['s'] = "Screen 1"; - ex['b'] = "2012/03/15 12:30"; - ex['e'] = "2012/03/22 02:30"; - _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); +} - _write_to = new CheckBox (this, _("Write to")); + +void +KDMOutputPanel::create_destination_widgets(wxWindow* parent) +{ + _write_to = new CheckBox(parent, _("Write to")); #ifdef DCPOMATIC_USE_OWN_PICKER - _folder = new DirPickerCtrl (this); + _folder = new DirPickerCtrl(parent); #else - _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, char_to_wx(wxDirSelectorPromptStr), wxDefaultPosition, wxSize (300, -1)); + _folder = new wxDirPickerCtrl(parent, wxID_ANY, wxEmptyString, char_to_wx(wxDirSelectorPromptStr), wxDefaultPosition, wxSize(300, -1)); #endif auto path = Config::instance()->default_kdm_directory(); if (path) { - _folder->SetPath (std_to_wx (path->string ())); + _folder->SetPath(std_to_wx(path->string())); } else { - _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + _folder->SetPath(wxStandardPaths::Get().GetDocumentsDir()); } - _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs")); - _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); + _write_flat = new wxRadioButton(parent, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + _write_folder = new wxRadioButton(parent, wxID_ANY, _("Write a folder for each cinema's KDMs")); + _write_zip = new wxRadioButton(parent, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); - _email = new CheckBox (this, _("Send by email")); - _add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses...")); + _email = new CheckBox(parent, _("Send by email")); + _add_email_addresses = new wxButton(parent, wxID_ANY, _("Set additional email addresses...")); switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { case Config::KDM_WRITE_FLAT: - _write_flat->SetValue (true); + _write_flat->SetValue(true); break; case Config::KDM_WRITE_FOLDER: - _write_folder->SetValue (true); + _write_folder->SetValue(true); break; case Config::KDM_WRITE_ZIP: - _write_zip->SetValue (true); + _write_zip->SetValue(true); break; } - _write_to->SetValue (Config::instance()->write_kdms_to_disk()); - _email->SetValue (Config::instance()->email_kdms()); + _write_to->SetValue(Config::instance()->write_kdms_to_disk()); + _email->SetValue(Config::instance()->email_kdms()); _write_to->bind(&KDMOutputPanel::write_to_changed, this); _email->bind(&KDMOutputPanel::email_changed, this); @@ -130,7 +117,34 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent) _write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); _write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); - _advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); +} + + +void +KDMOutputPanel::create_details_widgets(wxWindow* parent) +{ + _type = new KDMChoice(parent); + _type->set(Config::instance()->default_kdm_type()); + _advanced = new Button(parent, _("Advanced...")); + _annotation_text = new wxTextCtrl(parent, wxID_ANY); + + _container_name_format = new NameFormatEditor(parent, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); + + dcp::NameFormat::Map titles; + titles['f'] = wx_to_std (_("film name")); + titles['c'] = wx_to_std (_("cinema")); + titles['s'] = wx_to_std (_("screen")); + titles['b'] = wx_to_std (_("from date/time")); + titles['e'] = wx_to_std (_("to date/time")); + dcp::NameFormat::Map ex; + ex['f'] = "Bambi"; + ex['c'] = "Lumière"; + ex['s'] = "Screen 1"; + ex['b'] = "2012/03/15 12:30"; + ex['e'] = "2012/03/22 02:30"; + _filename_format = new NameFormatEditor(parent, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); + + _advanced->Bind(wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); } diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 447588fe7..dd4dbb1fc 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -75,6 +75,9 @@ public: boost::signals2::signal MethodChanged; protected: + void create_destination_widgets(wxWindow* parent); + void create_details_widgets(wxWindow* parent); + KDMChoice* _type; wxTextCtrl* _annotation_text; NameFormatEditor* _container_name_format; diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc index 1fb5cd958..d0bb3d7dd 100644 --- a/src/wx/tall_kdm_output_panel.cc +++ b/src/wx/tall_kdm_output_panel.cc @@ -63,6 +63,9 @@ using namespace boost::placeholders; TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent) : KDMOutputPanel(parent) { + create_destination_widgets(this); + create_details_widgets(this); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); table->AddGrowableCol (1); -- cgit v1.2.3 From 75328ad3c7adf61f9103ced9efcc441159f4ac84 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 00:53:59 +0100 Subject: Trim some padding from the KDM creator. --- src/tools/dcpomatic_kdm.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 8ac4b997a..1d22e0818 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -168,11 +168,11 @@ public: h->SetFont (subheading_font); right->Add (h); _timing = new KDMTimingPanel (overall_panel); - right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_timing, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); - right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); + right->Add(h, 0); _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ @@ -229,7 +229,7 @@ public: right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new Button (overall_panel, _("Create KDMs")); - right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); + right->Add(_create, 0, wxTOP, DCPOMATIC_SIZER_GAP); main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); overall_panel->SetSizer (main_sizer); -- cgit v1.2.3 From 52e7269c9d8dd9e7fcf68ba126eb4ce0a593cf76 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 00:56:25 +0100 Subject: Add shorter output panel for KDMs on smaller screens (#2646). --- src/tools/dcpomatic_kdm.cc | 20 ++++++- src/wx/short_kdm_output_panel.cc | 118 +++++++++++++++++++++++++++++++++++++++ src/wx/short_kdm_output_panel.h | 38 +++++++++++++ src/wx/wscript | 1 + 4 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 src/wx/short_kdm_output_panel.cc create mode 100644 src/wx/short_kdm_output_panel.h (limited to 'src') diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 1d22e0818..95165fcde 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -33,6 +33,7 @@ #include "wx/new_dkdm_folder_dialog.h" #include "wx/report_problem_dialog.h" #include "wx/screens_panel.h" +#include "wx/short_kdm_output_panel.h" #include "wx/static_text.h" #include "wx/tall_kdm_output_panel.h" #include "wx/wx_signal_manager.h" @@ -61,6 +62,7 @@ #include #include LIBDCP_DISABLE_WARNINGS +#include #include #include #include @@ -225,8 +227,20 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); - _output = new TallKDMOutputPanel(overall_panel); - right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + + int const sn = wxDisplay::GetFromWindow(this); + if (sn >= 0) { + auto const screen = wxDisplay(sn).GetClientArea(); + if (screen.height <= 800) { + _output = new ShortKDMOutputPanel(overall_panel); + } + } + + if (!_output) { + _output = new TallKDMOutputPanel(overall_panel); + } + + right->Add (_output, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); _create = new Button (overall_panel, _("Create KDMs")); right->Add(_create, 0, wxTOP, DCPOMATIC_SIZER_GAP); @@ -831,7 +845,7 @@ private: wxButton* _remove_dkdm; wxButton* _export_dkdm; wxButton* _create; - KDMOutputPanel* _output; + KDMOutputPanel* _output = nullptr; JobViewDialog* _job_view; Collator _collator; }; diff --git a/src/wx/short_kdm_output_panel.cc b/src/wx/short_kdm_output_panel.cc new file mode 100644 index 000000000..8ecd112f7 --- /dev/null +++ b/src/wx/short_kdm_output_panel.cc @@ -0,0 +1,118 @@ +/* + Copyright (C) 2015-2022 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 "check_box.h" +#include "kdm_choice.h" +#include "name_format_editor.h" +#include "short_kdm_output_panel.h" +#ifdef DCPOMATIC_USE_OWN_PICKER +#include "dir_picker_ctrl.h" +#else +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS +#endif +#include +#include + + +ShortKDMOutputPanel::ShortKDMOutputPanel(wxWindow* parent) + : KDMOutputPanel(parent) +{ + auto notebook = new wxNotebook(this, wxID_ANY); + + auto destination = new wxPanel(notebook, wxID_ANY); + create_destination_widgets(destination); + fill_destination_panel(destination); + /// TRANSLATORS: Destination here refers to where some KDMs will be written or sent + /// (a place on disk or some email addresses). + notebook->AddPage(destination, _("Destination"), true); + + auto details = new wxPanel(notebook, wxID_ANY); + create_details_widgets(details); + fill_details_panel(details); + notebook->AddPage(details, _("Details")); + + auto sizer = new wxBoxSizer(wxVERTICAL); + sizer->Add(notebook, 1, wxEXPAND); + SetSizer(sizer); +} + + +void +ShortKDMOutputPanel::fill_destination_panel(wxPanel* panel) +{ + auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol(1); + + table->Add(_write_to, 1, wxEXPAND); + table->Add(_folder, 1, wxEXPAND); + + auto write_options = new wxBoxSizer(wxVERTICAL); + write_options->Add(_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + write_options->Add(_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + write_options->Add(_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + table->AddSpacer(0); + table->Add(write_options); + + table->Add(_email, 1, wxEXPAND); + table->Add(_add_email_addresses); + + auto padding = new wxBoxSizer(wxVERTICAL); + padding->Add(table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + panel->SetSizer(padding); +} + + +void +ShortKDMOutputPanel::fill_details_panel(wxPanel* panel) +{ + auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol(1); + + add_label_to_sizer(table, panel, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + + auto type = new wxBoxSizer(wxHORIZONTAL); + type->Add(_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + type->Add(_advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + table->Add(type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + + add_label_to_sizer(table, panel, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + table->Add(_annotation_text, 1, wxEXPAND); + + add_label_to_sizer(table, panel, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); + table->Add(_container_name_format->panel(), 1, wxEXPAND); + + auto format = create_label(panel, _("Filename format"), true); + auto align = new wxBoxSizer(wxHORIZONTAL); +#ifdef DCPOMATIC_OSX + align->Add(format, 0, wxTOP, 2); + table->Add(align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + align->Add(format, 0, wxLEFT, DCPOMATIC_SIZER_GAP); + table->Add(align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif + table->Add(_filename_format->panel(), 1, wxEXPAND); + + auto padding = new wxBoxSizer(wxVERTICAL); + padding->Add(table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + panel->SetSizer(padding); +} diff --git a/src/wx/short_kdm_output_panel.h b/src/wx/short_kdm_output_panel.h new file mode 100644 index 000000000..eed2950e0 --- /dev/null +++ b/src/wx/short_kdm_output_panel.h @@ -0,0 +1,38 @@ +/* + Copyright (C) 2024 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 "kdm_output_panel.h" + + +class wxPanel; +class wxWindow; + + +class ShortKDMOutputPanel : public KDMOutputPanel +{ +public: + ShortKDMOutputPanel(wxWindow* parent); + +private: + void fill_destination_panel(wxPanel* panel); + void fill_details_panel(wxPanel* panel); +}; + diff --git a/src/wx/wscript b/src/wx/wscript index 9fc5a24ef..583fe4bb0 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -152,6 +152,7 @@ sources = """ send_test_email_dialog.cc server_dialog.cc servers_list_dialog.cc + short_kdm_output_panel.cc simple_video_view.cc smpte_metadata_dialog.cc standard_controls.cc -- cgit v1.2.3 From aa8bb7b6f6fe2eed323e6f4f978a76a9a067c545 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 01:58:15 +0100 Subject: Separate KDM output options yet further. Trying here to get them to fit vertically in 768 pixels. --- src/wx/kdm_output_panel.cc | 9 +++++++-- src/wx/kdm_output_panel.h | 1 + src/wx/short_kdm_output_panel.cc | 18 ++++++++++++++++++ src/wx/short_kdm_output_panel.h | 1 + src/wx/tall_kdm_output_panel.cc | 1 + 5 files changed, 28 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 3788c3fce..30660c6af 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -128,6 +128,13 @@ KDMOutputPanel::create_details_widgets(wxWindow* parent) _advanced = new Button(parent, _("Advanced...")); _annotation_text = new wxTextCtrl(parent, wxID_ANY); + _advanced->Bind(wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); +} + + +void +KDMOutputPanel::create_name_format_widgets(wxWindow* parent) +{ _container_name_format = new NameFormatEditor(parent, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); dcp::NameFormat::Map titles; @@ -143,8 +150,6 @@ KDMOutputPanel::create_details_widgets(wxWindow* parent) ex['b'] = "2012/03/15 12:30"; ex['e'] = "2012/03/22 02:30"; _filename_format = new NameFormatEditor(parent, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); - - _advanced->Bind(wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); } diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index dd4dbb1fc..84cfdecd7 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -77,6 +77,7 @@ public: protected: void create_destination_widgets(wxWindow* parent); void create_details_widgets(wxWindow* parent); + void create_name_format_widgets(wxWindow* parent); KDMChoice* _type; wxTextCtrl* _annotation_text; diff --git a/src/wx/short_kdm_output_panel.cc b/src/wx/short_kdm_output_panel.cc index 8ecd112f7..5a0fb2504 100644 --- a/src/wx/short_kdm_output_panel.cc +++ b/src/wx/short_kdm_output_panel.cc @@ -51,6 +51,11 @@ ShortKDMOutputPanel::ShortKDMOutputPanel(wxWindow* parent) fill_details_panel(details); notebook->AddPage(details, _("Details")); + auto name_formats = new wxPanel(notebook, wxID_ANY); + create_name_format_widgets(name_formats); + fill_name_formats_panel(name_formats); + notebook->AddPage(name_formats, _("Name formats")); + auto sizer = new wxBoxSizer(wxVERTICAL); sizer->Add(notebook, 1, wxEXPAND); SetSizer(sizer); @@ -98,6 +103,18 @@ ShortKDMOutputPanel::fill_details_panel(wxPanel* panel) add_label_to_sizer(table, panel, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); table->Add(_annotation_text, 1, wxEXPAND); + auto padding = new wxBoxSizer(wxVERTICAL); + padding->Add(table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + panel->SetSizer(padding); +} + + +void +ShortKDMOutputPanel::fill_name_formats_panel(wxPanel* panel) +{ + auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol(1); + add_label_to_sizer(table, panel, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); table->Add(_container_name_format->panel(), 1, wxEXPAND); @@ -116,3 +133,4 @@ ShortKDMOutputPanel::fill_details_panel(wxPanel* panel) padding->Add(table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); panel->SetSizer(padding); } + diff --git a/src/wx/short_kdm_output_panel.h b/src/wx/short_kdm_output_panel.h index eed2950e0..3f328d0c3 100644 --- a/src/wx/short_kdm_output_panel.h +++ b/src/wx/short_kdm_output_panel.h @@ -34,5 +34,6 @@ public: private: void fill_destination_panel(wxPanel* panel); void fill_details_panel(wxPanel* panel); + void fill_name_formats_panel(wxPanel* panel); }; diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc index d0bb3d7dd..d34c5460d 100644 --- a/src/wx/tall_kdm_output_panel.cc +++ b/src/wx/tall_kdm_output_panel.cc @@ -65,6 +65,7 @@ TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent) { create_destination_widgets(this); create_details_widgets(this); + create_name_format_widgets(this); auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); table->AddGrowableCol (1); -- cgit v1.2.3 From 4532fecad4bad945482fbcf2d61eef708178835c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Dec 2024 15:54:14 +0100 Subject: Coalesce three radios into a dropdown. --- src/wx/kdm_output_panel.cc | 48 ++++++++++++++++++++++------------------ src/wx/kdm_output_panel.h | 5 ++--- src/wx/short_kdm_output_panel.cc | 11 ++++----- src/wx/tall_kdm_output_panel.cc | 11 ++++----- 4 files changed, 37 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 30660c6af..f86808a70 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -22,6 +22,7 @@ #include "check_box.h" #include "confirm_kdm_email_dialog.h" #include "dcpomatic_button.h" +#include "dcpomatic_choice.h" #include "extra_kdm_email_dialog.h" #include "kdm_advanced_dialog.h" #include "kdm_choice.h" @@ -89,22 +90,23 @@ KDMOutputPanel::create_destination_widgets(wxWindow* parent) _folder->SetPath(wxStandardPaths::Get().GetDocumentsDir()); } - _write_flat = new wxRadioButton(parent, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - _write_folder = new wxRadioButton(parent, wxID_ANY, _("Write a folder for each cinema's KDMs")); - _write_zip = new wxRadioButton(parent, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); + _write_collect = new Choice(parent); + _write_collect->add_entry(_("Write all KDMs to the same folder")); + _write_collect->add_entry(_("Write a folder for each cinema's KDMs")); + _write_collect->add_entry(_("Write a ZIP file for each cinema's KDMs")); _email = new CheckBox(parent, _("Send by email")); _add_email_addresses = new wxButton(parent, wxID_ANY, _("Set additional email addresses...")); switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { case Config::KDM_WRITE_FLAT: - _write_flat->SetValue(true); + _write_collect->set(0); break; case Config::KDM_WRITE_FOLDER: - _write_folder->SetValue(true); + _write_collect->set(1); break; case Config::KDM_WRITE_ZIP: - _write_zip->SetValue(true); + _write_collect->set(2); break; } @@ -114,9 +116,7 @@ KDMOutputPanel::create_destination_widgets(wxWindow* parent) _write_to->bind(&KDMOutputPanel::write_to_changed, this); _email->bind(&KDMOutputPanel::email_changed, this); _add_email_addresses->Bind(wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this)); - _write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); - _write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); - _write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this)); + _write_collect->bind(&KDMOutputPanel::kdm_write_type_changed, this); } @@ -176,9 +176,7 @@ KDMOutputPanel::setup_sensitivity () { bool const write = _write_to->GetValue (); _folder->Enable (write); - _write_flat->Enable (write); - _write_folder->Enable (write); - _write_zip->Enable (write); + _write_collect->Enable(write); } @@ -196,12 +194,16 @@ KDMOutputPanel::advanced_clicked () void KDMOutputPanel::kdm_write_type_changed () { - if (_write_flat->GetValue()) { - Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FLAT); - } else if (_write_folder->GetValue()) { - Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FOLDER); - } else if (_write_zip->GetValue()) { - Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_ZIP); + switch (_write_collect->get().get_value_or(0)) { + case 0: + Config::instance()->set_last_kdm_write_type(Config::KDM_WRITE_FLAT); + break; + case 1: + Config::instance()->set_last_kdm_write_type(Config::KDM_WRITE_FOLDER); + break; + case 2: + Config::instance()->set_last_kdm_write_type(Config::KDM_WRITE_ZIP); + break; } } @@ -265,14 +267,16 @@ KDMOutputPanel::make ( try { if (_write_to->GetValue()) { - if (_write_flat->GetValue()) { + switch (_write_collect->get().get_value_or(0)) { + case 0: written = write_files ( kdms, directory(), _filename_format->get(), confirm_overwrite ); - } else if (_write_folder->GetValue()) { + break; + case 1: written = write_directories ( collect (kdms), directory(), @@ -280,7 +284,8 @@ KDMOutputPanel::make ( _filename_format->get(), confirm_overwrite ); - } else if (_write_zip->GetValue()) { + break; + case 2: written = write_zip_files ( collect (kdms), directory(), @@ -288,6 +293,7 @@ KDMOutputPanel::make ( _filename_format->get(), confirm_overwrite ); + break; } } diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 84cfdecd7..848b15722 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -34,6 +34,7 @@ LIBDCP_ENABLE_WARNINGS class CheckBox; +class Choice; class DirPickerCtrl; class Job; class KDMChoice; @@ -89,9 +90,7 @@ protected: #else wxDirPickerCtrl* _folder; #endif - wxRadioButton* _write_flat; - wxRadioButton* _write_folder; - wxRadioButton* _write_zip; + Choice* _write_collect; wxButton* _advanced; CheckBox* _email; wxButton* _add_email_addresses; diff --git a/src/wx/short_kdm_output_panel.cc b/src/wx/short_kdm_output_panel.cc index 5a0fb2504..7e0692319 100644 --- a/src/wx/short_kdm_output_panel.cc +++ b/src/wx/short_kdm_output_panel.cc @@ -20,6 +20,7 @@ #include "check_box.h" +#include "dcpomatic_choice.h" #include "kdm_choice.h" #include "name_format_editor.h" #include "short_kdm_output_panel.h" @@ -68,15 +69,11 @@ ShortKDMOutputPanel::fill_destination_panel(wxPanel* panel) auto table = new wxFlexGridSizer(2, DCPOMATIC_SIZER_X_GAP, 0); table->AddGrowableCol(1); - table->Add(_write_to, 1, wxEXPAND); + table->Add(_write_to, 1, wxEXPAND | wxLEFT); table->Add(_folder, 1, wxEXPAND); - auto write_options = new wxBoxSizer(wxVERTICAL); - write_options->Add(_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - write_options->Add(_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - write_options->Add(_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - table->AddSpacer(0); - table->Add(write_options); + add_label_to_sizer(table, panel, _("Collection"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); + table->Add(_write_collect, 1, wxEXPAND); table->Add(_email, 1, wxEXPAND); table->Add(_add_email_addresses); diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc index d34c5460d..5d4c5c661 100644 --- a/src/wx/tall_kdm_output_panel.cc +++ b/src/wx/tall_kdm_output_panel.cc @@ -22,6 +22,7 @@ #include "check_box.h" #include "confirm_kdm_email_dialog.h" #include "dcpomatic_button.h" +#include "dcpomatic_choice.h" #include "extra_kdm_email_dialog.h" #include "kdm_advanced_dialog.h" #include "kdm_choice.h" @@ -93,15 +94,11 @@ TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent) table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); #endif table->Add (_filename_format->panel(), 1, wxEXPAND); - table->Add (_write_to, 1, wxEXPAND); + table->Add (_write_to, 1, wxEXPAND | wxLEFT); table->Add (_folder, 1, wxEXPAND); - auto write_options = new wxBoxSizer(wxVERTICAL); - write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - table->AddSpacer (0); - table->Add (write_options); + add_label_to_sizer(table, this, _("Collection"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); + table->Add(_write_collect, 1, wxEXPAND); table->Add (_email, 1, wxEXPAND); table->Add (_add_email_addresses); -- cgit v1.2.3 From 85e5b7b41caa195510454ac49e0c5732c8e04ddf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 31 Dec 2024 00:11:05 +0100 Subject: Remove name documentation with short screens. --- src/wx/kdm_output_panel.cc | 28 +++++++++++++++++----------- src/wx/kdm_output_panel.h | 2 +- src/wx/short_kdm_output_panel.cc | 2 +- src/wx/tall_kdm_output_panel.cc | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index f86808a70..ecce47da2 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -133,22 +133,28 @@ KDMOutputPanel::create_details_widgets(wxWindow* parent) void -KDMOutputPanel::create_name_format_widgets(wxWindow* parent) +KDMOutputPanel::create_name_format_widgets(wxWindow* parent, bool detailed) { _container_name_format = new NameFormatEditor(parent, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); dcp::NameFormat::Map titles; - titles['f'] = wx_to_std (_("film name")); - titles['c'] = wx_to_std (_("cinema")); - titles['s'] = wx_to_std (_("screen")); - titles['b'] = wx_to_std (_("from date/time")); - titles['e'] = wx_to_std (_("to date/time")); + if (detailed) { + titles['f'] = wx_to_std (_("film name")); + titles['c'] = wx_to_std (_("cinema")); + titles['s'] = wx_to_std (_("screen")); + titles['b'] = wx_to_std (_("from date/time")); + titles['e'] = wx_to_std (_("to date/time")); + } + dcp::NameFormat::Map ex; - ex['f'] = "Bambi"; - ex['c'] = "Lumière"; - ex['s'] = "Screen 1"; - ex['b'] = "2012/03/15 12:30"; - ex['e'] = "2012/03/22 02:30"; + if (detailed) { + ex['f'] = "Bambi"; + ex['c'] = "Lumière"; + ex['s'] = "Screen 1"; + ex['b'] = "2012/03/15 12:30"; + ex['e'] = "2012/03/22 02:30"; + } + _filename_format = new NameFormatEditor(parent, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); } diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 848b15722..b555162dd 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -78,7 +78,7 @@ public: protected: void create_destination_widgets(wxWindow* parent); void create_details_widgets(wxWindow* parent); - void create_name_format_widgets(wxWindow* parent); + void create_name_format_widgets(wxWindow* parent, bool detailed); KDMChoice* _type; wxTextCtrl* _annotation_text; diff --git a/src/wx/short_kdm_output_panel.cc b/src/wx/short_kdm_output_panel.cc index 7e0692319..a7b8f5eb5 100644 --- a/src/wx/short_kdm_output_panel.cc +++ b/src/wx/short_kdm_output_panel.cc @@ -53,7 +53,7 @@ ShortKDMOutputPanel::ShortKDMOutputPanel(wxWindow* parent) notebook->AddPage(details, _("Details")); auto name_formats = new wxPanel(notebook, wxID_ANY); - create_name_format_widgets(name_formats); + create_name_format_widgets(name_formats, false); fill_name_formats_panel(name_formats); notebook->AddPage(name_formats, _("Name formats")); diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc index 5d4c5c661..b8b01f61b 100644 --- a/src/wx/tall_kdm_output_panel.cc +++ b/src/wx/tall_kdm_output_panel.cc @@ -66,7 +66,7 @@ TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent) { create_destination_widgets(this); create_details_widgets(this); - create_name_format_widgets(this); + create_name_format_widgets(this, true); auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); table->AddGrowableCol (1); -- cgit v1.2.3 From 6ab213e56c8871c407b840d70a7fe997ddaef60a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 31 Dec 2024 00:11:12 +0100 Subject: Tweak some button padding. --- src/tools/dcpomatic_kdm.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 95165fcde..3adbf5a4c 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -212,14 +212,14 @@ public: dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); auto dkdm_buttons = new wxBoxSizer(wxVERTICAL); _add_dkdm = new Button (overall_panel, _("Add...")); - dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + dkdm_buttons->Add (_add_dkdm, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); _add_dkdm_folder = new Button (overall_panel, _("Add folder...")); dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); _remove_dkdm = new Button (overall_panel, _("Remove")); dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); _export_dkdm = new Button (overall_panel, _("Export...")); dkdm_buttons->Add (_export_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); right->Add (dkdm_sizer, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); update_dkdm_view(); -- cgit v1.2.3