projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add options for where the add files dialog starts (#2413).
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index 13393f632701edab5a13107a962363ffc1d931da..8f25353b3c4167eec241dfa42d7f7a4979983d4b 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,49
+18,61
@@
*/
*/
+
#include "content_menu.h"
#include "content_menu.h"
-#include "lib/
types
.h"
+#include "lib/
enum_indexed_vector
.h"
#include "lib/film.h"
#include "lib/film.h"
+#include "lib/text_type.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/splitter.h>
#include <wx/splitter.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <list>
#include <list>
+
+class AudioPanel;
+class ContentListCtrl;
+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 wxNotebook;
class wxPanel;
class wxSizer;
-class wxListCtrl;
-class wxListEvent;
class wxSplitterWindow;
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
+
+class ContentPanel
{
public:
{
public:
- ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+ ContentPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer);
+
+ ContentPanel (ContentPanel const&) = delete;
+ ContentPanel& operator= (ContentPanel const&) = delete;
-
boost
::shared_ptr<Film> film () const {
+
std
::shared_ptr<Film> film () const {
return _film;
}
return _film;
}
- void set_film (
boost
::shared_ptr<Film>);
+ void set_film (
std
::shared_ptr<Film>);
void set_general_sensitivity (bool s);
void set_general_sensitivity (bool s);
- void set_selection (
boost
::weak_ptr<Content>);
+ void set_selection (
std
::weak_ptr<Content>);
void set_selection (ContentList cl);
void set_selection (ContentList cl);
+ void select_all ();
void film_changed (Film::Property p);
void film_content_changed (int p);
void film_changed (Film::Property p);
void film_content_changed (int p);
- wxWindow* window () const {
- return _splitter;
- }
+ void first_shown ();
+
+ wxWindow* window () const;
wxNotebook* notebook () const {
return _notebook;
wxNotebook* notebook () const {
return _notebook;
@@
-76,10
+88,14
@@
public:
bool remove_clicked (bool hotkey);
void timeline_clicked ();
bool remove_clicked (bool hotkey);
void timeline_clicked ();
-
boost::weak_ptr<FilmViewer> film_viewer
() const {
+
FilmViewer& film_viewer
() const {
return _film_viewer;
}
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:
boost::signals2::signal<void (void)> SelectionChanged;
private:
@@
-93,16
+109,18
@@
private:
void later_clicked ();
void right_click (wxListEvent &);
void files_dropped (wxDropFilesEvent &);
void later_clicked ();
void right_click (wxListEvent &);
void files_dropped (wxDropFilesEvent &);
+ boost::optional<boost::filesystem::path> add_files_override_path() const;
void setup ();
void setup_sensitivity ();
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;
std::list<ContentSubPanel *> panels () const;
- wxSplitterWindow* _splitter;
+ LimitedContentPanelSplitter* _splitter;
+ wxPanel* _top_panel;
wxNotebook* _notebook;
wxNotebook* _notebook;
-
wx
ListCtrl* _content;
+
Content
ListCtrl* _content;
wxButton* _add_file;
wxButton* _add_folder;
wxButton* _add_dcp;
wxButton* _add_file;
wxButton* _add_folder;
wxButton* _add_dcp;
@@
-110,17
+128,17
@@
private:
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
- VideoPanel* _video_panel;
- AudioPanel* _audio_panel;
-
TextPanel* _text_panel[TEXT_COUNT]
;
+ VideoPanel* _video_panel
= nullptr
;
+ AudioPanel* _audio_panel
= nullptr
;
+
EnumIndexedVector<TextPanel*, TextType> _text_panel
;
TimingPanel* _timing_panel;
ContentMenu* _menu;
TimingPanel* _timing_panel;
ContentMenu* _menu;
- TimelineDialog* _timeline_dialog;
+ TimelineDialog* _timeline_dialog
= nullptr
;
wxNotebook* _parent;
wxNotebook* _parent;
- wxWindow* _last_selected_tab;
+ wxWindow* _last_selected_tab
= nullptr
;
-
boost
::shared_ptr<Film> _film;
-
boost::weak_ptr<FilmViewer>
_film_viewer;
+
std
::shared_ptr<Film> _film;
+
FilmViewer&
_film_viewer;
bool _generally_sensitive;
bool _ignore_deselect;
bool _no_check_selection;
bool _generally_sensitive;
bool _ignore_deselect;
bool _no_check_selection;