Index: scribus/ui/propertiespalette_shapebase.ui
===================================================================
--- scribus/ui/propertiespalette_shapebase.ui (revision 17405)
+++ scribus/ui/propertiespalette_shapebase.ui (working copy)
@@ -1,350 +1,364 @@
-
-
- PropertiesPalette_ShapeBase
-
-
-
- 0
- 0
- 280
- 281
-
-
-
- Form
-
-
-
- 2
-
-
- 2
-
- -
-
-
- Shape
-
-
- true
-
-
-
- 5
-
-
- 2
-
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
-
- -
-
-
- &Edit...
-
-
-
-
-
- -
-
-
-
-
-
- Round Corners
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
- -
-
-
- Text Flow Around Frame
-
-
- true
-
-
-
- 5
-
-
- 2
-
-
-
-
-
-
- 0
- 0
-
-
-
- Disabled
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- textFlowBtnGroup
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Use &Frame Shape
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- textFlowBtnGroup
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Use &Bounding Box
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- textFlowBtnGroup
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- &Use Contour Line
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- textFlowBtnGroup
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Use Image Clip Path
-
-
- true
-
-
- true
-
-
- Qt::ToolButtonTextBesideIcon
-
-
- textFlowBtnGroup
-
-
-
-
-
-
- -
-
-
- 1
-
-
-
-
-
-
-
-
- Fill Rule
-
-
- true
-
-
-
- 5
-
-
- 2
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Even-Odd
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Non Zero
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
- ScrSpinBox
- QDoubleSpinBox
-
-
-
- Autoforms
- QToolButton
-
-
-
-
-
-
-
-
-
+
+
+ PropertiesPalette_ShapeBase
+
+
+
+ 0
+ 0
+ 280
+ 320
+
+
+
+ Form
+
+
+
+ 2
+
+
+ 2
+
+ -
+
+
+ Shape
+
+
+ true
+
+
+
+ 5
+
+
+ 2
+
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ ...
+
+
+
+ -
+
+
+ &Edit...
+
+
+
+
+
+ -
+
+
-
+
+
+ Round Corners
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Text Flow Around Frame
+
+
+ true
+
+
+
+ 5
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Disabled
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Use &Frame Shape
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Use &Bounding Box
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ &Use Contour Line
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+ &Edit
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Use Image Clip Path
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextBesideIcon
+
+
+ textFlowBtnGroup
+
+
+
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
-
+
+
+ Fill Rule
+
+
+ true
+
+
+
+ 5
+
+
+ 2
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Even-Odd
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Non Zero
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ Autoforms
+ QToolButton
+
+
+
+ ScrSpinBox
+ QDoubleSpinBox
+
+
+
+
+
+
+
+
+
Index: scribus/ui/propertiespalette_shape.h
===================================================================
--- scribus/ui/propertiespalette_shape.h (revision 17405)
+++ scribus/ui/propertiespalette_shape.h (working copy)
@@ -76,7 +76,9 @@
void handleTextFlow();
void handleShapeEdit();
+ void handleContourEdit();
void handleShapeEditEnded();
+ void handleContourEditEnded();
void handleCornerRadius();
void handleFillRule();
void handleNewShape(int, int, qreal *);
Index: scribus/ui/propertiespalette_shape.cpp
===================================================================
--- scribus/ui/propertiespalette_shape.cpp (revision 17405)
+++ scribus/ui/propertiespalette_shape.cpp (working copy)
@@ -62,6 +62,7 @@
connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
connect(editShape , SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
+ connect(editContour,SIGNAL(clicked()) ,this, SLOT(handleContourEdit()));
connect(roundRect , SIGNAL(valueChanged(double)) , this, SLOT(handleCornerRadius()));
connect(evenOdd , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
connect(nonZero , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
@@ -450,6 +451,41 @@
}
}
+void PropertiesPalette_Shape::handleContourEdit()
+{
+ if (!m_ScMW || m_ScMW->scriptIsRunning())
+ return;
+ if ((m_haveDoc) && (m_haveItem))
+ {
+ m_tmpSelection->clear();
+ if (m_item->asRegularPolygon())
+ {
+ m_ScMW->view->requestMode(modeEditPolygon);
+ roundRect->setEnabled(false);
+ }
+ else if (m_item->asArc())
+ {
+ m_ScMW->view->requestMode(modeEditArc);
+ roundRect->setEnabled(false);
+ }
+ else if (m_item->asSpiral())
+ {
+ m_ScMW->view->requestMode(modeEditSpiral);
+ roundRect->setEnabled(false);
+ }
+ else
+ {
+ m_ScMW->view->requestMode(modeEditClip);
+ m_ScMW->nodePalette->EditCont->setChecked(true);
+ m_ScMW->doc->nodeEdit.isContourLine=true;
+ m_ScMW->nodePalette->ResetCont->setEnabled(true);
+ roundRect->setEnabled(false);
+ connect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleContourEditEnded()));
+ }
+ m_doc->changed();
+ }
+}
+
void PropertiesPalette_Shape::handleShapeEditEnded()
{
disconnect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleShapeEditEnded()));
@@ -464,6 +500,20 @@
}
}
+void PropertiesPalette_Shape::handleContourEditEnded()
+{
+ disconnect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleContourEditEnded()));
+ if ((m_haveDoc) && (m_haveItem))
+ {
+ if (m_tmpSelection->count() > 0)
+ {
+ m_doc->m_Selection->copy(*m_tmpSelection, false);
+ m_doc->m_Selection->connectItemToGUI();
+ }
+ m_tmpSelection->clear();
+ }
+}
+
void PropertiesPalette_Shape::handleCornerRadius()
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())