Tweak vertical layout in the KDM creator (#833).

diff --git a/ChangeLog b/ChangeLog
index f279abba4e8513ea098ccccb10cd829bad4d3f02..04a7a77d59e08d32c0dfccc87ea9fc9603839981 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-04-22  c.hetherington  <cth@carlh.net>
 
+       * Arrange buttons to consume less vertical space in the
+       KDM creator (#833).
+
        * Select active channels on opening audio analysis (#802).
 
        * Disallow KDM until times from being before from times (#821).

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index ddb088c2fcf2564de5b05493ab5a225c109cef92..4f95ff40868ee1c953ec53140b7907c4fbffe0a0 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -51,21 +51,20 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
        add_cinemas ();
 
-       wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
+       wxGridSizer* target_buttons = new wxGridSizer (2, DCPOMATIC_BUTTON_STACK_GAP * 2, DCPOMATIC_SIZER_Y_GAP);
 
        _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
-       target_buttons->Add (_add_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-       _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
-       target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-       _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
-       target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-
+       target_buttons->Add (_add_cinema, 1, wxEXPAND);
        _add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
-       target_buttons->Add (_add_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+       target_buttons->Add (_add_screen, 1, wxEXPAND);
+       _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
+       target_buttons->Add (_edit_cinema, 1, wxEXPAND);
        _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
-       target_buttons->Add (_edit_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+       target_buttons->Add (_edit_screen, 1, wxEXPAND);
+       _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
+       target_buttons->Add (_remove_cinema, 1, wxEXPAND);
        _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
-       target_buttons->Add (_remove_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+       target_buttons->Add (_remove_screen, 1, wxEXPAND);
 
        targets->Add (target_buttons, 0, 0);