[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kchart/shape
From: Johannes Simon <johannes.simon () gmail ! com>
Date: 2009-01-31 22:24:35
Message-ID: 1233440675.904071.3861.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 919413 by jsimon:
Fix sixth of The Eight Release Critical Bugs: "gray out or hide axis editing options \
when editing polar chart". I decided to gray out the options. Hiding them would make \
the plot area tab almost completely empty. The disabled axis configuration options \
could of course be replaced by something more meaningful in the future.
M +4 -1 ChartConfigWidget.cpp
M +78 -68 ChartConfigWidget.ui
--- trunk/koffice/kchart/shape/ChartConfigWidget.cpp #919412:919413
@@ -505,14 +505,17 @@
subtype = NoChartSubtype;
}
- // Make sure polar and cartesian plots can't conflict and
+ // o Make sure polar and cartesian plots can't conflict and
// don't allow the user to mix these two types
+ // o Hide axis configuration options for polar plots
if ( isPolar( type ) ) {
setPolarChartTypesEnabled( true );
setCartesianChartTypesEnabled( false );
+ d->ui.axisConfiguration->setEnabled( false );
} else {
setPolarChartTypesEnabled( false );
setCartesianChartTypesEnabled( true );
+ d->ui.axisConfiguration->setEnabled( true );
}
emit chartTypeChanged( type );
--- trunk/koffice/kchart/shape/ChartConfigWidget.ui #919412:919413
@@ -79,20 +79,7 @@
<string>Plot Area</string>
</attribute>
<layout class="QGridLayout" >
- <item row="8" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>61</width>
- <height>71</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="5" >
+ <item row="1" column="0" colspan="3" >
<layout class="QHBoxLayout" name="horizontalLayout" >
<item>
<widget class="QCheckBox" name="showTitle" >
@@ -135,75 +122,98 @@
</item>
</layout>
</item>
- <item row="2" column="0" colspan="5" >
- <widget class="Line" name="line_2" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_2" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_4" >
<property name="text" >
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta \
name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: \
pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; \
font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; \
font-weight:600;">Axes</span></p></body></html></string> +<p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" \
font-weight:600;">Labels</span></p></body></html></string> </property>
</widget>
</item>
- <item row="4" column="0" colspan="3" >
- <widget class="QComboBox" name="axes" />
- </item>
- <item row="7" column="0" colspan="5" >
- <widget class="QPushButton" name="axisScalingButton" >
- <property name="text" >
- <string>Scaling...</string>
- </property>
- </widget>
- </item>
- <item row="4" column="3" >
- <widget class="QToolButton" name="addAxis" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="4" >
- <widget class="QToolButton" name="removeAxis" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> + <item row="2" column="0" \
colspan="3" > + <widget class="QWidget" native="1" name="axisConfiguration" >
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="0" column="0" colspan="3" >
+ <widget class="Line" name="line_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="3" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta \
name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: \
pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; \
font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" \
font-weight:600;">Labels</span></p></body></html></string>
- </property>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; \
font-weight:600;">Axes</span></p></body></html></string> + \
</property> + </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QComboBox" name="axes" />
+ </item>
+ <item row="2" column="1" >
+ <widget class="QToolButton" name="addAxis" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <widget class="QToolButton" name="removeAxis" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="3" >
+ <layout class="QHBoxLayout" name="horizontalLayout_5" >
+ <item>
+ <widget class="QCheckBox" name="axisShowTitle" >
+ <property name="text" >
+ <string>Label</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="axisTitle" />
+ </item>
+ </layout>
+ </item>
+ <item row="4" column="0" colspan="3" >
+ <widget class="QCheckBox" name="axisShowGridLines" >
+ <property name="text" >
+ <string>Show Grid Lines</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="3" >
+ <widget class="QPushButton" name="axisScalingButton" >
+ <property name="text" >
+ <string>Scaling...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="5" column="1" colspan="4" >
- <widget class="QLineEdit" name="axisTitle" />
- </item>
- <item row="5" column="0" >
- <widget class="QCheckBox" name="axisShowTitle" >
- <property name="text" >
- <string>Label</string>
+ <item row="8" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
- </item>
- <item row="6" column="0" colspan="5" >
- <widget class="QCheckBox" name="axisShowGridLines" >
- <property name="text" >
- <string>Show Grid Lines</string>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>61</width>
+ <height>71</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic