From: Enlightenment S. <no-...@en...> - 2010-08-11 16:56:39
|
Log: Verifying return of state_{add,del}. By Fidencio According with the new edje_edit API Author: Fabiano Fidencio <fidencio at profusion.mobi> Author: tiago Date: 2010-08-11 09:56:32 -0700 (Wed, 11 Aug 2010) New Revision: 51013 Modified: trunk/editje/editje/details_widget_states.py trunk/editje/editje/editable.py trunk/editje/editje/editable_animation.py trunk/editje/editje/editable_part.py trunk/editje/editje/objects_data.py Modified: trunk/editje/editje/details_widget_states.py =================================================================== --- trunk/editje/editje/details_widget_states.py 2010-08-11 16:56:30 UTC (rev 51012) +++ trunk/editje/editje/details_widget_states.py 2010-08-11 16:56:32 UTC (rev 51013) @@ -107,8 +107,7 @@ if state == self._edit_grp.part.state.name: self._edit_grp.part.state.name = ("default", 0.00) - self._edit_grp.part.state_del(*state) - return True + return self._edit_grp.part.state_del(*state) def _states_added_cb(self, popup, data): new_state = self.newstate_entry.entry @@ -147,7 +146,8 @@ st_name = (state_save.name, state_save.value) if readd: - self._edit_grp.part.state_add(*st_name) + if not self._edit_grp.part.state_add(*st_name): + return state = self._edit_grp.part_get(part_name).state_get(*st_name) state_save.apply_to(state) Modified: trunk/editje/editje/editable.py =================================================================== --- trunk/editje/editje/editable.py 2010-08-11 16:56:30 UTC (rev 51012) +++ trunk/editje/editje/editable.py 2010-08-11 16:56:32 UTC (rev 51013) @@ -559,7 +559,8 @@ for p in parts: prog.target_add(p) part = self.__edje.part_get(p) - part.state_add(startname) + if not part.state_add(startname): + return False state = part.state_get(statename) state.copy_from(prevstatename) @@ -589,7 +590,8 @@ part = self.__edje.part_get(pp) if part: part.state_selected_set("default") - part.state_del(p) + if not part.state_del(p): + return False self.program_del(p) self.program_del(stopname) self.event_emit("animation.removed", name) Modified: trunk/editje/editje/editable_animation.py =================================================================== --- trunk/editje/editje/editable_animation.py 2010-08-11 16:56:30 UTC (rev 51012) +++ trunk/editje/editje/editable_animation.py 2010-08-11 16:56:32 UTC (rev 51013) @@ -207,7 +207,8 @@ st = progname + " 0.00" prog = self._edit_grp.program_get(progname) prog.target_del(part) - p.state_del(st) + if not p.state_del(st): + return del self.parts[part] self.event_emit("part.removed", part) @@ -271,7 +272,8 @@ for p in self.parts.iterkeys(): prog.target_add(p) part = self._edit_grp.part_get(p) - part.state_add(name) + if not part.state_add(name): + return state = part.state_get(statename) state.copy_from(prevstatename) @@ -331,7 +333,8 @@ statename = progname for p in self.parts.iterkeys(): part = self._edit_grp.part_get(p) - part.state_del(statename, 0.0) + if not part.state_del(statename, 0.0): + return self.timestops.pop(idx) self.event_emit("state.removed", time) Modified: trunk/editje/editje/editable_part.py =================================================================== --- trunk/editje/editje/editable_part.py 2010-08-11 16:56:30 UTC (rev 51012) +++ trunk/editje/editje/editable_part.py 2010-08-11 16:56:32 UTC (rev 51013) @@ -128,7 +128,8 @@ if not self.name: return False - self._part.state_add(name, value) + if not self._part.state_add(name, value): + return False self.event_emit("state.added", (name, value)) return True @@ -136,7 +137,9 @@ if not self.name: return False - self._part.state_del(name, value) + if not self._part.state_del(name, value): + return False + self.event_emit("state.removed", (name, value)) return True Modified: trunk/editje/editje/objects_data.py =================================================================== --- trunk/editje/editje/objects_data.py 2010-08-11 16:56:30 UTC (rev 51012) +++ trunk/editje/editje/objects_data.py 2010-08-11 16:56:32 UTC (rev 51013) @@ -117,7 +117,8 @@ for state in self["states"]: name, val = state.name, state.value if not obj.state_exist(name, val): - obj.state_add(name, val) + if not obj.state_add(name, val): + return False state.apply_to(obj.state_get(name, val)) obj.state_selected_set(*self["state"]) @@ -569,7 +570,8 @@ if not part: continue - part.state_add(state_name) + if not part.state_add(state_name): + continue state = part.state_get(state_name) if not state: |