Author: craig
Date: Sun Mar 14 17:06:29 2021
New Revision: 24561
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24561
Log:
#16507: Update layout for Style Manager: widow and orphans, character
layout (bubu)
Added:
trunk/Scribus/resources/iconsets/1_5_1/22/orphan.png (with props)
trunk/Scribus/resources/iconsets/1_5_1/22/widow.png (with props)
trunk/Scribus/resources/iconsets/1_5_1_dark/22/orphan.png (with props)
trunk/Scribus/resources/iconsets/1_5_1_dark/22/widow.png (with props)
Modified:
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/cupsoptions.cpp
trunk/Scribus/scribus/ui/dasheditor.cpp
trunk/Scribus/scribus/ui/editor.cpp
trunk/Scribus/scribus/ui/modetoolbar.cpp
trunk/Scribus/scribus/ui/newtemp.cpp
trunk/Scribus/scribus/ui/pdfexportdialog.cpp
trunk/Scribus/scribus/ui/smcstylewidget.ui
trunk/Scribus/scribus/ui/smpstylewidget.cpp
trunk/Scribus/scribus/ui/smpstylewidget.ui
trunk/Scribus/scribus/ui/storyeditor.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Mar 14 17:06:29 2021
@@ -1338,7 +1338,7 @@
QWidget* zoomWidget = new QWidget( statusBar() );
QHBoxLayout* zoomLayout = new QHBoxLayout( zoomWidget );
zoomLayout->setContentsMargins(0, 0, 0, 0);
- zoomLayout->setSpacing(1);
+ zoomLayout->setSpacing(3);
zoomSpinBox = new ScrSpinBox( 1, 32000, zoomWidget, 6 );
zoomSpinBox->setFont(fo);
Modified: trunk/Scribus/scribus/ui/cupsoptions.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/cupsoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cupsoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/cupsoptions.cpp Sun Mar 14 17:06:29 2021
@@ -58,8 +58,8 @@
prefs = PrefsManager::instance().prefsFile->getContext("cups_options");
CupsOptionsLayout = new QVBoxLayout( this );
- CupsOptionsLayout->setSpacing( 5 );
- CupsOptionsLayout->setContentsMargins(10, 10, 10, 10);
+ CupsOptionsLayout->setSpacing(6);
+ CupsOptionsLayout->setContentsMargins(9, 9, 9, 9);
Table = new QTableWidget(0, 2, this);
Table->setSortingEnabled(false);
Table->setSelectionMode(QAbstractItemView::NoSelection);
@@ -211,7 +211,7 @@
CupsOptionsLayout->addWidget( Table );
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding,
QSizePolicy::Minimum );
Layout2->addItem( spacer );
Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp (original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp Sun Mar 14 17:06:29 2021
@@ -303,8 +303,8 @@
setFrameShape( QFrame::Panel );
setLineWidth( 1 );
QGridLayout *gridLayout = new QGridLayout(this);
- gridLayout->setSpacing(2);
- gridLayout->setContentsMargins(2, 2, 2, 2);
+ gridLayout->setSpacing(3);
+ gridLayout->setContentsMargins(6, 6, 6, 6);
Preview = new DashPreview(this);
gridLayout->addWidget(Preview, 0, 0, 1, 2);
Modified: trunk/Scribus/scribus/ui/editor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/editor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/editor.cpp (original)
+++ trunk/Scribus/scribus/ui/editor.cpp Sun Mar 14 17:06:29 2021
@@ -96,7 +96,7 @@
EditorLayout->addWidget( EditTex );
#ifdef Q_OS_MAC
Layout1_2 = new QHBoxLayout;
- Layout1_2->setSpacing( 5 );
+ Layout1_2->setSpacing(6);
Layout1_2->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacerr = new QSpacerItem( 2, 2, QSizePolicy::Expanding,
QSizePolicy::Minimum );
Layout1_2->addItem( spacerr );
Modified: trunk/Scribus/scribus/ui/modetoolbar.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/modetoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/modetoolbar.cpp Sun Mar 14 17:06:29 2021
@@ -73,8 +73,8 @@
propWidget = new QWidget();
group1Layout = new QGridLayout( propWidget );
- group1Layout->setSpacing( 3 );
- group1Layout->setContentsMargins(2, 2, 2, 2);
+ group1Layout->setSpacing(3);
+ group1Layout->setContentsMargins(3, 3, 3, 3);
group1Layout->setAlignment( Qt::AlignTop );
Angle = new ScrSpinBox( -180, 180, propWidget, 6 );
Angle->setValue( 0 );
Modified: trunk/Scribus/scribus/ui/newtemp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp (original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp Sun Mar 14 17:06:29 2021
@@ -28,10 +28,10 @@
setWindowTitle(titel);
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
- QueryLayout->setSpacing( 5 );
- QueryLayout->setContentsMargins(5, 5, 5, 5);
+ QueryLayout->setSpacing(6);
+ QueryLayout->setContentsMargins(9, 9, 9, 9);
Layout2 = new QHBoxLayout;
- Layout2->setSpacing( 5 );
+ Layout2->setSpacing(6);
Layout2->setContentsMargins(0, 0, 0, 0);
Answer = new QLineEdit( this );
Frage = new QLabel( text, this );
@@ -46,7 +46,7 @@
if (doc->pagePositioning() != singlePage)
{
Layout3 = new QHBoxLayout;
- Layout3->setSpacing( 5 );
+ Layout3->setSpacing(6);
Layout3->setContentsMargins(0, 0, 0, 0);
Links = new QComboBox( this );
QStringList::Iterator pNames;
@@ -67,7 +67,7 @@
QueryLayout->addLayout( Layout3 );
}
Layout1 = new QHBoxLayout;
- Layout1->setSpacing( 5 );
+ Layout1->setSpacing(6);
Layout1->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding,
QSizePolicy::Minimum );
Layout1->addItem( spacer );
Modified: trunk/Scribus/scribus/ui/pdfexportdialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfexportdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/pdfexportdialog.cpp Sun Mar 14 17:06:29 2021
@@ -62,13 +62,13 @@
setWindowTitle( tr( "Save as PDF" ) );
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
PDFExportLayout = new QVBoxLayout( this );
- PDFExportLayout->setSpacing( 5 );
- PDFExportLayout->setContentsMargins(10, 10, 10, 10);
+ PDFExportLayout->setSpacing(6);
+ PDFExportLayout->setContentsMargins(9, 9, 9, 9);
Name = new QGroupBox( this );
Name->setTitle( tr( "O&utput to File:" ) );
NameLayout = new QGridLayout( Name );
- NameLayout->setSpacing( 5 );
- NameLayout->setContentsMargins(10, 10, 10, 10);
+ NameLayout->setSpacing(6);
+ NameLayout->setContentsMargins(9, 9, 9, 9);
NameLayout->setAlignment( Qt::AlignTop );
fileNameLineEdit = new QLineEdit( Name );
fileNameLineEdit->setMinimumSize( QSize( 268, 22 ) );
@@ -113,7 +113,7 @@
Options = new TabPDFOptions( this, pdfOptions, AllFonts, PDFXProfiles,
DocFonts, currView->m_doc );
PDFExportLayout->addWidget( Options );
Layout7 = new QHBoxLayout;
- Layout7->setSpacing( 5 );
+ Layout7->setSpacing(6);
Layout7->setContentsMargins(0, 0, 0, 0);
QSpacerItem* spacer_2 = new QSpacerItem( 2, 2, QSizePolicy::Expanding,
QSizePolicy::Minimum );
Layout7->addItem( spacer_2 );
Modified: trunk/Scribus/scribus/ui/smcstylewidget.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/smcstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.ui Sun Mar 14 17:06:29 2021
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>430</width>
- <height>601</height>
+ <width>531</width>
+ <height>492</height>
</rect>
</property>
<property name="sizePolicy">
@@ -99,6 +99,12 @@
<widget class="QLabel" name="fontSizeLabel_">
<property name="minimumSize">
<size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
<width>22</width>
<height>22</height>
</size>
@@ -128,6 +134,12 @@
<widget class="QLabel" name="trackingLabel_">
<property name="minimumSize">
<size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
<width>22</width>
<height>22</height>
</size>
@@ -159,6 +171,12 @@
<item>
<widget class="QLabel" name="widthSpaceLabel">
<property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -333,7 +351,7 @@
<widget class="QLabel" name="baselineOffsetLabel_">
<property name="minimumSize">
<size>
- <width>10</width>
+ <width>20</width>
<height>0</height>
</size>
</property>
@@ -423,342 +441,355 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="hyphenGroup">
- <property name="title">
- <string>Hyphenation</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Hyphenation Character:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMLineEdit" name="hyphenCharLineEdit">
- <property name="maximumSize">
- <size>
- <width>60</width>
- <height>16777215</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="smColorGroup">
+ <property name="title">
+ <string>Colors</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="_2">
+ <item>
+ <widget class="QLabel" name="FillIcon">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>fillColor_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMColorCombo" name="fillColor_">
+ <property name="toolTip">
+ <string>Fill Color</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="fillShadeLabel">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>fillShade_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMShadeButton" name="fillShade_">
+ <property name="toolTip">
+ <string>Fill Shade</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="_10">
+ <item>
+ <widget class="QLabel" name="StrokeIcon">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>strokeColor_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMColorCombo" name="strokeColor_">
+ <property name="toolTip">
+ <string>Stroke Color</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="strokeShadeLabel">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>strokeShade_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMShadeButton" name="strokeShade_">
+ <property name="toolTip">
+ <string>Stroke Shade</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="_11">
+ <item>
+ <widget class="QLabel" name="backIcon">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>fillColor_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMColorCombo" name="backColor_">
+ <property name="toolTip">
+ <string>Background Color</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="backShadeLabel">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="buddy">
+ <cstring>fillShade_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMShadeButton" name="backShade_">
+ <property name="toolTip">
+ <string>Background Shade</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="hyphenGroup">
+ <property name="title">
+ <string>Hyphenation</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Hyphenation Character:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMLineEdit" name="hyphenCharLineEdit">
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::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">
+ <item>
+ <widget class="QLabel" name="smallestWordLabel">
+ <property name="text">
+ <string>Smallest Word:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="SMSpinBox" name="smallestWordSpinBox">
+ <property name="suffix">
+ <string> characters</string>
+ </property>
+ <property name="minimum">
+ <number>3</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="smallestWordLabel">
- <property name="text">
- <string>Smallest Word:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMSpinBox" name="smallestWordSpinBox">
- <property name="minimum">
- <number>3</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="smallestWordLabel2">
- <property name="text">
- <string>Characters</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="smColorGroup">
- <property name="title">
- <string>Colors</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="_2">
- <item>
- <widget class="QLabel" name="FillIcon">
- <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>fillColor_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMColorCombo" name="fillColor_">
- <property name="toolTip">
- <string>Fill Color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="fillShadeLabel">
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>fillShade_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMShadeButton" name="fillShade_">
- <property name="toolTip">
- <string>Fill Shade</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
</spacer>
</item>
</layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_10">
- <item>
- <widget class="QLabel" name="StrokeIcon">
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>strokeColor_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMColorCombo" name="strokeColor_">
- <property name="toolTip">
- <string>Stroke Color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="strokeShadeLabel">
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>strokeShade_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMShadeButton" name="strokeShade_">
- <property name="toolTip">
- <string>Stroke Shade</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_11">
- <item>
- <widget class="QLabel" name="backIcon">
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>fillColor_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMColorCombo" name="backColor_">
- <property name="toolTip">
- <string>Background Color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="backShadeLabel">
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="buddy">
- <cstring>fillShade_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="SMShadeButton" name="backShade_">
- <property name="toolTip">
- <string>Background Shade</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</item>
<item>
- <spacer>
+ <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>300</width>
+ <width>20</width>
<height>0</height>
</size>
</property>
Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Sun Mar 14 17:06:29 2021
@@ -103,6 +103,8 @@
lineSpacingLabel->setPixmap(iconManager.loadPixmap("linespacing2.png"));
spaceAboveLabel->setPixmap(iconManager.loadPixmap("above.png") );
spaceBelowLabel->setPixmap(iconManager.loadPixmap("below.png") );
+ keepLabelStart->setPixmap(iconManager.loadPixmap("22/orphan.png") );
+ keepLabelEnd->setPixmap(iconManager.loadPixmap("22/widow.png") );
backIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
backShadeLabel->setPixmap(iconManager.loadPixmap("shade.png"));
Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Sun Mar 14 17:06:29 2021
@@ -4,13 +4,13 @@
<widget class="QWidget" name="SMPStyleWidget">
<property name="geometry">
<rect>
- <x>0</x>
- <y>0</y>
- <width>695</width>
- <height>596</height>
- </rect>
- </property>
- <layout class="QVBoxLayout">
+ <x>0</x>
+ <y>0</y>
+ <width>695</width>
+ <height>613</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -248,25 +248,25 @@
</size>
</property>
</spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
<item row="0" column="1">
<widget class="QGroupBox" name="textFlowBox">
<property name="sizePolicy">
@@ -283,11 +283,20 @@
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLabel" name="keepLabelStart">
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
<property name="toolTip">
<string>Ensure that first lines of a paragraph won't end up
separated from the rest (known as widow/orphan control)</string>
- </property>
- <property name="text">
- <string>Don't separate first</string>
</property>
</widget>
</item>
@@ -317,14 +326,22 @@
</property>
</spacer>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<widget class="QLabel" name="keepLabelEnd">
- <property name="text">
- <string>Don't separate last</string>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Ensure that last lines of a paragraph won't end up
separated from the rest (known as widow/orphan control)</string>
</property>
</widget>
</item>
@@ -376,28 +393,41 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="opticalMarginsGroupBox">
<property name="title">
- <string>Optical Margins</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0" colspan="2">
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="2" column="0">
- <widget class="SMRadioButton" name="optMarginRadioLeft">
- <property name="text">
- <string>Left Only</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="SMRadioButton" name="optMarginRadioBoth">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <string>Optical Margins</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="2" column="0">
+ <widget class="SMRadioButton" name="optMarginRadioLeft">
+ <property name="text">
+ <string>Left Only</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="SMRadioButton" name="optMarginRadioBoth">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -420,39 +450,39 @@
</property>
<property name="checked">
<bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="SMRadioButton" name="optMarginRadioRight">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="SMRadioButton" name="optMarginRadioRight">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Right Only</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="optMarginDefaultButton">
- <property name="text">
- <string>Reset to Default</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="optMarginParentButton">
- <property name="text">
- <string>Use Parent Value</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="optMarginDefaultButton">
+ <property name="text">
+ <string>Reset to Default</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="optMarginParentButton">
+ <property name="text">
+ <string>Use Parent Value</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
<item row="1" column="1">
@@ -1337,8 +1367,6 @@
<tabstop>lineSpacing</tabstop>
<tabstop>spaceAbove</tabstop>
<tabstop>spaceBelow</tabstop>
- <tabstop>keepLinesStart</tabstop>
- <tabstop>keepLinesEnd</tabstop>
<tabstop>keepTogether</tabstop>
<tabstop>keepWithNext</tabstop>
<tabstop>optMarginRadioNone</tabstop>
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24561&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Mar 14 17:06:29 2021
@@ -1864,8 +1864,8 @@
setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
StoryEd2Layout = new QHBoxLayout;
- StoryEd2Layout->setSpacing( 5 );
- StoryEd2Layout->setContentsMargins(5, 5, 5, 5);
+ StoryEd2Layout->setSpacing(6);
+ StoryEd2Layout->setContentsMargins(9, 9, 9, 9);
/* Setting up Toolbars */
FileTools = new QToolBar(this);
@@ -1947,7 +1947,7 @@
ButtonGroup1->setFrameShadow( QFrame::Plain );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1 );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
- ButtonGroup1Layout->setSpacing( 2 );
+ ButtonGroup1Layout->setSpacing(3);
ButtonGroup1Layout->setContentsMargins(0, 0, 0, 0);
WordCT1 = new QLabel(ButtonGroup1);
ButtonGroup1Layout->addWidget( WordCT1, 0, 0, 1, 3 );
@@ -1965,7 +1965,7 @@
ButtonGroup2->setFrameShadow( QFrame::Plain );
ButtonGroup2Layout = new QGridLayout( ButtonGroup2 );
ButtonGroup2Layout->setAlignment( Qt::AlignTop );
- ButtonGroup2Layout->setSpacing( 2 );
+ ButtonGroup2Layout->setSpacing(3);
ButtonGroup2Layout->setContentsMargins(0, 0, 0, 0);
WordCT3 = new QLabel(ButtonGroup2);
ButtonGroup2Layout->addWidget( WordCT3, 0, 0, 1, 5 );
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
