From: seolhee, kim Date: Wed, 11 May 2016 08:07:08 +0000 (+0900) Subject: Update zone setup-wizard UI X-Git-Tag: submit/rmi/20160518.105607~2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61e6561baf196cc3f782f22513583c3aaf7c6d44;p=platform%2Fcore%2Fsecurity%2Fdevice-policy-manager.git Update zone setup-wizard UI Change-Id: Ie60b56b3bb30aa0cf791cee1b45d707a99a021d4 Signed-off-by: seolhee, kim --- diff --git a/tools/zone-setup-wizard/include/zone-setup.h b/tools/zone-setup-wizard/include/zone-setup.h index 1ef0bb1..33569ca 100644 --- a/tools/zone-setup-wizard/include/zone-setup.h +++ b/tools/zone-setup-wizard/include/zone-setup.h @@ -40,12 +40,8 @@ #define PACKAGE "org.tizen.zone-setup-wizard" #endif -#define SETUP_TEXT_STYLE "DEFAULT='font=Tizen:style=Regular font_size=34 color=#ffffff wrap=mixed align=center'" - -typedef enum { - WELCOME_VIEW = 0, - SETUP_COMPLETE_VIEW, -} view_num; +#define WELCOME_TEXT_STYLE "DEFAULT='font=Tizen:style=Regular font_size=34 color=#ffffff wrap=mixed align=center'" +#define SETUP_TEXT_STYLE "DEFAULT='font=Tizen:style=Regular font_size=34 color=#000000 wrap=mixed align=center'" typedef struct { char *zone_name; @@ -56,10 +52,6 @@ typedef struct { } appdata_s; void _create_base_window(appdata_s *data); -void _create_welcome_view(appdata_s *data); -void _create_zone_popup(appdata_s *data); -void _create_setup_complete_view(appdata_s *data); - int _send_zone_provision_data(const char *zone_name, const char *target_path); #endif /* __ZONE_SETUP_H__ */ diff --git a/tools/zone-setup-wizard/res/edc_resource/create-popup.edc b/tools/zone-setup-wizard/res/edc_resource/create-popup.edc deleted file mode 100644 index 423bd7a..0000000 --- a/tools/zone-setup-wizard/res/edc_resource/create-popup.edc +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Tizen Zone Setup-Wizard Layout - * - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -group { name: "create_popup_layout"; - styles { - style { name: "popup_content_style"; - base: "font=Tizen:style=Regular align=left font_size="24" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - } - parts { - part { name: "base"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - rel1 { relative: 0.0 0.0;} - rel2 { relative: 1.0 1.0;} - color: 255 255 255 255; - min: 0 200; - } - } - part { name: "processing"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - fixed: 0 1; - rel1 { relative: 0.0 0.0; to: "base"; offset: 22 0;} - rel2 { relative: 0.3 1.0; to: "base";} - align: 0.0 0.5; - } - } - part { name: "text"; - type: TEXTBLOCK; - scale: 1; - description { state: "default" 0.0; - fixed: 0 1; - rel1 { relative: 1.0 0.0; to:"processing"; offset:22 0;} - rel2 { relative: 1.0 1.0; to:"base"; offset:-22 0;} - text { style: "popup_content_style"; min: 0 1;} - color: 0 0 0 255; - align: 0.0 0.5; - } - } - } -} diff --git a/tools/zone-setup-wizard/res/edc_resource/layout.edc b/tools/zone-setup-wizard/res/edc_resource/layout.edc index e85dcfd..8c23aa4 100644 --- a/tools/zone-setup-wizard/res/edc_resource/layout.edc +++ b/tools/zone-setup-wizard/res/edc_resource/layout.edc @@ -45,7 +45,7 @@ group { name: "base_layout"; } } -group { name: "one_button_layout"; +group { name: "two_button_layout"; parts { part { name: "base"; type: RECT; @@ -56,11 +56,19 @@ group { name: "one_button_layout"; color: 255 255 255 255; } } - part { name : "button"; + part { name: "prev_button"; type: SWALLOW; scale: 1; description { state: "default" 0.0; rel1 { relative: 0.0 0.0; to: "base"; offset: 22 22;} + rel2 { relative: 0.5 1.0; to: "base"; offset: -22 -22;} + } + } + part { name: "next_button"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { relative: 1.0 0.0; to_x: "prev_button"; to_y: "base"; offset: 22 22;} rel2 { relative: 1.0 1.0; to: "base"; offset: -22 -22;} } } diff --git a/tools/zone-setup-wizard/res/edc_resource/setup-complete.edc b/tools/zone-setup-wizard/res/edc_resource/setup-complete.edc deleted file mode 100644 index 9587ea3..0000000 --- a/tools/zone-setup-wizard/res/edc_resource/setup-complete.edc +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Tizen Zone Setup-Wizard Layout - * - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -group { name: "setup_complete_layout"; - images { - image : "../images/icon.png" COMP; - } - styles { - style { name: "complete_title_style"; - base: "font=Tizen:style=Regular align=left font_size="32" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - style { name: "complete_content_style"; - base: "font=Tizen:style=Regular font_size="20" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen"; - tag: "br" "\n"; - tag: "tab" "\t"; - } - } - parts { - part { name: "base"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 0.0 0.0;} - rel2 {relative: 1.0 1.0;} - color: 246 246 246 255; - } - } - part { name: "main_title"; - type: TEXT; - scale: 1; - effect: SHADOW; - description { state: "default" 0.0; - color: 68 68 68 255; - color3: 85 88 88 255; - rel1 { relative: 0.0 0.0; to: "base"; offset: 22 150;} - rel2 { relative: 1.0 0.0; to: "base"; offset: -22 300;} - text { font: "Tizen:style=Regular"; size: "52"; align: 0.5 0.5; text: "Tizen ZONE";} - } - } - part { name: "main_image"; - type: IMAGE; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 0.0 1.0; to_x: "base"; to_y: "main_title"; offset: 0 35;} - rel2 {relative: 1.0 1.0; to_x: "base"; to_y: "main_title"; offset: 0 400;} - max: 230 230; - image.normal: "../images/icon.png"; - } - } - part { name: "sub_title_base"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 0.0 1.0; to_x: "base"; to_y: "main_image"; offset: 22 50;} - rel2 {relative: 1.0 1.0; to_x: "base"; to_y: "main_image"; offset: -22 130;} - visible: 0; - } - } - part { name: "sub_title_icon"; - type: IMAGE; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 0.0 0.0; to: "sub_title_base";} - rel2 {relative: 0.0 1.0; to: "sub_title_base"; offset: 90 0;} - image.normal: "../images/icon.png"; - } - } - part { name: "sub_title_text"; - type: TEXTBLOCK; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 1.0 0.0; to_x:"sub_title_icon"; to_y:"sub_title_base"; offset: 22 0;} - rel2 {relative: 1.0 1.0; to: "sub_title_base";} - text {style: "complete_title_style"; min: 0 1;} - color: 0 0 0 255; - } - } - part { name: "content_text"; - type: TEXTBLOCK; - scale: 1; - description { state: "default" 0.0; - rel1 {relative: 0.0 1.0; to_x: "base"; to_y: "sub_title_base"; offset: 22 20;} - rel2 {relative: 1.0 1.0; to: "base"; offset: -22 0;} - text {style: "complete_content_style"; min: 0 1; align: 0.0 0.0;} - color: 0 0 0 255; - } - } - } -} diff --git a/tools/zone-setup-wizard/res/edc_resource/setup.edc b/tools/zone-setup-wizard/res/edc_resource/setup.edc new file mode 100644 index 0000000..a087567 --- /dev/null +++ b/tools/zone-setup-wizard/res/edc_resource/setup.edc @@ -0,0 +1,79 @@ +group { name: "setup_layout"; + images { + image: "../images/icon.png" COMP; + } + parts { + part { name: "bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color: 228 228 228 255; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + } + } + part { name: "title"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 255; + rel1 { relative: 0.0 0.0; to: "bg"; offset: 22 150;} + rel2 { relative: 1.0 0.0; to: "bg"; offset: -22 300;} + text { font: "Tizen:style=Regular"; size: "48"; align: 0.5 0.5; text: "Separated Zone";} + } + } + part { name: "icon_base"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "title"; offset: 0 80;} + rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "title"; offset: 0 350;} + visible: 0; + } + } + part { name: "icon"; + type: IMAGE; + scale: 1; + description { state: "default" 0.0; + rel1 { relative: 0.0 0.0; to: "icon_base";} + rel2 { relative: 1.0 1.0; to: "icon_base";} + align: 0.5 0.0; + max: 170 170; + image.normal: "../images/icon.png"; + } + } + part { name: "progressbar_msg"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + color: 0 0 0 255; + rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "icon_base"; offset: 22 50;} + rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "icon_base"; offset: -22 150;} + text { font: "Tizen:style=Regular"; size: "30"; align: 0.5 0.5; text: "Creating Folder instance...";} + } + } + part { name: "progressbar"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "progressbar_msg"; offset: 22 22;} + rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "progressbar_msg"; offset: -22 52;} + } + } + part { name: "content_text"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "progressbar"; offset: 22 0;} + rel2 { relative: 1.0 1.0; to: "bg"; offset: -22 0;} + } + } + part { name: "bottom_pending"; + type: SPACER; + description { state: "default" 0.0; + rel1 { relative: 0.0 1.0; to: "bg"; offset: 0 -162;} + rel2 { relative: 1.0 1.0; to: "bg";} + } + } + } +} diff --git a/tools/zone-setup-wizard/res/edc_resource/welcome.edc b/tools/zone-setup-wizard/res/edc_resource/welcome.edc index 3ac9328..06e2ed4 100644 --- a/tools/zone-setup-wizard/res/edc_resource/welcome.edc +++ b/tools/zone-setup-wizard/res/edc_resource/welcome.edc @@ -38,9 +38,9 @@ group { name: "welcome_layout"; description { state: "default" 0.0; color: 255 255 255 255; color3: 85 88 88 255; - rel1 { relative: 0.0 0.0; to: "bg"; offset: 22 200;} - rel2 { relative: 1.0 0.0; to: "bg"; offset: -22 350;} - text { font: "Tizen:style=Regular"; size: "52"; align: 0.5 0.5; text: "Tizen ZONE";} + rel1 { relative: 0.0 0.0; to: "bg"; offset: 22 150;} + rel2 { relative: 1.0 0.0; to: "bg"; offset: -22 300;} + text { font: "Tizen:style=Regular"; size: "48"; align: 0.5 0.5; text: "Separated Zone";} } } part { name: "icon_base"; diff --git a/tools/zone-setup-wizard/res/org.tizen.zone-setup-wizard.edc b/tools/zone-setup-wizard/res/org.tizen.zone-setup-wizard.edc index a4487b5..54851b0 100644 --- a/tools/zone-setup-wizard/res/org.tizen.zone-setup-wizard.edc +++ b/tools/zone-setup-wizard/res/org.tizen.zone-setup-wizard.edc @@ -19,6 +19,5 @@ collections { base_scale: 1.8; #include "./edc_resource/layout.edc" #include "./edc_resource/welcome.edc" - #include "./edc_resource/create-popup.edc" - #include "./edc_resource/setup-complete.edc" + #include "./edc_resource/setup.edc" } diff --git a/tools/zone-setup-wizard/src/main.c b/tools/zone-setup-wizard/src/main.c index bde6443..d09efbb 100644 --- a/tools/zone-setup-wizard/src/main.c +++ b/tools/zone-setup-wizard/src/main.c @@ -22,7 +22,7 @@ static void __create_zone_done(const char *from, const char *info, void *user_data) { appdata_s *ad = (appdata_s *) user_data; - ad->create_done = true; + ad->create_done = true; } static bool __app_create(void *data) @@ -32,12 +32,12 @@ static bool __app_create(void *data) static void __app_pause(void *data) { - return ; + return; } static void __app_resume(void *data) { - return ; + return; } static void __app_terminate(void *data) @@ -83,7 +83,7 @@ static void __app_control(app_control_h app_control, void *data) elm_app_base_scale_set(1.8); _create_base_window(ad); - return ; + return; } int main(int argc, char *argv[]) diff --git a/tools/zone-setup-wizard/src/ui.c b/tools/zone-setup-wizard/src/ui.c index 81fdeb4..91c8e35 100644 --- a/tools/zone-setup-wizard/src/ui.c +++ b/tools/zone-setup-wizard/src/ui.c @@ -19,82 +19,62 @@ #include "zone-setup.h" #include "widget.h" -#define SETUP_TITLE "Tizen ZONE" -#define WELCOME_TEXT "Welcome
Keep your applications and content safe
with ZONE." -#define POPUP_CONTENT_TEXT "Creating Zone..." -#define COMPLETE_SUB_TEXT "The application shortcut will be created
on your personal home screen." +#define WELCOME_INFO_MESSAGE "Welcome
Use your applications separately
with SZ.
The folder will be created on your
personal home screen." +#define SETUP_INFO_MESSAGE "The folder will be created on your
presonal home screen." + +static void __create_welcome_view(appdata_s *ad); +static void __create_setup_view(appdata_s *ad); typedef struct { Evas_Object *win; Evas_Object *conform; Evas_Object *nf; - Evas_Object *popup; + Evas_Object *timer; char *edj_path; - view_num current_view; } uidata_s; uidata_s ud = {0, }; static Eina_Bool __naviframe_pop_cb(void *data, Elm_Object_Item *it) { - switch (ud.current_view) { - case WELCOME_VIEW: - ui_app_exit(); - return EINA_FALSE; - case SETUP_COMPLETE_VIEW: - ud.current_view = WELCOME_VIEW; - elm_object_signal_emit(ud.conform, "elm,state,indicator,overlap", "elm"); - return EINA_TRUE; - default: - return EINA_FALSE; - } + ui_app_exit(); + return EINA_FALSE; +} + +static void __prev_btn_cb(void *data, Evas_Object *obj, void *event_info) +{ + ui_app_exit(); + return; } static void __next_btn_cb(void *data, Evas_Object *obj, void *event_info) { appdata_s *ad = (appdata_s *)data; - switch (ud.current_view) { - case WELCOME_VIEW: - ud.current_view = SETUP_COMPLETE_VIEW; - if (_send_zone_provision_data(ad->zone_name, ad->provision_path) != 0) - ui_app_exit(); - _create_zone_popup(ad); - break; - case SETUP_COMPLETE_VIEW: + if (_send_zone_provision_data(ad->zone_name, ad->provision_path) != 0) ui_app_exit(); - break; - default: - break; - } - return ; + + __create_setup_view(ad); + return; } -static void __set_one_btn_bottom_layout(Evas_Object *layout, appdata_s *ad, const char *btn_text) +static void __set_two_btn_bottom_layout(Evas_Object *layout, appdata_s *ad, const char *prev_btn_text, const char *next_btn_text) { Evas_Object *bottom_layout; - Evas_Object *btn; - - bottom_layout = _create_layout(layout, ud.edj_path, "one_button_layout"); - - btn = _create_button(bottom_layout, btn_text, "bottom"); - elm_object_part_content_set(bottom_layout, "button", btn); - evas_object_smart_callback_add(btn, "clicked", __next_btn_cb, ad); + Evas_Object *prev_btn, *next_btn; - elm_object_part_content_set(layout, "bottom_layout", bottom_layout); - return ; -} + bottom_layout = _create_layout(layout, ud.edj_path, "two_button_layout"); -static void __popup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - appdata_s *ad = (appdata_s *)data; + prev_btn = _create_button(bottom_layout, prev_btn_text, "bottom"); + elm_object_part_content_set(bottom_layout, "prev_button", prev_btn); + evas_object_smart_callback_add(prev_btn, "clicked", __prev_btn_cb, NULL); - Evas_Object *timer = evas_object_data_get(obj, "timer"); - ecore_timer_del(timer); + next_btn = _create_button(bottom_layout, next_btn_text, "bottom"); + elm_object_part_content_set(bottom_layout, "next_button", next_btn); + evas_object_smart_callback_add(next_btn, "clicked", __next_btn_cb, ad); - eext_object_event_callback_add(ud.nf, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); - _create_setup_complete_view(ad); - return ; + elm_object_part_content_set(layout, "bottom_layout", bottom_layout); + return; } static Eina_Bool __progressbar_timer_cb(void *data) @@ -102,9 +82,8 @@ static Eina_Bool __progressbar_timer_cb(void *data) appdata_s *ad = (appdata_s *) data; if (ad->create_done) { - evas_object_data_del(ud.popup, "timer"); - evas_object_del(ud.popup); - + ecore_timer_del(ud.timer); + ui_app_exit(); return ECORE_CALLBACK_CANCEL; } @@ -119,7 +98,6 @@ void _create_base_window(appdata_s *ad) char *res_path = NULL; /* Initialize data */ - ud.current_view = WELCOME_VIEW; ad->create_done = false; /* Get EDJ path */ @@ -140,16 +118,16 @@ void _create_base_window(appdata_s *ad) elm_object_content_set(ud.conform, layout); ud.nf = elm_naviframe_add(layout); - _create_welcome_view(ad); + __create_welcome_view(ad); elm_object_part_content_set(layout, "elm.swallow.content", ud.nf); eext_object_event_callback_add(ud.nf, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); evas_object_show(ud.win); - return ; + return; } -void _create_welcome_view(appdata_s *ad) +static void __create_welcome_view(appdata_s *ad) { Elm_Object_Item *nf_it; Evas_Object *layout, *welcome_layout; @@ -162,72 +140,48 @@ void _create_welcome_view(appdata_s *ad) welcome_layout = _create_layout(layout, ud.edj_path, "welcome_layout"); text_st = evas_textblock_style_new(); - evas_textblock_style_set(text_st, SETUP_TEXT_STYLE); - text = _create_textblock(welcome_layout, WELCOME_TEXT, text_st); + evas_textblock_style_set(text_st, WELCOME_TEXT_STYLE); + text = _create_textblock(welcome_layout, WELCOME_INFO_MESSAGE, text_st); elm_object_part_content_set(welcome_layout, "content_text", text); evas_textblock_style_free(text_st); elm_object_part_content_set(layout, "content_layout", welcome_layout); - __set_one_btn_bottom_layout(layout, ad, "Set up"); + __set_two_btn_bottom_layout(layout, ad, "Cancel", "Set up"); nf_it = elm_naviframe_item_push(ud.nf, NULL, NULL, NULL, layout, NULL); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_TRUE); elm_naviframe_item_pop_cb_set(nf_it, __naviframe_pop_cb, NULL); - return ; + return; } -void _create_zone_popup(appdata_s *ad) -{ - Evas_Object *layout; - Evas_Object *popup; - Evas_Object *progressbar, *timer; - - eext_object_event_callback_del(ud.nf, EEXT_CALLBACK_BACK, eext_naviframe_back_cb); - popup = elm_popup_add(ud.win); - - elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); - evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_text_set(popup, "title,text", SETUP_TITLE); - - layout = _create_layout(popup, ud.edj_path, "create_popup_layout"); - elm_object_part_text_set(layout, "text", POPUP_CONTENT_TEXT); - - progressbar = _create_progressbar(layout, "process_large"); - elm_object_part_content_set(layout, "processing", progressbar); - elm_object_part_content_set(popup, "elm.swallow.content", layout); - - evas_object_show(popup); - ud.popup = popup; - - /* set popup timer callback*/ - timer = ecore_timer_add(0.1, __progressbar_timer_cb, ad); - evas_object_data_set(popup, "timer", timer); - evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, __popup_del_cb, ad); - - return ; -} - -void _create_setup_complete_view(appdata_s *ad) +static void __create_setup_view(appdata_s *ad) { Elm_Object_Item *nf_it; - Evas_Object *layout, *complete_layout; + Evas_Object *setup_layout; + Evas_Object *progressbar, *text; + Evas_Textblock_Style *text_st; - elm_object_signal_emit(ud.conform, "elm,state,indicator,nooverlap", "elm"); + eext_object_event_callback_del(ud.nf, EEXT_CALLBACK_BACK, eext_naviframe_back_cb); - layout = _create_layout(ud.nf, ud.edj_path, "base_layout"); + setup_layout = _create_layout(ud.nf, ud.edj_path, "setup_layout"); - complete_layout = _create_layout(layout, ud.edj_path, "setup_complete_layout"); - elm_object_part_text_set(complete_layout, "sub_title_text", SETUP_TITLE); - elm_object_part_text_set(complete_layout, "content_text", COMPLETE_SUB_TEXT); - elm_object_part_content_set(layout, "content_layout", complete_layout); + progressbar = _create_progressbar(setup_layout, "pending"); + elm_object_part_content_set(setup_layout, "progressbar", progressbar); - __set_one_btn_bottom_layout(layout, ad, "Done"); + text_st = evas_textblock_style_new(); + evas_textblock_style_set(text_st, SETUP_TEXT_STYLE); + text = _create_textblock(setup_layout, SETUP_INFO_MESSAGE, text_st); + elm_object_part_content_set(setup_layout, "content_text", text); + evas_textblock_style_free(text_st); - nf_it = elm_naviframe_item_push(ud.nf, NULL, NULL, NULL, layout, NULL); + nf_it = elm_naviframe_item_push(ud.nf, NULL, NULL, NULL, setup_layout, NULL); elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_TRUE); elm_naviframe_item_pop_cb_set(nf_it, __naviframe_pop_cb, NULL); - return ; + /* set progressbar timer callback */ + ud.timer = ecore_timer_add(0.1, __progressbar_timer_cb, ad); + + return; } diff --git a/tools/zone-setup-wizard/src/widget.c b/tools/zone-setup-wizard/src/widget.c index d70c99b..c4fc1ed 100644 --- a/tools/zone-setup-wizard/src/widget.c +++ b/tools/zone-setup-wizard/src/widget.c @@ -30,11 +30,6 @@ Evas_Object *_create_win(const char *package) elm_win_conformant_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE); - if (elm_win_wm_rotation_supported_get(win)) { - int rots[4] = { 0, 90, 180, 270 }; - elm_win_wm_rotation_available_rotations_set(win, (const int *)(&rots), 4); - } - evas_object_smart_callback_add(win, "delete,request", __win_delete_request_cb, NULL); elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_SHOW); elm_win_indicator_opacity_set(win, ELM_WIN_INDICATOR_TRANSPARENT); @@ -101,11 +96,13 @@ Evas_Object *_create_progressbar(Evas_Object *parent, const char *style) { Evas_Object *progressbar = elm_progressbar_add(parent); - elm_object_style_set(progressbar, style); + if (style != NULL) + elm_object_style_set(progressbar, style); + evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(progressbar, EINA_TRUE); - elm_progressbar_value_set(progressbar, 0.0); + elm_progressbar_pulse_set(progressbar, EINA_TRUE); evas_object_show(progressbar); return progressbar;