Fixed Nabi Issues, Change of back key implementation to keep the app in running state

Change-Id: I1ef543baaad4dfbf48ddd6b0b6bd0dc9d70764af
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/res/ara-AE.xml b/res/ara-AE.xml
index fbbd2a1..2f1ea22 100644 (file)
--- a/res/ara-AE.xml
+++ b/res/ara-AE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">اللاتينية-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">وضع المطور</text>
     <text id="IDS_COM_BODY_JUNE">06</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">تحميل الصور</text>
     <text id="IDS_BR_BUTTON2_DONE">تم</text>
     <text id="IDS_BR_OPT_SETTINGS">الضبط</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">ضخم</text>

diff --git a/res/aze-AZ.xml b/res/aze-AZ.xml
index eed885b..a053e37 100644 (file)
--- a/res/aze-AZ.xml
+++ b/res/aze-AZ.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Yaradıcı rejimi</text>
     <text id="IDS_COM_BODY_JUNE">İyun</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Şəkilləri yükləyin</text>
     <text id="IDS_BR_BUTTON2_DONE">Hazırdır</text>
     <text id="IDS_BR_OPT_SETTINGS">Parametrlər</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Nəhəng</text>

diff --git a/res/bul-BG.xml b/res/bul-BG.xml
index b58f2e9..fd3f329 100644 (file)
--- a/res/bul-BG.xml
+++ b/res/bul-BG.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Режим за разработчици</text>
     <text id="IDS_COM_BODY_JUNE">Юни</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Зареждане на изображения</text>
     <text id="IDS_BR_BUTTON2_DONE">Готово</text>
     <text id="IDS_BR_OPT_SETTINGS">Настройки</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Гигантски</text>

diff --git a/res/cat-ES.xml b/res/cat-ES.xml
index 4267434..d1ffbb8 100644 (file)
--- a/res/cat-ES.xml
+++ b/res/cat-ES.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Llatí-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Mode de programador</text>
     <text id="IDS_COM_BODY_JUNE">Juny</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Carregar imatges</text>
     <text id="IDS_BR_BUTTON2_DONE">Finalitzat</text>
     <text id="IDS_BR_OPT_SETTINGS">Ajustaments</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gegant</text>

diff --git a/res/ces-CZ.xml b/res/ces-CZ.xml
index 578b4a3..2a728f4 100644 (file)
--- a/res/ces-CZ.xml
+++ b/res/ces-CZ.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Vývojářský režim</text>
     <text id="IDS_COM_BODY_JUNE">Červen</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Načíst obrázky</text>
     <text id="IDS_BR_BUTTON2_DONE">Hotovo</text>
     <text id="IDS_BR_OPT_SETTINGS">Nastavení</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Obří</text>

diff --git a/res/dan-DK.xml b/res/dan-DK.xml
index 00f3a16..40840d4 100644 (file)
--- a/res/dan-DK.xml
+++ b/res/dan-DK.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Udviklertilstand</text>
     <text id="IDS_COM_BODY_JUNE">Juni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Indlæs billeder</text>
     <text id="IDS_BR_BUTTON2_DONE">Udført</text>
     <text id="IDS_BR_OPT_SETTINGS">Indstillinger</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigantisk</text>

diff --git a/res/deu-DE.xml b/res/deu-DE.xml
index 9da6355..bea6a50 100644 (file)
--- a/res/deu-DE.xml
+++ b/res/deu-DE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Entwickler-Modus</text>
     <text id="IDS_COM_BODY_JUNE">Juni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Bilder laden</text>
     <text id="IDS_BR_BUTTON2_DONE">OK</text>
     <text id="IDS_BR_OPT_SETTINGS">Einstellungen</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">riesig</text>

diff --git a/res/ell-GR.xml b/res/ell-GR.xml
index 7e4f68e..24c4bed 100644 (file)
--- a/res/ell-GR.xml
+++ b/res/ell-GR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Λατινικά-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Κατάσταση λειτουργίας προγραμματισμού</text>
     <text id="IDS_COM_BODY_JUNE">Ιούνιος</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Φόρτωση εικόνων</text>
     <text id="IDS_BR_BUTTON2_DONE">OΚ</text>
     <text id="IDS_BR_OPT_SETTINGS">Ρυθμίσεις</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Τεράστιο</text>

diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index 2a61b45..7d3d094 100644 (file)
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Developer mode</text>
     <text id="IDS_COM_BODY_JUNE">June</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Load images</text>
     <text id="IDS_BR_BUTTON2_DONE">Done</text>
     <text id="IDS_BR_OPT_SETTINGS">Settings</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Giant</text>

diff --git a/res/eng-PH.xml b/res/eng-PH.xml
index f3930cc..47d5da8 100644 (file)
--- a/res/eng-PH.xml
+++ b/res/eng-PH.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Developer mode</text>
     <text id="IDS_COM_BODY_JUNE">June</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Load images</text>
     <text id="IDS_BR_BUTTON2_DONE">Done</text>
     <text id="IDS_BR_OPT_SETTINGS">Settings</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Giant</text>

diff --git a/res/eng-US.xml b/res/eng-US.xml
index 94b509a..d2b117f 100644 (file)
--- a/res/eng-US.xml
+++ b/res/eng-US.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Developer mode</text>
     <text id="IDS_COM_BODY_JUNE">June</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Load images</text>
     <text id="IDS_BR_BUTTON2_DONE">Done</text>
     <text id="IDS_BR_OPT_SETTINGS">Settings</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Giant</text>

