[Libreoffice-commits] core.git: cui/source cui/uiconfig
Seth Chaiklin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 27 13:29:58 UTC 2020
cui/source/inc/paragrph.hxx | 1
cui/source/tabpages/paragrph.cxx | 3
cui/uiconfig/ui/pageformatpage.ui | 9 +
cui/uiconfig/ui/paraindentspacing.ui | 186 +++++++++++++++++------------------
4 files changed, 98 insertions(+), 101 deletions(-)
New commits:
commit 052dcb7665115f0aeb9dc43308bd7fb882716b19
Author: Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Thu Oct 15 10:53:57 2020 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 27 14:29:18 2020 +0100
Partially resolves: tdf#127279 Change "register-true" to "Page line-spacing"
in Page and Paragraph
For all places in UI where "register-true" appears, change
to "Page line-spacing".
-For Paragraph dialog, remove section heading and rename checkbox to
"Activate page line-spacing"
-For Page Style dialog, change label to: "Use page line-spacing"
-Add tooltip and extended tooltip in Paragraph dialog;
-Shorten tooltip in Page dialog, and add extended tooltip
Bonus:
-Add tooltip to "Automatic" in Paragraph dialog
-Remove contraction in control label (in accordance with UI guidelines)
Change-Id: I826ce35051b1d2c04f0e52d4e9fe4e6cfd1d7cf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104331
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 1f2305b54ce7..cea797707a7e 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -73,7 +73,6 @@ private:
std::unique_ptr<weld::Label> m_xAbsDist;
// only writer
- std::unique_ptr<weld::Widget> m_xRegisterFL;
std::unique_ptr<weld::CheckButton> m_xRegisterCB;
// preview
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4788969bcf4e..6ad843bdc9b3 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -588,7 +588,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet);
if(nHtmlMode & HTMLMODE_ON)
{
- m_xRegisterFL->hide();
m_xRegisterCB->hide();
m_xAutoCB->hide();
}
@@ -692,7 +691,6 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(weld::Container* pPage, weld::Dia
, m_xLineDistAtMetricBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTMETRIC", FieldUnit::CM))
, m_xLineDistAtLabel(m_xBuilder->weld_label("labelFT_LINEDIST"))
, m_xAbsDist(m_xBuilder->weld_label("labelST_LINEDIST_ABS"))
- , m_xRegisterFL(m_xBuilder->weld_widget("frameFL_REGISTER"))
, m_xRegisterCB(m_xBuilder->weld_check_button("checkCB_REGISTER"))
, m_xExampleWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE", m_aExampleWin))
{
@@ -921,7 +919,6 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
void SvxStdParagraphTabPage::EnableRegisterMode()
{
m_xRegisterCB->show();
- m_xRegisterFL->show();
}
void SvxStdParagraphTabPage::EnableContextualMode()
diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui
index 81bd0937aaf1..1199b4f023a4 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -527,14 +527,19 @@
</child>
<child>
<object class="GtkCheckButton" id="checkRegisterTrue">
- <property name="label" translatable="yes" context="pageformatpage|checkRegisterTrue">Page li_ne spacing</property>
+ <property name="label" translatable="yes" context="pageformatpage|checkRegisterTrue">Use page li_ne-spacing</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
- <property name="tooltip_text" translatable="yes" context="pageformatpage|checkRegisterTrue" comments="xdds">All paragraph styles with the option Page line spacing checked will be affected, assuming the line spacing defined here. This will align them to an invisible vertical page grid, regardless of their font size, so that each line is the same height.</property>
+ <property name="tooltip_text" translatable="yes" context="pageformatpage|checkRegisterTrue" comments="xdds">Enables page line-spacing (register-true) using the selected Reference Style</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="checkRegisterTrue-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|checkRegisterTrue">If enabled, then all paragraph styles with the option page line-spacing activated will be affected, assuming the line spacing of the Reference Style. This will align them to an invisible vertical page grid, regardless of their font size, so that each line is the same height.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui
index c5f9a7070f64..b6eac4b16ceb 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -161,6 +161,7 @@
<object class="GtkCheckButton" id="checkCB_AUTO">
<property name="label" translatable="yes" context="paraindentspacing|checkCB_AUTO">_Automatic</property>
<property name="visible">True</property>
+ <property name="tooltip_text" translatable="yes" context="paraindentspacing|checkCB_AUTO|tooltip_text">Indent paragraph automatically according to font size and line spacing.</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
@@ -323,7 +324,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_CONTEXTUALSPACING">
- <property name="label" translatable="yes" context="paraindentspacing|checkCB_CONTEXTUALSPACING">Don't add space between paragraphs of the same style</property>
+ <property name="label" translatable="yes" context="paraindentspacing|checkCB_CONTEXTUALSPACING">Do not add space between paragraphs of the same style</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -370,89 +371,123 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkComboBoxText" id="comboLB_LINEDIST">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Single</item>
- <item id="1" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.15 Lines</item>
- <item id="2" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.5 Lines</item>
- <item id="3" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Double</item>
- <item id="4" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Proportional</item>
- <item id="5" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">At least</item>
- <item id="6" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Leading</item>
- </items>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkComboBoxText" id="comboLB_LINEDIST">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Single</item>
+ <item id="1" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.15 Lines</item>
+ <item id="2" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">1.5 Lines</item>
+ <item id="3" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Double</item>
+ <item id="4" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Proportional</item>
+ <item id="5" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">At least</item>
+ <item id="6" translatable="yes" context="paraindentspacing|liststoreLB_LINEDIST">Leading</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelFT_LINEDIST">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="paraindentspacing|labelFT_LINEDIST">of</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelFT_LINEDIST">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="paraindentspacing|labelFT_LINEDIST">of</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkSpinButton" id="spinED_LINEDISTPERCENT">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentLINEDISTPERCENT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinED_LINEDISTMETRIC">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentED_LINEDISTMETRIC</property>
+ <property name="digits">1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkSpinButton" id="spinED_LINEDISTPERCENT">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentLINEDISTPERCENT</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinED_LINEDISTMETRIC">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentED_LINEDISTMETRIC</property>
- <property name="digits">1</property>
+ <object class="GtkCheckButton" id="checkCB_REGISTER">
+ <property name="label" translatable="yes" context="paraindentspacing|checkCB_REGISTER">Activate page li_ne-spacing</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes" context="paraindentspacing|checkCB_REGISTER|tooltip_text" comments="xdds">Applies page line-spacing (register-true) if set for the Page Style.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="checkCB_REGISTER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="paraindentspacing|extended_tip|checkCB_REGISTER">If page line-spacing is activated and the Page style uses page line-spacing, then this paragraph will align to an invisible vertical page grid, regardless of their font size, so that each line is the same height.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -475,45 +510,6 @@
<property name="top_attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkFrame" id="frameFL_REGISTER">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkCheckButton" id="checkCB_REGISTER">
- <property name="label" translatable="yes" context="paraindentspacing|checkCB_REGISTER">A_ctivate</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="paraindentspacing|label3">Follow Page Line Spacing</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
More information about the Libreoffice-commits
mailing list