434 changes: 209 additions & 225 deletions python/console_settings.ui
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions python/plugins/sextante/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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})
12 changes: 0 additions & 12 deletions python/plugins/sextante/SextantePlugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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"))
71 changes: 0 additions & 71 deletions python/plugins/sextante/about/AboutDialog.py
View file

This file was deleted.

6 changes: 0 additions & 6 deletions python/plugins/sextante/about/CMakeLists.txt
View file

This file was deleted.

Empty file removed python/plugins/sextante/about/__init__.py
View file
Empty file.
86 changes: 0 additions & 86 deletions python/plugins/sextante/about/aboutdialogbase.ui
View file

This file was deleted.

Binary file removed python/plugins/sextante/images/info.png
View file
Binary file not shown.
1 change: 0 additions & 1 deletion python/plugins/sextante/resources.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<file>images/grass.png</file>
<file>images/help.png</file>
<file>images/history.gif</file>
<file>images/info.png</file>
<file>images/input.png</file>
<file>images/iterate.png</file>
<file>images/model.png</file>
Expand Down
3 changes: 2 additions & 1 deletion src/core/qgsapplication.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() )
Expand Down
6 changes: 6 additions & 0 deletions src/mapserver/qgsprojectparser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1723,13 +1723,19 @@ 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 )
{
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 );
}

Expand Down
43 changes: 27 additions & 16 deletions src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -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 );
Expand Down Expand Up @@ -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() ) );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
23 changes: 19 additions & 4 deletions src/ui/qgsabout.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ p, li { white-space: pre-wrap; }
<attribute name="title">
<string>Developers</string>
</attribute>
<layout class="QGridLayout">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QListWidget" name="lstDevelopers">
<property name="alternatingRowColors">
<bool>true</bool>
Expand All @@ -190,13 +190,13 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="0">
<item row="0" column="1">
<widget class="QLabel" name="label_3">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../images/images.qrc">:/images/developers/lyon-2012.jpg</pixmap>
<pixmap resource="../../images/images.qrc">:/images/last-hackfest.jpg</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
Expand All @@ -206,6 +206,21 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<pointsize>17</pointsize>
</font>
</property>
<property name="text">
<string>Essen (Germany), Developer meeting 2012</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_5">
Expand Down
128 changes: 64 additions & 64 deletions src/ui/qgsrasterlayerpropertiesbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<item row="0" column="0" colspan="4">
<widget class="QTabWidget" name="tabBar">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<property name="iconSize">
<size>
Expand Down Expand Up @@ -251,69 +251,6 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QGroupBox" name="gboxNoDataValue">
<property name="title">
<string>No data value</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>1</number>
</property>
<item>
<widget class="QCheckBox" name="mSrcNoDataValueCheckBox">
<property name="toolTip">
<string>Use original source no data value.</string>
</property>
<property name="text">
<string>No data value:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblSrcNoDataValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Original data source no data value, if exists.</string>
</property>
<property name="text">
<string>&lt;src no data value&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="lblUserNoDataValueLabel">
<property name="toolTip">
<string>Additional user defined no data value.</string>
</property>
<property name="text">
<string>Additional no data value</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="leNoDataValue">
<property name="toolTip">
<string>Additional user defined no data value.</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
Expand Down Expand Up @@ -395,6 +332,69 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gboxNoDataValue">
<property name="title">
<string>No data value</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>1</number>
</property>
<item>
<widget class="QCheckBox" name="mSrcNoDataValueCheckBox">
<property name="toolTip">
<string>Use original source no data value.</string>
</property>
<property name="text">
<string>No data value:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblSrcNoDataValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Original data source no data value, if exists.</string>
</property>
<property name="text">
<string>&lt;src no data value&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="lblUserNoDataValueLabel">
<property name="toolTip">
<string>Additional user defined no data value.</string>
</property>
<property name="text">
<string>Additional no data value</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="leNoDataValue">
<property name="toolTip">
<string>Additional user defined no data value.</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion tests/src/analysis/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/src/gui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/src/providers/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 24 additions & 12 deletions tests/src/python/test_qgssymbollayerv2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down