X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=13393f632701edab5a13107a962363ffc1d931da;hp=d48ee26c1ded308843bad01ebbcb7ba8e0b46d46;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=1420c529d7e196f96ddf9580efdc09fa01c55d58

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index d48ee26c1..13393f632 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,57 +1,65 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include "content_menu.h"
 #include "lib/types.h"
 #include "lib/film.h"
-#include "content_menu.h"
+#include <wx/splitter.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 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 ContentPanel : public boost::noncopyable
 {
 public:
-	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, FilmViewer* viewer);
+	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
 	boost::shared_ptr<Film> film () const {
 		return _film;
 	}
 
-	void set_film (boost::shared_ptr<Film> f);
+	void set_film (boost::shared_ptr<Film>);
 	void set_general_sensitivity (bool s);
 	void set_selection (boost::weak_ptr<Content>);
+	void set_selection (ContentList cl);
 
 	void film_changed (Film::Property p);
 	void film_content_changed (int p);
 
-	wxPanel* panel () const {
-		return _panel;
+	wxWindow* window () const {
+		return _splitter;
 	}
 
 	wxNotebook* notebook () const {
@@ -59,46 +67,61 @@ public:
 	}
 
 	ContentList selected ();
-	VideoContentList selected_video ();
-	AudioContentList selected_audio ();
-	SubtitleContentList selected_subtitle ();
+	ContentList selected_video ();
+	ContentList selected_audio ();
+	ContentList selected_text ();
 	FFmpegContentList selected_ffmpeg ();
 
 	void add_file_clicked ();
-	
-private:	
-	void selection_changed ();
+	bool remove_clicked (bool hotkey);
+	void timeline_clicked ();
+
+	boost::weak_ptr<FilmViewer> film_viewer () const {
+		return _film_viewer;
+	}
+
+	boost::signals2::signal<void (void)> SelectionChanged;
+
+private:
+	void item_selected ();
+	void item_deselected ();
+	void item_deselected_idle ();
+	void check_selection ();
 	void add_folder_clicked ();
-	void remove_clicked ();
+	void add_dcp_clicked ();
 	void earlier_clicked ();
 	void later_clicked ();
 	void right_click (wxListEvent &);
 	void files_dropped (wxDropFilesEvent &);
-	void timeline_clicked ();
 
 	void setup ();
 	void setup_sensitivity ();
 
 	void add_files (std::list<boost::filesystem::path>);
+	std::list<ContentSubPanel *> panels () const;
 
-	wxPanel* _panel;
-	wxSizer* _sizer;
+	wxSplitterWindow* _splitter;
 	wxNotebook* _notebook;
 	wxListCtrl* _content;
 	wxButton* _add_file;
 	wxButton* _add_folder;
+	wxButton* _add_dcp;
 	wxButton* _remove;
 	wxButton* _earlier;
 	wxButton* _later;
 	wxButton* _timeline;
-	ContentSubPanel* _video_panel;
-	ContentSubPanel* _audio_panel;
-	ContentSubPanel* _subtitle_panel;
-	ContentSubPanel* _timing_panel;
-	std::list<ContentSubPanel *> _panels;
+	VideoPanel* _video_panel;
+	AudioPanel* _audio_panel;
+	TextPanel* _text_panel[TEXT_COUNT];
+	TimingPanel* _timing_panel;
 	ContentMenu* _menu;
 	TimelineDialog* _timeline_dialog;
+	wxNotebook* _parent;
+	wxWindow* _last_selected_tab;
 
 	boost::shared_ptr<Film> _film;
+	boost::weak_ptr<FilmViewer> _film_viewer;
 	bool _generally_sensitive;
+	bool _ignore_deselect;
+	bool _no_check_selection;
 };