X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=sources%2Fwifi-syspopup%2Fviewer-popups%2Fview-alerts.c;h=557b48c2bd490cadaa96e5cd0542dbf3fe95f0db;hb=HEAD;hp=30b8c2384d455879d100b4a9dbe34db64a806fef;hpb=7da017e0638268104769753f2ba7d2e49a09f08b;p=apps%2Fhome%2Fug-wifi-efl.git
diff --git a/sources/wifi-syspopup/viewer-popups/view-alerts.c b/sources/wifi-syspopup/viewer-popups/view-alerts.c
index 30b8c23..557b48c 100644
--- a/sources/wifi-syspopup/viewer-popups/view-alerts.c
+++ b/sources/wifi-syspopup/viewer-popups/view-alerts.c
@@ -1,59 +1,57 @@
/*
- * Copyright 2012 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.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.tizenopensource.org/license
- *
- * 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.
- */
+* Wi-Fi syspopup
+*
+* Copyright 2012 Samsung Electronics Co., Ltd
+
+* Licensed under the Flora License, Version 1.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.tizenopensource.org/license
+
+* 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.
+*
+*/
#include "common.h"
+#include "common_utils.h"
#include "wifi-syspopup.h"
#include "view-alerts.h"
#include "i18nmanager.h"
-extern wifi_object* app_state;
-
-static void _timeout_cb(void *data, Evas_Object *obj, void *event_info)
-{
- if (obj)
- evas_object_del(obj);
-}
+extern wifi_object* syspopup_app_state;
int view_alerts_powering_on_show(void)
{
__COMMON_FUNC_ENTER__;
- if(WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == app_state->wifi_syspopup_support){
+ if(WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == syspopup_app_state->wifi_syspopup_support){
__COMMON_FUNC_EXIT__;
return TRUE;
}
- if(NULL != app_state->alertpopup) {
- evas_object_del(app_state->alertpopup);
- app_state->alertpopup = NULL;
+ if(NULL != syspopup_app_state->alertpopup) {
+ evas_object_del(syspopup_app_state->alertpopup);
+ syspopup_app_state->alertpopup = NULL;
}
Evas_Object *conformant = NULL;
- conformant = elm_conformant_add(app_state->win_main);
- elm_win_conformant_set(app_state->win_main, EINA_TRUE);
- elm_win_resize_object_add(app_state->win_main, conformant);
+ conformant = elm_conformant_add(syspopup_app_state->win_main);
+ elm_win_conformant_set(syspopup_app_state->win_main, EINA_TRUE);
+ elm_win_resize_object_add(syspopup_app_state->win_main, conformant);
evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(conformant, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(conformant);
Evas_Object *content = elm_layout_add(conformant);
elm_object_content_set(conformant, content);
- app_state->alertpopup = elm_popup_add(content);
+ syspopup_app_state->alertpopup = elm_popup_add(content);
- Evas_Object *box = elm_box_add(app_state->alertpopup);
+ Evas_Object *box = elm_box_add(syspopup_app_state->alertpopup);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(box);
@@ -74,94 +72,53 @@ int view_alerts_powering_on_show(void)
evas_object_show(label);
elm_box_pack_end(box, label);
- elm_object_content_set(app_state->alertpopup, box);
- evas_object_size_hint_weight_set(app_state->alertpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(app_state->alertpopup);
-
- __COMMON_FUNC_EXIT__;
-
- return TRUE;
-}
-
-int view_alerts_connection_fail_show(void)
-{
- __COMMON_FUNC_ENTER__;
-
- if (WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == app_state->wifi_syspopup_support) {
- __COMMON_FUNC_EXIT__;
-
- return TRUE;
- }
-
- if (NULL != app_state->alertpopup) {
- evas_object_del(app_state->alertpopup);
- app_state->alertpopup = NULL;
- }
-
- app_state->alertpopup = elm_popup_add(app_state->win_main);
- elm_object_text_set(app_state->alertpopup, "Connection attempt failed.
Try again.");
- elm_popup_timeout_set(app_state->alertpopup, 2.0f);
- evas_object_smart_callback_add(app_state->alertpopup, "timeout", _timeout_cb, NULL);
- evas_object_size_hint_weight_set(app_state->alertpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(app_state->alertpopup);
+ elm_object_content_set(syspopup_app_state->alertpopup, box);
+ evas_object_size_hint_weight_set(syspopup_app_state->alertpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_show(syspopup_app_state->alertpopup);
__COMMON_FUNC_EXIT__;
return TRUE;
}
-int view_alerts_connection_fail_timeout_show(void)
+void view_alerts_popup_show(const char *err_msg)
{
__COMMON_FUNC_ENTER__;
- if (WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == app_state->wifi_syspopup_support) {
+ if (WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == syspopup_app_state->wifi_syspopup_support) {
__COMMON_FUNC_EXIT__;
-
- return TRUE;
+ return;
}
- if (NULL != app_state->alertpopup) {
- evas_object_del(app_state->alertpopup);
- app_state->alertpopup = NULL;
+ if (NULL != syspopup_app_state->alertpopup) {
+ evas_object_del(syspopup_app_state->alertpopup);
+ syspopup_app_state->alertpopup = NULL;
}
- app_state->alertpopup = elm_popup_add(app_state->win_main);
- elm_object_text_set(app_state->alertpopup, "No response from AP");
- elm_popup_timeout_set(app_state->alertpopup, 2.0f);
- evas_object_smart_callback_add(app_state->alertpopup, "timeout", _timeout_cb, NULL);
-
- evas_object_size_hint_weight_set(app_state->alertpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(app_state->alertpopup);
+ syspopup_app_state->alertpopup = common_utils_show_info_timeout_popup(syspopup_app_state->win_main, err_msg, 2.0f);
__COMMON_FUNC_EXIT__;
- return TRUE;
+ return;
}
-int view_alerts_password_length_error_show(void)
+void view_alerts_popup_ok_show(const char *err_msg)
{
__COMMON_FUNC_ENTER__;
- if (WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == app_state->wifi_syspopup_support) {
+ if (WIFI_SYSPOPUP_SUPPORT_QUICKPANEL == syspopup_app_state->wifi_syspopup_support) {
__COMMON_FUNC_EXIT__;
-
- return TRUE;
+ return;
}
- if (NULL != app_state->alertpopup) {
- evas_object_del(app_state->alertpopup);
- app_state->alertpopup = NULL;
+ if (NULL != syspopup_app_state->alertpopup) {
+ evas_object_del(syspopup_app_state->alertpopup);
+ syspopup_app_state->alertpopup = NULL;
}
- app_state->alertpopup = elm_popup_add(app_state->win_main);
- elm_object_text_set(app_state->alertpopup, "WPA2 requires 8 - 63 letters for a password.
Please, check your input.");
- elm_popup_timeout_set(app_state->alertpopup, 2.0f);
- evas_object_smart_callback_add(app_state->alertpopup, "timeout", _timeout_cb, NULL);
-
- evas_object_size_hint_weight_set(app_state->alertpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(app_state->alertpopup);
+ syspopup_app_state->alertpopup = common_utils_show_info_ok_popup(syspopup_app_state->win_main, PACKAGE, err_msg);
__COMMON_FUNC_EXIT__;
- return TRUE;
+ return;
}