Added Tizen Connect menu at Connection.

Change-Id: I12c15d010070903f8df38f173d48a0f24f73d78f
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/include/setting-connection.h b/include/setting-connection.h
index 2b0f2b9143e191e8405769dc65810396cebd3fb7..dfd69b21b73035dd6ebc133d8b1bef4057c761a0 100644 (file)
--- a/include/setting-connection.h
+++ b/include/setting-connection.h
@@ -32,6 +32,7 @@ enum {
        SETTING_CONNECTION_BLUETOOTH,
        SETTING_CONNECTION_WIFI,
        SETTING_CONNECTION_NFC,
+       SETTING_CONNECTION_TIZEN_CONNECT,
        /*      SETTING_CONNECTION_BT_ALERTS, */
        SETTING_CONNECTION_FLIGHT_MODE
 };

diff --git a/include/util.h b/include/util.h
index 86c456c18e9b5e06b422d24ffbc6b6a5dfbd46b7..377a767ce4ff8ba7ec9f8b2e96e78aa20ac63e26 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -160,6 +160,7 @@ typedef struct _appdata {
        app_control_h service_nfc;
        app_control_h service_input;
        app_control_h service_wifi;
+       app_control_h service_tizen_connect;
 
 } appdata;
 

diff --git a/po/ar.po b/po/ar.po
index 98268db69f8ddd94cb1b75496c8db04839ce6ad0..44e691a1fb351fa3e0db4a69fcb3ead9303e2ca1 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.po
@@ -472,3 +472,6 @@ msgstr "أوجه الساعات"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "إدخال"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/az.po b/po/az.po
index 3bd2e0184d7e52168fc107365c376c521184c0c2..a5782d244403e1e51aa97e42705b14a22dc9606d 100755 (executable)
--- a/po/az.po
+++ b/po/az.po
@@ -472,3 +472,6 @@ msgstr "Saat üzlər"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Daxiletmə"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/bg.po b/po/bg.po
index df292d6085bd6e12904f39a5b45c8e572bba245b..ca311ea32f3b606a032170057ad6c7f222d4b614 100755 (executable)
--- a/po/bg.po
+++ b/po/bg.po
@@ -472,3 +472,6 @@ msgstr "Циферблати"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Въвеждане"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Свързване"
+

diff --git a/po/ca.po b/po/ca.po
index 164b9d147869cd68b71ee70accba57f909de80e4..eb70f7e81447359cddc4ca11a65b58d74ad3190e 100755 (executable)
--- a/po/ca.po
+++ b/po/ca.po
@@ -472,3 +472,6 @@ msgstr "Cares de rellotge"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Entrada"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Connexió a Tizen"
+

diff --git a/po/cs.po b/po/cs.po
index a743841b514c67522c9ea0accc9e610c2008ef57..85aee7d7112e50c7c8e1ef5f87e65e6537b36db9 100755 (executable)
--- a/po/cs.po
+++ b/po/cs.po
@@ -472,3 +472,6 @@ msgstr "Ciferníky"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Zadání"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Připojení Tizen"
+

diff --git a/po/da.po b/po/da.po
index c5909ed2895211c67e4af312078c3a29b5bb97c0..a5f55f3ff85802e38bf322daededf7b85dc078cd 100755 (executable)
--- a/po/da.po
+++ b/po/da.po
@@ -472,3 +472,6 @@ msgstr "Urskiver"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Input"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen tilslut"
+

diff --git a/po/de.po b/po/de.po
index 077d1fc1b42e16c9064adc534adc03dd264bfcaf..7d5fdb1bfd19c2da670a37180394cd4c1b6de9cf 100755 (executable)
--- a/po/de.po
+++ b/po/de.po
@@ -472,3 +472,6 @@ msgstr "Ziffernblätter"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Eingabe"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen-Inhalt"
+

