diff --git a/resources/iconsets/1_5_1/fill-rule-even-odd.png b/resources/iconsets/1_5_1/fill-rule-even-odd.png
new file mode 100644
index 000000000..6bea711ff
Binary files /dev/null and b/resources/iconsets/1_5_1/fill-rule-even-odd.png differ
diff --git a/resources/iconsets/1_5_1/fill-rule-nonzero.png b/resources/iconsets/1_5_1/fill-rule-nonzero.png
new file mode 100644
index 000000000..108db0cab
Binary files /dev/null and b/resources/iconsets/1_5_1/fill-rule-nonzero.png differ
diff --git a/resources/iconsets/1_5_1/round-corners.png b/resources/iconsets/1_5_1/round-corners.png
new file mode 100644
index 000000000..cb70f13b7
Binary files /dev/null and b/resources/iconsets/1_5_1/round-corners.png differ
diff --git a/scribus/ui/propertiespalette_shape.cpp b/scribus/ui/propertiespalette_shape.cpp
index 1c5df1cc7..f6387184a 100644
--- a/scribus/ui/propertiespalette_shape.cpp
+++ b/scribus/ui/propertiespalette_shape.cpp
@@ -35,7 +35,6 @@ for which a new license (GPL+exception) is in place.
#include "util.h"
#include "util_math.h"
-
PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent)
: QWidget(parent),
m_haveDoc(false),
@@ -51,12 +50,17 @@ PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent)
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
+ roundRectIcon->setPixmap(IconManager::instance().loadPixmap("round-corners.png"));
+
textFlowDisabled->setIcon(IconManager::instance().loadIcon("flow-none.png"));
textFlowUsesFrameShape->setIcon(IconManager::instance().loadIcon("flow-frame.png"));
textFlowUsesBoundingBox->setIcon(IconManager::instance().loadIcon("flow-bounding.png"));
textFlowUsesContourLine->setIcon(IconManager::instance().loadIcon("flow-contour.png"));
textFlowUsesImageClipping->setIcon(IconManager::instance().loadIcon("flow-contour.png"));
+ evenOdd->setIcon(IconManager::instance().loadIcon("fill-rule-even-odd.png"));
+ nonZero->setIcon(IconManager::instance().loadIcon("fill-rule-nonzero.png"));
+
languageChange();
connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
@@ -67,7 +71,6 @@ PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent)
connect(customShape, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(handleNewShape(int, int, qreal *)));
roundRect->showValue(0);
- stackedWidget->setCurrentIndex(0);
}
void PropertiesPalette_Shape::changeEvent(QEvent *e)
@@ -350,23 +353,21 @@ void PropertiesPalette_Shape::setCurrentItem(PageItem *item)
roundRect->setValue(m_item->cornerRadius()*m_unitRatio);
showTextFlowMode(m_item->textFlowMode());
- if (m_item->asPathText())
- {
- stackedWidget->setCurrentIndex(0);
- }
- else if (m_item->asTextFrame())
+ if (m_item->asPathText() || m_item->asTextFrame() || m_item->asImageFrame())
{
- stackedWidget->setCurrentIndex(0);
+ nonZero->setChecked(false);
+ nonZero->setEnabled(false);
+ evenOdd->setChecked(false);
+ evenOdd->setEnabled(false);
}
else
{
- stackedWidget->setCurrentIndex(1);
- fillRuleGroup->setVisible(m_item->itemType() != PageItem::ImageFrame);
+ nonZero->setEnabled(true);
+ evenOdd->setEnabled(true);
+ nonZero->setChecked(!m_item->fillRule);
}
setLocked(m_item->locked());
setSizeLocked(m_item->sizeLocked());
- nonZero->setChecked(!m_item->fillRule);
- evenOdd->setChecked(m_item->fillRule);
// Frame type 3 is obsolete: CR 2005-02-06
//if (((i->itemType() == PageItem::TextFrame) || (i->itemType() == PageItem::ImageFrame) || (i->itemType() == 3)) && (!i->ClipEdited))
diff --git a/scribus/ui/propertiespalette_shapebase.ui b/scribus/ui/propertiespalette_shapebase.ui
index 70e25bf44..5b888a1b6 100644
--- a/scribus/ui/propertiespalette_shapebase.ui
+++ b/scribus/ui/propertiespalette_shapebase.ui
@@ -30,341 +30,334 @@
2
-
-
-
- Shape
-
-
- true
-
-
-
- 5
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Choose the shape of frame...
-
-
- ...
-
-
-
- -
-
-
- &Edit...
-
-
-
-
-
- -
-
-
-
-
-
- R&ound Corners:
-
-
- roundRect
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Set radius of corner rounding
-
-
-
-
-
-
-
-
- -
-
-
- Text &Flow Around Frame
-
-
- true
-
-
-
- 5
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 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
-
-
-
-
+
+
-
+
+
+ Shape:
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 22
+ 16777215
+
+
+
+ Text flow around bounding box
+
+
+ Use &Bounding Box
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonIconOnly
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 22
+ 16777215
+
+
+
+ Text flow around frame shape
+
+
+ Use Frame &Shape
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonIconOnly
+
+
+ textFlowBtnGroup
+
+
+
-
-
-
- Fill Rule
+
+
+
+ 0
+ 0
+
-
+
+
+ 22
+ 16777215
+
+
+
+ Text flow around frame disabled
+
+
+ Disabled
+
+
true
-
-
- 5
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <qt>Any path self-intersections or subpaths create holes in the fill</qt>
-
-
- Even-Odd
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <qt>Fill is solid unless a subpath is counter-directional</qt>
-
-
- Non Zero
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
+
+ true
+
+
+ Qt::ToolButtonIconOnly
+
+
+ textFlowBtnGroup
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 22
+ 16777215
+
+
+
+ Text Flow around contour line
+
+
+ &Use Contour Line
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonIconOnly
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 22
+ 16777215
+
+
+
+ Text flow around image clip path
+
+
+ Use Image Clip Path
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonIconOnly
+
+
+ textFlowBtnGroup
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Choose the shape of frame...
+
+
+ ...
+
+
+
+ -
+
+
+ &Edit...
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 10
+ 10
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Set radius of corner rounding
+
+
+
+
+
+ -
+
+
+ Text Flow:
+
+
+
+ -
+
+
+ Fill Rule:
+
+
+
+ -
+
+
-
+
+
+ Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)
+
+
+ ...
+
+
+ true
+
+
+ true
+
+
+ fillRuleBtnGroup
+
+
+
+ -
+
+
+ Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)
+
+
+ ...
+
+
+ true
+
+
+ true
+
+
+ fillRuleBtnGroup
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
-
+
+
-
@@ -396,6 +389,7 @@
+