Skip to content

Commit dba6ba4

Browse files
timlinuxtimlinux
committedJun 14, 2012
Merge branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents b33ea42 + efb54ea commit dba6ba4

File tree

9 files changed

+873
-864
lines changed

9 files changed

+873
-864
lines changed
 

‎doc/TRANSLATORS

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

‎i18n/qgis_de.ts

Lines changed: 790 additions & 752 deletions
Large diffs are not rendered by default.

‎i18n/qgis_nl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33983,7 +33983,7 @@ Dit kan een serverconfiguratie fout zijn. Moet de URL worden gebruikt?</translat
3398333983
</message>
3398433984
<message>
3398533985
<source>Tilesets</source>
33986-
<translation>Tilesetss</translation>
33986+
<translation>Tilesets</translation>
3398733987
</message>
3398833988
<message>
3398933989
<source>Styles</source>

‎src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
767767
m->setCheckBoxState( Qt::Unchecked );
768768
m->setCheckBoxVisible( true );
769769
m->setCheckBoxQSettingsLabel( settingsLabel );
770-
m->setMessageAsHtml( tr( "<p>The SVG export function in Qgis has several "
770+
m->setMessageAsHtml( tr( "<p>The SVG export function in QGIS has several "
771771
"problems due to bugs and deficiencies in the " )
772772
+ tr( "Qt4 svg code. In particular, there are problems "
773773
"with layers not being clipped to the map "

‎src/core/qgsexpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ bool QgsExpression::NodeColumnRef::prepare( QgsExpression* parent, const QgsFiel
15511551
return true;
15521552
}
15531553
}
1554-
parent->mEvalErrorString = QObject::tr( "Column '%1'' not found" ).arg( mName );
1554+
parent->mEvalErrorString = QObject::tr( "Column '%1' not found" ).arg( mName );
15551555
mIndex = -1;
15561556
return false;
15571557
}

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
3030
setupUi( this );
3131

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

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

46+
connect( btnLoadAll, SIGNAL( pressed() ), this, SLOT( loadAllValues() ) );
47+
connect( btnLoadSample, SIGNAL( pressed() ), this, SLOT( loadSampleValues() ) );
48+
4949
foreach( QPushButton* button, mOperatorsGroupBox->findChildren<QPushButton *>() )
5050
{
5151
connect( button, SIGNAL( pressed() ), this, SLOT( operatorButtonClicked() ) );
@@ -87,7 +87,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
8787
if ( func.mParams >= 1 )
8888
name += "(";
8989
registerItem( func.mGroup, func.mName, " " + name + " " );
90-
};
90+
}
91+
92+
#if QT_VERSION >= 0x040700
93+
txtSearchEdit->setPlaceHolderText( tr( "Search" ) );
94+
#endif
9195
}
9296

9397

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

112-
// Loading field values are handled with a
113-
// right click so we just show the help.
114116
if ( item->getItemType() != QgsExpressionItem::Field )
115117
{
116-
117-
mValueGroupBox->hide();
118118
mValueListWidget->clear();
119119
}
120+
121+
btnLoadAll->setVisible( item->getItemType() == QgsExpressionItem::Field );
122+
btnLoadSample->setVisible( item->getItemType() == QgsExpressionItem::Field );
123+
mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field );
124+
120125
// Show the help for the current item.
121126
QString help = loadFunctionHelp( item );
122127
txtHelpText->setText( help );

