View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0009757 | Scribus | Story Editor / Text Frames | public | 2011-02-18 22:19 | 2011-03-27 14:34 |
Reporter | wexfordpress | Assigned To | cbradney | ||
Priority | normal | Severity | minor | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | PC | OS | Slackware Linux | OS Version | 13.0 |
Product Version | 1.5.0svn | ||||
Fixed in Version | 1.5.0svn | ||||
Summary | 0009757: Can't change default font for e.g., Story Editor. | ||||
Description | I can change the default font in File>Preferences>Item Tools. this is recorded in .scribus.rc. But when I fire up Scribus again I am back to the default, which is the first font in alphanumeric order, in my case AGaramond Italic. | ||||
Steps To Reproduce | Change File>Preferences>Item Tools>Text>Font to e.g., Bitstream Charter. | ||||
Tags | No tags attached. | ||||
Patch | |||||
|
Assign this bug to me |
|
Assigning to me to commit the patch. Wolfpack, please upload your patch to this bug. Thanks |
|
9757.diff (42,439 bytes)
Index: Scribus/scribus/prefsmanager.cpp =================================================================== --- Scribus/scribus/prefsmanager.cpp (revision 16505) +++ Scribus/scribus/prefsmanager.cpp (working copy) @@ -2039,6 +2039,8 @@ appPrefs.itemToolPrefs.textLineColorShade = dc.attribute("TextLineColorShade", "100").toInt(); appPrefs.itemToolPrefs.textShade = dc.attribute("TextColorShade", "100").toInt(); appPrefs.itemToolPrefs.textStrokeShade = dc.attribute("TextStrokeColorShade", "100").toInt(); + appPrefs.itemToolPrefs.textFont = dc.attribute("FontFace", "Bitstream Charter Bold"); + appPrefs.itemToolPrefs.textSize = dc.attribute("FontSize", "120").toInt(); appPrefs.itemToolPrefs.textColumns = dc.attribute("TextColumnCount", "1").toInt(); appPrefs.itemToolPrefs.textColumnGap = ScCLocale::toDoubleC(dc.attribute("TextColumnGap"), 0.0); appPrefs.itemToolPrefs.textTabFillChar = dc.attribute("TabFillCharacter", ""); Index: Scribus/scribus/ui/prefs_itemtools.cpp =================================================================== --- Scribus/scribus/ui/prefs_itemtools.cpp (revision 16505) +++ Scribus/scribus/ui/prefs_itemtools.cpp (working copy) @@ -18,35 +18,35 @@ Prefs_ItemTools::Prefs_ItemTools(QWidget* parent, ScribusDoc* doc) - : Prefs_Pane(parent), - m_doc(NULL), - showFontPreview(false) + : Prefs_Pane(parent), + m_doc(NULL), + showFontPreview(false) { - setupUi(this); - lineEndArrowComboBox->setStartDirection(false); - shapeLineWidthSpinBox->setNewUnit(0); - shapeLineWidthSpinBox->setMaximum(36); - shapeLineWidthSpinBox->setDecimals(1); - lineWidthSpinBox->setNewUnit(0); - lineWidthSpinBox->setMaximum(36); - lineWidthSpinBox->setDecimals(1); - calPenLineWidthSpinBox->setNewUnit(0); - calPenLineWidthSpinBox->setMaximum(36); - calPenLineWidthSpinBox->setDecimals(1); - calPenWidthSpinBox->setNewUnit(0); - calPenWidthSpinBox->setMaximum(100); - calPenWidthSpinBox->setDecimals(1); - calPenAngleSpinBox->setNewUnit(6); - calPenAngleSpinBox->setMaximum(180); - calPenAngleSpinBox->setMinimum(-180); - calPenAngleSpinBox->setDecimals(0); - shapeLineWidthSpinBox->setSpecialValueText( tr("Hairline")); - lineWidthSpinBox->setSpecialValueText( tr("Hairline")); - calPenLineWidthSpinBox->setSpecialValueText( tr("Hairline")); - textSizeSpinBox->setNewUnit(0); - textSizeSpinBox->setMinimum(0.5); - textSizeSpinBox->setMaximum(2048); - languageChange(); + setupUi(this); + lineEndArrowComboBox->setStartDirection(false); + shapeLineWidthSpinBox->setNewUnit(0); + shapeLineWidthSpinBox->setMaximum(36); + shapeLineWidthSpinBox->setDecimals(1); + lineWidthSpinBox->setNewUnit(0); + lineWidthSpinBox->setMaximum(36); + lineWidthSpinBox->setDecimals(1); + calPenLineWidthSpinBox->setNewUnit(0); + calPenLineWidthSpinBox->setMaximum(36); + calPenLineWidthSpinBox->setDecimals(1); + calPenWidthSpinBox->setNewUnit(0); + calPenWidthSpinBox->setMaximum(100); + calPenWidthSpinBox->setDecimals(1); + calPenAngleSpinBox->setNewUnit(6); + calPenAngleSpinBox->setMaximum(180); + calPenAngleSpinBox->setMinimum(-180); + calPenAngleSpinBox->setDecimals(0); + shapeLineWidthSpinBox->setSpecialValueText( tr("Hairline")); + lineWidthSpinBox->setSpecialValueText( tr("Hairline")); + calPenLineWidthSpinBox->setSpecialValueText( tr("Hairline")); + textSizeSpinBox->setNewUnit(0); + textSizeSpinBox->setMinimum(0.5); + textSizeSpinBox->setMaximum(2048); + languageChange(); } Prefs_ItemTools::~Prefs_ItemTools() @@ -56,374 +56,372 @@ void Prefs_ItemTools::languageChange() { - textPreviewWidget->setText( tr( "Woven silk pyjamas exchanged for blue quartz" )); - scalingLockToolButton->setToolTip( tr( "Keep horizontal and vertical scaling the same" ) ); + textPreviewWidget->setText( tr( "Woven silk pyjamas exchanged for blue quartz" )); + scalingLockToolButton->setToolTip( tr( "Keep horizontal and vertical scaling the same" ) ); } void Prefs_ItemTools::unitChange(int newIndex) { - textColumnGapSpinBox->setNewUnit(newIndex); - textTabWidthSpinBox->setNewUnit(newIndex); + textColumnGapSpinBox->setNewUnit(newIndex); + textTabWidthSpinBox->setNewUnit(newIndex); } void Prefs_ItemTools::restoreDefaults(struct ApplicationPrefs *prefsData) { - enableSignals(false); - int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex; - double unitRatio = unitGetRatioFromIndex(docUnitIndex); - unitChange(docUnitIndex); + enableSignals(false); + int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex; + double unitRatio = unitGetRatioFromIndex(docUnitIndex); + unitChange(docUnitIndex); - PrefsManager* prefsManager=PrefsManager::instance(); - ColorList* colorList = (m_doc != NULL) ? (&m_doc->PageColors) : prefsManager->colorSetPtr(); + PrefsManager* prefsManager=PrefsManager::instance(); + ColorList* colorList = (m_doc != NULL) ? (&m_doc->PageColors) : prefsManager->colorSetPtr(); - //Text Tool - for (int i=0; i<textFontComboBox->count(); ++i) - { - if (textFontComboBox->itemText(i) == prefsData->itemToolPrefs.textFont) - { - textFontComboBox->setCurrentIndex(i); - break; - } - } - textSizeSpinBox->setValue(prefsData->itemToolPrefs.textSize / 10); - textColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textColor); - textColorShadingSpinBox->setValue(prefsData->itemToolPrefs.textShade); - textStrokeColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textStrokeColor); - textStrokeShadingSpinBox->setValue(prefsData->itemToolPrefs.textStrokeShade); - textFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textFillColor); - textFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.textFillColorShade); - textFrameLineColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textLineColor); - textFrameLineShadingSpinBox->setValue(prefsData->itemToolPrefs.textLineColorShade); - textTabFillCharComboBox->clear(); - textTabFillCharComboBox->addItem( tr("None", "tab fill" )); - textTabFillCharComboBox->addItem( tr("Dot")); - textTabFillCharComboBox->addItem( tr("Hyphen")); - textTabFillCharComboBox->addItem( tr("Underscore")); - textTabFillCharComboBox->addItem( tr("Custom")); - if (prefsData->itemToolPrefs.textTabFillChar.isEmpty()) - { - textTabFillCharComboBox->setCurrentIndex(0); - } - else if (prefsData->itemToolPrefs.textTabFillChar == ".") - { - textTabFillCharComboBox->setCurrentIndex(1); - } - else if (prefsData->itemToolPrefs.textTabFillChar == "-") - { - textTabFillCharComboBox->setCurrentIndex(2); - } - else if (prefsData->itemToolPrefs.textTabFillChar == "_") - { - textTabFillCharComboBox->setCurrentIndex(3); - } - else - { - textTabFillCharComboBox->setCurrentIndex(4); - textTabFillCharComboBox->setEditable(true); - textTabFillCharComboBox->setItemText(textTabFillCharComboBox->currentIndex(), CommonStrings::trCustomTabFill + prefsData->itemToolPrefs.textTabFillChar); - } - textTabWidthSpinBox->setValue(prefsData->itemToolPrefs.textTabWidth * unitRatio); - textColumnsSpinBox->setValue(prefsData->itemToolPrefs.textColumns); - textColumnGapSpinBox->setValue(prefsData->itemToolPrefs.textColumnGap * unitRatio); - topTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Top * unitRatio); - bottomTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Bottom * unitRatio); - leftTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Left * unitRatio); - rightTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Right * unitRatio); + //Text Tool + for (int i=0; i<textFontComboBox->count(); ++i) + { + if (textFontComboBox->itemText(i) == prefsData->itemToolPrefs.textFont) + { + textFontComboBox->setCurrentIndex(i); + break; + } + } + textSizeSpinBox->setValue(prefsData->itemToolPrefs.textSize); + textColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textColor); + textColorShadingSpinBox->setValue(prefsData->itemToolPrefs.textShade); + textStrokeColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textStrokeColor); + textStrokeShadingSpinBox->setValue(prefsData->itemToolPrefs.textStrokeShade); + textFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textFillColor); + textFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.textFillColorShade); + textFrameLineColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.textLineColor); + textFrameLineShadingSpinBox->setValue(prefsData->itemToolPrefs.textLineColorShade); + textTabFillCharComboBox->clear(); + textTabFillCharComboBox->addItem( tr("None", "tab fill" )); + textTabFillCharComboBox->addItem( tr("Dot")); + textTabFillCharComboBox->addItem( tr("Hyphen")); + textTabFillCharComboBox->addItem( tr("Underscore")); + textTabFillCharComboBox->addItem( tr("Custom")); + if (prefsData->itemToolPrefs.textTabFillChar.isEmpty()) + { + textTabFillCharComboBox->setCurrentIndex(0); + } + else if (prefsData->itemToolPrefs.textTabFillChar == ".") + { + textTabFillCharComboBox->setCurrentIndex(1); + } + else if (prefsData->itemToolPrefs.textTabFillChar == "-") + { + textTabFillCharComboBox->setCurrentIndex(2); + } + else if (prefsData->itemToolPrefs.textTabFillChar == "_") + { + textTabFillCharComboBox->setCurrentIndex(3); + } + else + { + textTabFillCharComboBox->setCurrentIndex(4); + textTabFillCharComboBox->setEditable(true); + textTabFillCharComboBox->setItemText(textTabFillCharComboBox->currentIndex(), CommonStrings::trCustomTabFill + prefsData->itemToolPrefs.textTabFillChar); + } + textTabWidthSpinBox->setValue(prefsData->itemToolPrefs.textTabWidth * unitRatio); + textColumnsSpinBox->setValue(prefsData->itemToolPrefs.textColumns); + textColumnGapSpinBox->setValue(prefsData->itemToolPrefs.textColumnGap * unitRatio); + topTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Top * unitRatio); + bottomTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Bottom * unitRatio); + leftTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Left * unitRatio); + rightTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.Right * unitRatio); - //Image Tool -//TODO imageFrameLineColorComboBox -//TODO imageFrameLineShadingSpinBox - imageFreeScalingRadioButton->setChecked( prefsData->itemToolPrefs.imageScaleType ); - imageFrameScalingRadioButton->setChecked( !prefsData->itemToolPrefs.imageScaleType ); - imageHorizontalScalingSpinBox->setValue(qRound(prefsData->itemToolPrefs.imageScaleX * 100)); - imageVerticalScalingSpinBox->setValue(qRound(prefsData->itemToolPrefs.imageScaleY * 100)); - imageKeepAspectRatioCheckBox->setChecked(prefsData->itemToolPrefs.imageAspectRatio); - imageFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.imageFillColor); - imageFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.imageFillColorShade ); - imageUseEmbeddedClippingPathCheckBox->setChecked(prefsData->itemToolPrefs.imageUseEmbeddedPath); - switch (prefsData->itemToolPrefs.imageLowResType) - { - case 0: - onscreenResolutionFullRadioButton->setChecked(true); - break; - case 1: - onscreenResolutionNormalRadioButton->setChecked(true); - break; - case 2: - onscreenResolutionLowRadioButton->setChecked(true); - break; - } + //Image Tool +//TODO imageFrameLineColorComboBox +//TODO imageFrameLineShadingSpinBox + imageFreeScalingRadioButton->setChecked( prefsData->itemToolPrefs.imageScaleType ); + imageFrameScalingRadioButton->setChecked( !prefsData->itemToolPrefs.imageScaleType ); + imageHorizontalScalingSpinBox->setValue(qRound(prefsData->itemToolPrefs.imageScaleX * 100)); + imageVerticalScalingSpinBox->setValue(qRound(prefsData->itemToolPrefs.imageScaleY * 100)); + imageKeepAspectRatioCheckBox->setChecked(prefsData->itemToolPrefs.imageAspectRatio); + imageFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.imageFillColor); + imageFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.imageFillColorShade ); + imageUseEmbeddedClippingPathCheckBox->setChecked(prefsData->itemToolPrefs.imageUseEmbeddedPath); + switch (prefsData->itemToolPrefs.imageLowResType) + { + case 0: + onscreenResolutionFullRadioButton->setChecked(true); + break; + case 1: + onscreenResolutionNormalRadioButton->setChecked(true); + break; + case 2: + onscreenResolutionLowRadioButton->setChecked(true); + break; + } - //Shape Tool - shapeFrameLineColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.shapeLineColor); - shapeFrameLineShadingSpinBox->setValue(prefsData->itemToolPrefs.shapeLineColorShade); - shapeFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.shapeFillColor); - shapeFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.shapeFillColorShade); - shapeFrameLineStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.shapeLineStyle) - 1); - shapeLineWidthSpinBox->setValue(prefsData->itemToolPrefs.shapeLineWidth); + //Shape Tool + shapeFrameLineColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.shapeLineColor); + shapeFrameLineShadingSpinBox->setValue(prefsData->itemToolPrefs.shapeLineColorShade); + shapeFrameFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.shapeFillColor); + shapeFrameFillShadingSpinBox->setValue(prefsData->itemToolPrefs.shapeFillColorShade); + shapeFrameLineStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.shapeLineStyle) - 1); + shapeLineWidthSpinBox->setValue(prefsData->itemToolPrefs.shapeLineWidth); - //Polygon Tool - polygonWidget->restoreDefaults(&prefsData->itemToolPrefs); + //Polygon Tool + polygonWidget->restoreDefaults(&prefsData->itemToolPrefs); - //Line Tool - lineFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.lineColor); + //Line Tool + lineFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.lineColor); - lineFillColorShadingSpinBox->setValue(prefsData->itemToolPrefs.lineColorShade); - lineStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.lineStyle) - 1); - if (m_doc != 0) - { - lineStartArrowComboBox->rebuildList(&m_doc->arrowStyles()); - lineEndArrowComboBox->rebuildList(&m_doc->arrowStyles()); - } - else - { - lineStartArrowComboBox->rebuildList(&prefsData->arrowStyles); - lineEndArrowComboBox->rebuildList(&prefsData->arrowStyles); - } - lineStartArrowComboBox->setCurrentIndex(prefsData->itemToolPrefs.lineStartArrow); - lineEndArrowComboBox->setCurrentIndex(prefsData->itemToolPrefs.lineEndArrow); - lineWidthSpinBox->setValue(prefsData->itemToolPrefs.lineWidth); - // - //Calligraphic Pen Tool - calPenFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenFillColor); - calPenFillShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenFillColorShade); - calPenColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenLineColor); - calPenLineShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineColorShade); - calPenStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.calligrapicPenStyle) - 1); - calPenLineWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineWidth); - calPenAngleSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenAngle); - calPenWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenWidth); + lineFillColorShadingSpinBox->setValue(prefsData->itemToolPrefs.lineColorShade); + lineStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.lineStyle) - 1); + if (m_doc != 0) + { + lineStartArrowComboBox->rebuildList(&m_doc->arrowStyles()); + lineEndArrowComboBox->rebuildList(&m_doc->arrowStyles()); + } + else + { + lineStartArrowComboBox->rebuildList(&prefsData->arrowStyles); + lineEndArrowComboBox->rebuildList(&prefsData->arrowStyles); + } + lineStartArrowComboBox->setCurrentIndex(prefsData->itemToolPrefs.lineStartArrow); + lineEndArrowComboBox->setCurrentIndex(prefsData->itemToolPrefs.lineEndArrow); + lineWidthSpinBox->setValue(prefsData->itemToolPrefs.lineWidth); + // + //Calligraphic Pen Tool + calPenFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenFillColor); + calPenFillShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenFillColorShade); + calPenColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenLineColor); + calPenLineShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineColorShade); + calPenStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.calligrapicPenStyle) - 1); + calPenLineWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineWidth); + calPenAngleSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenAngle); + calPenWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenWidth); - // Arc Tool - arcDisplay->restoreDefaults(&prefsData->itemToolPrefs); - // Spiral Tool - spiralDisplay->restoreDefaults(&prefsData->itemToolPrefs); + // Arc Tool + arcDisplay->restoreDefaults(&prefsData->itemToolPrefs); + // Spiral Tool + spiralDisplay->restoreDefaults(&prefsData->itemToolPrefs); - enableSignals(true); + enableSignals(true); } void Prefs_ItemTools::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const { - //Text Tool - prefsData->itemToolPrefs.textFont = textFontComboBox->currentText(); - prefsData->itemToolPrefs.textSize = textSizeSpinBox->value() * 10; - prefsData->itemToolPrefs.textFillColor = textFrameFillColorComboBox->currentText(); - if (prefsData->itemToolPrefs.textFillColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.textFillColor = CommonStrings::None; - prefsData->itemToolPrefs.textLineColor = textFrameLineColorComboBox->currentText(); - if (prefsData->itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.textLineColor = CommonStrings::None; - prefsData->itemToolPrefs.textFillColorShade = textFrameFillShadingSpinBox->value(); - prefsData->itemToolPrefs.textLineColorShade = textFrameLineShadingSpinBox->value(); - prefsData->itemToolPrefs.textShade = textColorShadingSpinBox->value(); - prefsData->itemToolPrefs.textStrokeShade = textStrokeShadingSpinBox->value(); - prefsData->itemToolPrefs.textColor = textColorComboBox->currentText(); - if (prefsData->itemToolPrefs.textColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.textColor = CommonStrings::None; - prefsData->itemToolPrefs.textStrokeColor = textStrokeColorComboBox->currentText(); - if (prefsData->itemToolPrefs.textStrokeColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.textStrokeColor = CommonStrings::None; - prefsData->itemToolPrefs.textColumns = textColumnsSpinBox->value(); - int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex; - double unitRatio = unitGetRatioFromIndex(docUnitIndex); - prefsData->itemToolPrefs.textColumnGap = textColumnGapSpinBox->value() / unitRatio; - prefsData->itemToolPrefs.textTabWidth = textTabWidthSpinBox->value() / unitRatio; + //Text Tool + prefsData->itemToolPrefs.textFont = textFontComboBox->currentText(); + prefsData->itemToolPrefs.textSize = textSizeSpinBox->value() * 10; + prefsData->itemToolPrefs.textFillColor = textFrameFillColorComboBox->currentText(); + if (prefsData->itemToolPrefs.textFillColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.textFillColor = CommonStrings::None; + prefsData->itemToolPrefs.textLineColor = textFrameLineColorComboBox->currentText(); + if (prefsData->itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.textLineColor = CommonStrings::None; + prefsData->itemToolPrefs.textFillColorShade = textFrameFillShadingSpinBox->value(); + prefsData->itemToolPrefs.textLineColorShade = textFrameLineShadingSpinBox->value(); + prefsData->itemToolPrefs.textShade = textColorShadingSpinBox->value(); + prefsData->itemToolPrefs.textStrokeShade = textStrokeShadingSpinBox->value(); + prefsData->itemToolPrefs.textColor = textColorComboBox->currentText(); + if (prefsData->itemToolPrefs.textColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.textColor = CommonStrings::None; + prefsData->itemToolPrefs.textStrokeColor = textStrokeColorComboBox->currentText(); + if (prefsData->itemToolPrefs.textStrokeColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.textStrokeColor = CommonStrings::None; + prefsData->itemToolPrefs.textColumns = textColumnsSpinBox->value(); + int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex; + double unitRatio = unitGetRatioFromIndex(docUnitIndex); + prefsData->itemToolPrefs.textColumnGap = textColumnGapSpinBox->value() / unitRatio; + prefsData->itemToolPrefs.textTabWidth = textTabWidthSpinBox->value() / unitRatio; - switch (textTabFillCharComboBox->currentIndex()) - { - case 0: - prefsData->itemToolPrefs.textTabFillChar = ""; - break; - case 1: - prefsData->itemToolPrefs.textTabFillChar = "."; - break; - case 2: - prefsData->itemToolPrefs.textTabFillChar = "-"; - break; - case 3: - prefsData->itemToolPrefs.textTabFillChar = "_"; - break; - case 4: - prefsData->itemToolPrefs.textTabFillChar = textTabFillCharComboBox->currentText().right(1); - break; - } - prefsData->itemToolPrefs.textDistances.Top = topTextDistanceSpinBox->value() / unitRatio; - prefsData->itemToolPrefs.textDistances.Bottom = bottomTextDistanceSpinBox->value() / unitRatio; - prefsData->itemToolPrefs.textDistances.Left = leftTextDistanceSpinBox->value() / unitRatio; - prefsData->itemToolPrefs.textDistances.Right = rightTextDistanceSpinBox->value() / unitRatio; + switch (textTabFillCharComboBox->currentIndex()) + { + case 0: + prefsData->itemToolPrefs.textTabFillChar = ""; + break; + case 1: + prefsData->itemToolPrefs.textTabFillChar = "."; + break; + case 2: + prefsData->itemToolPrefs.textTabFillChar = "-"; + break; + case 3: + prefsData->itemToolPrefs.textTabFillChar = "_"; + break; + case 4: + prefsData->itemToolPrefs.textTabFillChar = textTabFillCharComboBox->currentText().right(1); + break; + } + prefsData->itemToolPrefs.textDistances.Top = topTextDistanceSpinBox->value() / unitRatio; + prefsData->itemToolPrefs.textDistances.Bottom = bottomTextDistanceSpinBox->value() / unitRatio; + prefsData->itemToolPrefs.textDistances.Left = leftTextDistanceSpinBox->value() / unitRatio; + prefsData->itemToolPrefs.textDistances.Right = rightTextDistanceSpinBox->value() / unitRatio; - //Image Tool - // - // TODO imageFrameLineColorComboBox - // TODO imageFrameLineShadingSpinBox - // TODO scalingLockToolButton + //Image Tool + // + // TODO imageFrameLineColorComboBox + // TODO imageFrameLineShadingSpinBox + // TODO scalingLockToolButton - prefsData->itemToolPrefs.imageFillColor = imageFrameFillColorComboBox->currentText(); - if (prefsData->itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.imageFillColor = CommonStrings::None; - prefsData->itemToolPrefs.imageFillColorShade = imageFrameFillShadingSpinBox->value(); - prefsData->itemToolPrefs.imageScaleX = static_cast<double>(imageHorizontalScalingSpinBox->value()) / 100.0; - prefsData->itemToolPrefs.imageScaleY = static_cast<double>(imageVerticalScalingSpinBox->value()) / 100.0; - prefsData->itemToolPrefs.imageScaleType = imageFreeScalingRadioButton->isChecked(); - prefsData->itemToolPrefs.imageAspectRatio = imageKeepAspectRatioCheckBox->isChecked(); - prefsData->itemToolPrefs.imageUseEmbeddedPath = imageUseEmbeddedClippingPathCheckBox->isChecked(); - int haRes = 0; - if (onscreenResolutionFullRadioButton->isChecked()) - haRes = 0; - if (onscreenResolutionNormalRadioButton->isChecked()) - haRes = 1; - if (onscreenResolutionLowRadioButton->isChecked()) - haRes = 2; - prefsData->itemToolPrefs.imageLowResType = haRes; + prefsData->itemToolPrefs.imageFillColor = imageFrameFillColorComboBox->currentText(); + if (prefsData->itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.imageFillColor = CommonStrings::None; + prefsData->itemToolPrefs.imageFillColorShade = imageFrameFillShadingSpinBox->value(); + prefsData->itemToolPrefs.imageScaleX = static_cast<double>(imageHorizontalScalingSpinBox->value()) / 100.0; + prefsData->itemToolPrefs.imageScaleY = static_cast<double>(imageVerticalScalingSpinBox->value()) / 100.0; + prefsData->itemToolPrefs.imageScaleType = imageFreeScalingRadioButton->isChecked(); + prefsData->itemToolPrefs.imageAspectRatio = imageKeepAspectRatioCheckBox->isChecked(); + prefsData->itemToolPrefs.imageUseEmbeddedPath = imageUseEmbeddedClippingPathCheckBox->isChecked(); + int haRes = 0; + if (onscreenResolutionFullRadioButton->isChecked()) + haRes = 0; + if (onscreenResolutionNormalRadioButton->isChecked()) + haRes = 1; + if (onscreenResolutionLowRadioButton->isChecked()) + haRes = 2; + prefsData->itemToolPrefs.imageLowResType = haRes; - //Shape tool - prefsData->itemToolPrefs.shapeLineColor = shapeFrameLineColorComboBox->currentText(); - if (prefsData->itemToolPrefs.shapeLineColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.shapeLineColor = CommonStrings::None; - prefsData->itemToolPrefs.shapeFillColor = shapeFrameFillColorComboBox->currentText(); - if (prefsData->itemToolPrefs.shapeFillColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.shapeFillColor = CommonStrings::None; - prefsData->itemToolPrefs.shapeFillColorShade = shapeFrameFillShadingSpinBox->value(); - prefsData->itemToolPrefs.shapeLineColorShade = shapeFrameLineShadingSpinBox->value(); - prefsData->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(shapeFrameLineStyleComboBox->currentIndex()) + 1; - prefsData->itemToolPrefs.shapeLineWidth = shapeLineWidthSpinBox->value(); + //Shape tool + prefsData->itemToolPrefs.shapeLineColor = shapeFrameLineColorComboBox->currentText(); + if (prefsData->itemToolPrefs.shapeLineColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.shapeLineColor = CommonStrings::None; + prefsData->itemToolPrefs.shapeFillColor = shapeFrameFillColorComboBox->currentText(); + if (prefsData->itemToolPrefs.shapeFillColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.shapeFillColor = CommonStrings::None; + prefsData->itemToolPrefs.shapeFillColorShade = shapeFrameFillShadingSpinBox->value(); + prefsData->itemToolPrefs.shapeLineColorShade = shapeFrameLineShadingSpinBox->value(); + prefsData->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(shapeFrameLineStyleComboBox->currentIndex()) + 1; + prefsData->itemToolPrefs.shapeLineWidth = shapeLineWidthSpinBox->value(); - //Polygon Tool - polygonWidget->saveGuiToPrefs(&prefsData->itemToolPrefs); + //Polygon Tool + polygonWidget->saveGuiToPrefs(&prefsData->itemToolPrefs); - //Line Tool - prefsData->itemToolPrefs.lineColor = lineFillColorComboBox->currentText(); - if (prefsData->itemToolPrefs.lineColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.lineColor = CommonStrings::None; - prefsData->itemToolPrefs.lineColorShade = lineFillColorShadingSpinBox->value(); - prefsData->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(lineStyleComboBox->currentIndex()) + 1; - prefsData->itemToolPrefs.lineWidth = lineWidthSpinBox->value(); - prefsData->itemToolPrefs.lineStartArrow = lineStartArrowComboBox->currentIndex(); - prefsData->itemToolPrefs.lineEndArrow = lineEndArrowComboBox->currentIndex(); - //Calligraphic Pen Tool - prefsData->itemToolPrefs.calligrapicPenFillColor = calPenFillColorComboBox->currentText(); - if (prefsData->itemToolPrefs.calligrapicPenFillColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.calligrapicPenFillColor = CommonStrings::None; - prefsData->itemToolPrefs.calligrapicPenLineColor = calPenColorComboBox->currentText(); - if (prefsData->itemToolPrefs.calligrapicPenLineColor == CommonStrings::tr_NoneColor) - prefsData->itemToolPrefs.calligrapicPenLineColor = CommonStrings::None; - prefsData->itemToolPrefs.calligrapicPenFillColorShade = calPenFillShadingSpinBox->value(); - prefsData->itemToolPrefs.calligrapicPenLineColorShade = calPenLineShadingSpinBox->value(); - prefsData->itemToolPrefs.calligrapicPenStyle = static_cast<Qt::PenStyle>(calPenStyleComboBox->currentIndex()) + 1; - prefsData->itemToolPrefs.calligrapicPenLineWidth = calPenLineWidthSpinBox->value(); - prefsData->itemToolPrefs.calligrapicPenAngle = calPenAngleSpinBox->value(); - prefsData->itemToolPrefs.calligrapicPenWidth = calPenWidthSpinBox->value(); + //Line Tool + prefsData->itemToolPrefs.lineColor = lineFillColorComboBox->currentText(); + if (prefsData->itemToolPrefs.lineColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.lineColor = CommonStrings::None; + prefsData->itemToolPrefs.lineColorShade = lineFillColorShadingSpinBox->value(); + prefsData->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(lineStyleComboBox->currentIndex()) + 1; + prefsData->itemToolPrefs.lineWidth = lineWidthSpinBox->value(); + prefsData->itemToolPrefs.lineStartArrow = lineStartArrowComboBox->currentIndex(); + prefsData->itemToolPrefs.lineEndArrow = lineEndArrowComboBox->currentIndex(); + //Calligraphic Pen Tool + prefsData->itemToolPrefs.calligrapicPenFillColor = calPenFillColorComboBox->currentText(); + if (prefsData->itemToolPrefs.calligrapicPenFillColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.calligrapicPenFillColor = CommonStrings::None; + prefsData->itemToolPrefs.calligrapicPenLineColor = calPenColorComboBox->currentText(); + if (prefsData->itemToolPrefs.calligrapicPenLineColor == CommonStrings::tr_NoneColor) + prefsData->itemToolPrefs.calligrapicPenLineColor = CommonStrings::None; + prefsData->itemToolPrefs.calligrapicPenFillColorShade = calPenFillShadingSpinBox->value(); + prefsData->itemToolPrefs.calligrapicPenLineColorShade = calPenLineShadingSpinBox->value(); + prefsData->itemToolPrefs.calligrapicPenStyle = static_cast<Qt::PenStyle>(calPenStyleComboBox->currentIndex()) + 1; + prefsData->itemToolPrefs.calligrapicPenLineWidth = calPenLineWidthSpinBox->value(); + prefsData->itemToolPrefs.calligrapicPenAngle = calPenAngleSpinBox->value(); + prefsData->itemToolPrefs.calligrapicPenWidth = calPenWidthSpinBox->value(); - //Arc Tool - arcDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs); - //Spiral Tool - spiralDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs); + //Arc Tool + arcDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs); + //Spiral Tool + spiralDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs); } void Prefs_ItemTools::enableSignals(bool on) { - if (on) - { - connect(textFontComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - connect(textSizeSpinBox, SIGNAL(valueChanged(double)), this, SLOT(updateFontPreview())); - connect(textColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - connect(textFrameFillColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - connect(textFrameFillShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); - connect(textColorShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); -// connect(buttonGroup3, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingFree(bool))); -// connect(buttonGroup5, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingRatio(bool))); - connect(scalingLockToolButton, SIGNAL(clicked()), this, SLOT(toggleImagesScalingChain())); - connect(imageHorizontalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageHorizontalScalingChange())); - connect(imageVerticalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageVerticalScalingChange())); -// connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int))); - } - else - { - disconnect(textFontComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - disconnect(textSizeSpinBox, SIGNAL(valueChanged(double)), this, SLOT(updateFontPreview())); - disconnect(textColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - disconnect(textFrameFillColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); - disconnect(textFrameFillShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); - disconnect(textColorShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); -// disconnect(buttonGroup3, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingFree(bool))); -// disconnect(buttonGroup5, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingRatio(bool))); - disconnect(scalingLockToolButton, SIGNAL(clicked()), this, SLOT(toggleImagesScalingChain())); - disconnect(imageHorizontalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageHorizontalScalingChange())); - disconnect(imageVerticalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageVerticalScalingChange())); -// disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int))); - } + if (on) + { + connect(textFontComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + connect(textSizeSpinBox, SIGNAL(valueChanged(double)), this, SLOT(updateFontPreview())); + connect(textColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + connect(textFrameFillColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + connect(textFrameFillShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); + connect(textColorShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); +// connect(buttonGroup3, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingFree(bool))); +// connect(buttonGroup5, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingRatio(bool))); + connect(scalingLockToolButton, SIGNAL(clicked()), this, SLOT(toggleImagesScalingChain())); + connect(imageHorizontalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageHorizontalScalingChange())); + connect(imageVerticalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageVerticalScalingChange())); +// connect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int))); + } + else + { + disconnect(textFontComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + disconnect(textSizeSpinBox, SIGNAL(valueChanged(double)), this, SLOT(updateFontPreview())); + disconnect(textColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + disconnect(textFrameFillColorComboBox, SIGNAL(activated(int)), this, SLOT(updateFontPreview())); + disconnect(textFrameFillShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); + disconnect(textColorShadingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateFontPreview())); +// disconnect(buttonGroup3, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingFree(bool))); +// disconnect(buttonGroup5, SIGNAL(toggled(bool)), this, SLOT(changeImageScalingRatio(bool))); + disconnect(scalingLockToolButton, SIGNAL(clicked()), this, SLOT(toggleImagesScalingChain())); + disconnect(imageHorizontalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageHorizontalScalingChange())); + disconnect(imageVerticalScalingSpinBox, SIGNAL(valueChanged(int)), this, SLOT(imageVerticalScalingChange())); +// disconnect(tabFillCombo, SIGNAL(activated(int)), this, SLOT(setFillChar(int))); + } } void Prefs_ItemTools::enableFontPreview(bool showPreview) { - showFontPreview = showPreview; - updateFontPreview(); + showFontPreview = showPreview; + updateFontPreview(); } void Prefs_ItemTools::updateFontPreview() { - if (!showFontPreview) - return; + if (!showFontPreview) + return; - SampleItem si; - si.setText( tr("Woven silk pyjamas exchanged for blue quartz")); - if (textFrameFillColorComboBox->currentText() != CommonStrings::tr_NoneColor) - { - if (m_doc != 0) - { - si.setBgColor(m_doc->PageColors[textFrameFillColorComboBox->currentText()].getRawRGBColor()); - } - else - { - PrefsManager* prefsManager=PrefsManager::instance(); - ColorList* colorList=prefsManager->colorSetPtr(); - si.setBgColor((*colorList)[textFrameFillColorComboBox->currentText()].getRawRGBColor()); - } - si.setBgShade(textFrameFillShadingSpinBox->value()); - } - else - si.setBgColor(palette().color(QPalette::Window)); + SampleItem si; + si.setText( tr("Woven silk pyjamas exchanged for blue quartz")); + if (textFrameFillColorComboBox->currentText() != CommonStrings::tr_NoneColor) + { + if (m_doc != 0) + { + si.setBgColor(m_doc->PageColors[textFrameFillColorComboBox->currentText()].getRawRGBColor()); + } + else + { + PrefsManager* prefsManager=PrefsManager::instance(); + ColorList* colorList=prefsManager->colorSetPtr(); + si.setBgColor((*colorList)[textFrameFillColorComboBox->currentText()].getRawRGBColor()); + } + si.setBgShade(textFrameFillShadingSpinBox->value()); + } + else + si.setBgColor(palette().color(QPalette::Window)); - if (textColorComboBox->currentText() != CommonStrings::tr_NoneColor) - { - if (m_doc != 0) - { - si.setTxColor(m_doc->PageColors[textColorComboBox->currentText()].getRawRGBColor()); - } - else - { - PrefsManager* prefsManager=PrefsManager::instance(); - ColorList* colorList=prefsManager->colorSetPtr(); - si.setTxColor((*colorList)[textColorComboBox->currentText()].getRawRGBColor()); - } - si.setTxShade(textColorShadingSpinBox->value()); - } - else - si.setTxColor(palette().color(QPalette::Window)); - si.setFont(textFontComboBox->currentText()); - si.setFontSize(textSizeSpinBox->value() * 10, true); - textPreviewWidget->setPixmap(si.getSample(textPreviewWidget->width(), textPreviewWidget->height())); + if (textColorComboBox->currentText() != CommonStrings::tr_NoneColor) + { + if (m_doc != 0) + { + si.setTxColor(m_doc->PageColors[textColorComboBox->currentText()].getRawRGBColor()); + } + else + { + PrefsManager* prefsManager=PrefsManager::instance(); + ColorList* colorList=prefsManager->colorSetPtr(); + si.setTxColor((*colorList)[textColorComboBox->currentText()].getRawRGBColor()); + } + si.setTxShade(textColorShadingSpinBox->value()); + } + else + si.setTxColor(palette().color(QPalette::Window)); + si.setFont(textFontComboBox->currentText()); + si.setFontSize(textSizeSpinBox->value() * 10, true); + textPreviewWidget->setPixmap(si.getSample(textPreviewWidget->width(), textPreviewWidget->height())); } void Prefs_ItemTools::toggleImagesScalingChain() { - imageHorizontalScalingChange(); + imageHorizontalScalingChange(); } void Prefs_ItemTools::imageHorizontalScalingChange() { - if (scalingLockToolButton->isChecked()) - imageVerticalScalingSpinBox->setValue(imageHorizontalScalingSpinBox->value()); + if (scalingLockToolButton->isChecked()) + imageVerticalScalingSpinBox->setValue(imageHorizontalScalingSpinBox->value()); } void Prefs_ItemTools::imageVerticalScalingChange() { - if (scalingLockToolButton->isChecked()) - imageHorizontalScalingSpinBox->setValue(imageVerticalScalingSpinBox->value()); + if (scalingLockToolButton->isChecked()) + imageHorizontalScalingSpinBox->setValue(imageVerticalScalingSpinBox->value()); } - - |
|
9757-realfix.diff (1,150 bytes)
Index: prefsmanager.cpp =================================================================== --- prefsmanager.cpp (revision 16525) +++ prefsmanager.cpp (working copy) @@ -2076,9 +2076,9 @@ appPrefs.itemToolPrefs.spiralStartAngle = ScCLocale::toDoubleC(dc.attribute("SpiralStartAngle"), 0.0); appPrefs.itemToolPrefs.spiralEndAngle = ScCLocale::toDoubleC(dc.attribute("SpiralEndAngle"), 1080.0); appPrefs.itemToolPrefs.spiralFactor = ScCLocale::toDoubleC(dc.attribute("SpiralFactor"), 1.2); - if (dc.hasAttribute("Face")) + if (dc.hasAttribute("FontFace")) { - QString tmpf=dc.attribute("Face"); + QString tmpf=dc.attribute("FontFace"); QString newFont = ""; if (!appPrefs.fontPrefs.AvailFonts.contains(tmpf) || !appPrefs.fontPrefs.AvailFonts[tmpf].usable()) { @@ -2092,7 +2092,7 @@ newFont = tmpf; if (!newFont.isEmpty()) appPrefs.itemToolPrefs.textFont = newFont; - appPrefs.itemToolPrefs.textSize = qRound( ScCLocale::toDoubleC(dc.attribute("SIZE"), 12.0) * 10.0 ); + appPrefs.itemToolPrefs.textSize = qRound( ScCLocale::toDoubleC(dc.attribute("FontSize"), 12.0) * 10.0 ); } } |
|
Wolfpack I have added the real fix to the bug.. please review. I have committed this to SVN already so I will resolve the bug. |
Date Modified | Username | Field | Change |
---|---|---|---|
2011-02-18 22:19 | wexfordpress | New Issue | |
2011-03-27 08:40 | wolfpack-nav | Note Added: 0025942 | |
2011-03-27 10:44 | cbradney | Assigned To | => cbradney |
2011-03-27 10:44 | cbradney | Status | new => assigned |
2011-03-27 10:45 | cbradney | Note Added: 0025949 | |
2011-03-27 13:02 | wolfpack-nav | File Added: 9757.diff | |
2011-03-27 13:57 | cbradney | File Added: 9757-realfix.diff | |
2011-03-27 13:58 | cbradney | Note Added: 0025950 | |
2011-03-27 13:58 | cbradney | Status | assigned => resolved |
2011-03-27 13:58 | cbradney | Fixed in Version | => 1.5.0svn |
2011-03-27 13:58 | cbradney | Resolution | open => fixed |
2011-03-27 14:34 | cbradney | Status | resolved => closed |
2015-09-17 20:08 | Kunda | Category | Story Editor / Text Frames => Story Ed/Txt Frames |
2015-09-17 20:12 | Kunda | Category | Story Ed/Txt Frames => Story Editor / Text Frames |