X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=c295ec327f79b9b81060c02fcb9328d455f0d54d;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hp=37df8f368cc5397172c032551bc473552f95aff2;hpb=a5902c6008fd20392c7248c30bc469310122c527;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 37df8f368..c295ec327 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -1,35 +1,44 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "lib/font.h"
-#include "lib/subtitle_content.h"
 #include "fonts_dialog.h"
 #include "wx_util.h"
+#include "system_font_dialog.h"
+#include "font_files_dialog.h"
+#include "lib/font.h"
+#include "lib/content.h"
+#include "lib/text_content.h"
 #include <wx/wx.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
+using std::string;
+using std::cout;
 using boost::shared_ptr;
 
-FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
+FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content)
 	: wxDialog (parent, wxID_ANY, _("Fonts"))
+	, _content (content)
 {
-	_fonts = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+	_fonts = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (550, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
 
 	{
 		wxListItem ip;
@@ -38,25 +47,37 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
 		ip.SetWidth (100);
 		_fonts->InsertColumn (0, ip);
 	}
-	
+
 	{
 		wxListItem ip;
 		ip.SetId (1);
-		ip.SetText (_("Font file"));
-		ip.SetWidth (300);
+		ip.SetText (_("Normal file"));
+		ip.SetWidth (150);
 		_fonts->InsertColumn (1, ip);
 	}
 
-	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
-	sizer->Add (_fonts, 1, wxEXPAND);
+	{
+		wxListItem ip;
+		ip.SetId (2);
+		ip.SetText (_("Italic file"));
+		ip.SetWidth (150);
+		_fonts->InsertColumn (2, ip);
+	}
 
 	{
-		wxSizer* s = new wxBoxSizer (wxVERTICAL);
-		_edit = new wxButton (this, wxID_ANY, _("Edit..."));
-		s->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-		sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+		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..."));
+	sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
@@ -67,17 +88,78 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
 
 	SetSizerAndFit (overall_sizer);
 
-	list<shared_ptr<Font> > fonts = content->fonts ();
+	_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 ();
+}
+
+void
+FontsDialog::setup ()
+{
+	shared_ptr<Content> content = _content.lock ();
+	if (!content) {
+		return;
+	}
+
+	_fonts->DeleteAllItems ();
 	size_t n = 0;
-	for (list<shared_ptr<Font> >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+	BOOST_FOREACH (shared_ptr<Font> i, content->subtitle->fonts ()) {
 		wxListItem item;
 		item.SetId (n);
 		_fonts->InsertItem (item);
-		_fonts->SetItem (n, 0, (*i)->id.get_value_or (wx_to_std (_("[Default]"))));
-		if ((*i)->file) {
-			_fonts->SetItem (n, 1, (*i)->file.get().leaf().string ());
+		_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 ());
+			}
 		}
 		++n;
 	}
+
+	setup_sensitivity ();
 }
 
+void
+FontsDialog::selection_changed ()
+{
+	setup_sensitivity ();
+}
+
+void
+FontsDialog::setup_sensitivity ()
+{
+	int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	_edit->Enable (item != -1);
+}
+
+void
+FontsDialog::edit_clicked ()
+{
+	shared_ptr<Content> content = _content.lock ();
+	if (!content) {
+		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()) {
+		if (i->id() == id) {
+			font = i;
+		}
+	}
+
+	if (!font) {
+		return;
+	}
+
+	FontFilesDialog* d = new FontFilesDialog (this, font->files ());
+	if (d->ShowModal () == wxID_OK) {
+		font->set_files (d->get ());
+	}
+	d->Destroy ();
+
+	setup ();
+}