Removed init/shutdown calls from tests and examples

This commit is contained in:
Kai Huuhko 2015-05-04 04:03:07 +03:00
parent e37026ec17
commit 4d73872f8f
124 changed files with 35 additions and 269 deletions

View File

@ -12,8 +12,8 @@ Improvements:
* Re-added evas.SmartObject (with incompatible API compared to the earlier
incarnation) and made elm.Object inherit from it.
* Better init/shutdown management in eo/evas/ecore/elm, no more need to
manually call those functions (no harm in doing that though).
* Better init/shutdown management in all modules, no more need to
manually call those functions (no harm in doing it though).
Changes:

1
TODO
View File

@ -43,4 +43,3 @@ Elm
- video
- web
- window ?
* How are the ecore events managed? for example: ELM_EVENT_PROCESS_FOREGROUND

View File

@ -594,8 +594,5 @@ class MyWin(StandardWindow):
if __name__ == "__main__":
elm.init()
win = MyWin()
elm.run()
elm.shutdown()

View File

@ -2,14 +2,13 @@
import sys
import efl.ecore
from efl.ecore.x import init, Window, on_window_configure_add
from efl.ecore.x import Window, on_window_configure_add
from subprocess import Popen, PIPE
init()
try:
filename = sys.argv[1]
except IndexError, e:
except IndexError:
raise SystemExit("Usage: %s <filename>" % sys.argv[0])
main_window = Window(w=800, h=600)

View File

@ -1,9 +1,8 @@
#!/usr/bin/env python
import efl.ecore
from efl.ecore.x import init, Window, on_window_configure_add
from efl.ecore.x import Window, on_window_configure_add
init()
# method 1
main_window = Window(w=800, h=600)

View File

@ -224,10 +224,8 @@ def evas3d_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
evas3d_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -284,7 +284,6 @@ def access_clicked(obj, item=None):
# evas_object_show(win)
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -320,4 +319,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -143,9 +143,7 @@ def actionslider_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
actionslider_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -44,7 +44,6 @@ def bg_image_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application", size=(320,520))
win.callback_delete_request_add(lambda x: elementary.exit())
@ -76,5 +75,4 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -167,7 +167,6 @@ def box_transition_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda x: elementary.exit())
@ -203,5 +202,4 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -83,7 +83,6 @@ def bubble_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda x: elementary.exit())
@ -116,4 +115,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -52,10 +52,8 @@ def buttons_clicked(obj):
if __name__ == "__main__":
elementary.init()
buttons_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -231,7 +231,6 @@ def calendar3_clicked(obj, item=None):
win.show()
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -267,4 +266,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -82,10 +82,8 @@ def check_clicked(obj):
if __name__ == "__main__":
elementary.init()
check_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -77,10 +77,8 @@ def clock_clicked(obj):
if __name__ == "__main__":
elementary.init()
clock_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -78,9 +78,7 @@ def cnp_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
cnp_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -139,10 +139,8 @@ def colorselector_clicked(obj):
if __name__ == "__main__":
elementary.init()
colorselector_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -356,9 +356,7 @@ def config_clicked(obj, data=None):
win.show()
if __name__ == "__main__":
elementary.init()
config_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -152,7 +152,6 @@ def conformant2_clicked(obj, item=None):
win.show()
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -187,4 +186,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -77,9 +77,7 @@ def core_ecore_events_in_elm_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
core_ecore_events_in_elm_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -87,10 +87,8 @@ def core_evas_canvas_callbacks_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
core_evas_canvas_callbacks_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -151,9 +151,7 @@ def core_evas_object_callbacks_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
core_evas_object_callbacks_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -47,10 +47,8 @@ def core_evas_objects_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
core_evas_objects_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -203,7 +203,5 @@ if __name__ == "__main__":
efl_log_handler = logging.StreamHandler()
efl_log_handler.setFormatter(efl_log_form)
efl_log.addHandler(efl_log_handler)
elementary.init()
core_evas_smart_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -187,10 +187,8 @@ def ctxpopup_clicked(obj):
if __name__ == "__main__":
elementary.init()
ctxpopup_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -164,7 +164,6 @@ def cursor3_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -198,4 +197,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -60,9 +60,7 @@ def datetime_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
datetime_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -68,10 +68,8 @@ def dayselector_clicked(obj):
if __name__ == "__main__":
elementary.init()
dayselector_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -108,9 +108,7 @@ def diskselector_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
diskselector_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -577,7 +577,6 @@ def dnd_genlist_gengrid_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -613,4 +612,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -448,7 +448,6 @@ def entry_notepad_clicked(obj, item=None):
win.show()
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -484,4 +483,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -51,10 +51,8 @@ def evas_textgrid_clicked(obj, item=None):
if __name__ == "__main__":
evas.init()
elementary.init()
evas_textgrid_clicked(None)
elementary.run()
elementary.shutdown()
evas.shutdown()

