From 823d6301cdcd84e4f85daa1ba6f5f836b51834f3 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 19 Jun 2019 19:08:27 +1000 Subject: [PATCH] [needs-docs] Move some lesser-used label format settings from first page to "formatting" page Makes room for a larger text format style list --- src/ui/qgstextformatwidgetbase.ui | 1249 ++++++++++++++--------------- 1 file changed, 618 insertions(+), 631 deletions(-) diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui index fa3248bd9f4..3224369a330 100644 --- a/src/ui/qgstextformatwidgetbase.ui +++ b/src/ui/qgstextformatwidgetbase.ui @@ -112,7 +112,7 @@ 0 0 - 794 + 811 300 @@ -620,8 +620,8 @@ 0 0 - 396 - 540 + 771 + 889 @@ -664,50 +664,48 @@ 0 - - + + + + … + + + + + - + 0 0 - - - 0 - 0 - - - - 4 - - - 999999999.000000000000000 - - - false - - - - - - Spacing + Style - - - - Qt::StrongFocus - - - - - - - … + + + + + 0 + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + @@ -885,151 +883,68 @@ - - - - … - - - - - - - - - - 0 - 0 - - - - letter - - - - - - - - 0 - 0 - - - - Space in pixels or map units, relative to size unit choice - - - 4 - - - -1000.000000000000000 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - true - - - - - - - + + - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - … - - - - - - - - - - 0 - 0 - - - - word - - - - - - - - 0 - 0 - - - - Space in pixels or map units, relative to size unit choice - - - 4 - - - -1000.000000000000000 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - true - - - - - - - - - … - - - - - - - + 0 0 - Style + Font + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + true + + + Opacity + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + 4 + + + 999999999.000000000000000 + + + false + + + + + + + Qt::StrongFocus + + + + + + + … @@ -1061,43 +976,6 @@ - - - - - 0 - 0 - - - - Size - - - - - - - - - - … - - - - - - - … - - - - - - - … - - - @@ -1114,22 +992,8 @@ - - - - … - - - - - - - … - - - - - + + 0 @@ -1137,45 +1001,54 @@ - Type case + Size - - - - - 0 - 0 - + + + + QFrame::NoFrame + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + - Text - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + … - - - - true + + + + false - - - 0 - 0 - + + QComboBox::AdjustToMinimumContentsLengthWithIcon - - - 16777215 - 16777215 - - - - Capitalization style of text + + 8 @@ -1195,17 +1068,54 @@ - - + + + + Qt::StrongFocus + + + + + … - - + + - Blend mode + … + + + + + + + … + + + + + + + + 0 + 0 + + + + Text + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + … @@ -1247,109 +1157,6 @@ font-style: italic; - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - If enabled, the label text will automatically be modified using a preset list of substitutes - - - Apply label text substitutes - - - - - - - false - - - Configure substitutes - - - … - - - - - - - - - - - 0 - 0 - - - - Font - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - QComboBox::AdjustToMinimumContentsLengthWithIcon - - - 8 - - - false - - - - - - - Qt::StrongFocus - - - - - - - true - - - Opacity - - - - - - - … - - - @@ -1396,41 +1203,64 @@ font-style: italic; 0 0 - 435 - 554 + 771 + 872 - + 0 - - 0 - 6 - - + + 6 + + + + Qt::Horizontal + + + + 0 + 20 + + + + - + + + + 0 + 0 + + - Multiple lines + Formatted numbers - - + + + + … + + + + + QFrame::NoFrame QFrame::Raised - + 20 @@ -1443,183 +1273,48 @@ font-style: italic; 0 - - - - Wrap lines to - - - - - - - 0 - 0 - - + - Wrap on character - - - - - - - - 0 - 0 - - - - Line height - - - - - - - … - - - - - - - true - - - Paragraph style alignment of multi-line text - - - Qt::LeftToRight - - - - Left - - - - - Center - - - - - Right - - - - - - - - … - - - - - - - true - - - If set, label text will automatically be wrapped to match the specified number of characters per line (if possible) - - - No automatic wrapping - - - characters - - - 999 + Decimal places - - - - 0 - 0 - - - - - - + - + 0 0 - - Alignment - - - - - - - … - - - - - - - true - - - - 0 - 0 - - - - Line height spacing for multi-line text - - - line - - - 0.000000000000000 - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 + 20 - + … - - - - Controls whether lines are automatically wrapped using the maximum number of characters in a line, or the minimum + + + + Qt::LeftToRight + + + Show plus sign + + + + + + + … - - - Maximum line length - - - - - Minimum line length - - @@ -1627,7 +1322,147 @@ font-style: italic; - + + + + Spacing + + + + + + + + + + 0 + 0 + + + + word + + + + + + + + 0 + 0 + + + + Space in pixels or map units, relative to size unit choice + + + 4 + + + -1000.000000000000000 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + true + + + + + + + + + Blend mode + + + + + + + … + + + + + + + + 0 + 0 + + + + Type case + + + + + + + + + + 0 + 0 + + + + letter + + + + + + + + 0 + 0 + + + + Space in pixels or map units, relative to size unit choice + + + 4 + + + -1000.000000000000000 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + true + + + + + + + + + + + + false + + + Configure substitutes + + + … + + + + @@ -1927,53 +1762,76 @@ font-style: italic; - - + + + + … + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + true + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Capitalization style of text + + + + + + + … + + + + + 6 - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - - 0 - 0 - - + + - Formatted numbers + Multiple lines - - - - … - - - - - + + QFrame::NoFrame QFrame::Raised - + 20 @@ -1986,45 +1844,180 @@ font-style: italic; 0 - - + + - Decimal places + Wrap lines to + + + + true + + + Paragraph style alignment of multi-line text + + + Qt::LeftToRight + + + + Left + + + + + Center + + + + + Right + + + + - + + + + 0 + 0 + + + + + + - + 0 0 - - 20 + + Alignment - - + + … - - - - Qt::LeftToRight + + + + Controls whether lines are automatically wrapped using the maximum number of characters in a line, or the minimum + + + + Maximum line length + + + + + Minimum line length + + + + + + + + … + + + + + + + … + + + + + + + true + + + If set, label text will automatically be wrapped to match the specified number of characters per line (if possible) + + + No automatic wrapping + + + characters + + + 999 + + + + + + + true + + + + 0 + 0 + + + + Line height spacing for multi-line text + + + line + + + 0.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + - Show plus sign + Line height + + + + + + + + 0 + 0 + + + + Wrap on character - + … @@ -2035,18 +2028,22 @@ font-style: italic; - - - - Qt::Vertical + + + + If enabled, the label text will automatically be modified using a preset list of substitutes - - - 20 - 0 - + + Apply label text substitutes - + + + + + + … + + @@ -2081,8 +2078,8 @@ font-style: italic; 0 0 - 364 - 358 + 224 + 233 @@ -2427,8 +2424,8 @@ font-style: italic; 0 0 - 578 - 902 + 368 + 572 @@ -3200,8 +3197,8 @@ font-style: italic; 0 0 - 372 - 528 + 259 + 350 @@ -3660,9 +3657,9 @@ font-style: italic; 0 - -320 - 772 - 1211 + 0 + 288 + 852 @@ -5369,8 +5366,8 @@ font-style: italic; 0 0 - 430 - 912 + 287 + 656 @@ -6426,16 +6423,6 @@ font-style: italic; mFontColorDDBtn mTextOpacityWidget mFontOpacityDDBtn - mFontCapitalsComboBox - mFontCaseDDBtn - mFontLetterSpacingSpinBox - mFontLetterSpacingDDBtn - mFontWordSpacingSpinBox - mFontWordSpacingDDBtn - comboBlendMode - mFontBlendModeDDBtn - mCheckBoxSubstituteText - mToolButtonConfigureSubstitutes scrollArea_5 wrapCharacterEdit mWrapCharDDBtn @@ -6653,22 +6640,6 @@ font-style: italic; - - mLabelingOptionsListWidget - currentRowChanged(int) - mLabelStackedWidget - setCurrentIndex(int) - - - 34 - 599 - - - 633 - 411 - - - mOptionsTab currentChanged(int) @@ -6685,5 +6656,21 @@ font-style: italic; + + mLabelingOptionsListWidget + currentRowChanged(int) + mLabelStackedWidget + setCurrentIndex(int) + + + 34 + 599 + + + 633 + 411 + + +