diff --git a/po/el_GR.po b/po/el_GR.po
index 76472f458f6820dd2bbf33041cbfe57c75795a86..31c306873742eb74605264704c25fda1c805a5f9 100755 (executable)
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -472,3 +472,6 @@ msgstr "Καντράν ρολογιού"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Εισαγωγή"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Σύνδεση Tizen"
+

diff --git a/po/en.po b/po/en.po
index 56a23562083e3775654822fc88a8910390037234..d702a0ac5ae2c77bb32d54f46727d01a0416916d 100755 (executable)
--- a/po/en.po
+++ b/po/en.po
@@ -472,3 +472,6 @@ msgstr "Watch faces"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Input"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/en_PH.po b/po/en_PH.po
index c5054ea865b09ae39323082394f94e529c1d1a3b..e9da6c1f6a89f4995c4841a41d94c913c325925a 100755 (executable)
--- a/po/en_PH.po
+++ b/po/en_PH.po
@@ -472,3 +472,6 @@ msgstr "Watch faces"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Input"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/en_US.po b/po/en_US.po
index d2d4e37dbd082f2e2eee9d93d79e92e3f7a47606..997642429d1960df9a8c5ac6a1c54481c994305c 100755 (executable)
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -472,3 +472,6 @@ msgstr "Watch faces"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Input"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/es_ES.po b/po/es_ES.po
index b71f1959fbf96f125e4fbdd13db7a593d8ef38c4..04ea7ad09516c38f4c5511de8a2547a9fbd396aa 100755 (executable)
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -472,3 +472,6 @@ msgstr "Esferas de reloj"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Entrada"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Conexión de Tizen"
+

diff --git a/po/es_US.po b/po/es_US.po
index e7c4790cc62e53de9c190515cd19d84377f25000..ec66a075d282f92bfc28daea35e5113cebefee5f 100755 (executable)
--- a/po/es_US.po
+++ b/po/es_US.po
@@ -472,3 +472,6 @@ msgstr "Carátulas del reloj"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Entrada"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/et.po b/po/et.po
index fc9e3ed6f982c0cb8f88a4c815fc1a0a7289532c..2e81f825508ef4c740d2804400a01a95e022dca8 100755 (executable)
--- a/po/et.po
+++ b/po/et.po
@@ -472,3 +472,6 @@ msgstr "Sihverplaadid"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Sisestus"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/eu.po b/po/eu.po
index b0b96c438299721573c214edb3503d28302f6991..1547e6187465419aae77f9eba67d51965c585721 100755 (executable)
--- a/po/eu.po
+++ b/po/eu.po
@@ -472,3 +472,6 @@ msgstr "Erlojuaren diseinuak"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Sartu"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/fi.po b/po/fi.po
index 911f467cced5ff29164513b538d60b97ce138a35..c3cc54eb9bbbbc539d660bc576108cb0a9999088 100755 (executable)
--- a/po/fi.po
+++ b/po/fi.po
@@ -472,3 +472,6 @@ msgstr "Kellotaulut"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Syöttö"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen-yhteys"
+

diff --git a/po/fr.po b/po/fr.po
index 43c843557c7821a0187fbb5790169c7d380551c2..8574a35b3b92c2bcf2afe842880cecb56f9f422c 100755 (executable)
--- a/po/fr.po
+++ b/po/fr.po
@@ -472,3 +472,6 @@ msgstr "Cadrans"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Saisie"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Connexion Tizen"
+

diff --git a/po/fr_CA.po b/po/fr_CA.po
index 80735ebcdf486b163c399c6f490516ed4da3b5fb..c41459e64bdef7c248d2d59142ec2c3d99d2a20f 100755 (executable)
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -472,3 +472,6 @@ msgstr "Cadrans"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Saisie"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Connexion Tizen"
+

