X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=66f8ab0e486dfab24dde0c3f6c36c1aa49933ed9;hp=269dad6780fdb058465fff2e69f1d5f39ac24cf1;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=cbd4450197a083bf58bda510e626f73ba583cb66

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 269dad678..66f8ab0e4 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -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/caption_content.h"
+#include "lib/text_content.h"
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -33,8 +33,9 @@ using std::list;
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
-FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<CaptionContent> caption)
+FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
 	: wxDialog (parent, wxID_ANY, _("Fonts"))
 	, _content (content)
 	, _caption (caption)
@@ -52,31 +53,15 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
 	{
 		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);
@@ -100,7 +85,7 @@ void
 FontsDialog::setup ()
 {
 	shared_ptr<Content> content = _content.lock ();
-	shared_ptr<CaptionContent> caption = _caption.lock ();
+	shared_ptr<TextContent> caption = _caption.lock ();
 	if (!content || !caption) {
 		return;
 	}
@@ -112,10 +97,8 @@ FontsDialog::setup ()
 		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 ());
-			}
+		if (i->file()) {
+			_fonts->SetItem (n, 1, i->file()->leaf().string ());
 		}
 		++n;
 	}
@@ -140,7 +123,7 @@ void
 FontsDialog::edit_clicked ()
 {
 	shared_ptr<Content> content = _content.lock ();
-	shared_ptr<CaptionContent> caption = _caption.lock ();
+	shared_ptr<TextContent> caption = _caption.lock ();
 	if (!content || !caption) {
 		return;
 	}
@@ -158,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 ();