Allow debug builds with no internet connection. Also add missing patron.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index e177c0f1ebe5ee4fadac330e771bbb7553bb2a1d..761b34a24113d97d82ce1715e36eb427a0a55049 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -18,17 +18,19 @@
 
 */
 
-#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;
@@ -42,7 +44,7 @@ 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;
@@ -56,8 +58,8 @@ public:
        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 {
@@ -74,14 +76,17 @@ public:
        bool remove_clicked (bool hotkey);
        void timeline_clicked ();
 
-       FilmViewer* film_viewer () const {
+       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 ();
@@ -95,8 +100,7 @@ private:
        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;
@@ -117,6 +121,8 @@ private:
        wxWindow* _last_selected_tab;
 
        boost::shared_ptr<Film> _film;
-       FilmViewer* _film_viewer;
+       boost::weak_ptr<FilmViewer> _film_viewer;
        bool _generally_sensitive;
+       bool _ignore_deselect;
+       bool _no_check_selection;
 };