diff --git a/po/ga.po b/po/ga.po
index deaa4fdf0b27c19703e970feef17e6c5fdf40aab..7a4e81102009a13350c741ff29ed3a49920d86d7 100755 (executable)
--- a/po/ga.po
+++ b/po/ga.po
@@ -472,3 +472,6 @@ msgstr "Aghaidheanna uaireadóra"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Ionchuir"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/gl.po b/po/gl.po
index 32f76bd4e2c4868d49b8691f0cd21a0cc4544078..7fc8f45e8b007a8ff66c87e5b74bdcad783cbc56 100755 (executable)
--- a/po/gl.po
+++ b/po/gl.po
@@ -472,3 +472,6 @@ msgstr "Esferas de reloxo"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Entrada"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/hr.po b/po/hr.po
index 8d99015ff180639e8bb3a0813eb487eac5db7509..8ed6c2019f12ee6dd1153b3f472b92c87b36173e 100755 (executable)
--- a/po/hr.po
+++ b/po/hr.po
@@ -472,3 +472,6 @@ msgstr "Izgled sata"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Unos"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen povezivanje"
+

diff --git a/po/hu.po b/po/hu.po
index 8ff0482199e5a69affc64799dbaf4da9d406b89c..b21b3e85e0de2d1d547d3da832664e527e7ae272 100755 (executable)
--- a/po/hu.po
+++ b/po/hu.po
@@ -472,3 +472,6 @@ msgstr "Óraszámlapok"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Bevitel"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/hy.po b/po/hy.po
index e9d82549b749c3dc20788aed8de9a7ac5093b1b2..098f90454ca122932d32d023e563155d0703cbd9 100755 (executable)
--- a/po/hy.po
+++ b/po/hy.po
@@ -472,3 +472,6 @@ msgstr "Ժամացույցի թվացույցներ"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Ներածում"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/is.po b/po/is.po
index 131437de218e2f770a39d2b3f640241c8c4897e7..9aebfd27ff7bdf1913c2cc130b38a7dbd8580561 100755 (executable)
--- a/po/is.po
+++ b/po/is.po
@@ -472,3 +472,6 @@ msgstr "Klukkur"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Inntak"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen-tenging"
+

diff --git a/po/it_IT.po b/po/it_IT.po
index 83dabe73b094e01dedb0b6cce11b96b197abb849..ff65749250231770c94d418d704d31c936e165a2 100755 (executable)
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -472,3 +472,6 @@ msgstr "Quadranti orologio"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Inserisci"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Connessione Tizen"
+

diff --git a/po/ja_JP.po b/po/ja_JP.po
index 36346804556e922cd24fe5a18ee2c8ae7ba549d8..27209fc4cc0bd495bd2e639d9c737284dd438bc8 100755 (executable)
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -472,3 +472,6 @@ msgstr "時計の画面"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "入力"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizenコネクト"
+

diff --git a/po/ka.po b/po/ka.po
index 31a563e46f6b179ae9e92f91843df7f5e82bec20..f2ea0713943b1b2816b6ce5f04b4ffc82fbd52d5 100755 (executable)
--- a/po/ka.po
+++ b/po/ka.po
@@ -472,3 +472,6 @@ msgstr "საათის ციფერბლატები"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "ჩანაწერი"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/kk.po b/po/kk.po
index 97ddda77923aea4057273e318bc0cf011d8fd4e6..bba442b3b74ef5ba467e12978969939dad058cd3 100755 (executable)
--- a/po/kk.po
+++ b/po/kk.po
@@ -472,3 +472,6 @@ msgstr "Сағат беттері"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Енгізу"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen қосылымы"
+

