Allow the browser to search into table comments

Hugo Mercier · m-kuhn · commit 44d9b3516335 · 2015-09-25T20:57:54.000+02:00
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -200,7 +200,10 @@ class QgsBrowserTreeFilterProxyModel : public QSortFilterProxyModel
       if ( mFilter == "" || !mModel ) return true;
 
       QModelIndex sourceIndex = mModel->index( sourceRow, 0, sourceParent );
-      return filterAcceptsItem( sourceIndex ) || filterAcceptsAncestor( sourceIndex ) || filterAcceptsDescendant( sourceIndex );
+      // also look into the comment column
+      QModelIndex commentIndex = mModel->index( sourceRow, 1, sourceParent );
+      return filterAcceptsItem( sourceIndex ) || filterAcceptsAncestor( sourceIndex ) || filterAcceptsDescendant( sourceIndex ) ||
+        filterAcceptsItem( commentIndex ) || filterAcceptsAncestor( commentIndex ) || filterAcceptsDescendant( commentIndex );
     }
 
     // returns true if at least one ancestor is accepted by filter
@@ -232,6 +235,11 @@ class QgsBrowserTreeFilterProxyModel : public QSortFilterProxyModel
           return true;
         if ( filterAcceptsDescendant( sourceChildIndex ) )
           return true;
+        sourceChildIndex = mModel->index( i, 1, sourceIndex );
+        if ( filterAcceptsItem( sourceChildIndex ) )
+          return true;
+        if ( filterAcceptsDescendant( sourceChildIndex ) )
+          return true;
       }
       return false;
     }
@@ -532,6 +540,7 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
     // provide a horizontal scroll bar instead of using ellipse (...) for longer items
     mBrowserView->setTextElideMode( Qt::ElideNone );
     mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
+    mBrowserView->header()->setResizeMode( 1, QHeaderView::ResizeToContents );
     mBrowserView->header()->setStretchLastSection( false );
 
     // selectionModel is created when model is set on tree
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -202,7 +202,16 @@ QVariant QgsBrowserModel::data( const QModelIndex &index, int role ) const
   }
   else if ( role == Qt::DisplayRole )
   {
-    return item->name();
+    if ( index.column() == 0 )
+    {
+      return item->name();
+    }
+    if ( item->type() == QgsDataItem::Layer )
+    {
+      QgsLayerItem* lyrItem = qobject_cast<QgsLayerItem*>(item);
+      return lyrItem->comments();
+    }
+    return "";
   }
   else if ( role == Qt::ToolTipRole )
   {

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,16 @@ QVariant QgsBrowserModel::data( const QModelIndex &index, int role ) const`
`202`	`202`	`}`
`203`	`203`	`else if ( role == Qt::DisplayRole )`
`204`	`204`	`{`
`205`		`- return item->name();`
	`205`	`+ if ( index.column() == 0 )`
	`206`	`+ {`
	`207`	`+ return item->name();`
	`208`	`+ }`
	`209`	`+ if ( item->type() == QgsDataItem::Layer )`
	`210`	`+ {`
	`211`	`+ QgsLayerItem* lyrItem = qobject_cast<QgsLayerItem*>(item);`
	`212`	`+ return lyrItem->comments();`
	`213`	`+ }`
	`214`	`+ return "";`
`206`	`215`	`}`
`207`	`216`	`else if ( role == Qt::ToolTipRole )`
`208`	`217`	`{`