Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 23:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-2258: change login label and suggest email instead of username.

Browse Source
This commit is contained in:
Xavier Michelon
2023-01-17 11:29:28 +01:00
parent a377384553
commit fe009ca235
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp
View File

@ -55,6 +55,14 @@ void User::update(User const &user) {
}
//****************************************************************************************************************************************************
/// \return The user's primary email. If not known, return turn username
//****************************************************************************************************************************************************
QString User::primaryEmailOrUsername() const {
return addresses_.isEmpty() ? username_ : addresses_.front();
}
//****************************************************************************************************************************************************
/// \param[in] makeItActive Should split mode be made active.
//****************************************************************************************************************************************************

1
internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.h
View File

@ -73,6 +73,7 @@ public: // member functions.
User &operator=(User const &) = delete; ///< Disabled assignment operator.
User &operator=(User &&) = delete; ///< Disabled move assignment operator.
void update(User const &user); ///< Update the user.
Q_INVOKABLE QString primaryEmailOrUsername() const; ///< Return the user primary email, or, if unknown its username.
public slots:
// slots for QML generated calls