diff --git a/po/ko_KR.po b/po/ko_KR.po
index 76eee02c642413015294905665673d4fb2287ad6..8619df78495fddc83f434fb6635206a8304f5657 100755 (executable)
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -472,3 +472,6 @@ msgstr "시계 화면"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "입력"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/lt.po b/po/lt.po
index 4f4cc6fb8c31cb98340da909c836444343cf0be1..57a298f18eed434b1caa352745dca4116fc237a6 100755 (executable)
--- a/po/lt.po
+++ b/po/lt.po
@@ -472,3 +472,6 @@ msgstr "Laikrodžio vaizdai"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Įvesti"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/lv.po b/po/lv.po
index 65bf095486f7d37f0b385a3996dc9de67e90b60b..fcc1efbd7873990c18b3d3e20f16ac4b777d5eee 100755 (executable)
--- a/po/lv.po
+++ b/po/lv.po
@@ -472,3 +472,6 @@ msgstr "Ciparnīcas"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Ievade"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/mk.po b/po/mk.po
index 2f5fc6b2697dc4ac5fb0494d536c33d287e90b2d..f7bacbaa908baa594b6a968bec10e8ee29a19492 100755 (executable)
--- a/po/mk.po
+++ b/po/mk.po
@@ -472,3 +472,6 @@ msgstr "Маски за часовник"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Внеси"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Поврзување Tizen"
+

diff --git a/po/nb.po b/po/nb.po
index 1a8ef3bc977ea647dbeeb2617b32a0ca6642c9e4..63233f9a3b928505deeaa24904240c7793011f8c 100755 (executable)
--- a/po/nb.po
+++ b/po/nb.po
@@ -472,3 +472,6 @@ msgstr "Klokkefronter"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Inndata"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen-tilkobling"
+

diff --git a/po/nl.po b/po/nl.po
index 3e3f6ff61fa6f5bd2eb0bd90722ab09eb38ca537..f11c3788c5f60fb26b08f85d46a8706cb9b2c8ab 100755 (executable)
--- a/po/nl.po
+++ b/po/nl.po
@@ -472,3 +472,6 @@ msgstr "Wijzerplaten"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Invoer"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Verbinden met Tizen"
+

diff --git a/po/pl.po b/po/pl.po
index 9c01034b04c447955e99b5db93b4671745b07328..96d6e0a3e5da1f422264b45f129ca3627eb9dcc2 100755 (executable)
--- a/po/pl.po
+++ b/po/pl.po
@@ -472,3 +472,6 @@ msgstr "Tarcze zegarka"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Wprowadzanie"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Połączenie Tizen"
+

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f77878c8c34922b33288d84fa0e30ce8cd1d409..e68d5b7e9c5a77b2fd69bd7174cfce555d572a43 100755 (executable)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -472,3 +472,6 @@ msgstr "Mostradores de relógio"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Entrada"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Conexão Tizen"
+

diff --git a/po/pt_PT.po b/po/pt_PT.po
index fa4f19d7f7e2ae413050e99814904c321ca9fff4..6375c2cec3ba065cb43b4719a7435e5d0c29fd81 100755 (executable)
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -472,3 +472,6 @@ msgstr "Mostradores de relógio"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Introdução"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/ro.po b/po/ro.po
index ba1c862b66ebc3a3c29f82090d6fd43da27f361f..799df5f888f58666dbc66b983f9291b3b6ffa746 100755 (executable)
--- a/po/ro.po
+++ b/po/ro.po
@@ -472,3 +472,6 @@ msgstr "Aspecte ceas"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Metodă de introducere"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Conectare Tizen"
+

diff --git a/po/ru_RU.po b/po/ru_RU.po
index b42df8c5316ccca56040be366f7983bd1fde9dd1..d36bff17d49f6804e36f0b57eee7cf4d6309e9aa 100755 (executable)
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -472,3 +472,6 @@ msgstr "Циферблаты часов"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Ввод"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Подключение Tizen"
+

diff --git a/po/sk.po b/po/sk.po
index 82af835143dd5072dbe1280c13d4f09b5508c457..59b5a7dd977d45dc8e8965f19647be4855a2fec0 100755 (executable)
--- a/po/sk.po
+++ b/po/sk.po
@@ -472,3 +472,6 @@ msgstr "Ciferníky"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Vstup"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Pripojenie Tizen"
+

