diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h index fcc6b2bd0bc67260b319f13ee030ffa05bd1b06c..3e5ab24e212d5088d2882ba345525b918cdb79eb 100644 --- a/src/app/appsettingsmanager.h +++ b/src/app/appsettingsmanager.h @@ -42,7 +42,6 @@ extern const QString defaultDownloadPath; X(AcceptTransferBelow, 20) \ X(AutoAcceptFiles, true) \ X(DisplayHyperlinkPreviews, true) \ - X(EnableExperimentalSwarm, false) \ X(EnableDarkTheme, false) \ X(AppTheme, "System") \ X(BaseZoom, 1.0) \ diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml index df70ac49c0d0645da1d0d1904f9bfc308ca7a67d..4a9c572ac623accbc32f0df282724897256fe3d5 100644 --- a/src/app/constant/JamiStrings.qml +++ b/src/app/constant/JamiStrings.qml @@ -486,8 +486,6 @@ Item { property string troubleshootTitle: qsTr("Troubleshoot") property string troubleshootButton: qsTr("Open logs") property string troubleshootText: qsTr("Get logs") - property string experimentalSwarm: qsTr("(Experimental) Enable small groups support for Swarm") - property string experimentalSwarmTooltip: qsTr("This feature is in development.") // Recording Settings property string tipRecordFolder: qsTr("Select a record directory") diff --git a/src/app/mainview/components/SidePanel.qml b/src/app/mainview/components/SidePanel.qml index eb7a3824570e853ccd318e3c0dddc3ae6b3658a5..2740157c46d968cca67cdd70f7d23fccec348e54 100644 --- a/src/app/mainview/components/SidePanel.qml +++ b/src/app/mainview/components/SidePanel.qml @@ -167,8 +167,6 @@ Rectangle { preferredSize: titleBar.height - visible: UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm) - source: JamiResources.round_close_24dp_svg toolTipText: JamiStrings.cancel @@ -222,20 +220,12 @@ Rectangle { preferredSize: startBar.height - visible: UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm) && !swarmMemberSearchList.visible && CurrentAccount.type !== Profile.Type.SIP + visible: !swarmMemberSearchList.visible && CurrentAccount.type !== Profile.Type.SIP source: smartListLayout.visible ? JamiResources.create_swarm_svg : JamiResources.round_close_24dp_svg toolTipText: smartListLayout.visible ? JamiStrings.startSwarm : JamiStrings.cancel onClicked: createSwarmClicked() - - Connections { - target: UtilsAdapter - - function onShowExperimentalSwarm() { - startConversation.visible = UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm) - } - } } } diff --git a/src/app/settingsview/components/TroubleshootSettings.qml b/src/app/settingsview/components/TroubleshootSettings.qml index c60d184399037805a27464554cc28fb4e09cb52d..d7303ebaee8954f0149ced0920108971c126eba7 100644 --- a/src/app/settingsview/components/TroubleshootSettings.qml +++ b/src/app/settingsview/components/TroubleshootSettings.qml @@ -85,22 +85,4 @@ ColumnLayout { } } } - - ToggleSwitch { - id: checkboxSwarm - - Layout.fillWidth: true - Layout.leftMargin: JamiTheme.preferredMarginSize - - checked: UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm) - - labelText: JamiStrings.experimentalSwarm - fontPointSize: JamiTheme.settingsFontSize - - tooltipText: JamiStrings.experimentalSwarmTooltip - - onSwitchToggled: { - UtilsAdapter.setAppValue(Settings.Key.EnableExperimentalSwarm, checked) - } - } } diff --git a/src/app/tipsmodel.cpp b/src/app/tipsmodel.cpp index 36609d27551e0c988b33a597dc02c976c8e92032..d2446fddcfd44d54a15b2cdeafa34ab2961d248a 100644 --- a/src/app/tipsmodel.cpp +++ b/src/app/tipsmodel.cpp @@ -53,10 +53,6 @@ TipsModel::TipsModel(AppSettingsManager* settingsManager, QObject* parent) {"desc", tr("In a call, you can click on \"Add participants\" to add a contact to a call.")}, {"type", "tip"}}); - tips_.append({{"id", "5"}, - {"title", tr("Does Jami have group chats?")}, - {"desc", tr("In the settings, you can enabled support for groups (experimental)")}, - {"type", "tip"}}); tips_.append({{"id", "6"}, {"title", tr("What is a Jami account?")}, {"desc", diff --git a/src/app/utilsadapter.cpp b/src/app/utilsadapter.cpp index ac205fb1172c9cca6b9a0e96d5c3f380cc5bd7bb..cc44971d980b181fa8774ff455aaf02e55a8cb5a 100644 --- a/src/app/utilsadapter.cpp +++ b/src/app/utilsadapter.cpp @@ -369,8 +369,6 @@ UtilsAdapter::setAppValue(const Settings::Key key, const QVariant& value) // If we change the lang preference, reload the translations if (key == Settings::Key::LANG) settingsManager_->loadTranslations(); - else if (key == Settings::Key::EnableExperimentalSwarm) - Q_EMIT showExperimentalSwarm(); else if (key == Settings::Key::BaseZoom) Q_EMIT changeFontSize(); else if (key == Settings::Key::ShowChatviewHorizontally) diff --git a/src/app/utilsadapter.h b/src/app/utilsadapter.h index b1c659e79a224cdf295ae8629c1b26b5608a4fcb..7a239c20b0d4fa7b4d855c9026688367a545dff3 100644 --- a/src/app/utilsadapter.h +++ b/src/app/utilsadapter.h @@ -123,7 +123,6 @@ public: Q_SIGNALS: void debugMessageReceived(const QString& message); - void showExperimentalSwarm(); void changeFontSize(); void chatviewPositionChanged(); void appThemeChanged();