Skip to content

Commit

Permalink
Fixes Table Background Color Dialog behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
@SrNetoChan @m-kuhn
SrNetoChan authored and m-kuhn committed Jul 25, 2017
1 parent 30be722 commit 4d6b980
Showing 1 changed file with 110 additions and 111 deletions.
221 changes: 110 additions & 111 deletions src/ui/composer/qgscomposertablebackgroundstyles.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,35 @@
<rect>
<x>0</x>
<y>0</y>
<width>393</width>
<height>444</height>
<width>356</width>
<height>501</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Table Background Colors</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="12" column="2">
<item row="14" column="0" colspan="2">
<widget class="QCheckBox" name="mFirstRowCheckBox">
<property name="text">
<string>First row</string>
</property>
</widget>
</item>
<item row="13" column="0" colspan="2">
<widget class="QCheckBox" name="mHeaderRowCheckBox">
<property name="text">
<string>Header row</string>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QgsColorButton" name="mLastRowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
Expand All @@ -39,59 +59,53 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="mOddRowsCheckBox">
<property name="text">
<string>Odd rows</string>
<item row="7" column="2">
<widget class="QgsColorButton" name="mEvenColumnsColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="mHeaderRowCheckBox">
<property name="text">
<string>Header row</string>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check options to enable shading for matching cells. Options lower in this list will take precedence over higher options. For example, if both &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;First row&lt;/span&gt;&amp;quot; and &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;Odd rows&lt;/span&gt;&amp;quot; are checked, the cells in the first row will be shaded using the color specified for &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;First row&lt;/span&gt;&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="wordWrap">
<bool>true</bool>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="mLastColumnCheckBox">
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="mEvenColumnsCheckBox">
<property name="text">
<string>Last column</string>
<string>Even columns</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="mOddColumnsCheckBox">
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="mFirstColumnCheckBox">
<property name="text">
<string>Odd columns</string>
<string>First column</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="mEvenRowsCheckBox">
<property name="text">
<string>Even rows</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="mEvenColumnsCheckBox">
<property name="text">
<string>Even columns</string>
</property>
</widget>
</item>
<item row="3" column="2">
<item row="5" column="2">
<widget class="QgsColorButton" name="mOddColumnsColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
Expand All @@ -116,8 +130,8 @@
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsColorButton" name="mEvenColumnsColorButton">
<item row="13" column="2">
<widget class="QgsColorButton" name="mHeaderRowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -141,33 +155,22 @@
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QgsColorButton" name="mFirstRowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="mOddColumnsCheckBox">
<property name="text">
<string>Odd columns</string>
</property>
</widget>
</item>
<item row="15" column="0" colspan="2">
<widget class="QCheckBox" name="mLastRowCheckBox">
<property name="text">
<string/>
<string>Last row</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsColorButton" name="mLastColumnColorButton">
<item row="11" column="2">
<widget class="QgsColorButton" name="mFirstColumnColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -191,28 +194,22 @@
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="mFirstRowCheckBox">
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="mLastColumnCheckBox">
<property name="text">
<string>First row</string>
<string>Last column</string>
</property>
</widget>
</item>
<item row="14" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default cell background</string>
</property>
</spacer>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsColorButton" name="mFirstColumnColorButton">
<item row="3" column="2">
<widget class="QgsColorButton" name="mDefaultColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -236,8 +233,18 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsColorButton" name="mDefaultColorButton">
<item row="16" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QgsColorButton" name="mFirstRowColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -261,8 +268,8 @@
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QgsColorButton" name="mHeaderRowColorButton">
<item row="9" column="2">
<widget class="QgsColorButton" name="mOddRowsColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -286,31 +293,14 @@
</property>
</widget>
</item>
<item row="13" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="mFirstColumnCheckBox">
<property name="text">
<string>First column</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="mLastRowCheckBox">
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="mOddRowsCheckBox">
<property name="text">
<string>Last row</string>
<string>Odd rows</string>
</property>
</widget>
</item>
<item row="7" column="2">
<item row="10" column="2">
<widget class="QgsColorButton" name="mEvenRowsColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
Expand All @@ -335,15 +325,8 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default cell background</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsColorButton" name="mOddRowsColorButton">
<item row="12" column="2">
<widget class="QgsColorButton" name="mLastColumnColorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -367,12 +350,28 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check options to enable shading for matching cells. Options lower in this list will take precedence over higher options. For example, if both &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;First row&lt;/span&gt;&amp;quot; and &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;Odd rows&lt;/span&gt;&amp;quot; are checked, the cells in the first row will be shaded using the color specified for &amp;quot;&lt;span style=&quot; font-style:italic;&quot;&gt;First row&lt;/span&gt;&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
Expand Down

0 comments on commit 4d6b980

Please sign in to comment.