X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=14fb368d3a31d5e09fa33c8e1507db502f821d4a;hb=00d0a99cfd1616e80efd86ec0531e5ca86a455e8;hp=d4cc270494fc61762e273fc244a6bad81b8cd8af;hpb=8547687a7202cdcc166e6b1d28d382af1a8b720c;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index d4cc27049..14fb368d3 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -19,21 +19,23 @@
 */
 
 
+#include "dcpomatic_button.h"
 #include "fonts_dialog.h"
-#include "wx_util.h"
 #include "system_font_dialog.h"
-#include "dcpomatic_button.h"
-#include "lib/font.h"
+#include "wx_util.h"
 #include "lib/content.h"
+#include "lib/font.h"
 #include "lib/text_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
+#include <memory>
 
 
 using std::list;
-using std::string;
-using std::cout;
 using std::shared_ptr;
+using std::string;
 using namespace dcpomatic;
 
 
@@ -63,8 +65,19 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
 	auto sizer = new wxBoxSizer (wxHORIZONTAL);
 	sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
 
-	_edit = new Button (this, _("Edit..."));
-	sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+	auto buttons_panel = new wxPanel(this);
+	auto buttons_sizer = new wxBoxSizer(wxVERTICAL);
+
+	_set_from_file = new Button(buttons_panel, _("Set from file..."));
+	buttons_sizer->Add (_set_from_file, 0, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+
+#ifdef DCPOMATIC_WINDOWS
+	_set_from_system_font = new Button(buttons_panel, _("Set from system font..."));
+	buttons_sizer->Add (_set_from_system_font, 0, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+#endif
+
+	buttons_panel->SetSizer(buttons_sizer);
+	sizer->Add(buttons_panel);
 
 	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
@@ -76,7 +89,10 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
 
 	SetSizerAndFit (overall_sizer);
 
-	_edit->Bind (wxEVT_BUTTON, boost::bind (&FontsDialog::edit_clicked, this));
+	_set_from_file->Bind(wxEVT_BUTTON, boost::bind(&FontsDialog::set_from_file_clicked, this));
+	if (_set_from_system_font) {
+		_set_from_system_font->Bind(wxEVT_BUTTON, boost::bind(&FontsDialog::set_from_system_font_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));
 
@@ -99,9 +115,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;
 	}
@@ -121,28 +139,31 @@ void
 FontsDialog::setup_sensitivity ()
 {
 	int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	_edit->Enable (item != -1);
+	_set_from_file->Enable (item != -1);
+	if (_set_from_system_font) {
+		_set_from_system_font->Enable (item != -1);
+	}
 }
 
 
-void
-FontsDialog::edit_clicked ()
+shared_ptr<Font>
+FontsDialog::get_selection ()
 {
-	auto content = _content.lock ();
-	auto caption = _caption.lock ();
-	if (!content || !caption) {
-		return;
+	auto caption = _caption.lock();
+	if (!caption) {
+		return {};
 	}
 
 	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));
+	return caption->get_font(id);
+}
 
+
+void
+FontsDialog::set_from_file_clicked ()
+{
+	auto font = get_selection();
 	if (!font) {
 		return;
 	}
@@ -175,3 +196,25 @@ FontsDialog::edit_clicked ()
 
 	setup ();
 }
+
+
+void
+FontsDialog::set_from_system_font_clicked()
+{
+	auto font = get_selection();
+	if (!font) {
+		return;
+	}
+
+	auto dialog = new SystemFontDialog(this);
+	auto const r = dialog->ShowModal();
+	if (r == wxID_OK) {
+		auto font_file = dialog->get_font();
+		if (font_file) {
+			font->set_file(*font_file);
+		}
+	}
+
+	dialog->Destroy();
+	setup ();
+}