‎src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
591591
mShowInvalidLines = false;
592592
QgsMessageOutput* output = QgsMessageOutput::createMessageOutput();
593593
output->setTitle( tr( "Error" ) );
594-
output->setMessage( tr( "Note: the following lines were not loaded because Qgis was "
594+
output->setMessage( tr( "Note: the following lines were not loaded because QGIS was "
595595
"unable to determine values for the x and y coordinates:\n" ),
596596
QgsMessageOutput::MessageText );
597597

‎src/providers/wms/qgswmsprovider.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <QString>
2727
#include <QStringList>
2828
#include <QDomElement>
29+
#include <QHash>
2930
#include <QMap>
3031
#include <QVector>
3132
#include <QUrl>

‎src/ui/qgsexpressionbuilder.ui

Lines changed: 40 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<property name="spacing">
5050
<number>0</number>
5151
</property>
52-
<item row="5" column="0">
52+
<item row="4" column="0">
5353
<widget class="QTreeView" name="expressionTree">
5454
<property name="frameShape">
5555
<enum>QFrame::StyledPanel</enum>
@@ -75,37 +75,11 @@
7575
</widget>
7676
</item>
7777
<item row="2" column="0">
78-
<layout class="QHBoxLayout" name="horizontalLayout">
79-
<property name="spacing">
80-
<number>0</number>
81-
</property>
82-
<property name="topMargin">
83-
<number>2</number>
84-
</property>
85-
<property name="bottomMargin">
86-
<number>2</number>
78+
<widget class="QLineEdit" name="txtSearchEdit">
79+
<property name="enabled">
80+
<bool>true</bool>
8781
</property>
88-
<item>
89-
<widget class="QLabel" name="label">
90-
<property name="enabled">
91-
<bool>true</bool>
92-
</property>
93-
<property name="text">
94-
<string>Search</string>
95-
</property>
96-
<property name="scaledContents">
97-
<bool>false</bool>
98-
</property>
99-
</widget>
100-
</item>
101-
<item>
102-
<widget class="QLineEdit" name="txtSearchEdit">
103-
<property name="enabled">
104-
<bool>true</bool>
105-
</property>
106-
</widget>
107-
</item>
108-
</layout>
82+
</widget>
10983
</item>
11084
</layout>
11185
</widget>
@@ -124,6 +98,9 @@
12498
<property name="rightMargin">
12599
<number>0</number>
126100
</property>
101+
<property name="bottomMargin">
102+
<number>0</number>
103+
</property>
127104
<item>
128105
<widget class="QGroupBox" name="mFunctionHelGroup">
129106
<property name="title">
@@ -182,7 +159,7 @@
182159
<property name="spacing">
183160
<number>0</number>
184161
</property>
185-
<item row="0" column="0">
162+
<item row="0" column="0" colspan="2">
186163
<widget class="QListWidget" name="mValueListWidget">
187164
<property name="sizePolicy">
188165
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -216,6 +193,27 @@
216193
</layout>
217194
</widget>
218195
</item>
196+
<item>
197+
<layout class="QHBoxLayout" name="horizontalLayout_5">
198+
<property name="leftMargin">
199+
<number>6</number>
200+
</property>
201+
<item>
202+
<widget class="QPushButton" name="btnLoadAll">
203+
<property name="text">
204+
<string>Load all unique values</string>
205+
</property>
206+
</widget>
207+
</item>
208+
<item>
209+
<widget class="QPushButton" name="btnLoadSample">
210+
<property name="text">
211+
<string>Load 10 sample values</string>
212+
</property>
213+
</widget>
214+
</item>
215+
</layout>
216+
</item>
219217
</layout>
220218
</item>
221219
</layout>
@@ -471,7 +469,16 @@
471469
<bool>true</bool>
472470
</property>
473471
<layout class="QGridLayout" name="gridLayout_2">
474-
<property name="margin">
472+
<property name="leftMargin">
473+
<number>0</number>
474+
</property>
475+
<property name="topMargin">
476+
<number>3</number>
477+
</property>
478+
<property name="rightMargin">
479+
<number>0</number>
480+
</property>
481+
<property name="bottomMargin">
475482
<number>0</number>
476483
</property>
477484
<property name="spacing">
@@ -490,48 +497,6 @@
490497
</property>
491498
</widget>
492499
</item>
493-
<item row="2" column="1">
494-
<layout class="QVBoxLayout" name="opensaveLayout">
495-
<property name="spacing">
496-
<number>3</number>
497-
</property>
498-
<item>
499-
<widget class="QPushButton" name="btnSave">
500-
<property name="text">
501-
<string/>
502-
</property>
503-
<property name="icon">
504-
<iconset resource="../../images/images.qrc">
505-
<normaloff>:/images/themes/default/mActionFileSave.png</normaloff>:/images/themes/default/mActionFileSave.png</iconset>
506-
</property>
507-
</widget>
508-
</item>
509-
<item>
510-
<widget class="QPushButton" name="btnOpen">
511-
<property name="text">
512-
<string/>
513-
</property>
514-
<property name="icon">
515-
<iconset resource="../../images/images.qrc">
516-
<normaloff>:/images/themes/gis/mActionFileOpen.png</normaloff>:/images/themes/gis/mActionFileOpen.png</iconset>
517-
</property>
518-
</widget>
519-
</item>
520-
<item>
521-
<spacer name="verticalSpacer">
522-
<property name="orientation">
523-
<enum>Qt::Vertical</enum>
524-
</property>
525-
<property name="sizeHint" stdset="0">
526-
<size>
527-
<width>20</width>
528-
<height>40</height>
529-
</size>
530-
</property>
531-
</spacer>
532-
</item>
533-
</layout>
534-
</item>
535500
</layout>
536501
</widget>
537502
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.