summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-04-08 12:01:47 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-04-08 12:01:47 +0000
commitac1b542a2084313d93c0d26b6a7c069426ab374b (patch)
tree342837119edc2f5a12ba3cab0f2416ef58a63061
parente81ee08736a5b1c4f60b74066bca838c0e328a0f (diff)
editje: updated editje code according to latest python binding changes (git).
This is not all. I should wait for the edje edit support from python-efl. SVN revision: 84490
-rwxr-xr-xeditje-bin4
-rw-r--r--editje/about.py4
-rw-r--r--editje/editable.py2
-rw-r--r--editje/editje.py10
-rw-r--r--editje/floater.py17
5 files changed, 22 insertions, 15 deletions
diff --git a/editje-bin b/editje-bin
index 5fb0889..2853ab0 100755
--- a/editje-bin
+++ b/editje-bin
@@ -24,8 +24,8 @@ from optparse import OptionParser
24import errno 24import errno
25import logging 25import logging
26 26
27import elementary 27from efl import elementary
28import edje 28from efl import edje
29 29
30from editje.sysconfig import VERSION 30from editje.sysconfig import VERSION
31from editje.editje import Editje 31from editje.editje import Editje
diff --git a/editje/about.py b/editje/about.py
index 3788072..da2aa9c 100644
--- a/editje/about.py
+++ b/editje/about.py
@@ -15,8 +15,8 @@
15# You should have received a copy of the GNU Lesser General Public 15# You should have received a copy of the GNU Lesser General Public
16# License along with Editje. If not, see <http://www.gnu.org/licenses/>. 16# License along with Editje. If not, see <http://www.gnu.org/licenses/>.
17 17
18import evas 18from efl import evas
19import elementary 19from efl import elementary
20 20
21import sysconfig 21import sysconfig
22from floater import Wizard 22from floater import Wizard
diff --git a/editje/editable.py b/editje/editable.py
index 2a6bae7..d39a8d3 100644
--- a/editje/editable.py
+++ b/editje/editable.py
@@ -18,7 +18,7 @@
18import os 18import os
19import re 19import re
20 20
21import edje 21from import edje
22from edje.edit import EdjeEdit 22from edje.edit import EdjeEdit
23 23
24from editable_animation import EditableAnimation 24from editable_animation import EditableAnimation
diff --git a/editje/editje.py b/editje/editje.py
index cd7e10b..15a9077 100644
--- a/editje/editje.py
+++ b/editje/editje.py
@@ -19,11 +19,11 @@ import os
19import sys 19import sys
20import errno 20import errno
21 21
22import evas 22from efl import evas
23import ecore 23from efl import ecore
24import edje 24from efl import edje
25import elementary 25from efl import elementary
26import ecore 26from efl import ecore
27 27
28import sysconfig 28import sysconfig
29from about import About 29from about import About
diff --git a/editje/floater.py b/editje/floater.py
index 754eb02..cdf252d 100644
--- a/editje/floater.py
+++ b/editje/floater.py
@@ -15,10 +15,17 @@
15# You should have received a copy of the GNU Lesser General Public 15# You should have received a copy of the GNU Lesser General Public
16# License along with Editje. If not, see <http://www.gnu.org/licenses/>. 16# License along with Editje. If not, see <http://www.gnu.org/licenses/>.
17 17
18import evas 18from efl import evas
19import edje 19from efl import edje
20from elementary import Layout, Button, InnerWindow, Box, Naviframe, \ 20from efl.elementary.layout import Layout
21 Icon, Label, Notify, ELM_NOTIFY_ORIENT_TOP, Separator 21from efl.elementary.button import Button
22from efl.elementary.innerwindow import InnerWindow
23from efl.elementary.box import Box
24from efl.elementary.naviframe import Naviframe
25from efl.elementary.icon import Icon
26from efl.elementary.label import Label
27from efl.elementary.notify import Notify
28from efl.elementary.separator import Separator
22import sysconfig 29import sysconfig
23 30
24_instance = None 31_instance = None
@@ -342,7 +349,7 @@ class Wizard(InnerWindow):
342 self.__notification = None 349 self.__notification = None
343 self.__notification = Notify(self) 350 self.__notification = Notify(self)
344 self.__notification.timeout_set(2) 351 self.__notification.timeout_set(2)
345 self.__notification.orient_set(ELM_NOTIFY_ORIENT_TOP) 352 self.__notification.orient_set(elementary.ELM_NOTIFY_ORIENT_TOP)
346 353
347 bx = Box(self) 354 bx = Box(self)
348 bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) 355 bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)