Skip to content

Commit fe9c7c3

Browse files
NathanW2NathanW2
committed
Fix #12055 - Add split to function/help area on expression builder
Funded by Digital Mapping Solutions
1 parent fb344ff commit fe9c7c3

File tree

2 files changed

+173
-179
lines changed

2 files changed

+173
-179
lines changed

‎src/gui/qgsexpressionbuilderwidget.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
6060

6161
QSettings settings;
6262
splitter->restoreState( settings.value( "/windows/QgsExpressionBuilderWidget/splitter" ).toByteArray() );
63+
functionsplit->restoreState( settings.value( "/windows/QgsExpressionBuilderWidget/functionsplitter" ).toByteArray() );
6364

6465
txtExpressionString->setFoldingVisible( false );
6566

@@ -84,7 +85,7 @@ QgsExpressionBuilderWidget::~QgsExpressionBuilderWidget()
8485
{
8586
QSettings settings;
8687
settings.setValue( "/windows/QgsExpressionBuilderWidget/splitter", splitter->saveState() );
87-
// settings.setValue( "/windows/QgsExpressionBuilderWidget/splitter2", splitter_2->saveState() );
88+
settings.setValue( "/windows/QgsExpressionBuilderWidget/functionsplitter", functionsplit->saveState() );
8889
}
8990

9091
void QgsExpressionBuilderWidget::setLayer( QgsVectorLayer *layer )

‎src/ui/qgsexpressionbuilder.ui

