From 6617c76a5e8c902abab5e54c462e552f4ac285e1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 8 May 2014 07:32:36 +1000
Subject: And now purkle is it's own skang module.

---
 src/extantz/build.lua |  4 ++--
 src/extantz/extantz.c |  7 ++++---
 src/extantz/extantz.h |  1 -
 src/extantz/purkle.c  | 43 -------------------------------------------
 4 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 src/extantz/purkle.c

(limited to 'src/extantz')

diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index d15be35..1591e8a 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -18,11 +18,11 @@ LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
 libs    = libs    .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr'
 
 removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
-removeFiles(dir, {'../../extantz', 'camera.o', 'purkle.o', 'files.o', 'scenri.o', 'woMan.o'})
+removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'})
 
 runCommand('edje_cc',		dir, 'edje_cc ' .. EDJE_FLAGS .. ' extantz.edc ../../media/extantz.edj')
 runCommand('Irrlicht files',	dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c crappisspuke.cpp -o crappisspuke.o ' .. LDFLAGS)
 runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c CDemo.cpp -o CDemo.o ' .. LDFLAGS)
 runCommand(nil,			dir, 'g++ ' .. CFLAGS .. ' -ffast-math -c extantzCamera.cpp -o extantzCamera.o ' .. LDFLAGS)
 CFLAGS = CFLAGS .. ' -Wl,-export-dynamic'
-compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'purkle', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
+compileFiles('../../extantz',	dir, {'gears', 'ephysics_demo', 'camera', 'Evas_3D_demo', 'files', 'scenri', 'woMan', 'extantz'}, 'crappisspuke.o CDemo.o extantzCamera.o')
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index b8536e9..590770d 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -515,11 +515,12 @@ EAPI_MAIN int elm_main(int argc, char **argv)
   makeMainMenu(&ourGlobals);
 
 //  overlay_add(&ourGlobals);
-  woMan_add(&ourGlobals);
-  purkleAdd(&ourGlobals);
-  ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
   char *args[] = {"extantz", "-l", "test", "-foo", "COMBINED!", NULL};
   GuiLuaDo(5, args, ourGlobals.mainWindow);
+  woMan_add(&ourGlobals);
+  args[2] = "purkle";
+  GuiLuaDo(3, args, ourGlobals.mainWindow);
+  ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
 
 #if USE_PHYSICS
   world = ephysicsAdd(&ourGlobals);
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index c6e3393..684b53d 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -258,7 +258,6 @@ Eina_Bool animateCamera(Scene_Data *scene);
 
 winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
 void     filesShow(winFang *me, Evas_Smart_Cb func, void *data);
-winFang *purkleAdd(globals *ourGlobals);
 winFang *woMan_add(globals *ourGlobals);
 
 
diff --git a/src/extantz/purkle.c b/src/extantz/purkle.c
deleted file mode 100644
index 590a84e..0000000
--- a/src/extantz/purkle.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "extantz.h"
-
-
-// TODO - This is to work around a bug in Elm entry, remove it when the bug is fixed.
-//   The bug is that editable entry widgets cause the app to hang on exit.
-static void _on_entry_del(void *data, Evas_Object *obj, void *event_info)
-{
-//  winFang *me = data;
-
-  elm_entry_editable_set(obj, EINA_FALSE);
-}
-
-winFang *purkleAdd(globals *ourGlobals)
-{
-  winFang *me;
-  Widget  *wid;
-  Evas_Object *en;
-
-  me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "purkle");
-
-  en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win,
-    elm_obj_entry_scrollable_set(EINA_TRUE),
-    elm_obj_entry_editable_set(EINA_FALSE),
-    evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-    evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
-    evas_obj_visibility_set(EINA_TRUE)
-       );
-  elm_object_text_set(en, "History is shown here");
-  elm_box_pack_end(me->box, en);
-  eo_unref(en);
-
-  wid = widgetAdd(me, ELM_OBJ_ENTRY_CLASS, me->win, "");
-  wid->on_del = _on_entry_del;
-  eo_do(wid->obj,
-    elm_obj_entry_scrollable_set(EINA_TRUE),
-    elm_obj_entry_editable_set(EINA_TRUE)
-       );
-  elm_box_pack_end(me->box, wid->obj);
-
-  evas_object_show(me->box);
-
-  return me;
-}
-- 
cgit v1.1