From dfac217dce9f65b68836f32a70a934207b178386 Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Tue, 19 Oct 2021 17:23:35 +0200 Subject: [PATCH] [EGD-7353] Application Messages String fixes Application Messages String fixes. --- image/assets/lang/Deutsch.json | 1 + image/assets/lang/English.json | 5 +++-- image/assets/lang/Espanol.json | 1 + image/assets/lang/Francais.json | 1 + image/assets/lang/Polski.json | 1 + image/assets/lang/Svenska.json | 1 + .../application-messages/windows/NewMessage.cpp | 2 +- .../application-phonebook/data/PhonebookStyle.hpp | 4 ---- .../widgets/InputBoxWithLabelAndIconWidget.cpp | 6 ++---- .../windows/PhonebookMainWindow.cpp | 13 ++++++++++--- .../windows/network/SimContactsImportWindow.cpp | 2 +- module-gui/gui/widgets/Style.hpp | 1 + 12 files changed, 23 insertions(+), 15 deletions(-) diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json index aa69f016d9cbfe30476bf32b95a0b13750fb26f8..a53fbe46993c71c5ac412a841861f5bc5d77ddf1 100644 --- a/image/assets/lang/Deutsch.json +++ b/image/assets/lang/Deutsch.json @@ -12,6 +12,7 @@ "common_ok": "BESTÄTIGEN", "common_back": "ZURÜCK", "common_skip": "ÜBERSPRINGEN", + "common_contacts": "KONTAKTE", "common_set": "EINSTELLEN", "common_yes": "Ja", "common_no": "Nein", diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index 3d708e0eb870f44814814ce2c8b3523c79a7accf..4f314733a4abb1f7e087468e22a53d0d3fdef0b7 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -13,6 +13,7 @@ "common_ok": "OK", "common_back": "BACK", "common_skip": "SKIP", + "common_contacts": "CONTACTS", "common_set": "SET", "common_show": "SHOW", "common_yes": "Yes", @@ -287,7 +288,7 @@ "app_messages_title_main": "Messages", "app_messages_no_messages": "No messages yet.

Press left arrow to add new.

", "app_messages_thread_delete_confirmation": "Delete this conversation?", - "app_messages_message_delete_confirmation": "

Do you really want to delete

