X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=1e137f23326955484e3378f8f302c5d8d5b5ef32;hb=2ed96cf8baea81ab3b6331ae029bfa76ef2522e1;hp=21d6f8e5ba6c46a48a57004fa625e3a584af4641;hpb=e491397c0028a80ac4a48a92007f783746553c1a;p=dcpomatic.git

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 21d6f8e5b..1e137f233 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -30,6 +30,7 @@
 #include "wx_util.h"
 #include "subtitle_view.h"
 #include "content_panel.h"
+#include "fonts_dialog.h"
 
 using std::vector;
 using std::string;
@@ -39,7 +40,8 @@ using boost::dynamic_pointer_cast;
 
 SubtitlePanel::SubtitlePanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Subtitles"))
-	, _view (0)
+	, _subtitle_view (0)
+	, _fonts_dialog (0)
 {
 	wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	_sizer->Add (grid, 0, wxALL, 8);
@@ -83,26 +85,37 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p)
 		add_label_to_sizer (s, this, _("%"), false);
 		grid->Add (s);
 	}
+
+	add_label_to_sizer (grid, this, _("Language"), true);
+	_language = new wxTextCtrl (this, wxID_ANY);
+	grid->Add (_language, 1, wxEXPAND);
 	
 	add_label_to_sizer (grid, this, _("Stream"), true);
 	_stream = new wxChoice (this, wxID_ANY);
 	grid->Add (_stream, 1, wxEXPAND);
 
-	_view_button = new wxButton (this, wxID_ANY, _("View..."));
-	grid->Add (_view_button);
+	_subtitle_view_button = new wxButton (this, wxID_ANY, _("View..."));
+	grid->Add (_subtitle_view_button);
+	grid->AddSpacer (0);
+
+	_fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
+	grid->Add (_fonts_dialog_button);
+	grid->AddSpacer (0);
 	
 	_x_offset->SetRange (-100, 100);
 	_y_offset->SetRange (-100, 100);
 	_x_scale->SetRange (10, 1000);
 	_y_scale->SetRange (10, 1000);
 
-	_use->Bind         (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this));
-	_x_offset->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
-	_y_offset->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
-	_x_scale->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this));
-	_y_scale->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this));
-	_stream->Bind      (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&SubtitlePanel::stream_changed, this));
-	_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&SubtitlePanel::view_clicked, this));
+	_use->Bind                  (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this));
+	_x_offset->Bind             (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
+	_y_offset->Bind             (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
+	_x_scale->Bind              (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this));
+	_y_scale->Bind              (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this));
+	_language->Bind             (wxEVT_COMMAND_TEXT_UPDATED,     boost::bind (&SubtitlePanel::language_changed, this));
+	_stream->Bind               (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&SubtitlePanel::stream_changed, this));
+	_subtitle_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&SubtitlePanel::subtitle_view_clicked, this));
+	_fonts_dialog_button->Bind  (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&SubtitlePanel::fonts_dialog_clicked, this));
 }
 
 void
@@ -155,6 +168,8 @@ SubtitlePanel::film_content_changed (int property)
 		checked_set (_x_scale, scs ? int (rint (scs->subtitle_x_scale() * 100)) : 100);
 	} else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) {
 		checked_set (_y_scale, scs ? int (rint (scs->subtitle_y_scale() * 100)) : 100);
+	} else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) {
+		checked_set (_language, scs ? scs->subtitle_language() : "");
 	}
 }
 
@@ -198,8 +213,10 @@ SubtitlePanel::setup_sensitivity ()
 	_y_offset->Enable (any_subs > 0 && use);
 	_x_scale->Enable (any_subs > 0 && use);
 	_y_scale->Enable (any_subs > 0 && use);
+	_language->Enable (any_subs > 0 && use);
 	_stream->Enable (ffmpeg_subs == 1);
-	_view_button->Enable (subrip_or_dcp_subs == 1);
+	_subtitle_view_button->Enable (subrip_or_dcp_subs == 1);
+	_fonts_dialog_button->Enable (subrip_or_dcp_subs == 1);
 }
 
 void
@@ -260,6 +277,15 @@ SubtitlePanel::y_scale_changed ()
 	}
 }
 
+void
+SubtitlePanel::language_changed ()
+{
+	SubtitleContentList c = _parent->selected_subtitle ();
+	for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) {
+		(*i)->set_subtitle_language (wx_to_std (_language->GetValue()));
+	}
+}
+
 void
 SubtitlePanel::content_selection_changed ()
 {
@@ -269,18 +295,20 @@ SubtitlePanel::content_selection_changed ()
 	film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
 	film_content_changed (SubtitleContentProperty::SUBTITLE_X_SCALE);
 	film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE);
+	film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE);
+	film_content_changed (SubtitleContentProperty::FONTS);
 }
 
 void
-SubtitlePanel::view_clicked ()
+SubtitlePanel::subtitle_view_clicked ()
 {
-	if (_view) {
-		_view->Destroy ();
-		_view = 0;
+	if (_subtitle_view) {
+		_subtitle_view->Destroy ();
+		_subtitle_view = 0;
 	}
 
 	SubtitleContentList c = _parent->selected_subtitle ();
-	assert (c.size() == 1);
+	DCPOMATIC_ASSERT (c.size() == 1);
 
 	shared_ptr<SubtitleDecoder> decoder;
 	
@@ -295,7 +323,22 @@ SubtitlePanel::view_clicked ()
 	}
 	
 	if (decoder) {
-		_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ());
-		_view->Show ();
+		_subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ());
+		_subtitle_view->Show ();
 	}
 }
+
+void
+SubtitlePanel::fonts_dialog_clicked ()
+{
+	if (_fonts_dialog) {
+		_fonts_dialog->Destroy ();
+		_fonts_dialog = 0;
+	}
+
+	SubtitleContentList c = _parent->selected_subtitle ();
+	DCPOMATIC_ASSERT (c.size() == 1);
+
+	_fonts_dialog = new FontsDialog (this, c.front ());
+	_fonts_dialog->Show ();
+}