|
 |
ecdf9b |
From fdf136b10de78b84e0ae9843e2eb8f71194ab43c Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Thu, 20 Jun 2013 19:31:06 +0200
|
|
|
ecdf9b |
Subject: [PATCH 51/51] cheese: Leave shoot button disabled when the effects
|
|
|
ecdf9b |
selector is showing
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Before this patch the shoot button would get re-enabled when changing
|
|
|
ecdf9b |
resolution (or device) at the effects selector.
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
src/cheese-window.vala | 13 ++++++++++---
|
|
|
ecdf9b |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
|
|
|
ecdf9b |
index fc38850..a1a645c 100644
|
|
|
ecdf9b |
--- a/src/cheese-window.vala
|
|
|
ecdf9b |
+++ b/src/cheese-window.vala
|
|
|
ecdf9b |
@@ -1313,13 +1313,20 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
*/
|
|
|
ecdf9b |
public void toggle_camera_actions_sensitivities (bool active)
|
|
|
ecdf9b |
{
|
|
|
ecdf9b |
- string [] actions = { "shoot", "mode", "effects" };
|
|
|
ecdf9b |
+ string [] actions = { "mode", "effects" };
|
|
|
ecdf9b |
|
|
|
ecdf9b |
- /* If inactive, hide the effects selector, stop recording, etc. */
|
|
|
ecdf9b |
- if (!active) {
|
|
|
ecdf9b |
+ if (active)
|
|
|
ecdf9b |
+ {
|
|
|
ecdf9b |
+ /* Use update_shoot_enabled, so as to not adversely enable it */
|
|
|
ecdf9b |
+ update_shoot_enabled ();
|
|
|
ecdf9b |
+ }
|
|
|
ecdf9b |
+ else
|
|
|
ecdf9b |
+ {
|
|
|
ecdf9b |
+ /* Inactive, hide the effects selector, stop recording, etc. */
|
|
|
ecdf9b |
if (is_effects_selector_active)
|
|
|
ecdf9b |
effects_toggle_button.set_active (false);
|
|
|
ecdf9b |
cancel_running_action ();
|
|
|
ecdf9b |
+ actions += "shoot";
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
|
|
|
ecdf9b |
foreach (string name in actions)
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|