X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=66f8ab0e486dfab24dde0c3f6c36c1aa49933ed9;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=9c03299143161c3d64783c6e6d0fdfd19ee71d6e;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 9c0329914..66f8ab0e4 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,10 +21,10 @@
 #include "fonts_dialog.h"
 #include "wx_util.h"
 #include "system_font_dialog.h"
-#include "font_files_dialog.h"
+#include "dcpomatic_button.h"
 #include "lib/font.h"
 #include "lib/content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -33,10 +33,12 @@ using std::list;
 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,31 +53,15 @@ 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);
 	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);
@@ -88,9 +74,9 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content)
 
 	SetSizerAndFit (overall_sizer);
 
-	_edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FontsDialog::edit_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 ();
 }
@@ -99,19 +85,20 @@ void
 FontsDialog::setup ()
 {
 	shared_ptr<Content> content = _content.lock ();
-	if (!content) {
+	shared_ptr<TextContent> caption = _caption.lock ();
+	if (!content || !caption) {
 		return;
 	}
 
 	_fonts->DeleteAllItems ();
 	size_t n = 0;
-	BOOST_FOREACH (shared_ptr<Font> i, content->subtitle->fonts ()) {
+	BOOST_FOREACH (shared_ptr<Font> i, caption->fonts ()) {
 		wxListItem item;
 		item.SetId (n);
 		_fonts->InsertItem (item);
 		_fonts->SetItem (n, 0, std_to_wx (i->id ()));
-		if (i->file(FontFiles::NORMAL)) {
-			_fonts->SetItem (n, 1, i->file(FontFiles::NORMAL).get().leaf().string ());
+		if (i->file()) {
+			_fonts->SetItem (n, 1, i->file()->leaf().string ());
 		}
 		++n;
 	}
@@ -136,14 +123,15 @@ void
 FontsDialog::edit_clicked ()
 {
 	shared_ptr<Content> content = _content.lock ();
-	if (!content) {
+	shared_ptr<TextContent> 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->subtitle->fonts()) {
+	BOOST_FOREACH (shared_ptr<Font> i, caption->fonts()) {
 		if (i->id() == id) {
 			font = i;
 		}
@@ -153,10 +141,30 @@ FontsDialog::edit_clicked ()
 		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
+
+	wxFileDialog* 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 ();