projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unicode BOMs as they apparently confuse gettext.
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index d48ee26c1ded308843bad01ebbcb7ba8e0b46d46..e1a66770c446633fcf72cfda2d9140b26833c26e 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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/>.
*/
*/
@@
-31,6
+32,7
@@
class wxListEvent;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
class TimelineDialog;
class FilmEditor;
class ContentSubPanel;
+class AudioPanel;
class Film;
class FilmViewer;
class Film;
class FilmViewer;
@@
-43,7
+45,7
@@
public:
return _film;
}
return _film;
}
- void set_film (boost::shared_ptr<Film>
f
);
+ void set_film (boost::shared_ptr<Film>);
void set_general_sensitivity (bool s);
void set_selection (boost::weak_ptr<Content>);
void set_general_sensitivity (bool s);
void set_selection (boost::weak_ptr<Content>);
@@
-59,17
+61,17
@@
public:
}
ContentList selected ();
}
ContentList selected ();
-
Video
ContentList selected_video ();
-
Audio
ContentList selected_audio ();
-
Subtitle
ContentList selected_subtitle ();
+ ContentList selected_video ();
+ ContentList selected_audio ();
+ ContentList selected_subtitle ();
FFmpegContentList selected_ffmpeg ();
void add_file_clicked ();
FFmpegContentList selected_ffmpeg ();
void add_file_clicked ();
-
-private:
+ bool remove_clicked (bool hotkey);
+
+private:
void selection_changed ();
void add_folder_clicked ();
void selection_changed ();
void add_folder_clicked ();
- void remove_clicked ();
void earlier_clicked ();
void later_clicked ();
void right_click (wxListEvent &);
void earlier_clicked ();
void later_clicked ();
void right_click (wxListEvent &);
@@
-92,13
+94,16
@@
private:
wxButton* _later;
wxButton* _timeline;
ContentSubPanel* _video_panel;
wxButton* _later;
wxButton* _timeline;
ContentSubPanel* _video_panel;
-
ContentSub
Panel* _audio_panel;
+
Audio
Panel* _audio_panel;
ContentSubPanel* _subtitle_panel;
ContentSubPanel* _timing_panel;
std::list<ContentSubPanel *> _panels;
ContentMenu* _menu;
TimelineDialog* _timeline_dialog;
ContentSubPanel* _subtitle_panel;
ContentSubPanel* _timing_panel;
std::list<ContentSubPanel *> _panels;
ContentMenu* _menu;
TimelineDialog* _timeline_dialog;
+ wxNotebook* _parent;
+ ContentList _last_selected;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Film> _film;
+ FilmViewer* _film_viewer;
bool _generally_sensitive;
};
bool _generally_sensitive;
};