diff --git a/README.md b/README.md index 11d8a785a..d92961a07 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,14 @@ Linphone is dual licensed, and is available either : - [Linphone public wiki](https://wiki.linphone.org/xwiki/wiki/public/view/Linphone/) +### Parameters + +`--help` : display available parameters. + +`--verbose` : print logs into stdout/stderr. + +`--qt-logs-only` : print only logs from the application. It strips SDK logs from the output. + ## Getting started Here are the general instructions to build Linphone for desktop. The specific instructions for each build platform is described just below. diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index b08b6c24b..c3852cb26 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -117,6 +117,10 @@ checkForUpdates Zkontrolovat aktualizace + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1411,6 +1415,11 @@ Adresa URL serveru není nakonfigurována. "Export As...": Title of a file dialog to export a file. Exportovat jako… + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2617,6 +2626,11 @@ Klikněte zde: <a href="%1">%1</a> 'Delete data' : Action to delete all data. Odstranit data + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 08f9c8ae4..0ed6b9b9c 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -117,6 +117,10 @@ checkForUpdates Tjek for opdateringer + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ Server url ikke konfigureret. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Klik her: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index d4838a083..424af96f1 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -117,6 +117,10 @@ checkForUpdates Auf Aktualisierungen prüfen + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ Server URL ist nicht konfiguriert. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Klicken Sie hier: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 28ebce10a..0ff8544c0 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -117,6 +117,10 @@ checkForUpdates Check for updates + + commandLineOptionQtLogsOnly + Print only logs from the application + AssistantAbstractView @@ -1401,6 +1405,11 @@ Server URL not configured. "Export As...": Title of a file dialog to export a file. Export As… + + loadFile + "Load": Title of a file dialog to load a file. + Load + HistoryView @@ -2604,6 +2613,12 @@ Click here: <a href="%1">%1</a> 'Delete data' : Action to delete all data. Delete data + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + 'Full logs' : label for an option to activate all logs (debug and traces) + Full logs + SettingsAudio diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index 9dea88389..568294fc4 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -117,6 +117,10 @@ checkForUpdates Buscar actualizaciones + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ URL del servidor no configurada. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Haga clic aquí: <a href="%1">%1 </a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index d8385a059..e98d465ea 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -117,6 +117,10 @@ checkForUpdates Vérifier les mises à jour + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ URL du serveur non configurée. "Export As...": Title of a file dialog to export a file. Exporter vers… + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Cliquez ici : <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' L'application va supprimer toutes ses données. Veuillez confirmer cette suppression. + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 5b12814e6..210c710ac 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -117,6 +117,10 @@ checkForUpdates Frissítések keresése + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1391,6 +1395,11 @@ A kiszolgáló URL-je nincs konfigurálva. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2590,6 +2599,11 @@ Kattintson ide: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 0f1251582..694d29c49 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -117,6 +117,10 @@ checkForUpdates Cerca aggiornamenti + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ URL del server non configurato. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Clicca: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 6cf02ba2c..50a6833d1 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -117,6 +117,10 @@ checkForUpdates アップデートを確認する + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1391,6 +1395,11 @@ "Export As...": Title of a file dialog to export a file. エクスポート… + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2590,6 +2599,11 @@ 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index d12396e7c..af950be30 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -117,6 +117,10 @@ checkForUpdates + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1411,6 +1415,11 @@ Nesukonfigūruotas serverio url. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2616,6 +2625,11 @@ Spustelėkite čia: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index d826a64fb..8ddc75979 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -117,6 +117,10 @@ checkForUpdates Verificar se há atualizações + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ URL do servidor não configurado. "Export As...": Title of a file dialog to export a file. Exportar como… + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Clique aqui: <a href="%1">%1 </a> 'The application will delete your application data files. Do you confirm ?' O aplicativo excluirá seus arquivos de dados do aplicativo. Você confirma ? + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 0d9b445f1..ad5a9ef0c 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -117,6 +117,10 @@ checkForUpdates Проверить обновления + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1411,6 +1415,11 @@ "Export As...": Title of a file dialog to export a file. Экспортировать как... + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2616,6 +2625,11 @@ 'The application will delete your application data files. Do you confirm ?' Файлы данных приложения будут удалены. Продолжить? + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index c9a7d189a..0944f3427 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -117,6 +117,10 @@ checkForUpdates + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1401,6 +1405,11 @@ Serverwebbadressen är inte konfigurerad. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2603,6 +2612,11 @@ Klicka här: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 59b39d476..7318367f7 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -117,6 +117,10 @@ checkForUpdates Güncellemeleri denetle + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1391,6 +1395,11 @@ Sunucu url'si yapılandırılmadı. "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2590,6 +2599,11 @@ Buraya tıklayın: <a href="%1">%1</a> 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index fc05e9510..b553e162a 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -117,6 +117,10 @@ checkForUpdates + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1411,6 +1415,11 @@ "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2616,6 +2625,11 @@ 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index f13eb4be1..ff96cb03e 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -117,6 +117,10 @@ checkForUpdates + + commandLineOptionQtLogsOnly + + AssistantAbstractView @@ -1391,6 +1395,11 @@ "Export As...": Title of a file dialog to export a file. + + loadFile + "Load": Title of a file dialog to load a file. + + HistoryView @@ -2590,6 +2599,11 @@ 'The application will delete your application data files. Do you confirm ?' + + fullLogsEnabledLabel + 'Full logs' : label for an option to activate all logs (debug and traces) + + SettingsAudio diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 1e872707b..83cbafdc8 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -260,6 +260,8 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U if (mParser->isSet("verbose")) Logger::getInstance()->setVerbose(true); + if (mParser->isSet("qt-logs-only")) + Logger::getInstance()->enableQtOnly(true); // List available locales. for (const auto &locale : QDir(Constants::LanguagePath).entryList()) @@ -592,7 +594,8 @@ void App::createParser () { #ifndef Q_OS_MACOS { "iconified", tr("commandLineOptionIconified") }, #endif // ifndef Q_OS_MACOS - { { "V", "verbose" }, tr("commandLineOptionVerbose") } + { { "V", "verbose" }, tr("commandLineOptionVerbose") }, + { "qt-logs-only", tr("commandLineOptionQtLogsOnly") }, }); } diff --git a/linphone-app/src/app/logger/Logger.cpp b/linphone-app/src/app/logger/Logger.cpp index 741a47c06..3a7b24033 100644 --- a/linphone-app/src/app/logger/Logger.cpp +++ b/linphone-app/src/app/logger/Logger.cpp @@ -63,7 +63,7 @@ static inline QByteArray getFormattedCurrentTime () { } // ----------------------------------------------------------------------------- - +// Called from SDK class LinphoneLogger : public linphone::LoggingServiceListener { public: LinphoneLogger (const Logger *logger) : mLogger(logger) {} @@ -75,40 +75,43 @@ private: linphone::LogLevel level, const string &message ) override { - if (!mLogger->isVerbose()) + bool isQtLog = domain==Constants::QtDomain; + if (!mLogger->isVerbose() || (!isQtLog && mLogger->qtOnlyEnabled())) return; - + FILE * out = stdout; using LogLevel = linphone::LogLevel; - const char *format; + QString format = (isQtLog ? PURPLE : YELLOW ) + QString("Core:%s: " RESET "%s\n"); switch (level) { case LogLevel::Debug: - format = GREEN "[%s][Debug]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(GREEN "[%s][Debug]"); break; case LogLevel::Trace: - format = BLUE "[%s][Trace]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(BLUE "[%s][Trace]"); break; case LogLevel::Message: - format = BLUE "[%s][Info]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(BLUE "[%s][Info]"); break; case LogLevel::Warning: - format = RED "[%s][Warning]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(RED "[%s][Warning]"); + out = stderr; break; case LogLevel::Error: - format = RED "[%s][Error]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(RED "[%s][Error]"); + out = stderr; break; case LogLevel::Fatal: - format = RED "[%s][Fatal]" YELLOW "Core:%s: " RESET "%s\n"; + format.prepend(RED "[%s][Fatal]"); + out = stderr; break; } - fprintf( - stderr, - format, + fprintf( out, + qPrintable(format), getFormattedCurrentTime().constData(), domain.empty() ? domain.c_str() : EXECUTABLE_NAME, message.c_str() ); - + fflush(out); if (level == LogLevel::Fatal) terminate(); }; @@ -117,7 +120,7 @@ private: }; // ----------------------------------------------------------------------------- - +// Called from Qt void Logger::log (QtMsgType type, const QMessageLogContext &context, const QString &msg) { const char *format; BctbxLogLevel level; @@ -163,8 +166,6 @@ void Logger::log (QtMsgType type, const QMessageLogContext &context, const QStri mMutex.lock(); - fprintf(stdout, format, dateTime.constData(), QThread::currentThread(), contextStr, localMsg.constData()); - fflush(stdout); if( level == BCTBX_LOG_FATAL) QMessageBox::critical(nullptr, "Linphone will crash", msg); // Print an error message before sending msg to bctoolbox bctbx_log(Constants::QtDomain, level, "QT: %s%s", contextStr, localMsg.constData()); @@ -210,7 +211,26 @@ void Logger::init (const shared_ptr &config) { linphone::Core::setLogCollectionPath(Utils::appStringToCoreString(folder)); linphone::Core::setLogCollectionMaxFileSize(Constants::MaxLogsCollectionSize); + mInstance->enableFullLogs(SettingsModel::getFullLogsEnabled(config)); mInstance->enable(SettingsModel::getLogsEnabled(config)); + +} + +void Logger::enableFullLogs(const bool& full){ + if(mLoggingService){ + mLoggingService->setLogLevel(full ? linphone::LogLevel::Debug : linphone::LogLevel::Message); + } +} + +bool Logger::qtOnlyEnabled() const{ + return mQtOnly; +} + +void Logger::enableQtOnly(const bool& enable){ + mQtOnly = enable; + if(mLoggingService){ + mLoggingService->setDomain(enable ? Constants::QtDomain : ""); + } } QString Logger::getLogText()const{ diff --git a/linphone-app/src/app/logger/Logger.hpp b/linphone-app/src/app/logger/Logger.hpp index 374b49e52..320c88f12 100644 --- a/linphone-app/src/app/logger/Logger.hpp +++ b/linphone-app/src/app/logger/Logger.hpp @@ -44,19 +44,24 @@ public: void enable (bool status); QString getLogText()const; + void enableFullLogs(const bool& full); + bool qtOnlyEnabled() const; + void enableQtOnly(const bool& enable); + static void init (const std::shared_ptr &config); static Logger *getInstance () { return mInstance; } - + private: Logger () = default; static void log (QtMsgType type, const QMessageLogContext &context, const QString &msg); bool mVerbose = false; + bool mQtOnly = false; static QMutex mMutex; static Logger *mInstance; diff --git a/linphone-app/src/components/contact/VcardModel.cpp b/linphone-app/src/components/contact/VcardModel.cpp index f807d756e..b31fa3309 100644 --- a/linphone-app/src/components/contact/VcardModel.cpp +++ b/linphone-app/src/components/contact/VcardModel.cpp @@ -100,11 +100,11 @@ VcardModel::VcardModel (shared_ptr vcard, bool isReadOnly) : QO VcardModel::~VcardModel () { if (!mIsReadOnly) { - qInfo() << QStringLiteral("Destroy detached vcard:") << this; + qDebug() << QStringLiteral("Destroy detached vcard:") << this; if (!mAvatarIsReadOnly) removeBelcardPhoto(mVcard->getVcard()); } else - qInfo() << QStringLiteral("Destroy attached vcard:") << this; + qDebug() << QStringLiteral("Destroy attached vcard:") << this; } // ----------------------------------------------------------------------------- diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 91eb54e0c..3744f5cc5 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -623,15 +623,15 @@ QVariantMap SettingsModel::getVideoDefinition () const { } QVariantMap SettingsModel::getCurrentPreviewVideoDefinition () const { - auto definition = CoreManager::getInstance()->getCore()->getCurrentPreviewVideoDefinition(); - if(definition) - return createMapFromVideoDefinition(definition); - else { - QVariantMap map; - map["width"] = 0; - map["height"] = 0; - return map; + if(CoreManager::getInstance()->getCore()->videoPreviewEnabled()){ + auto definition = CoreManager::getInstance()->getCore()->getCurrentPreviewVideoDefinition(); + if(definition) + return createMapFromVideoDefinition(definition); } + QVariantMap map; + map["width"] = 0; + map["height"] = 0; + return map; } void SettingsModel::setVideoDefinition (const QVariantMap &definition) { @@ -1768,6 +1768,16 @@ void SettingsModel::setLogsEnabled (bool status) { emit logsEnabledChanged(status); } +bool SettingsModel::getFullLogsEnabled () const { + return getFullLogsEnabled(mConfig); +} + +void SettingsModel::setFullLogsEnabled (bool status) { + mConfig->setInt(UiSection, "full_logs_enabled", status); + Logger::getInstance()->enableFullLogs(status); + emit fullLogsEnabledChanged(); +} + // --------------------------------------------------------------------------- QString SettingsModel::getLogsEmail () const { @@ -1849,6 +1859,9 @@ bool SettingsModel::getLogsEnabled (const shared_ptr &config) return config ? config->getInt(UiSection, "logs_enabled", false) : true; } +bool SettingsModel::getFullLogsEnabled (const shared_ptr &config) { + return config ? config->getInt(UiSection, "full_logs_enabled", false) : false; +} // --------------------------------------------------------------------------- bool SettingsModel::getVfsEncrypted (){ diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index 773198710..a65b65f2f 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -226,6 +226,7 @@ class SettingsModel : public QObject { Q_PROPERTY(QString logsFolder READ getLogsFolder WRITE setLogsFolder NOTIFY logsFolderChanged) Q_PROPERTY(QString logsUploadUrl READ getLogsUploadUrl WRITE setLogsUploadUrl NOTIFY logsUploadUrlChanged) Q_PROPERTY(bool logsEnabled READ getLogsEnabled WRITE setLogsEnabled NOTIFY logsEnabledChanged) + Q_PROPERTY(bool fullLogsEnabled READ getFullLogsEnabled WRITE setFullLogsEnabled NOTIFY fullLogsEnabledChanged) Q_PROPERTY(QString logsEmail READ getLogsEmail WRITE setLogsEmail NOTIFY logsEmailChanged) Q_PROPERTY(bool isVfsEncrypted READ getVfsEncrypted NOTIFY vfsEncryptedChanged) @@ -627,6 +628,9 @@ public: bool getLogsEnabled () const; void setLogsEnabled (bool status); + bool getFullLogsEnabled () const; + void setFullLogsEnabled (bool status); + QString getLogsEmail () const; void setLogsEmail (const QString &email); @@ -650,6 +654,7 @@ public: static QString getLogsFolder (const std::shared_ptr &config); static bool getLogsEnabled (const std::shared_ptr &config); + static bool getFullLogsEnabled (const std::shared_ptr &config); // --------------------------------------------------------------------------- Q_INVOKABLE bool isDeveloperSettingsAvailable() const; @@ -834,6 +839,7 @@ signals: void logsFolderChanged (const QString &folder); void logsUploadUrlChanged (const QString &url); void logsEnabledChanged (bool status); + void fullLogsEnabledChanged (); void logsEmailChanged (const QString &email); void vfsEncryptedChanged(); diff --git a/linphone-app/ui/modules/Common/Dialog/FileViewDialog.qml b/linphone-app/ui/modules/Common/Dialog/FileViewDialog.qml index 3b08624bc..71e5d06b7 100644 --- a/linphone-app/ui/modules/Common/Dialog/FileViewDialog.qml +++ b/linphone-app/ui/modules/Common/Dialog/FileViewDialog.qml @@ -94,8 +94,8 @@ DialogPlus{ FileDialog { id: loadAsDialog folder: shortcuts.documents - //: "Load": Title of a file dialog to export a file. - title: 'Load' + //: "Load": Title of a file dialog to load a file. + title: qsTr('loadFile') selectExisting: true //defaultSuffix: Utils.getExtension(mainItem.filePath)// Doesn't seems to work on all platforms onAccepted: { diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml index 1a442c905..5979706b4 100644 --- a/linphone-app/ui/views/App/Main/Conversation.qml +++ b/linphone-app/ui/views/App/Main/Conversation.qml @@ -45,7 +45,7 @@ ColumnLayout { function getPeerAddress() { if(chatRoomModel) { if(chatRoomModel.groupEnabled || chatRoomModel.isSecure()) { - return chatRoomModel.participants.addressesToString; + return chatRoomModel.getPeerAddress(); }else { return chatRoomModel.sipAddress; } @@ -56,7 +56,7 @@ ColumnLayout { function getFullPeerAddress() { if(chatRoomModel) { if(chatRoomModel.groupEnabled || chatRoomModel.isSecure()) { - return chatRoomModel.participants.addressesToString; + return chatRoomModel.getFullPeerAddress() }else { return chatRoomModel.sipAddress; } diff --git a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml index 6cdcc97a9..14d9c5856 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml @@ -69,6 +69,16 @@ TabContainer { onClicked: SettingsModel.logsEnabled = !checked } } + FormGroup { + //: 'Full logs' : label for an option to activate all logs (debug and traces) + label: qsTr('fullLogsEnabledLabel') + + Switch { + checked: SettingsModel.fullLogsEnabled + + onClicked: SettingsModel.fullLogsEnabled = !checked + } + } } } Row { diff --git a/linphone-sdk b/linphone-sdk index 2eadea705..ac8896ff5 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 2eadea70597365f32e66cceb54d949c8c4a1b94f +Subproject commit ac8896ff53184cd5716897cb35a58c0f78ecd823