projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ellipsize content names in the middle (#2350).
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index e177c0f1ebe5ee4fadac330e771bbb7553bb2a1d..4ce68aea55a05da8791c51f47f8eefa6515efc5e 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
18
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,47
+18,61
@@
*/
*/
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include "lib/types.h"
-#include "lib/film.h"
+
#include "content_menu.h"
#include "content_menu.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 wxNotebook;
-class wxPanel;
-class wxSizer;
-class wxListCtrl;
-class wxListEvent;
-class TimelineDialog;
-class FilmEditor;
-class ContentSubPanel;
-class TextPanel;
-class VideoPanel;
class AudioPanel;
class AudioPanel;
-class TimingPanel;
+class ContentListCtrl;
+class ContentSubPanel;
class Film;
class Film;
+class FilmEditor;
class FilmViewer;
class FilmViewer;
+class LimitedContentPanelSplitter;
+class TextPanel;
+class TimelineDialog;
+class TimingPanel;
+class VideoPanel;
+class wxListCtrl;
+class wxListEvent;
+class wxNotebook;
+class wxPanel;
+class wxSizer;
+class wxSplitterWindow;
+
-class ContentPanel
: public boost::noncopyable
+class ContentPanel
{
public:
{
public:
- ContentPanel
(wxNotebook *, boost::shared_ptr<Film>, FilmViewer*
viewer);
+ ContentPanel
(wxNotebook *, std::shared_ptr<Film>, FilmViewer&
viewer);
- boost::shared_ptr<Film> film () const {
+ ContentPanel (ContentPanel const&) = delete;
+ ContentPanel& operator= (ContentPanel const&) = delete;
+
+ 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);
- wxPanel* panel () const {
- return _panel;
- }
+ void first_shown ();
+
+ wxWindow* window () const;
wxNotebook* notebook () const {
return _notebook;
wxNotebook* notebook () const {
return _notebook;
@@
-74,14
+88,21
@@
public:
bool remove_clicked (bool hotkey);
void timeline_clicked ();
bool remove_clicked (bool hotkey);
void timeline_clicked ();
- 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:
- 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 add_folder_clicked ();
void add_dcp_clicked ();
void earlier_clicked ();
@@
-91,14
+112,14
@@
private:
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;
-
wxPanel* _panel
;
- wx
Sizer* _sizer
;
+
LimitedContentPanelSplitter* _splitter
;
+ wx
Panel* _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;
@@
-106,17
+127,18
@@
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;
- ContentList _last_selected;
- wxWindow* _last_selected_tab;
+ wxWindow* _last_selected_tab = nullptr;
-
boost
::shared_ptr<Film> _film;
- FilmViewer
*
_film_viewer;
+
std
::shared_ptr<Film> _film;
+ FilmViewer
&
_film_viewer;
bool _generally_sensitive;
bool _generally_sensitive;
+ bool _ignore_deselect;
+ bool _no_check_selection;
};
};