Rearrange subtitle font management.

[dcpomatic.git] / src / wx / fonts_dialog.cc

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 528b3999bd036c529e90ba1bbffe7b19394fde3b..4ca338709dc3332ccb8ab3816ce28bc48cd57080 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,31 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "fonts_dialog.h"
-#include "wx_util.h"
 #include "system_font_dialog.h"
-#include "font_files_dialog.h"
-#include "lib/font.h"
+#include "wx_util.h"
 #include "lib/content.h"
-#include "lib/caption_content.h"
+#include "lib/font.h"
+#include "lib/text_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/foreach.hpp>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
+
 
 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> content)
+
+FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
        : wxDialog (parent, wxID_ANY, _("Fonts"))
        , _content (content)
+       , _caption (caption)
 {
        _fonts = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (550, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
 
@@ -51,37 +57,21 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content)
        {
                wxListItem ip;
                ip.SetId (1);
-               ip.SetText (_("Normal file"));
-               ip.SetWidth (150);
+               ip.SetText (_("File"));
+               ip.SetWidth (450);
                _fonts->InsertColumn (1, ip);
        }
 
-       {
-               wxListItem ip;
-               ip.SetId (2);
-               ip.SetText (_("Italic file"));
-               ip.SetWidth (150);
-               _fonts->InsertColumn (2, ip);
-       }
-
-       {
-               wxListItem ip;
-               ip.SetId (3);
-               ip.SetText (_("Bold file"));
-               ip.SetWidth (150);
-               _fonts->InsertColumn (3, ip);
-       }
-
-       wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto sizer = new wxBoxSizer (wxHORIZONTAL);
        sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
 
-       _edit = new wxButton (this, wxID_ANY, _("Edit..."));
+       _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());
        }
@@ -95,25 +85,27 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content)
        setup ();
 }
 
+
 void
 FontsDialog::setup ()
 {
-       shared_ptr<Content> content = _content.lock ();
-       if (!content) {
+       auto content = _content.lock ();
+       auto caption = _caption.lock ();
+       if (!content || !caption) {
                return;
        }
 
        _fonts->DeleteAllItems ();
        size_t n = 0;
-       BOOST_FOREACH (shared_ptr<Font> i, content->caption->fonts ()) {
+       for (auto i: caption->fonts ()) {
                wxListItem item;
                item.SetId (n);
                _fonts->InsertItem (item);
-               _fonts->SetItem (n, 0, std_to_wx (i->id ()));
-               for (int j = 0; j < FontFiles::VARIANTS; ++j) {
-                       if (i->file(static_cast<FontFiles::Variant>(j))) {
-                               _fonts->SetItem (n, j + 1, i->file(static_cast<FontFiles::Variant>(j)).get().leaf().string ());
-                       }
+               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());
                }
                ++n;
        }
@@ -121,12 +113,14 @@ FontsDialog::setup ()
        setup_sensitivity ();
 }
 
+
 void
 FontsDialog::selection_changed ()
 {
        setup_sensitivity ();
 }
 
+
 void
 FontsDialog::setup_sensitivity ()
 {
@@ -134,31 +128,47 @@ FontsDialog::setup_sensitivity ()
        _edit->Enable (item != -1);
 }
 
+
 void
 FontsDialog::edit_clicked ()
 {
-       shared_ptr<Content> content = _content.lock ();
-       if (!content) {
+       auto content = _content.lock ();
+       auto caption = _caption.lock ();
+       if (!content || !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> font;
-       BOOST_FOREACH (shared_ptr<Font> i, content->caption->fonts()) {
-               if (i->id() == id) {
-                       font = i;
-               }
-       }
-
+       auto const id = _fonts->GetItemData(item) ? "" : wx_to_std(_fonts->GetItemText(item, 0));
+       auto font = caption->get_font(id);
        if (!font) {
                return;
        }
 
-       FontFilesDialog* d = new FontFilesDialog (this, font->files ());
-       if (d->ShowModal () == wxID_OK) {
-               font->set_files (d->get ());
+        /* 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
+
+       auto d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf;*.ttc"), 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 ();