diff options
21 files changed, 245 insertions, 45 deletions
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index be7a31e039..39472300bc 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -285,6 +285,8 @@ <string name="share">Поделиться</string> <!-- iOS share by Message button text (including SMS) --> <string name="message">Сообщение</string> + <!-- Share by email button text --> + <string name="email">E-Mail</string> <!-- Copy Link --> <string name="copy_link">Скопировать ссылку</string> <!-- Text for the button that returns to caller application --> diff --git a/strings.txt b/strings.txt index c7e8cf4c78..9f4843e3ef 100644 --- a/strings.txt +++ b/strings.txt @@ -2494,7 +2494,7 @@ hu = Nézd meg a maps.me helyzetemet! %1$@ vagy %2$@ A program letöltése: http://maps.me/get [bookmark_share_email_subject] en = Hey, check out my pin at maps.me map! - tags = ios,android + tags = ios,android,tizen comment = Subject for emailed bookmark ru = Смотри мою метку на карте maps.me uk = Поглянь на мою позначку на карті maps.me @@ -2511,6 +2511,7 @@ hu = Nézze meg a maps.me jelzőmet [bookmark_share_email] en = Hi,\n\nI pinned: %1$@ at maps.me, world offline maps. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks. + tags = tizen comment = Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me ru = Привет!\n\nОткрой эту ссылку %2$@ либо эту %3$@, для того, чтобы увидеть мою метку %1$@ на карте maps.me.\n\nСпасибо. uk = Привіт,\n\nЯ позначив: %1$@ на maps.me, офлайн картах світу. Натисни на це посилання %2$@ або на це посилання %3$@, щоб побачити місце на карті. \n\nДякую. @@ -2527,7 +2528,7 @@ hu = Üdvözlöm, \n\nleszúrtam egy maps.me jelzőt: %1$@. Kattintson erre a hivatkozásra %2$@ vagy erre %3$@ hogy lássa a helyet a térképen.\n\nKöszönöm. [my_position_share_email_subject] en = Hey, check out my current location at maps.me map! - tags = ios,android + tags = ios,android,tizen comment = Subject for emailed position ru = Посмотри на карте maps.me, где я сейчас нахожусь uk = Поглянь на моє поточне місцезнаходження на карті maps.me @@ -2544,7 +2545,7 @@ hu = Nézze meg a helyzetemet a maps.me térképen! [my_position_share_email] en = Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks. - tags = ios,android + tags = ios,android,tizen comment = Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME ru = Привет!\n\nЯ сейчас здесь: %1$@. Чтобы увидеть это место на карте maps.me, открой эту ссылку %2$@ или эту %3$@ \n\nСпасибо. uk = Привіт,\n\nЯ зараз тут: %1$@. Натисни на це посилання %2$@ або на це посилання %3$@ щоб побачити місце на карті. \n\nДякую. @@ -2615,7 +2616,7 @@ hu = Üzenet [email] en = E-Mail - tags = ios,android + tags = ios,android,tizen comment = Share by email button text cs = E-Mail de = E-Mail @@ -2627,6 +2628,7 @@ zh-Hant = 電子郵件 uk = Електронна пошта ko = 이메일 + ru = E-Mail pl = E-mail pt = E-Mail hu = Email diff --git a/tizen/MapsWithMe/inc/AppResourceId.h b/tizen/MapsWithMe/inc/AppResourceId.h index d5e342fdbe..a75d21b53e 100644 --- a/tizen/MapsWithMe/inc/AppResourceId.h +++ b/tizen/MapsWithMe/inc/AppResourceId.h @@ -16,6 +16,7 @@ extern const wchar_t* IDC_COPY_MARK; extern const wchar_t* IDC_DOWNLOAD_LISTVIEW; extern const wchar_t* IDC_EDITFIELD; extern const wchar_t* IDC_EDITFIELD_NAME; +extern const wchar_t* IDC_EMAIL; extern const wchar_t* IDC_ENABLE_GPS; extern const wchar_t* IDC_ENABLE_SCALE_BUTTONS_CB; extern const wchar_t* IDC_FOOTS_CHECKBUTTON; @@ -54,6 +55,8 @@ extern const wchar_t* IDS_BANK; extern const wchar_t* IDS_BECOME_A_PRO; extern const wchar_t* IDS_BOOKMARKS; extern const wchar_t* IDS_BOOKMARK_COLOR; +extern const wchar_t* IDS_BOOKMARK_SHARE_EMAIL; +extern const wchar_t* IDS_BOOKMARK_SHARE_EMAIL_SUBJECT; extern const wchar_t* IDS_BOOKMARK_SHARE_SMS; extern const wchar_t* IDS_CANCEL; extern const wchar_t* IDS_CANCEL_DOWNLOAD; @@ -65,6 +68,7 @@ extern const wchar_t* IDS_DOWNLOAD; extern const wchar_t* IDS_DOWNLOAD_COUNTRY_FAILED; extern const wchar_t* IDS_DOWNLOAD_MAPS; extern const wchar_t* IDS_EDIT; +extern const wchar_t* IDS_EMAIL; extern const wchar_t* IDS_ENTERTAINMENT; extern const wchar_t* IDS_FOOD; extern const wchar_t* IDS_FUEL; @@ -77,6 +81,8 @@ extern const wchar_t* IDS_MEASUREMENT_UNITS; extern const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY; extern const wchar_t* IDS_MESSAGE; extern const wchar_t* IDS_MILES; +extern const wchar_t* IDS_MY_POSITION_SHARE_EMAIL; +extern const wchar_t* IDS_MY_POSITION_SHARE_EMAIL_SUBJECT; extern const wchar_t* IDS_MY_POSITION_SHARE_SMS; extern const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED; extern const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND; diff --git a/tizen/MapsWithMe/inc/BookMarkUtils.hpp b/tizen/MapsWithMe/inc/BookMarkUtils.hpp index 2d51cbadb3..653c53848d 100644 --- a/tizen/MapsWithMe/inc/BookMarkUtils.hpp +++ b/tizen/MapsWithMe/inc/BookMarkUtils.hpp @@ -75,6 +75,8 @@ public: Tizen::Base::String GetSMSTextMyPosition(double lat, double lon); Tizen::Base::String GetSMSTextMark(UserMark const * pMark); + Tizen::Base::String GetEmailTextMyPosition(double lat, double lon); + Tizen::Base::String GetEmailTextMark(UserMark const * pMark); private: shared_ptr<UserMarkCopy> m_pCurBookMarkCopy; diff --git a/tizen/MapsWithMe/inc/SharePositionForm.hpp b/tizen/MapsWithMe/inc/SharePositionForm.hpp index d3f8dda483..80b9558a23 100644 --- a/tizen/MapsWithMe/inc/SharePositionForm.hpp +++ b/tizen/MapsWithMe/inc/SharePositionForm.hpp @@ -25,8 +25,11 @@ public: { ID_CANCEL, ID_SEND_MESSAGE, + ID_SEND_EMAIL, ID_COPY_TO_CLIPBOARD }; - Tizen::Base::String m_message; + bool m_sharePosition; + Tizen::Base::String m_messageSMS; + Tizen::Base::String m_messageEmail; }; diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml index 520fbc45d4..444333d3d1 100644 --- a/tizen/MapsWithMe/res/ces-CZ.xml +++ b/tizen/MapsWithMe/res/ces-CZ.xml @@ -79,10 +79,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Koukni na mou značku na mapě. Otevři odkaz: %1$s nebo %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Koukni kde jsem. Otevři odkaz: %1$s nebo %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Koukni na moji značku na mapě maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Ahoj,\n\nOznačil/a jsem: %1$s v maps.me, offline mapách celého světa. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.\n\nDíky.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Podívejte se na mou aktuální polohu na mapě na maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Ahoj,\n\nPrávě jsem tady: %1$s. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.\n\nDíky.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Sdílet</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Zpráva</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-Mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Zkopírovat odkaz</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml index f435d3dac9..59801a0270 100644 --- a/tizen/MapsWithMe/res/deu-DE.xml +++ b/tizen/MapsWithMe/res/deu-DE.xml @@ -77,10 +77,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Meine Nadel auf der Karte sehen. Klicke auf den Link %1$s oder %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Sieh, wo ich gerade bin. Klicke auf den Link %1$s oder %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Schau dir meine Nadel auf der maps.me-Karte an</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Hi,\n\nIch habe gepinnt: %1$s auf maps.me, Offline-Weltkarten. Klicke auf diesen Link %2$s oder diesen %3$s, um den Ort auf der Karte zu sehen.\n\nVielen Dank.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Sieh dir meinen aktuellen Standort auf der Karte maps.me an</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Hi,\n\nich bin gerade hier: %1$s . Klicke auf diesen Link %2$s oder diesen %3$s, um meinen Standort auf der Karte zu sehen.\n\nVielen Dank.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Teilen</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Nachricht</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-Mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Link kopieren</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml index 50c40e9d63..21863758a4 100644 --- a/tizen/MapsWithMe/res/eng-GB.xml +++ b/tizen/MapsWithMe/res/eng-GB.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Hey, check out my pin at maps.me! %1$s or %2$s Don\'t have offline maps installed? Download here: http://maps.me/get</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Hey, check out my current location at maps.me! %1$s or %2$s Don\'t have offline maps? Download here: http://maps.me/get</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Hey, check out my pin at maps.me map!</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Hi,\n\nI pinned: %1$s at maps.me, world offline maps. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Hey, check out my current location at maps.me map!</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Hi,\n\nI\'m here now: %1$s. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Share</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Message</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-Mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Copy Link</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml index 50632484f5..133c663386 100644 --- a/tizen/MapsWithMe/res/fra-FR.xml +++ b/tizen/MapsWithMe/res/fra-FR.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Regarde cette epingle sur la carte ! Ouvre %1$s ou %2$s. Pas de carte hors-ligne ? A obtenir ici http://maps.me/get</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Regarde ma position sur maps.me ! Ouvre %1$s ou %2$s. Pas de carte hors-ligne ? A obtenir ici http://maps.me/get</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Regarde mon épingle sur la carte maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Salut,\n\nJ\'ai épinglé %1$s sur maps.me, les cartes du monde hors ligne. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Regarde ma localisation actuelle sur la carte maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Salut,\n\nJe me trouve actuellement ici : %1$s. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Partager</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Message</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Copier le lien</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml index 64153a7182..7629346a64 100644 --- a/tizen/MapsWithMe/res/ita-IT.xml +++ b/tizen/MapsWithMe/res/ita-IT.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Vedi pin sulla mappa. Apri %1$s o %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Vedi dove sono ora. Apri %1$s o %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Dai uno sguardo al mio pin sulla mappa di maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Ciao,\n\nHo segnato %1$s su maps.me, le mappe del mondo offline. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.\n\nGrazie.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Guarda dove mi trovo attualmente sulla mappa maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Ciao,\n\nSono qui adesso: %1$s. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.\n\nGrazie.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Condividi</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Messaggio</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Copia link</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml index 7a0c7d0057..80fe498ef0 100644 --- a/tizen/MapsWithMe/res/pol-PL.xml +++ b/tizen/MapsWithMe/res/pol-PL.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Mój znacznik w maps.me %1$s i %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Zobacz gdzie jestem. Link %1$s lub %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Obejrzyj mój znacznik na mapie w maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Cześć,\n\nDodałem znacznik w: %1$s w aplikacji maps.me, mapach offline całego świata. Naciśnij ten link %2$s lub ten %3$s by zobaczyć to miejsce na mapie.\n\nDziękuję.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Zobacz moją aktualną lokalizację na mapie przy użyciu maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Cześć,\n\nJestem teraz tutaj: %1$s. Naciśnij na ten link %2$s lub ten %3$s, aby zobaczyć to miejsce na mapie.\n\nDziękuję.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Udostępnij</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Wiadomość</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Kopiuj link</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml index d9beb0884f..89cec71497 100644 --- a/tizen/MapsWithMe/res/por-PT.xml +++ b/tizen/MapsWithMe/res/por-PT.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Veja o meu marcador no mapa do maps.me. Abra a hiperligação: %1$s ou %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Veja o meu marcador no mapa do maps.me.</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Olá,\n\nFixei:%1$s na maps.me, mapas offline mundiais. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.\n\nObrigado.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Veja a minha localização atual em maps.me map</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Olá,\n\n Estou aqui agora: %1$s. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.\n\nObrigado.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Partilhar</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Mensagem</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-Mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Copiar hiperligação</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml index 4f7a0a0e1a..ebe2f0e993 100644 --- a/tizen/MapsWithMe/res/rus-RU.xml +++ b/tizen/MapsWithMe/res/rus-RU.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Моя метка на карте. Жми %1$s или %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Смотри где я сейчас. Жми %1$s или %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Смотри мою метку на карте maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Привет!\n\nОткрой эту ссылку %2$s либо эту %3$s, для того, чтобы увидеть мою метку %1$s на карте maps.me.\n\nСпасибо.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Посмотри на карте maps.me, где я сейчас нахожусь</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Привет!\n\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте maps.me, открой эту ссылку %2$s или эту %3$s \n\nСпасибо.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Поделиться</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Сообщение</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">E-Mail</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Скопировать ссылку</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml b/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml index 87cb5f4513..ff7ea6d9c1 100644 --- a/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml +++ b/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml @@ -11,24 +11,29 @@ <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR" type="LAYOUT_RELATIVE"/> <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR" type="LAYOUT_RELATIVE"/> </Form> - <Button id="IDC_MESSAGE" parent="IDF_SHARE_POSITION_FORM"> - <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_MESSAGE" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/> - <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDF_SHARE_POSITION_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDF_SHARE_POSITION_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="550.0"/> - <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="146.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="601.0" x="68.0" y="412.0"/> - </Button> <TextBox id="IDC_TEXTBOX1" parent="IDF_SHARE_POSITION_FORM"> <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="::IDS_SHARE" textAlignment="ALIGNMENT_CENTER" textSize="45.0" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/> <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="410.0"/> <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="137.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="67.0" y="237.0"/> </TextBox> + <Button id="IDC_MESSAGE" parent="IDF_SHARE_POSITION_FORM"> + <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_MESSAGE" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDF_SHARE_POSITION_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDF_SHARE_POSITION_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_TEXTBOX1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="550.0"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="146.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="601.0" x="68.0" y="412.0"/> + </Button> + <Button id="IDC_EMAIL" parent="IDF_SHARE_POSITION_FORM"> + <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_EMAIL" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_MESSAGE" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="19.0" y="690.0"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="146.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="640.0" x="90.0" y="584.0"/> + </Button> <Button id="IDC_COPY_MARK" parent="IDF_SHARE_POSITION_FORM"> <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COPY_LINK" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/> - <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="690.0"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_EMAIL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="830.0"/> <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="146.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="640.0" x="80.0" y="574.0"/> </Button> <Button id="IDC_CANCEL" parent="IDF_SHARE_POSITION_FORM"> <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#323232" normalColorOpacity="100" normalTextColor="#FEFFFF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_CANCEL" textSize="45.0" verticalAlign="ALIGN_MIDDLE"/> - <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="830.0"/> + <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="120.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_COPY_MARK" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="680.0" x="20.0" y="970.0"/> <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="204.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="619.0" x="67.0" y="516.0"/> </Button> </Scene> diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml index d5ecbc7b74..9e92300151 100644 --- a/tizen/MapsWithMe/res/spa-ES.xml +++ b/tizen/MapsWithMe/res/spa-ES.xml @@ -75,10 +75,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Ve mi alfiler en mapa. Abre %1$s o %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Mira dónde estoy. Abre %1$s o %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Mira mi alfiler en el mapa de maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">¡Hola!\n\nMarqué con un alfiler: %1$s en maps.me, mapas del mundo sin conexión. Haz clic en este enlace %2$s o este %3$s para ver el sitio en el mapa.\n\nGracias.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Mira mi ubicación actual en el mapa en maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Hola:\n\nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa. \n\nGracias.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Compartir</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Mensaje</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">Correo electrónico</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Copiar enlace</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml index b9717ffd35..4984ba61d3 100644 --- a/tizen/MapsWithMe/res/ukr-UA.xml +++ b/tizen/MapsWithMe/res/ukr-UA.xml @@ -81,10 +81,20 @@ <text id="IDS_BOOKMARK_SHARE_SMS">Моя мітка на карті. Іди %1$s або %2$s</text> <!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 --> <text id="IDS_MY_POSITION_SHARE_SMS">Глянь де я зараз. Іди %1$s або %2$s</text> + <!-- Subject for emailed bookmark --> + <text id="IDS_BOOKMARK_SHARE_EMAIL_SUBJECT">Поглянь на мою позначку на карті maps.me</text> + <!-- Share one specific bookmark using EMail, %1$@ is bookmark's name, %2$@ is ge0:// link and %3$@ http://ge0.me --> + <text id="IDS_BOOKMARK_SHARE_EMAIL">Привіт,\n\nЯ позначив: %1$s на maps.me, офлайн картах світу. Натисни на це посилання %2$s або на це посилання %3$s, щоб побачити місце на карті. \n\nДякую.</text> + <!-- Subject for emailed position --> + <text id="IDS_MY_POSITION_SHARE_EMAIL_SUBJECT">Поглянь на моє поточне місцезнаходження на карті maps.me</text> + <!-- Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME --> + <text id="IDS_MY_POSITION_SHARE_EMAIL">Привіт,\n\nЯ зараз тут: %1$s. Натисни на це посилання %2$s або на це посилання %3$s щоб побачити місце на карті. \n\nДякую.</text> <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. --> <text id="IDS_SHARE">Подiлитись</text> <!-- iOS share by Message button text (including SMS) --> <text id="IDS_MESSAGE">Повідомлення</text> + <!-- Share by email button text --> + <text id="IDS_EMAIL">Електронна пошта</text> <!-- Copy Link --> <text id="IDS_COPY_LINK">Копіювати посилання</text> <!-- Used for bookmark editing --> diff --git a/tizen/MapsWithMe/src/AppResourceId.cpp b/tizen/MapsWithMe/src/AppResourceId.cpp index 662b31fb0e..1aeac9f71a 100644 --- a/tizen/MapsWithMe/src/AppResourceId.cpp +++ b/tizen/MapsWithMe/src/AppResourceId.cpp @@ -17,6 +17,7 @@ const wchar_t* IDC_COPY_MARK = L"IDC_COPY_MARK"; const wchar_t* IDC_DOWNLOAD_LISTVIEW = L"IDC_DOWNLOAD_LISTVIEW"; const wchar_t* IDC_EDITFIELD = L"IDC_EDITFIELD"; const wchar_t* IDC_EDITFIELD_NAME = L"IDC_EDITFIELD_NAME"; +const wchar_t* IDC_EMAIL = L"IDC_EMAIL"; const wchar_t* IDC_ENABLE_GPS = L"IDC_ENABLE_GPS"; const wchar_t* IDC_ENABLE_SCALE_BUTTONS_CB = L"IDC_ENABLE_SCALE_BUTTONS_CB"; const wchar_t* IDC_FOOTS_CHECKBUTTON = L"IDC_FOOTS_CHECKBUTTON"; @@ -55,6 +56,8 @@ const wchar_t* IDS_BANK = L"IDS_BANK"; const wchar_t* IDS_BECOME_A_PRO = L"IDS_BECOME_A_PRO"; const wchar_t* IDS_BOOKMARKS = L"IDS_BOOKMARKS"; const wchar_t* IDS_BOOKMARK_COLOR = L"IDS_BOOKMARK_COLOR"; +const wchar_t* IDS_BOOKMARK_SHARE_EMAIL = L"IDS_BOOKMARK_SHARE_EMAIL"; +const wchar_t* IDS_BOOKMARK_SHARE_EMAIL_SUBJECT = L"IDS_BOOKMARK_SHARE_EMAIL_SUBJECT"; const wchar_t* IDS_BOOKMARK_SHARE_SMS = L"IDS_BOOKMARK_SHARE_SMS"; const wchar_t* IDS_CANCEL = L"IDS_CANCEL"; const wchar_t* IDS_CANCEL_DOWNLOAD = L"IDS_CANCEL_DOWNLOAD"; @@ -66,6 +69,7 @@ const wchar_t* IDS_DOWNLOAD = L"IDS_DOWNLOAD"; const wchar_t* IDS_DOWNLOAD_COUNTRY_FAILED = L"IDS_DOWNLOAD_COUNTRY_FAILED"; const wchar_t* IDS_DOWNLOAD_MAPS = L"IDS_DOWNLOAD_MAPS"; const wchar_t* IDS_EDIT = L"IDS_EDIT"; +const wchar_t* IDS_EMAIL = L"IDS_EMAIL"; const wchar_t* IDS_ENTERTAINMENT = L"IDS_ENTERTAINMENT"; const wchar_t* IDS_FOOD = L"IDS_FOOD"; const wchar_t* IDS_FUEL = L"IDS_FUEL"; @@ -78,6 +82,8 @@ const wchar_t* IDS_MEASUREMENT_UNITS = L"IDS_MEASUREMENT_UNITS"; const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY = L"IDS_MEASUREMENT_UNITS_SUMMARY"; const wchar_t* IDS_MESSAGE = L"IDS_MESSAGE"; const wchar_t* IDS_MILES = L"IDS_MILES"; +const wchar_t* IDS_MY_POSITION_SHARE_EMAIL = L"IDS_MY_POSITION_SHARE_EMAIL"; +const wchar_t* IDS_MY_POSITION_SHARE_EMAIL_SUBJECT = L"IDS_MY_POSITION_SHARE_EMAIL_SUBJECT"; const wchar_t* IDS_MY_POSITION_SHARE_SMS = L"IDS_MY_POSITION_SHARE_SMS"; const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED = L"IDS_NO_INTERNET_CONNECTION_DETECTED"; const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND = L"IDS_NO_SEARCH_RESULTS_FOUND"; diff --git a/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp b/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp index 2dd967504c..3c03b19ca5 100644 --- a/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp +++ b/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp @@ -129,10 +129,13 @@ void BookMarkSplitPanel::OnActionPerformed(Tizen::Ui::Control const & source, in { case ID_SHARE_BUTTON: { - String textVal = GetBMMnger().GetSMSTextMark(GetBMMnger().GetCurMark()); + String textValSMS = GetBMMnger().GetSMSTextMark(GetBMMnger().GetCurMark()); + String textValEmail = GetBMMnger().GetEmailTextMark(GetBMMnger().GetCurMark()); ArrayList * pList = new ArrayList; pList->Construct(); - pList->Add(new String(textVal)); + pList->Add(new String(textValSMS)); + pList->Add(new String(textValEmail)); + pList->Add(new Boolean(false)); //not my position but mark SceneManager * pSceneManager = SceneManager::GetInstance(); pSceneManager->GoForward(ForwardSceneTransition(SCENE_SHARE_POSITION, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_KEEP), pList); diff --git a/tizen/MapsWithMe/src/BookMarkUtils.cpp b/tizen/MapsWithMe/src/BookMarkUtils.cpp index 0e0b2e93a8..33f4bdc156 100644 --- a/tizen/MapsWithMe/src/BookMarkUtils.cpp +++ b/tizen/MapsWithMe/src/BookMarkUtils.cpp @@ -436,43 +436,75 @@ size_t BookMarkManager::GetCategorySize(int index) return pFW->GetBmCategory(index)->GetBookmarksCount(); } -Tizen::Base::String BookMarkManager::GetSMSTextMyPosition(double lat, double lon) +namespace detail { - Framework * pFW = GetFramework(); - - String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); +Tizen::Base::String FormatSMSString(Tizen::Base::String message, Tizen::Base::String const & url) +{ + message.Replace("%1$s", url); + String s2 = "http://ge0.me/"; + String s3; + url.SubString(6, s3); + s2.Append(s3); + message.Replace("%2$s", s2); + return message; +} - String r = GetString(IDS_MY_POSITION_SHARE_SMS); - r.Replace("%1$s", s); +Tizen::Base::String FormatEmailString(Tizen::Base::String message, Tizen::Base::String const & description, Tizen::Base::String const & url) +{ + message.Replace("%1$s", description); + message.Replace("%2$s", url); String s2 = "http://ge0.me/"; String s3; - s.SubString(6, s3); + url.SubString(6, s3); s2.Append(s3); - r.Replace("%2$s", s2); - return r; + message.Replace("%3$s", s2); + return message; +} + +} + +Tizen::Base::String BookMarkManager::GetSMSTextMyPosition(double lat, double lon) +{ + Framework * pFW = GetFramework(); + String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String r = GetString(IDS_MY_POSITION_SHARE_SMS); + return detail::FormatSMSString(r, s); } Tizen::Base::String BookMarkManager::GetSMSTextMark(UserMark const * pMark) { if (!pMark) return ""; - - double lat; - double lon; - + double lat,lon; pMark->GetLatLon(lat, lon); Framework * pFW = GetFramework(); - String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_BOOKMARK_SHARE_SMS); + return detail::FormatSMSString(r, s); +} +Tizen::Base::String BookMarkManager::GetEmailTextMyPosition(double lat, double lon) +{ + search::AddressInfo info; + double y = MercatorBounds::LatToY(lat); + double x = MercatorBounds::LonToX(lon); + Framework * pFW = GetFramework(); + pFW->GetAddressInfoForGlobalPoint(m2::PointD(x, y), info); + String const & description = info.FormatNameAndAddress().c_str(); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_MY_POSITION_SHARE_EMAIL); + return detail::FormatEmailString(r, description, s); +} - String r = GetString(IDS_BOOKMARK_SHARE_SMS); - r.Replace("%1$s", s); - String s2 = "http://ge0.me/"; - String s3; - s.SubString(6, s3); - s2.Append(s3); - r.Replace("%2$s", s2); - return r; +Tizen::Base::String BookMarkManager::GetEmailTextMark(UserMark const * pMark) +{ + Framework * pFW = GetFramework(); + String const & description = GetMarkName(pMark); + double lat,lon; + pMark->GetLatLon(lat, lon); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_MY_POSITION_SHARE_EMAIL); + return detail::FormatEmailString(r, description, s); } }//bookmark diff --git a/tizen/MapsWithMe/src/MapsWithMeForm.cpp b/tizen/MapsWithMe/src/MapsWithMeForm.cpp index 6551860daa..320bb86280 100644 --- a/tizen/MapsWithMe/src/MapsWithMeForm.cpp +++ b/tizen/MapsWithMe/src/MapsWithMeForm.cpp @@ -569,10 +569,13 @@ void MapsWithMeForm::OnListViewItemStateChanged(ListView & listView, int index, double lat, lon; if (GetFramework()->GetCurrentPosition(lat, lon)) { - String textVal = bookmark::GetBMMnger().GetSMSTextMyPosition(lat, lon); + String textValSMS = bookmark::GetBMMnger().GetSMSTextMyPosition(lat, lon); + String textValEmail = bookmark::GetBMMnger().GetEmailTextMyPosition(lat, lon); ArrayList * pList = new ArrayList; pList->Construct(); - pList->Add(new String(textVal)); + pList->Add(new String(textValSMS)); + pList->Add(new String(textValEmail)); + pList->Add(new Boolean(true)); // my position not mark SceneManager * pSceneManager = SceneManager::GetInstance(); pSceneManager->GoForward(ForwardSceneTransition(SCENE_SHARE_POSITION, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_KEEP), pList); diff --git a/tizen/MapsWithMe/src/SharePositionForm.cpp b/tizen/MapsWithMe/src/SharePositionForm.cpp index 7ac5c0d402..a4a620a928 100644 --- a/tizen/MapsWithMe/src/SharePositionForm.cpp +++ b/tizen/MapsWithMe/src/SharePositionForm.cpp @@ -36,6 +36,10 @@ result SharePositionForm::OnInitializing(void) pMessageButton->SetActionId(ID_SEND_MESSAGE); pMessageButton->AddActionEventListener(*this); + Button * pEmailButton = static_cast<Button *>(GetControl(IDC_EMAIL, true)); + pEmailButton->SetActionId(ID_SEND_EMAIL); + pEmailButton->AddActionEventListener(*this); + Button * pCopyButton = static_cast<Button *>(GetControl(IDC_COPY_MARK, true)); pCopyButton->SetActionId(ID_COPY_TO_CLIPBOARD); pCopyButton->AddActionEventListener(*this); @@ -44,6 +48,7 @@ result SharePositionForm::OnInitializing(void) pCancelButton->SetActionId(ID_CANCEL); pCancelButton->AddActionEventListener(*this); + m_sharePosition = true; SetFormBackEventListener(this); return E_SUCCESS; } @@ -62,7 +67,7 @@ void SharePositionForm::OnActionPerformed(Tizen::Ui::Control const & source, int { Clipboard* pClipboard = Clipboard::GetInstance(); ClipboardItem item; - item.Construct(Tizen::Ui::CLIPBOARD_DATA_TYPE_TEXT, m_message); + item.Construct(Tizen::Ui::CLIPBOARD_DATA_TYPE_TEXT, m_messageEmail); pClipboard->CopyItem(item); SceneManager* pSceneManager = SceneManager::GetInstance(); @@ -77,7 +82,7 @@ void SharePositionForm::OnActionPerformed(Tizen::Ui::Control const & source, int String typeKey = L"http://tizen.org/appcontrol/data/messagetype"; String typeVal = L"sms"; String textKey = L"http://tizen.org/appcontrol/data/text"; - String textVal = m_message; + String textVal = m_messageSMS; String toKey = L"http://tizen.org/appcontrol/data/to"; String toVal = L""; extraData.Add(&typeKey, &typeVal); @@ -95,6 +100,35 @@ void SharePositionForm::OnActionPerformed(Tizen::Ui::Control const & source, int pSceneManager->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT)); break; } + + case ID_SEND_EMAIL: + { + HashMap extraData; + extraData.Construct(); + String subjectKey = L"http://tizen.org/appcontrol/data/subject"; + String subjectVal = m_sharePosition ? GetString(IDS_MY_POSITION_SHARE_EMAIL_SUBJECT) : GetString(IDS_BOOKMARK_SHARE_EMAIL_SUBJECT); + String textKey = L"http://tizen.org/appcontrol/data/text"; + String textVal = m_messageEmail; + String toKey = L"http://tizen.org/appcontrol/data/to"; + String toVal = L""; + String ccKey = L"http://tizen.org/appcontrol/data/cc"; + String ccVal = L""; + String bccKey = L"://tizen.org/appcontrol/data/bcc"; + String bccVal = L""; + extraData.Add(&subjectKey, &subjectVal); + extraData.Add(&textKey, &textVal); + extraData.Add(&toKey, &toVal); + extraData.Add(&ccKey, &ccVal); + extraData.Add(&bccKey, &bccVal); + AppControl* pAc = AppManager::FindAppControlN(L"tizen.email", + L"http://tizen.org/appcontrol/operation/compose"); + if (pAc) + { + pAc->Start(null, null, &extraData, null); + delete pAc; + } + break; + } } Invalidate(true); } @@ -108,14 +142,16 @@ void SharePositionForm::OnFormBackRequested(Tizen::Ui::Controls::Form & source) void SharePositionForm::OnSceneActivatedN(Tizen::Ui::Scenes::SceneId const & previousSceneId, Tizen::Ui::Scenes::SceneId const & currentSceneId, Tizen::Base::Collection::IList* pArgs) { - m_message = ""; if (pArgs != null) { - if (pArgs->GetCount() == 1) + if (pArgs->GetCount() == 3) { - String * pMessage = dynamic_cast<String *>(pArgs->GetAt(0)); - m_message = *pMessage; + String * pMessageSMS = dynamic_cast<String *>(pArgs->GetAt(0)); + m_messageSMS = *pMessageSMS; + String * pMessageEmail = dynamic_cast<String *>(pArgs->GetAt(1)); + m_messageEmail = *pMessageEmail; + Boolean * pSharePosition = dynamic_cast<Boolean *>(pArgs->GetAt(2)); + m_sharePosition = pSharePosition->value; } } - } |