projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix layout bug where the stuff in the content panel would be completely
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index e177c0f1ebe5ee4fadac330e771bbb7553bb2a1d..a4a172a7fc822a57ecba1f87d5a7c7df659cced3 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
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 "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 wxNotebook;
class wxPanel;
class wxSizer;
class wxListCtrl;
class wxListEvent;
+class wxSplitterWindow;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
@@
-42,7
+44,7
@@
class FilmViewer;
class ContentPanel : public boost::noncopyable
{
public:
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;
boost::shared_ptr<Film> film () const {
return _film;
@@
-56,8
+58,10
@@
public:
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 {
+ return _splitter;
}
wxNotebook* notebook () const {
}
wxNotebook* notebook () const {
@@
-74,14
+78,17
@@
public:
bool remove_clicked (bool hotkey);
void timeline_clicked ();
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:
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 add_folder_clicked ();
void add_dcp_clicked ();
void earlier_clicked ();
@@
-95,8
+102,8
@@
private:
void add_files (std::list<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
void add_files (std::list<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
- wx
Panel* _panel
;
- wx
Sizer* _sizer
;
+ wx
SplitterWindow* _splitter
;
+ wx
Panel* _top_panel
;
wxNotebook* _notebook;
wxListCtrl* _content;
wxButton* _add_file;
wxNotebook* _notebook;
wxListCtrl* _content;
wxButton* _add_file;
@@
-113,10
+120,11
@@
private:
ContentMenu* _menu;
TimelineDialog* _timeline_dialog;
wxNotebook* _parent;
ContentMenu* _menu;
TimelineDialog* _timeline_dialog;
wxNotebook* _parent;
- ContentList _last_selected;
wxWindow* _last_selected_tab;
boost::shared_ptr<Film> _film;
wxWindow* _last_selected_tab;
boost::shared_ptr<Film> _film;
-
FilmViewer*
_film_viewer;
+
boost::weak_ptr<FilmViewer>
_film_viewer;
bool _generally_sensitive;
bool _generally_sensitive;
+ bool _ignore_deselect;
+ bool _no_check_selection;
};
};