X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=d1ba1a7603422074c2bb97717bb2b97c2efb407b;hb=f479e6edc5152edfa4b21f85e925b890818817af;hp=70568ccc044bf2be3230de382008a4ae122b71ea;hpb=69a7c253174091d12b0efb37f2a4ac5e61dfaa3a;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 70568ccc0..d1ba1a760 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,54 +18,43 @@
 
 */
 
+
 #include "content_menu.h"
-#include "lib/types.h"
+#include "lib/enum_indexed_vector.h"
 #include "lib/film.h"
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/splitter.h>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
+
+class AudioPanel;
+class ContentSubPanel;
+class Film;
+class FilmEditor;
+class FilmViewer;
+class LimitedContentPanelSplitter;
+class TextPanel;
+class TimelineDialog;
+class TimingPanel;
+class VideoPanel;
+class wxListCtrl;
+class wxListEvent;
 class wxNotebook;
 class wxPanel;
 class wxSizer;
-class wxListCtrl;
-class wxListEvent;
 class wxSplitterWindow;
-class TimelineDialog;
-class FilmEditor;
-class ContentSubPanel;
-class TextPanel;
-class VideoPanel;
-class AudioPanel;
-class TimingPanel;
-class Film;
-class FilmViewer;
 
 
-class LimitedSplitter : public wxSplitterWindow
+class ContentPanel
 {
 public:
-	LimitedSplitter (wxWindow* parent);
+	ContentPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer);
 
-	bool OnSashPositionChange (int new_position)
-	{
-		/* Try to stop the top bit of the splitter getting so small that buttons disappear */
-		return new_position > 220;
-	}
-
-	void first_shown (wxWindow* top, wxWindow* bottom);
-
-private:
-	void sized (wxSizeEvent& ev);
-
-	bool _first_shown;
-	int const _top_panel_minimum_size;
-};
-
-
-class ContentPanel : public boost::noncopyable
-{
-public:
-	ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+	ContentPanel (ContentPanel const&) = delete;
+	ContentPanel& operator= (ContentPanel const&) = delete;
 
 	std::shared_ptr<Film> film () const {
 		return _film;
@@ -82,9 +71,7 @@ public:
 
 	void first_shown ();
 
-	wxWindow* window () const {
-		return _splitter;
-	}
+	wxWindow* window () const;
 
 	wxNotebook* notebook () const {
 		return _notebook;
@@ -100,10 +87,14 @@ public:
 	bool remove_clicked (bool hotkey);
 	void timeline_clicked ();
 
-	std::weak_ptr<FilmViewer> film_viewer () const {
+	FilmViewer& film_viewer() const {
 		return _film_viewer;
 	}
 
+	void add_files(std::vector<boost::filesystem::path> files);
+	void add_dcp(boost::filesystem::path dcp);
+	void add_folder(boost::filesystem::path folder);
+
 	boost::signals2::signal<void (void)> SelectionChanged;
 
 private:
@@ -120,11 +111,11 @@ private:
 
 	void setup ();
 	void setup_sensitivity ();
+	void set_selected_state(int item, bool state);
 
-	void add_files (std::list<boost::filesystem::path>);
 	std::list<ContentSubPanel *> panels () const;
 
-	LimitedSplitter* _splitter;
+	LimitedContentPanelSplitter* _splitter;
 	wxPanel* _top_panel;
 	wxNotebook* _notebook;
 	wxListCtrl* _content;
@@ -135,17 +126,17 @@ private:
 	wxButton* _earlier;
 	wxButton* _later;
 	wxButton* _timeline;
-	VideoPanel* _video_panel;
-	AudioPanel* _audio_panel;
-	TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
+	VideoPanel* _video_panel = nullptr;
+	AudioPanel* _audio_panel = nullptr;
+	EnumIndexedVector<TextPanel*, TextType> _text_panel;
 	TimingPanel* _timing_panel;
 	ContentMenu* _menu;
-	TimelineDialog* _timeline_dialog;
+	TimelineDialog* _timeline_dialog = nullptr;
 	wxNotebook* _parent;
-	wxWindow* _last_selected_tab;
+	wxWindow* _last_selected_tab = nullptr;
 
 	std::shared_ptr<Film> _film;
-	std::weak_ptr<FilmViewer> _film_viewer;
+	FilmViewer& _film_viewer;
 	bool _generally_sensitive;
 	bool _ignore_deselect;
 	bool _no_check_selection;