diff --git a/res/est-EE.xml b/res/est-EE.xml
index 55668f7..120c807 100644 (file)
--- a/res/est-EE.xml
+++ b/res/est-EE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Ladina-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Arendaja režiim</text>
     <text id="IDS_COM_BODY_JUNE">Juuni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Laadi pildid</text>
     <text id="IDS_BR_BUTTON2_DONE">Valmis</text>
     <text id="IDS_BR_OPT_SETTINGS">Seaded</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Hiiglaslik</text>

diff --git a/res/eus-ES.xml b/res/eus-ES.xml
index b5c78f3..097a759 100644 (file)
--- a/res/eus-ES.xml
+++ b/res/eus-ES.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Garatzaile modua</text>
     <text id="IDS_COM_BODY_JUNE">Ekaina</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Kargatu irudiak</text>
     <text id="IDS_BR_BUTTON2_DONE">Egina</text>
     <text id="IDS_BR_OPT_SETTINGS">Ezarpenak</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Izugarrizkoa</text>

diff --git a/res/fin-FI.xml b/res/fin-FI.xml
index db3a2f1..e89f540 100644 (file)
--- a/res/fin-FI.xml
+++ b/res/fin-FI.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latinalainen-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Kehittäjätila</text>
     <text id="IDS_COM_BODY_JUNE">Kesäkuu</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Lataa kuvia</text>
     <text id="IDS_BR_BUTTON2_DONE">Valmis</text>
     <text id="IDS_BR_OPT_SETTINGS">Asetukset</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Jättimäinen</text>

diff --git a/res/fra-CA.xml b/res/fra-CA.xml
index e7d4a78..d0736f3 100644 (file)
--- a/res/fra-CA.xml
+++ b/res/fra-CA.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Mode développeur</text>
     <text id="IDS_COM_BODY_JUNE">Juin</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Charger les images</text>
     <text id="IDS_BR_BUTTON2_DONE">Terminé</text>
     <text id="IDS_BR_OPT_SETTINGS">Paramètres</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Géante</text>

diff --git a/res/fra-FR.xml b/res/fra-FR.xml
index 3ae8383..a62b33e 100644 (file)
--- a/res/fra-FR.xml
+++ b/res/fra-FR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Mode développeur</text>
     <text id="IDS_COM_BODY_JUNE">Juin</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Charger les images</text>
     <text id="IDS_BR_BUTTON2_DONE">Terminé</text>
     <text id="IDS_BR_OPT_SETTINGS">Paramètres</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Géante</text>

diff --git a/res/gle-IE.xml b/res/gle-IE.xml
index b4580a4..3254346 100644 (file)
--- a/res/gle-IE.xml
+++ b/res/gle-IE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Laidin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Mód forbróra</text>
     <text id="IDS_COM_BODY_JUNE">Meitheamh</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Lódáil íomhánna</text>
     <text id="IDS_BR_BUTTON2_DONE">Déanta</text>
     <text id="IDS_BR_OPT_SETTINGS">Socruithe</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Ollmhór</text>

diff --git a/res/glg-ES.xml b/res/glg-ES.xml
index 3c173f0..044546b 100644 (file)
--- a/res/glg-ES.xml
+++ b/res/glg-ES.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latino-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modo do creador</text>
     <text id="IDS_COM_BODY_JUNE">Xuño</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Cargar imaxes</text>
     <text id="IDS_BR_BUTTON2_DONE">Feito</text>
     <text id="IDS_BR_OPT_SETTINGS">Axustes</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Enorme</text>

diff --git a/res/hin-IN.xml b/res/hin-IN.xml
index d264813..89ed3c1 100644 (file)
--- a/res/hin-IN.xml
+++ b/res/hin-IN.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">लैटिन-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">डेवलपर मोड</text>
     <text id="IDS_COM_BODY_JUNE">जून</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">छवियाँ लोड करें</text>
     <text id="IDS_BR_BUTTON2_DONE">हुआ</text>
     <text id="IDS_BR_OPT_SETTINGS">सेटिंग्स</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">ज्यायंट</text>

diff --git a/res/hrv-HR.xml b/res/hrv-HR.xml
index 9aa82e7..02c64ad 100644 (file)
--- a/res/hrv-HR.xml
+++ b/res/hrv-HR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Razvojni način</text>
     <text id="IDS_COM_BODY_JUNE">Lipanj</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Učitaj slike</text>
     <text id="IDS_BR_BUTTON2_DONE">OK</text>
     <text id="IDS_BR_OPT_SETTINGS">Postavke</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Ogromno</text>

diff --git a/res/hun-HU.xml b/res/hun-HU.xml
index 9787662..8a2e52d 100644 (file)
--- a/res/hun-HU.xml
+++ b/res/hun-HU.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Fejlesztői üzemmód</text>
     <text id="IDS_COM_BODY_JUNE">június</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Képek betöltése</text>
     <text id="IDS_BR_BUTTON2_DONE">Kész</text>
     <text id="IDS_BR_OPT_SETTINGS">Beállítások</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Nagyon nagy</text>

