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
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index 43a1214c2c915aad424bd63178c8852201cb823f..0e61f4898f7577dbcae7871b7ac0c18ba7850544 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,7
+23,10
@@
*/
#include "lib/film.h"
*/
#include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
class wxNotebook;
#include <boost/signals2.hpp>
class wxNotebook;
@@
-37,11
+41,13
@@
class FilmViewer;
class FilmEditor : public wxPanel
{
public:
class FilmEditor : public wxPanel
{
public:
- FilmEditor (wxWindow *,
FilmViewer*
viewer);
+ FilmEditor (wxWindow *,
boost::weak_ptr<FilmViewer>
viewer);
void set_film (boost::shared_ptr<Film>);
void set_film (boost::shared_ptr<Film>);
+ void first_shown ();
boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
+ boost::signals2::signal<void (void)> SelectionChanged;
/* Stuff for panels */
/* Stuff for panels */
@@
-54,11
+60,11
@@
public:
}
/* Handle changes to the model */
}
/* Handle changes to the model */
- void film_change
d (
Film::Property);
- void film_content_change
d (
int);
+ void film_change
(ChangeType,
Film::Property);
+ void film_content_change
(ChangeType type,
int);
void set_general_sensitivity (bool);
void set_general_sensitivity (bool);
- void active_jobs_changed (boo
l
);
+ void active_jobs_changed (boo
st::optional<std::string>
);
wxNotebook* _main_notebook;
ContentPanel* _content_panel;
wxNotebook* _main_notebook;
ContentPanel* _content_panel;