X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_view.cc;h=916f1eedcdf39ea1afedba5b0ceca5a0399e25f9;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=dc41db2fa51e82fd49ac5ba9c2165f7149174301;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index dc41db2fa..916f1eedc 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -17,10 +17,10 @@
 
 */
 
-#include "lib/subrip_decoder.h"
+#include "lib/text_subtitle_decoder.h"
 #include "lib/content_subtitle.h"
 #include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "subtitle_view.h"
 #include "wx_util.h"
 
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<SubtitleDecoder> decoder, DCPTime position)
-	: wxDialog (parent, wxID_ANY, _("Subtitles"))
+	: wxDialog (parent, wxID_ANY, _("Subtitles"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
 	_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL);
 
@@ -47,7 +47,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 		ip.SetText (_("End"));
 		ip.SetWidth (100);
 		_list->InsertColumn (1, ip);
-	}		
+	}
 
 	{
 		wxListItem ip;
@@ -58,14 +58,14 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 	}
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	sizer->Add (_list, 1, wxEXPAND);
+	sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
 		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true);
+	list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true, true);
 	FrameRateChange const frc = film->active_frame_rate_change (position);
 	int n = 0;
 	for (list<ContentTextSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
@@ -83,4 +83,3 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 
 	SetSizerAndFit (sizer);
 }
-