mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-09-10 12:03:18 +02:00
misc: make swarm with multiple participants by default
Change-Id: Id5700e08e7966121ec182786d25b9645b7f6fd75
This commit is contained in:
parent
dae9249098
commit
44c1ee49b8
7 changed files with 1 additions and 39 deletions
|
@ -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) \
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -123,7 +123,6 @@ public:
|
|||
|
||||
Q_SIGNALS:
|
||||
void debugMessageReceived(const QString& message);
|
||||
void showExperimentalSwarm();
|
||||
void changeFontSize();
|
||||
void chatviewPositionChanged();
|
||||
void appThemeChanged();
|
||||
|
|
Loading…
Add table
Reference in a new issue