diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml index fba9b4cedd63c78b7676e6b8d0028ed95688ca0f..82ffef41feef62e52bc5db8557241d361d899eaa 100644 --- a/src/constant/JamiStrings.qml +++ b/src/constant/JamiStrings.qml @@ -339,7 +339,7 @@ Item { property string logsViewCancel: qsTr("Cancel") property string logsViewCopied: qsTr("Copied to clipboard!") property string logsViewDisplay: qsTr("Receive Logs") - + // ImportFromBackupPage property string archive: qsTr("Archive") property string openFile: qsTr("Open file") diff --git a/src/settingsadapter.cpp b/src/settingsadapter.cpp index 6c379ada57e02777e1fa502eefb34a1459f4cff4..a489d00bb85df0bba7038d4824718ba2968022c0 100644 --- a/src/settingsadapter.cpp +++ b/src/settingsadapter.cpp @@ -26,13 +26,7 @@ SettingsAdapter::SettingsAdapter(AppSettingsManager* settingsManager, QObject* parent) : QmlAdapterBase(instance, parent) , settingsManager_(settingsManager) -{ - QObject::connect(&lrcInstance_->behaviorController(), - &lrc::api::BehaviorController::debugMessageReceived, - this, - &SettingsAdapter::debugMessageReceived, - Qt::ConnectionType::UniqueConnection); -} +{} QString SettingsAdapter::getDir_Document() @@ -1110,5 +1104,14 @@ SettingsAdapter::isAllModeratorsEnabled(const QString& accountId) void SettingsAdapter::monitor(const bool& continuous) { + if (continuous) + debugMessageReceivedConnection_ + = QObject::connect(&lrcInstance_->behaviorController(), + &lrc::api::BehaviorController::debugMessageReceived, + this, + &SettingsAdapter::debugMessageReceived, + Qt::ConnectionType::UniqueConnection); + else + disconnect(debugMessageReceivedConnection_); lrcInstance_->monitor(continuous); } diff --git a/src/settingsadapter.h b/src/settingsadapter.h index b22e9571279a82a54fb82720f939d98c430a3164..98e1be2d0c5bd23667e370db0107703f84399866 100644 --- a/src/settingsadapter.h +++ b/src/settingsadapter.h @@ -235,5 +235,7 @@ Q_SIGNALS: private: AppSettingsManager* settingsManager_; + + QMetaObject::Connection debugMessageReceivedConnection_; }; Q_DECLARE_METATYPE(SettingsAdapter*) diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml index 06c68f4174cacb49100d468129781f849e71a801..eb56ce115cbf5811fac2020ed0b9b629e5c57dec 100644 --- a/src/settingsview/components/GeneralSettingsPage.qml +++ b/src/settingsview/components/GeneralSettingsPage.qml @@ -84,6 +84,7 @@ Rectangle { Layout.rightMargin: JamiTheme.preferredMarginSize Layout.bottomMargin: JamiTheme.preferredMarginSize itemWidth: preferredColumnWidth + visible: Qt.platform.os == "windows" ? false : true } // update setting panel @@ -92,7 +93,7 @@ Rectangle { Layout.leftMargin: JamiTheme.preferredMarginSize Layout.rightMargin: JamiTheme.preferredMarginSize Layout.bottomMargin: JamiTheme.preferredMarginSize - visible: Qt.platform.os == "windows"? true : false + visible: Qt.platform.os == "windows" ? true : false } } }