View Issue Details

IDProjectCategoryView StatusLast Update
0014870ScribusUser Interfacepublic2017-06-21 22:09
ReporterFirasH Assigned ToFirasH  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.4.svn 
Fixed in Version1.5.4.svn 
Summary0014870: Style select is missing colons before spinboxes and does not translate "Auto" string on language change
DescriptionStyle select is missing colons before spinboxes and does not translate "Auto" string on language change.
Steps To Reproduce0) Create a new document
1) Insert a Text Frame
2) Go to: Windows > Text Properties > Colors & Effects
3) Change values of Underline/Strikeout/etc.

Labels are missing and "Auto" is not updated on language change.
Additional Information1.5.4.svn (22072)
TagsNo tags attached.
PatchYes

Activities

FirasH

2017-06-18 12:50

developer  

14870-Patch.diff (3,340 bytes)   

diff --git a/scribus/ui/styleselect.cpp b/scribus/ui/styleselect.cpp
--- a/scribus/ui/styleselect.cpp
+++ b/scribus/ui/styleselect.cpp
@@ -20,15 +20,13 @@
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
 	LPos->setWrapping(true);
-	LPos->setSpecialValueText( tr( "Auto" ) );
-	LPosTxt = new QLabel( "Displacement", this );
+	LPosTxt = new QLabel( "Displacement:", this );
 	group1Layout->addWidget( LPos, 0, 1 );
 	group1Layout->addWidget( LPosTxt, 0 , 0 );
 	LWidth = new ScrSpinBox( -0.1, 100, this, 0 );
 	LWidth->setValue( -0.1 );
 	LWidth->setWrapping(true);
-	LWidth->setSpecialValueText( tr( "Auto" ) );
-	LWidthTxt = new QLabel( "Linewidth", this );
+	LWidthTxt = new QLabel( "Linewidth:", this );
 	group1Layout->addWidget( LWidth, 1, 1 );
 	group1Layout->addWidget( LWidthTxt, 1 , 0 );
 	languageChange();
@@ -37,9 +35,12 @@
 void StrikeValues::languageChange()
 {
 	LPos->setSuffix( tr(" %"));
-	LPosTxt->setText( tr("Displacement"));
+	LPos->setSpecialValueText( tr( "Auto" ) );
+	LPosTxt->setText( tr("Displacement:"));
 	LWidth->setSuffix( tr(" %"));
-	LWidthTxt->setText( tr("Linewidth"));
+	LWidth->setSpecialValueText( tr( "Auto" ) );
+	LWidthTxt->setText( tr("Linewidth:"));
+	group1Layout->updateGeometry();
 	LPosTxt->adjustSize();
 	LWidthTxt->adjustSize();
 }
@@ -53,15 +54,13 @@
 	LPos = new ScrSpinBox( -0.1, 100, this, 0 );
 	LPos->setValue( -0.1 );
 	LPos->setWrapping(true);
-	LPos->setSpecialValueText( tr( "Auto" ) );
-	LPosTxt = new QLabel( "Displacement", this );
+	LPosTxt = new QLabel( "Displacement:", this );
 	group1Layout->addWidget( LPos, 0, 1 );
 	group1Layout->addWidget( LPosTxt, 0 , 0 );
 	LWidth = new ScrSpinBox( -0.1, 100, this, 0 );
 	LWidth->setValue( -0.1 );
 	LWidth->setWrapping(true);
-	LWidth->setSpecialValueText( tr( "Auto" ) );
-	LWidthTxt = new QLabel( "Linewidth", this );
+	LWidthTxt = new QLabel( "Linewidth:", this );
 	group1Layout->addWidget( LWidth, 1, 1 );
 	group1Layout->addWidget( LWidthTxt, 1 , 0 );
 	languageChange();
@@ -69,10 +68,12 @@
 
 void UnderlineValues::languageChange()
 {
+	LPos->setSpecialValueText( tr("Auto") );
 	LPos->setSuffix( tr(" %"));
-	LPosTxt->setText( tr("Displacement"));
+	LPosTxt->setText( tr("Displacement:"));
+	LWidth->setSpecialValueText( tr("Auto") );
 	LWidth->setSuffix( tr(" %"));
-	LWidthTxt->setText( tr("Linewidth"));
+	LWidthTxt->setText( tr("Linewidth:"));
 	LPosTxt->adjustSize();
 	LWidthTxt->adjustSize();
 }
@@ -85,7 +86,7 @@
 	group1Layout->setAlignment( Qt::AlignTop );
 	LWidth = new ScrSpinBox( 0, 100, this, 0 );
 	LWidth->setValue( 1 );
-	LWidthTxt = new QLabel( "Linewidth", this );
+	LWidthTxt = new QLabel( "Linewidth:", this );
 	group1Layout->addWidget( LWidth, 0, 1 );
 	group1Layout->addWidget( LWidthTxt, 0 , 0 );
 	languageChange();
@@ -94,7 +95,7 @@
 void OutlineValues::languageChange()
 {
 	LWidth->setSuffix( tr(" %"));
-	LWidthTxt->setText( tr("Linewidth"));
+	LWidthTxt->setText( tr("Linewidth:"));
 	LWidthTxt->adjustSize();
 }
 
@@ -120,9 +121,9 @@
 void ShadowValues::languageChange()
 {
 	Xoffset->setSuffix( tr(" %"));
-	XoffsetTxt->setText( tr("X-Offset"));
+	XoffsetTxt->setText( tr("X-Offset:"));
 	Yoffset->setSuffix( tr(" %"));
-	YoffsetTxt->setText( tr("Y-Offset"));
+	YoffsetTxt->setText( tr("Y-Offset:"));
 	XoffsetTxt->adjustSize();
 	YoffsetTxt->adjustSize();
 }
14870-Patch.diff (3,340 bytes)   

jghali

2017-06-21 18:00

administrator   ~0044070

>> group1Layout->updateGeometry();

QGridLayout does not have updateGeometry() as a member in Qt 5.5 or in Qt 5.6.

jghali

2017-06-21 19:24

administrator   ~0044071

Committed without the offending line. Thanks!

FirasH

2017-06-21 22:09

developer   ~0044072

Perfect, thanks jghali!
Fixed in 1.5.4.svn (22075).

Issue History

Date Modified Username Field Change
2017-06-18 12:50 FirasH New Issue
2017-06-18 12:50 FirasH File Added: 14870-Patch.diff
2017-06-21 18:00 jghali Note Added: 0044070
2017-06-21 19:24 jghali Assigned To => FirasH
2017-06-21 19:24 jghali Status new => resolved
2017-06-21 19:24 jghali Resolution open => fixed
2017-06-21 19:24 jghali Fixed in Version => 1.5.4.svn
2017-06-21 19:24 jghali Note Added: 0044071
2017-06-21 22:09 FirasH Status resolved => closed
2017-06-21 22:09 FirasH Note Added: 0044072