summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-04 09:32:44 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-04 09:32:44 +0100
commitea50f871993b76f733d5deb86a6004dc6bda3f0e (patch)
tree403ab42df3e8db00464b016cbda4603a3cc612e2
parent3953d71258bb187413ed7447298bc6eec642b439 (diff)
Fix control sensitivity in various places.
-rw-r--r--ChangeLog5
-rw-r--r--src/wx/audio_panel.cc10
-rw-r--r--src/wx/content_panel.cc1
-rw-r--r--src/wx/subtitle_panel.cc2
-rw-r--r--src/wx/timing_panel.cc1
5 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bda2a420c..3b637533f 100644
--- 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 ab26329a4..ddee3157f 100644
--- 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 b7878d3b3..fa6641cfb 100644
--- 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 e2f7dd4d8..d82f9c028 100644
--- 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 e5c2ed785..01494f17b 100644
--- 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);