r24217 by jghali - #9604: Missing possibility to configure first line offset default value for the text box
scribus-commit
scribus-commit at lists.scribus.net
Mon Nov 9 23:58:33 UTC 2020
Author: jghali
Date: Mon Nov 9 23:58:32 2020
New Revision: 24217
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24217
Log:
#9604: Missing possibility to configure first line offset default value for the text box
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/prefsstructs.h
trunk/Scribus/scribus/ui/prefs_itemtools.cpp
trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Nov 9 23:58:32 2020
@@ -433,7 +433,7 @@
PLineArt = Qt::PenStyle(m_Doc->itemToolPrefs().shapeLineStyle);
PLineEnd = Qt::FlatCap;
PLineJoin = Qt::MiterJoin;
- m_textDistanceMargins=m_Doc->itemToolPrefs().textDistances;
+ m_textDistanceMargins = m_Doc->itemToolPrefs().textDistances;
pixm.imgInfo.lowResType = m_Doc->itemToolPrefs().imageLowResType;
switch (m_itemType)
{
@@ -683,7 +683,7 @@
meshGradientArray.append(mgList);
meshGradientPatches.append(patch);
- m_firstLineOffset = FLOPRealGlyphHeight;
+ m_firstLineOffset = m_Doc->itemToolPrefs().firstLineOffset;
m_columns = m_Doc->itemToolPrefs().textColumns;
m_columnGap = m_Doc->itemToolPrefs().textColumnGap;
@@ -691,15 +691,18 @@
m_startArrowIndex = m_Doc->itemToolPrefs().lineStartArrow;
m_endArrowIndex = m_Doc->itemToolPrefs().lineEndArrow;
effectsInUse.clear();
+
//Page Item Attributes
pageItemAttributes.clear();
- for (ObjAttrVector::Iterator objAttrIt = m_Doc->itemAttributes().begin() ; objAttrIt != m_Doc->itemAttributes().end(); ++objAttrIt )
- {
- if (((*objAttrIt).autoaddto=="textframes" && m_itemType==TextFrame) ||
- ((*objAttrIt).autoaddto=="imageframes" && m_itemType==ImageFrame)
- )
- pageItemAttributes.append(*objAttrIt);
- }
+ for (const ObjectAttribute& objAttr : qAsConst(m_Doc->itemAttributes()))
+ {
+ if ((objAttr.autoaddto == "textframes" && m_itemType == TextFrame) ||
+ (objAttr.autoaddto == "imageframes" && m_itemType == ImageFrame))
+ {
+ pageItemAttributes.append(objAttr);
+ }
+ }
+
hatchBackground = CommonStrings::None;
hatchBackgroundQ = QColor();
hatchForeground = "Black";
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Mon Nov 9 23:58:32 2020
@@ -1095,6 +1095,7 @@
doc->opToolPrefs().constrain = attrs.valueAsDouble("constrain", 15.0);
doc->itemToolPrefs().textTabFillChar = attrs.valueAsString("TabFill","");
doc->itemToolPrefs().textTabWidth = attrs.valueAsDouble("TabWidth", 36.0);
+ doc->itemToolPrefs().firstLineOffset = FLOPRealGlyphHeight;
if (attrs.hasAttribute("CPICT"))
doc->itemToolPrefs().imageFillColor = attrs.valueAsString("CPICT");
doc->itemToolPrefs().imageFillColorShade = attrs.valueAsInt("PICTSHADE", 100);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Mon Nov 9 23:58:32 2020
@@ -422,6 +422,7 @@
m_Doc->itemToolPrefs().shapeFillColorShade = dc.attribute("BRUSHSHADE", "100").toInt();
m_Doc->itemToolPrefs().textTabFillChar = dc.attribute("TabFill","");
m_Doc->itemToolPrefs().textTabWidth = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
+ m_Doc->itemToolPrefs().firstLineOffset = FLOPRealGlyphHeight;
if (dc.hasAttribute("CPICT"))
m_Doc->itemToolPrefs().imageFillColor = dc.attribute("CPICT");
m_Doc->itemToolPrefs().imageFillColorShade = ScCLocale::toDoubleC(dc.attribute("PICTSHADE"), 100.0);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Mon Nov 9 23:58:32 2020
@@ -2412,6 +2412,8 @@
doc->opToolPrefs().constrain = attrs.valueAsDouble("constrain", 15.0);
doc->itemToolPrefs().textTabFillChar = attrs.valueAsString("TabFill","");
doc->itemToolPrefs().textTabWidth = attrs.valueAsDouble("TabWidth", 36.0);
+ doc->itemToolPrefs().firstLineOffset = (FirstLineOffsetPolicy) attrs.valueAsInt("FirstLineOffset", (int) FLOPRealGlyphHeight); // Default to FLOPRealGlyphHeight for legacy docs
+ doc->itemToolPrefs().firstLineOffset = qMax(FLOPRealGlyphHeight, qMin(doc->itemToolPrefs().firstLineOffset, FLOPBaselineGrid));
if (attrs.hasAttribute("CPICT"))
doc->itemToolPrefs().imageFillColor = attrs.valueAsString("CPICT");
doc->itemToolPrefs().imageFillColorShade = attrs.valueAsInt("PICTSHADE", 100);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Mon Nov 9 23:58:32 2020
@@ -260,6 +260,7 @@
docu.writeAttribute("TextDistRight", m_Doc->itemToolPrefs().textDistances.right());
docu.writeAttribute("TextDistBottom", m_Doc->itemToolPrefs().textDistances.bottom());
docu.writeAttribute("TextDistTop" , m_Doc->itemToolPrefs().textDistances.top());
+ docu.writeAttribute("FirstLineOffset" , (int) m_Doc->itemToolPrefs().firstLineOffset);
docu.writeAttribute("AUTHOR" , m_Doc->documentInfo().author());
docu.writeAttribute("COMMENTS" , m_Doc->documentInfo().comments());
docu.writeAttribute("KEYWORDS" , m_Doc->documentInfo().keywords());
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Mon Nov 9 23:58:32 2020
@@ -242,8 +242,9 @@
appPrefs.itemToolPrefs.textLineColorShade = 100;
appPrefs.itemToolPrefs.textShade = 100;
appPrefs.itemToolPrefs.textStrokeShade = 100;
- appPrefs.itemToolPrefs.textTabFillChar = "";
+ appPrefs.itemToolPrefs.textTabFillChar.clear();
appPrefs.itemToolPrefs.textTabWidth = 36.0;
+ appPrefs.itemToolPrefs.firstLineOffset = FLOPFontAscent;
// defaults for calligraphic pen
appPrefs.itemToolPrefs.calligraphicPenFillColor = "Black";
appPrefs.itemToolPrefs.calligraphicPenLineColor = "Black";
@@ -1565,17 +1566,18 @@
dcItemTools.setAttribute("TextColorShade", appPrefs.itemToolPrefs.textShade);
dcItemTools.setAttribute("TextStrokeColorShade", appPrefs.itemToolPrefs.textStrokeShade);
dcItemTools.setAttribute("TextColumnCount", appPrefs.itemToolPrefs.textColumns);
- dcItemTools.setAttribute("TextColumnGap",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textColumnGap));
- dcItemTools.setAttribute("TextTabWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textTabWidth));
- dcItemTools.setAttribute("TextDistanceTop",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.top()));
- dcItemTools.setAttribute("TextDistanceBottom",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.bottom()));
- dcItemTools.setAttribute("TextDistanceLeft",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.left()));
- dcItemTools.setAttribute("TextDistanceRight",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.right()));
+ dcItemTools.setAttribute("TextColumnGap", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textColumnGap));
+ dcItemTools.setAttribute("TextTabWidth", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textTabWidth));
+ dcItemTools.setAttribute("TextDistanceTop", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.top()));
+ dcItemTools.setAttribute("TextDistanceBottom", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.bottom()));
+ dcItemTools.setAttribute("TextDistanceLeft", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.left()));
+ dcItemTools.setAttribute("TextDistanceRight", ScCLocale::toQStringC(appPrefs.itemToolPrefs.textDistances.right()));
dcItemTools.setAttribute("TabFillCharacter", appPrefs.itemToolPrefs.textTabFillChar);
+ dcItemTools.setAttribute("FirstLineOffset", (int) appPrefs.itemToolPrefs.firstLineOffset);
dcItemTools.setAttribute("ShapeLineStyle", appPrefs.itemToolPrefs.shapeLineStyle);
dcItemTools.setAttribute("LineStyle", appPrefs.itemToolPrefs.lineStyle);
- dcItemTools.setAttribute("ShapeLineWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeLineWidth));
- dcItemTools.setAttribute("LineWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.lineWidth));
+ dcItemTools.setAttribute("ShapeLineWidth", ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeLineWidth));
+ dcItemTools.setAttribute("LineWidth", ScCLocale::toQStringC(appPrefs.itemToolPrefs.lineWidth));
dcItemTools.setAttribute("ShapeLineColorShade", appPrefs.itemToolPrefs.shapeLineColorShade);
dcItemTools.setAttribute("LineColorShade", appPrefs.itemToolPrefs.lineColorShade);
dcItemTools.setAttribute("ShapeFillColorShade", appPrefs.itemToolPrefs.shapeFillColorShade);
@@ -2188,7 +2190,7 @@
}
- if (dc.tagName()=="ItemTools")
+ if (dc.tagName() == "ItemTools")
{
appPrefs.itemToolPrefs.calligraphicPenFillColor = dc.attribute("CalligraphicPenFillColor", "Black");
appPrefs.itemToolPrefs.calligraphicPenLineColor = dc.attribute("CalligraphicPenLineColor", "Black");
@@ -2217,6 +2219,8 @@
appPrefs.itemToolPrefs.textDistances.setBottom(ScCLocale::toDoubleC(dc.attribute("TextDistanceBottom"), 0.0));
appPrefs.itemToolPrefs.textDistances.setLeft(ScCLocale::toDoubleC(dc.attribute("TextDistanceLeft"), 0.0));
appPrefs.itemToolPrefs.textDistances.setRight(ScCLocale::toDoubleC(dc.attribute("TextDistanceRight"), 0.0));
+ appPrefs.itemToolPrefs.firstLineOffset = (FirstLineOffsetPolicy) dc.attribute("FirstLineOffset", "1").toInt(); // Default to FLOPFontAscent
+ appPrefs.itemToolPrefs.firstLineOffset = qMax(FLOPRealGlyphHeight, qMin(appPrefs.itemToolPrefs.firstLineOffset, FLOPBaselineGrid));
appPrefs.itemToolPrefs.shapeLineStyle = dc.attribute("ShapeLineStyle").toInt();
appPrefs.itemToolPrefs.lineStyle = dc.attribute("LineStyle").toInt();
appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("ShapeLineWidth"), 1.0);
Modified: trunk/Scribus/scribus/prefsstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Mon Nov 9 23:58:32 2020
@@ -24,6 +24,7 @@
#include "pdfoptions.h"
#include "scfonts.h"
#include "scpattern.h"
+#include "sctextstruct.h"
#include "vgradient.h"
struct CheckerPrefs
@@ -226,6 +227,7 @@
QString textTabFillChar; //! Default tab fill character
MarginStruct textDistances; //! Default text to frame distances
double textTabWidth; //! Default tab width
+ FirstLineOffsetPolicy firstLineOffset; //! Default first line offset of text frame
/* ShapeTool */
QString shapeLineColor; //! Default shape line color
QString shapeFillColor; //! Default shape fill color
Modified: trunk/Scribus/scribus/ui/prefs_itemtools.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/ui/prefs_itemtools.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtools.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtools.cpp Mon Nov 9 23:58:32 2020
@@ -135,6 +135,7 @@
bottomTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.bottom() * unitRatio);
leftTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.left() * unitRatio);
rightTextDistanceSpinBox->setValue(prefsData->itemToolPrefs.textDistances.right() * unitRatio);
+ firstLineOffsetComboBox->setCurrentIndex((int) prefsData->itemToolPrefs.firstLineOffset);
//Image Tool
imageFreeScalingRadioButton->setChecked( prefsData->itemToolPrefs.imageScaleType );
@@ -236,6 +237,7 @@
double unitRatio = unitGetRatioFromIndex(docUnitIndex);
prefsData->itemToolPrefs.textColumnGap = textColumnGapSpinBox->value() / unitRatio;
prefsData->itemToolPrefs.textTabWidth = textTabWidthSpinBox->value() / unitRatio;
+ prefsData->itemToolPrefs.firstLineOffset = (FirstLineOffsetPolicy) firstLineOffsetComboBox->currentIndex();
switch (textTabFillCharComboBox->currentIndex())
{
Modified: trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24217&path=/trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui Mon Nov 9 23:58:32 2020
@@ -93,283 +93,37 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <item row="2" column="1">
- <widget class="QLabel" name="label_43">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="5" column="0" colspan="3">
- <widget class="Line" name="line_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="ColumnsAndTextDistances">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Columns & Text Distances</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0" colspan="3">
- <widget class="Line" name="line_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="16" column="0">
- <spacer name="verticalSpacer_10">
+ <item row="11" column="0" colspan="3">
+ <spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="14" column="0" colspan="3">
- <widget class="Line" name="line_3">
+ <item row="19" column="0" colspan="2">
+ <spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="13" column="0">
- <widget class="QLabel" name="label_11">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Preview</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <spacer name="horizontalSpacer_15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="label_42">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="6" column="0" colspan="2">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="2" column="4">
- <widget class="ScrSpinBox" name="rightTextDistanceSpinBox"/>
- </item>
- <item row="0" column="4">
- <widget class="ScrSpinBox" name="textColumnGapSpinBox"/>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="textColumnsSpinBox">
- <property name="minimum">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="topTextDistanceSpinBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="TopLabel">
- <property name="text">
- <string>Top:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="ScrSpinBox" name="leftTextDistanceSpinBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="BottomLabel">
- <property name="text">
- <string>Bottom:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QLabel" name="LefLabel">
- <property name="text">
- <string>Left:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="ColumnsLabel">
- <property name="text">
- <string>Columns:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="ColumnGapLabel">
- <property name="text">
- <string>Column Gap:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ScrSpinBox" name="bottomTextDistanceSpinBox"/>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="RightLabel">
- <property name="text">
- <string>Right:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" rowspan="3">
- <spacer name="horizontalSpacer_9">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="10" column="0" colspan="3">
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="3" column="3">
- <widget class="QLabel" name="textColorStrokeLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ColorCombo" name="textStrokeColorComboBox"/>
- </item>
- <item row="3" column="4">
- <widget class="QSpinBox" name="textStrokeShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="textColorShadingLabel">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="StrokeLabel">
- <property name="text">
- <string>Stroke:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QSpinBox" name="textColorShadingSpinBox">
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="FontLabel">
- <property name="text">
- <string>Font:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="textSizeSpinBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textColorLabel">
- <property name="text">
- <string>Color:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ColorCombo" name="textColorComboBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="SizeLabel">
- <property name="text">
- <string>Size:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="5" rowspan="3">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1" colspan="5">
- <widget class="FontCombo" name="textFontComboBox"/>
- </item>
- </layout>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_19">
@@ -384,7 +138,105 @@
</property>
</widget>
</item>
- <item row="15" column="0" colspan="3">
+ <item row="2" column="1">
+ <widget class="QLabel" name="label_43">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_42">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="18" column="0">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="2" column="4">
+ <widget class="ScrSpinBox" name="rightTextDistanceSpinBox"/>
+ </item>
+ <item row="0" column="4">
+ <widget class="ScrSpinBox" name="textColumnGapSpinBox"/>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="textColumnsSpinBox">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="topTextDistanceSpinBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="TopLabel">
+ <property name="text">
+ <string>Top:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <widget class="ScrSpinBox" name="leftTextDistanceSpinBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="BottomLabel">
+ <property name="text">
+ <string>Bottom:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="LefLabel">
+ <property name="text">
+ <string>Left:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="ColumnsLabel">
+ <property name="text">
+ <string>Columns:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel" name="ColumnGapLabel">
+ <property name="text">
+ <string>Column Gap:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScrSpinBox" name="bottomTextDistanceSpinBox"/>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel" name="RightLabel">
+ <property name="text">
+ <string>Right:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" rowspan="3">
+ <spacer name="horizontalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="22" column="0" colspan="3">
<widget class="QLabel" name="textPreviewWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -406,40 +258,128 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <item row="16" column="0">
+ <widget class="QLabel" name="ColumnsAndTextDistances">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Columns & Text Distances</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0" colspan="3">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="3" column="3">
+ <widget class="QLabel" name="textColorStrokeLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ColorCombo" name="textStrokeColorComboBox"/>
+ </item>
+ <item row="3" column="4">
+ <widget class="QSpinBox" name="textStrokeShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLabel" name="textColorShadingLabel">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="StrokeLabel">
+ <property name="text">
+ <string>Stroke:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4">
+ <widget class="QSpinBox" name="textColorShadingSpinBox">
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="FontLabel">
+ <property name="text">
+ <string>Font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="textSizeSpinBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textColorLabel">
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ColorCombo" name="textColorComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="SizeLabel">
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="5" rowspan="3">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1" colspan="5">
+ <widget class="FontCombo" name="textFontComboBox"/>
+ </item>
+ </layout>
</item>
<item row="7" column="0" colspan="2">
<spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="12" column="0" colspan="3">
- <spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -587,6 +527,150 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="23" column="0">
+ <spacer name="verticalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="20" column="0">
+ <widget class="QLabel" name="label_11">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Preview</string>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>First Line Offset</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0" colspan="3">
+ <widget class="Line" name="line_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="0" colspan="3">
+ <widget class="Line" name="line_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="0" colspan="2">
+ <widget class="Line" name="line_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="21" column="0" colspan="3">
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="18" column="1">
+ <spacer name="horizontalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="15" column="0" colspan="2">
+ <spacer name="verticalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="14" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_8">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Offset:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="firstLineOffsetComboBox">
+ <item>
+ <property name="text">
+ <string>Maximum Ascent</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Font Ascent</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Line Spacing</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Baseline Grid</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_19">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
<height>20</height>
</size>
</property>
@@ -1634,26 +1718,25 @@
</customwidgets>
<tabstops>
<tabstop>tabWidget</tabstop>
- <tabstop>scrollArea</tabstop>
<tabstop>textFrameFillColorComboBox</tabstop>
<tabstop>textFrameFillShadingSpinBox</tabstop>
<tabstop>textFrameLineColorComboBox</tabstop>
<tabstop>textFrameLineShadingSpinBox</tabstop>
<tabstop>textTabFillCharComboBox</tabstop>
<tabstop>textTabWidthSpinBox</tabstop>
+ <tabstop>textFontComboBox</tabstop>
+ <tabstop>textSizeSpinBox</tabstop>
+ <tabstop>textColorComboBox</tabstop>
+ <tabstop>textColorShadingSpinBox</tabstop>
+ <tabstop>textStrokeColorComboBox</tabstop>
+ <tabstop>textStrokeShadingSpinBox</tabstop>
+ <tabstop>firstLineOffsetComboBox</tabstop>
<tabstop>textColumnsSpinBox</tabstop>
<tabstop>textColumnGapSpinBox</tabstop>
<tabstop>topTextDistanceSpinBox</tabstop>
<tabstop>leftTextDistanceSpinBox</tabstop>
<tabstop>bottomTextDistanceSpinBox</tabstop>
<tabstop>rightTextDistanceSpinBox</tabstop>
- <tabstop>textFontComboBox</tabstop>
- <tabstop>textSizeSpinBox</tabstop>
- <tabstop>textColorComboBox</tabstop>
- <tabstop>textColorShadingSpinBox</tabstop>
- <tabstop>textStrokeColorComboBox</tabstop>
- <tabstop>textStrokeShadingSpinBox</tabstop>
- <tabstop>scrollArea_2</tabstop>
<tabstop>imageFrameFillColorComboBox</tabstop>
<tabstop>imageFrameFillShadingSpinBox</tabstop>
<tabstop>imageFrameLineColorComboBox</tabstop>
@@ -1688,6 +1771,8 @@
<tabstop>calPenAngleSpinBox</tabstop>
<tabstop>calPenLineWidthSpinBox</tabstop>
<tabstop>calPenWidthSpinBox</tabstop>
+ <tabstop>scrollArea</tabstop>
+ <tabstop>scrollArea_2</tabstop>
</tabstops>
<resources/>
<connections/>
More information about the scribus-commit
mailing list