r21035 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Wed Feb 24 22:57:55 UTC 2016
Author: jghali
Date: Wed Feb 24 22:57:55 2016
New Revision: 21035
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21035
Log:
#13770: Simplify image palette strings translation <FirasH>
Modified:
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
trunk/Scribus/scribus/ui/propertiespalette_imagebase.ui
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21035&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Wed Feb 24 22:57:55 2016
@@ -790,31 +790,9 @@
void PropertiesPalette_Image::languageChange()
{
- imagePageNumberLabel->setText( tr("&Page Number:"));
+ retranslateUi(this);
+
imagePageNumber->setSpecialValueText( tr( "Auto" ));
- xposImgLabel->setText( tr("&X-Pos:"));
- yposImgLabel->setText( tr("&Y-Pos:"));
- imageRotationLabel->setText( tr("Rotation:"));
-
- scalingGroupBox->setTitle( tr("Scaling"));
- freeScale->setText( tr("&Free Scaling"));
- xscaleLabel->setText( tr("X-Sc&ale:"));
- yscaleLabel->setText( tr("Y-Scal&e:"));
- imgDPIXLabel->setText( tr("Actual X-DPI:"));
- imgDPIYLabel->setText( tr("Actual Y-DPI:"));
- frameScale->setText( tr("&To Frame Size"));
- cbProportional->setText( tr("P&roportional"));
-
- colorMgmtGroup->setTitle( tr("Color Management"));
- inputProfLabel->setText( tr("Input Profile:"));
- renderIntentLabel->setText( tr("Rendering Intent:"));
-
- pdfCompressionGroup->setTitle( tr("PDF Compression"));
- compressionMethodLabel->setText( tr("Method:"));
- compressionQualityLabel->setText( tr("Quality:"));
-
- imgEffectsButton->setText( tr("Image Effects"));
- imgExtProperties->setText( tr("Extended Properties"));
int oldMonitorI=renderIntent->currentIndex();
renderIntent->clear();
@@ -852,21 +830,6 @@
imageXOffsetSpinBox->setSuffix(suffix);
imageYOffsetSpinBox->setSuffix(suffix);
-
- imageXOffsetSpinBox->setToolTip( tr("Horizontal offset of image within frame"));
- imageYOffsetSpinBox->setToolTip( tr("Vertical offset of image within frame"));
- imageXScaleSpinBox->setToolTip( tr("Resize the image horizontally"));
- imageYScaleSpinBox->setToolTip( tr("Resize the image vertically"));
- keepImageWHRatioButton->setToolTip( tr("Keep the X and Y scaling the same"));
- freeScale->setToolTip( tr("Allow the image to be a different size to the frame"));
- frameScale->setToolTip( tr("Make the image fit within the size of the frame"));
- imgDpiX->setToolTip( tr("Effective horizontal DPI of the image after scaling"));
- imgDpiY->setToolTip( tr("Effective vertical DPI of the image after scaling"));
- cbProportional->setToolTip( tr("Use image proportions rather than those of the frame"));
- inputProfiles->setToolTip( tr("Source profile of the image"));
- renderIntent->setToolTip( tr("Rendering intent for the image"));
- compressionMethod->setToolTip( tr("Compression method used in PDF export for the image"));
- compressionQuality->setToolTip( tr("Compression quality used in PDF export for the image"));
}
void PropertiesPalette_Image::unitChange()
Modified: trunk/Scribus/scribus/ui/propertiespalette_imagebase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21035&path=/trunk/Scribus/scribus/ui/propertiespalette_imagebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_imagebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_imagebase.ui Wed Feb 24 22:57:55 2016
@@ -11,13 +11,22 @@
</rect>
</property>
<property name="windowTitle">
- <string>Form</string>
+ <string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>2</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>2</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="rightMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
<number>2</number>
</property>
<item>
@@ -25,7 +34,7 @@
<item row="2" column="0">
<widget class="QLabel" name="xposImgLabel">
<property name="text">
- <string>X-Pos:</string>
+ <string>&X-Pos:</string>
</property>
</widget>
</item>
@@ -37,6 +46,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Horizontal offset of image within frame</string>
+ </property>
</widget>
</item>
<item row="4" column="0">
@@ -66,7 +78,7 @@
<item row="3" column="0">
<widget class="QLabel" name="yposImgLabel">
<property name="text">
- <string>Y-Pos:</string>
+ <string>&Y-Pos:</string>
</property>
</widget>
</item>
@@ -78,6 +90,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Vertical offset of image within frame</string>
+ </property>
</widget>
</item>
<item row="1" column="1">
@@ -110,6 +125,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Resize the image horizontally</string>
+ </property>
</widget>
</item>
<item row="3" column="0">
@@ -127,6 +145,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Resize the image vertically</string>
+ </property>
</widget>
</item>
<item row="2" column="2" rowspan="2">
@@ -137,6 +158,9 @@
<height>32767</height>
</size>
</property>
+ <property name="toolTip">
+ <string>Keep the X and Y scaling the same</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -159,7 +183,11 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="ScrSpinBox" name="imgDpiX"/>
+ <widget class="ScrSpinBox" name="imgDpiX">
+ <property name="toolTip">
+ <string>Effective horizontal DPI of the image after scaling</string>
+ </property>
+ </widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="imgDPIYLabel">
@@ -169,7 +197,11 @@
</widget>
</item>
<item row="5" column="1">
- <widget class="ScrSpinBox" name="imgDpiY"/>
+ <widget class="ScrSpinBox" name="imgDpiY">
+ <property name="toolTip">
+ <string>Effective vertical DPI of the image after scaling</string>
+ </property>
+ </widget>
</item>
<item row="4" column="2" rowspan="2">
<widget class="LinkButton" name="keepImageDPIRatioButton">
@@ -195,13 +227,19 @@
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="freeScale">
- <property name="text">
- <string>Free</string>
+ <property name="toolTip">
+ <string>Allow the image to be a different size to the frame</string>
+ </property>
+ <property name="text">
+ <string>&Free Scaling</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="cbProportional">
+ <property name="toolTip">
+ <string>Use image proportions rather than those of the frame</string>
+ </property>
<property name="text">
<string>Proportional</string>
</property>
@@ -209,8 +247,11 @@
</item>
<item row="6" column="0">
<widget class="QRadioButton" name="frameScale">
- <property name="text">
- <string>To Frame Size</string>
+ <property name="toolTip">
+ <string>Make the image fit within the size of the frame</string>
+ </property>
+ <property name="text">
+ <string>&To Frame Size</string>
</property>
</widget>
</item>
@@ -226,7 +267,7 @@
<item row="0" column="0">
<widget class="QLabel" name="inputProfLabel">
<property name="text">
- <string>Input Profile</string>
+ <string>Input Profile:</string>
</property>
</widget>
</item>
@@ -238,17 +279,24 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Source profile of the image</string>
+ </property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="renderIntentLabel">
<property name="text">
- <string>Intent</string>
+ <string>Rendering Intent:</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="QComboBox" name="renderIntent"/>
+ <widget class="QComboBox" name="renderIntent">
+ <property name="toolTip">
+ <string>Rendering intent for the image</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -274,6 +322,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Compression method used in PDF export for the image</string>
+ </property>
</widget>
</item>
<item row="1" column="0">
@@ -290,6 +341,9 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Compression quality used in PDF export for the image</string>
</property>
</widget>
</item>
More information about the scribus-commit
mailing list