From: ChunEon P. <he...@na...> - 2012-06-30 06:47:50
|
Will someone improve this up again? you kuuko? ------------------------------------ -Regards, Hermet- -----Original Message----- From: "Enlightenment SVN"<no-...@en...> To: <enl...@li...>; Cc: Sent: 2012-06-28 (목) 13:46:35 Subject: E SVN: kuuko trunk/editje/editje Log: editje: Make editje work again. Author: kuuko Date: 2012-06-27 21:46:34 -0700 (Wed, 27 Jun 2012) New Revision: 72971 Trac: http://trac.enlightenment.org/e/changeset/72971 Modified: trunk/editje/editje/controller.py trunk/editje/editje/desktop.py trunk/editje/editje/details.py trunk/editje/editje/details_widget_states.py trunk/editje/editje/editje.py trunk/editje/editje/fileselector.py trunk/editje/editje/prop.py Modified: trunk/editje/editje/controller.py =================================================================== --- trunk/editje/editje/controller.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/controller.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -56,6 +56,6 @@ # Theme def _theme_get(self): - return self.parent_view.theme + return self.parent_view.themeext - theme = property(_theme_get) + themeext = property(_theme_get) Modified: trunk/editje/editje/desktop.py =================================================================== --- trunk/editje/editje/desktop.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/desktop.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -183,7 +183,7 @@ #Group Handler self.group_handler = GroupResizeHandler( - self.controller.e, self.parent_view, self.theme, + self.controller.e, self.parent_view, self.themeext, self.group_resize, self.padding_update, self._operation_stack_cb) self.listener_member_push(self.group_handler) @@ -220,7 +220,7 @@ self.listener_member_push(self.highlight) def handler_args_list(): - return (self.controller.e, self.parent_view, self.theme, + return (self.controller.e, self.parent_view, self.themeext, self._inform_rel1_changed, self._inform_rel2_changed, self._operation_stack_cb) @@ -481,7 +481,7 @@ class GroupBorder(GroupListener, edje.Edje): def __init__(self, parent): self._parent = parent - edje.Edje.__init__(self, parent.evas, file=parent.theme, + edje.Edje.__init__(self, parent.evas, file=parent.themeext, group="editje/desktop/frame") GroupListener.__init__(self) @@ -539,7 +539,7 @@ class PartHighlight(PartListener, edje.Edje): def __init__(self, parent): - edje.Edje.__init__(self, parent.evas, file=parent.theme, + edje.Edje.__init__(self, parent.evas, file=parent.themeext, group="editje/desktop/highlight") PartListener.__init__(self) Modified: trunk/editje/editje/details.py =================================================================== --- trunk/editje/editje/details.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/details.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -32,7 +32,7 @@ " EditjeDetails objects.") elementary.Layout.__init__(self, parent) - self.file_set(parent.theme, group) + self.file_set(parent.themeext, group) self._edje = self.edje_get() self._parent = parent @@ -92,7 +92,7 @@ tbl.show() frm = elementary.Layout(self._parent) - frm.file_set(self._parent.theme, "subgroup") + frm.file_set(self._parent.themeext, "subgroup") frm.edje_get().part_text_set("title.label", name) frm.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) frm.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) Modified: trunk/editje/editje/details_widget_states.py =================================================================== --- trunk/editje/editje/details_widget_states.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/details_widget_states.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -51,7 +51,7 @@ if s == self._edit_grp.part.state.name: ico = Icon(self.states) ico.file_set(self.theme_file, "editje/icon/confirm") - ico.scale_set(0, 0) + ico.resizable_set(0, 0) lbl = "%s %.2f" % s self.states.item_append(lbl, None, ico, self._show_actions, s) self.states.go() Modified: trunk/editje/editje/editje.py =================================================================== --- trunk/editje/editje/editje.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/editje.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -62,8 +62,8 @@ class Editje(elementary.Window, OpenFileManager): def __init__(self, swapfile, theme="default", slave_mode=False, in_port=None): - self.theme = sysconfig.theme_file_get(theme) - elementary.theme_extension_add(self.theme) + self.themeext = sysconfig.theme_file_get(theme) + elementary.theme_extension_add(self.themeext) # external modules for m in edje.available_modules_get(): @@ -226,7 +226,7 @@ def _load_theme(self, group="main"): self.main_layout = elementary.Layout(self) - self.main_layout.file_set(self.theme, group) + self.main_layout.file_set(self.themeext, group) self.main_layout.size_hint_weight_set( evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) self.resize_object_add(self.main_layout) @@ -372,7 +372,7 @@ if self._window_blocker: return self._window_blocker = elementary.Layout(self) - self._window_blocker.file_set(self.theme, "blocker") + self._window_blocker.file_set(self.themeext, "blocker") self._window_blocker.size_hint_weight_set( evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) self.resize_object_add(self._window_blocker) @@ -837,7 +837,7 @@ item = self._modes_selector.item_add( name, "", 0, self._mode_set_cb, name) self._modes[name] = (item, toolbar, mainbar, sidebar) - item.icon_set(self.theme, icon, elementary.ELM_ICON_FILE) + item.icon_set(self.themeext, icon, elementary.ELM_ICON_FILE) self._toolbar_pager.item_simple_push(toolbar) self._mainbar_pager.item_simple_push(mainbar) self._sidebar_pager.item_simple_push(sidebar) @@ -953,7 +953,7 @@ def _parts_init(self): # Toolbar toolbar = elementary.Layout(self) - toolbar.file_set(self.theme, "toolbar.edit") + toolbar.file_set(self.themeext, "toolbar.edit") toolbar.show() edj = toolbar.edje_get() @@ -1042,7 +1042,7 @@ # Toolbar toolbar = elementary.Layout(self) - toolbar.file_set(self.theme, "toolbar.anim") + toolbar.file_set(self.themeext, "toolbar.anim") toolbar.show() self._delay = None Modified: trunk/editje/editje/fileselector.py =================================================================== --- trunk/editje/editje/fileselector.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/fileselector.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -68,8 +68,8 @@ self._nav_home.text_set("Home") ic = elementary.Icon(self) ic.standard_set("home") - ic.scale_set(0, 0) - self._nav_home.icon_set(ic) + ic.resizable_set(0, 0) + self._nav_home.content_set(ic) self._nav_home.callback_clicked_add(self._home_load) bx.pack_end(self._nav_home) self._nav_home.show() @@ -87,8 +87,8 @@ self._nav_up.text_set("Up") ic = elementary.Icon(self) ic.standard_set("arrow_up") - ic.scale_set(0, 0) - self._nav_up.icon_set(ic) + ic.resizable_set(0, 0) + self._nav_up.content_set(ic) self._nav_up.callback_clicked_add(self._parent_load) bx.pack_end(self._nav_up) self._nav_up.show() @@ -132,7 +132,7 @@ evas.EVAS_HINT_EXPAND) self._files.callback_selected_add(self._file_selected) self._files.callback_unselected_add(self._file_unselected) - self._files.callback_clicked_add(self._file_clicked) + self._files.callback_activated_add(self._file_clicked) self._right_bx.pack_end(self._files) self._files.show() @@ -253,7 +253,7 @@ if os.path.isdir(full): ic = elementary.Icon(self) ic.standard_set("folder") - ic.scale_set(0, 0) + ic.resizable_set(0, 0) it = self._directories.item_append( file, ic, None, None, full) self._ls_dir[file] = it @@ -261,7 +261,7 @@ if not filter or self._filter_call(full): ic = elementary.Icon(self) ic.standard_set("file") - ic.scale_set(0, 0) + ic.resizable_set(0, 0) it = self._files.item_append(file, ic, None, None, full) self._ls_dir[file] = it @@ -270,7 +270,9 @@ self._directories.go() def _folder_change(self, li, id): - self.path = li.selected_item_get().data_get()[0][0] + selected = li.selected_item_get() + print(selected) + self.path = selected.data_get()[0][0] def _path_change(self, en): self.path = self._nav_path.entry_get() Modified: trunk/editje/editje/prop.py =================================================================== --- trunk/editje/editje/prop.py 2012-06-28 03:37:13 UTC (rev 72970) +++ trunk/editje/editje/prop.py 2012-06-28 04:46:34 UTC (rev 72971) @@ -102,7 +102,7 @@ self._parent = parent lbl = elementary.Layout(self._parent) - lbl.file_set(self._parent.theme, "prop_label") + lbl.file_set(self._parent.themeext, "prop_label") ed = lbl.edje_get() ed.part_text_set("label", self._name.replace("_", " ") + ":") ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-svn mailing list enl...@li... https://lists.sourceforge.net/lists/listinfo/enlightenment-svn |