View File

@ -130,7 +130,6 @@ def edje_external_video_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -166,4 +165,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -260,9 +260,7 @@ def fileselector_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
fileselector_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -85,7 +85,6 @@ def fileselector_button_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
import logging
efl_log = logging.getLogger("efl")
@ -94,4 +93,3 @@ if __name__ == "__main__":
fileselector_button_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -85,7 +85,6 @@ def fileselector_entry_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
import logging
efl_log = logging.getLogger("efl")
@ -94,4 +93,3 @@ if __name__ == "__main__":
fileselector_entry_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -212,7 +212,6 @@ def flip_interactive_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -246,4 +245,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -118,9 +118,7 @@ def flipselector_clicked(obj):
if __name__ == "__main__":
elementary.init()
flipselector_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -59,9 +59,7 @@ def floating_clicked(obj):
win.callback_delete_request_add(lambda o: elementary.exit())
if __name__ == "__main__":
elementary.init()
floating_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -554,7 +554,6 @@ def focus5_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -590,4 +589,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -59,9 +59,7 @@ def frame_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
frame_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -380,9 +380,7 @@ def gengrid_clicked(obj):
if __name__ == "__main__":
elementary.init()
gengrid_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -797,7 +797,6 @@ def genlist11_clicked(obj, item=None):
win.show()
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -839,4 +838,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -327,9 +327,7 @@ def gesture_layer_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
gesture_layer_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -77,9 +77,7 @@ def grid_clicked(obj):
if __name__ == "__main__":
elementary.init()
grid_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -121,7 +121,6 @@ def hover2_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -154,4 +153,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -94,9 +94,7 @@ def hoversel_clicked(obj):
if __name__ == "__main__":
elementary.init()
hoversel_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -168,7 +168,6 @@ def icon_standard_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -202,4 +201,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -130,7 +130,6 @@ def image2_clicked(obj, it=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320, 520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -163,4 +162,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -93,9 +93,7 @@ def index_clicked(obj):
if __name__ == "__main__":
elementary.init()
index_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -91,10 +91,8 @@ def elm_input_events_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
elm_input_events_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -29,9 +29,7 @@ def inner_window_clicked(obj):
if __name__ == "__main__":
elementary.init()
inner_window_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -148,9 +148,7 @@ def label_clicked(obj):
if __name__ == "__main__":
elementary.init()
label_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -49,9 +49,7 @@ def layout_clicked(obj):
if __name__ == "__main__":
elementary.init()
layout_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -260,7 +260,6 @@ def list3_clicked(obj, item=None):
win.show()
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -294,4 +293,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -47,10 +47,8 @@ def main_menu_clicked(obj):
if __name__ == "__main__":
elementary.init()
main_menu_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -438,9 +438,7 @@ def map_clicked(obj):
if __name__ == "__main__":
elementary.init()
map_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -169,9 +169,7 @@ def mapbuf_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
mapbuf_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -85,9 +85,7 @@ def menu_clicked(obj):
if __name__ == "__main__":
elementary.init()
menu_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -180,10 +180,8 @@ def multibuttonentry_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
multibuttonentry_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -129,9 +129,7 @@ def naviframe_clicked(obj):
if __name__ == "__main__":
elementary.init()
naviframe_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -320,9 +320,7 @@ def notify_clicked(obj=None):
if __name__ == "__main__":
elementary.init()
notify_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -94,10 +94,8 @@ def panel_clicked(obj):
if __name__ == "__main__":
elementary.init()
panel_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -60,10 +60,8 @@ def panel_scroll_clicked(obj):
if __name__ == "__main__":
elementary.init()
panel_scroll_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -47,9 +47,7 @@ def panes_clicked(obj):
if __name__ == "__main__":
elementary.init()
panes_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -62,9 +62,7 @@ def photo_clicked(obj):
if __name__ == "__main__":
elementary.init()
photo_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -152,9 +152,7 @@ def photocam_clicked(obj):
if __name__ == "__main__":
elementary.init()
photocam_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -203,9 +203,7 @@ def popup_clicked(obj):
if __name__ == "__main__":
elementary.init()
popup_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -151,9 +151,7 @@ def progressbar_clicked(obj):
if __name__ == "__main__":
elementary.init()
progressbar_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -73,9 +73,7 @@ def radio_clicked(obj):
if __name__ == "__main__":
elementary.init()
radio_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -183,9 +183,7 @@ def scroller_clicked(obj):
if __name__ == "__main__":
elementary.init()
scroller_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -94,9 +94,7 @@ def segment_control_clicked(obj):
if __name__ == "__main__":
elementary.init()
segment_control_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -58,9 +58,7 @@ def separator_clicked(obj):
if __name__ == "__main__":
elementary.init()
separator_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -245,10 +245,8 @@ def slider_clicked(obj):
rd.show()
if __name__ == "__main__":
elementary.init()
slider_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -165,9 +165,7 @@ def slideshow_clicked(obj):
if __name__ == "__main__":
elementary.init()
slideshow_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -72,9 +72,7 @@ def spinner_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
spinner_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -126,9 +126,7 @@ def store_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
store_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -80,9 +80,7 @@ def sys_notify_clicked(obj):
win.show()
if __name__ == "__main__":
elementary.init()
sys_notify_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -291,7 +291,6 @@ def table7_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -331,4 +330,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -88,10 +88,8 @@ def theme_clicked(obj, data=None):
if __name__ == "__main__":
elementary.init()
theme_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -59,9 +59,7 @@ def thumb_clicked(obj):
if __name__ == "__main__":
elementary.init()
thumb_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -205,7 +205,6 @@ def toolbar5_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -240,4 +239,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -222,9 +222,7 @@ def tooltip_clicked(obj):
if __name__ == "__main__":
elementary.init()
tooltip_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -362,7 +362,6 @@ def transit9_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
win = StandardWindow("test", "python-elementary test application",
size=(320,520))
win.callback_delete_request_add(lambda o: elementary.exit())
@ -404,4 +403,3 @@ if __name__ == "__main__":
win.show()
elementary.run()
elementary.shutdown()

View File

@ -156,7 +156,5 @@ def transit_bezier_clicked(obj, item=None):
if __name__ == "__main__":
elementary.init()
transit_bezier_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -43,9 +43,7 @@ def video_clicked(obj):
if __name__ == "__main__":
elementary.init()
video_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -146,9 +146,7 @@ def web_clicked(obj):
if __name__ == "__main__":
elementary.init()
if not elementary.need_web():
elementary.shutdown()
raise SystemExit("EFL-webkit not available!")
elementary.policy_set(elementary.ELM_POLICY_QUIT,
@ -157,4 +155,3 @@ if __name__ == "__main__":
web_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -149,10 +149,8 @@ def window_states_clicked(obj):
if __name__ == "__main__":
elementary.init()
window_states_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -39,10 +39,8 @@ def window_dialog_clicked(obj):
if __name__ == "__main__":
elementary.init()
window_dialog_clicked(None)
elementary.run()
elementary.shutdown()

View File

@ -40,4 +40,3 @@ class TestDBusBasics(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -57,4 +57,3 @@ class TestTimer(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -52,4 +52,3 @@ class TestAnimator(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -41,4 +41,3 @@ class TestPoller(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -46,4 +46,3 @@ class TestIdler(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -63,4 +63,3 @@ class TestIdleEnterer(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -62,4 +62,3 @@ class TestIdleExiter(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -37,4 +37,3 @@ class TestFdHandler(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -84,5 +84,3 @@ class TestExe(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -33,4 +33,3 @@ class TestFileDownload(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

View File

@ -82,4 +82,3 @@ class TestFileMonitor(unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2)
ecore.shutdown()

Some files were not shown because too many files have changed in this diff Show More