X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=9c03299143161c3d64783c6e6d0fdfd19ee71d6e;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=99d570263c12a88dcccb486a3fea70e23890b5a6;hpb=5f2a57d1c21c3e8067dfd1f68505b1bf96e1d7c7;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 99d570263..9c0329914 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -1,37 +1,44 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2016 Carl Hetherington - 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 . */ -#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/subtitle_content.h" #include +#include +#include using std::list; using std::string; +using std::cout; using boost::shared_ptr; -FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content) +FontsDialog::FontsDialog (wxWindow* parent, shared_ptr 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; @@ -40,25 +47,37 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr 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); - _set_file = new wxButton (this, wxID_ANY, _("Set file...")); - s->Add (_set_file, 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); @@ -69,7 +88,9 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content) SetSizerAndFit (overall_sizer); - _set_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FontsDialog::set_file_clicked, this)); + _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)); setup (); } @@ -77,59 +98,65 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content) void FontsDialog::setup () { - shared_ptr content = _content.lock (); + shared_ptr content = _content.lock (); if (!content) { return; } - + _fonts->DeleteAllItems (); - list > fonts = content->fonts (); size_t n = 0; - for (list >::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { + BOOST_FOREACH (shared_ptr i, content->subtitle->fonts ()) { wxListItem item; item.SetId (n); _fonts->InsertItem (item); - _fonts->SetItem (n, 0, std_to_wx ((*i)->id)); - if ((*i)->file) { - _fonts->SetItem (n, 1, (*i)->file.get().leaf().string ()); + _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 ()); } ++n; } + + setup_sensitivity (); +} + +void +FontsDialog::selection_changed () +{ + setup_sensitivity (); } void -FontsDialog::set_file_clicked () +FontsDialog::setup_sensitivity () { - shared_ptr content = _content.lock (); + int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + _edit->Enable (item != -1); +} + +void +FontsDialog::edit_clicked () +{ + shared_ptr content = _content.lock (); if (!content) { return; } - int item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item == -1) { - 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; + BOOST_FOREACH (shared_ptr i, content->subtitle->fonts()) { + if (i->id() == id) { + font = i; + } } - - /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using - non-Latin filenames or paths. - */ - wxFileDialog* d = new wxFileDialog (this, _("Choose a font file"), wxT (""), wxT (""), wxT ("*.ttf"), wxFD_CHANGE_DIR); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); + + if (!font) { return; } - string id = wx_to_std (_fonts->GetItemText (item, 0)); - - list > fonts = content->fonts (); - for (list >::iterator i = fonts.begin(); i != fonts.end(); ++i) { - if ((*i)->id == id) { - (*i)->file = wx_to_std (d->GetPath ()); - } + FontFilesDialog* d = new FontFilesDialog (this, font->files ()); + if (d->ShowModal () == wxID_OK) { + font->set_files (d->get ()); } - d->Destroy (); setup ();