Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed Jun 14, 2012
2 parents b33ea42 + efb54ea commit dba6ba4fb1f3af70f96bea9173ab27f7a8542fc7

Large diffs are not rendered by default.

Large diffs are not rendered by default.

</message>
<message>
<source>Tilesets</source>
<translation>Tilesetss</translation>
<translation>Tilesets</translation>
</message>
<message>
<source>Styles</source>
@@ -767,7 +767,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
m->setCheckBoxState( Qt::Unchecked );
m->setCheckBoxVisible( true );
m->setCheckBoxQSettingsLabel( settingsLabel );
m->setMessageAsHtml( tr( "<p>The SVG export function in Qgis has several "
m->setMessageAsHtml( tr( "<p>The SVG export function in QGIS has several "
"problems due to bugs and deficiencies in the " )
+ tr( "Qt4 svg code. In particular, there are problems "
"with layers not being clipped to the map "
@@ -1551,7 +1551,7 @@ bool QgsExpression::NodeColumnRef::prepare( QgsExpression* parent, const QgsFiel
return true;
}
}
parent->mEvalErrorString = QObject::tr( "Column '%1'' not found" ).arg( mName );
parent->mEvalErrorString = QObject::tr( "Column '%1' not found" ).arg( mName );
mIndex = -1;
return false;
}
@@ -30,9 +30,6 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
setupUi( this );

mValueGroupBox->hide();
// The open and save button are for future.
btnOpen->hide();
btnSave->hide();
highlighter = new QgsExpressionHighlighter( txtExpressionString->document() );

mModel = new QStandardItemModel( );
@@ -46,6 +43,9 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
connect( expressionTree->selectionModel(), SIGNAL( currentChanged( const QModelIndex &, const QModelIndex & ) ),
this, SLOT( currentChanged( const QModelIndex &, const QModelIndex & ) ) );

connect( btnLoadAll, SIGNAL( pressed() ), this, SLOT( loadAllValues() ) );
connect( btnLoadSample, SIGNAL( pressed() ), this, SLOT( loadSampleValues() ) );

foreach( QPushButton* button, mOperatorsGroupBox->findChildren<QPushButton *>() )
{
connect( button, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
@@ -87,7 +87,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
if ( func.mParams >= 1 )
name += "(";
registerItem( func.mGroup, func.mName, " " + name + " " );
};
}

#if QT_VERSION >= 0x040700
txtSearchEdit->setPlaceHolderText( tr( "Search" ) );
#endif
}


@@ -109,14 +113,15 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
if ( item == 0 )
return;

// Loading field values are handled with a
// right click so we just show the help.
if ( item->getItemType() != QgsExpressionItem::Field )
{

mValueGroupBox->hide();
mValueListWidget->clear();
}

btnLoadAll->setVisible( item->getItemType() == QgsExpressionItem::Field );
btnLoadSample->setVisible( item->getItemType() == QgsExpressionItem::Field );
mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field );

// Show the help for the current item.
QString help = loadFunctionHelp( item );
txtHelpText->setText( help );
@@ -591,7 +591,7 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
mShowInvalidLines = false;
QgsMessageOutput* output = QgsMessageOutput::createMessageOutput();
output->setTitle( tr( "Error" ) );
output->setMessage( tr( "Note: the following lines were not loaded because Qgis was "
output->setMessage( tr( "Note: the following lines were not loaded because QGIS was "
"unable to determine values for the x and y coordinates:\n" ),
QgsMessageOutput::MessageText );

@@ -26,6 +26,7 @@
#include <QString>
#include <QStringList>
#include <QDomElement>
#include <QHash>
#include <QMap>
#include <QVector>
#include <QUrl>
@@ -49,7 +49,7 @@
<property name="spacing">
<number>0</number>
</property>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QTreeView" name="expressionTree">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@@ -75,37 +75,11 @@
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
<widget class="QLineEdit" name="txtSearchEdit">
<property name="enabled">
<bool>true</bool>
</property>
<item>
<widget class="QLabel" name="label">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Search</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="txtSearchEdit">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -124,6 +98,9 @@
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="mFunctionHelGroup">
<property name="title">
@@ -182,7 +159,7 @@
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="mValueListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -216,6 +193,27 @@
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="btnLoadAll">
<property name="text">
<string>Load all unique values</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnLoadSample">
<property name="text">
<string>Load 10 sample values</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
@@ -471,7 +469,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -490,48 +497,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QVBoxLayout" name="opensaveLayout">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QPushButton" name="btnSave">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileSave.png</normaloff>:/images/themes/default/mActionFileSave.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnOpen">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/gis/mActionFileOpen.png</normaloff>:/images/themes/gis/mActionFileOpen.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>

0 comments on commit dba6ba4

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