More tweaks.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index e1a66770c446633fcf72cfda2d9140b26833c26e..4a41ad1894ea6db435e99efc8dc2fe2dfc3f5ed3 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -32,14 +32,17 @@ class wxListEvent;
 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;
@@ -48,6 +51,7 @@ public:
        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);
@@ -63,25 +67,36 @@ public:
        ContentList selected ();
        ContentList selected_video ();
        ContentList selected_audio ();
-       ContentList selected_subtitle ();
+       ContentList selected_text ();
        FFmpegContentList selected_ffmpeg ();
 
        void add_file_clicked ();
        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 selection_changed ();
+       void item_selected ();
+       void item_deselected ();
+       void item_deselected_idle ();
+       void check_selection ();
        void add_folder_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;
@@ -89,21 +104,23 @@ private:
        wxListCtrl* _content;
        wxButton* _add_file;
        wxButton* _add_folder;
+       wxButton* _add_dcp;
        wxButton* _remove;
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
-       ContentSubPanel* _video_panel;
+       VideoPanel* _video_panel;
        AudioPanel* _audio_panel;
-       ContentSubPanel* _subtitle_panel;
-       ContentSubPanel* _timing_panel;
-       std::list<ContentSubPanel *> _panels;
+       TextPanel* _text_panel[TEXT_COUNT];
+       TimingPanel* _timing_panel;
        ContentMenu* _menu;
        TimelineDialog* _timeline_dialog;
        wxNotebook* _parent;
        ContentList _last_selected;
+       wxWindow* _last_selected_tab;
 
        boost::shared_ptr<Film> _film;
-       FilmViewer* _film_viewer;
+       boost::weak_ptr<FilmViewer> _film_viewer;
        bool _generally_sensitive;
+       bool _ignore_deselect;
 };