r20604 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Mon Nov 30 21:15:58 UTC 2015
Author: jghali
Date: Mon Nov 30 21:15:58 2015
New Revision: 20604
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20604
Log:
#13577: Fix inconsistent colons in Properties Palette <FirasH>
Modified:
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20604&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Mon Nov 30 21:15:58 2015
@@ -51,8 +51,6 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- roundRectLabel->setBuddy(roundRect);
-
textFlowDisabled->setIcon(IconManager::instance()->loadIcon("flow-none.png"));
textFlowUsesFrameShape->setIcon(IconManager::instance()->loadIcon("flow-frame.png"));
textFlowUsesBoundingBox->setIcon(IconManager::instance()->loadIcon("flow-bounding.png"));
@@ -544,24 +542,7 @@
QString suffix = m_doc ? unitGetSuffixFromIndex(m_doc->unitIndex()) : ptSuffix;
roundRect->setSuffix(suffix);
- shapeGroup->setTitle( tr("Shape:"));
- customShape->setToolTip( tr("Choose the shape of frame..."));
- editShape->setText( tr("&Edit..."));
- roundRect->setToolTip( tr("Set radius of corner rounding"));
- roundRectLabel->setText( tr("R&ound Corners:"));
- fillRuleGroup->setTitle( tr("Fill Rule"));
- evenOdd->setText( tr("Even-Odd"));
- nonZero->setText( tr("Non Zero"));
-
- evenOdd->setToolTip( "<qt>" + tr("Any path self-intersections or subpaths create holes in the fill") + "</qt>");
- nonZero->setToolTip( "<qt>" + tr("Fill is solid unless a subpath is counter-directional") + "</qt>");
-
- textFlowGroup->setTitle( tr("Text &Flow Around Frame"));
- textFlowDisabled->setText( tr("Disabled"));
- textFlowUsesFrameShape->setText( tr("Use Frame &Shape"));
- textFlowUsesBoundingBox->setText( tr("Use &Bounding Box"));
- textFlowUsesContourLine->setText( tr("&Use Contour Line"));
- textFlowUsesImageClipping->setText( tr("Use Image Clip Path"));
+ retranslateUi(this);
}
void PropertiesPalette_Shape::unitChange()
Modified: trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20604&path=/trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shapebase.ui Mon Nov 30 21:15:58 2015
@@ -52,6 +52,9 @@
</item>
<item>
<widget class="Autoforms" name="customShape">
+ <property name="toolTip">
+ <string>Choose the shape of frame...</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -71,7 +74,10 @@
<item>
<widget class="QLabel" name="roundRectLabel">
<property name="text">
- <string>Round Corners</string>
+ <string>R&ound Corners:</string>
+ </property>
+ <property name="buddy">
+ <cstring>roundRect</cstring>
</property>
</widget>
</item>
@@ -83,6 +89,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Set radius of corner rounding</string>
+ </property>
</widget>
</item>
</layout>
@@ -93,7 +102,7 @@
<item>
<widget class="QGroupBox" name="textFlowGroup">
<property name="title">
- <string>Text Flow Around Frame</string>
+ <string>Text &Flow Around Frame</string>
</property>
<property name="flat">
<bool>true</bool>
@@ -126,7 +135,7 @@
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
+ <string notr="true">textFlowBtnGroup</string>
</attribute>
</widget>
</item>
@@ -139,19 +148,19 @@
</sizepolicy>
</property>
<property name="text">
- <string>Use &Frame Shape</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
+ <string>Use Frame &Shape</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextBesideIcon</enum>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">textFlowBtnGroup</string>
</attribute>
</widget>
</item>
@@ -176,7 +185,7 @@
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
+ <string notr="true">textFlowBtnGroup</string>
</attribute>
</widget>
</item>
@@ -201,7 +210,7 @@
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
+ <string notr="true">textFlowBtnGroup</string>
</attribute>
</widget>
</item>
@@ -226,7 +235,7 @@
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
+ <string notr="true">textFlowBtnGroup</string>
</attribute>
</widget>
</item>
@@ -277,6 +286,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string><qt>Any path self-intersections or subpaths create holes in the fill</qt></string>
+ </property>
<property name="text">
<string>Even-Odd</string>
</property>
@@ -289,6 +301,9 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string><qt>Fill is solid unless a subpath is counter-directional</qt></string>
</property>
<property name="text">
<string>Non Zero</string>
More information about the scribus-commit
mailing list