[bugfix] Bookmark project sync

elpaso · elpaso · commit 042fd33db790 · 2017-11-30T09:35:27.000+01:00
Fixes #17584 Spatial Bookmarks checkbox is not synced with project status
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();

Original file line number	Diff line number	Diff line change
`@@ -509,11 +509,10 @@ QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel`
`509`	`509`	`: mQgisTableModel( qgisTableModel )`
`510`	`510`	`, mProjectTableModel( projectTableModel )`
`511`	`511`	`, mTreeView( treeView )`
`512`		`- , mProjectOpen( false )`
`513`	`512`	`{`
`514`	`513`	`connect(`
`515`		`- QgisApp::instance(), &QgisApp::projectRead,`
`516`		`- this, &QgsMergedBookmarksTableModel::projectRead );`
	`514`	`+ QgsProject::instance(), &QgsProject::fileNameChanged,`
	`515`	`+ this, &QgsMergedBookmarksTableModel::projectFileNameChanged );`
`517`	`516`
`518`	`517`	`connect(`
`519`	`518`	`&mQgisTableModel, &QAbstractTableModel::layoutChanged,`
`@@ -620,7 +619,7 @@ Qt::ItemFlags QgsMergedBookmarksTableModel::flags( const QModelIndex &index ) co`
`620`	`619`	`Qt::ItemFlags flags = Qt::ItemIsSelectable \| Qt::ItemIsEnabled;`
`621`	`620`	`if ( index.column() == mQgisTableModel.columnCount() )`
`622`	`621`	`{`
`623`		`- if ( !mProjectOpen )`
	`622`	`+ if ( !projectAvailable() )`
`624`	`623`	`{`
`625`	`624`	`return Qt::ItemIsSelectable;`
`626`	`625`	`}`
`@@ -679,6 +678,11 @@ QAbstractTableModel *QgsMergedBookmarksTableModel::qgisModel()`
`679`	`678`	`return &mQgisTableModel;`
`680`	`679`	`}`
`681`	`680`
	`681`	`+bool QgsMergedBookmarksTableModel::projectAvailable() const`
	`682`	`+{`
	`683`	`+ return ! QgsProject::instance()->fileName().isEmpty();`
	`684`	`+}`
	`685`	`+`
`682`	`686`	`void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom, QAbstractTableModel &modelTo, int row )`
`683`	`687`	`{`
`684`	`688`	`QSqlTableModel qgisModel = dynamic_cast<QSqlTableModel >( &modelTo );`
`@@ -719,3 +723,8 @@ void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom,`
`719`	`723`	`modelFrom.removeRows( row, 1 );`
`720`	`724`	`}`
`721`	`725`	`}`
	`726`	`+`
	`727`	`+void QgsMergedBookmarksTableModel::projectFileNameChanged()`
	`728`	`+{`
	`729`	`+ emit layoutChanged();`
	`730`	`+}`