X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=e61055ad7f69e794d2588e86163b62ff6b25d358;hb=df79d429bf1663a0053844b7e98690d2fdfb790d;hp=de53a3c2830a83849ea1d41a1ba813d42c98baa8;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index de53a3c28..e61055ad7 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -1,42 +1,48 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington - 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. - 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 - 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 . */ + #include "fonts_dialog.h" #include "wx_util.h" #include "system_font_dialog.h" +#include "dcpomatic_button.h" #include "lib/font.h" -#include "lib/subtitle_content.h" +#include "lib/content.h" +#include "lib/text_content.h" #include -#include #include + using std::list; using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; +using namespace dcpomatic; -FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content) + +FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content, shared_ptr caption) : wxDialog (parent, wxID_ANY, _("Fonts")) , _content (content) - , _set_from_system (0) + , _caption (caption) { - _fonts = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL); + _fonts = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (550, 200), wxLC_REPORT | wxLC_SINGLE_SEL); { wxListItem ip; @@ -49,151 +55,123 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content) { wxListItem ip; ip.SetId (1); - ip.SetText (_("Font file")); - ip.SetWidth (300); + ip.SetText (_("File")); + ip.SetWidth (450); _fonts->InsertColumn (1, ip); } - wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); - sizer->Add (_fonts, 1, wxEXPAND); + auto sizer = new wxBoxSizer (wxHORIZONTAL); + sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP); - { - wxSizer* s = new wxBoxSizer (wxVERTICAL); - _set_from_file = new wxButton (this, wxID_ANY, _("Set from .ttf file...")); - s->Add (_set_from_file, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); -#ifdef DCPOMATIC_WINDOWS - _set_from_system = new wxButton (this, wxID_ANY, _("Set from system font...")); - s->Add (_set_from_system, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); -#endif - sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); - } + _edit = new Button (this, _("Edit...")); + sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + 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); - _set_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FontsDialog::set_from_file_clicked, this)); - if (_set_from_system) { - _set_from_system->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FontsDialog::set_from_system_clicked, this)); - } - _fonts->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&FontsDialog::selection_changed, this)); - _fonts->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&FontsDialog::selection_changed, this)); + _edit->Bind (wxEVT_BUTTON, boost::bind (&FontsDialog::edit_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 (); - if (!content) { + auto content = _content.lock (); + auto caption = _caption.lock (); + if (!content || !caption) { return; } _fonts->DeleteAllItems (); - list > fonts = content->fonts (); size_t n = 0; - for (list >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { + for (auto i: caption->fonts ()) { wxListItem item; item.SetId (n); _fonts->InsertItem (item); - _fonts->SetItem (n, 0, std_to_wx ((*i)->id ())); - if ((*i)->file ()) { - _fonts->SetItem (n, 1, (*i)->file().get().leaf().string ()); + _fonts->SetItem (n, 0, std_to_wx (i->id ())); + if (i->file()) { + _fonts->SetItem (n, 1, i->file()->leaf().string ()); } ++n; } - update_sensitivity (); + setup_sensitivity (); } + void -FontsDialog::set_from_file_clicked () +FontsDialog::selection_changed () { - /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using - non-Latin filenames or paths. - */ - wxString default_dir = ""; -#ifdef DCPOMATIC_LINUX - if (boost::filesystem::exists ("/usr/share/fonts/truetype")) { - default_dir = "/usr/share/fonts/truetype"; - } else { - default_dir = "/usr/share/fonts"; - } -#endif -#ifdef DCPOMATIC_OSX - default_dir = "/System/Library/Fonts"; -#endif - - wxFileDialog* d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT (""), wxT ("*.ttf"), wxFD_CHANGE_DIR); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); - return; - } - - set_selected_font_file (wx_to_std (d->GetPath ())); - d->Destroy (); + setup_sensitivity (); } + void -FontsDialog::set_from_system_clicked () +FontsDialog::setup_sensitivity () { - SystemFontDialog* d = new SystemFontDialog (this); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); - return; - } - - set_selected_font_file (d->get_font().get ()); - d->Destroy (); + int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + _edit->Enable (item != -1); } + void -FontsDialog::set_selected_font_file (boost::filesystem::path file) +FontsDialog::edit_clicked () { - shared_ptr content = _content.lock (); - if (!content) { - return; - } - - int item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) { + auto content = _content.lock (); + auto caption = _caption.lock (); + if (!content || !caption) { return; } - string id = wx_to_std (_fonts->GetItemText (item, 0)); - - BOOST_FOREACH (shared_ptr i, content->fonts ()) { + int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + auto const id = wx_to_std (_fonts->GetItemText(item, 0)); + shared_ptr font; + for (auto i: caption->fonts()) { if (i->id() == id) { - i->set_file (file); + font = i; } } - setup (); -} + if (!font) { + return; + } -void -FontsDialog::selection_changed () -{ - update_sensitivity (); -} + /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using + non-Latin filenames or paths. + */ + wxString default_dir = ""; +#ifdef DCPOMATIC_LINUX + if (boost::filesystem::exists ("/usr/share/fonts/truetype")) { + default_dir = "/usr/share/fonts/truetype"; + } else { + default_dir = "/usr/share/fonts"; + } +#endif +#ifdef DCPOMATIC_OSX + default_dir = "/System/Library/Fonts"; +#endif -void -FontsDialog::update_sensitivity () -{ - int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - _set_from_file->Enable (item != -1); - if (_set_from_system) { - _set_from_system->Enable (item != -1); + auto d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf"), wxFD_CHANGE_DIR); + int const r = d->ShowModal (); + + if (r != wxID_OK) { + d->Destroy (); + return; } + + font->set_file (wx_to_std(d->GetPath())); + d->Destroy (); + + setup (); }