[bugfix] Bookmark project sync

Fixes #17584 Spatial Bookmarks checkbox is not synced with project status
qgis · Nov 30, 2017 · 042fd33 · 042fd33
1 parent f6acf37
commit 042fd33
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -509,11 +509,10 @@ QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel
   : mQgisTableModel( qgisTableModel )
   , mProjectTableModel( projectTableModel )
   , mTreeView( treeView )
-  , mProjectOpen( false )
 {
   connect(
-    QgisApp::instance(), &QgisApp::projectRead,
-    this, &QgsMergedBookmarksTableModel::projectRead );
+    QgsProject::instance(), &QgsProject::fileNameChanged,
+    this, &QgsMergedBookmarksTableModel::projectFileNameChanged );
 
   connect(
     &mQgisTableModel, &QAbstractTableModel::layoutChanged,
@@ -620,7 +619,7 @@ Qt::ItemFlags QgsMergedBookmarksTableModel::flags( const QModelIndex &index ) co
   Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
   if ( index.column() == mQgisTableModel.columnCount() )
   {
-    if ( !mProjectOpen )
+    if ( !projectAvailable() )
     {
       return Qt::ItemIsSelectable;
     }
@@ -679,6 +678,11 @@ QAbstractTableModel *QgsMergedBookmarksTableModel::qgisModel()
   return &mQgisTableModel;
 }
 
+bool QgsMergedBookmarksTableModel::projectAvailable() const
+{
+  return ! QgsProject::instance()->fileName().isEmpty();
+}
+
 void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom, QAbstractTableModel &modelTo, int row )
 {
   QSqlTableModel *qgisModel = dynamic_cast<QSqlTableModel *>( &modelTo );
@@ -719,3 +723,8 @@ void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom,
     modelFrom.removeRows( row, 1 );
   }
 }
+
+void QgsMergedBookmarksTableModel::projectFileNameChanged()
+{
+  emit layoutChanged();
+}
diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h
@@ -79,12 +79,11 @@ class QgsMergedBookmarksTableModel: public QAbstractTableModel
     QAbstractTableModel &mQgisTableModel;
     QAbstractTableModel &mProjectTableModel;
     QTreeView *mTreeView = nullptr;
-    bool mProjectOpen;
-
+    bool projectAvailable() const;
     void moveBookmark( QAbstractTableModel &modelFrom, QAbstractTableModel &modelTo, int row );
 
   private slots:
-    void projectRead() { mProjectOpen = true; }
+    void projectFileNameChanged();
     void allLayoutChanged()
     {
       emit layoutChanged();