Merge pull request #2545 from MerginMaps/2.0.1-dev

Merge 2.0.1 integration branch
MerginMaps · Feb 2, 2023 · 2452365 · 2452365 · inputapp-bot · Feb 2, 2023
2 parents 2e5074e + b3915e3
commit 2452365
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 47 deletions.
diff --git a/app/inputhelp.cpp b/app/inputhelp.cpp
@@ -133,7 +133,7 @@ QString InputHelp::projectLoadingErrorHelpLink() const
 
 QString InputHelp::whatsNewPostLink() const
 {
-  return inputWeb + "/blog/introducing-workspaces" + utmTagOther;
+  return inputWeb + "/blog/introducing-workspaces-simplified-collaboration" + utmTagOther;
 }
 
 bool InputHelp::submitReportPending() const

diff --git a/app/qml/CreateWorkspacePage.qml b/app/qml/CreateWorkspacePage.qml
@@ -43,37 +43,17 @@ Page {
       rightMargin: InputStyle.outerFieldMargin
     }
 
-    Image {
-      Layout.alignment: Qt.AlignHCenter
-
-      width: parent.width / 2
-      source: InputStyle.mmLogoHorizontal
-      sourceSize.width: width
-    }
-
     Rectangle {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.xSmallGap
+      Layout.alignment: Qt.AlignCenter
       color: "transparent"
     }
 
     Label {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.rowHeightSmall
-
-      text: qsTr("Hello") + " " + __merginApi.userAuth.username + "!"
-
-      font.pixelSize: InputStyle.fontPixelSizeNormal
-      font.bold: true
-      color: InputStyle.fontColor
-
-      horizontalAlignment: Text.AlignHCenter
-      verticalAlignment: Text.AlignVCenter
-    }
-
-    Label {
-      Layout.fillWidth: true
-      Layout.preferredHeight: InputStyle.rowHeightSmall
+      Layout.alignment: Qt.AlignCenter
 
       text: qsTr("A Workspace is a place to store your projects. Colleagues " +
                  "can be invited to your workspace to collaborate on projects. " +
@@ -92,6 +72,7 @@ Page {
     Rectangle {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.xSmallGap
+      Layout.alignment: Qt.AlignCenter
       color: "transparent"
     }
 
@@ -100,14 +81,15 @@ Page {
 
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.fieldHeight
-      Layout.alignment: Qt.AlignHCenter
+      Layout.alignment: Qt.AlignCenter
 
       placeholderText: qsTr("My workspace name…")
     }
 
     Rectangle {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.xSmallGap
+      Layout.alignment: Qt.AlignCenter
       color: "transparent"
     }
 
@@ -117,6 +99,7 @@ Page {
       Layout.fillWidth: true
       btnWidth: width
       Layout.preferredHeight: InputStyle.fieldHeight
+      Layout.alignment: Qt.AlignCenter
 
       text: qsTr("Create workspace")
 

diff --git a/app/qml/ManageInvitationsPage.qml b/app/qml/ManageInvitationsPage.qml
@@ -23,6 +23,7 @@ Page {
   signal createWorkspaceRequested
 
   property bool haveBack: false
+  property bool showCreate: true
 
   header: PanelHeaderV2 {
     width: root.width
@@ -38,37 +39,17 @@ Page {
       rightMargin: InputStyle.outerFieldMargin
     }
 
-    Image {
-      Layout.alignment: Qt.AlignHCenter
-
-      width: parent.width / 2
-      source: InputStyle.mmLogoHorizontal
-      sourceSize.width: width
-    }
-
     Rectangle {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.xSmallGap
+      Layout.alignment: Qt.AlignCenter
       color: "transparent"
     }
 
     Label {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.rowHeightSmall
-
-      text: qsTr("Hello") + " " + __merginApi.userAuth.username + "!"
-
-      font.pixelSize: InputStyle.fontPixelSizeNormal
-      font.bold: true
-      color: InputStyle.fontColor
-
-      horizontalAlignment: Text.AlignHCenter
-      verticalAlignment: Text.AlignVCenter
-    }
-
-    Label {
-      Layout.fillWidth: true
-      Layout.preferredHeight: InputStyle.rowHeightSmall
+      Layout.alignment: Qt.AlignCenter
 
       text: qsTr("You have been invited to the following workspaces:")
 
@@ -84,12 +65,14 @@ Page {
     Rectangle {
       Layout.fillWidth: true
       Layout.preferredHeight: InputStyle.xSmallGap
+      Layout.alignment: Qt.AlignCenter
       color: "transparent"
     }
 
     ScrollView {
       Layout.fillWidth: true
       Layout.fillHeight: true
+      Layout.alignment: Qt.AlignCenter
 
       contentWidth: availableWidth // only scroll vertically
 
@@ -166,12 +149,14 @@ Page {
         Rectangle {
           Layout.fillWidth: true
           Layout.preferredHeight: InputStyle.xSmallGap
+          Layout.alignment: Qt.AlignCenter
           color: "transparent"
         }
 
         Text {
           Layout.fillWidth: true
           Layout.preferredHeight: InputStyle.rowHeightHeader
+          Layout.alignment: Qt.AlignCenter
 
           color: InputStyle.fontColor
           linkColor: InputStyle.highlightColor
@@ -185,7 +170,7 @@ Page {
           verticalAlignment: Qt.AlignVCenter
           horizontalAlignment: Qt.AlignHCenter
 
-          visible: !__purchasing.transactionPending
+          visible: root.showCreate
 
           text: ("%1" + qsTr("Do you want to create a new workspace instead?") + "\n" + qsTr("Click here!") + "%2")
             .arg("<a href='http://click-me'>")
@@ -197,6 +182,7 @@ Page {
         Rectangle {
           Layout.fillWidth: true
           Layout.preferredHeight: InputStyle.xSmallGap
+          Layout.alignment: Qt.AlignCenter
           color: "transparent"
         }
       }

diff --git a/app/qml/ProjectPanel.qml b/app/qml/ProjectPanel.qml
@@ -1043,6 +1043,7 @@ Item {
     ManageInvitationsPage {
       objectName: "invitationsPanel"
       haveBack: true
+      showCreate: false
       onBack: {
         stackView.pop( null )
       }