Fix crash

m-kuhn · m-kuhn · commit f03a94f6504d · 2016-05-02T18:25:58.000+02:00
diff --git a/python/core/qgsaction.sip b/python/core/qgsaction.sip
@@ -33,13 +33,36 @@ class QgsAction
       OpenUrl,
     };
 
-    QgsAction( ActionType type, const QString& name, const QString& action, bool capture );
+    /**
+     * Create a new QgsAction
+     *
+     * @param type          The type of this action
+     * @param description   A human readable description string
+     * @param action        The action text. Its interpretation depends on the type
+     * @param capture       If this is set to true, the output will be captured when an action is run
+     */
+    QgsAction( ActionType type, const QString& description, const QString& action, bool capture );
 
-    QgsAction( ActionType type, const QString& name, const QString& action, const QString& icon, bool capture );
 
-    //! The name of the action
+    /**
+     * Create a new QgsAction
+     *
+     * @param type          The type of this action
+     * @param description   A human readable description string
+     * @param action        The action text. Its interpretation depends on the type
+     * @param icon          Path to an icon for this action
+     * @param capture       If this is set to true, the output will be captured when an action is run
+     * @param shortTitle    A short string used to label user interface elements like buttons
+     */
+    QgsAction( ActionType type, const QString& description, const QString& action, const QString& icon, bool capture, const QString& shortTitle = QString() );
+
+
+    //! The name of the action. This may be a longer description.
     QString name() const;
 
+    //! The short title is used to label user interface elements like buttons
+    QString shortTitle() const;
+
     //! The path to the icon
     QString iconPath() const;
 
diff --git a/python/gui/attributetable/qgsattributetabledelegate.sip b/python/gui/attributetable/qgsattributetabledelegate.sip
@@ -39,4 +39,9 @@ class QgsAttributeTableDelegate : QItemDelegate
     void setEditorData( QWidget *editor, const QModelIndex &index ) const;
 
     void setFeatureSelectionModel( QgsFeatureSelectionModel* featureSelectionModel );
+
+    /**
+     * Set an image that represents an action widget
+     */
+    void setActionWidgetImage( const QImage& image );
 };
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -111,13 +111,16 @@ int QgsAttributeTableFilterModel::columnCount( const QModelIndex& parent ) const
 
 void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTableConfig& config )
 {
+  mConfig = config;
+  mConfig.update( layer()->fields() );
+
   int columnIndex = 0;
   int configIndex = 0;
   bool resetModel = false;
 
-  for ( ; configIndex < config.columns().size(); ++configIndex )
+  for ( ; configIndex < mConfig.columns().size(); ++configIndex )
   {
-    const QgsAttributeTableConfig::ColumnConfig& columnConfig = config.columns().at( configIndex );
+    const QgsAttributeTableConfig::ColumnConfig& columnConfig = mConfig.columns().at( configIndex );
 
     // Hidden? No reason for further checks
     if ( columnConfig.mHidden )
@@ -144,7 +147,6 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa
       resetModel = true;
     }
 
-
     // New column? append
     Q_ASSERT( mColumnMapping.size() == columnIndex );
     if ( columnConfig.mType == QgsAttributeTableConfig::Action )
@@ -183,6 +185,7 @@ void QgsAttributeTableFilterModel::setSourceModel( QgsAttributeTableModel* sourc
   }
 
   QSortFilterProxyModel::setSourceModel( sourceModel );
+  disconnect( mTableModel, SIGNAL( columnsAboutToBeInserted( QModelIndex, int, int ) ), this, SLOT( onColumnsAboutToBeInserted() ) );
 }
 
 bool QgsAttributeTableFilterModel::selectedOnTop()
@@ -290,6 +293,11 @@ void QgsAttributeTableFilterModel::selectionChanged()
   }
 }
 
+void QgsAttributeTableFilterModel::onColumnsAboutToBeInserted()
+{
+  setAttributeTableConfig( mConfig );
+}
+
 void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
 {
   if ( !layer() )
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h
@@ -228,6 +228,7 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub
 
   private slots:
     void selectionChanged();
+    void onColumnsAboutToBeInserted();
 
   private:
     QgsFeatureIds mFilteredFeatures;
@@ -236,6 +237,7 @@ class GUI_EXPORT QgsAttributeTableFilterModel: public QSortFilterProxyModel, pub
     bool mSelectedOnTop;
     QgsAttributeTableModel* mTableModel;
 
+    QgsAttributeTableConfig mConfig;
     QVector<int> mColumnMapping;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,16 @@ int QgsAttributeTableFilterModel::columnCount( const QModelIndex& parent ) const`
`111`	`111`
`112`	`112`	`void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTableConfig& config )`
`113`	`113`	`{`
	`114`	`+ mConfig = config;`
	`115`	`+ mConfig.update( layer()->fields() );`
	`116`	`+`
`114`	`117`	`int columnIndex = 0;`
`115`	`118`	`int configIndex = 0;`
`116`	`119`	`bool resetModel = false;`
`117`	`120`
`118`		`- for ( ; configIndex < config.columns().size(); ++configIndex )`
	`121`	`+ for ( ; configIndex < mConfig.columns().size(); ++configIndex )`
`119`	`122`	`{`
`120`		`- const QgsAttributeTableConfig::ColumnConfig& columnConfig = config.columns().at( configIndex );`
	`123`	`+ const QgsAttributeTableConfig::ColumnConfig& columnConfig = mConfig.columns().at( configIndex );`
`121`	`124`
`122`	`125`	`// Hidden? No reason for further checks`
`123`	`126`	`if ( columnConfig.mHidden )`
`@@ -144,7 +147,6 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa`
`144`	`147`	`resetModel = true;`
`145`	`148`	`}`
`146`	`149`
`147`		`-`
`148`	`150`	`// New column? append`
`149`	`151`	`Q_ASSERT( mColumnMapping.size() == columnIndex );`
`150`	`152`	`if ( columnConfig.mType == QgsAttributeTableConfig::Action )`
`@@ -183,6 +185,7 @@ void QgsAttributeTableFilterModel::setSourceModel( QgsAttributeTableModel* sourc`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`QSortFilterProxyModel::setSourceModel( sourceModel );`
	`188`	`+ disconnect( mTableModel, SIGNAL( columnsAboutToBeInserted( QModelIndex, int, int ) ), this, SLOT( onColumnsAboutToBeInserted() ) );`
`186`	`189`	`}`
`187`	`190`
`188`	`191`	`bool QgsAttributeTableFilterModel::selectedOnTop()`
`@@ -290,6 +293,11 @@ void QgsAttributeTableFilterModel::selectionChanged()`
`290`	`293`	`}`
`291`	`294`	`}`
`292`	`295`
	`296`	`+void QgsAttributeTableFilterModel::onColumnsAboutToBeInserted()`
	`297`	`+{`
	`298`	`+ setAttributeTableConfig( mConfig );`
	`299`	`+}`
	`300`	`+`
`293`	`301`	`void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()`
`294`	`302`	`{`
`295`	`303`	`if ( !layer() )`