Skip to content

Commit 93fb9db

Browse files
committed
Use code editor for expression widget
1 parent 32dfb86 commit 93fb9db

File tree

4 files changed

+19
-44
lines changed

4 files changed

+19
-44
lines changed

src/gui/qgscodeeditor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ QgsCodeEditor::QgsCodeEditor( QWidget *parent, QString title, bool folding, bool
3636
setWindowTitle( mWidgetTitle );
3737
}
3838
setSciWidget();
39+
setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
3940
}
4041

4142
QgsCodeEditor::~QgsCodeEditor()

src/gui/qgscodeeditorpython.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ void QgsCodeEditorPython::loadScript( const QString &script )
132132

133133
QTextStream in( &file );
134134

135-
//QString line = in.readAll();
136-
//while ( !in.atEnd() )
137-
//{
138-
//QString line = in.readLine();
139-
//QStringList fields = line.split( "," );
140-
//QgsCodeEditor::insert( fields );
141-
//}
142135
setText( in.readAll() );
143136
file.close();
144137

src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
3232

3333
mValueGroupBox->hide();
3434
mLoadGroupBox->hide();
35-
highlighter = new QgsExpressionHighlighter( txtExpressionString->document() );
35+
// highlighter = new QgsExpressionHighlighter( txtExpressionString->document() );
3636

3737
mModel = new QStandardItemModel( );
3838
mProxyModel = new QgsExpressionItemSearchProxy();
@@ -158,7 +158,7 @@ void QgsExpressionBuilderWidget::on_expressionTree_doubleClicked( const QModelIn
158158
return;
159159

160160
// Insert the expression text.
161-
txtExpressionString->insertPlainText( item->getExpressionText() );
161+
txtExpressionString->insert( item->getExpressionText() );
162162
txtExpressionString->setFocus();
163163
}
164164

@@ -185,7 +185,7 @@ void QgsExpressionBuilderWidget::loadFieldNames( const QgsFields& fields )
185185
fieldNames << fieldName;
186186
registerItem( "Fields and Values", fieldName, " \"" + fieldName + "\" ", "", QgsExpressionItem::Field );
187187
}
188-
highlighter->addFields( fieldNames );
188+
// highlighter->addFields( fieldNames );
189189
}
190190

191191
void QgsExpressionBuilderWidget::fillFieldValues( int fieldIndex, int countLimit )
@@ -289,17 +289,17 @@ void QgsExpressionBuilderWidget::setGeomCalculator( const QgsDistanceArea & da )
289289

290290
QString QgsExpressionBuilderWidget::expressionText()
291291
{
292-
return txtExpressionString->toPlainText();
292+
return txtExpressionString->text();
293293
}
294294

295295
void QgsExpressionBuilderWidget::setExpressionText( const QString& expression )
296296
{
297-
txtExpressionString->setPlainText( expression );
297+
txtExpressionString->setText( expression );
298298
}
299299

300300
void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()
301301
{
302-
QString text = txtExpressionString->toPlainText();
302+
QString text = txtExpressionString->text();
303303

304304
// If the string is empty the expression will still "fail" although
305305
// we don't show the user an error as it will be confusing.
@@ -392,14 +392,14 @@ void QgsExpressionBuilderWidget::on_lblPreview_linkActivated( QString link )
392392

393393
void QgsExpressionBuilderWidget::on_mValueListWidget_itemDoubleClicked( QListWidgetItem *item )
394394
{
395-
txtExpressionString->insertPlainText( " " + item->text() + " " );
395+
txtExpressionString->insert( " " + item->text() + " " );
396396
txtExpressionString->setFocus();
397397
}
398398

399399
void QgsExpressionBuilderWidget::operatorButtonClicked()
400400
{
401401
QPushButton* button = dynamic_cast<QPushButton*>( sender() );
402-
txtExpressionString->insertPlainText( " " + button->text() + " " );
402+
txtExpressionString->insert( " " + button->text() + " " );
403403
txtExpressionString->setFocus();
404404
}
405405

src/ui/qgsexpressionbuilder.ui

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -441,37 +441,9 @@
441441
<bool>true</bool>
442442
</property>
443443
<layout class="QGridLayout" name="gridLayout">
444-
<property name="leftMargin">
445-
<number>0</number>
446-
</property>
447-
<property name="topMargin">
448-
<number>9</number>
449-
</property>
450-
<property name="rightMargin">
451-
<number>0</number>
452-
</property>
453-
<property name="bottomMargin">
444+
<property name="margin">
454445
<number>0</number>
455446
</property>
456-
<item row="0" column="0" colspan="2">
457-
<widget class="QTextEdit" name="txtExpressionString">
458-
<property name="sizePolicy">
459-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
460-
<horstretch>0</horstretch>
461-
<verstretch>0</verstretch>
462-
</sizepolicy>
463-
</property>
464-
<property name="minimumSize">
465-
<size>
466-
<width>0</width>
467-
<height>32</height>
468-
</size>
469-
</property>
470-
<property name="cursor" stdset="0">
471-
<cursorShape>IBeamCursor</cursorShape>
472-
</property>
473-
</widget>
474-
</item>
475447
<item row="1" column="0">
476448
<widget class="QLabel" name="label_2">
477449
<property name="sizePolicy">
@@ -533,6 +505,9 @@
533505
</property>
534506
</widget>
535507
</item>
508+
<item row="0" column="0" colspan="2">
509+
<widget class="QgsCodeEditorSQL" name="txtExpressionString" native="true"/>
510+
</item>
536511
</layout>
537512
</widget>
538513
</item>
@@ -554,6 +529,12 @@
554529
<extends>QLineEdit</extends>
555530
<header>qgsfilterlineedit.h</header>
556531
</customwidget>
532+
<customwidget>
533+
<class>QgsCodeEditorSQL</class>
534+
<extends>QWidget</extends>
535+
<header>qgscodeeditorsql.h</header>
536+
<container>1</container>
537+
</customwidget>
557538
</customwidgets>
558539
<resources/>
559540
<connections/>

0 commit comments

Comments
 (0)