Skip to content
Snippets Groups Projects
Unverified Commit bbd3e743 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

newswarmpage: take title and description for new swarm

GitLab: #340
Change-Id: Ib5d3d44c620120b050fca57c774edfe2b3de7c93
parent 1d074f25
No related branches found
Tags
No related merge requests found
......@@ -268,6 +268,8 @@ Item {
property real preferredFieldWidth: 256
property real preferredFieldHeight: 32
property real preferredMarginSize: 16
property real settingsMarginSize: 8
property real swarmDetailsPageTopMargin: 64
property real preferredDialogWidth: 400
property real preferredDialogHeight: 300
property real minimumPreviewWidth: 120
......
......@@ -570,8 +570,14 @@ ConversationsAdapter::connectConversationModel()
}
void
ConversationsAdapter::createSwarm()
ConversationsAdapter::createSwarm(const QString& title,
const QString& description,
const QString& avatar,
const VectorString& participants)
{
auto convModel = lrcInstance_->getCurrentConversationModel();
convModel->createConversation({}, "");
convModel->createConversation(participants,
{{"title", title},
{"description", description},
{"avatar", avatar}});
}
\ No newline at end of file
......@@ -48,7 +48,10 @@ protected:
public:
Q_INVOKABLE bool connectConversationModel();
Q_INVOKABLE void createSwarm();
Q_INVOKABLE void createSwarm(const QString& title,
const QString& description,
const QString& avatar,
const VectorString& participants);
Q_INVOKABLE void setFilter(const QString& filterString);
Q_INVOKABLE QVariantMap getConvInfoMap(const QString& convId);
Q_INVOKABLE void restartConversation(const QString& convId);
......
......@@ -40,6 +40,7 @@ Rectangle {
anchors.centerIn: root
EditableLineEdit {
id: title
Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.preferredMarginSize
......@@ -55,6 +56,7 @@ Rectangle {
}
EditableLineEdit {
id: description
Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.preferredMarginSize
......@@ -81,7 +83,7 @@ Rectangle {
text: JamiStrings.createTheSwarm
onClicked: {
ConversationsAdapter.createSwarm()
ConversationsAdapter.createSwarm(title.text, description.text, "", [])
createSwarmClicked()
}
}
......
......@@ -82,7 +82,10 @@ Rectangle {
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.bottomMargin: JamiTheme.preferredMarginSize
font.pointSize: JamiTheme.titleFontSize
font.pointSize: JamiTheme.menuFontSize
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: CurrentConversation.description
placeholderText: JamiStrings.editDescription
......@@ -108,8 +111,8 @@ Rectangle {
backgroundColor: JamiTheme.buttonTintedBlue
hoverColor: JamiTheme.buttonTintedBlue
borderWidth: 4
bottomMargin: JamiTheme.preferredMarginSize
fontSize: JamiTheme.titleFontSize
bottomMargin: JamiTheme.settingsMarginSize
fontSize: JamiTheme.menuFontSize
underlineContentOnly: true
down: tabBar.currentIndex === 0
......@@ -121,8 +124,8 @@ Rectangle {
backgroundColor: JamiTheme.buttonTintedBlue
hoverColor: JamiTheme.buttonTintedBlue
borderWidth: 4
bottomMargin: JamiTheme.preferredMarginSize
fontSize: JamiTheme.titleFontSize
bottomMargin: JamiTheme.settingsMarginSize
fontSize: JamiTheme.menuFontSize
underlineContentOnly: true
down: true//tabBar.currentIndex === 1
......@@ -139,8 +142,8 @@ Rectangle {
backgroundColor: JamiTheme.buttonTintedBlue
hoverColor: JamiTheme.buttonTintedBlue
borderWidth: 4
bottomMargin: JamiTheme.preferredMarginSize
fontSize: JamiTheme.titleFontSize
bottomMargin: JamiTheme.settingsMarginSize
fontSize: JamiTheme.menuFontSize
underlineContentOnly: true
down: tabBar.currentIndex === 2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment