Merge pull request #5119 from opengisch/QF-3983-broken-changes

Fix changes list popup looking broken when empty
opengisch · Mar 22, 2024 · 11083eb · 11083eb
2 parents 34e5c6e + fca430d
commit 11083eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/core/deltalistmodel.cpp b/src/core/deltalistmodel.cpp
@@ -88,6 +88,9 @@ DeltaListModel::DeltaListModel( QJsonDocument deltasStatusList )
     mIsValid = true;
     mDeltas.append( delta );
   }
+
+  connect( this, &DeltaListModel::rowsInserted, this, &DeltaListModel::rowCountChanged );
+  connect( this, &DeltaListModel::rowsRemoved, this, &DeltaListModel::rowCountChanged );
 }
 
 int DeltaListModel::rowCount( const QModelIndex &parent ) const

diff --git a/src/core/deltalistmodel.h b/src/core/deltalistmodel.h
@@ -65,8 +65,10 @@ class DeltaListModel : public QAbstractListModel
     DeltaListModel() = default;
     explicit DeltaListModel( QJsonDocument deltasStatusList );
 
+    Q_PROPERTY( int rowCount READ rowCount NOTIFY rowCountChanged )
+
     //! Returns number of rows.
-    int rowCount( const QModelIndex &parent ) const override;
+    int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
 
     //! Returns the data at given \a index with given \a role.
     QVariant data( const QModelIndex &index, int role ) const override;
@@ -89,6 +91,9 @@ class DeltaListModel : public QAbstractListModel
     //! Returns a combined output for all deltas, separated by a new line.
     QString combinedOutput() const;
 
+  signals:
+    void rowCountChanged();
+
   private:
     QJsonDocument mJson;
     bool mIsValid = false;

diff --git a/src/qml/QFieldCloudDeltaHistory.qml b/src/qml/QFieldCloudDeltaHistory.qml
@@ -62,7 +62,7 @@ Popup {
             }
             iconSource: Theme.getThemeIcon( 'ic_close_black_24dp' )
             iconColor: Theme.mainTextColor
-            bgcolor: "white"
+            bgcolor: Theme.mainBackgroundColor
 
             onClicked: {
               popup.close();
@@ -74,10 +74,23 @@ Popup {
             spacing: 4
             width: parent.width
 
+            Label {
+              leftPadding: 48
+              rightPadding: 48
+              width: parent.width
+              visible: !!model && model.rowCount === 0
+
+              text: qsTr( "No changes have been pushed yet!" )
+              color: Theme.mainTextDisabledColor
+              horizontalAlignment: Text.AlignHCenter
+              wrapMode: Text.WordWrap
+            }
+
             ListView {
                 id: deltaList
                 width: parent.width
-                height: mainWindow.height - 160
+                height: visible ? mainWindow.height - 160 : 0
+                visible: deltaList.model && deltaList.model.rowCount !== 0
                 clip: true
 
                 delegate: Rectangle {