vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: When tests are running show the build results first 

As soon as test results appear then show the test panel
This commit is contained in:
Andy Williams 2016-12-26 18:33:16 +00:00
parent 49b55e838e
commit 65dc251098
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/edi_consolepanel.c
View File

@ -233,6 +233,7 @@ _edi_test_line_parse_suite(const char *path)
eina_stringshare_del(_current_test_dir); eina_stringshare_del(_current_test_dir);
_current_test_dir = eina_stringshare_add(dirname(logpath)); _current_test_dir = eina_stringshare_add(dirname(logpath));
edi_testpanel_show();
file = eina_file_open(logfile, EINA_FALSE); file = eina_file_open(logfile, EINA_FALSE);
it = eina_file_map_lines(file); it = eina_file_map_lines(file);

12
src/bin/edi_consolepanel.h
View File

@ -38,8 +38,20 @@ void edi_consolepanel_add(Evas_Object *parent);
*/ */
void edi_consolepanel_show(); void edi_consolepanel_show();
/**
* Initialize a new Edi testpanel and add it to the parent panel.
*
* @param parent The panel into which the panel will be loaded.
*
* @ingroup UI
*/
void edi_testpanel_add(Evas_Object *parent); void edi_testpanel_add(Evas_Object *parent);
/**
* Show the Edi testpanel - animating on to screen if required.
*
* @ingroup UI
*/
void edi_testpanel_show(); void edi_testpanel_show();
/** /**

15
src/bin/edi_main.c
View File

@ -620,15 +620,12 @@ _tb_goto_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUS
} }
static Eina_Bool static Eina_Bool
_edi_build_prep(Evas_Object *button, Eina_Bool test) _edi_build_prep(Evas_Object *button)
{ {
elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(button), EINA_FALSE); elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(button), EINA_FALSE);
edi_consolepanel_clear(); edi_consolepanel_clear();
if (test) edi_consolepanel_show();
edi_testpanel_show();
else
edi_consolepanel_show();
if (!edi_builder_can_build()) if (!edi_builder_can_build())
{ {
@ -642,28 +639,28 @@ _edi_build_prep(Evas_Object *button, Eina_Bool test)
static void static void
_tb_build_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) _tb_build_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{ {
if (_edi_build_prep(obj, EINA_FALSE)) if (_edi_build_prep(obj))
edi_builder_build(); edi_builder_build();
} }
static void static void
_tb_test_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) _tb_test_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{ {
if (_edi_build_prep(obj, EINA_TRUE)) if (_edi_build_prep(obj))
edi_builder_test(); edi_builder_test();
} }
static void static void
_tb_run_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) _tb_run_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{ {
if (_edi_build_prep(obj, EINA_FALSE)) if (_edi_build_prep(obj))
_edi_launcher_run(&_edi_project_config->launch); _edi_launcher_run(&_edi_project_config->launch);
} }
static void static void
_tb_clean_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) _tb_clean_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{ {
if (_edi_build_prep(obj, EINA_FALSE)) if (_edi_build_prep(obj))
edi_builder_clean(); edi_builder_clean();
} }