From 44c1ee49b894ea58f2540cb674a1c26b945131f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 26 Oct 2022 13:41:33 -0400
Subject: [PATCH] misc: make swarm with multiple participants by default
Change-Id: Id5700e08e7966121ec182786d25b9645b7f6fd75
---
src/app/appsettingsmanager.h | 1 -
src/app/constant/JamiStrings.qml | 2 --
src/app/mainview/components/SidePanel.qml | 12 +-----------
.../components/TroubleshootSettings.qml | 18 ------------------
src/app/tipsmodel.cpp | 4 ----
src/app/utilsadapter.cpp | 2 --
src/app/utilsadapter.h | 1 -
7 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/src/app/appsettingsmanager.h b/src/app/appsettingsmanager.h
index fcc6b2bd0..3e5ab24e2 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 df70ac49c..4a9c572ac 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 eb7a38245..2740157c4 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 c60d18439..d7303ebae 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 36609d275..d2446fddc 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 ac205fb11..cc44971d9 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 b1c659e79..7a239c20b 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();
--
GitLab