Make offline editing warnings use message bar and more verbose

m-kuhn · m-kuhn · commit 4a8bcc9894b6 · 2015-01-22T17:19:08.000+01:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -425,7 +425,7 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
     }
     else
     {
-      showWarning( tr( "Unknown data type %1" ).arg( type ) );
+      showWarning( tr( "%1: Unknown data type %2. Not using type affinity for thie field." ).arg( fields[idx].name() ).arg( QVariant::typeToName( type ) ) );
     }
 
     sql += delim + QString( "'%1' %2" ).arg( fields[idx].name() ).arg( dataType );
@@ -817,7 +817,7 @@ QMap<int, int> QgsOfflineEditing::attributeLookup( QgsVectorLayer* offlineLayer,
 
 void QgsOfflineEditing::showWarning( const QString& message )
 {
-  QMessageBox::warning( NULL, tr( "Offline Editing Plugin" ), message );
+  emit warning( tr( "Offline Editing Plugin" ), message );
 }
 
 sqlite3* QgsOfflineEditing::openLoggingDb()
diff --git a/src/core/qgsofflineediting.h b/src/core/qgsofflineediting.h
@@ -85,6 +85,13 @@ class CORE_EXPORT QgsOfflineEditing : public QObject
     /** emit a signal that processing of all layers has finished */
     void progressStopped();
 
+    /**
+     * Emitted when a warning needs to be displayed.
+     *
+     * @param message A descriptive message for the warning
+     */
+    void warning( const QString& title, const QString& message );
+
   private:
     void initializeSpatialMetadata( sqlite3 *sqlite_handle );
     bool createSpatialiteDB( const QString& offlineDbPath );
diff --git a/src/plugins/offline_editing/offline_editing_plugin.cpp b/src/plugins/offline_editing/offline_editing_plugin.cpp
@@ -24,6 +24,7 @@
 #include <qgisgui.h>
 #include <qgsmaplayerregistry.h>
 #include <qgsproject.h>
+#include <qgsmessagebar.h>
 
 #include <QAction>
 
@@ -81,6 +82,7 @@ void QgsOfflineEditingPlugin::initGui()
   connect( mOfflineEditing, SIGNAL( progressModeSet( QgsOfflineEditing::ProgressMode, int ) ), this, SLOT( setProgressMode( QgsOfflineEditing::ProgressMode, int ) ) );
   connect( mOfflineEditing, SIGNAL( progressUpdated( int ) ), this, SLOT( updateProgress( int ) ) );
   connect( mOfflineEditing, SIGNAL( progressStopped() ), this, SLOT( hideProgress() ) );
+  connect( mOfflineEditing, SIGNAL( warning( QString, QString ) ), mQGisIface->messageBar(), SLOT( pushWarning( QString, QString ) ) );
 
   connect( mQGisIface->mainWindow(), SIGNAL( projectRead() ), this, SLOT( updateActions() ) );
   connect( mQGisIface->mainWindow(), SIGNAL( newProject() ), this, SLOT( updateActions() ) );
@@ -204,7 +206,6 @@ void QgsOfflineEditingPlugin::hideProgress()
   mProgressDialog->hide();
 }
 
-
 /**
  * Required extern functions needed  for every plugin
  * These functions can be called prior to creating an instance

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con`
`425`	`425`	`}`
`426`	`426`	`else`
`427`	`427`	`{`
`428`		`- showWarning( tr( "Unknown data type %1" ).arg( type ) );`
	`428`	`+ showWarning( tr( "%1: Unknown data type %2. Not using type affinity for thie field." ).arg( fields[idx].name() ).arg( QVariant::typeToName( type ) ) );`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`sql += delim + QString( "'%1' %2" ).arg( fields[idx].name() ).arg( dataType );`
`@@ -817,7 +817,7 @@ QMap<int, int> QgsOfflineEditing::attributeLookup( QgsVectorLayer* offlineLayer,`
`817`	`817`
`818`	`818`	`void QgsOfflineEditing::showWarning( const QString& message )`
`819`	`819`	`{`
`820`		`- QMessageBox::warning( NULL, tr( "Offline Editing Plugin" ), message );`
	`820`	`+ emit warning( tr( "Offline Editing Plugin" ), message );`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`sqlite3* QgsOfflineEditing::openLoggingDb()`