[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 3 commits - svx/source svx/uiconfig sw/uiconfig
Jim Raykowski (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 2 09:21:27 UTC 2019
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 25 +++++++++++++++++++++
svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 5 ++++
svx/uiconfig/ui/paralrspacing.ui | 6 ++---
svx/uiconfig/ui/paraulspacing.ui | 4 +--
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2 -
sw/uiconfig/swriter/ui/notebookbar_single.ui | 3 ++
6 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit 9d55361562602a420103e28dfacac8f4d80ab1db
Author: Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Nov 29 21:29:47 2019 -0900
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Dec 2 10:21:03 2019 +0100
tdf#109425 Make paraspacing windows grab focus
to their shown SvxRelativeField when focus is gained using keyboard
navigation. The patch also corrects images used for before, after, and
above controls.
Change-Id: Ic1411ac0eddf3b281590ac5821171b5e8aaac976
Reviewed-on: https://gerrit.libreoffice.org/84103
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 65d3285536e3342c2b1b669d0dc8c134bc7254c6)
Reviewed-on: https://gerrit.libreoffice.org/84152
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index d945b32ed5bf..d6800db15b8c 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -116,6 +116,11 @@ ParaAboveSpacingWindow::ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::R
m_pBelowContainer->Hide();
}
+void ParaAboveSpacingWindow::GetFocus()
+{
+ m_pAboveSpacing->GrabFocus();
+}
+
// ParaBelowSpacingWindow
ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -125,6 +130,11 @@ ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::R
m_pBelowContainer->Show();
}
+void ParaBelowSpacingWindow::GetFocus()
+{
+ m_pBelowSpacing->GrabFocus();
+}
+
// ParaLRSpacingWindow
ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -304,6 +314,11 @@ ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Ref
m_pFirstLineContainer->Hide();
}
+void ParaLeftSpacingWindow::GetFocus()
+{
+ m_pBeforeSpacing->GrabFocus();
+}
+
// ParaRightSpacingWindow
ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -314,6 +329,11 @@ ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::R
m_pFirstLineContainer->Hide();
}
+void ParaRightSpacingWindow::GetFocus()
+{
+ m_pAfterSpacing->GrabFocus();
+}
+
// ParaFirstLineSpacingWindow
ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -324,4 +344,9 @@ ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css
m_pFirstLineContainer->Show();
}
+void ParaFirstLineSpacingWindow::GetFocus()
+{
+ m_pFLSpacing->GrabFocus();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 5d0496414bd2..6d7ad8232102 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -60,12 +60,14 @@ class ParaAboveSpacingWindow : public ParaULSpacingWindow
{
public:
explicit ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+ virtual void GetFocus() override;
};
class ParaBelowSpacingWindow : public ParaULSpacingWindow
{
public:
explicit ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+ virtual void GetFocus() override;
};
class ParaLRSpacingWindow : public VclVBox,
@@ -100,18 +102,21 @@ class ParaLeftSpacingWindow : public ParaLRSpacingWindow
{
public:
explicit ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+ virtual void GetFocus() override;
};
class ParaRightSpacingWindow : public ParaLRSpacingWindow
{
public:
explicit ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+ virtual void GetFocus() override;
};
class ParaFirstLineSpacingWindow : public ParaLRSpacingWindow
{
public:
explicit ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+ virtual void GetFocus() override;
};
}
diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index d38ff54dd161..6093e4a1eee9 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -22,7 +22,7 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+ <property name="pixbuf">svx/res/symphony/Indent4.png</property>
</object>
<packing>
<property name="expand">False</property>
@@ -60,7 +60,7 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+ <property name="pixbuf">svx/res/symphony/Indent3.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/svx/uiconfig/ui/paraulspacing.ui b/svx/uiconfig/ui/paraulspacing.ui
index 6c9cd2a2e289..fc7c32ff0667 100644
--- a/svx/uiconfig/ui/paraulspacing.ui
+++ b/svx/uiconfig/ui/paraulspacing.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -29,7 +29,7 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="pixbuf">svx/res/symphony/spacing2.png</property>
+ <property name="pixbuf">svx/res/symphony/spacing1.png</property>
</object>
<packing>
<property name="expand">False</property>
commit 6e1f57551935250c45eb0c1c868f5d24842a5389
Author: Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Nov 29 20:48:36 2019 -0900
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Dec 2 10:20:55 2019 +0100
tdf#109425 NB bar compact: Make send mail button kb accessible
Change-Id: I4b0bbe9834cb950ff67210404c0e28225f1bd4a0
Reviewed-on: https://gerrit.libreoffice.org/84101
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 9a564c80ad48c116c261f37fea003c170ada14c4)
Reviewed-on: https://gerrit.libreoffice.org/84151
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index b0dbd64bd018..d94c31a13eda 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -17814,7 +17814,7 @@
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom162">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Tools-SendMail">
commit 83b4c4373e1d68f79fcf841799db21320297fc88
Author: Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Nov 29 21:50:34 2019 -0900
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Dec 2 10:20:48 2019 +0100
tdf#109425 Fixes for notebookbar single
Enable grow and shrink controls to be keyboard accessed and make print
preview controls show
Change-Id: I6a31b881fb08bc73d4b4b475658c210824cbc109
Reviewed-on: https://gerrit.libreoffice.org/84105
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit d428f1e91575e743b624ec67699bc5b967889ca6)
Reviewed-on: https://gerrit.libreoffice.org/84150
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 896da66b6f8a..bf9a57f59ab8 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -283,6 +283,7 @@
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Default-Grow">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Grow</property>
</object>
@@ -293,6 +294,7 @@
</child>
<child>
<object class="GtkToolButton" id="Default-Shrink">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="visible_horizontal">False</property>
<property name="action_name">.uno:Shrink</property>
@@ -8109,6 +8111,7 @@
</child>
<child>
<object class="sfxlo-PriorityMergedHBox" id="PrintContainer">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="sfxlo-OptionalBox" id="Print-Section-ShowSinglePage">
More information about the Libreoffice-commits
mailing list