diff --git a/po/sl.po b/po/sl.po
index 3e4252be7f7714d8dc34d549e3eddc0212824499..5fe634689144f03acb4913b70eb0ac5e2485ef5a 100755 (executable)
--- a/po/sl.po
+++ b/po/sl.po
@@ -472,3 +472,6 @@ msgstr "Številčnice ure"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Vnos"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/sr.po b/po/sr.po
index 5b19fde234e9219588004bc6cbd1b93a1353d02c..b4f15781e2ca03cf31257b9ede5d1eb2187bbbe7 100755 (executable)
--- a/po/sr.po
+++ b/po/sr.po
@@ -472,3 +472,6 @@ msgstr "Maske za sat"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Unesi"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen povezivanje"
+

diff --git a/po/sv.po b/po/sv.po
index 7d1a93b5fa133955c80351e80a8da1dccb126bdc..64972e5f0f8c1c9f689d060c1927480e84351d5b 100755 (executable)
--- a/po/sv.po
+++ b/po/sv.po
@@ -472,3 +472,6 @@ msgstr "Urtavlor"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Inmatning"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Anslut till Tizen"
+

diff --git a/po/tr_TR.po b/po/tr_TR.po
index a0b876ed02f57d9d0de4cf8e004511fb73f6c1fe..351ad59bb02ba13810f92f2155f553af68b048bd 100755 (executable)
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -472,3 +472,6 @@ msgstr "Saat şekilleri"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Giriş"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/uk.po b/po/uk.po
index 9930e16a97158c6ea28be7e55ed51bddddfda25f..1eb0a07cbaab9cd92349a311dc6ed6590b63de12 100755 (executable)
--- a/po/uk.po
+++ b/po/uk.po
@@ -472,3 +472,6 @@ msgstr "Циферблати годинника"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Введення"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Підключення Tizen"
+

diff --git a/po/uz.po b/po/uz.po
index 00a6b5dd202562d15832dd5136264d88e1342564..f181d423ac30d329a8606571dc1958982981bc22 100755 (executable)
--- a/po/uz.po
+++ b/po/uz.po
@@ -472,3 +472,6 @@ msgstr "Soat yuzlari"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "Kiritish"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d56ef3558af1caf50e422705f5448f432577b5d..6aa48461d463490d2bc243d573697ae001c5027d 100755 (executable)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -472,3 +472,6 @@ msgstr "表盘"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "输入"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen 连接"
+

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8ccc75546483273b2d4261f05ef1452e970f538f..ba9fa681d8d1a917352d207d834a0812729f7f59 100755 (executable)
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -472,3 +472,6 @@ msgstr "錶面"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "輸入"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 88cc1e4fdda7af21984c8d5c994911740a9155fb..266db42a4c1dad8db7e49aaea322d28cd3f7a305 100755 (executable)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -472,3 +472,6 @@ msgstr "錶面"
 msgid "IDS_ST_HEADER_INPUT"
 msgstr "輸入"
 
+msgid "IDS_ST_HEADER_TIZEN_CONNECT"
+msgstr "Tizen Connect"
+

diff --git a/src/setting-connection.c b/src/setting-connection.c
index 1e736651033f1e600e904e98efeb6f258ebfd51e..c3f3fe0b16157c6bf3f8950b9105c1d1b200c140 100644 (file)
--- a/src/setting-connection.c
+++ b/src/setting-connection.c
@@ -40,6 +40,7 @@ void _wifi_cb(void *data, Evas_Object *obj, void *event_info);
 /*void _alerts_cb(void *data, Evas_Object *obj, void *event_info); */
 void _flight_mode_cb(void *data, Evas_Object *obj, void *event_info);
 void _nfc_cb(void *data, Evas_Object *obj, void *event_info);
+void _tizen_connect_cb(void *data, Evas_Object *obj, void *event_info);
 
 static void bt_status_vconf_changed_cb(keynode_t *key, void *data);
 static void wifi_status_vconf_changed_cb(keynode_t *key, void *data);
