From: Enlightenment S. <no-...@en...> - 2010-02-02 20:48:23
|
Log: Fix update after part rename Author: tiago Date: 2010-02-02 12:48:14 -0800 (Tue, 02 Feb 2010) New Revision: 45819 Modified: trunk/editje/editje/details_state.py trunk/editje/editje/editable.py trunk/editje/editje/editje.py Modified: trunk/editje/editje/details_state.py =================================================================== --- trunk/editje/editje/details_state.py 2010-02-02 20:09:17 UTC (rev 45818) +++ trunk/editje/editje/details_state.py 2010-02-02 20:48:14 UTC (rev 45819) @@ -98,6 +98,12 @@ self.edje_get().signal_emit("cl,option,enable", "editje") + self.e.callback_add("group.changed", + self._edje_load) + self.e.part.callback_add("part.changed", + self._part_update) + self.e.part.callback_add("part.renamed", + self._part_update) self.e.part.state.callback_add("state.changed", self._state_changed_cb) self.e.part.state.callback_add("rel1x.changed", @@ -228,15 +234,15 @@ popup.on_changed_size_hints_del(self._state_popup_place) popup.close() - def editable_set(self, obj): - self.editable = obj + def _edje_load(self, emissor, data): + self.editable = self.e.edje - def active_part_set(self, part): - self.part = part - state = part.state_selected_get() + def _part_update(self, emissor, data): + self.part = self.e.part._part + state = self.part.state_selected_get() if self._animmode: - self._header_table["name"].value = part.name - self._header_table["type"].value = self._part_type_to_text(part.type) + self._header_table["name"].value = self.part.name + self._header_table["type"].value = self._part_type_to_text(self.part.type) else: if state == "(null) 0.00": state = "default 0.00" @@ -245,7 +251,7 @@ # print st # self.state_prop[1].item_add(st) self._header_table["state"].value = state - self.state = part.state_get(state) + self.state = self.part.state_get(state) self._update() self.open() Modified: trunk/editje/editje/editable.py =================================================================== --- trunk/editje/editje/editable.py 2010-02-02 20:09:17 UTC (rev 45818) +++ trunk/editje/editje/editable.py 2010-02-02 20:48:14 UTC (rev 45819) @@ -35,6 +35,10 @@ self._group = "" self._edje = None + self.animation = EditableAnimation(self) + self.part = EditablePart(self) + self.signal = EditableProgram(self) + self._min_max_init() self._modification_init() self._parts_init() @@ -42,10 +46,6 @@ self._animations_init() self._signals_init() - self.animation = EditableAnimation(self) - self.part = EditablePart(self) - self.signal = EditableProgram(self) - # Edje def _edje_get(self): return self._edje @@ -228,6 +228,8 @@ self.callback_add("group.changed", self._parts_reload_cb) self.callback_add("part.added", self._parts_reload_cb) self.callback_add("part.removed", self._parts_reload_cb) + self.callback_add("part.removed", self._parts_reload_cb) + self.part.callback_add("name.changed", self._parts_reload_cb) def _parts_reload_cb(self, emissor, data): self.parts = self._edje.parts Modified: trunk/editje/editje/editje.py =================================================================== --- trunk/editje/editje/editje.py 2010-02-02 20:09:17 UTC (rev 45818) +++ trunk/editje/editje/editje.py 2010-02-02 20:48:14 UTC (rev 45819) @@ -70,7 +70,6 @@ self._toolbar_static_init() self._desktop_init() self._modes_init() - self._hacks_init() self.select_group() @@ -533,21 +532,3 @@ self._mode_add("Signals", "editje/icon/signal", toolbar, mainbar, sidebar) - - # HACKS - def _hacks_init(self): - self.e.callback_add("group.changed", - self._group_changed_cb) - self.e.part.callback_add("part.changed", - self._part_selected_cb) - - def _group_changed_cb(self, emissor, data): - self.editable = self.e.edje - - self.part_state_details.editable_set(self.editable) - self.anim_state_details.editable_set(self.editable) - - def _part_selected_cb(self, emissor, name): - part = self.editable.part_get(name) - self.part_state_details.active_part_set(part) - self.anim_state_details.active_part_set(part) |