Merge branch 'master' of github.com:qgis/QGIS

qgis · Oct 24, 2017 · 1c1ecf4 · 1c1ecf4
2 parents 87d087b + cff3569
commit 1c1ecf4
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 25 deletions.
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -2547,6 +2547,7 @@ empirial:imperial
 emporer:emperor
 emprisoned:imprisoned
 emptry:empty
+empy:empty
 emtied:emptied
 emties:empties
 emtpy:empty

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -124,7 +124,6 @@ SET(QGIS_ANALYSIS_MOC_HDRS
   vector/geometry_checker/qgsgeometryanglecheck.h
   vector/geometry_checker/qgsgeometryareacheck.h
   vector/geometry_checker/qgsgeometrychecker.h
-  vector/geometry_checker/qgsgeometrycheckerutils.h
   vector/geometry_checker/qgsgeometrycheck.h
   vector/geometry_checker/qgsgeometrycontainedcheck.h
   vector/geometry_checker/qgsgeometrydanglecheck.h
@@ -202,6 +201,7 @@ SET(QGIS_ANALYSIS_HDRS
   vector/mersenne-twister.h
   vector/qgsgeometrysnapper.h
   vector/qgszonalstatistics.h
+  vector/geometry_checker/qgsgeometrycheckerutils.h
 
   interpolation/qgsinterpolator.h
   interpolation/qgsgridfilewriter.h

diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp
@@ -280,6 +280,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
   connect( mColumnUpPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mColumnUpPushButton_clicked );
   connect( mColumnDownPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mColumnDownPushButton_clicked );
   connect( mResetColumnsPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mResetColumnsPushButton_clicked );
+  connect( mClearColumnsPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mClearColumnsPushButton_clicked );
   connect( mAddSortColumnPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mAddSortColumnPushButton_clicked );
   connect( mRemoveSortColumnPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mRemoveSortColumnPushButton_clicked );
   connect( mSortColumnUpPushButton, &QPushButton::clicked, this, &QgsAttributeSelectionDialog::mSortColumnUpPushButton_clicked );
@@ -330,13 +331,12 @@ QgsAttributeSelectionDialog::~QgsAttributeSelectionDialog()
 
 void QgsAttributeSelectionDialog::mRemoveColumnPushButton_clicked()
 {
-  //remove selected row from model
-  QItemSelection viewSelection( mColumnsTableView->selectionModel()->selection() );
-  if ( viewSelection.length() > 0 )
-  {
-    int selectedRow = viewSelection.indexes().at( 0 ).row();
-    mColumnModel->removeRow( selectedRow );
-  }
+  //remove selected rows from model
+  QModelIndexList indexes =  mColumnsTableView->selectionModel()->selectedRows();
+  int count = indexes.count();
+
+  for ( int i = count; i > 0; --i )
+    mColumnModel->removeRow( indexes.at( i - 1 ).row(), QModelIndex() );
 }
 
 void QgsAttributeSelectionDialog::mAddColumnPushButton_clicked()
@@ -348,23 +348,23 @@ void QgsAttributeSelectionDialog::mAddColumnPushButton_clicked()
 void QgsAttributeSelectionDialog::mColumnUpPushButton_clicked()
 {
   //move selected row up
-  QItemSelection viewSelection( mColumnsTableView->selectionModel()->selection() );
-  if ( !viewSelection.empty() )
-  {
-    int selectedRow = viewSelection.indexes().at( 0 ).row();
-    mColumnModel->moveRow( selectedRow, QgsComposerAttributeTableColumnModelV2::ShiftUp );
-  }
+
+  QModelIndexList indexes =  mColumnsTableView->selectionModel()->selectedRows();
+  int count = indexes.count();
+
+  std::reverse( indexes.begin(), indexes.end() );
+  for ( int i = count; i > 0; --i )
+    mColumnModel->moveRow( indexes.at( i - 1 ).row(), QgsComposerAttributeTableColumnModelV2::ShiftUp );
 }
 
 void QgsAttributeSelectionDialog::mColumnDownPushButton_clicked()
 {
   //move selected row down
-  QItemSelection viewSelection( mColumnsTableView->selectionModel()->selection() );
-  if ( !viewSelection.empty() )
-  {
-    int selectedRow = viewSelection.indexes().at( 0 ).row();
-    mColumnModel->moveRow( selectedRow, QgsComposerAttributeTableColumnModelV2::ShiftDown );
-  }
+  QModelIndexList indexes =  mColumnsTableView->selectionModel()->selectedRows();
+  int count = indexes.count();
+
+  for ( int i = count; i > 0; --i )
+    mColumnModel->moveRow( indexes.at( i - 1 ).row(), QgsComposerAttributeTableColumnModelV2::ShiftDown );
 }
 
 void QgsAttributeSelectionDialog::mResetColumnsPushButton_clicked()
@@ -374,6 +374,13 @@ void QgsAttributeSelectionDialog::mResetColumnsPushButton_clicked()
   mSortColumnComboBox->setCurrentIndex( 0 );
 }
 
+void QgsAttributeSelectionDialog::mClearColumnsPushButton_clicked()
+{
+  //remove all columns
+  mColumnModel->removeRows( 0, mColumnModel->rowCount() );
+  mSortColumnComboBox->setCurrentIndex( 0 );
+}
+
 void QgsAttributeSelectionDialog::mAddSortColumnPushButton_clicked()
 {
   //add column to sort order widget

diff --git a/src/app/composer/qgsattributeselectiondialog.h b/src/app/composer/qgsattributeselectiondialog.h
@@ -123,6 +123,7 @@ class QgsAttributeSelectionDialog: public QDialog, private Ui::QgsAttributeSelec
     void mColumnUpPushButton_clicked();
     void mColumnDownPushButton_clicked();
     void mResetColumnsPushButton_clicked();
+    void mClearColumnsPushButton_clicked();
     void mAddSortColumnPushButton_clicked();
     void mRemoveSortColumnPushButton_clicked();
     void mSortColumnUpPushButton_clicked();

diff --git a/src/gui/symbology/qgsstylemanagerdialog.cpp b/src/gui/symbology/qgsstylemanagerdialog.cpp
@@ -792,7 +792,7 @@ bool QgsStyleManagerDialog::removeColorRamp()
 {
   QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
   if ( QMessageBox::Yes != QMessageBox::question( this, tr( "Confirm removal" ),
-       QString( tr( "Do you really want to remove %n ramps(s)?", nullptr, indexes.count() ) ),
+       QString( tr( "Do you really want to remove %n ramp(s)?", nullptr, indexes.count() ) ),
        QMessageBox::Yes,
        QMessageBox::No ) )
     return false;

diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -519,7 +519,7 @@ void QgsGeoPackageCollectionItem::addTable()
   }
   else
   {
-    QgsDebugMsg( QStringLiteral( "Cannot add Table: connection %1 does not exists or the path is empy!" ).arg( connName ) );
+    QgsDebugMsg( QStringLiteral( "Cannot add Table: connection %1 does not exist or the path is empty!" ).arg( connName ) );
   }
 }
 
@@ -593,7 +593,7 @@ QgsGeoPackageAbstractLayerItem::QgsGeoPackageAbstractLayerItem( QgsDataItem *par
 
 bool QgsGeoPackageAbstractLayerItem::executeDeleteLayer( QString &errCause )
 {
-  errCause = QObject::tr( "The layer <b>%1</b> cannot be deleted because the this feature is not yet implemented for this kind of layers." ).arg( mName );
+  errCause = QObject::tr( "The layer <b>%1</b> cannot be deleted because this feature is not yet implemented for this kind of layers." ).arg( mName );
   return false;
 }
 

diff --git a/src/ui/composer/qgsattributeselectiondialogbase.ui b/src/ui/composer/qgsattributeselectiondialogbase.ui
@@ -77,6 +77,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="mClearColumnsPushButton">
+           <property name="text">
+            <string>Clear</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item row="1" column="1">
@@ -113,7 +120,7 @@
           <enum>Qt::IgnoreAction</enum>
          </property>
          <property name="selectionMode">
-          <enum>QAbstractItemView::SingleSelection</enum>
+          <enum>QAbstractItemView::MultiSelection</enum>
          </property>
          <property name="selectionBehavior">
           <enum>QAbstractItemView::SelectRows</enum>

diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -2225,7 +2225,7 @@ border-radius: 2px;</string>
             <item row="0" column="0">
              <widget class="QLabel" name="label_1">
               <property name="text">
-               <string>Auxiliary storage tables can contain additional data that should only belong to the project file. For instance, specific location or rotation for labels. Auxiliary data are saved in qgd files. New fields can be added from any data-defined widget when needed. Be aware that this information will NOT be saved in you datasource but only in the project file.</string>
+               <string>Auxiliary storage tables can contain additional data that should only belong to the project file. For instance, specific location or rotation for labels. Auxiliary data are saved in qgd files. New fields can be added from any data-defined widget when needed. Be aware that this information will NOT be saved in the data source but only in the project file.</string>
               </property>
               <property name="wordWrap">
                <bool>true</bool>