Merge pull request #41102 from stefanuhrig/hanaicon

New SAP HANA Icon
qgis · Jan 20, 2021 · dba2700 · dba2700
2 parents 0cf985f + 54480d9
commit dba2700
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 266 deletions.
diff --git a/images/themes/default/mActionAddHanaLayer.svg b/images/themes/default/mActionAddHanaLayer.svg
diff --git a/images/themes/default/mIconHana.svg b/images/themes/default/mIconHana.svg
diff --git a/src/providers/hana/qgshanaconnection.cpp b/src/providers/hana/qgshanaconnection.cpp
@@ -65,7 +65,7 @@ QgsHanaConnection::~QgsHanaConnection()
   }
   catch ( const Exception &ex )
   {
-    QgsMessageLog::logMessage( QgsHanaUtils::formatErrorMessage( ex.what() ), tr( "HANA" ) );
+    QgsMessageLog::logMessage( QgsHanaUtils::formatErrorMessage( ex.what() ), tr( "SAP HANA" ) );
   }
 }
 
@@ -104,7 +104,7 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
       {
         errorMessage = QObject::tr( "Connection to database failed" ) + '\n' + QgsHanaUtils::formatErrorMessage( ex.what() );
         QgsDebugMsg( errorMessage );
-        QgsMessageLog::logMessage( errorMessage, tr( "HANA" ) );
+        QgsMessageLog::logMessage( errorMessage, tr( "SAP HANA" ) );
       }
 
       return conn->connected();

diff --git a/src/providers/hana/qgshanadataitemguiprovider.h b/src/providers/hana/qgshanadataitemguiprovider.h
@@ -27,7 +27,7 @@ class QgsHanaDataItemGuiProvider : public QObject, public QgsDataItemGuiProvider
     Q_OBJECT
   public:
 
-    QString name() override { return QStringLiteral( "HANA" ); }
+    QString name() override { return QStringLiteral( "SAP HANA" ); }
 
     void populateContextMenu( QgsDataItem *item, QMenu *menu,
                               const QList<QgsDataItem *> &selectedItems, QgsDataItemGuiContext context ) override;

diff --git a/src/providers/hana/qgshanadataitems.cpp b/src/providers/hana/qgshanadataitems.cpp
@@ -174,7 +174,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
         connect( exportTask.get(), &QgsVectorLayerExporterTask::exportComplete, this,
                  [ = ]()
         {
-          QMessageBox::information( nullptr, tr( "Import to HANA database" ), tr( "Import was successful." ) );
+          QMessageBox::information( nullptr, tr( "Import to SAP HANA database" ), tr( "Import was successful." ) );
           refreshSchema( toSchema );
         } );
 
@@ -185,7 +185,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
           if ( error != QgsVectorLayerExporter::ErrUserCanceled )
           {
             QgsMessageOutput *output = QgsMessageOutput::createMessageOutput();
-            output->setTitle( tr( "Import to HANA database" ) );
+            output->setTitle( tr( "Import to SAP HANA database" ) );
             output->setMessage( tr( "Failed to import some layers!\n\n" ) +
                                 errorMessage, QgsMessageOutput::MessageText );
             output->showMessage();
@@ -211,7 +211,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
   if ( hasError )
   {
     QgsMessageOutput *output = QgsMessageOutput::createMessageOutput();
-    output->setTitle( tr( "Import to HANA database" ) );
+    output->setTitle( tr( "Import to SAP HANA database" ) );
     output->setMessage( tr( "Failed to import some layers!\n\n" ) +
                         importResults.join( QLatin1Char( '\n' ) ), QgsMessageOutput::MessageText );
     output->showMessage();
@@ -381,5 +381,5 @@ QgsDataItem *QgsHanaDataItemProvider::createDataItem(
   const QString &pathIn, QgsDataItem *parentItem )
 {
   Q_UNUSED( pathIn );
-  return new QgsHanaRootItem( parentItem, QStringLiteral( "HANA" ), QStringLiteral( "hana:" ) );
+  return new QgsHanaRootItem( parentItem, QStringLiteral( "SAP HANA" ), QStringLiteral( "hana:" ) );
 }
diff --git a/src/providers/hana/qgshanadataitems.h b/src/providers/hana/qgshanadataitems.h
@@ -103,7 +103,7 @@ class QgsHanaLayerItem : public QgsLayerItem
 class QgsHanaDataItemProvider : public QgsDataItemProvider
 {
   public:
-    QString name() override { return QStringLiteral( "HANA" ); }
+    QString name() override { return QStringLiteral( "SAP HANA" ); }
     int capabilities() const override { return QgsDataProvider::Database; }
     QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
 };

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -278,7 +278,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     filterRect = mSource->mSrsExtent.intersect( filterRect );
 
   if ( !filterRect.isFinite() )
-    QgsMessageLog::logMessage( QObject::tr( "Infinite filter rectangle specified" ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "Infinite filter rectangle specified" ), QObject::tr( "SAP HANA" ) );
 
   QStringList orderByParts;
 #if 0