Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Set better size for conditional format widget
  • Loading branch information
NathanW2 committed Aug 21, 2015
1 parent db56307 commit bbf2fe8
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
Expand Up @@ -144,7 +144,7 @@ void QgsFieldConditionalFormatWidget::addNewRule()
void QgsFieldConditionalFormatWidget::reset()
{
mSymbol = 0;
mRuleEdit->clear();
mRuleEdit->setText( "@value " );
btnBackgroundColor->setColor( QColor() );
btnTextColor->setColor( QColor() );
mDefault1->toggle();
Expand Down
79 changes: 59 additions & 20 deletions src/ui/qgsdualviewbase.ui
Expand Up @@ -15,34 +15,55 @@
</property>
<widget class="QWidget" name="mPageTableView">
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="spacing">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QgsAttributeTableView" name="mTableView">
<property name="alternatingRowColors">
<bool>true</bool>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsFieldConditionalFormatWidget" name="mConditionalFormatWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="childrenCollapsible">
<bool>false</bool>
</property>
<widget class="QgsAttributeTableView" name="mTableView">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
</widget>
<widget class="QgsFieldConditionalFormatWidget" name="mConditionalFormatWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="mPageAttributeEditor">
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
Expand All @@ -52,7 +73,16 @@
</property>
<widget class="QWidget" name="listViewWdg" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -106,7 +136,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
Expand All @@ -119,8 +158,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
<width>230</width>
<height>503</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4"/>
Expand Down
18 changes: 15 additions & 3 deletions src/ui/qgsfieldconditionalformatwidget.ui
Expand Up @@ -6,16 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>387</width>
<height>461</height>
<width>400</width>
<height>374</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
Expand Down Expand Up @@ -120,6 +126,12 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Condition</string>
</property>
Expand Down

0 comments on commit bbf2fe8

Please sign in to comment.