projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in verification due to mismatched wxString::Format placeholder.
[dcpomatic.git]
/
src
/
wx
/
fonts_dialog.h
diff --git
a/src/wx/fonts_dialog.h
b/src/wx/fonts_dialog.h
index c29a982c932ee318a9d5550fa157304542463bc7..ba98e0963877b82ccf05982b4b81da161dd4ce99 100644
(file)
--- a/
src/wx/fonts_dialog.h
+++ b/
src/wx/fonts_dialog.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
8
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/>.
*/
*/
@@
-23,23
+24,22
@@
#include <boost/weak_ptr.hpp>
#include <boost/filesystem.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/filesystem.hpp>
-class SubtitleContent;
+class Content;
+class TextContent;
class FontsDialog : public wxDialog
{
public:
class FontsDialog : public wxDialog
{
public:
- FontsDialog (wxWindow* parent, boost::shared_ptr<
SubtitleContent>
);
+ FontsDialog (wxWindow* parent, boost::shared_ptr<
Content>, boost::shared_ptr<TextContent> caption
);
private:
void setup ();
private:
void setup ();
- void set_from_file_clicked ();
- void set_from_system_clicked ();
- void update_sensitivity ();
+ void setup_sensitivity ();
void selection_changed ();
void selection_changed ();
- void
set_selected_font_file (boost::filesystem::path file
);
+ void
edit_clicked (
);
- boost::weak_ptr<SubtitleContent> _content;
+ boost::weak_ptr<Content> _content;
+ boost::weak_ptr<TextContent> _caption;
wxListCtrl* _fonts;
wxListCtrl* _fonts;
- wxButton* _set_from_file;
- wxButton* _set_from_system;
+ wxButton* _edit;
};
};