diff --git a/res/hye-AM.xml b/res/hye-AM.xml
index 00437bf..fd40924 100644 (file)
--- a/res/hye-AM.xml
+++ b/res/hye-AM.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Լատիներեն-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Մշակողի ռեժիմ</text>
     <text id="IDS_COM_BODY_JUNE">Հունիս</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Բեռնել պատկերներ</text>
     <text id="IDS_BR_BUTTON2_DONE">Արված է</text>
     <text id="IDS_BR_OPT_SETTINGS">Պարամետրեր</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Հսկա</text>

diff --git a/res/isl-IS.xml b/res/isl-IS.xml
index 309b82f..462a8fe 100644 (file)
--- a/res/isl-IS.xml
+++ b/res/isl-IS.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Hönnunarstilling</text>
     <text id="IDS_COM_BODY_JUNE">Júní</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Hlaða inn myndum</text>
     <text id="IDS_BR_BUTTON2_DONE">Lokið</text>
     <text id="IDS_BR_OPT_SETTINGS">Stillingar</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Risastórt</text>

diff --git a/res/ita-IT.xml b/res/ita-IT.xml
index 7d01d09..c652960 100644 (file)
--- a/res/ita-IT.xml
+++ b/res/ita-IT.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modalità sviluppatore</text>
     <text id="IDS_COM_BODY_JUNE">Giugno</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Carica immagini</text>
     <text id="IDS_BR_BUTTON2_DONE">Fatto</text>
     <text id="IDS_BR_OPT_SETTINGS">Impostazioni</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Enorme</text>

diff --git a/res/jpn-JP.xml b/res/jpn-JP.xml
index e4630f3..4f1b6b5 100644 (file)
--- a/res/jpn-JP.xml
+++ b/res/jpn-JP.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">ラテン1(ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">開発者モード</text>
     <text id="IDS_COM_BODY_JUNE">6月</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">画像の読み込み</text>
     <text id="IDS_BR_BUTTON2_DONE">完了</text>
     <text id="IDS_BR_OPT_SETTINGS">設定</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">極大</text>

diff --git a/res/kat-GE.xml b/res/kat-GE.xml
index 628093e..b9a55d9 100644 (file)
--- a/res/kat-GE.xml
+++ b/res/kat-GE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">ლათინური-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">დეველოპერის რეჟიმი</text>
     <text id="IDS_COM_BODY_JUNE">ივნისი</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">სურათების ჩამოტვირთვა</text>
     <text id="IDS_BR_BUTTON2_DONE">შესრულდა</text>
     <text id="IDS_BR_OPT_SETTINGS">პარამეტრები</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">გიგანტური</text>

diff --git a/res/kaz-KZ.xml b/res/kaz-KZ.xml
index 17c2047..6b02c0b 100644 (file)
--- a/res/kaz-KZ.xml
+++ b/res/kaz-KZ.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Латын-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Әзірлеуші режимі</text>
     <text id="IDS_COM_BODY_JUNE">Маусым</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Суреттерді жүктеу</text>
     <text id="IDS_BR_BUTTON2_DONE">Дайын</text>
     <text id="IDS_BR_OPT_SETTINGS">Қондырғ-р</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Үлкен</text>

diff --git a/res/kor-KR.xml b/res/kor-KR.xml
index 87eba0d..51a7bfb 100644 (file)
--- a/res/kor-KR.xml
+++ b/res/kor-KR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">라틴어-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">개발자 모드</text>
     <text id="IDS_COM_BODY_JUNE">6월</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">이미지 표시</text>
     <text id="IDS_BR_BUTTON2_DONE">완료</text>
     <text id="IDS_BR_OPT_SETTINGS">설정</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">최대한 크게</text>

diff --git a/res/lav-LV.xml b/res/lav-LV.xml
index 578054e..cde21f8 100644 (file)
--- a/res/lav-LV.xml
+++ b/res/lav-LV.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latīņu-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Izstrādātāju režīms</text>
     <text id="IDS_COM_BODY_JUNE">Jūnijs</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Ielādēt attēlus</text>
     <text id="IDS_BR_BUTTON2_DONE">Gatavs</text>
     <text id="IDS_BR_OPT_SETTINGS">Iestatījumi</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Milzīgs</text>

diff --git a/res/lit-LT.xml b/res/lit-LT.xml
index cbadd3f..6ae061c 100644 (file)
--- a/res/lit-LT.xml
+++ b/res/lit-LT.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Lotynų-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Kūrėjo režimas</text>
     <text id="IDS_COM_BODY_JUNE">Birželis</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Įkelti vaizdus</text>
     <text id="IDS_BR_BUTTON2_DONE">Atlikta</text>
     <text id="IDS_BR_OPT_SETTINGS">Nustat.</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Milžiniškas</text>

diff --git a/res/mkd-MK.xml b/res/mkd-MK.xml
index b7b0114..fc82e8d 100644 (file)
--- a/res/mkd-MK.xml
+++ b/res/mkd-MK.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Режим за програмери</text>
     <text id="IDS_COM_BODY_JUNE">Јуни</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Вчитај слики</text>
     <text id="IDS_BR_BUTTON2_DONE">Готово</text>
     <text id="IDS_BR_OPT_SETTINGS">Опции</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Џиновски</text>

