9b94ca029c
into gnome-3.10 but not all have been merged yet, re-add the non merged ones - Fix video recording not working - Allow changing effects while recording - Disallow changing camera settings while recording - Fix cheese misbehavior when going from 0 -> 1 or 1 -> 0 camera devices
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From 462287f28f87c5dd9f30f734132b5c6193a1daa1 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Tue, 3 Sep 2013 15:39:49 +0200
|
|
Subject: [PATCH 13/13] cheese-window: Disable effect switching buttons on
|
|
webcam error
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
src/cheese-window.vala | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
|
|
index 07cf0f4..bc2d3b7 100644
|
|
--- a/src/cheese-window.vala
|
|
+++ b/src/cheese-window.vala
|
|
@@ -1030,9 +1030,11 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
var effects_next = this.lookup_action ("effects-next") as SimpleAction;
|
|
var effects_previous = this.lookup_action ("effects-previous") as SimpleAction;
|
|
|
|
- effects_next.set_enabled (is_effects_selector_active
|
|
+ effects_next.set_enabled (!error_layer.visible
|
|
+ && is_effects_selector_active
|
|
&& current_effects_page != effects_manager.effects.length () / EFFECTS_PER_PAGE);
|
|
- effects_previous.set_enabled (is_effects_selector_active
|
|
+ effects_previous.set_enabled (!error_layer.visible
|
|
+ && is_effects_selector_active
|
|
&& current_effects_page != 0);
|
|
}
|
|
|
|
@@ -1151,6 +1153,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
public void camera_state_change_playing ()
|
|
{
|
|
show_error (null);
|
|
+ setup_effects_page_switch_sensitivity ();
|
|
|
|
Effect effect = effects_manager.get_effect (settings.get_string ("selected-effect"));
|
|
if (effect != null)
|
|
@@ -1169,6 +1172,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
{
|
|
show_error (_("There was an error playing video from the webcam"));
|
|
}
|
|
+ setup_effects_page_switch_sensitivity ();
|
|
}
|
|
|
|
/**
|
|
--
|
|
1.8.3.1
|
|
|