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