mirror/MuditaOS
1
0
Fork 0
mirror of https://github.com/mudita/MuditaOS.git synced 2026-07-23 14:34:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

[EGD-3155] Remove label with second address line

Browse Source
This commit is contained in:
Pawel Olejniczak
2020-05-07 18:12:07 +02:00
committed by pawel-mudita
parent 660d51c405
commit 443ea202e8
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module-apps/application-phonebook/windows/PhonebookContact.cpp
View File

@@ -275,16 +275,6 @@ namespace gui
RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES,
Alignment(Alignment::ALIGN_HORIZONTAL_LEFT, Alignment::ALIGN_VERTICAL_CENTER));
addressLine2 = addLabel(&page1,
30,
508,
422,
33,
"",
style::window::font::big,
RectangleEdgeFlags::GUI_RECT_EDGE_NO_EDGES,
Alignment(Alignment::ALIGN_HORIZONTAL_LEFT, Alignment::ALIGN_VERTICAL_CENTER));
noteLabel = addLabel(&page2,
30,
203,
@@ -418,7 +408,6 @@ namespace gui
email->setY(363 - 66);
addressLabel->setY(429 - 33);
address->setY(475 - 33);
addressLine2->setY(508 - 33);
}
if (contact->numbers.size() == 1) {
@@ -438,7 +427,6 @@ namespace gui
email->setY(363 - 33);
addressLabel->setY(429 - 33);
address->setY(475 - 33);
addressLine2->setY(508 - 33);
}
if (contact->numbers.size() == 2) {
@@ -448,7 +436,6 @@ namespace gui
email->setY(363);
addressLabel->setY(429);
address->setY(475);
addressLine2->setY(508);
}
if (contact->mail.length() > 0) {

1
module-apps/application-phonebook/windows/PhonebookContact.hpp
View File

@@ -60,7 +60,6 @@ namespace gui
Label *ifnormation = nullptr;
Label *addressLabel = nullptr;
Label *address = nullptr;
Label *addressLine2 = nullptr;
Label *email = nullptr;
Label *numberPrimary = nullptr;
Label *numberSecondary = nullptr;

2
module-db/Interface/ContactRecord.hpp
View File

@@ -53,7 +53,7 @@ struct ContactRecord
if (type == NameFormatType::List && numbers.size() > 0) {
return numbers[0].numberUser;
}
return type == NameFormatType::Default ? "" : utils::localize.get("no_name");
return type == NameFormatType::Default ? "" : utils::localize.get("app_phonebook_contact_no_name");
}
};