From 327391da95bf5e4359e8a0edc59ab2f45e864215 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 26 Nov 2012 11:58:04 +0000 Subject: [PATCH] new wizard page to enable tasks by default ticket #1663 SVN revision: 79701 --- config/standard/e.src | 6 +++ src/modules/Makefile_wizard.am | 3 ++ src/modules/wizard/page_180.c | 76 ++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 src/modules/wizard/page_180.c diff --git a/config/standard/e.src b/config/standard/e.src index d09c5a116..9a8de572d 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -1788,6 +1788,12 @@ group "E_Config" struct { value "delayed" uchar: 0; value "priority" int: -1000; } + group "E_Config_Module" struct { + value "name" string: "tasks"; + value "enabled" uchar: 1; + value "delayed" uchar: 0; + value "priority" int: 0; + } group "E_Config_Module" struct { value "name" string: "mixer"; value "enabled" uchar: 1; diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am index 994188e37..579cb873e 100644 --- a/src/modules/Makefile_wizard.am +++ b/src/modules/Makefile_wizard.am @@ -37,6 +37,7 @@ wizardpkg_LTLIBRARIES = wizard/module.la \ wizard/page_150.la \ wizard/page_160.la \ wizard/page_170.la \ + wizard/page_180.la \ wizard/page_200.la wizard_module_la_SOURCES = wizard/e_mod_main.h \ @@ -105,6 +106,8 @@ wizard_page_160_la_SOURCES = wizard/page_160.c wizard_page_170_la_SOURCES = wizard/page_170.c +wizard_page_180_la_SOURCES = wizard/page_180.c + wizard_page_200_la_SOURCES = wizard/page_200.c .PHONY: wizard install-wizard diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c new file mode 100644 index 000000000..2f7b10439 --- /dev/null +++ b/src/modules/wizard/page_180.c @@ -0,0 +1,76 @@ +/* Setup if we need connman? */ +#include "e.h" +#include "e_mod_main.h" + +static int do_tasks = 1; + +EAPI int +wizard_page_init(E_Wizard_Page *pg __UNUSED__) +{ + return 1; +} + +EAPI int +wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +{ + return 1; +} + +EAPI int +wizard_page_show(E_Wizard_Page *pg) +{ + Evas_Object *o, *of, *ob; + + o = e_widget_list_add(pg->evas, 1, 0); + e_wizard_title_set(_("Taskbar")); + + of = e_widget_framelist_add(pg->evas, _("Information"), 0); + + ob = e_widget_textblock_add(pg->evas); + e_widget_size_min_set(ob, 260 * e_scale, 200 * e_scale); + e_widget_textblock_markup_set + (ob, + _("A taskbar can be added to
" + "show open windows and applications." + ) + ); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_check_add(pg->evas, _("Enable Taskbar"), &(do_tasks)); + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o, of, 0, 0, 0.5); + + evas_object_show(of); + + e_wizard_page_show(o); + return 1; /* 1 == show ui, and wait for user, 0 == just continue */ +} + +EAPI int +wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +{ + return 1; +} + +EAPI int +wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +{ + E_Config_Module *em; + Eina_List *l; + + if (do_tasks) return 1; + + EINA_LIST_FOREACH(e_config->modules, l, em) + { + if (!em->name) continue; + if (strcmp(em->name, "tasks")) continue; + e_config->modules = eina_list_remove_list(e_config->modules, l); + eina_stringshare_del(em->name); + free(em); + break; + } + + return 1; +} +