Hopefully improve layout on high-resolution displays (#1303).

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 89690a5d0f6be9b0554efdcff2708187bc3fbd3c..ad3419d148056c11d55881f281cb0d6c58889c0e 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -27,6 +27,7 @@
 #include "timeline_dialog.h"
 #include "image_sequence_dialog.h"
 #include "film_viewer.h"
+#include "dcpomatic_button.h"
 #include "lib/audio_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
@@ -93,41 +94,41 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 
                wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
 
-               _add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)..."));
+               _add_file = new Button (_panel, _("Add file(s)..."));
                _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
                b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _add_folder = new wxButton (_panel, wxID_ANY, _("Add folder..."));
+               _add_folder = new Button (_panel, _("Add folder..."));
                _add_folder->SetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files."));
                b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _add_dcp = new wxButton (_panel, wxID_ANY, _("Add DCP..."));
+               _add_dcp = new Button (_panel, _("Add DCP..."));
                _add_dcp->SetToolTip (_("Add a DCP."));
                b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _remove = new wxButton (_panel, wxID_ANY, _("Remove"));
+               _remove = new Button (_panel, _("Remove"));
                _remove->SetToolTip (_("Remove the selected piece of content from the film."));
                b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _earlier = new wxButton (_panel, wxID_ANY, _("Earlier"));
+               _earlier = new Button (_panel, _("Earlier"));
                _earlier->SetToolTip (_("Move the selected piece of content earlier in the film."));
                b->Add (_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _later = new wxButton (_panel, wxID_ANY, _("Later"));
+               _later = new Button (_panel, _("Later"));
                _later->SetToolTip (_("Move the selected piece of content later in the film."));
                b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
-               _timeline = new wxButton (_panel, wxID_ANY, _("Timeline..."));
+               _timeline = new Button (_panel, _("Timeline..."));
                _timeline->SetToolTip (_("Open the timeline for the film."));
                b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                s->Add (b, 0, wxALL, 4);
 
-               _sizer->Add (s, 0, wxEXPAND | wxALL, 6);
+               _sizer->Add (s, 1, wxEXPAND | wxALL, 6);
        }
 
        _notebook = new wxNotebook (_panel, wxID_ANY);
-       _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+       _sizer->Add (_notebook, 0, wxEXPAND | wxTOP, 6);
 
        _timing_panel = new TimingPanel (this, _film_viewer);
        _notebook->AddPage (_timing_panel, _("Timing"), false);
@@ -568,7 +569,7 @@ ContentPanel::setup_sensitivity ()
                        _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty());
                }
        }
-       _timing_panel->Enable   (_generally_sensitive);
+       _timing_panel->Enable (_generally_sensitive);
 }
 
 void