From 310af9cd32b42e9ad5324fb1dca9bff25ccaca96 Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <koslowski@kit.edu>
Date: Wed, 15 Jun 2016 11:25:31 -0700
Subject: grc-refactor: block state handling

---
 grc/gui/ActionHandler.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'grc/gui/ActionHandler.py')

diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 25c779b4d2..d188030c62 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -670,12 +670,14 @@ class ActionHandler:
         Actions.BLOCK_COPY.set_sensitive(bool(selected_blocks))
         Actions.BLOCK_PASTE.set_sensitive(bool(self.clipboard))
         #update enable/disable/bypass
-        can_enable = any(block.get_state() != Constants.BLOCK_ENABLED
+        can_enable = any(block.state != block.ENABLED
                          for block in selected_blocks)
-        can_disable = any(block.get_state() != Constants.BLOCK_DISABLED
+        can_disable = any(block.state != block.DISABLED
                           for block in selected_blocks)
-        can_bypass_all = all(block.can_bypass() for block in selected_blocks) \
-                         and any(not block.get_bypassed() for block in selected_blocks)
+        can_bypass_all = (
+            all(block.can_bypass() for block in selected_blocks) and
+            any(not block.get_bypassed() for block in selected_blocks)
+        )
         Actions.BLOCK_ENABLE.set_sensitive(can_enable)
         Actions.BLOCK_DISABLE.set_sensitive(can_disable)
         Actions.BLOCK_BYPASS.set_sensitive(can_bypass_all)
-- 
cgit v1.2.3