Fix control sensitivity in various places.

diff --git a/ChangeLog b/ChangeLog
index bda2a420c35b96d881a25b6a3a5a9e8023489010..3b637533f08616c064eaefa7966eb4fb7848c0af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-04  c.hetherington  <cth@carlh.net>
+
+       * Fix several bugs with the sensitivity
+       of controls in various circumstances.
+
 2016-07-04  Carl Hetherington  <cth@carlh.net>
 
        * Updated de_DE translation from Carsten Kurz.

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ab26329a4b878a564ecf9cd96e9eed8890f674db..ddee3157f069374d15d7f1f205ce410d6a8706d6 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -272,17 +272,19 @@ AudioPanel::setup_sensitivity ()
        if (_reference->GetValue ()) {
                _gain->wrapped()->Enable (false);
                _gain_calculate_button->Enable (false);
+               _show->Enable (true);
                _peak->Enable (false);
                _delay->wrapped()->Enable (false);
                _mapping->Enable (false);
                _description->Enable (false);
        } else {
-               _gain->wrapped()->Enable (true);
+               _gain->wrapped()->Enable (sel.size() == 1);
                _gain_calculate_button->Enable (sel.size() == 1);
-               _peak->Enable (true);
-               _delay->wrapped()->Enable (true);
+               _show->Enable (sel.size() == 1);
+               _peak->Enable (sel.size() == 1);
+               _delay->wrapped()->Enable (sel.size() == 1);
                _mapping->Enable (sel.size() == 1);
-               _description->Enable (true);
+               _description->Enable (sel.size() == 1);
        }
 }
 

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index b7878d3b3147fddd3a9c00bb43daabc5145bcbe6..fa6641cfbcf031f183915fb5c5e057b58c37e432 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -410,6 +410,7 @@ ContentPanel::set_film (shared_ptr<Film> film)
        film_changed (Film::CONTENT);
        film_changed (Film::AUDIO_CHANNELS);
        selection_changed ();
+       setup_sensitivity ();
 }
 
 void

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index e2f7dd4d82f3800f0204fb2a9f3e673598efb4b7..d82f9c028d7388af412e9956d3be68bea714b3b2 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -309,7 +309,7 @@ SubtitlePanel::setup_sensitivity ()
        _stream->Enable (!reference && ffmpeg_subs == 1);
        _subtitle_view_button->Enable (!reference && text_subs == 1);
        _fonts_dialog_button->Enable (!reference && text_subs == 1);
-       _appearance_dialog_button->Enable (!reference);
+       _appearance_dialog_button->Enable (!reference && any_subs > 0 && use);
 }
 
 void

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index e5c2ed7852813cc64980f090df2cdc5832b72ecd..01494f17bb4465a9a8144ee394b9897b22e442bc 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -468,6 +468,7 @@ TimingPanel::setup_sensitivity ()
        bool const e = !_parent->selected().empty ();
 
        _position->Enable (e);
+       _move_to_start_of_reel->Enable (e);
        _full_length->Enable (e);
        _trim_start->Enable (e);
        _trim_end->Enable (e);