josch/neo1973-germany
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add Dialer.get_evas()

Browse source 
Rename parameters from "main" to "screen_manager", as that's what the Dialer class is 



git-svn-id: http://www.neo1973-germany.de/svn@109 46df4e5c-bc4e-4628-a0fc-830ba316316d
This commit is contained in:
Abraxa 2008-08-31 04:15:56 +00:00
parent 6465961301
commit aedb86b36d
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
epydial/epydial.py
View file

@ -36,8 +36,7 @@ from pyneo.sys_support import pr_set_name
from ConfigParser import SafeConfigParser from ConfigParser import SafeConfigParser
class EdjeGroup(edje.Edje): class EdjeGroup(edje.Edje):
def __init__(self, main, group): def __init__(self, group_manager, group):
self.main = main
# Theme file name is formed as follows: # Theme file name is formed as follows:
# Last two group name parts, combined by underscore # Last two group name parts, combined by underscore
@ -49,19 +48,19 @@ class EdjeGroup(edje.Edje):
raise IOError("Edje theme file for group %s not found: %s" % (group, file_name)) raise IOError("Edje theme file for group %s not found: %s" % (group, file_name))
try: try:
edje.Edje.__init__(self, self.main.evas_canvas.evas_obj.evas, file=file_name, group=group) edje.Edje.__init__(self, group_manager.get_evas(), file=file_name, group=group)
except edje.EdjeLoadError, e: except edje.EdjeLoadError, e:
raise SystemExit("Error loading %s: %s" % (file_name, e)) raise SystemExit("Error loading %s: %s" % (file_name, e))
self.size = self.main.evas_canvas.evas_obj.evas.size self.size = group_manager.get_evas().size
class InCallScreen(EdjeGroup): class InCallScreen(EdjeGroup):
def __init__(self, main): def __init__(self, screen_manager):
EdjeGroup.__init__(self, main, INCALL_SCREEN_NAME) EdjeGroup.__init__(self, screen_manager, INCALL_SCREEN_NAME)
class MainScreen(EdjeGroup): class MainScreen(EdjeGroup):
def __init__(self, main): def __init__(self, screen_manager):
EdjeGroup.__init__(self, main, MAIN_SCREEN_NAME) EdjeGroup.__init__(self, screen_manager, MAIN_SCREEN_NAME)
self.text = [] self.text = []
dbus_ml = e_dbus.DBusEcoreMainLoop() dbus_ml = e_dbus.DBusEcoreMainLoop()
@ -186,6 +185,9 @@ class Dialer(object):
else: else:
screen.hide() screen.hide()
def get_evas(self):
return self.evas_canvas.evas_obj.evas
class EvasCanvas(object): class EvasCanvas(object):
def __init__(self, fullscreen, engine_name): def __init__(self, fullscreen, engine_name):
if engine_name == "x11": if engine_name == "x11":