python/core/qgsfield.sip

@@ -151,7 +151,7 @@ public:
 
   QgsField& operator[](int i) /Factory/;
 %MethodCode
-  int idx = sipConvertFromSequenceIndex(a0, sipCpp->count());
+  SIP_SSIZE_T idx = sipConvertFromSequenceIndex(a0, sipCpp->count());
   if (idx < 0)
     sipIsErr = 1;
   else

src/app/qgsattributetabledialog.cpp

@@ -119,6 +119,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   // info from table to application
   connect( this, SIGNAL( saveEdits( QgsMapLayer * ) ), QgisApp::instance(), SLOT( saveEdits( QgsMapLayer * ) ) );
 
+  connect( mMainView, SIGNAL( currentChanged( int ) ), mMainViewButtonGroup, SLOT() );
+
   bool myDockFlag = settings.value( "/qgis/dockAttributeTable", false ).toBool();
   if ( myDockFlag )
   {
@@ -421,6 +423,11 @@ void QgsAttributeTableDialog::on_mDeleteSelectedButton_clicked()
   QgisApp::instance()->deleteSelected( mLayer, this );
 }
 
+void QgsAttributeTableDialog::on_mMainView_currentChanged( int viewMode )
+{
+  mMainViewButtonGroup->button( viewMode )->click();
+}
+
 void QgsAttributeTableDialog::on_mToggleEditingButton_toggled()
 {
   if ( !mLayer )

src/app/qgsattributetabledialog.h

@@ -121,6 +121,15 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
      */
     void on_mDeleteSelectedButton_clicked();
 
+    /**
+     * Called when the current index changes in the main view
+     * i.e. when the view mode is switched from table to form view
+     * or vice versa.
+     *
+     * Will adjust the button state
+     */
+    void on_mMainView_currentChanged( int );
+
     /**
      * add feature
      */