0017889: [PATCH] Improve Paragraph Effects UI for Lists and Drop Caps - Mantis Issue Tracker for Scribus

ID	Project	Category	View Status	Date Submitted	Last Update
0017889	Scribus	User Interface	public	2026-07-15 11:43	2026-07-15 11:44

Reporter	qirat	Assigned To
Priority	normal	Severity	minor	Reproducibility	N/A
Status	new	Resolution	open
Platform	Linux	OS	Fedora Workstation	OS Version	44
Product Version	1.7.4.svn

Summary	0017889: [PATCH] Improve Paragraph Effects UI for Lists and Drop Caps
Description	Recently. @Fahad did an amazing work adding a suffix align option, making it possible (and simple) to align suffix in numbered lists. This patch (made using AI) reorganizes and polishes the UI in both the Style Manager and PP. Adjustments: - clearer grouping for numbered-list settings, - improved labels, spacing, alignment, and tooltips - overall consistency in layout Feel free to improve this.
Additional Information	Based on the patch v3 posted in issue 0017243 (r27709)
Tags	No tags attached.
Attached Files	lists-and-dropcaps-ui-rearrange-v1-13.patch (128,675 bytes) Index: resources/iconsets/1_7_0/16/paragraph-list-marker-alignment.svg =================================================================== --- resources/iconsets/1_7_0/16/paragraph-list-marker-alignment.svg (nonexistent) +++ resources/iconsets/1_7_0/16/paragraph-list-marker-alignment.svg (working copy) @@ -0,0 +1,5 @@ +<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><style>@import '../colors.css';</style> +<path d="M5 2H6V14H5V2Z" class="info"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M3 3H8V5H3V3ZM1 7H8V9H1V7ZM3 11H8V13H3V11Z"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M10 3H15V4H10V3ZM10 5H14V6H10V5ZM10 7H15V8H10V7ZM10 9H14V10H10V9ZM10 11H15V12H10V11ZM10 13H14V14H10V13Z"/> +</svg> Index: resources/iconsets/1_7_0/1_7_0.xml =================================================================== --- resources/iconsets/1_7_0/1_7_0.xml (revision 27709) +++ resources/iconsets/1_7_0/1_7_0.xml (working copy) @@ -551,6 +551,7 @@ <icon id="paragraph-indent-right" file="16/paragraph-indent-right.svg" /> <icon id="paragraph-language" file="16/paragraph-language.svg" /> <icon id="paragraph-line-height" file="16/font-lineheight.svg" /> + <icon id="paragraph-list-marker-alignment" file="16/paragraph-list-marker-alignment.svg" /> <icon id="paragraph-list-offset" file="16/paragraph-list-indent-left.svg" /> <icon id="paragraph-optical-margin-left" file="16/paragraph-optical-margin-left.svg" /> <icon id="paragraph-optical-margin-right" file="16/paragraph-optical-margin-right.svg" /> Index: scribus/pageitem_textframe.cpp =================================================================== --- scribus/pageitem_textframe.cpp (revision 27709) +++ scribus/pageitem_textframe.cpp (working copy) @@ -1950,7 +1950,7 @@ } } - if (BulNumMode \|\| DropCmode) + if (style.hasNum()) { double effectWidth = 0.0; for (int j = i; shapedText.haveMoreText(j, glyphClusters); ++j) Index: scribus/ui/propertywidget_pareffect.cpp =================================================================== --- scribus/ui/propertywidget_pareffect.cpp (revision 27709) +++ scribus/ui/propertywidget_pareffect.cpp (working copy) @@ -25,6 +25,11 @@ { setupUi(this); + dropCapsPageLayout->setAlignment(Qt::AlignTop); + bulletedListPageLayout->setAlignment(Qt::AlignTop); + dropCapsBoxLayout->setAlignment(dropCapLinesField, Qt::AlignTop); + bulletBoxLayout->setAlignment(bulletCharacterField, Qt::AlignTop); + languageChange(); dropCapLines->setValue(2); @@ -120,8 +125,9 @@ { IconManager& iconManager = IconManager::instance(); bulletCharTableButton->setIcon(iconManager.loadIcon("tool-insert-table")); - peCharStyleLabel->setPixmap(iconManager.loadPixmap("character-style")); - peOffsetLabel->setPixmap(iconManager.loadPixmap("paragraph-list-offset")); + suffixAlignmentIcon->setPixmap(iconManager.loadPixmap("paragraph-list-marker-alignment")); + peCharStyleIcon->setPixmap(iconManager.loadPixmap("character-style")); + peOffsetIcon->setPixmap(iconManager.loadPixmap("paragraph-list-offset")); peLabel->setPixmap(iconManager.loadPixmap("paragraph-effects-style")); } @@ -177,21 +183,67 @@ void PropertyWidget_ParEffect::setType(int id) { - if (id == -1) // No effect + bool isDropCap = (id == 0); + bool isBulletList = (id == 1); + bool isNumberedList = (id == 2); + bool hasParagraphEffect = isDropCap \|\| isBulletList \|\| isNumberedList; + + if (isDropCap) + { + peCharStyleCombo->setFixedWidth(192); + peCharStyleLabel->setFixedWidth(212); + } + else if (isBulletList) + { + peCharStyleCombo->setFixedWidth(164); + peCharStyleLabel->setFixedWidth(184); + } + else + { + peCharStyleCombo->setFixedWidth(222); + peCharStyleLabel->setFixedWidth(242); + } + + if (hasParagraphEffect) + { + peOffsetLabel->setFixedWidth(110); + peOffset->setFixedWidth(90); + } + + if (!hasParagraphEffect) // No effect { stackedWidget->setVisible(false); - peGroup->setVisible(false); peCombo->setCurrentIndex(0); } else { stackedWidget->setCurrentIndex(id); stackedWidget->setVisible(true); - peGroup->setVisible(true); + + if (isDropCap) + { + dropCapsBoxLayout->insertWidget(3, peOffsetLabel, 0, Qt::AlignTop); + dropCapsCharStyleLayout->insertWidget(0, peCharStyleLabel, 0, Qt::AlignTop); + } + else if (isBulletList) + { + bulletBoxLayout->insertWidget(3, peOffsetLabel, 0, Qt::AlignTop); + bulletCharStyleLayout->insertWidget(0, peCharStyleLabel, 0, Qt::AlignTop); + } + else + { + markerPositionGroupLayout->insertWidget(0, suffixAlignmentLabel, 0, Qt::AlignTop); + markerPositionGroupLayout->insertWidget(1, peOffsetLabel, 0, Qt::AlignTop); + markerGroupLayout->insertWidget(2, peCharStyleLabel, 0, Qt::AlignTop); + suffixAlignmentCombo->setToolTip(tr("Choose how the numbered-list marker is aligned<br/>within the space reserved for the widest marker.")); + } } - bool isNumberedList = (id == 2); + + peGroup->setVisible(isNumberedList); suffixAlignmentLabel->setVisible(isNumberedList); suffixAlignmentCombo->setVisible(isNumberedList); + peOffsetLabel->setVisible(hasParagraphEffect); + peCharStyleLabel->setVisible(hasParagraphEffect); } void PropertyWidget_ParEffect::fillBulletStrEditCombo() Index: scribus/ui/propertywidget_pareffectbase.ui =================================================================== --- scribus/ui/propertywidget_pareffectbase.ui (revision 27709) +++ scribus/ui/propertywidget_pareffectbase.ui (working copy) @@ -74,303 +74,343 @@ </layout> </item> <item> + <layout class="QVBoxLayout" name="paragraphEffectContentLayout"> + <property name="spacing"> + <number>12</number> + </property> + <item> <widget class="StackedContainer" name="stackedWidget"> <property name="currentIndex"> <number>2</number> </property> <widget class="QWidget" name="pageDropCaps"> - <layout class="QGridLayout" name="gridLayout"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>4</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>4</number> - </property> - <property name="horizontalSpacing"> - <number>4</number> - </property> - <property name="verticalSpacing"> - <number>8</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="dropCapLinesLabel"> - <property name="toolTip"> - <string>Number of lines used by the drop cap</string> - </property> - <property name="text"> - <string>Lines:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="dropCapLines"> - <property name="toolTip"> - <string>Drop Cap Lines</string> - </property> - <property name="minimum"> - <number>2</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> + <layout class="QVBoxLayout" name="dropCapsPageLayout"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>8</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>4</number></property> + <item> + <layout class="QHBoxLayout" name="dropCapsBoxLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="dropCapsIconInsetSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>20</height></size></property> + </spacer> + </item> + <item> + <widget class="QWidget" name="dropCapLinesField"> + <property name="sizePolicy"><sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>70</width><height>0</height></size></property> + <property name="maximumSize"><size><width>70</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="dropCapLinesFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QSpinBox" name="dropCapLines"> + <property name="minimumSize"><size><width>70</width><height>0</height></size></property> + <property name="maximumSize"><size><width>70</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the number of lines occupied by the drop cap.</string></property> + <property name="minimum"><number>2</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="dropCapLinesLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Lines</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>dropCapLines</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="dropCapsControlGapSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>12</width><height>20</height></size></property> + </spacer> + </item> + <item> + <spacer name="dropCapsRowSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="dropCapsCharStyleLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="dropCapsCharStyleSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> </item> </layout> </widget> <widget class="QWidget" name="pageBulletedList"> - <layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,0,1"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>4</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>4</number> - </property> - <property name="horizontalSpacing"> - <number>4</number> - </property> - <property name="verticalSpacing"> - <number>8</number> - </property> - <item row="0" column="2"> - <widget class="QPushButton" name="bulletCharTableButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enhanced Character Table to choose bullet characters</string> - </property> - <property name="text"> - <string>Char Table</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="bulletCharLabel"> - <property name="text"> - <string>Bullet Char(s):</string> - </property> - <property name="buddy"> - <cstring>bulletStrEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QComboBox" name="bulletStrEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="3"> - <spacer name="horizontalSpacer_7"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> + <layout class="QVBoxLayout" name="bulletedListPageLayout"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>8</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>4</number></property> + <item> + <layout class="QHBoxLayout" name="bulletBoxLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="bulletIconInsetSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>20</height></size></property> + </spacer> + </item> + <item> + <widget class="QWidget" name="bulletCharacterField"> + <property name="sizePolicy"><sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>164</width><height>0</height></size></property> + <property name="maximumSize"><size><width>164</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="bulletCharacterFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="bulletCharacterControlLayout"> + <property name="spacing"><number>4</number></property> + <item> + <widget class="QComboBox" name="bulletStrEdit"> + <property name="sizePolicy"><sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"><horstretch>1</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>50</width><height>0</height></size></property> + <property name="maximumSize"><size><width>50</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter or choose one or more characters to use as the bullet marker.</string></property> + <property name="editable"><bool>true</bool></property> + </widget> + </item> + <item> + <widget class="QPushButton" name="bulletCharTableButton"> + <property name="sizePolicy"><sizepolicy hsizetype="Fixed" vsizetype="Fixed"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <property name="toolTip"><string>Open the character table to choose a bullet character.</string></property> + <property name="text"><string>Char Table</string></property> + <property name="checkable"><bool>true</bool></property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="bulletCharLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Bullet Character</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>bulletStrEdit</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="bulletControlGapSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>12</width><height>20</height></size></property> + </spacer> + </item> + <item> + <spacer name="bulletRowSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="bulletCharStyleLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="bulletCharStyleSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> </item> </layout> </widget> <widget class="QWidget" name="pageNumberedList"> - <layout class="QGridLayout" name="gridLayout_5" columnstretch="0,0,0,0,0,0"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>4</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>4</number> - </property> - <property name="horizontalSpacing"> - <number>4</number> - </property> - <property name="verticalSpacing"> - <number>8</number> - </property> - <item row="2" column="5"> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="numLevelSpin"> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="numComboLabel"> - <property name="text"> - <string>Set:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QLabel" name="numStartLabel"> - <property name="text"> - <string>Start:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="numPrefixLabel"> - <property name="text"> - <string>Prefix:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - <property name="buddy"> - <cstring>numPrefix</cstring> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="QLabel" name="numSuffixLabel"> - <property name="text"> - <string>Suffix:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - <property name="buddy"> - <cstring>numSuffix</cstring> - </property> - </widget> - </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Policy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>16</width> - <height>20</height> - </size> - </property> + <layout class="QVBoxLayout" name="numberedListPageLayout"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>4</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>4</number></property> + <item> + <widget class="QGroupBox" name="numberFormatGroupBox"> + <property name="title"><string>Numbering</string></property> + <layout class="QVBoxLayout" name="numberFormatGroupLayout"> + <property name="spacing"><number>8</number></property> + <item> + <layout class="QHBoxLayout" name="numberDefinitionLayout"> + <property name="spacing"><number>8</number></property> + <item> + <widget class="QWidget" name="numSetField"> + <layout class="QVBoxLayout" name="numSetFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QComboBox" name="numComboBox"> + <property name="minimumSize"><size><width>150</width><height>0</height></size></property> + <property name="maximumSize"><size><width>150</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the numbering set used by the selected paragraphs.</string></property> + <property name="currentIndex"><number>-1</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numComboLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Numbering Set</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numComboBox</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberDefinitionSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="numberSequenceLayout"> + <property name="spacing"><number>8</number></property> + <item> + <widget class="QWidget" name="numFormatField"> + <layout class="QVBoxLayout" name="numFormatFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="NumFormatCombo" name="numFormatCombo"> + <property name="minimumSize"><size><width>150</width><height>0</height></size></property> + <property name="maximumSize"><size><width>150</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the numbering style, such as 1, A, or i.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numFormatLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Number Style</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numFormatCombo</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberSequenceSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="numberLevelStartLayout"> + <property name="spacing"><number>8</number></property> + <item> + <widget class="QWidget" name="numLevelField"> + <layout class="QVBoxLayout" name="numLevelFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QSpinBox" name="numLevelSpin"> + <property name="minimumSize"><size><width>64</width><height>0</height></size></property> + <property name="maximumSize"><size><width>80</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the selected paragraphs' level<br/>within a multilevel numbering set.</string></property> + <property name="minimum"><number>1</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numLevelLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Level</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numLevelSpin</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numStartField"> + <layout class="QVBoxLayout" name="numStartFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QSpinBox" name="numStart"> + <property name="minimumSize"><size><width>64</width><height>0</height></size></property> + <property name="maximumSize"><size><width>80</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the number at which this level begins or restarts.</string></property> + <property name="minimum"><number>1</number></property> + <property name="maximum"><number>999</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numStartLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Start at</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numStart</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberLevelStartSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberedPageSpacer"> + <property name="orientation"><enum>Qt::Orientation::Vertical</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> </spacer> </item> - <item row="1" column="0"> - <widget class="QLabel" name="numFormatLabel"> - <property name="text"> - <string>Style:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - <property name="buddy"> - <cstring>numFormatCombo</cstring> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="numLevelLabel"> - <property name="text"> - <string>Level:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - <property name="buddy"> - <cstring>numLevelSpin</cstring> - </property> - </widget> - </item> - <item row="2" column="4"> - <widget class="QSpinBox" name="numStart"> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>999</number> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="numPrefix"/> - </item> - <item row="3" column="4"> - <widget class="QLineEdit" name="numSuffix"/> - </item> - <item row="1" column="1" colspan="4"> - <widget class="NumFormatCombo" name="numFormatCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="0" column="1" colspan="4"> - <widget class="QComboBox" name="numComboBox"> - <property name="currentIndex"> - <number>-1</number> - </property> - </widget> - </item> </layout> </widget> </widget> @@ -378,152 +418,279 @@ <item> <widget class="QWidget" name="peGroup" native="true"> <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="spacing"> - <number>8</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <property name="spacing"> - <number>20</number> - </property> - <item> - <widget class="FormWidget" name="peOffsetLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="label" stdset="0"> - <string/> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <widget class="QGroupBox" name="markerGroupBox"> + <property name="title"><string>Marker</string></property> + <layout class="QVBoxLayout" name="markerGroupLayout"> + <property name="spacing"><number>8</number></property> + <item> + <widget class="StackedContainer" name="markerContentStack"> + <property name="currentIndex"><number>2</number></property> + <widget class="QWidget" name="pageDropCapMarker"/> + <widget class="QWidget" name="pageBulletMarker"/> + <widget class="QWidget" name="pageNumberedMarker"> + <layout class="QHBoxLayout" name="numberedMarkerContentLayout"> + <property name="spacing"><number>12</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QWidget" name="numPrefixField"> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>120</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="numPrefixLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>20</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QLineEdit" name="numPrefix"> + <property name="minimumSize"><size><width>100</width><height>0</height></size></property> + <property name="maximumSize"><size><width>100</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter one or more characters to place before the list number.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numPrefixLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Prefix</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numPrefix</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numSuffixField"> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="numSuffixLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>20</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QLineEdit" name="numSuffix"> + <property name="minimumSize"><size><width>90</width><height>0</height></size></property> + <property name="maximumSize"><size><width>90</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter one or more characters to place after the list number.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numSuffixLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Suffix</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numSuffix</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberedMarkerContentSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="markerPositionGroupLayout"> + <property name="spacing"><number>12</number></property> <item> - <widget class="ScrSpinBox" name="peOffset"> - <property name="toolTip"> - <string>Paragraph Effects characters offset</string> - </property> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> + <widget class="QWidget" name="suffixAlignmentLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> </property> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>120</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="suffixAlignmentFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="suffixAlignmentControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="suffixAlignmentIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="QComboBox" name="suffixAlignmentCombo"> + <property name="minimumSize"><size><width>100</width><height>0</height></size></property> + <property name="maximumSize"><size><width>100</width><height>16777215</height></size></property> + <property name="toolTip"><string>Choose how the numbered-list marker is aligned<br/>within the space reserved for the widest marker.</string></property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="suffixAlignmentLabelLayout"> + <property name="spacing"><number>0</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <spacer name="suffixAlignmentLabelInset"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> + </item> + <item> + <widget class="QLabel" name="suffixAlignmentTextLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Marker Alignment</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>suffixAlignmentCombo</cstring></property> + </widget> + </item> + </layout> + </item> + </layout> </widget> </item> - </layout> - </widget> - </item> -<item> - <widget class="QLabel" name="suffixAlignmentLabel"> - <property name="text"> - <string>Suffix Align:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="suffixAlignmentCombo"> - <property name="toolTip"> - <string>Alignment of suffix characters in numbered lists</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>4</number> - </property> - <item> - <widget class="FormWidget" name="peCharStyleLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="label" stdset="0"> - <string/> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> <item> - <widget class="CharStyleComboBox" name="peCharStyleCombo"> - <property name="toolTip"> - <string>Choose Character Style or leave blank to use default Paragraph Style</string> + <widget class="QWidget" name="peOffsetLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> </property> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="peOffsetFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="peOffsetControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="peOffsetIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="ScrSpinBox" name="peOffset"> + <property name="minimumSize"><size><width>90</width><height>0</height></size></property> + <property name="maximumSize"><size><width>90</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the horizontal distance between the marker and the paragraph text.</string></property> + <property name="minimum"><double>-3000.000000000000000</double></property> + <property name="maximum"><double>3000.000000000000000</double></property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="peOffsetLabelLayout"> + <property name="spacing"><number>0</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <spacer name="peOffsetLabelInset"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> + </item> + <item> + <widget class="QLabel" name="peOffsetTextLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Marker-Text Gap</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>peOffset</cstring></property> + </widget> + </item> + </layout> + </item> + </layout> </widget> </item> + <item> + <spacer name="markerPositionSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> </layout> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + </item> + <item> + <widget class="QWidget" name="peCharStyleLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> + </property> + <property name="maximumSize"><size><width>250</width><height>16777215</height></size></property> + <layout class="QHBoxLayout" name="peCharStyleControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="peCharStyleIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="CharStyleComboBox" name="peCharStyleCombo"> + <property name="minimumSize"><size><width>150</width><height>0</height></size></property> + <property name="maximumSize"><size><width>220</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the character style applied to the bullet, numbered-list marker, or drop cap.<br/>Leave blank to use the paragraph's character formatting.</string></property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="markerPaneSpacer"> + <property name="orientation"><enum>Qt::Orientation::Vertical</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> </item> </layout> </widget> </item> + </layout> + </item> </layout> </widget> <customwidgets> @@ -557,19 +724,30 @@ </customwidgets> <tabstops> <tabstop>peCombo</tabstop> + <tabstop>dropCapLines</tabstop> + <tabstop>bulletStrEdit</tabstop> + <tabstop>bulletCharTableButton</tabstop> <tabstop>numComboBox</tabstop> <tabstop>numFormatCombo</tabstop> <tabstop>numLevelSpin</tabstop> <tabstop>numStart</tabstop> <tabstop>numPrefix</tabstop> <tabstop>numSuffix</tabstop> -<tabstop>peOffset</tabstop> <tabstop>suffixAlignmentCombo</tabstop> + <tabstop>peOffset</tabstop> <tabstop>peCharStyleCombo</tabstop> - <tabstop>dropCapLines</tabstop> - <tabstop>bulletStrEdit</tabstop> - <tabstop>bulletCharTableButton</tabstop> </tabstops> <resources/> - <connections/> + <connections> + <connection> + <sender>stackedWidget</sender> + <signal>currentChanged(int)</signal> + <receiver>markerContentStack</receiver> + <slot>setCurrentIndex(int)</slot> + <hints> + <hint type="sourcelabel"><x>0</x><y>0</y></hint> + <hint type="destinationlabel"><x>0</x><y>0</y></hint> + </hints> + </connection> + </connections> </ui> Index: scribus/ui/smpstylewidget.cpp =================================================================== --- scribus/ui/smpstylewidget.cpp (revision 27709) +++ scribus/ui/smpstylewidget.cpp (working copy) @@ -31,6 +31,15 @@ { setupUi(this); + dropCapsPageLayout->setAlignment(Qt::AlignTop); + bulletedListPageLayout->setAlignment(Qt::AlignTop); + dropCapsBoxLayout->setAlignment(dropCapLinesField, Qt::AlignTop); + bulletBoxLayout->setAlignment(bulletCharacterField, Qt::AlignTop); + + const int numberingGroupWidth = qMax(numberFormatGroupBox->sizeHint().width(), numberRestartGroupBox->sizeHint().width()); + numberFormatGroupBox->setFixedWidth(numberingGroupWidth); + numberRestartGroupBox->setFixedWidth(numberingGroupWidth); + //Not used yet // optMarginCheckLeftProtruding->setVisible(false); @@ -118,8 +127,9 @@ consecutiveHyphenLabel->setPixmap(iconManager.loadPixmap("hyphen-consecutive")); bulletCharTableButton->setIcon(iconManager.loadIcon("character-table")); - distFromTextLabel->setPixmap(iconManager.loadPixmap("paragraph-list-offset")); - parEffectCharStyleComboLabel->setPixmap(iconManager.loadPixmap("character-style")); + suffixAlignmentIcon->setPixmap(iconManager.loadPixmap("paragraph-list-marker-alignment")); + distFromTextIcon->setPixmap(iconManager.loadPixmap("paragraph-list-offset")); + parEffectCharStyleIcon->setPixmap(iconManager.loadPixmap("character-style")); peLabel->setPixmap(iconManager.loadPixmap("paragraph-effects-style")); parentParEffectsButton->setIcon(iconManager.loadIcon("reset-style-changes")); backgroundColor->setPixmap(iconManager.loadPixmap("color-fill")); @@ -1031,20 +1041,56 @@ peCombo->setCurrentIndex(index); int id = peCombo->currentIndex(); + bool isDropCap = (id == 1); + bool isBulletList = (id == 2); + bool isNumberedList = (id == 3); + bool hasParagraphEffect = isDropCap \|\| isBulletList \|\| isNumberedList; + + if (isDropCap) + { + parEffectCharStyleCombo->setFixedWidth(192); + parEffectCharStyleComboLabel->setFixedWidth(212); + } + else if (isBulletList) + { + parEffectCharStyleCombo->setFixedWidth(164); + parEffectCharStyleComboLabel->setFixedWidth(184); + } + else + { + parEffectCharStyleCombo->setFixedWidth(222); + parEffectCharStyleComboLabel->setFixedWidth(242); + } - if (id == 1 \|\| id == 2 \|\| id == 3) + if (hasParagraphEffect) + { + distFromTextLabel->setFixedWidth(110); + parEffectOffset->setFixedWidth(90); + } + + if (hasParagraphEffect) { stackedWidget->setCurrentIndex(id - 1); stackedWidget->setVisible(true); - peGroup->setVisible(true); - if (id == 2) // Bullet List + if (isDropCap) { + dropCapsBoxLayout->insertWidget(3, distFromTextLabel, 0, Qt::AlignTop); + dropCapsCharStyleLayout->insertWidget(0, parEffectCharStyleComboLabel, 0, Qt::AlignTop); + } + else if (isBulletList) + { + bulletBoxLayout->insertWidget(3, distFromTextLabel, 0, Qt::AlignTop); + bulletCharStyleLayout->insertWidget(0, parEffectCharStyleComboLabel, 0, Qt::AlignTop); if (bulletStrEdit->currentText().isEmpty()) bulletStrEdit->setEditText(bulletStrEdit->itemText(0)); } - else if (id == 3) // Numbered List + else { + markerPositionGroupLayout->insertWidget(0, suffixAlignmentLabel, 0, Qt::AlignTop); + markerPositionGroupLayout->insertWidget(1, distFromTextLabel, 0, Qt::AlignTop); + markerGroupLayout->insertWidget(2, parEffectCharStyleComboLabel, 0, Qt::AlignTop); + suffixAlignmentCombo->setToolTip(tr("Choose how the numbered-list marker is aligned<br/>within the space reserved for the widest marker.")); if (numComboBox->currentIndex() < 0) numComboBox->setCurrentIndex(0); } @@ -1052,12 +1098,14 @@ else // No effect { stackedWidget->setVisible(false); - peGroup->setVisible(false); peCombo->setCurrentIndex(0); } - bool isNumberedList = (id == 3); + + peGroup->setVisible(isNumberedList); suffixAlignmentLabel->setVisible(isNumberedList); suffixAlignmentCombo->setVisible(isNumberedList); + distFromTextLabel->setVisible(hasParagraphEffect); + parEffectCharStyleComboLabel->setVisible(hasParagraphEffect); } void SMPStyleWidget::showDropCap(const QList<ParagraphStyle*> &pstyles, const QList<CharStyle> &cstyles, int unitIndex) Index: scribus/ui/smpstylewidget.ui =================================================================== --- scribus/ui/smpstylewidget.ui (revision 27709) +++ scribus/ui/smpstylewidget.ui (working copy) @@ -1073,63 +1073,85 @@ </layout> </item> <item> + <layout class="QHBoxLayout" name="paragraphEffectContentLayout" stretch="0,1"> + <property name="spacing"> + <number>8</number> + </property> + <item> <widget class="StackedContainer" name="stackedWidget"> <property name="currentIndex"> <number>2</number> </property> <widget class="QWidget" name="pageDropCaps"> - <layout class="QVBoxLayout" name="verticalLayout_11"> - <property name="spacing"> - <number>4</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <layout class="QVBoxLayout" name="dropCapsPageLayout"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>4</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> <item> <layout class="QHBoxLayout" name="dropCapsBoxLayout"> + <property name="spacing"><number>0</number></property> <item> - <widget class="QLabel" name="dropCapsLineLabel"> - <property name="text"> - <string>Lines:</string> - </property> - <property name="buddy"> - <cstring>dropCapLines</cstring> - </property> - </widget> + <spacer name="dropCapsIconInsetSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>20</height></size></property> + </spacer> </item> <item> - <widget class="SMSpinBox" name="dropCapLines"> - <property name="toolTip"> - <string>Drop Cap Lines</string> - </property> - <property name="minimum"> - <number>2</number> - </property> - <property name="maximum"> - <number>20</number> - </property> + <widget class="QWidget" name="dropCapLinesField" native="true"> + <property name="sizePolicy"><sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>70</width><height>0</height></size></property> + <property name="maximumSize"><size><width>70</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="dropCapLinesFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMSpinBox" name="dropCapLines"> + <property name="minimumSize"><size><width>70</width><height>0</height></size></property> + <property name="maximumSize"><size><width>70</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the number of lines occupied by the drop cap.</string></property> + <property name="minimum"><number>2</number></property> + <property name="maximum"><number>20</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="dropCapsLineLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Lines</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>dropCapLines</cstring></property> + </widget> + </item> + </layout> </widget> </item> <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> + <spacer name="dropCapsControlGapSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>12</width><height>20</height></size></property> + </spacer> + </item> + <item> + <spacer name="dropCapsRowSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="dropCapsCharStyleLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="dropCapsCharStyleSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> </spacer> </item> </layout> @@ -1137,86 +1159,91 @@ </layout> </widget> <widget class="QWidget" name="pageBullet"> - <layout class="QVBoxLayout" name="verticalLayout_9"> - <property name="spacing"> - <number>4</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <layout class="QVBoxLayout" name="bulletedListPageLayout"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>4</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,1"> - <property name="spacing"> - <number>4</number> - </property> + <layout class="QHBoxLayout" name="bulletBoxLayout"> + <property name="spacing"><number>0</number></property> <item> - <widget class="QLabel" name="bulletCharLabel"> - <property name="text"> - <string>Bullet Char(s):</string> - </property> - </widget> + <spacer name="bulletIconInsetSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>20</height></size></property> + </spacer> </item> <item> - <widget class="SMScComboBox" name="bulletStrEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>50</width> - <height>0</height> - </size> - </property> - <property name="statusTip"> - <string>Character for bulleted list</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> + <widget class="QWidget" name="bulletCharacterField" native="true"> + <property name="sizePolicy"><sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>164</width><height>0</height></size></property> + <property name="maximumSize"><size><width>164</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="bulletCharacterFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="bulletCharacterControlLayout"> + <property name="spacing"><number>4</number></property> + <item> + <widget class="SMScComboBox" name="bulletStrEdit"> + <property name="sizePolicy"><sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"><horstretch>1</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>50</width><height>0</height></size></property> + <property name="maximumSize"><size><width>50</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter or choose one or more characters to use as the bullet marker.</string></property> + <property name="statusTip"><string>Character for bulleted list</string></property> + <property name="editable"><bool>true</bool></property> + </widget> + </item> + <item> + <widget class="QPushButton" name="bulletCharTableButton"> + <property name="sizePolicy"><sizepolicy hsizetype="Fixed" vsizetype="Fixed"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy></property> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <property name="toolTip"><string>Open the character table to choose a bullet character.</string></property> + <property name="text"><string>Char Table</string></property> + <property name="checkable"><bool>true</bool></property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="bulletCharLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Bullet Character</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>bulletStrEdit</cstring></property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="QPushButton" name="bulletCharTableButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enhanced Character Table for inserting custom characters as bullets</string> - </property> - <property name="text"> - <string>Char Table</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> + <spacer name="bulletControlGapSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>12</width><height>20</height></size></property> + </spacer> </item> <item> - <spacer name="spacer_2"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> + <spacer name="bulletRowSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="bulletCharStyleLayout"> + <property name="spacing"><number>0</number></property> + <item> + <spacer name="bulletCharStyleSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> </spacer> </item> </layout> @@ -1226,7 +1253,7 @@ <widget class="QWidget" name="pageNumbered"> <layout class="QVBoxLayout" name="verticalLayout_10"> <property name="spacing"> - <number>4</number> + <number>8</number> </property> <property name="leftMargin"> <number>0</number> @@ -1240,254 +1267,269 @@ <property name="bottomMargin"> <number>0</number> </property> - <item> - <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,0,0,0,1"> - <property name="horizontalSpacing"> - <number>4</number> - </property> - <property name="verticalSpacing"> - <number>8</number> + <item alignment="Qt::AlignmentFlag::AlignLeft"> + <widget class="QGroupBox" name="numberFormatGroupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <item row="1" column="0"> - <widget class="QLabel" name="numFormatLabel"> - <property name="text"> - <string>Style:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - <property name="buddy"> - <cstring>numFormatCombo</cstring> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="numLevelLabel"> - <property name="text"> - <string>Level:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QLabel" name="numStartLabel"> - <property name="text"> - <string>Start:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="numComboLabel"> - <property name="text"> - <string>Set:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="4" column="6"> - <widget class="SMCheckBox" name="numRestartOtherBox"> - <property name="text"> - <string>Restart after other format</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="numPrefix"> - <property name="toolTip"> - <string>List number prefix</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="numRestartLabel"> - <property name="text"> - <string>Restart:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="1" colspan="4"> - <widget class="SMScComboBox" name="numComboBox"> - <property name="currentIndex"> - <number>-1</number> - </property> - <property name="minimumContentsLength"> - <number>10</number> - </property> - </widget> - </item> - <item row="5" column="6"> - <widget class="SMCheckBox" name="numRestartHigherBox"> - <property name="text"> - <string>Restart after higher level</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer_15"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Policy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>16</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="4"> - <widget class="QLineEdit" name="numSuffix"> - <property name="toolTip"> - <string>List number suffix</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="numPrefixLabel"> - <property name="text"> - <string>Prefix:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="5"> - <spacer name="horizontalSpacer_17"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Policy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>16</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="1"> - <widget class="SMSpinBox" name="numLevelSpin"> - <property name="toolTip"> - <string>Hierarchy level of list numbering</string> - </property> - </widget> - </item> - <item row="4" column="1" colspan="4"> - <widget class="SMScComboBox" name="numRestartCombo"/> - </item> - <item row="4" column="7"> - <spacer name="horizontalSpacer_9"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1" colspan="4"> - <widget class="SMNumFormatCombo" name="numFormatCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>List numbering style</string> - </property> - </widget> - </item> - <item row="2" column="4"> - <widget class="SMSpinBox" name="numStartSpin"> - <property name="toolTip"> - <string>Starting number of the list count</string> - </property> - <property name="maximum"> - <number>99999</number> - </property> - <property name="value"> - <number>1</number> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="QLabel" name="numSuffixLabel"> - <property name="text"> - <string>Suffix:</string> - </property> - <property name="alignment"> - <set>Qt::AlignmentFlag::AlignRight\|Qt::AlignmentFlag::AlignTrailing\|Qt::AlignmentFlag::AlignVCenter</set> - </property> - </widget> - </item> - <item row="0" column="6"> - <widget class="FormWidget" name="formWidget_2" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="label" stdset="0"> - <string>New Set:</string> - </property> - <property name="useSmallFont" stdset="0"> - <bool>false</bool> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_25"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <property name="title"><string>Numbering</string></property> + <layout class="QVBoxLayout" name="numberFormatGroupLayout"> + <property name="spacing"><number>8</number></property> + <item> + <layout class="QHBoxLayout" name="numberDefinitionLayout"> + <property name="spacing"><number>12</number></property> + <item> + <widget class="QWidget" name="numSetField" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="numSetFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMScComboBox" name="numComboBox"> + <property name="minimumSize"><size><width>160</width><height>0</height></size></property> + <property name="maximumSize"><size><width>160</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the numbering set used by this paragraph style.</string></property> + <property name="currentIndex"><number>-1</number></property> + <property name="minimumContentsLength"><number>10</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numComboLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Numbering Set</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numComboBox</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numNewSetField" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="numNewSetFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QLineEdit" name="numNewLineEdit"> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>160</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter a name to create a new numbering set.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numNewLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>New Set Name</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numNewLineEdit</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> <item> - <widget class="QLineEdit" name="numNewLineEdit"/> + <spacer name="numberDefinitionSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> </item> </layout> - </widget> - </item> - <item row="3" column="6"> - <widget class="SMScComboBox" name="suffixAlignmentCombo"> - <property name="toolTip"> - <string>Alignment of suffix characters in numbered lists</string> - </property> - </widget> - </item> - <item row="3" column="5"> - <widget class="QLabel" name="suffixAlignmentLabel"> - <property name="text"> - <string>Suffix Align:</string> - </property> - </widget> - </item> - </layout> + </item> + <item> + <layout class="QHBoxLayout" name="numberSequenceLayout"> + <property name="spacing"><number>12</number></property> + <item> + <widget class="QWidget" name="numFormatField" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QVBoxLayout" name="numFormatFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMNumFormatCombo" name="numFormatCombo"> + <property name="minimumSize"><size><width>160</width><height>0</height></size></property> + <property name="maximumSize"><size><width>160</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the numbering style, such as 1, A, or i.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numFormatLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Number Style</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numFormatCombo</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numLevelField" native="true"> + <layout class="QVBoxLayout" name="numLevelFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMSpinBox" name="numLevelSpin"> + <property name="minimumSize"><size><width>64</width><height>0</height></size></property> + <property name="maximumSize"><size><width>80</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set this paragraph style's level<br/>within a multilevel numbering set.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numLevelLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Level</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numLevelSpin</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numStartField" native="true"> + <layout class="QVBoxLayout" name="numStartFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMSpinBox" name="numStartSpin"> + <property name="minimumSize"><size><width>64</width><height>0</height></size></property> + <property name="maximumSize"><size><width>80</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the number at which this level begins or restarts.</string></property> + <property name="maximum"><number>99999</number></property> + <property name="value"><number>1</number></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numStartLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Start at</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numStartSpin</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberSequenceSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item alignment="Qt::AlignmentFlag::AlignLeft"> + <widget class="QGroupBox" name="numberRestartGroupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"><string>Continuation && Restart</string></property> + <layout class="QHBoxLayout" name="numberRestartGroupLayout"> + <property name="spacing"><number>12</number></property> + <item> + <widget class="QWidget" name="numRestartScopeField" native="true"> + <property name="maximumSize"><size><width>160</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="numRestartScopeLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMScComboBox" name="numRestartCombo"> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>150</width><height>16777215</height></size></property> + <property name="toolTip"><string>Choose whether numbering continues across the document<br/>or restarts for each text story.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numRestartLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Continue Across</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numRestartCombo</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numRestartOptions" native="true"> + <layout class="QVBoxLayout" name="numRestartOptionsLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="SMCheckBox" name="numRestartOtherBox"> + <property name="toolTip"><string>Restart this level after an unnumbered paragraph<br/>or a paragraph using a different numbering set.</string></property> + <property name="text"><string>Restart after other format</string></property> + </widget> + </item> + <item> + <widget class="SMCheckBox" name="numRestartHigherBox"> + <property name="toolTip"><string>Restart this level after an item at a higher list level.</string></property> + <property name="text"><string>Restart after a higher level</string></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberRestartSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberedPageSpacer"> + <property name="orientation"><enum>Qt::Orientation::Vertical</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> </item> </layout> </widget> @@ -1495,139 +1537,280 @@ </item> <item> <widget class="QWidget" name="peGroup" native="true"> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>8</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout_13"> + <property name="spacing"><number>8</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_12"> - <property name="spacing"> - <number>16</number> - </property> - <item> - <widget class="FormWidget" name="distFromTextLabel" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="label" stdset="0"> - <string>Distance</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_22"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <widget class="QGroupBox" name="markerGroupBox"> + <property name="title"><string>Marker</string></property> + <layout class="QVBoxLayout" name="markerGroupLayout"> + <property name="spacing"><number>8</number></property> + <item> + <widget class="StackedContainer" name="markerContentStack"> + <property name="currentIndex"><number>2</number></property> + <widget class="QWidget" name="pageDropCapMarker"/> + <widget class="QWidget" name="pageBulletMarker"/> + <widget class="QWidget" name="pageNumberedMarker"> + <layout class="QHBoxLayout" name="numberedMarkerContentLayout"> + <property name="spacing"><number>12</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QWidget" name="numPrefixField" native="true"> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>120</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="numPrefixLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>20</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QLineEdit" name="numPrefix"> + <property name="minimumSize"><size><width>100</width><height>0</height></size></property> + <property name="maximumSize"><size><width>100</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter one or more characters to place before the list number.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numPrefixLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Prefix</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numPrefix</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QWidget" name="numSuffixField" native="true"> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="numSuffixLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>20</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <widget class="QLineEdit" name="numSuffix"> + <property name="minimumSize"><size><width>90</width><height>0</height></size></property> + <property name="maximumSize"><size><width>90</width><height>16777215</height></size></property> + <property name="toolTip"><string>Enter one or more characters to place after the list number.</string></property> + </widget> + </item> + <item> + <widget class="QLabel" name="numSuffixLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Suffix</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>numSuffix</cstring></property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="numberedMarkerContentSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="markerPositionGroupLayout"> + <property name="spacing"><number>12</number></property> <item> - <widget class="SMScrSpinBox" name="parEffectOffset"> - <property name="toolTip"> - <string>Paragraph Effects characters offset</string> - </property> - <property name="minimum"> - <double>-3000.000000000000000</double> - </property> - <property name="maximum"> - <double>3000.000000000000000</double> + <widget class="QWidget" name="suffixAlignmentLabel" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> </property> + <property name="minimumSize"><size><width>120</width><height>0</height></size></property> + <property name="maximumSize"><size><width>120</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="suffixAlignmentFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="suffixAlignmentControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="suffixAlignmentIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="SMScComboBox" name="suffixAlignmentCombo"> + <property name="minimumSize"><size><width>100</width><height>0</height></size></property> + <property name="maximumSize"><size><width>100</width><height>16777215</height></size></property> + <property name="toolTip"><string>Choose how the numbered-list marker is aligned<br/>within the space reserved for the widest marker.</string></property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="suffixAlignmentLabelLayout"> + <property name="spacing"><number>0</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <spacer name="suffixAlignmentLabelInset"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> + </item> + <item> + <widget class="QLabel" name="suffixAlignmentTextLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Marker Alignment</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>suffixAlignmentCombo</cstring></property> + </widget> + </item> + </layout> + </item> + </layout> </widget> </item> - </layout> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_14"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_15"> - <property name="spacing"> - <number>16</number> - </property> - <item> - <widget class="FormWidget" name="parEffectCharStyleComboLabel" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="label" stdset="0"> - <string>Style</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_23"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> <item> - <widget class="SMScComboBox" name="parEffectCharStyleCombo"> - <property name="toolTip"> - <string>Choose Character Style or leave blank to use default Paragraph Style</string> + <widget class="QWidget" name="distFromTextLabel" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> </property> + <property name="minimumSize"><size><width>110</width><height>0</height></size></property> + <property name="maximumSize"><size><width>110</width><height>16777215</height></size></property> + <layout class="QVBoxLayout" name="parEffectOffsetFieldLayout"> + <property name="spacing"><number>3</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <layout class="QHBoxLayout" name="parEffectOffsetControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="distFromTextIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="SMScrSpinBox" name="parEffectOffset"> + <property name="minimumSize"><size><width>90</width><height>0</height></size></property> + <property name="maximumSize"><size><width>90</width><height>16777215</height></size></property> + <property name="toolTip"><string>Set the horizontal distance between the marker and the paragraph text.</string></property> + <property name="minimum"><double>-3000.000000000000000</double></property> + <property name="maximum"><double>3000.000000000000000</double></property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="parEffectOffsetLabelLayout"> + <property name="spacing"><number>0</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item> + <spacer name="parEffectOffsetLabelInset"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeType"><enum>QSizePolicy::Policy::Fixed</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> + </item> + <item> + <widget class="QLabel" name="distFromTextTextLabel"> + <property name="font"><font><pointsize>8</pointsize></font></property> + <property name="text"><string>Marker-Text Gap</string></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + <property name="buddy"><cstring>parEffectOffset</cstring></property> + </widget> + </item> + </layout> + </item> + </layout> </widget> </item> + <item> + <spacer name="markerPositionSpacer"> + <property name="orientation"><enum>Qt::Orientation::Horizontal</enum></property> + <property name="sizeHint" stdset="0"><size><width>0</width><height>20</height></size></property> + </spacer> + </item> </layout> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_7"> - <property name="orientation"> - <enum>Qt::Orientation::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + </item> + <item> + <widget class="QWidget" name="parEffectCharStyleComboLabel" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"><horstretch>0</horstretch><verstretch>0</verstretch></sizepolicy> + </property> + <property name="maximumSize"><size><width>260</width><height>16777215</height></size></property> + <layout class="QHBoxLayout" name="parEffectCharStyleControlLayout"> + <property name="spacing"><number>4</number></property> + <property name="leftMargin"><number>0</number></property> + <property name="topMargin"><number>0</number></property> + <property name="rightMargin"><number>0</number></property> + <property name="bottomMargin"><number>0</number></property> + <item alignment="Qt::AlignmentFlag::AlignVCenter"> + <widget class="QLabel" name="parEffectCharStyleIcon"> + <property name="minimumSize"><size><width>16</width><height>16</height></size></property> + <property name="maximumSize"><size><width>16</width><height>16</height></size></property> + <property name="text"><string/></property> + <property name="alignment"><set>Qt::AlignmentFlag::AlignCenter</set></property> + </widget> + </item> + <item> + <widget class="SMScComboBox" name="parEffectCharStyleCombo"> + <property name="minimumSize"><size><width>160</width><height>0</height></size></property> + <property name="maximumSize"><size><width>230</width><height>16777215</height></size></property> + <property name="toolTip"><string>Select the character style applied to the bullet, numbered-list marker, or drop cap.<br/>Leave blank to use the paragraph style's character formatting.</string></property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="markerPaneSpacer"> + <property name="orientation"><enum>Qt::Orientation::Vertical</enum></property> + <property name="sizeHint" stdset="0"><size><width>20</width><height>0</height></size></property> + </spacer> </item> </layout> </widget> </item> + </layout> + </item> <item> <spacer name="verticalSpacer_2"> <property name="orientation"> @@ -1762,21 +1945,33 @@ <tabstop>peCombo</tabstop> <tabstop>parentParEffectsButton</tabstop> <tabstop>dropCapLines</tabstop> - <tabstop>parEffectOffset</tabstop> - <tabstop>parEffectCharStyleCombo</tabstop> + <tabstop>bulletStrEdit</tabstop> + <tabstop>bulletCharTableButton</tabstop> + <tabstop>numComboBox</tabstop> + <tabstop>numNewLineEdit</tabstop> + <tabstop>numFormatCombo</tabstop> + <tabstop>numLevelSpin</tabstop> + <tabstop>numStartSpin</tabstop> <tabstop>numPrefix</tabstop> <tabstop>numSuffix</tabstop> + <tabstop>suffixAlignmentCombo</tabstop> + <tabstop>parEffectOffset</tabstop> + <tabstop>parEffectCharStyleCombo</tabstop> <tabstop>numRestartCombo</tabstop> <tabstop>numRestartOtherBox</tabstop> <tabstop>numRestartHigherBox</tabstop> - <tabstop>numNewLineEdit</tabstop> - <tabstop>numStartSpin</tabstop> - <tabstop>numFormatCombo</tabstop> - <tabstop>numLevelSpin</tabstop> - <tabstop>bulletStrEdit</tabstop> - <tabstop>bulletCharTableButton</tabstop> - <tabstop>numComboBox</tabstop> </tabstops> <resources/> - <connections/> + <connections> + <connection> + <sender>stackedWidget</sender> + <signal>currentChanged(int)</signal> + <receiver>markerContentStack</receiver> + <slot>setCurrentIndex(int)</slot> + <hints> + <hint type="sourcelabel"><x>0</x><y>0</y></hint> + <hint type="destinationlabel"><x>0</x><y>0</y></hint> + </hints> + </connection> + </connections> </ui> lists-and-dropcaps-ui-rearrange-v1-13.patch (128,675 bytes)

Patch	Yes

qirat 2026-07-15 11:44 reporter ~0054039	Here are the screenshots for three pages it deals with. para-effect-bulleted-list-ui.png (186,962 bytes) para-effect-bulleted-list-ui.png (186,962 bytes) para-effect-drop-caps-ui.png (180,101 bytes) para-effect-drop-caps-ui.png (180,101 bytes) para-effect-num-list-ui.png (247,871 bytes) para-effect-num-list-ui.png (247,871 bytes)

Date Modified	Username	Field	Change
2026-07-15 11:43	qirat	New Issue
2026-07-15 11:43	qirat	File Added: lists-and-dropcaps-ui-rearrange-v1-13.patch
2026-07-15 11:44	qirat	Note Added: 0054039
2026-07-15 11:44	qirat	File Added: para-effect-bulleted-list-ui.png
2026-07-15 11:44	qirat	File Added: para-effect-drop-caps-ui.png
2026-07-15 11:44	qirat	File Added: para-effect-num-list-ui.png