From fd2b1d22d392042b20e8d496777a4479672e5480 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 14 Feb 2020 15:23:37 +0100 Subject: [PATCH] -Fix ICE/STUN connexion and saving state -Remove error on warning for building SDK -Add missing files in Qt ressources --- CMakeLists.txt | 14 ++--- build_all_linux.sh | 8 +-- resources.qrc | 2 + src/components/other/colors/Colors.hpp | 54 +++++++++---------- .../settings/AccountSettingsModel.cpp | 26 +++++---- 5 files changed, 54 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a83d4b8f..37b92e60f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ if (NOT WIN32) -Wall \ -Wcast-align \ -Wconversion \ +-Wno-error=conversion \ -Werror=return-type \ -Wextra \ -Wfloat-equal \ @@ -117,14 +118,16 @@ if (NOT WIN32) -Woverloaded-virtual \ -Wpointer-arith \ -Wsign-conversion \ +-Wno-error=sign-conversion \ -Wuninitialized \ -Wunused \ +-Wno-error=float-equal \ ") if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wlogical-op") endif () if (SUGGEST_OVERRIDE) - set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wsuggest-override -Werror=suggest-override") + set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wsuggest-override") endif () elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CUSTOM_FLAGS "${CUSTOM_FLAGS} -Wno-switch") @@ -403,15 +406,6 @@ else() list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/views") - set(QML_IMPORT_PATH ${_QML_IMPORT_PATHS} CACHE STRING "Path used to locate CMake modules by Qt Creator" FORCE) - - - set(_QML_IMPORT_PATHS "") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/modules") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/dev-modules") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/scripts") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/views") - set(QML_IMPORT_PATH ${_QML_IMPORT_PATHS} CACHE STRING "Path used to locate CMake modules by Qt Creator" FORCE) # ------------------------------------------------------------------------------ diff --git a/build_all_linux.sh b/build_all_linux.sh index fac87455f..96b714837 100755 --- a/build_all_linux.sh +++ b/build_all_linux.sh @@ -36,17 +36,17 @@ mkdir -p build-desktop #Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop. #SDK building cd build-desktop -cmake .. -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_VPX=YES -DENABLE_GPL_THIRD_PARTIES=YES -DENABLE_NON_FREE_CODECS=YES -DENABLE_AMRNB=YES -DENABLE_AMRWB=YES -DENABLE_G729=YES -DENABLE_GSM=YES -DENABLE_ILBC=YES -DENABLE_ISAC=YES -DENABLE_SILK=YES -DENABLE_SPEEX=YES -DENABLE_H263=YES -DENABLE_H263P=YES -DENABLE_MPEG4=YES -DENABLE_OPENH264=YES -DENABLE_FFMPEG=YES -DENABLE_VIDEO=YES -DENABLE_GL=YES -DENABLE_OPUS=NO -#cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo +#cmake .. -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_VPX=YES -DENABLE_GPL_THIRD_PARTIES=YES -DENABLE_NON_FREE_CODECS=YES -DENABLE_AMRNB=YES -DENABLE_AMRWB=YES -DENABLE_G729=YES -DENABLE_GSM=YES -DENABLE_ILBC=YES -DENABLE_ISAC=YES -DENABLE_SILK=YES -DENABLE_SPEEX=YES -DENABLE_H263=YES -DENABLE_H263P=YES -DENABLE_MPEG4=YES -DENABLE_OPENH264=YES -DENABLE_FFMPEG=YES -DENABLE_VIDEO=YES -DENABLE_GL=YES -DENABLE_OPUS=NO +cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WSI_WAYLAND_SUPPORT=OFF cmake --build . --target all --config RelWithDebInfo --parallel 10 #MiniZip Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WSI_WAYLAND_SUPPORT=OFF cmake --build . --target minizip --config RelWithDebInfo --parallel 10 cmake --build . --target install #Desktop Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WSI_WAYLAND_SUPPORT=OFF cmake --build . --target all --config RelWithDebInfo --parallel 10 cmake --build . --target install diff --git a/resources.qrc b/resources.qrc index d85bde972..2e91f697b 100644 --- a/resources.qrc +++ b/resources.qrc @@ -478,5 +478,7 @@ ui/views/App/Styles/Settings/SettingsWindowStyle.qml assets/images/linphone_logo.svg ui/views/App/Main/MainWindowTopMenuBar.qml + ui/dev-modules/Colors/Colors.qml + ui/dev-modules/Units/Units.qml diff --git a/src/components/other/colors/Colors.hpp b/src/components/other/colors/Colors.hpp index 5ba4d76fb..8e32493b1 100644 --- a/src/components/other/colors/Colors.hpp +++ b/src/components/other/colors/Colors.hpp @@ -52,54 +52,54 @@ namespace linphone { } class Colors : public QObject { - Q_OBJECT; + Q_OBJECT - Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT); + Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT) - ADD_COLOR(a, "transparent"); + ADD_COLOR(a, "transparent") // Primary color for hovered items. - ADD_COLOR(b, "#D64D00"); + ADD_COLOR(b, "#D64D00") - ADD_COLOR(c, "#CBCBCB"); - ADD_COLOR(d, "#5A585B"); - ADD_COLOR(e, "#F3F3F3"); - ADD_COLOR(f, "#E8E8E8"); - ADD_COLOR(g, "#6B7A86"); - ADD_COLOR(h, "#687680"); + ADD_COLOR(c, "#CBCBCB") + ADD_COLOR(d, "#5A585B") + ADD_COLOR(e, "#F3F3F3") + ADD_COLOR(f, "#E8E8E8") + ADD_COLOR(g, "#6B7A86") + ADD_COLOR(h, "#687680") // Primary color. - ADD_COLOR(i, "#FE5E00"); + ADD_COLOR(i, "#FE5E00") - ADD_COLOR(j, "#4B5964"); + ADD_COLOR(j, "#4B5964") // Popups, home, call, assistant and settings background. - ADD_COLOR(k, "#FFFFFF"); + ADD_COLOR(k, "#FFFFFF") - ADD_COLOR(l, "#000000"); + ADD_COLOR(l, "#000000") // Primary color for clicked items. - ADD_COLOR(m, "#FF8600"); + ADD_COLOR(m, "#FF8600") - ADD_COLOR(n, "#A1A1A1"); - ADD_COLOR(o, "#D0D8DE"); + ADD_COLOR(n, "#A1A1A1") + ADD_COLOR(o, "#D0D8DE") // Progress bar. - ADD_COLOR(p, "#17A81A"); + ADD_COLOR(p, "#17A81A") // Fields, backgrounds and text color on some items. - ADD_COLOR(q, "#FFFFFF"); + ADD_COLOR(q, "#FFFFFF") // Field error. - ADD_COLOR(error, "#FF0000"); + ADD_COLOR(error, "#FF0000") - ADD_COLOR_WITH_ALPHA(g, 10); - ADD_COLOR_WITH_ALPHA(g, 20); - ADD_COLOR_WITH_ALPHA(g, 90); - ADD_COLOR_WITH_ALPHA(i, 30); - ADD_COLOR_WITH_ALPHA(l, 50); - ADD_COLOR_WITH_ALPHA(l, 80); - ADD_COLOR_WITH_ALPHA(q, 50); + ADD_COLOR_WITH_ALPHA(g, 10) + ADD_COLOR_WITH_ALPHA(g, 20) + ADD_COLOR_WITH_ALPHA(g, 90) + ADD_COLOR_WITH_ALPHA(i, 30) + ADD_COLOR_WITH_ALPHA(l, 50) + ADD_COLOR_WITH_ALPHA(l, 80) + ADD_COLOR_WITH_ALPHA(q, 50) public: Colors (QObject *parent = Q_NULLPTR); diff --git a/src/components/settings/AccountSettingsModel.cpp b/src/components/settings/AccountSettingsModel.cpp index 8fb3fef93..9ce1b7933 100644 --- a/src/components/settings/AccountSettingsModel.cpp +++ b/src/components/settings/AccountSettingsModel.cpp @@ -135,16 +135,20 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr
  • getState()); shared_ptr natPolicy = proxyConfig->getNatPolicy(); - if (!natPolicy) - natPolicy = proxyConfig->getCore()->createNatPolicy(); + bool createdNat = !natPolicy; + if (createdNat) + natPolicy = proxyConfig->getCore()->createNatPolicy(); map["iceEnabled"] = natPolicy->iceEnabled(); map["turnEnabled"] = natPolicy->turnEnabled(); const string &turnUser(natPolicy->getStunServerUsername()); const string &stunServer(natPolicy->getStunServer()); - map["turnUser"] = Utils::coreStringToAppString(turnUser); - map["stunServer"] = Utils::coreStringToAppString(stunServer); + map["turnUser"] = QString::fromStdString(turnUser); + map["stunServer"] = QString::fromStdString(stunServer); + + if (createdNat) + proxyConfig->setNatPolicy(natPolicy); shared_ptr authInfo = CoreManager::getInstance()->getCore()->findAuthInfo( "", turnUser, stunServer @@ -237,25 +241,29 @@ bool AccountSettingsModel::addOrUpdateProxyConfig ( ); shared_ptr natPolicy = proxyConfig->getNatPolicy(); - if (!natPolicy) + bool createdNat = !natPolicy; + if (createdNat) natPolicy = proxyConfig->getCore()->createNatPolicy(); natPolicy->enableIce(data["iceEnabled"].toBool()); natPolicy->enableStun(data["iceEnabled"].toBool()); - const string turnUser(Utils::appStringToCoreString(data["turnUser"].toString())); - const string stunServer(Utils::appStringToCoreString(data["stunServer"].toString())); + const string turnUser(data["turnUser"].toString().toStdString()); + const string stunServer(data["stunServer"].toString().toStdString()); natPolicy->enableTurn(data["turnEnabled"].toBool()); natPolicy->setStunServerUsername(turnUser); natPolicy->setStunServer(stunServer); + if( createdNat) + proxyConfig->setNatPolicy(natPolicy); + shared_ptr core(proxyConfig->getCore()); shared_ptr authInfo(core->findAuthInfo("", turnUser, stunServer)); if (authInfo) { shared_ptr clonedAuthInfo(authInfo->clone()); clonedAuthInfo->setUserid(turnUser); clonedAuthInfo->setUsername(turnUser); - clonedAuthInfo->setPassword(Utils::appStringToCoreString(data["turnPassword"].toString())); + clonedAuthInfo->setPassword(data["turnPassword"].toString().toStdString()); core->addAuthInfo(clonedAuthInfo); core->removeAuthInfo(authInfo); @@ -263,7 +271,7 @@ bool AccountSettingsModel::addOrUpdateProxyConfig ( core->addAuthInfo(linphone::Factory::get()->createAuthInfo( turnUser, turnUser, - Utils::appStringToCoreString(data["turnPassword"].toString()), + data["turnPassword"].toString().toStdString(), "", "", ""