Try to fix the EFL CL, does not work yet

drf · Apr 26, 2009 · d6663b9 · d6663b9
1 parent f171143
commit d6663b9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/amsn2/gui/front_ends/efl/contact_list.py b/amsn2/gui/front_ends/efl/contact_list.py
@@ -4,22 +4,25 @@
 import edje
 import ecore
 import ecore.evas
-import etk
+import elementary
 
 from image import *
 
 from amsn2.core.views import StringView
 from amsn2.gui import base
 import pymsn
 
-class aMSNContactListWindow(base.aMSNContactListWindow):
+class aMSNContactListWindow(elementary.Box, base.aMSNContactListWindow):
     def __init__(self, amsn_core, parent):
         self._core = amsn_core
         self._evas = parent._evas
         self._parent = parent
         self._skin = amsn_core._skin_manager.skin
+        elementary.Box.__init__(self, parent)
         self._clwidget = aMSNContactListWidget(amsn_core, self)
-        parent.setChild(self._clwidget)
+        self._parent.resize_object_add(self)
+        self.size_hint_weight_set(1.0, 1.0)
+        self.pack_start(self._clwidget)
         self._clwidget.show()
 
     def show(self):
@@ -38,15 +41,13 @@ def myInfoUpdated(self, view):
         pass #TODO
 
 
-class aMSNContactListWidget(etk.ScrolledView, base.aMSNContactListWidget):
+class aMSNContactListWidget(elementary.Scroller, base.aMSNContactListWidget):
     def __init__(self, amsn_core, parent):
         base.aMSNContactListWidget.__init__(self, amsn_core, parent)
         self._core = amsn_core
         self._evas = parent._evas
         self._skin = parent._skin
-
-        self._etk_evas_object = etk.EvasObject()
-        etk.ScrolledView.__init__(self)
+        elementary.Scroller.__init__(self, parent)
 
         edje.frametime_set(1.0 / 30)
         try:
@@ -58,13 +59,12 @@ def __init__(self, amsn_core, parent):
 
         self.group_holder = GroupHolder(self._evas, self)
 
-        self._etk_evas_object.evas_object = self._edje
-        self.add_with_viewport(self._etk_evas_object)
 
         self._edje.part_swallow("groups", self.group_holder);
-
+        #elementary.Scroller.resize_object_add(self._edje)
+        self._edje.size_hint_weight_set(1.0, 1.0)
+        self.content_set(self._edje)
         self._edje.show()
-        self._etk_evas_object.show()
 
 
     def contactUpdated(self, contact):
@@ -83,7 +83,7 @@ def contactListUpdated(self, clview):
 
 
     def size_request_set(self, w,h):
-        self._etk_evas_object.size_request_set(w,h)
+       self.size_hint_request_set(w,h)
 
 
 class ContactHolder(evas.SmartObject):

diff --git a/amsn2/gui/front_ends/efl/efl.py b/amsn2/gui/front_ends/efl/efl.py
@@ -1,7 +1,7 @@
 from main_loop import *
 from main import *
 from login import *
-#from contact_list import *
+from contact_list import *
 from image import *
 from splash import *
 from skins import *

diff --git a/amsn2/gui/front_ends/efl/image.py b/amsn2/gui/front_ends/efl/image.py
@@ -62,7 +62,7 @@ def _loadFromFileObject(self, fileobject, pos=0, view=None, i=0):
         self._loadFromFilename(tf, pos, view, i)
 
 
-    def _loadFromSkin(self, resource_name, pos=0, view=None, i=0):
+    def _loadFromTheme(self, resource_name, pos=0, view=None, i=0):
         res = self._skin.getKey(resource_name)
         if res is not None:
             (type, value) = res

diff --git a/amsn2/gui/front_ends/efl/login.py b/amsn2/gui/front_ends/efl/login.py
@@ -54,13 +54,14 @@ def __init__(self, amsn_core, parent):
 
 
     def show(self):
+        self._parent.resize_object_add(self._edje)
         self._edje.show()
 
     def hide(self):
+        self._parent.resize_object_del(self._edje)
         self._edje.hide()
         #FIXME: those are not hidden by self._edje.hide()
         self.password.hide()
-        self.status.hide()
         self.username.hide()
         try:
             getattr(self, "signin_b")