[Debian-live-changes] r2222 - in dists/trunk/live-magic/livemagic: controllers views

[lamby-guest at alioth.debian.org]

Author: lamby-guest
Date: 2007-06-20 20:44:13 +0000 (Wed, 20 Jun 2007)
New Revision: 2222

Modified:
   dists/trunk/live-magic/livemagic/controllers/hooks.py
   dists/trunk/live-magic/livemagic/views/hooks.py
Log:


Modified: dists/trunk/live-magic/livemagic/controllers/hooks.py
===================================================================
--- dists/trunk/live-magic/livemagic/controllers/hooks.py	2007-06-20 18:52:27 UTC (rev 2221)
+++ dists/trunk/live-magic/livemagic/controllers/hooks.py	2007-06-20 20:44:13 UTC (rev 2222)
@@ -34,7 +34,6 @@
         hook_name = self.view.do_show_new_hook_window()
         if hook_name is not None:
             if len(hook_name) > 0 and hook_name not in self.model.hooks:
-
                 self.model.hooks[hook_name] = self._new_hook_template(hook_name)
                 self.view.set_save_enabled(True)
                 self.notify_load_hooks()
@@ -55,8 +54,7 @@
         hook_name = self.view.get_selected_hook()
         new_hook_name = self.view.do_show_rename_hook_window(hook_name)
 
-        if new_hook_name is None:
-            return
+        if new_hook_name is None: return
 
         try:
             self.model.hooks.rename(hook_name, new_hook_name)
@@ -72,9 +70,11 @@
             self.model.hooks.delete(hook_name)
             self.notify_load_hooks()
             self.view.do_clear_hook_contents()
+            self.view.do_enable_edit_hook(False)
 
     def on_hook_editor_changed(self, *_):
         if self.hook_select_triggers_change:
             self.view.set_save_enabled(True)
         hook = self.view.get_selected_hook()
-        self.model.hooks[hook] = self.view.get_hook_editor_contents()
+        if hook is not None:
+            self.model.hooks[hook] = self.view.get_hook_editor_contents()

Modified: dists/trunk/live-magic/livemagic/views/hooks.py
===================================================================
--- dists/trunk/live-magic/livemagic/views/hooks.py	2007-06-20 18:52:27 UTC (rev 2221)
+++ dists/trunk/live-magic/livemagic/views/hooks.py	2007-06-20 20:44:13 UTC (rev 2222)
@@ -134,7 +134,7 @@
         buf = self.hook_editor.get_buffer()
         return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
-    def do_enable_edit_hook(self, enabled=True):
+    def do_enable_edit_hook(self, enabled):
         self.cb.set_sensitive(enabled)
         self.hook_editor.set_sensitive(enabled)
         self['button_hook_rename'].set_sensitive(enabled)