this message?", + "app_messages_message_delete_confirmation": "Delete this message?", "app_messages_thread_no_result": "There are no results", "app_messages_message": "Message", "app_messages_templates": "Templates", @@ -543,7 +544,7 @@ "app_music_player_music_empty_window_notification": "No songs yet", "app_special_input_window": "Special characters", "app_emoji_input_window": "Emoji", - "sms_add_rec_num": "Add recipient or type a number", + "sms_add_rec_num": "Add contact or type a number", "sms_title_message": "New message", "sms_call_text": "Call ", "sms_resend_failed": "Send again", diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json index 5195ed15f81f51ce6cc7bcec55edc60a6f33b9f7..bc93740fae72c2185f2f3b69d480ff049182ad48 100644 --- a/image/assets/lang/Espanol.json +++ b/image/assets/lang/Espanol.json @@ -12,6 +12,7 @@ "common_ok": "OK", "common_back": "ATRÁS", "common_skip": "OMITIR", + "common_contacts": "CONTACTOS", "common_set": "ESTABLECER", "common_yes": "Sí", "common_no": "No", diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json index 6b4b624cd0db2b9837be161eb4f2e9102339d8cc..9e00aff3e2ea27ce53126ae302d4730c047eadf0 100644 --- a/image/assets/lang/Francais.json +++ b/image/assets/lang/Francais.json @@ -12,6 +12,7 @@ "common_ok": "OK", "common_back": "RETOUR", "common_skip": "SAUTER", + "common_contacts": "CONTACTS", "common_set": "DÉFINIR", "common_yes": "Oui", "common_no": "Non", diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json index 63dc8b2119e813546c6e81d00edf7c546655fa24..d549972ca9d7466f0c1bf12b3612a3c926bcc1d2 100644 --- a/image/assets/lang/Polski.json +++ b/image/assets/lang/Polski.json @@ -12,6 +12,7 @@ "common_ok": "OK", "common_back": "WRÓĆ", "common_skip": "POMIŃ", + "common_contacts": "KONTAKTY", "common_set": "USTAW", "common_yes": "Tak", "common_no": "Nie", diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index ad9b03aec2695620c68773d8b63a85d1fc3e9092..a83ee5df4c2ed7ce2d0d9b349f0e29e40c5df3b6 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -11,6 +11,7 @@ "common_use": "ANVÄND", "common_ok": "OK", "common_back": "TILLBAKA", + "common_contacts": "KONTAKTER", "common_set": "VÄLJ", "common_yes": "Ja", "common_no": "Nej", diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp index 5ecdb25d5679e24a9fc30973b30a0177b47b2be2..10a044c52d41f5d4aa8988d1724c5f6a67e1d423 100644 --- a/module-apps/application-messages/windows/NewMessage.cpp +++ b/module-apps/application-messages/windows/NewMessage.cpp @@ -170,7 +170,7 @@ namespace gui if (getFocusItem() == recipient) { bottomBar->setActive(BottomBar::Side::LEFT, false); if (recipient->getText().empty()) { - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::contacts)); return; } bottomBar->setActive(BottomBar::Side::CENTER, false); diff --git a/module-apps/application-phonebook/data/PhonebookStyle.hpp b/module-apps/application-phonebook/data/PhonebookStyle.hpp index f624e5ec2bfed6018014df13b2bf24faadb4b7c9..63447760ac7157921c25f83c4dc8bec6a825696a 100644 --- a/module-apps/application-phonebook/data/PhonebookStyle.hpp +++ b/module-apps/application-phonebook/data/PhonebookStyle.hpp @@ -98,10 +98,6 @@ namespace phonebookStyle inline constexpr uint32_t input_box_h = h; inline constexpr int32_t input_box_right_margin = 20; - inline constexpr uint32_t description_label_w = 280; - inline constexpr uint32_t description_label_h = 33; - inline constexpr int32_t description_label_right_margin = 40; - inline constexpr int32_t tick_image_left_margin = -64; inline constexpr int32_t tick_image_right_margin = 32; diff --git a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp index 09be0e42a32b7bf67e762fab069829633ba099a9..62fece26fc1a72299cdf71fef0a89f77698c9bb4 100644 --- a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp +++ b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp @@ -50,10 +50,8 @@ namespace gui tickImage->activeItem = false; descriptionLabel = new gui::Label(hBox, 0, 0, 0, 0); - descriptionLabel->setMaximumSize(phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_w, - phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_h); - descriptionLabel->setMargins( - gui::Margins(0, 0, phonebookStyle::inputBoxWithLabelAndIconIWidget::description_label_right_margin, 0)); + descriptionLabel->setMaximumSize(phonebookStyle::inputBoxWithLabelAndIconIWidget::w, + phonebookStyle::inputBoxWithLabelAndIconIWidget::h); descriptionLabel->setEdges(gui::RectangleEdge::None); descriptionLabel->setAlignment(Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center)); descriptionLabel->setFont(style::window::font::medium); diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp index 13bd2570d5488155cd1aeafa9b4d6ed5b6217a4c..71ecc3d7b6604b198779b926e50e9ef54da7471b 100644 --- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp +++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp @@ -99,6 +99,10 @@ namespace gui std::make_unique(application->GetName(), std::move(data))); }; + bottomBar->setActive(BottomBar::Side::LEFT, false); + bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::add)); + bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + header->navigationIndicatorRemove(gui::header::BoxSelection::Left); header->navigationIndicatorRemove(gui::header::BoxSelection::Right); } @@ -181,10 +185,13 @@ namespace gui void PhonebookMainWindow::onListFilled() { - bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); + if (!isSearchRequested()) { + bottomBar->setActive(gui::BottomBar::Side::LEFT, true); + bottomBar->setActive(gui::BottomBar::Side::CENTER, true); + header->navigationIndicatorAdd(new gui::header::SearchAction(), gui::header::BoxSelection::Right); + } + emptyListIcon->setVisible(false); - header->navigationIndicatorAdd(new gui::header::SearchAction(), gui::header::BoxSelection::Right); application->refreshWindow(RefreshModes::GUI_REFRESH_DEEP); } } /* namespace gui */ diff --git a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp index 8968a51e237e6e51e3c96f6542985a76bb0b6a34..f5ec1e44dbe22b9a573c65aeeb6245f49152a2df 100644 --- a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp +++ b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp @@ -163,7 +163,7 @@ namespace gui emptyListIcon->image->set("success_icon_W_G"); bottomBar->setActive(BottomBar::Side::RIGHT, false); bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(::style::strings::common::ok)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate("app_desktop_menu_contacts")); + bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(::style::strings::common::contacts)); onLFInputCallback = [&]() { app::manager::Controller::sendAction(application, app::manager::actions::ShowContacts); diff --git a/module-gui/gui/widgets/Style.hpp b/module-gui/gui/widgets/Style.hpp index 8955c443989644a021c08d832893ea0e6dc2ef62..097ae49d459b1c82f3d517627cfb31b11864d4a7 100644 --- a/module-gui/gui/widgets/Style.hpp +++ b/module-gui/gui/widgets/Style.hpp @@ -176,6 +176,7 @@ namespace style inline constexpr auto ok = "common_ok"; inline constexpr auto back = "common_back"; inline constexpr auto skip = "common_skip"; + inline constexpr auto contacts = "common_contacts"; inline constexpr auto set = "common_set"; inline constexpr auto show = "common_show"; inline constexpr auto yes = "common_yes";