diff --git a/res/nld-NL.xml b/res/nld-NL.xml
index 51e0b8c..0ec2105 100644 (file)
--- a/res/nld-NL.xml
+++ b/res/nld-NL.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Ontwikkelaarstand</text>
     <text id="IDS_COM_BODY_JUNE">Juni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Afbeeldingen laden</text>
     <text id="IDS_BR_BUTTON2_DONE">Klaar</text>
     <text id="IDS_BR_OPT_SETTINGS">Instellingen</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Enorm</text>

diff --git a/res/nob-NO.xml b/res/nob-NO.xml
index 91ebba4..930d551 100644 (file)
--- a/res/nob-NO.xml
+++ b/res/nob-NO.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Utviklermodus</text>
     <text id="IDS_COM_BODY_JUNE">juni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Åpne bilder</text>
     <text id="IDS_BR_BUTTON2_DONE">Utført</text>
     <text id="IDS_BR_OPT_SETTINGS">Innstillinger</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigantisk</text>

diff --git a/res/pol-PL.xml b/res/pol-PL.xml
index 7056af0..62a3558 100644 (file)
--- a/res/pol-PL.xml
+++ b/res/pol-PL.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Łaciński-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Tryb programisty</text>
     <text id="IDS_COM_BODY_JUNE">Czerwiec</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Załaduj obrazy</text>
     <text id="IDS_BR_BUTTON2_DONE">Gotowe</text>
     <text id="IDS_BR_OPT_SETTINGS">Ustawienia</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigantyczna</text>

diff --git a/res/por-BR.xml b/res/por-BR.xml
index aa894a2..c6b813d 100644 (file)
--- a/res/por-BR.xml
+++ b/res/por-BR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latino-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modo de programador</text>
     <text id="IDS_COM_BODY_JUNE">Junho</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Carregar imagens</text>
     <text id="IDS_BR_BUTTON2_DONE">Concluído</text>
     <text id="IDS_BR_OPT_SETTINGS">Config.</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigante</text>

diff --git a/res/por-PT.xml b/res/por-PT.xml
index 25930d4..ac3a776 100644 (file)
--- a/res/por-PT.xml
+++ b/res/por-PT.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latino-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modo de programador</text>
     <text id="IDS_COM_BODY_JUNE">Junho</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Carregar imagens</text>
     <text id="IDS_BR_BUTTON2_DONE">Concluir</text>
     <text id="IDS_BR_OPT_SETTINGS">Definições</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigante</text>

diff --git a/res/ron-RO.xml b/res/ron-RO.xml
index 878ec46..8d0cdc4 100644 (file)
--- a/res/ron-RO.xml
+++ b/res/ron-RO.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Mod dezvoltator</text>
     <text id="IDS_COM_BODY_JUNE">Iunie</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Încărcare imagini</text>
     <text id="IDS_BR_BUTTON2_DONE">Efectuat</text>
     <text id="IDS_BR_OPT_SETTINGS">Setări</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigant</text>

diff --git a/res/rus-RU.xml b/res/rus-RU.xml
index 1bdd594..5d476c0 100644 (file)
--- a/res/rus-RU.xml
+++ b/res/rus-RU.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Латиница-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Режим разработчика</text>
     <text id="IDS_COM_BODY_JUNE">Июнь</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Загружать графику</text>
     <text id="IDS_BR_BUTTON2_DONE">Готово</text>
     <text id="IDS_BR_OPT_SETTINGS">Настройки</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Гигантский</text>

diff --git a/res/slk-SK.xml b/res/slk-SK.xml
index 2c08169..3a0d2e1 100644 (file)
--- a/res/slk-SK.xml
+++ b/res/slk-SK.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Vývojársky režim</text>
     <text id="IDS_COM_BODY_JUNE">Jún</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Načítať obrázky</text>
     <text id="IDS_BR_BUTTON2_DONE">Hotovo</text>
     <text id="IDS_BR_OPT_SETTINGS">Nastavenia</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigantická</text>

diff --git a/res/slv-SI.xml b/res/slv-SI.xml
index 7b4df58..bc5875e 100644 (file)
--- a/res/slv-SI.xml
+++ b/res/slv-SI.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latinski-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Način za razvijalce</text>
     <text id="IDS_COM_BODY_JUNE">Junij</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Naloži slike</text>
     <text id="IDS_BR_BUTTON2_DONE">Končano</text>
     <text id="IDS_BR_OPT_SETTINGS">Nastavitve</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Ogromna</text>

diff --git a/res/spa-ES.xml b/res/spa-ES.xml
index 87664c9..c0b5195 100644 (file)
--- a/res/spa-ES.xml
+++ b/res/spa-ES.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latino-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modo de desarrollador</text>
     <text id="IDS_COM_BODY_JUNE">Junio</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Cargar imágenes</text>
     <text id="IDS_BR_BUTTON2_DONE">Guardar</text>
     <text id="IDS_BR_OPT_SETTINGS">Ajustes</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigante</text>

diff --git a/res/spa-MX.xml b/res/spa-MX.xml
index a80be3e..607c9bd 100644 (file)
--- a/res/spa-MX.xml
+++ b/res/spa-MX.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latino-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Modo de desarrollador</text>
     <text id="IDS_COM_BODY_JUNE">Junio</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Cargar imágenes</text>
     <text id="IDS_BR_BUTTON2_DONE">Listo</text>
     <text id="IDS_BR_OPT_SETTINGS">Configuración</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigante</text>

