diff options
| author | Nilesh Trimbake <t.shripati@samsung.com> | 2018-03-08 12:15:13 +0530 |
|---|---|---|
| committer | Nilesh Trimbake <t.shripati@samsung.com> | 2018-03-08 12:15:38 +0530 |
| commit | 61184a9f0d5fb834d0f0420336d75ef254576193 (patch) | |
| tree | 2013018618b508a9a5be1befb2e00a157ae1369e | |
| parent | 3ee8a82a12e2be5507481cc8ac326a0cfb7add45 (diff) | |
| parent | 49a6d70ef19fde56c00594eb04f20adee3462546 (diff) | |
| download | idle-clock-digital-61184a9f0d5fb834d0f0420336d75ef254576193.tar.gz idle-clock-digital-61184a9f0d5fb834d0f0420336d75ef254576193.tar.bz2 idle-clock-digital-61184a9f0d5fb834d0f0420336d75ef254576193.zip | |
Merge remote-tracking branch 'origin/tizen_4.0' into tizensubmit/tizen_5.0/20181101.000009submit/tizen/20180921.174528submit/tizen/20180831.131433submit/tizen/20180402.131227tizen_5.0
Change-Id: Ic108ffd06f66f2f17b874074024620c8a394b7b7
| -rw-r--r-- | src/App/inc/MainController.h | 1 | ||||
| -rw-r--r-- | src/App/src/MainController.cpp | 11 | ||||
| -rw-r--r-- | src/Common/inc/I18nString.h | 1 | ||||
| -rw-r--r-- | src/Common/inc/View.h | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/App/inc/MainController.h b/src/App/inc/MainController.h index 0bd8ceb..f6b5578 100644 --- a/src/App/inc/MainController.h +++ b/src/App/inc/MainController.h @@ -24,7 +24,6 @@ namespace IdleClock { class MainController : public MainLayout { - public: MainController(Evas_Object *parent); virtual ~MainController(); diff --git a/src/App/src/MainController.cpp b/src/App/src/MainController.cpp index e2fa387..98318af 100644 --- a/src/App/src/MainController.cpp +++ b/src/App/src/MainController.cpp @@ -105,13 +105,20 @@ void MainController::dispTime() void MainController::dispTime(time_t tt) { + static const std::string ltr = "\u202D"; // Left-to-Right Override + std::string hoursStr = ltr; + std::string minutesStr = ltr; + std::string timeStr = m_Formatter.getTime(tt); LOG("Time: ", timeStr); char *lexeme = strtok(const_cast<char*>(timeStr.c_str()), ":"); - std::string hoursStr = lexeme; + if (lexeme) + hoursStr += lexeme; + lexeme = strtok(nullptr, ":"); - std::string minutesStr = lexeme; + if (lexeme) + minutesStr += lexeme; m_pTimeView->setHours(hoursStr); m_pTimeView->setMinutes(minutesStr); diff --git a/src/Common/inc/I18nString.h b/src/Common/inc/I18nString.h index 441f576..b3b5397 100644 --- a/src/Common/inc/I18nString.h +++ b/src/Common/inc/I18nString.h @@ -24,7 +24,6 @@ namespace IdleClock { class I18nString : private std::basic_string<i18n_uchar> { - public: I18nString(); I18nString(const I18nString &that); diff --git a/src/Common/inc/View.h b/src/Common/inc/View.h index cb113cd..13fb833 100644 --- a/src/Common/inc/View.h +++ b/src/Common/inc/View.h @@ -448,9 +448,9 @@ namespace IdleClock { inline void View::setText(Evas_Object *obj, const TText &text, const char *part) { - if (text.isTranslatable()) + if (text.isTranslatable()) { elm_object_domain_translatable_part_text_set(obj, part, text.getDomain(), text.getMsg()); - else { + } else { elm_object_part_text_translatable_set(obj, part, false); elm_object_part_text_set(obj, part, text.getMsg()); } |