Skip to content

Commit

Permalink
Merge pull request #2640 from nirvn/diagram_tiny_fixes_v2
Browse files Browse the repository at this point in the history 
[diagram] tiny UI improvements
  • Loading branch information
@nyalldawson
nyalldawson committed Jan 6, 2016
2 parents f76bbeb + 17d2214 commit 8c902b9
Showing 1 changed file with 61 additions and 58 deletions.
119 changes: 61 additions & 58 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -631,7 +631,7 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="mTransparencyLabel">
<property name="minimumSize">
<size>
Expand All @@ -644,7 +644,62 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QSlider" name="mTransparencySlider">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QgsSpinBox" name="mTransparencySpinBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> %</string>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mBarWidthLabel">
<property name="text">
<string>Bar width</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="mBarWidthSpinBox">
<property name="minimum">
<double>0.010000000000000</double>
Expand Down Expand Up @@ -681,6 +736,9 @@
<property name="maximum">
<double>99999.990000000005239</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
</widget>
</item>
<item row="4" column="0">
Expand Down Expand Up @@ -714,13 +772,6 @@
<item row="5" column="1">
<widget class="QComboBox" name="mAngleOffsetComboBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="mBarWidthLabel">
<property name="text">
<string>Bar width</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QgsColorButtonV2" name="mDiagramPenColorButton">
<property name="minimumSize">
Expand Down Expand Up @@ -760,54 +811,6 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QSlider" name="mTransparencySlider">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QgsSpinBox" name="mTransparencySpinBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string> %</string>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -1839,9 +1842,9 @@
<tabstop>mRemoveCategoryPushButton</tabstop>
<tabstop>mDiagramAttributesTreeWidget</tabstop>
<tabstop>scrollArea_4</tabstop>
<tabstop>mBarWidthSpinBox</tabstop>
<tabstop>mTransparencySlider</tabstop>
<tabstop>mTransparencySpinBox</tabstop>
<tabstop>mBarWidthSpinBox</tabstop>
<tabstop>mBackgroundColorButton</tabstop>
<tabstop>mDiagramPenColorButton</tabstop>
<tabstop>mPenWidthSpinBox</tabstop>
Expand Down

0 comments on commit 8c902b9

Please sign in to comment.