1 files changed, 27 insertions, 10 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index b2b3a76386..d864db7e16 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -106,7 +106,8 @@ class Action(gtk.Action, _ActionBase):
     Pass additional arguments such as keypresses.
     """
 
-    def __init__(self, keypresses=(), name=None, label=None, tooltip=None, stock_id=None):
+    def __init__(self, keypresses=(), name=None, label=None, tooltip=None,
+                 stock_id=None):
         """
         Create a new Action instance.
 
@@ -129,7 +130,8 @@ class ToggleAction(gtk.ToggleAction, _ActionBase):
     Pass additional arguments such as keypresses.
     """
 
-    def __init__(self, keypresses=(), name=None, label=None, tooltip=None, stock_id=None, preference_name=None):
+    def __init__(self, keypresses=(), name=None, label=None, tooltip=None,
+                 stock_id=None, preference_name=None, default=True):
         """
         Create a new ToggleAction instance.
 
@@ -137,22 +139,24 @@ class ToggleAction(gtk.ToggleAction, _ActionBase):
             key_presses: a tuple of (keyval1, mod_mask1, keyval2, mod_mask2, ...)
             the: regular gtk.Action parameters (defaults to None)
         """
-        if name is None: name = label
+        if name is None:
+            name = label
         gtk.ToggleAction.__init__(self,
-            name=name, label=label,
-            tooltip=tooltip, stock_id=stock_id,
+            name=name, label=label, tooltip=tooltip, stock_id=stock_id,
         )
-        #register this action
         _ActionBase.__init__(self, label, keypresses)
         self.preference_name = preference_name
+        self.default = default
 
     def load_from_preferences(self):
         if self.preference_name is not None:
-            self.set_active(Preferences.bool_entry(self.preference_name))
+            self.set_active(Preferences.bool_entry(self.preference_name,
+                                                   default=self.default))
 
     def save_to_preferences(self):
         if self.preference_name is not None:
-            Preferences.bool_entry(self.preference_name, self.get_active())
+            Preferences.bool_entry(self.preference_name,
+                                   value=self.get_active())
 
 ########################################################################
 # Actions
@@ -247,6 +251,12 @@ BLOCK_DISABLE = Action(
     stock_id=gtk.STOCK_DISCONNECT,
     keypresses=(gtk.keysyms.d, NO_MODS_MASK),
 )
+BLOCK_BYPASS = Action(
+    label='_Bypass',
+    tooltip='Bypass the selected block',
+    stock_id=gtk.STOCK_MEDIA_FORWARD,
+    keypresses=(gtk.keysyms.b, NO_MODS_MASK),
+)
 TOGGLE_SNAP_TO_GRID = ToggleAction(
     label='_Snap to grid',
     tooltip='Snap blocks to a grid for an easier connection alignment',
@@ -268,6 +278,13 @@ TOGGLE_SHOW_BLOCK_COMMENTS = ToggleAction(
     tooltip="Show comment beneath each block",
     preference_name='show_block_comments'
 )
+TOGGLE_SHOW_CODE_PREVIEW_TAB = ToggleAction(
+    label='Generated Code Preview',
+    tooltip="Show a preview of the code generated for each Block in its "
+            "Properties Dialog",
+    preference_name='show_generated_code_tab',
+    default=False,
+)
 BLOCK_CREATE_HIER = Action(
     label='C_reate Hier',
     tooltip='Create hier block from selected blocks',
@@ -298,13 +315,13 @@ ERRORS_WINDOW_DISPLAY = Action(
     stock_id=gtk.STOCK_DIALOG_ERROR,
 )
 TOGGLE_REPORTS_WINDOW = ToggleAction(
-    label='Show _Reports',
+    label='Show _Reports Panel',
     tooltip='Toggle visibility of the Report widget',
     keypresses=(gtk.keysyms.r, gtk.gdk.CONTROL_MASK),
     preference_name='reports_window_visible'
 )
 TOGGLE_BLOCKS_WINDOW = ToggleAction(
-    label='Show _Block Tree',
+    label='Show _Block Tree Panel',
     tooltip='Toggle visibility of the block tree widget',
     keypresses=(gtk.keysyms.b, gtk.gdk.CONTROL_MASK),
     preference_name='blocks_window_visible'