From: leerang song Date: Fri, 19 Apr 2013 11:56:28 +0000 (+0900) Subject: In order to avoid creating a variety of pop-up, set the check flag X-Git-Tag: submit/tizen_2.2/20130927.092158^2~123 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cae65369c65ff37f447fdc58c0e63951f28e355;p=platform%2Fframework%2Fweb%2Fweb-provider.git In order to avoid creating a variety of pop-up, set the check flag [Issue#] ORANGE [Problem] create a variety of pop-up [Cause] N/A [Solution] Set the popup check flag [SCMRequest] N/A Change-Id: I52b3cdbcecdf2d619a08e47ce854a31288a739c3 --- diff --git a/src/Core/Service/PeriodChanger.cpp b/src/Core/Service/PeriodChanger.cpp index 801b0ec..36515d7 100755 --- a/src/Core/Service/PeriodChanger.cpp +++ b/src/Core/Service/PeriodChanger.cpp @@ -27,10 +27,23 @@ #include "PeriodChanger.h" #define UPDATE_PERIOD_MIN 60.0 +#define UPDATE_PERIOD_HOUR 60.0 * 60.0 +#define U_(str) dgettext("web-provider", str) namespace Service { Evas_Object* PeriodChanger::s_window = NULL; +bool PeriodChanger::s_checkPopup = false; + +static const char * const TEXT_POPUP_TITLE = "IDS_CLOCK_BODY_UPDATE_INTERVAL"; +static const char * const TEXT_POPUP_CANCEL_BUTTON = "IDS_ST_BUTTON_CANCEL"; +static const char * const TEXT_POPUP_UPDATE_PERIOD_1 ="IDS_ST_BODY_1_HOUR"; +static const char * const TEXT_POPUP_UPDATE_PERIOD_3 ="IDS_ST_BODY_3HOURS"; +static const char * const TEXT_POPUP_UPDATE_PERIOD_6 ="IDS_ST_BODY_6_HOURS_TMO"; +static const char * const TEXT_POPUP_UPDATE_PERIOD_12 ="IDS_ST_BODY_12_HOURS"; +static const char * const TEXT_POPUP_UPDATE_PERIOD_NEVER ="IDS_ST_BODY_NEVER"; +static const char * const MO_INSTALL_DIR = "/usr/share/res/locale"; +static const char * const MO_PROJECT_NAME = "web-provider"; PeriodChanger::PeriodChanger( std::string& boxId, std::string& instanceId, @@ -53,6 +66,12 @@ bool PeriodChanger::change() { LogD("enter"); + if (!s_checkPopup) { + s_checkPopup = true; + } else { + return false; + } + if (m_requestedPeriod < 0) { showPeriodPopup(); return true; @@ -217,6 +236,7 @@ void PeriodChanger::destroyWindow() if (!s_window) { return; } + s_checkPopup = false; evas_object_hide(s_window); elm_win_lower(s_window); } diff --git a/src/Core/Service/PeriodChanger.h b/src/Core/Service/PeriodChanger.h index 5fec521..06cfbfb 100755 --- a/src/Core/Service/PeriodChanger.h +++ b/src/Core/Service/PeriodChanger.h @@ -60,6 +60,7 @@ class PeriodChanger { std::string m_instanceId; float m_currentPeriod; float m_requestedPeriod; + static bool s_checkPopup; struct PopupListData { PeriodChanger* periodChanger;