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 668d8798b000bb9105cc02ee26ae3cd71c57e3f9..4ca338709dc3332ccb8ab3816ce28bc48cd57080 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -26,10 +26,10 @@
 #include "lib/content.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 
@@ -101,9 +101,11 @@ FontsDialog::setup ()
                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;
        }
@@ -137,14 +139,8 @@ FontsDialog::edit_clicked ()
        }
 
        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> font;
-       for (auto i: 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;
        }