/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
+#include <wx/display.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
#include <iostream>
_text_panel[i] = 0;
}
- _panel = new wxPanel (n);
- _sizer = new wxBoxSizer (wxVERTICAL);
- _panel->SetSizer (_sizer);
+ _splitter = new wxSplitterWindow (n);
+ wxPanel* top = new wxPanel (_splitter);
+
+ _menu = new ContentMenu (_splitter);
- _menu = new ContentMenu (_panel);
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _content = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
+ _content = new wxListCtrl (top, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
_content->DragAcceptFiles (true);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
- _add_file = new wxButton (_panel, wxID_ANY, _("Add file(s)..."));
+ _add_file = new Button (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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 (top, _("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);
+ top->SetSizer (s);
}
- _notebook = new wxNotebook (_panel, wxID_ANY);
- _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+ _notebook = new wxNotebook (_splitter, wxID_ANY);
+
+ /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
+ enough on small displays to leave space for the content area.
+ */
+ wxDisplay display (wxDisplay::GetFromWindow(_splitter));
+ wxRect screen = display.GetClientArea();
+ _splitter->SplitHorizontally (top, _notebook, screen.height > 800 ? -600 : -150);
_timing_panel = new TimingPanel (this, _film_viewer);
_notebook->AddPage (_timing_panel, _("Timing"), false);
/* This method is also called when Ctrl-A is pressed, so check that our notebook page
is visible.
*/
- if (_parent->GetCurrentPage() != _panel || !_film) {
+ if (_parent->GetCurrentPage() != _splitter || !_film) {
return;
}
non-Latin filenames or paths.
*/
wxFileDialog* d = new wxFileDialog (
- _panel,
+ _splitter,
_("Choose a file or files"),
wxT (""),
wxT (""),
void
ContentPanel::add_folder_clicked ()
{
- wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST);
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
BOOST_FOREACH (shared_ptr<Content> i, content) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
if (ic) {
- ImageSequenceDialog* e = new ImageSequenceDialog (_panel);
+ ImageSequenceDialog* e = new ImageSequenceDialog (_splitter);
r = e->ShowModal ();
float const frame_rate = e->frame_rate ();
e->Destroy ();
void
ContentPanel::add_dcp_clicked ()
{
- wxDirDialog* d = new wxDirDialog (_panel, _("Choose a DCP folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST);
int r = d->ShowModal ();
boost::filesystem::path const path (wx_to_std (d->GetPath ()));
d->Destroy ();
/* If the method was called because Delete was pressed check that our notebook page
is visible and that the content list is focussed.
*/
- if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) {
+ if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) {
return true;
}
void
ContentPanel::setup ()
{
+ if (!_film) {
+ _content->DeleteAllItems ();
+ setup_sensitivity ();
+ return;
+ }
+
ContentList content = _film->content ();
Content* selected_content = 0;
projects / dcpomatic.git / blobdiff