diff --git a/res/srp-RS.xml b/res/srp-RS.xml
index b037878..c2125ec 100644 (file)
--- a/res/srp-RS.xml
+++ b/res/srp-RS.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Režim za razvoj</text>
     <text id="IDS_COM_BODY_JUNE">Jun</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Učitaj slike</text>
     <text id="IDS_BR_BUTTON2_DONE">Kraj</text>
     <text id="IDS_BR_OPT_SETTINGS">Podešavanja</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Džinovsko</text>

diff --git a/res/swe-SE.xml b/res/swe-SE.xml
index 00b5337..5842e23 100644 (file)
--- a/res/swe-SE.xml
+++ b/res/swe-SE.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Utvecklarläge</text>
     <text id="IDS_COM_BODY_JUNE">juni</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Läs in bilder</text>
     <text id="IDS_BR_BUTTON2_DONE">Klar</text>
     <text id="IDS_BR_OPT_SETTINGS">Inställningar</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Gigantisk</text>

diff --git a/res/tur-TR.xml b/res/tur-TR.xml
index b8d72f2..f2ef8fd 100644 (file)
--- a/res/tur-TR.xml
+++ b/res/tur-TR.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Geliştirici modu</text>
     <text id="IDS_COM_BODY_JUNE">Haziran</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Resimleri yükle</text>
     <text id="IDS_BR_BUTTON2_DONE">Tamam</text>
     <text id="IDS_BR_OPT_SETTINGS">Ayarlar</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Kocaman</text>

diff --git a/res/ukr-UA.xml b/res/ukr-UA.xml
index 8cbd35f..418fb2c 100644 (file)
--- a/res/ukr-UA.xml
+++ b/res/ukr-UA.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Латиниця-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Режим розробки</text>
     <text id="IDS_COM_BODY_JUNE">Червня</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Завантажити зображення</text>
     <text id="IDS_BR_BUTTON2_DONE">Готово</text>
     <text id="IDS_BR_OPT_SETTINGS">Установки</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Надвеликий</text>

diff --git a/res/uzb-UZ.xml b/res/uzb-UZ.xml
index 4aff289..8e40288 100644 (file)
--- a/res/uzb-UZ.xml
+++ b/res/uzb-UZ.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Lotincha-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">Ishlab chiqaruvchi rejimi</text>
     <text id="IDS_COM_BODY_JUNE">Iyun</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">Rasmlarni yuklash</text>
     <text id="IDS_BR_BUTTON2_DONE">Bajarildi</text>
     <text id="IDS_BR_OPT_SETTINGS">Parametrlar</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">Ulkan</text>

diff --git a/res/zho-CN.xml b/res/zho-CN.xml
index bf521c4..7a3cf5f 100644 (file)
--- a/res/zho-CN.xml
+++ b/res/zho-CN.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">拉丁语-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">开发模式</text>
     <text id="IDS_COM_BODY_JUNE">6月</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">载入图像</text>
     <text id="IDS_BR_BUTTON2_DONE">完成</text>
     <text id="IDS_BR_OPT_SETTINGS">设定</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">巨大</text>

diff --git a/res/zho-HK.xml b/res/zho-HK.xml
index 654d11d..cd71919 100644 (file)
--- a/res/zho-HK.xml
+++ b/res/zho-HK.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">拉丁-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">開發人員模式</text>
     <text id="IDS_COM_BODY_JUNE">6月</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">載入圖像</text>
     <text id="IDS_BR_BUTTON2_DONE">完成</text>
     <text id="IDS_BR_OPT_SETTINGS">設定</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">巨大</text>

diff --git a/res/zho-SG.xml b/res/zho-SG.xml
index ece2778..7dbdb3c 100644 (file)
--- a/res/zho-SG.xml
+++ b/res/zho-SG.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">开发模式</text>
     <text id="IDS_COM_BODY_JUNE">6月</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">载入图像</text>
     <text id="IDS_BR_BUTTON2_DONE">完成</text>
     <text id="IDS_BR_OPT_SETTINGS">设定</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">巨大</text>

diff --git a/res/zho-TW.xml b/res/zho-TW.xml
index 2de96ea..4b08f8d 100644 (file)
--- a/res/zho-TW.xml
+++ b/res/zho-TW.xml
@@ -22,6 +22,7 @@
     <text id="IDS_BR_OPT_LATIN_1_HISO_8859_1">Latin-1 (ISO-8859-1)</text>
     <text id="IDS_BR_BODY_DEVELOPER_MODE">程式開發人員模式</text>
     <text id="IDS_COM_BODY_JUNE">6月</text>
+    <text id="IDS_BR_OPT_LOAD_IMAGES">載入圖片</text>
     <text id="IDS_BR_BUTTON2_DONE">完成</text>
     <text id="IDS_BR_OPT_SETTINGS">設定</text>
     <text id="IDS_BR_OPT_GIANT_M_TEXTSIZE">大</text>

diff --git a/src/IntDropDownCustomItem.cpp b/src/IntDropDownCustomItem.cpp
index d7c7d39..46b51ec 100644 (file)
--- a/src/IntDropDownCustomItem.cpp
+++ b/src/IntDropDownCustomItem.cpp
@@ -137,7 +137,15 @@ DropDownCustomItem::Make()
        }
 
        pSubTextElement = new(std::nothrow) TextElement();