@@ -53,6 +54,7 @@ static struct _connection_menu_item connection_menu_its[] = {
        { "IDS_ST_BODY_WI_FI",                                  SETTING_CONNECTION_WIFI,                        _wifi_cb        },
 #endif
        { "IDS_ST_BODY_NFC",                                    SETTING_CONNECTION_NFC,                         _nfc_cb },
+       { "IDS_ST_HEADER_TIZEN_CONNECT",                SETTING_CONNECTION_TIZEN_CONNECT,       _tizen_connect_cb},
        /*      { "Alerts",                                     SETTING_CONNECTION_BT_ALERTS,                   _alerts_cb      }, */
 #ifndef FEATURE_SETTING_EMUL
        { "IDS_ST_BODY_FLIGHT_MODE",                    SETTING_CONNECTION_FLIGHT_MODE,         _flight_mode_cb  },
@@ -369,6 +371,34 @@ void _nfc_cb(void *data, Evas_Object *obj, void *event_info)
        running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
 }
 
+void _tizen_connect_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+
+       DBG("_tizen_connect_cb in");
+       appdata *ad = data;
+
+       if (ad == NULL) {
+               DBG("Setting - ad is null");
+               return;
+       }
+
+       app_control_h service;
+       app_control_create(&service);
+       app_control_set_package(service, "org.tizen.d2d-conv-setting");
+       app_control_send_launch_request(service, NULL, NULL);
+
+       ad->service_tizen_connect = service;
+
+       running_connection = true;
+
+       if (running_timer) {
+               ecore_timer_del(running_timer);
+               running_timer = NULL;
+       }
+       running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
+}
+
 /*void _alerts_cb(void *data, Evas_Object *obj, void *event_info) */
 /*{ */
 /*     elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); */
@@ -444,6 +474,11 @@ Evas_Object *_create_connection_list(void *data)
        itc->func.text_get = _gl_connection_title_get;
        itc->func.del = _connection_gl_del;
 
+       Elm_Genlist_Item_Class *itc_1text = elm_genlist_item_class_new();
+       itc_1text->item_style = "1text";
+       itc_1text->func.text_get = _gl_connection_title_get;
+       itc_1text->func.del = _connection_gl_del;
+
        Elm_Genlist_Item_Class *text_icon = elm_genlist_item_class_new();
        text_icon->item_style = "1text.1icon.1";
        text_icon->func.text_get = _gl_connection_title_get;
@@ -482,6 +517,9 @@ Evas_Object *_create_connection_list(void *data)
                case SETTING_CONNECTION_NFC:
                        itc_tmp = itc;
                        break;
+               case SETTING_CONNECTION_TIZEN_CONNECT:
+                       itc_tmp = itc_1text;
+                       break;
                /*              case SETTING_CONNECTION_BT_ALERTS: */
                /*                      itc_tmp = text2_icon; */
                /*                      break; */

diff --git a/src/setting.c b/src/setting.c
index be6ad49973a642db5532d6c1e1402d60c5e1f28a..8ff8f105b02e3aaba602fd8113eb91c1b54bd878 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -971,6 +971,7 @@ void app_terminate(void *data)
 
        __FREE_SERVICE(ad->service_wifi);
        __FREE_SERVICE(ad->service_nfc);
+       __FREE_SERVICE(ad->service_tizen_connect);
        __FREE_SERVICE(ad->service_bt);
        __FREE_SERVICE(ad->service_input);
 
@@ -1063,6 +1064,7 @@ void clear_popup_naviframe(appdata *ad)
 
        __DISTROY_FREE_SERVICE(ad->service_wifi);
        __DISTROY_FREE_SERVICE(ad->service_nfc);
+       __DISTROY_FREE_SERVICE(ad->service_tizen_connect);
        __DISTROY_FREE_SERVICE(ad->service_bt);
        __DISTROY_FREE_SERVICE(ad->service_input);