#include "dcpomatic_button.h"
#include "fonts_dialog.h"
#include "system_font_dialog.h"
+#include "wx_ptr.h"
#include "wx_util.h"
#include "lib/content.h"
#include "lib/font.h"
+#include "lib/scope_guard.h"
#include "lib/text_content.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
auto sizer = new wxBoxSizer (wxHORIZONTAL);
sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- _edit = new Button (this, _("Edit..."));
- sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+ auto buttons_panel = new wxPanel(this);
+ auto buttons_sizer = new wxBoxSizer(wxVERTICAL);
+
+ _set_from_file = new Button(buttons_panel, _("Set from file..."));
+ buttons_sizer->Add (_set_from_file, 0, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+
+#ifdef DCPOMATIC_WINDOWS
+ _set_from_system_font = new Button(buttons_panel, _("Set from system font..."));
+ buttons_sizer->Add (_set_from_system_font, 0, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+#endif
+
+ buttons_panel->SetSizer(buttons_sizer);
+ sizer->Add(buttons_panel);
auto overall_sizer = new wxBoxSizer (wxVERTICAL);
overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
SetSizerAndFit (overall_sizer);
- _edit->Bind (wxEVT_BUTTON, boost::bind (&FontsDialog::edit_clicked, this));
+ _set_from_file->Bind(wxEVT_BUTTON, boost::bind(&FontsDialog::set_from_file_clicked, this));
+ if (_set_from_system_font) {
+ _set_from_system_font->Bind(wxEVT_BUTTON, boost::bind(&FontsDialog::set_from_system_font_clicked, this));
+ }
_fonts->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&FontsDialog::selection_changed, this));
_fonts->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&FontsDialog::selection_changed, this));
FontsDialog::setup_sensitivity ()
{
int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- _edit->Enable (item != -1);
+ _set_from_file->Enable (item != -1);
+ if (_set_from_system_font) {
+ _set_from_system_font->Enable (item != -1);
+ }
}
-void
-FontsDialog::edit_clicked ()
+shared_ptr<Font>
+FontsDialog::get_selection ()
{
- auto content = _content.lock ();
- auto caption = _caption.lock ();
- if (!content || !caption) {
- return;
+ auto caption = _caption.lock();
+ if (!caption) {
+ return {};
}
int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
auto const id = _fonts->GetItemData(item) ? "" : wx_to_std(_fonts->GetItemText(item, 0));
- auto font = caption->get_font(id);
+ return caption->get_font(id);
+}
+
+
+void
+FontsDialog::set_from_file_clicked ()
+{
+ auto font = get_selection();
if (!font) {
return;
}
default_dir = "/System/Library/Fonts";
#endif
- auto d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf;*.ttc"), wxFD_CHANGE_DIR);
- int const r = d->ShowModal ();
+ auto d = make_wx<wxFileDialog>(this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf;*.ttc"), wxFD_CHANGE_DIR);
- if (r != wxID_OK) {
- d->Destroy ();
+ if (d->ShowModal() != wxID_OK) {
return;
}
font->set_file (wx_to_std(d->GetPath()));
- d->Destroy ();
+ setup ();
+}
+
+
+void
+FontsDialog::set_from_system_font_clicked()
+{
+ auto font = get_selection();
+ if (!font) {
+ return;
+ }
+
+ auto dialog = make_wx<SystemFontDialog>(this);
+ if (dialog->ShowModal() == wxID_OK) {
+ auto font_file = dialog->get_font();
+ if (font_file) {
+ font->set_file(*font_file);
+ }
+ }
setup ();
}