-       pSubTextElement->Construct(__subText);
+       r = pSubTextElement->Construct(__subText);
+       if(IsFailed(r))
+       {
+               pMainEnText->RemoveAll(true);
+               delete pMainEnText;
+               delete pSubEnText;
+               delete pSubTextElement;
+               return E_FAILURE;
+       }
 
 
        subTextFont.Construct(FONT_STYLE_PLAIN, 32);

diff --git a/src/IntInternetApp.cpp b/src/IntInternetApp.cpp
index f45037b..d9138b0 100644 (file)
--- a/src/IntInternetApp.cpp
+++ b/src/IntInternetApp.cpp
@@ -185,7 +185,11 @@ InternetApp::OnAppInitialized(void)
                        {
                                delete pAc;
                        }
-                       delete __value;
+                       if(__value != null)
+                       {
+                               delete __value;
+                               __value = null;
+                       }
 //                     return true;
                }
        }
@@ -393,7 +397,9 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                if (pArgs)
                {
                        //const String* pVal = (String *) pArgs->GetValue(String(L"http://tizen.org/appcontrol/data/notification"));
-                       __value = new String(*(String *) pArgs->GetValue(String(L"http://tizen.org/appcontrol/data/notification")));
+                       String *data = (String *) pArgs->GetValue(String(L"http://tizen.org/appcontrol/data/notification"));
+                       if(data != NULL)
+                               __value = new String(*data);
                        if (__value && __value->GetLength() > 0)
                        {
                                AppLog("17jul rahul __value is %S", __value->GetPointer());
@@ -417,7 +423,11 @@ InternetApp::OnAppControlRequestReceived(RequestId reqId, const String &operatio
                                                delete pAc;
                                        }
                                }
-                               delete __value;
+                               if(__value != null)
+                               {
+                                       delete __value;
+                                       __value = null;
+                               }
                        }
                }
        }

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 1714c95..c087f1b 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -895,11 +895,6 @@ MainForm::InitSelectTextContextMenu(Point p, bool pasteOption, bool onlyPasteOpt
        }
        else
        {
-               if(GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE || GetOrientationStatus() == ORIENTATION_STATUS_LANDSCAPE_REVERSE )
-               {
-                       AppLog("asdasdafdsfdgfd");
-                       p.y = p.y - 500;
-               }
                direction = CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD;
        }
        __pImageMenu = new (std::nothrow) ContextMenu();
@@ -1139,7 +1134,7 @@ MainForm::InitFindWordPanel(void)
        }
 
        __pFindWordCountLabelRightToLeft = static_cast<Label*>(__pFindWordControl->GetControl(L"IDC_FIND_COUNT_LABEL2", true));
