Skip to content
Permalink
Browse files

Fix for compile failure when buiding without spatialite.

Changed shortcut key for creating new spatialite layer/database to
Ctrl+Shift+A (previous value conflicted with existing shortcut)

git-svn-id: http://svn.osgeo.org/qgis/trunk@13294 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman
gsherman committed Apr 11, 2010
1 parent 94ee5a4 commit dc39570f3d04e3569439e3d977c1daf03be76381
Showing with 6 additions and 3 deletions.
  1. +4 −3 src/app/qgisapp.cpp
  2. +2 −0 src/app/qgisapp.h
@@ -217,10 +217,10 @@
#define PG_VERSION "unknown"
#endif
#endif
#include <sqlite3.h>
#ifdef HAVE_SPATIALITE
extern "C"
{
#include <sqlite3.h>
#include <spatialite.h>
}
#include "qgsspatialitesourceselect.h"
@@ -956,7 +956,7 @@ void QgisApp::createActions()

#ifdef HAVE_SPATIALITE
mActionNewSpatialiteLayer = new QAction( getThemeIcon( "mActionNewVectorLayer.png" ), tr( "New SpatiaLite Layer ..." ), this );
shortcuts->registerAction( mActionNewSpatialiteLayer, tr( "Ctrl+Shift+S", "Create a New SpatiaLite Layer " ) );
shortcuts->registerAction( mActionNewSpatialiteLayer, tr( "Ctrl+Shift+A", "Create a New SpatiaLite Layer " ) );
mActionNewSpatialiteLayer->setStatusTip( tr( "Create a New SpatiaLite Layer " ) );
connect( mActionNewSpatialiteLayer, SIGNAL( triggered() ), this, SLOT( newSpatialiteLayer() ) );
#endif
@@ -3106,13 +3106,13 @@ static QString quotedValue( QString value )
return value.prepend( "'" ).append( "'" );
}

#ifdef HAVE_SPATIALITE
void QgisApp::newSpatialiteLayer()
{
if ( mMapCanvas && mMapCanvas->isDrawing() )
{
return;
}

QgsNewSpatialiteLayerDialog spatialiteDialog( this );
if ( spatialiteDialog.exec() == QDialog::Rejected )
{
@@ -3229,6 +3229,7 @@ void QgisApp::newSpatialiteLayer()
}
}
}
#endif

void QgisApp::fileOpen()
{
@@ -493,8 +493,10 @@ class QgisApp : public QMainWindow
void fileNew( bool thePromptToSaveFlag );
//! Create a new empty vector layer
void newVectorLayer();
#ifdef HAVE_SPATIALITE
//! Create a new empty spatialite layer
void newSpatialiteLayer();
#endif
//! Print the current map view frame
void newPrintComposer();
void showComposerManager();

0 comments on commit dc39570

Please sign in to comment.
You can’t perform that action at this time.