diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-05 15:23:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-05 15:23:17 +0000 |
| commit | 62df6543cdeaa945afb4e0ea182da06102bea4ef (patch) | |
| tree | fb24011ae391f52f03a078236326c110d8d580d4 | |
| parent | f3145f04ac18d161551f2eb3348f16e55a6e9b5c (diff) | |
GUI tweaks.
| -rw-r--r-- | src/wx/dci_name_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 10 | ||||
| -rw-r--r-- | src/wx/film_editor.h | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/wx/dci_name_dialog.cc b/src/wx/dci_name_dialog.cc index bb6c25807..6927d6c9e 100644 --- a/src/wx/dci_name_dialog.cc +++ b/src/wx/dci_name_dialog.cc @@ -43,7 +43,7 @@ DCINameDialog::DCINameDialog (wxWindow* parent, shared_ptr<Film> film) _territory = new wxTextCtrl (this, wxID_ANY); table->Add (_territory, 1, wxEXPAND); - add_label_to_sizer (table, this, "Rating (e.g. 15"); + add_label_to_sizer (table, this, "Rating (e.g. 15)"); _rating = new wxTextCtrl (this, wxID_ANY); table->Add (_rating, 1, wxEXPAND); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index e2a31d8d4..703059780 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -57,6 +57,7 @@ using boost::shared_ptr; FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent) : wxPanel (parent) , _film (f) + , _generally_sensitive (true) { _sizer = new wxFlexGridSizer (2, 4, 4); SetSizer (_sizer); @@ -506,6 +507,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 ()); _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); @@ -612,6 +614,8 @@ FilmEditor::set_film (shared_ptr<Film> f) void FilmEditor::set_things_sensitive (bool s) { + _generally_sensitive = s; + _name->Enable (s); _use_dci_name->Enable (s); _edit_dci_button->Enable (s); @@ -812,7 +816,11 @@ FilmEditor::with_subtitles_toggled (wxCommandEvent &) void FilmEditor::setup_subtitle_control_sensitivity () { - bool const h = _film ? _film->has_subtitles() : false; + bool h = false; + if (_generally_sensitive && _film) { + h = _film->has_subtitles(); + } + _with_subtitles->Enable (h); _subtitle_stream->Enable (h); _subtitle_offset->Enable (h); diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 778988a0f..c5fe4b6cc 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -147,4 +147,6 @@ private: std::vector<Format const *> _formats; wxSizer* _sizer; + + bool _generally_sensitive; }; |