r21920 by craig - #14738: New Hyphenation features strings in Style Manager do not get updated on language change. <FirasH>
scribus-commit
scribus-commit at lists.scribus.net
Sun Apr 16 20:59:11 UTC 2017
Author: craig
Date: Sun Apr 16 20:59:11 2017
New Revision: 21920
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21920
Log:
#14738: New Hyphenation features strings in Style Manager do not get updated on language change. <FirasH>
Modified:
trunk/Scribus/scribus/ui/smcstylewidget.cpp
trunk/Scribus/scribus/ui/smcstylewidget.ui
Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21920&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp Sun Apr 16 20:59:11 2017
@@ -93,27 +93,7 @@
backColor_->blockSignals(sigBlocked);
}
-/***********************************/
-/* Begin Tooltips */
-/***********************************/
-// These are for the character style page
-// as in character styles and in paragraph style's character style
-
- parentCombo->setToolTip( tr("Parent Style"));
- fontFace_->setToolTip( tr("Font Family"));
- fontSize_->setToolTip( tr("Font Size"));
- tracking_->setToolTip( tr("Tracking"));
- widthSpaceSpin->setToolTip( tr("Default width for space"));
- baselineOffset_->setToolTip( tr("Baseline Offset"));
- fontHScale_->setToolTip( tr("Horizontal Scaling"));
- fontVScale_->setToolTip( tr("Vertical Scaling"));
- language_->setToolTip( tr("Language"));
- fillColor_->setToolTip( tr("Fill Color"));
- fillShade_->setToolTip( tr("Fill Shade"));
- strokeColor_->setToolTip( tr("Stroke Color"));
- strokeShade_->setToolTip( tr("Stroke Shade"));
- backColor_->setToolTip( tr("Background Color"));
- backShade_->setToolTip( tr("Background Shade"));
+ retranslateUi(this);
fontSizeLabel_->setToolTip(fontSize_->toolTip());
trackingLabel_->setToolTip(tracking_->toolTip());
@@ -128,16 +108,6 @@
backIcon->setToolTip(backColor_->toolTip());
backShadeLabel->setToolTip(backShade_->toolTip());
-/***********************************/
-/* End Tooltips */
-/***********************************/
-
- basicGroup->setTitle( tr("Basic Formatting"));
- advGroup->setTitle( tr("Advanced Formatting"));
- smColorGroup->setTitle( tr("Colors"));
-
- parentLabel->setText( tr("Based On:"));
- languageLabel_->setText( tr("Language:"));
// fontVScale_->setSuffix( tr(" %"));
// fontHScale_->setSuffix( tr(" %"));
// baselineOffset_->setSuffix( tr(" %"));
Modified: trunk/Scribus/scribus/ui/smcstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21920&path=/trunk/Scribus/scribus/ui/smcstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.ui Sun Apr 16 20:59:11 2017
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>380</width>
+ <width>402</width>
<height>624</height>
</rect>
</property>
@@ -64,6 +64,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Parent Style</string>
+ </property>
</widget>
</item>
</layout>
@@ -125,6 +128,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="fontSize_">
+ <property name="toolTip">
+ <string>Font Size</string>
+ </property>
<property name="minimum">
<number>1</number>
</property>
@@ -151,6 +157,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="tracking_">
+ <property name="toolTip">
+ <string>Tracking</string>
+ </property>
<property name="suffix">
<string> %</string>
</property>
@@ -180,6 +189,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="widthSpaceSpin">
+ <property name="toolTip">
+ <string>Default width for space</string>
+ </property>
<property name="suffix">
<string> %</string>
</property>
@@ -311,6 +323,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="fontHScale_">
+ <property name="toolTip">
+ <string>Horizontal Scaling</string>
+ </property>
<property name="suffix">
<string> %</string>
</property>
@@ -346,6 +361,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="fontVScale_">
+ <property name="toolTip">
+ <string>Vertical Scaling</string>
+ </property>
<property name="suffix">
<string> %</string>
</property>
@@ -381,6 +399,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="baselineOffset_">
+ <property name="toolTip">
+ <string>Baseline Offset</string>
+ </property>
<property name="suffix">
<string> %</string>
</property>
@@ -421,6 +442,9 @@
</item>
<item>
<widget class="SMScComboBox" name="language_">
+ <property name="toolTip">
+ <string>Language</string>
+ </property>
<property name="editable">
<bool>true</bool>
</property>
@@ -461,7 +485,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox">
+ <widget class="QGroupBox" name="hyphenGroup">
<property name="title">
<string>Hyphenation</string>
</property>
@@ -496,7 +520,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="smallestWordLabel">
<property name="text">
<string>Smallest Word:</string>
</property>
@@ -510,7 +534,7 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="smallestWordLabel2">
<property name="text">
<string>Characters</string>
</property>
@@ -580,7 +604,11 @@
</widget>
</item>
<item>
- <widget class="SMColorCombo" name="fillColor_"/>
+ <widget class="SMColorCombo" name="fillColor_">
+ <property name="toolTip">
+ <string>Fill Color</string>
+ </property>
+ </widget>
</item>
<item>
<widget class="QLabel" name="fillShadeLabel">
@@ -606,6 +634,9 @@
</item>
<item>
<widget class="SMShadeButton" name="fillShade_">
+ <property name="toolTip">
+ <string>Fill Shade</string>
+ </property>
<property name="text">
<string/>
</property>
@@ -651,7 +682,11 @@
</widget>
</item>
<item>
- <widget class="SMColorCombo" name="strokeColor_"/>
+ <widget class="SMColorCombo" name="strokeColor_">
+ <property name="toolTip">
+ <string>Stroke Color</string>
+ </property>
+ </widget>
</item>
<item>
<widget class="QLabel" name="strokeShadeLabel">
@@ -677,6 +712,9 @@
</item>
<item>
<widget class="SMShadeButton" name="strokeShade_">
+ <property name="toolTip">
+ <string>Stroke Shade</string>
+ </property>
<property name="text">
<string/>
</property>
@@ -722,7 +760,11 @@
</widget>
</item>
<item>
- <widget class="SMColorCombo" name="backColor_"/>
+ <widget class="SMColorCombo" name="backColor_">
+ <property name="toolTip">
+ <string>Background Color</string>
+ </property>
+ </widget>
</item>
<item>
<widget class="QLabel" name="backShadeLabel">
@@ -748,6 +790,9 @@
</item>
<item>
<widget class="SMShadeButton" name="backShade_">
+ <property name="toolTip">
+ <string>Background Shade</string>
+ </property>
<property name="text">
<string/>
</property>
More information about the scribus-commit
mailing list