X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Ftext_panel.cc;h=2121ba388254d6a6b9a61dc1220ded90274b5ab0;hb=e8582393bd1367fff36bae8e053d799073d8b2ed;hp=31881806f306ef07d7abef4f6b3dd193250cb50f;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 31881806f..2121ba388 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -28,6 +28,7 @@
 #include "subtitle_appearance_dialog.h"
 #include "static_text.h"
 #include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/string_text_file_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
@@ -87,7 +88,7 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 	_x_scale_label = create_label (this, _("X"), true);
 	_x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
 	_x_scale_pc_label = new StaticText (this, _("%"));
-	_y_scale_label = create_label (this, _("Y"), true);
+	_y_scale_label = create_label (this, S_("Coord|Y"), true);
 	_y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
 	_y_scale_pc_label = new StaticText (this, _("%"));
 
@@ -104,9 +105,9 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 	_stream_label = create_label (this, _("Stream"), true);
 	_stream = new wxChoice (this, wxID_ANY);
 
-	_text_view_button = new wxButton (this, wxID_ANY, _("View..."));
-	_fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
-	_appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance..."));
+	_text_view_button = new Button (this, _("View..."));
+	_fonts_dialog_button = new Button (this, _("Fonts..."));
+	_appearance_dialog_button = new Button (this, _("Appearance..."));
 
 	_x_offset->SetRange (-100, 100);
 	_y_offset->SetRange (-100, 100);
@@ -254,7 +255,12 @@ TextPanel::update_dcp_tracks ()
 {
 	_dcp_track->Clear ();
 	BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
-		_dcp_track->Append (std_to_wx(i.summary()));
+		/* XXX: don't display the "magic" track which has empty name and language;
+		   this is a nasty hack (see also Film::closed_caption_tracks)
+		*/
+		if (!i.name.empty() || !i.language.empty()) {
+			_dcp_track->Append (std_to_wx(i.summary()));
+		}
 	}
 
 	if (_parent->film()->closed_caption_tracks().size() < 6) {
@@ -299,7 +305,7 @@ TextPanel::dcp_track_changed ()
 void
 TextPanel::film_changed (Film::Property property)
 {
-	if (property == Film::CONTENT || property == Film::REEL_TYPE) {
+	if (property == Film::CONTENT || property == Film::REEL_TYPE || property == Film::INTEROP) {
 		setup_sensitivity ();
 	}
 }
@@ -432,7 +438,10 @@ void
 TextPanel::setup_sensitivity ()
 {
 	int any_subs = 0;
+	/* We currently assume that FFmpeg subtitles are bitmapped */
 	int ffmpeg_subs = 0;
+	/* DCP subs can't have their line spacing changed */
+	int dcp_subs = 0;
 	ContentList sel = _parent->selected_text ();
 	BOOST_FOREACH (shared_ptr<Content> i, sel) {
 		/* These are the content types that could include subtitles */
@@ -445,7 +454,10 @@ TextPanel::setup_sensitivity ()
 				++ffmpeg_subs;
 				++any_subs;
 			}
-		} else if (sc || dc || dsc) {
+		} else if (dc || dsc) {
+			++dcp_subs;
+			++any_subs;
+		} else if (sc) {
 			/* XXX: in the future there could be bitmap subs from DCPs */
 			++any_subs;
 		}
@@ -466,6 +478,26 @@ TextPanel::setup_sensitivity ()
 
 	TextType const type = current_type ();
 
+	/* Set up _type */
+	_type->Clear ();
+	_type->Append (_("open subtitles"));
+	if (ffmpeg_subs == 0) {
+		_type->Append (_("closed captions"));
+	}
+
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		_type->SetSelection (0);
+		break;
+	case TEXT_CLOSED_CAPTION:
+		if (_type->GetCount() > 1) {
+			_type->SetSelection (1);
+		}
+		break;
+	default:
+		break;
+	}
+
 	/* Set up sensitivity */
 	_use->Enable (!reference && any_subs > 0);
 	bool const use = _use->GetValue ();
@@ -475,12 +507,14 @@ TextPanel::setup_sensitivity ()
 	_y_offset->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_x_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_y_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
-	_line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE);
+	/* DCP subs ignore the line spacing setting */
+	_line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE && dcp_subs < any_subs);
 	_dcp_track->Enable (!reference && any_subs > 0 && use && type == TEXT_CLOSED_CAPTION);
 	_language->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 	_stream->Enable (!reference && ffmpeg_subs == 1);
-	_text_view_button->Enable (!reference);
-	_fonts_dialog_button->Enable (!reference && type == TEXT_OPEN_SUBTITLE);
+	/* Ideally we would check here to see if the FFmpeg content has "string" subs (i.e. not bitmaps) */
+	_text_view_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0);
+	_fonts_dialog_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0 && type == TEXT_OPEN_SUBTITLE);
 	_appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
 }