From: Enlightenment S. <no-...@en...> - 2010-06-10 18:42:36
|
Log: Standardization when adding part/animation/signal When click in plus button, the button to add a part, animation or signal is the same (Add). And now the check if the name is already in use is when typing. By: Helen Fornazier <hel...@pr...> Author: sachiel Date: 2010-06-10 11:42:29 -0700 (Thu, 10 Jun 2010) New Revision: 49618 Modified: trunk/editje/editje/parts.py trunk/editje/editje/signals.py Modified: trunk/editje/editje/parts.py =================================================================== --- trunk/editje/editje/parts.py 2010-06-10 18:42:02 UTC (rev 49617) +++ trunk/editje/editje/parts.py 2010-06-10 18:42:29 UTC (rev 49618) @@ -539,6 +539,10 @@ self.action_disabled_set("default", "Add", True) name = self._part_name_entry.entry + if name in self._edit_grp.parts: + bad() + return + if not name or not self._type: incomplete() return @@ -548,10 +552,6 @@ incomplete() return - if name in self._edit_grp.parts: - bad() - return - good() def _default_name_set(self, label): Modified: trunk/editje/editje/signals.py =================================================================== --- trunk/editje/editje/signals.py 2010-06-10 18:42:02 UTC (rev 49617) +++ trunk/editje/editje/signals.py 2010-06-10 18:42:29 UTC (rev 49618) @@ -212,8 +212,8 @@ self._types_btns.show() self.action_add("default", "Cancel", self._cancel, key="Escape") - self.action_add("default", "Create", self._add, key="Return") - self.action_disabled_set("default", "Create", True) + self.action_add("default", "Add", self._add, key="Return") + self.action_disabled_set("default", "Add", True) self._new_sig_cb = new_sig_cb self._sigs_list_cb = sigs_list_cb @@ -230,25 +230,25 @@ def good(): self._sig_name_entry.status_label = "" - self.action_disabled_set("default", "Create", False) + self.action_disabled_set("default", "Add", False) def bad(): self._sig_name_entry.status_label = error_msg - self.action_disabled_set("default", "Create", True) + self.action_disabled_set("default", "Add", True) def incomplete(): self._sig_name_entry.status_label = "" - self.action_disabled_set("default", "Create", True) + self.action_disabled_set("default", "Add", True) name = self._sig_name_entry.entry + if name in self._sigs_list_cb(): + bad() + return + if not name or self._type is None: incomplete() return - if name in self._sigs_list_cb(): - bad() - return - good() def _add(self): |