Add shorter output panel for KDMs on smaller screens (#2646).

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 1d22e0818279baafc66dc43b50656b8abcb1f776..95165fcde25dcfc81505197466e0050d2a00327b 100644 (file)
--- 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 <dcp/filesystem.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
+#include <wx/display.h>
 #include <wx/dnd.h>
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
@@ -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 (file)
index 0000000..8ecd112
--- /dev/null
+++ b/src/wx/short_kdm_output_panel.cc
@@ -0,0 +1,118 @@
+/*
+    Copyright (C) 2015-2022 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 "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 <wx/filepicker.h>
+LIBDCP_ENABLE_WARNINGS
+#endif
+#include <wx/notebook.h>
+#include <wx/sizer.h>
+
+
+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 (file)
index 0000000..eed2950
--- /dev/null
+++ b/src/wx/short_kdm_output_panel.h
@@ -0,0 +1,38 @@
+/*
+    Copyright (C) 2024 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 "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 9fc5a24efe92c6ff2f5bdc6a0860253c2f5fabc0..583fe4bb077057041484209b4462db71094db134 100644 (file)
--- 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