officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 2 -
sc/Module_sc.mk | 8
+++----
sfx2/uiconfig/ui/loadtemplatedialog.ui | 11
+++++-----
sfx2/uiconfig/ui/templatedlg.ui | 7
+++++-
4 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 008cf21683f2b072532ab706f25a7a6bd1126231
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Jan 11 14:38:53 2021 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Jan 13 14:11:11 2021 +0100
tdf#138846 change "Settings" to "Tools" in Template Manager dialog
And add "extended tooltip" to explain what is hidden inside the icon
Change-Id: I46903d7001c180af44a47ebf0de32bd3d932c3a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109007
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 1ea6b4b4c499..5246f7542e41 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -661,12 +661,17 @@
<object class="GtkMenuButton" id="action_menu">
<property name="can-focus">True</property>
<property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes"
context="templatedlg|action_menu|tooltip_text">Settings</property>
+ <property name="tooltip-text" translatable="yes"
context="templatedlg|action_menu|tooltip_text">Tools</property>
<property name="image">image7</property>
<property name="relief">none</property>
<property name="always-show-image">True</property>
<property name="popup">menu1</property>
<property name="use-popover">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="tools-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="templatedlg|extended_tip|action_menu">Provides
commands to create, rename and delete categories, reset default templates, and
refresh the template manager.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
commit 9b36407b7a3d1052a79077ca54904e3b3b8d0bce
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jan 12 18:17:19 2021 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 13 14:10:53 2021 +0100
move CppunitTest_sc_jumbosheets_test from subsequentcheck to slowcheck
and sort the list
this way, Jenkins executes this module on Windows and Mac as well.
Before I submitted this test, I ran
'make clean && make CppunitTest_sc_uicalc' on a Win machine
Change-Id: I906255bcf82e19917036aa3e99344f9ecf2a26fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109190
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 5d5b033711f9..58bd568e0e00 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -61,13 +61,14 @@ endif
$(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_cond_format_merge \
+ CppunitTest_sc_copypaste \
+ CppunitTest_sc_html_export_test \
+ CppunitTest_sc_jumbosheets_test \
CppunitTest_sc_new_cond_format_api \
CppunitTest_sc_pdf_export \
+ CppunitTest_sc_pivottable_filters_test \
CppunitTest_sc_subsequent_filters_test \
CppunitTest_sc_subsequent_export_test \
- CppunitTest_sc_html_export_test \
- CppunitTest_sc_copypaste \
- CppunitTest_sc_pivottable_filters_test \
CppunitTest_sc_uicalc \
))
@@ -175,7 +176,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_tablerowsenumeration \
CppunitTest_sc_indexenumeration_textfieldenumeration \
CppunitTest_sc_importdescriptorbaseobj \
- CppunitTest_sc_jumbosheets_test \
CppunitTest_sc_labelrangeobj \
CppunitTest_sc_labelrangesobj \
CppunitTest_sc_macros_test \
commit e58b2365e6ec962d8832636283b1e74b5c0246c6
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Jan 11 13:48:10 2021 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Jan 13 14:08:48 2021 +0100
tdf#102002 update labels and tooltip in 'Load Styles' dialog box
Change-Id: I9091e19dcfb44e9aeb89eb005b4f309d29359549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109006
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 35a4e60a69bb..0c593f09373f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1187,7 +1187,7 @@
</node>
<node oor:name=".uno:LoadStyles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Load Styles...</value>
+ <value xml:lang="en-US">~Load Styles from Template</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui
b/sfx2/uiconfig/ui/loadtemplatedialog.ui
index 2ff9f8cf22fe..fb08a626b01d 100644
--- a/sfx2/uiconfig/ui/loadtemplatedialog.ui
+++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui
@@ -259,7 +259,7 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="text">
- <property name="label" translatable="yes"
context="loadtemplatedialog|text">Te_xt</property>
+ <property name="label" translatable="yes"
context="loadtemplatedialog|text">_Paragraph and Character</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -299,7 +299,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pages">
- <property name="label" translatable="yes"
context="loadtemplatedialog|pages">_Pages</property>
+ <property name="label" translatable="yes"
context="loadtemplatedialog|pages">Pa_ge</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -319,7 +319,7 @@
</child>
<child>
<object class="GtkCheckButton" id="numbering">
- <property name="label" translatable="yes"
context="loadtemplatedialog|numbering">N_umbering</property>
+ <property name="label" translatable="yes"
context="loadtemplatedialog|numbering">_List</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -328,7 +328,7 @@
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="numbering-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="loadtemplatedialog|extended_tip|numbering">Loads
the numbering styles from the selected document into the current
document.</property>
+ <property name="AtkObject::accessible-description"
translatable="yes" context="loadtemplatedialog|extended_tip|numbering">Loads
the list styles from the selected document into the current document.</property>
</object>
</child>
</object>
@@ -346,6 +346,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="tooltip_text" translatable="yes"
context="loadtemplatedialog|overwrite">Overwrite styles with same
name</property>
<child internal-child="accessible">
<object class="AtkObject" id="overwrite-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="loadtemplatedialog|extended_tip|overwrite">Replaces
styles in the current document that have the same name as the styles you are
loading.</property>
@@ -371,7 +372,7 @@
<object class="GtkLabel" id="alttitle">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes"
context="loadtemplatedialog|alttitle">Load Styles</property>
+ <property name="label" translatable="yes"
context="loadtemplatedialog|alttitle">Load Styles from Template</property>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
