View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0016494 | Scribus | User Interface | public | 2021-02-27 00:39 | 2021-03-21 14:51 |
| Reporter | bubu | Assigned To | jghali | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Product Version | 1.5.7.svn | ||||
| Fixed in Version | 1.5.7.svn | ||||
| Summary | 0016494: Unify margins and spacing for properties palette, set 3 | ||||
| Description | I propose last set of trivial margin/spacing adjustment for properties palettes: Text properties. Comments: - I removed unnecessary black frame borders too. Please see the attached screenshot. Please review the patch. Thanks a lot. | ||||
| Tags | No tags attached. | ||||
| Patch | No | ||||
| child of | 0013906 | acknowledged | Metabug: UI enhancement proposals (1.5.x.svn) |
|
|
0001-Unify-margins-and-spacing-for-properties-palette-set-3.patch (25,439 bytes)
From ade925539899a3028b5a45a40ce6cb14953bb874 Mon Sep 17 00:00:00 2001
Message-Id: <ade925539899a3028b5a45a40ce6cb14953bb874.1614385964.git.bubu@ujevangelizacio.hu>
From: =?UTF-8?q?Gyuris=20Gell=C3=A9rt?= <bubu@ujevangelizacio.hu>
Date: Sat, 27 Feb 2021 01:32:30 +0100
Subject: [PATCH] Unify margins and spacing for properties palette, set 3
---
scribus/ui/propertiespalette_textbase.ui | 31 +++++--
scribus/ui/propertywidget_advanced.cpp | 3 -
scribus/ui/propertywidget_distance.cpp | 3 -
scribus/ui/propertywidget_distancebase.ui | 20 ++---
scribus/ui/propertywidget_flop.cpp | 4 +-
scribus/ui/propertywidget_flopbase.ui | 23 +++--
scribus/ui/propertywidget_fontfeatures.cpp | 2 -
scribus/ui/propertywidget_fontfeaturesbase.ui | 38 ++++++--
scribus/ui/propertywidget_hyphenation.cpp | 2 -
scribus/ui/propertywidget_hyphenationbase.ui | 29 +++---
scribus/ui/propertywidget_optmargins.cpp | 2 -
scribus/ui/propertywidget_optmarginsbase.ui | 23 ++---
scribus/ui/propertywidget_orphans.cpp | 2 -
scribus/ui/propertywidget_orphansbase.ui | 19 +++-
scribus/ui/propertywidget_pareffect.cpp | 3 +-
scribus/ui/propertywidget_pareffectbase.ui | 89 ++++++++++++++++++-
scribus/ui/propertywidget_pathtext.cpp | 4 +-
scribus/ui/propertywidget_pathtextbase.ui | 25 +++---
scribus/ui/propertywidget_textcolor.cpp | 3 -
scribus/ui/propertywidget_textcolorbase.ui | 18 ----
20 files changed, 230 insertions(+), 113 deletions(-)
diff --git a/scribus/ui/propertiespalette_textbase.ui b/scribus/ui/propertiespalette_textbase.ui
index d5d7331d2..b38e3f796 100644
--- a/scribus/ui/propertiespalette_textbase.ui
+++ b/scribus/ui/propertiespalette_textbase.ui
@@ -15,25 +15,28 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>2</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>2</number>
+ <number>3</number>
</property>
<item>
<widget class="FontComboH" name="fonts" native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="fontSizeLabel">
<property name="sizePolicy">
@@ -80,6 +83,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="lineSpacingLabel">
<property name="sizePolicy">
@@ -129,6 +135,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item alignment="Qt::AlignLeft">
<widget class="DirectionSelect" name="textDirection" native="true"/>
</item>
@@ -161,7 +170,11 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_6"/>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ </layout>
</item>
<item>
<widget class="Line" name="line">
@@ -172,6 +185,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="paraStyleLabel">
<property name="sizePolicy">
@@ -225,6 +241,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="charStyleLabel">
<property name="sizePolicy">
diff --git a/scribus/ui/propertywidget_advanced.cpp b/scribus/ui/propertywidget_advanced.cpp
index 33e3ec7a1..d7a568fd2 100644
--- a/scribus/ui/propertywidget_advanced.cpp
+++ b/scribus/ui/propertywidget_advanced.cpp
@@ -20,9 +20,6 @@ PropertyWidget_Advanced::PropertyWidget_Advanced(QWidget* parent) : QFrame(paren
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
-
layout()->setAlignment(Qt::AlignLeft);
textBase->setValue(0);
diff --git a/scribus/ui/propertywidget_distance.cpp b/scribus/ui/propertywidget_distance.cpp
index 6ed02667f..391eefcec 100644
--- a/scribus/ui/propertywidget_distance.cpp
+++ b/scribus/ui/propertywidget_distance.cpp
@@ -24,9 +24,6 @@ PropertyWidget_Distance::PropertyWidget_Distance(QWidget* parent) : QFrame(paren
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
-
layout()->setAlignment(Qt::AlignTop);
columnsLabel->setBuddy(columns);
diff --git a/scribus/ui/propertywidget_distancebase.ui b/scribus/ui/propertywidget_distancebase.ui
index 0d42d926b..f321b64e0 100644
--- a/scribus/ui/propertywidget_distancebase.ui
+++ b/scribus/ui/propertywidget_distancebase.ui
@@ -6,34 +6,28 @@
<rect>
<x>0</x>
<y>0</y>
- <width>187</width>
- <height>223</height>
+ <width>223</width>
+ <height>232</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="verticalAlignLabel">
diff --git a/scribus/ui/propertywidget_flop.cpp b/scribus/ui/propertywidget_flop.cpp
index 6b5052e35..4df0b4d18 100644
--- a/scribus/ui/propertywidget_flop.cpp
+++ b/scribus/ui/propertywidget_flop.cpp
@@ -14,10 +14,8 @@ PropertyWidget_Flop::PropertyWidget_Flop(QWidget* parent) : QFrame(parent)
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
layout()->setAlignment(Qt::AlignTop);
-
+
flopRealHeight->setChecked(true);
flopGroup->setId(flopRealHeight, RealHeightID);
diff --git a/scribus/ui/propertywidget_flopbase.ui b/scribus/ui/propertywidget_flopbase.ui
index 589a39b8b..ccae504a2 100644
--- a/scribus/ui/propertywidget_flopbase.ui
+++ b/scribus/ui/propertywidget_flopbase.ui
@@ -7,19 +7,28 @@
<x>0</x>
<y>0</y>
<width>218</width>
- <height>126</height>
+ <height>107</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QRadioButton" name="flopRealHeight">
<property name="toolTip">
diff --git a/scribus/ui/propertywidget_fontfeatures.cpp b/scribus/ui/propertywidget_fontfeatures.cpp
index 4199499dd..e560c1ea0 100644
--- a/scribus/ui/propertywidget_fontfeatures.cpp
+++ b/scribus/ui/propertywidget_fontfeatures.cpp
@@ -20,8 +20,6 @@ PropertyWidget_FontFeatures::PropertyWidget_FontFeatures(QWidget* parent) : QFra
m_ScMW = nullptr;
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
layout()->setAlignment(Qt::AlignTop);
initWidgets();
diff --git a/scribus/ui/propertywidget_fontfeaturesbase.ui b/scribus/ui/propertywidget_fontfeaturesbase.ui
index 3ed357c25..8932b7817 100644
--- a/scribus/ui/propertywidget_fontfeaturesbase.ui
+++ b/scribus/ui/propertywidget_fontfeaturesbase.ui
@@ -7,19 +7,28 @@
<x>0</x>
<y>0</y>
<width>509</width>
- <height>1151</height>
+ <height>837</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QCheckBox" name="CommonCheck">
<property name="toolTip">
@@ -457,6 +466,21 @@
<string>Stylistic sets</string>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QCheckBox" name="StyleSet01">
<property name="text">
diff --git a/scribus/ui/propertywidget_hyphenation.cpp b/scribus/ui/propertywidget_hyphenation.cpp
index 73c29bed3..b5c5e0a5e 100644
--- a/scribus/ui/propertywidget_hyphenation.cpp
+++ b/scribus/ui/propertywidget_hyphenation.cpp
@@ -24,8 +24,6 @@ PropertyWidget_Hyphenation::PropertyWidget_Hyphenation(QWidget* parent)
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
hyphenCharLineEdit->setMaxLength(1);
layout()->setAlignment( Qt::AlignTop );
languageChange();
diff --git a/scribus/ui/propertywidget_hyphenationbase.ui b/scribus/ui/propertywidget_hyphenationbase.ui
index 792d3804c..a3f48dd64 100644
--- a/scribus/ui/propertywidget_hyphenationbase.ui
+++ b/scribus/ui/propertywidget_hyphenationbase.ui
@@ -6,37 +6,34 @@
<rect>
<x>0</x>
<y>0</y>
- <width>304</width>
- <height>152</height>
+ <width>305</width>
+ <height>95</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<property name="leftMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="topMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="rightMargin">
- <number>5</number>
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>5</number>
+ <number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label">
<property name="text">
@@ -78,6 +75,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
@@ -97,6 +97,9 @@ A value of 0 means unlimited hyphenations.</string>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
diff --git a/scribus/ui/propertywidget_optmargins.cpp b/scribus/ui/propertywidget_optmargins.cpp
index d6e1d1caf..91f20ce03 100644
--- a/scribus/ui/propertywidget_optmargins.cpp
+++ b/scribus/ui/propertywidget_optmargins.cpp
@@ -22,8 +22,6 @@ PropertyWidget_OptMargins::PropertyWidget_OptMargins(QWidget* parent) : QFrame(p
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
layout()->setAlignment(Qt::AlignTop);
languageChange();
diff --git a/scribus/ui/propertywidget_optmarginsbase.ui b/scribus/ui/propertywidget_optmarginsbase.ui
index 188d46537..78273ca9f 100644
--- a/scribus/ui/propertywidget_optmarginsbase.ui
+++ b/scribus/ui/propertywidget_optmarginsbase.ui
@@ -7,24 +7,27 @@
<x>0</x>
<y>0</y>
<width>210</width>
- <height>122</height>
+ <height>137</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
- <number>2</number>
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
</property>
- <property name="margin">
- <number>5</number>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<item>
<widget class="QRadioButton" name="optMarginRadioNone">
diff --git a/scribus/ui/propertywidget_orphans.cpp b/scribus/ui/propertywidget_orphans.cpp
index 2aa84e393..89b6eb2fe 100644
--- a/scribus/ui/propertywidget_orphans.cpp
+++ b/scribus/ui/propertywidget_orphans.cpp
@@ -14,8 +14,6 @@ PropertyWidget_Orphans::PropertyWidget_Orphans(QWidget* parent) : QFrame(parent)
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
layout()->setAlignment(Qt::AlignTop);
keepLinesStart->setDecimals(0);
keepLinesEnd->setDecimals(0);
diff --git a/scribus/ui/propertywidget_orphansbase.ui b/scribus/ui/propertywidget_orphansbase.ui
index ef6202713..0d8d42867 100644
--- a/scribus/ui/propertywidget_orphansbase.ui
+++ b/scribus/ui/propertywidget_orphansbase.ui
@@ -6,14 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
- <width>211</width>
- <height>130</height>
+ <width>258</width>
+ <height>113</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="keepLabelStart">
<property name="toolTip">
diff --git a/scribus/ui/propertywidget_pareffect.cpp b/scribus/ui/propertywidget_pareffect.cpp
index 71b64bf2a..459b3267d 100644
--- a/scribus/ui/propertywidget_pareffect.cpp
+++ b/scribus/ui/propertywidget_pareffect.cpp
@@ -25,8 +25,7 @@ for which a new license (GPL+exception) is in place.
PropertyWidget_ParEffect::PropertyWidget_ParEffect(QWidget *parent) : QFrame(parent)
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
+
layout()->setAlignment(Qt::AlignTop);
languageChange();
diff --git a/scribus/ui/propertywidget_pareffectbase.ui b/scribus/ui/propertywidget_pareffectbase.ui
index 3b8ce0418..eda1ef0ce 100644
--- a/scribus/ui/propertywidget_pareffectbase.ui
+++ b/scribus/ui/propertywidget_pareffectbase.ui
@@ -7,13 +7,28 @@
<x>0</x>
<y>0</y>
<width>354</width>
- <height>442</height>
+ <height>390</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
<item>
<widget class="QComboBox" name="peCombo"/>
</item>
@@ -23,6 +38,21 @@
<string>Drop Caps</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
<item>
<widget class="QLabel" name="dropCapLinesLabel">
<property name="toolTip">
@@ -62,6 +92,21 @@
<string>Bulleted List</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="0" column="1">
<widget class="QComboBox" name="bulletStrEdit">
<property name="sizePolicy">
@@ -119,8 +164,26 @@
<string>Numbered List</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="numLevelLabel">
<property name="text">
@@ -172,6 +235,9 @@
</item>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="numComboLabel">
<property name="text">
@@ -223,6 +289,9 @@
</item>
<item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QLabel" name="numPrefixLabel">
<property name="text">
@@ -273,6 +342,21 @@
<string>Effect Parameters</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item row="6" column="0">
<widget class="QLabel" name="peCharStyleLabel">
<property name="text">
@@ -292,6 +376,9 @@
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="spacing">
+ <number>3</number>
+ </property>
<item>
<widget class="QCheckBox" name="peIndent">
<property name="text">
diff --git a/scribus/ui/propertywidget_pathtext.cpp b/scribus/ui/propertywidget_pathtext.cpp
index 932ceb183..7cb3caf80 100644
--- a/scribus/ui/propertywidget_pathtext.cpp
+++ b/scribus/ui/propertywidget_pathtext.cpp
@@ -19,10 +19,8 @@ PropertyWidget_PathText::PropertyWidget_PathText(QWidget* parent) : QFrame(paren
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
layout()->setAlignment(Qt::AlignTop);
-
+
startOffset->setValues(0, 30000, 2, 0);
startOffset->setSingleStep(10);
diff --git a/scribus/ui/propertywidget_pathtextbase.ui b/scribus/ui/propertywidget_pathtextbase.ui
index 462e440af..0f20ee657 100644
--- a/scribus/ui/propertywidget_pathtextbase.ui
+++ b/scribus/ui/propertywidget_pathtextbase.ui
@@ -6,25 +6,28 @@
<rect>
<x>0</x>
<y>0</y>
- <width>218</width>
- <height>118</height>
+ <width>243</width>
+ <height>143</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QGridLayout" name="gridLayout">
- <property name="margin">
- <number>5</number>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<property name="spacing">
- <number>2</number>
+ <number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="pathTextTypeLabel">
diff --git a/scribus/ui/propertywidget_textcolor.cpp b/scribus/ui/propertywidget_textcolor.cpp
index c43f396e0..e259656da 100644
--- a/scribus/ui/propertywidget_textcolor.cpp
+++ b/scribus/ui/propertywidget_textcolor.cpp
@@ -19,9 +19,6 @@ PropertyWidget_TextColor::PropertyWidget_TextColor(QWidget* parent) : QFrame(par
{
setupUi(this);
- setFrameStyle(QFrame::Box | QFrame::Plain);
- setLineWidth(1);
-
layout()->setAlignment(Qt::AlignLeft);
fillLayout->setAlignment(Qt::AlignLeft);
diff --git a/scribus/ui/propertywidget_textcolorbase.ui b/scribus/ui/propertywidget_textcolorbase.ui
index 5ee143d68..950184770 100644
--- a/scribus/ui/propertywidget_textcolorbase.ui
+++ b/scribus/ui/propertywidget_textcolorbase.ui
@@ -13,12 +13,6 @@
<property name="windowTitle">
<string notr="true">Frame</string>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>3</number>
@@ -90,18 +84,6 @@
<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="QLabel" name="strokeIcon">
<property name="text">
--
2.27.0
|
|
|
Applied, thanks! |
|
|
Thanks! Fixed in 1.5.7.svn (24533) |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2021-02-27 00:39 | bubu | New Issue | |
| 2021-02-27 00:39 | bubu | File Added: 0001-Unify-margins-and-spacing-for-properties-palette-set-3.patch | |
| 2021-02-27 00:39 | bubu | File Added: propertiespalette_text.gif | |
| 2021-02-27 22:32 | jghali | Assigned To | => jghali |
| 2021-02-27 22:32 | jghali | Status | new => resolved |
| 2021-02-27 22:32 | jghali | Resolution | open => fixed |
| 2021-02-27 22:32 | jghali | Fixed in Version | => 1.5.7.svn |
| 2021-02-27 22:32 | jghali | Note Added: 0048882 | |
| 2021-03-01 13:55 | PeterBenedek | Relationship added | child of 0013906 |
| 2021-03-21 14:51 | FirasH | Status | resolved => closed |
| 2021-03-21 14:51 | FirasH | Note Added: 0048978 |