-       if (__pFindWordCountLabel == null)
+       if (__pFindWordCountLabelRightToLeft == null)
        {
                AppLogException("There is some problem in the xml file. Please check.");
                return E_FAILURE;
@@ -1420,22 +1415,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        pApp = UiApp::GetInstance();
                        if (pApp != null)
                        {
-                               RemoveOrientationEventListener(*this);
-
-                               if(__pAddressbar)
-                               {
-                                       __pAddressbar->SetAddressbarEventListener(null);
-                               }
-
-                               if(__pWebViewer)
-                               {
-                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                       __pWebViewer->SetTextSearchListener(null);
-                                       __pWebViewer->SetLoadingListener(null);
-                               }
-                               r = pApp->Terminate();
+                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                if (IsFailed(r))
                                {
                                        AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -1459,22 +1439,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                pApp = UiApp::GetInstance();
                                if (pApp != null)
                                {
-                                       RemoveOrientationEventListener(*this);
-
-                                       if(__pAddressbar)
-                                       {
-                                               __pAddressbar->SetAddressbarEventListener(null);
-                                       }
-
-                                       if(__pWebViewer)
-                                       {
-                                               __pWebViewer->RemoveTouchEventListener(*this);
-                                               __pWebViewer->SetWebUiEventListenerF(null);
-                                               __pWebViewer->SetWebKeypadEventListener(null);
-                                               __pWebViewer->SetTextSearchListener(null);
-                                               __pWebViewer->SetLoadingListener(null);
-                                       }
-                                       r = pApp->Terminate();
+                                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                        if (IsFailed(r))
                                        {
                                                AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -1494,22 +1459,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                        pApp = UiApp::GetInstance();
                                        if (pApp != null)
                                        {
-                                               RemoveOrientationEventListener(*this);
-
-                                               if(__pAddressbar)
-                                               {
-                                                       __pAddressbar->SetAddressbarEventListener(null);
-                                               }
-
-                                               if(__pWebViewer)
-                                               {
-                                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                                       __pWebViewer->SetTextSearchListener(null);
-                                                       __pWebViewer->SetLoadingListener(null);
-                                               }
-                                               r = pApp->Terminate();
+                                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                                if (IsFailed(r))
                                                {
                                                        AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -1547,23 +1497,7 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                                        pApp = UiApp::GetInstance();
                                                        if (pApp != null)
                                                        {
-
-                                                               RemoveOrientationEventListener(*this);
-
-                                                               if(__pAddressbar)
-                                                               {
-                                                                       __pAddressbar->SetAddressbarEventListener(null);
-                                                               }
-
-                                                               if(__pWebViewer)
-                                                               {
-                                                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                                                       __pWebViewer->SetTextSearchListener(null);
-                                                                       __pWebViewer->SetLoadingListener(null);
-                                                               }
-                                                               r = pApp->Terminate();
+                                                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                                                return;
                                                        }
                                                }
@@ -2621,22 +2555,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                pApp = UiApp::GetInstance();
                if (pApp != null)
                {
-                       RemoveOrientationEventListener(*this);
-
-                       if(__pAddressbar)
-                       {
-                               __pAddressbar->SetAddressbarEventListener(null);
-                       }
-
-                       if(__pWebViewer)
-                       {
-                               __pWebViewer->RemoveTouchEventListener(*this);
-                               __pWebViewer->SetWebUiEventListenerF(null);
-                               __pWebViewer->SetWebKeypadEventListener(null);
-                               __pWebViewer->SetTextSearchListener(null);
-                               __pWebViewer->SetLoadingListener(null);
-                       }
-                       r = pApp->Terminate();
+                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                        if (IsFailed(r))
                        {
                                AppLogException("MainForm::OnFormBackRequested failed with %s", GetErrorMessage(r));
@@ -2660,22 +2579,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                        pApp = UiApp::GetInstance();
                        if (pApp != null)
                        {
-                               RemoveOrientationEventListener(*this);
-
-                               if(__pAddressbar)
-                               {
-                                       __pAddressbar->SetAddressbarEventListener(null);
-                               }
-
-                               if(__pWebViewer)
-                               {
-                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                       __pWebViewer->SetTextSearchListener(null);
-                                       __pWebViewer->SetLoadingListener(null);
-                               }
-                               r = pApp->Terminate();
+                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                if (IsFailed(r))
                                {
                                        AppLogException("MainForm::OnFormBackRequested failed with %s", GetErrorMessage(r));
@@ -2695,22 +2599,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                                pApp = UiApp::GetInstance();
                                if (pApp != null)
                                {
-                                       RemoveOrientationEventListener(*this);
-
-                                       if(__pAddressbar)
-                                       {
-                                               __pAddressbar->SetAddressbarEventListener(null);
-                                       }
-
-                                       if(__pWebViewer)
-                                       {
-                                               __pWebViewer->RemoveTouchEventListener(*this);
-                                               __pWebViewer->SetWebUiEventListenerF(null);
-                                               __pWebViewer->SetWebKeypadEventListener(null);
-                                               __pWebViewer->SetTextSearchListener(null);
-                                               __pWebViewer->SetLoadingListener(null);
-                                       }
-                                       r = pApp->Terminate();
+                                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                        if (IsFailed(r))
                                        {
                                                AppLogException("MainForm::OnFormBackRequested failed with %s", GetErrorMessage(r));
@@ -2748,22 +2637,7 @@ MainForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
                                                pApp = UiApp::GetInstance();
                                                if (pApp != null)
                                                {
-                                                       RemoveOrientationEventListener(*this);
-
-                                                       if(__pAddressbar)
-                                                       {
-                                                               __pAddressbar->SetAddressbarEventListener(null);
-                                                       }
-
-                                                       if(__pWebViewer)
-                                                       {
-                                                               __pWebViewer->RemoveTouchEventListener(*this);
-                                                               __pWebViewer->SetWebUiEventListenerF(null);
-                                                               __pWebViewer->SetWebKeypadEventListener(null);
-                                                               __pWebViewer->SetTextSearchListener(null);
-                                                               __pWebViewer->SetLoadingListener(null);
-                                                       }
-                                                       r = pApp->Terminate();
+                                                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                                        return;
                                                }
                                        }
@@ -3547,25 +3421,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                pApp = UiApp::GetInstance();
                if (pApp != null)
                {
-
-                       RemoveOrientationEventListener(*this);
-
-                       if(__pAddressbar)
-                       {
-                               __pAddressbar->SetAddressbarEventListener(null);
-                       }
-
-                       if(__pWebViewer)
-                       {
-                               __pWebViewer->RemoveTouchEventListener(*this);
-                               __pWebViewer->SetWebUiEventListenerF(null);
-                               __pWebViewer->SetWebKeypadEventListener(null);
-                               __pWebViewer->SetTextSearchListener(null);
-                               __pWebViewer->SetLoadingListener(null);
-                       }
-
-
-                       r = pApp->Terminate();
+                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                        if (IsFailed(r))
                        {
                                AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -3589,24 +3445,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                        pApp = UiApp::GetInstance();
                        if (pApp != null)
                        {
-                               RemoveOrientationEventListener(*this);
-
-                               if(__pAddressbar)
-                               {
-                                       __pAddressbar->SetAddressbarEventListener(null);
-                               }
-
-                               if(__pWebViewer)
-                               {
-                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                       __pWebViewer->SetTextSearchListener(null);
-                                       __pWebViewer->SetLoadingListener(null);
-                               }
-
-
-                               r = pApp->Terminate();
+                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                if (IsFailed(r))
                                {
                                        AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -3626,24 +3465,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                                pApp = UiApp::GetInstance();
                                if (pApp != null)
                                {
-                                       RemoveOrientationEventListener(*this);
-
-                                       if(__pAddressbar)
-                                       {
-                                               __pAddressbar->SetAddressbarEventListener(null);
-                                       }
-
-                                       if(__pWebViewer)
-                                       {
-                                               __pWebViewer->RemoveTouchEventListener(*this);
-                                               __pWebViewer->SetWebUiEventListenerF(null);
-                                               __pWebViewer->SetWebKeypadEventListener(null);
-                                               __pWebViewer->SetTextSearchListener(null);
-                                               __pWebViewer->SetLoadingListener(null);
-                                       }
-
-
-                                       r = pApp->Terminate();
+                                       r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                        if (IsFailed(r))
                                        {
                                                AppLogException("OnActionPerformed failed with %s", GetErrorMessage(r));
@@ -3679,24 +3501,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                                        pApp = UiApp::GetInstance();
                                        if (pApp != null)
                                        {
-                                               RemoveOrientationEventListener(*this);
-
-                                               if(__pAddressbar)
-                                               {
-                                                       __pAddressbar->SetAddressbarEventListener(null);
-                                               }
-
-                                               if(__pWebViewer)
-                                               {
-                                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                                       __pWebViewer->SetTextSearchListener(null);
-                                                       __pWebViewer->SetLoadingListener(null);
-                                               }
-
-
-                                               r = pApp->Terminate();
+                                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                                return;
                                        }
 
@@ -3706,24 +3511,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                                        pApp = UiApp::GetInstance();
                                        if (pApp != null)
                                        {
-                                               RemoveOrientationEventListener(*this);
-
-                                               if(__pAddressbar)
-                                               {
-                                                       __pAddressbar->SetAddressbarEventListener(null);
-                                               }
-
-                                               if(__pWebViewer)
-                                               {
-                                                       __pWebViewer->RemoveTouchEventListener(*this);
-                                                       __pWebViewer->SetWebUiEventListenerF(null);
-                                                       __pWebViewer->SetWebKeypadEventListener(null);
-                                                       __pWebViewer->SetTextSearchListener(null);
-                                                       __pWebViewer->SetLoadingListener(null);
-                                               }
-
-
-                                               r = pApp->Terminate();
+                                               r = pApp->GetFrameAt(0)->SetShowMode(FRAME_SHOW_MODE_MINIMIZED);
                                                return;
                                        }
                                }
@@ -4666,7 +4454,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
                __isLongPressedDone = true;
                result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0  && type.CompareTo(L"submit") !=0/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0  && type.CompareTo(L"submit") !=0 && type.CompareTo(L"range") !=0/*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 
@@ -5443,7 +5231,7 @@ MainForm::ShowIndicatorNotification(const String& messageText, const String& con
 
        Tizen::Shell::NotificationManager notiMgr;
        notiMgr.Construct();
-       notiMgr.Notify(request);
+       notiMgr.NotifyOngoingActivity(request);
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;
 }

diff --git a/src/IntSettingForm.cpp b/src/IntSettingForm.cpp
index 1fa28a1..94f627e 100644 (file)
--- a/src/IntSettingForm.cpp
+++ b/src/IntSettingForm.cpp
@@ -164,7 +164,7 @@ SettingForm::InitializeSettingValues(void)
        settingInfo[SETTING_RUN_JAVASCRIPT].itemType = ITEM_TYPE_TOGGLE;
        settingInfo[SETTING_RUN_JAVASCRIPT].isSelected = SettingPresentationModel::GetInstance()->IsRunJavascriptEnabled();
 
-       settingInfo[SETTING_DISPLAY_IMAGES].titleText = CommonUtil::GetString(L"IDS_BR_BODY_SHOW_IMAGES");
+       settingInfo[SETTING_DISPLAY_IMAGES].titleText = CommonUtil::GetString(L"IDS_BR_OPT_LOAD_IMAGES");
        settingInfo[SETTING_DISPLAY_IMAGES].subText = L"";
        settingInfo[SETTING_DISPLAY_IMAGES].itemType = ITEM_TYPE_TOGGLE;
        settingInfo[SETTING_DISPLAY_IMAGES].isSelected = SettingPresentationModel::GetInstance()->IsDisplayImagesEnabled();

diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index ce3724b..b5eaef2 100644 (file)
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -142,10 +142,7 @@ SharePopup::~SharePopup(void)
                                AppLog("removed failure");
                        }
                }
-               if (pShareInfo != null)
-               {
-                       delete pShareInfo;
-               }
+               __pShareList->RemoveAll(true);
        }
 
 }
@@ -526,7 +523,12 @@ void SharePopup::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& a
 
        ShareInfo* pShareInfo = null;
        result r = E_FAILURE;
-
+       if(__pTimer)
+       {
+               __pTimer->Cancel();
+               delete __pTimer;
+               __pTimer = null;
+       }
        if (__pShareList != null)
        {
                pShareInfo = dynamic_cast<ShareInfo*>(__pShareList->GetAt(0));
@@ -551,10 +553,7 @@ void SharePopup::OnAppControlCompleteResponseReceived(const Tizen::App::AppId& a
                                AppLog("removed failure");
                        }
                }
-               if (pShareInfo != null)
-               {
-                       delete pShareInfo;
-               }
+               __pShareList->RemoveAll(true);
        }
        Popup::SetShowState(false);
        Popup::Show();
@@ -569,6 +568,12 @@ SharePopup::OnKeyReleased (Control &source, const KeyEventInfo &keyEventInfo)
        {
                if(GetShowState() == true)
                {
+                       if(__pTimer)
+                       {
+                               __pTimer->Cancel();
+                               delete __pTimer;
+                               __pTimer = null;
+                       }
                        SetShowState(false);
                }
        }