Skip to content

Commit

Permalink
Remove temporary group box from diagram properties (fix #16206)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Feb 20, 2017
1 parent d206737 commit a0f655a
Showing 1 changed file with 24 additions and 31 deletions.
55 changes: 24 additions & 31 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -267,7 +267,7 @@
<item>
<widget class="QStackedWidget" name="mDiagramStackedWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="mDiagramPage_Attributes">
<layout class="QVBoxLayout" name="verticalLayout_9">
Expand Down Expand Up @@ -303,8 +303,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>303</width>
<height>104</height>
<width>632</width>
<height>405</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
Expand Down Expand Up @@ -538,9 +538,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-93</y>
<y>0</y>
<width>618</width>
<height>498</height>
<height>484</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
Expand Down Expand Up @@ -856,13 +856,6 @@
</item>
</layout>
</item>
<item row="1" column="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -1137,8 +1130,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>511</width>
<height>294</height>
<width>632</width>
<height>405</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_11">
Expand Down Expand Up @@ -1453,8 +1446,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>280</width>
<height>288</height>
<width>632</width>
<height>405</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
Expand Down Expand Up @@ -1879,8 +1872,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>180</height>
<width>632</width>
<height>405</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -2098,8 +2091,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>324</width>
<height>131</height>
<width>632</width>
<height>405</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -2181,6 +2174,17 @@
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
Expand Down Expand Up @@ -2209,17 +2213,6 @@
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsunitselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mDiagramTypeComboBox</tabstop>
Expand Down

0 comments on commit a0f655a

Please sign in to comment.