X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=c59607e8f4cd1b906c6a392403fbaf59a8b4d519;hb=e87f943433216d294b22853411eca5c582be1066;hp=66f8ab0e486dfab24dde0c3f6c36c1aa49933ed9;hpb=f41818f14369f170475b7f2bde1a2dd856517b14;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 66f8ab0e4..c59607e8f 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,23 +18,28 @@ */ + +#include "dcpomatic_button.h" #include "fonts_dialog.h" -#include "wx_util.h" #include "system_font_dialog.h" -#include "dcpomatic_button.h" -#include "lib/font.h" +#include "wx_util.h" #include "lib/content.h" +#include "lib/font.h" +#include "lib/scope_guard.h" #include "lib/text_content.h" +#include +LIBDCP_DISABLE_WARNINGS #include -#include -#include +LIBDCP_ENABLE_WARNINGS +#include + using std::list; +using std::shared_ptr; using std::string; -using std::cout; -using boost::shared_ptr; using namespace dcpomatic; + FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content, shared_ptr caption) : wxDialog (parent, wxID_ANY, _("Fonts")) , _content (content) @@ -58,47 +63,64 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content, shared_ _fonts->InsertColumn (1, ip); } - wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); + 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); - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); +#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); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + auto buttons = CreateSeparatedButtonSizer (wxOK); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } 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)); setup (); } + void FontsDialog::setup () { - shared_ptr content = _content.lock (); - shared_ptr caption = _caption.lock (); + auto content = _content.lock (); + auto caption = _caption.lock (); if (!content || !caption) { return; } _fonts->DeleteAllItems (); size_t n = 0; - BOOST_FOREACH (shared_ptr i, caption->fonts ()) { + for (auto i: caption->fonts ()) { wxListItem item; item.SetId (n); _fonts->InsertItem (item); - _fonts->SetItem (n, 0, std_to_wx (i->id ())); + auto const id = i->id().empty() ? _("Unspecified") : std_to_wx(i->id()); + _fonts->SetItem(n, 0, id); + _fonts->SetItemData(n, i->id().empty()); if (i->file()) { - _fonts->SetItem (n, 1, i->file()->leaf().string ()); + _fonts->SetItem(n, 1, i->file()->leaf().string()); } ++n; } @@ -106,37 +128,43 @@ FontsDialog::setup () setup_sensitivity (); } + void FontsDialog::selection_changed () { setup_sensitivity (); } + void 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 +FontsDialog::get_selection () { - shared_ptr content = _content.lock (); - shared_ptr 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); - string const id = wx_to_std (_fonts->GetItemText (item, 0)); - shared_ptr font; - BOOST_FOREACH (shared_ptr i, caption->fonts()) { - if (i->id() == id) { - font = i; - } - } + auto const id = _fonts->GetItemData(item) ? "" : wx_to_std(_fonts->GetItemText(item, 0)); + return caption->get_font(id); +} + +void +FontsDialog::set_from_file_clicked () +{ + auto font = get_selection(); if (!font) { return; } @@ -156,16 +184,32 @@ FontsDialog::edit_clicked () default_dir = "/System/Library/Fonts"; #endif - wxFileDialog* d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf"), wxFD_CHANGE_DIR); - int const r = d->ShowModal (); + auto d = make_wx(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(this); + if (dialog->ShowModal() == wxID_OK) { + auto font_file = dialog->get_font(); + if (font_file) { + font->set_file(*font_file); + } + } setup (); }