From 396e2cf0f219859973177774da7130103804e6a8 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Wed, 30 Dec 2015 20:04:17 +0000 Subject: [PATCH] Improve Basic shapes Properties size function replace QSpinBox by QDoublespinBox, int to double git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4296 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/qetshapeitem.cpp | 2 +- sources/qetgraphicsitem/qetshapeitem.h | 2 +- .../ui/shapegraphicsitempropertieswidget.cpp | 4 ++-- .../ui/shapegraphicsitempropertieswidget.ui | 19 ++++++++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/sources/qetgraphicsitem/qetshapeitem.cpp b/sources/qetgraphicsitem/qetshapeitem.cpp index bcd8b8a1a..6769e3712 100644 --- a/sources/qetgraphicsitem/qetshapeitem.cpp +++ b/sources/qetgraphicsitem/qetshapeitem.cpp @@ -459,7 +459,7 @@ bool QetShapeItem::fromXml(const QDomElement &e) is_movable_ = (e.attribute("is_movable").toInt()); m_pen.setStyle(Qt::PenStyle(e.attribute("style","0").toInt())); - m_pen.setWidthF(e.attribute("shape_size", QString::number(shape_size)).toInt()); + m_pen.setWidthF(e.attribute("shape_size", QString::number(shape_size)).toDouble()); QString type = e.attribute("type"); //Compatibility for version older than N°4075, shape type was stored with an int diff --git a/sources/qetgraphicsitem/qetshapeitem.h b/sources/qetgraphicsitem/qetshapeitem.h index 9a4a81322..1638833bb 100644 --- a/sources/qetgraphicsitem/qetshapeitem.h +++ b/sources/qetgraphicsitem/qetshapeitem.h @@ -103,7 +103,7 @@ class QetShapeItem : public QetGraphicsItem bool m_hovered, m_mouse_grab_handler; int m_vector_index; - int shape_size; + double shape_size; QetGraphicsHandlerUtility m_handler; }; #endif // QETSHAPEITEM_H diff --git a/sources/ui/shapegraphicsitempropertieswidget.cpp b/sources/ui/shapegraphicsitempropertieswidget.cpp index 3ff6eb635..a56713cd2 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.cpp +++ b/sources/ui/shapegraphicsitempropertieswidget.cpp @@ -134,10 +134,10 @@ bool ShapeGraphicsItemPropertiesWidget::setLiveEdit(bool live_edit) if (m_live_edit){ connect (ui->m_style_cb, SIGNAL(activated(int)), this, SLOT(apply())); - connect (ui->m_size_cb, SIGNAL(valueChanged(int)), this, SLOT(apply())); + connect (ui->m_size_cb, SIGNAL(valueChanged(double)), this, SLOT(apply())); }else disconnect (ui->m_style_cb, SIGNAL(activated(int)), this, SLOT(apply())); - disconnect (ui->m_size_cb, SIGNAL(valueChanged(int)), this, SLOT(apply())); + disconnect (ui->m_size_cb, SIGNAL(valueChanged(double)), this, SLOT(apply())); return true; } diff --git a/sources/ui/shapegraphicsitempropertieswidget.ui b/sources/ui/shapegraphicsitempropertieswidget.ui index e745c2ecb..72cda72a0 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.ui +++ b/sources/ui/shapegraphicsitempropertieswidget.ui @@ -61,19 +61,28 @@ - - + + + + + 16777212 + 16777215 + + QAbstractSpinBox::CorrectToNearestValue - 1 + 0.400000000000000 - 20 + 50.000000000000000 + + + 0.200000000000000 - 1 + 1.000000000000000