diff --git a/python/plugins/sextante/CMakeLists.txt b/python/plugins/sextante/CMakeLists.txt
index 6ba91c184200..cf375de62732 100644
--- a/python/plugins/sextante/CMakeLists.txt
+++ b/python/plugins/sextante/CMakeLists.txt
@@ -1,6 +1,5 @@
SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
-ADD_SUBDIRECTORY(about)
ADD_SUBDIRECTORY(algs)
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(ftools)
@@ -27,6 +26,4 @@ FILE(GLOB PY_FILES *.py)
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
-
-
PLUGIN_INSTALL(sextante . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})
diff --git a/python/plugins/sextante/SextantePlugin.py b/python/plugins/sextante/SextantePlugin.py
index 95ee6b4b49a9..1724ffe515cf 100644
--- a/python/plugins/sextante/SextantePlugin.py
+++ b/python/plugins/sextante/SextantePlugin.py
@@ -42,8 +42,6 @@
from sextante.modeler.ModelerDialog import ModelerDialog
-from sextante.about.AboutDialog import AboutDialog
-
import resources_rc
cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
@@ -102,12 +100,6 @@ def initGui(self):
QObject.connect(self.helpAction, SIGNAL("triggered()"), self.openHelp)
self.menu.addAction(self.helpAction)
- self.aboutAction = QAction(QIcon(":/sextante/images/info.png"),
- QCoreApplication.translate("SEXTANTE", "&About SEXTANTE"),
- self.iface.mainWindow())
- QObject.connect(self.aboutAction, SIGNAL("triggered()"), self.openAbout)
- self.menu.addAction(self.aboutAction)
-
menuBar = self.iface.mainWindow().menuBar()
menuBar.insertMenu(menuBar.actions()[-1], self.menu)
@@ -145,9 +137,5 @@ def openConfig(self):
dlg = ConfigDialog(self.toolbox)
dlg.exec_()
- def openAbout(self):
- dlg = AboutDialog()
- dlg.exec_()
-
def openHelp(self):
QDesktopServices.openUrl(QUrl(os.path.dirname(__file__) + "/help/index.html"))
diff --git a/python/plugins/sextante/about/AboutDialog.py b/python/plugins/sextante/about/AboutDialog.py
deleted file mode 100644
index bfd861fea2af..000000000000
--- a/python/plugins/sextante/about/AboutDialog.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
- AboutDialog.py
- ---------------------
- Date : August 2012
- Copyright : (C) 2012 by Tim Sutton
- Email : tim at linfiniti dot com
-***************************************************************************
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
-***************************************************************************
-"""
-
-__author__ = 'Tim Sutton'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Tim Sutton'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-import os
-
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
-from sextante.__init__ import version
-from ui_aboutdialogbase import Ui_DlgAbout
-
-import sextante.resources_rc
-
-class AboutDialog(QDialog, Ui_DlgAbout):
-
- def __init__(self):
- QDialog.__init__(self)
- self.setupUi(self)
-
- self.buttonBox.helpRequested.connect(self.openHelp)
-
- self.setAboutText()
-
- def setAboutText(self):
- strAbout = self.tr("""
- 
- SEXTANTE for QGIS
- SEXTANTE, a geoprocessing platform for QGIS
- A development by Victor Olaya (volayaf@gmail.com).
- Portions of this software contributed by:
-
- - Alexander Bruy
- - Carson Farmer (fTools algorithms)
- - Julien Malik (Orfeo Toolbox connectors)
- - Evgeniy Nikulin (Original Field Pyculator code)
- - Michael Nimm (mmqgis algorithms)
- - Camilo Polymeris (Threading). Developed as part of Google
- Summer of Code 2012
-
-
- You are currently using SEXTANTE v%1
- This software is distributed under the terms of the GNU GPL License v2.
-
For more information, please visit our website at
- http://sextantegis.com
- """).arg(version())
- self.webView.setHtml(strAbout)
-
- def openHelp(self):
- QDesktopServices.openUrl(QUrl(os.path.join(os.path.dirname(__file__), os.path.pardir) + "/help/index.html"))
diff --git a/python/plugins/sextante/about/CMakeLists.txt b/python/plugins/sextante/about/CMakeLists.txt
deleted file mode 100644
index 1f274b6b89f8..000000000000
--- a/python/plugins/sextante/about/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-FILE(GLOB PY_FILES *.py)
-
-FILE(GLOB UI_FILES *.ui)
-PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
-
-PLUGIN_INSTALL(sextante ./about ${PY_FILES} ${PYUI_FILES})
diff --git a/python/plugins/sextante/about/__init__.py b/python/plugins/sextante/about/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/python/plugins/sextante/about/aboutdialogbase.ui b/python/plugins/sextante/about/aboutdialogbase.ui
deleted file mode 100644
index 49b21bd364e5..000000000000
--- a/python/plugins/sextante/about/aboutdialogbase.ui
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
- DlgAbout
-
-
-
- 0
- 0
- 492
- 401
-
-
-
- About SEXTANTE
-
-
-
- 2
-
-
- 0
-
- -
-
-
-
- about:blank
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Close|QDialogButtonBox::Help
-
-
-
-
-
-
-
- QWebView
- QWidget
-
-
-
-
-
-
- buttonBox
- accepted()
- DlgAbout
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- DlgAbout
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/python/plugins/sextante/images/info.png b/python/plugins/sextante/images/info.png
deleted file mode 100644
index 6627835ba32d..000000000000
Binary files a/python/plugins/sextante/images/info.png and /dev/null differ
diff --git a/python/plugins/sextante/resources.qrc b/python/plugins/sextante/resources.qrc
index 1e390ec721d5..f9659c89c7a2 100644
--- a/python/plugins/sextante/resources.qrc
+++ b/python/plugins/sextante/resources.qrc
@@ -5,7 +5,6 @@
images/grass.png
images/help.png
images/history.gif
- images/info.png
images/input.png
images/iterate.png
images/model.png
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index aade37de2a3c..5d79b158e4c5 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -91,7 +91,8 @@ void QgsApplication::init( QString customConfigPath )
// check if QGIS is run from build directory (not the install directory)
QFile f;
- foreach ( QString path, QStringList() << "" << "/.." << "/bin" )
+ // "/../../.." is for Mac bundled app in build directory
+ foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
{
f.setFileName( prefixPath + path + "/path.txt" );
if ( f.exists() )
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
index 39833ab59fe3..e20298fabfe5 100644
--- a/src/mapserver/qgsprojectparser.cpp
+++ b/src/mapserver/qgsprojectparser.cpp
@@ -1723,6 +1723,8 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
QDomElement keywordListElem = propertiesElem.firstChildElement( "WMSKeywordList" );
if ( !keywordListElem.isNull() )
{
+ bool siaFormat = featureInfoFormatSIA2045();
+
QDomElement wmsKeywordElem = doc.createElement( "KeywordList" );
QDomNodeList keywordList = keywordListElem.elementsByTagName( "value" );
for ( int i = 0; i < keywordList.size(); ++i )
@@ -1730,6 +1732,10 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
QDomElement keywordElem = doc.createElement( "Keyword" );
QDomText keywordText = doc.createTextNode( keywordList.at( i ).toElement().text() );
keywordElem.appendChild( keywordText );
+ if ( siaFormat )
+ {
+ keywordElem.setAttribute( "vocabulary", "SIA_Geo405" );
+ }
wmsKeywordElem.appendChild( keywordElem );
}
diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
index 13549592e5f6..78559bbfd7b1 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
+++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
@@ -166,7 +166,7 @@ void QgsDelimitedTextSourceSelect::on_buttonBox_accepted()
settings.setValue( key + "/delimiterType", "plain" );
else
settings.setValue( key + "/delimiterType", "regexp" );
- settings.setValue( key + "/delimiterChars", selectedChars() );
+ settings.setValue( key + "/delimiterChars", selectedChars().join( "" ) );
accept();
}
@@ -181,37 +181,50 @@ void QgsDelimitedTextSourceSelect::on_buttonBox_rejected()
reject();
}
-QString QgsDelimitedTextSourceSelect::selectedChars()
+QStringList QgsDelimitedTextSourceSelect::selectedChars()
{
- QString chars = "";
+ QStringList chars;
if ( cbxDelimSpace->isChecked() )
- chars += " ";
+ chars << " ";
if ( cbxDelimTab->isChecked() )
- chars += "\\t";
+ chars << "\\t";
if ( cbxDelimSemicolon->isChecked() )
- chars += ";";
+ chars << ";";
if ( cbxDelimComma->isChecked() )
- chars += ",";
+ chars << ",";
if ( cbxDelimColon->isChecked() )
- chars += ":";
+ chars << ":";
return chars;
}
QStringList QgsDelimitedTextSourceSelect::splitLine( QString line )
{
- QString delimiter = txtDelimiter->text();
+ QString delimiter;
+ if ( delimiterSelection->isChecked() )
+ {
+ if ( selectedChars().size() > 1 )
+ {
+ delimiter = "[" + selectedChars().join( "" ) + "]";
+ }
+ else
+ {
+ delimiter = selectedChars().join( "" );
+ }
+ txtDelimiter->setText( delimiter );
+ }
+ else
+ {
+ delimiter = txtDelimiter->text();
+ }
if ( delimiterPlain->isChecked() )
{
return QgsDelimitedTextProvider::splitLine( line, "plain", delimiter );
}
- if ( delimiterSelection->isChecked() )
+ if ( delimiterSelection->isChecked() && selectedChars().size() <= 1 )
{
- delimiter = "[";
- delimiter += selectedChars();
- delimiter += "]";
- txtDelimiter->setText( delimiter );
+ return QgsDelimitedTextProvider::splitLine( line, "plain", delimiter );
}
return QgsDelimitedTextProvider::splitLine( line, "regexp", delimiter );
@@ -291,8 +304,6 @@ void QgsDelimitedTextSourceSelect::updateFieldLists()
QgsDebugMsg( QString( "Attempting to split the input line: %1 using delimiter %2" ).arg( line ).arg( txtDelimiter->text() ) );
- QString delimiter = txtDelimiter->text();
-
QStringList fieldList = splitLine( line );
QgsDebugMsg( QString( "Split line into %1 parts" ).arg( fieldList.size() ) );
diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
index 341d52fc8d2c..8d16e4c4e6aa 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
+++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
@@ -38,7 +38,7 @@ class QgsDelimitedTextSourceSelect : public QDialog, private Ui::QgsDelimitedTex
bool haveValidFileAndDelimiters();
void updateFieldLists();
void getOpenFileName();
- QString selectedChars();
+ QStringList selectedChars();
private slots:
void on_buttonBox_accepted();
diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui
index 7b225d5b023b..3d64bba5ae53 100644
--- a/src/ui/qgsabout.ui
+++ b/src/ui/qgsabout.ui
@@ -179,8 +179,8 @@ p, li { white-space: pre-wrap; }
Developers
-
- -
+
+
-
true
@@ -190,13 +190,13 @@ p, li { white-space: pre-wrap; }
- -
+
-
- :/images/developers/lyon-2012.jpg
+ :/images/last-hackfest.jpg
false
@@ -206,6 +206,21 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+
+ 17
+
+
+
+ Essen (Germany), Developer meeting 2012
+
+
+ Qt::AlignCenter
+
+
+
diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
index 9f0b86133191..2c3c7b048033 100644
--- a/src/ui/qgsrasterlayerpropertiesbase.ui
+++ b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -72,7 +72,7 @@
-
- 0
+ 1
@@ -251,69 +251,6 @@
-
-
-
-
-
- No data value
-
-
-
-
-
-
- 1
-
-
-
-
-
- Use original source no data value.
-
-
- No data value:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Original data source no data value, if exists.
-
-
- <src no data value>
-
-
-
-
-
- -
-
-
-
-
-
- Additional user defined no data value.
-
-
- Additional no data value
-
-
-
- -
-
-
- Additional user defined no data value.
-
-
-
-
-
-
-
-
-
@@ -395,6 +332,69 @@
+ -
+
+
+ No data value
+
+
+
-
+
+
+ 1
+
+
-
+
+
+ Use original source no data value.
+
+
+ No data value:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Original data source no data value, if exists.
+
+
+ <src no data value>
+
+
+
+
+
+ -
+
+
-
+
+
+ Additional user defined no data value.
+
+
+ Additional no data value
+
+
+
+ -
+
+
+ Additional user defined no data value.
+
+
+
+
+
+
+
+
-
diff --git a/tests/src/analysis/CMakeLists.txt b/tests/src/analysis/CMakeLists.txt
index 98c9018b20ec..1a134aea8b99 100644
--- a/tests/src/analysis/CMakeLists.txt
+++ b/tests/src/analysis/CMakeLists.txt
@@ -42,7 +42,7 @@ ENDIF (WIN32)
# ensure the qgis libs can be found.
IF (APPLE)
# For Mac OS X, the executable must be at the root of the bundle's executable folder
- SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
+# SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
ENDIF (APPLE)
#note for tests we should not include the moc of our
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
index 92bfef502c5b..dfd92cffd770 100644
--- a/tests/src/core/CMakeLists.txt
+++ b/tests/src/core/CMakeLists.txt
@@ -41,7 +41,7 @@ ENDIF (WIN32)
# ensure the qgis libs can be found.
IF (APPLE)
# For Mac OS X, the executable must be at the root of the bundle's executable folder
- SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
+# SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
ENDIF (APPLE)
#note for tests we should not include the moc of our
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
index 23f0f1e01f1e..57d4190b5d27 100644
--- a/tests/src/gui/CMakeLists.txt
+++ b/tests/src/gui/CMakeLists.txt
@@ -48,7 +48,7 @@ ENDIF(WIN32)
# ensure the omg libs can be found.
IF (APPLE)
# For Mac OS X, the executable must be at the root of the bundle's executable folder
- SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/gui)
+# SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/gui)
ENDIF (APPLE)
#note for tests we should not include the moc of our
diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
index f27aa77fac78..7caf15ce3ce2 100644
--- a/tests/src/providers/CMakeLists.txt
+++ b/tests/src/providers/CMakeLists.txt
@@ -39,7 +39,7 @@ ENDIF (WIN32)
# ensure the qgis libs can be found.
IF (APPLE)
# For Mac OS X, the executable must be at the root of the bundle's executable folder
- SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
+# SET (CMAKE_INSTALL_NAME_DIR @executable_path/../../../src/core)
ENDIF (APPLE)
#note for tests we should not include the moc of our
diff --git a/tests/src/python/test_qgssymbollayerv2.py b/tests/src/python/test_qgssymbollayerv2.py
index bf43c724c220..b2856f491cef 100644
--- a/tests/src/python/test_qgssymbollayerv2.py
+++ b/tests/src/python/test_qgssymbollayerv2.py
@@ -34,27 +34,39 @@
Qt)
from PyQt4.QtXml import QDomDocument
-from qgis.core import (QgsSymbolLayerV2,
- QgsSimpleFillSymbolLayerV2,
- QgsVectorFieldSymbolLayer,
- QgsMarkerSymbolLayerV2,
+from qgis.core import (QgsCentroidFillSymbolLayerV2,
+ QgsEllipseSymbolLayerV2,
QgsFontMarkerSymbolLayerV2,
- QgsCentroidFillSymbolLayerV2,
- QgsPointPatternFillSymbolLayer,
- QgsSVGFillSymbolLayer,
+ QgsLineDecorationSymbolLayerV2,
QgsLinePatternFillSymbolLayer,
QgsMarkerLineSymbolLayerV2,
- QgsEllipseSymbolLayerV2,
+ QgsMarkerSymbolLayerV2,
+ QgsPointPatternFillSymbolLayer,
+ QgsSimpleFillSymbolLayerV2,
+ QgsSimpleLineSymbolLayerV2,
+ QgsSimpleMarkerSymbolLayerV2,
+ QgsSVGFillSymbolLayer,
QgsSvgMarkerSymbolLayerV2,
+ QgsSymbolLayerV2,
+ QgsVectorFieldSymbolLayer,
QgsCentroidFillSymbolLayerV2,
+ QgsEllipseSymbolLayerV2,
+ QgsFillSymbolLayerV2,
+ QgsFontMarkerSymbolLayerV2,
+ QgsImageFillSymbolLayer,
+ QgsLineDecorationSymbolLayerV2,
QgsLinePatternFillSymbolLayer,
- QgsCentroidFillSymbolLayerV2,
+ QgsLineSymbolLayerV2,
QgsMarkerLineSymbolLayerV2,
- QgsSimpleMarkerSymbolLayerV2,
+ QgsMarkerSymbolLayerV2,
+ QgsPointPatternFillSymbolLayer,
QgsSimpleFillSymbolLayerV2,
QgsSimpleLineSymbolLayerV2,
- QgsLineDecorationSymbolLayerV2
- )
+ QgsSimpleMarkerSymbolLayerV2,
+ QgsSVGFillSymbolLayer,
+ QgsSvgMarkerSymbolLayerV2,
+ QgsVectorFieldSymbolLayer,
+ )
from utilities import (unitTestDataPath,
getQgisTestApp,
TestCase,