+171-178
Original file line numberDiff line numberDiff line change
@@ -354,197 +354,190 @@
354354
<property name="flat">
355355
<bool>true</bool>
356356
</property>
357-
<layout class="QGridLayout" name="gridLayout_6">
358-
<property name="leftMargin">
359-
<number>0</number>
360-
</property>
361-
<property name="topMargin">
362-
<number>3</number>
363-
</property>
364-
<property name="rightMargin">
365-
<number>0</number>
366-
</property>
367-
<property name="bottomMargin">
368-
<number>0</number>
369-
</property>
370-
<property name="horizontalSpacing">
371-
<number>6</number>
372-
</property>
373-
<property name="verticalSpacing">
374-
<number>0</number>
375-
</property>
376-
<item row="2" column="0">
377-
<widget class="QgsFilterLineEdit" name="txtSearchEdit">
378-
<property name="enabled">
379-
<bool>true</bool>
380-
</property>
381-
</widget>
382-
</item>
383-
<item row="4" column="0">
384-
<widget class="QTreeView" name="expressionTree">
385-
<property name="frameShape">
386-
<enum>QFrame::StyledPanel</enum>
387-
</property>
388-
<property name="frameShadow">
389-
<enum>QFrame::Sunken</enum>
357+
<layout class="QGridLayout" name="gridLayout_5">
358+
<item row="0" column="0">
359+
<widget class="QSplitter" name="functionsplit">
360+
<property name="orientation">
361+
<enum>Qt::Horizontal</enum>
390362
</property>
391-
<property name="editTriggers">
392-
<set>QAbstractItemView::NoEditTriggers</set>
393-
</property>
394-
<property name="uniformRowHeights">
395-
<bool>false</bool>
396-
</property>
397-
<property name="sortingEnabled">
398-
<bool>false</bool>
399-
</property>
400-
<property name="animated">
401-
<bool>true</bool>
402-
</property>
403-
<attribute name="headerVisible">
404-
<bool>false</bool>
405-
</attribute>
406-
</widget>
407-
</item>
408-
<item row="2" column="1" rowspan="4">
409-
<layout class="QVBoxLayout" name="verticalLayout_3">
410-
<item>
411-
<widget class="QTextEdit" name="txtHelpText">
412-
<property name="readOnly">
413-
<bool>true</bool>
414-
</property>
415-
</widget>
416-
</item>
417-
<item>
418-
<layout class="QVBoxLayout" name="verticalLayout_2">
419-
<property name="spacing">
420-
<number>0</number>
421-
</property>
422-
<property name="sizeConstraint">
423-
<enum>QLayout::SetDefaultConstraint</enum>
424-
</property>
425-
<property name="topMargin">
426-
<number>0</number>
427-
</property>
428-
<property name="rightMargin">
429-
<number>0</number>
430-
</property>
431-
<property name="bottomMargin">
432-
<number>0</number>
433-
</property>
363+
<widget class="QWidget" name="">
364+
<layout class="QVBoxLayout" name="verticalLayout_4">
434365
<item>
435-
<widget class="QFrame" name="mValueGroupBox">
436-
<layout class="QGridLayout" name="gridLayout_7">
437-
<property name="leftMargin">
438-
<number>0</number>
439-
</property>
440-
<property name="topMargin">
441-
<number>0</number>
442-
</property>
443-
<property name="rightMargin">
444-
<number>0</number>
445-
</property>
446-
<property name="bottomMargin">
447-
<number>0</number>
448-
</property>
449-
<property name="spacing">
450-
<number>0</number>
451-
</property>
452-
<item row="1" column="0" colspan="2">
453-
<widget class="QListWidget" name="mValueListWidget">
454-
<property name="sizePolicy">
455-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
456-
<horstretch>0</horstretch>
457-
<verstretch>0</verstretch>
458-
</sizepolicy>
459-
</property>
460-
<property name="maximumSize">
461-
<size>
462-
<width>16777215</width>
463-
<height>16777215</height>
464-
</size>
465-
</property>
466-
<property name="autoFillBackground">
467-
<bool>false</bool>
468-
</property>
469-
<property name="editTriggers">
470-
<set>QAbstractItemView::NoEditTriggers</set>
471-
</property>
472-
<property name="showDropIndicator" stdset="0">
473-
<bool>false</bool>
366+
<widget class="QgsFilterLineEdit" name="txtSearchEdit">
367+
<property name="enabled">
368+
<bool>true</bool>
369+
</property>
370+
</widget>
371+
</item>
372+
<item>
373+
<widget class="QTreeView" name="expressionTree">
374+
<property name="frameShape">
375+
<enum>QFrame::StyledPanel</enum>
376+
</property>
377+
<property name="frameShadow">
378+
<enum>QFrame::Sunken</enum>
379+
</property>
380+
<property name="editTriggers">
381+
<set>QAbstractItemView::NoEditTriggers</set>
382+
</property>
383+
<property name="uniformRowHeights">
384+
<bool>false</bool>
385+
</property>
386+
<property name="sortingEnabled">
387+
<bool>false</bool>
388+
</property>
389+
<property name="animated">
390+
<bool>true</bool>
391+
</property>
392+
<attribute name="headerVisible">
393+
<bool>false</bool>
394+
</attribute>
395+
</widget>
396+
</item>
397+
</layout>
398+
</widget>
399+
<widget class="QWidget" name="">
400+
<layout class="QVBoxLayout" name="verticalLayout_3">
401+
<item>
402+
<widget class="QTextEdit" name="txtHelpText">
403+
<property name="readOnly">
404+
<bool>true</bool>
405+
</property>
406+
</widget>
407+
</item>
408+
<item>
409+
<layout class="QVBoxLayout" name="verticalLayout_2">
410+
<property name="spacing">
411+
<number>0</number>
412+
</property>
413+
<property name="sizeConstraint">
414+
<enum>QLayout::SetDefaultConstraint</enum>
415+
</property>
416+
<property name="topMargin">
417+
<number>0</number>
418+
</property>
419+
<property name="rightMargin">
420+
<number>0</number>
421+
</property>
422+
<property name="bottomMargin">
423+
<number>0</number>
424+
</property>
425+
<item>
426+
<widget class="QFrame" name="mValueGroupBox">
427+
<layout class="QGridLayout" name="gridLayout_7">
428+
<property name="leftMargin">
429+
<number>0</number>
474430
</property>
475-
<property name="alternatingRowColors">
476-
<bool>true</bool>
431+
<property name="topMargin">
432+
<number>0</number>
477433
</property>
478-
<property name="viewMode">
479-
<enum>QListView::ListMode</enum>
434+
<property name="rightMargin">
435+
<number>0</number>
480436
</property>
481-
</widget>
482-
</item>
483-
<item row="0" column="0">
484-
<widget class="QLabel" name="label_4">
485-
<property name="text">
486-
<string>Values</string>
437+
<property name="bottomMargin">
438+
<number>0</number>
487439
</property>
488-
</widget>
489-
</item>
490-
</layout>
491-
</widget>
492-
</item>
493-
<item>
494-
<widget class="QWidget" name="mLoadGroupBox" native="true">
495-
<layout class="QHBoxLayout" name="horizontalLayout">
496-
<property name="leftMargin">
497-
<number>0</number>
498-
</property>
499-
<property name="topMargin">
500-
<number>0</number>
501-
</property>
502-
<property name="rightMargin">
503-
<number>0</number>
504-
</property>
505-
<property name="bottomMargin">
506-
<number>0</number>
507-
</property>
508-
<item>
509-
<spacer name="horizontalSpacer">
510-
<property name="orientation">
511-
<enum>Qt::Horizontal</enum>
440+
<property name="spacing">
441+
<number>0</number>
512442
</property>
513-
<property name="sizeHint" stdset="0">
514-
<size>
515-
<width>5</width>
516-
<height>20</height>
517-
</size>
443+
<item row="1" column="0" colspan="2">
444+
<widget class="QListWidget" name="mValueListWidget">
445+
<property name="sizePolicy">
446+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
447+
<horstretch>0</horstretch>
448+
<verstretch>0</verstretch>
449+
</sizepolicy>
450+
</property>
451+
<property name="maximumSize">
452+
<size>
453+
<width>16777215</width>
454+
<height>16777215</height>
455+
</size>
456+
</property>
457+
<property name="autoFillBackground">
458+
<bool>false</bool>
459+
</property>
460+
<property name="editTriggers">
461+
<set>QAbstractItemView::NoEditTriggers</set>
462+
</property>
463+
<property name="showDropIndicator" stdset="0">
464+
<bool>false</bool>
465+
</property>
466+
<property name="alternatingRowColors">
467+
<bool>true</bool>
468+
</property>
469+
<property name="viewMode">
470+
<enum>QListView::ListMode</enum>
471+
</property>
472+
</widget>
473+
</item>
474+
<item row="0" column="0">
475+
<widget class="QLabel" name="label_4">
476+
<property name="text">
477+
<string>Values</string>
478+
</property>
479+
</widget>
480+
</item>
481+
</layout>
482+
</widget>
483+
</item>
484+
<item>
485+
<widget class="QWidget" name="mLoadGroupBox" native="true">
486+
<layout class="QHBoxLayout" name="horizontalLayout">
487+
<property name="leftMargin">
488+
<number>0</number>
518489
</property>
519-
</spacer>
520-
</item>
521-
<item>
522-
<widget class="QLabel" name="lblLoad">
523-
<property name="text">
524-
<string>Load values</string>
490+
<property name="topMargin">
491+
<number>0</number>
525492
</property>
526-
</widget>
527-
</item>
528-
<item>
529-
<widget class="QPushButton" name="btnLoadAll">
530-
<property name="text">
531-
<string>all unique</string>
493+
<property name="rightMargin">
494+
<number>0</number>
532495
</property>
533-
</widget>
534-
</item>
535-
<item>
536-
<widget class="QPushButton" name="btnLoadSample">
537-
<property name="text">
538-
<string>10 samples</string>
496+
<property name="bottomMargin">
497+
<number>0</number>
539498
</property>
540-
</widget>
541-
</item>
542-
</layout>
543-
</widget>
499+
<item>
500+
<spacer name="horizontalSpacer">
501+
<property name="orientation">
502+
<enum>Qt::Horizontal</enum>
503+
</property>
504+
<property name="sizeHint" stdset="0">
505+
<size>
506+
<width>5</width>
507+
<height>20</height>
508+
</size>
509+
</property>
510+
</spacer>
511+
</item>
512+
<item>
513+
<widget class="QLabel" name="lblLoad">
514+
<property name="text">
515+
<string>Load values</string>
516+
</property>
517+
</widget>
518+
</item>
519+
<item>
520+
<widget class="QPushButton" name="btnLoadAll">
521+
<property name="text">
522+
<string>all unique</string>
523+
</property>
524+
</widget>
525+
</item>
526+
<item>
527+
<widget class="QPushButton" name="btnLoadSample">
528+
<property name="text">
529+
<string>10 samples</string>
530+
</property>
531+
</widget>
532+
</item>
533+
</layout>
534+
</widget>
535+
</item>
536+
</layout>
544537
</item>
545538
</layout>
546-
</item>
547-
</layout>
539+
</widget>
540+
</widget>
548541
</item>
549542
</layout>
550543
</widget>

0 commit comments

Comments
 (0)