From 69ae35eb02481de7ba48863a00d165a579cefad7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Dec 2012 22:16:34 +0000 Subject: Try not to say 'git release' on versions built from non-git checkouts. --- src/tools/dvdomatic.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 59f3ebc3e..9d0d58662 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -350,7 +350,11 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + if (strcmp (dvdomatic_git_commit, "release") == 0) { + info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version))); + } else { + info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + } info.SetDescription (_("Free, open-source DCP generation from almost anything.")); info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); wxArrayString authors; -- cgit v1.2.3 From 81c40635c73b402e13613a614fa8b9e9c2aa703a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Dec 2012 22:20:52 +0000 Subject: Fix subtitle control sensitivity a little (#14). --- src/wx/film_editor.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index c90122aff..8cf8c5fda 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -611,9 +611,7 @@ FilmEditor::film_changed (Film::Property p) break; case Film::WITH_SUBTITLES: checked_set (_with_subtitles, _film->with_subtitles ()); - _subtitle_stream->Enable (_film->with_subtitles ()); - _subtitle_scale->Enable (_film->with_subtitles ()); - _subtitle_offset->Enable (_film->with_subtitles ()); + setup_subtitle_control_sensitivity (); _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; case Film::SUBTITLE_OFFSET: @@ -965,9 +963,9 @@ FilmEditor::setup_subtitle_control_sensitivity () } _with_subtitles->Enable (h); - _subtitle_stream->Enable (h); - _subtitle_offset->Enable (h); - _subtitle_scale->Enable (h); + _subtitle_stream->Enable (_film->with_subtitles ()); + _subtitle_offset->Enable (_film->with_subtitles ()); + _subtitle_scale->Enable (_film->with_subtitles ()); } void -- cgit v1.2.3