data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show real error message on login if exists

Browse source 
fix windows packaging

icon button
This commit is contained in:
gaelle 2025-02-17 10:22:00 +01:00
parent 344b6600c1
commit b4b573a027
6 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Linphone/core/login/LoginPage.cpp
View file

@ -70,12 +70,15 @@ void LoginPage::login(const QString &username,
// Create on Model thread. // Create on Model thread.
AccountManager *accountManager = new AccountManager(); AccountManager *accountManager = new AccountManager();
connect(accountManager, &AccountManager::registrationStateChanged, this, connect(accountManager, &AccountManager::registrationStateChanged, this,
[accountManager, this](linphone::RegistrationState state) mutable { [accountManager, this](linphone::RegistrationState state, QString message) mutable {
// View thread // View thread
setRegistrationState(state); setRegistrationState(state);
switch (state) { switch (state) {
case linphone::RegistrationState::Failed: { case linphone::RegistrationState::Failed: {
setErrorMessage(QString(tr("Le couple identifiant mot de passe ne correspond pas"))); if (message.isEmpty())
setErrorMessage(QString(tr("Le couple identifiant mot de passe ne correspond pas")));
else
setErrorMessage(message);
if (accountManager) { if (accountManager) {
accountManager->deleteLater(); accountManager->deleteLater();
accountManager = nullptr; accountManager = nullptr;

4
Linphone/model/account/AccountManager.cpp
View file

@ -137,8 +137,8 @@ bool AccountManager::login(QString username,
emit mAccountModel->removeListener(); emit mAccountModel->removeListener();
mAccountModel = nullptr; mAccountModel = nullptr;
} }
} }
emit registrationStateChanged(state); emit registrationStateChanged(state, QString::fromStdString(message));
}); });
auto status = core->addAccount(account); auto status = core->addAccount(account);
if (status == -1) { if (status == -1) {

2
Linphone/model/account/AccountManager.hpp
View file

@ -55,7 +55,7 @@ public:
void linkNewAccountUsingCode(const QString &code, RegisterType registerType, const QString &sipAddress); void linkNewAccountUsingCode(const QString &code, RegisterType registerType, const QString &sipAddress);
signals: signals:
void registrationStateChanged(linphone::RegistrationState state); void registrationStateChanged(linphone::RegistrationState state, QString message = QString());
void newAccountCreationSucceed(QString sipAddress, RegisterType registerType, const QString &registerAddress); void newAccountCreationSucceed(QString sipAddress, RegisterType registerType, const QString &registerAddress);
void registerNewAccountFailed(const QString &error); void registerNewAccountFailed(const QString &error);
void tokenConversionSucceed(QString convertedToken); void tokenConversionSucceed(QString convertedToken);

5
Linphone/view/CMakeLists.txt
View file

@ -6,8 +6,9 @@ list(APPEND _LINPHONEAPP_QML_FILES
view/Control/Button/CheckBox.qml view/Control/Button/CheckBox.qml
view/Control/Button/ComboBox.qml view/Control/Button/ComboBox.qml
view/Control/Button/HelpIconLabelButton.qml view/Control/Button/HelpIconLabelButton.qml
view/Control/Button/IconLabelButton.qml view/Control/Button/IconButton.qml
view/Control/Button/BigButton.qml view/Control/Button/IconLabelButton.qml
view/Control/Button/BigButton.qml
view/Control/Button/RoundButton.qml view/Control/Button/RoundButton.qml
view/Control/Button/MediumButton.qml view/Control/Button/MediumButton.qml
view/Control/Button/SmallButton.qml view/Control/Button/SmallButton.qml

40
Linphone/view/Control/Button/IconButton.qml Normal file
View file

@ -0,0 +1,40 @@
import QtQuick
import QtQuick.Effects
import QtQuick.Layouts
import Linphone
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
Button {
id: mainItem
icon.width: 24 * DefaultStyle.dp
icon.height: 24 * DefaultStyle.dp
textSize: 14 * DefaultStyle.dp
textWeight: 400 * DefaultStyle.dp
radius: 5 * DefaultStyle.dp
shadowEnabled: mainItem.activeFocus || hovered
style: ButtonStyle.hoveredBackground
background: Rectangle {
anchors.fill: parent
radius: mainItem.radius
color: mainItem.pressed
? mainItem.pressedColor
: mainItem.hovered || mainItem.hasNavigationFocus
? mainItem.hoveredColor
: mainItem.color
border.color: mainItem.borderColor
}
contentItem: EffectImage {
imageSource: mainItem.icon.source
imageWidth: mainItem.icon.width
imageHeight: mainItem.icon.height
colorizationColor: mainItem.pressed
? mainItem.pressedImageColor
: mainItem.hovered
? mainItem.hoveredImageColor
: mainItem.contentImageColor
Layout.preferredWidth: mainItem.icon.width
Layout.preferredHeight: mainItem.icon.height
}
}

4
cmake/install/install.cmake
View file

@ -120,12 +120,12 @@ elseif(WIN32)
NAMES msys2_shell.cmd NAMES msys2_shell.cmd
HINTS "C:/msys64/" HINTS "C:/msys64/"
) )
include(InstallRequiredSystemLibraries)
set(MSVC_VERSION ${MSVC_TOOLSET_VERSION}) set(MSVC_VERSION ${MSVC_TOOLSET_VERSION})
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE) set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
endif() endif()
include(InstallRequiredSystemLibraries)
find_file(UCRTBASE_LIB "ucrtbase.dll" PATHS "C:/Windows/System32") find_file(UCRTBASE_LIB "ucrtbase.dll" PATHS "C:/Windows/System32")
install(FILES ${UCRTBASE_LIB} DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES ${UCRTBASE_LIB} DESTINATION "${CMAKE_INSTALL_BINDIR}")