AllLangHelp_sdraw.mk | 2
CustomTarget_html.mk | 4 -
source/auxiliary/sdraw.tree | 101 +++++++++++++++++++++++++++++++++++++++++
source/auxiliary/simpress.tree | 40 +---------------
4 files changed, 108 insertions(+), 39 deletions(-)
New commits:
commit e7ae111766f390ee4b4d1697893335d33c1a01cc
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue May 21 15:30:59 2019 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu May 23 14:49:47 2019 +0200
Untangle Help Contents for Impress and Draw
Create a separated sdraw.tree for Contents and move entries
from Impress tree to Draw tree.
Common contents are maintained in both trees.
This is work in progress. Draw and Impress Help pages need update
especially for menus.
Change-Id: I179a5ee7407c4a8357a87b2e7a0d8782b7bb0520
Reviewed-on: https://gerrit.libreoffice.org/72693
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index f8eb53997..d22c7f05a 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_AllLangHelp_AllLangHelp,sdraw))
+$(eval $(call
gb_AllLangHelp_set_treefile,sdraw,helpcontent2/source/auxiliary/sdraw))
+
$(eval $(call gb_AllLangHelp_use_linked_modules,sdraw,\
schart \
shared \
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 3b2c8982c..de972bb73 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -10,8 +10,8 @@
$(eval $(call gb_CustomTarget_CustomTarget,helpcontent2/help3xsl))
# HACK!!
-html_TREE_MODULES := sbasic scalc schart shared simpress smath swriter
-html_TEXT_MODULES := $(html_TREE_MODULES) sdatabase sdraw
+html_TREE_MODULES := sbasic scalc schart shared simpress smath swriter sdraw
+html_TEXT_MODULES := $(html_TREE_MODULES) sdatabase
html_BMARK_MODULES := swriter:WRITER scalc:CALC simpress:IMPRESS sdraw:DRAW
shared/explorer/database:BASE smath:MATH schart:CHART sbasic:BASIC shared:SHARED
$(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree
new file mode 100644
index 000000000..4de802518
--- /dev/null
+++ b/source/auxiliary/sdraw.tree
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+ <tree_view version="24-Aug-2004">
+ <help_section application="sdraw" id="11" title="Drawings (Draw)">
+ <node id="1101" title="General Information and User Interface Usage">
+ <topic id="sdraw/text/sdraw/main0000.xhp">Welcome to the
%PRODUCTNAME Draw Help</topic>
+ <topic id="sdraw/text/sdraw/main0503.xhp">%PRODUCTNAME Draw
Features</topic>
+ <topic id="sdraw/text/sdraw/guide/keyboard.xhp">Shortcut Keys for
Drawing Objects</topic>
+ <topic id="sdraw/text/sdraw/04/01020000.xhp">Shortcut Keys for
Drawings</topic>
+ <topic id="sdraw/text/sdraw/guide/main.xhp">Instructions for
Using %PRODUCTNAME Draw</topic>
+ </node>
+ <node id="0902" title="Command and Menu Reference">
+ <node id="110202" title="Drawings (%PRODUCTNAME Draw)">
+ <node id="11020201" title="Menus">
+ <topic id="sdraw/text/sdraw/main0100.xhp">Menus</topic>
+ <topic id="sdraw/text/sdraw/main0101.xhp">File</topic>
+ <topic id="sdraw/text/sdraw/main0102.xhp">Edit</topic>
+ <topic id="sdraw/text/sdraw/main0103.xhp">View</topic>
+ <topic id="sdraw/text/sdraw/main0104.xhp">Insert</topic>
+ <topic id="sdraw/text/sdraw/main0105.xhp">Format</topic>
+ <topic id="sdraw/text/sdraw/main_shape.xhp">Shape</topic>
+ <topic id="sdraw/text/sdraw/main0106.xhp">Tools</topic>
+ <topic
id="simpress/text/simpress/main0107.xhp">Window</topic>
+ <topic id="shared/text/shared/main0108.xhp">Help</topic>
+ </node>
+ <node id="11020202" title="Toolbars">
+ <topic id="sdraw/text/sdraw/main0200.xhp">Toolbars</topic>
+ <topic id="sdraw/text/sdraw/main0210.xhp">Drawing
Bar</topic>
+ <topic id="sdraw/text/sdraw/main0213.xhp">Options
Bar</topic>
+ <topic id="shared/text/shared/main0201.xhp">Standard
Bar</topic>
+ <topic id="shared/text/shared/main0213.xhp">Form
Navigation Bar</topic>
+ <topic id="shared/text/shared/main0226.xhp">Form Design
Toolbar</topic>
+ <topic id="shared/text/shared/main0227.xhp">Edit Points
Bar</topic>
+ </node>
+ </node>
+ </node>
+ <node id="1103" title="Loading, Saving, Importing, and Exporting">
+ <topic
id="simpress/text/simpress/guide/palette_files.xhp">Loading Color, Gradient,
and Hatching Lists</topic>
+ <topic id="sdraw/text/sdraw/guide/graphic_insert.xhp">Inserting
Graphics</topic>
+ </node>
+ <node id="1104" title="Formatting">
+ <topic
id="simpress/text/simpress/guide/palette_files.xhp">Loading Color, Gradient,
and Hatching Lists</topic>
+ <topic
id="simpress/text/simpress/guide/line_arrow_styles.xhp">Loading Line and Arrow
Styles</topic>
+ <topic id="sdraw/text/sdraw/guide/color_define.xhp">Defining
Custom Colors</topic>
+ <topic id="sdraw/text/sdraw/guide/gradient.xhp">Creating Gradient
Fills</topic>
+ <topic id="sdraw/text/sdraw/guide/eyedropper.xhp">Replacing
Colors</topic>
+ <topic id="sdraw/text/sdraw/guide/align_arrange.xhp">Arranging,
Aligning and Distributing Objects</topic>
+ <topic id="simpress/text/simpress/guide/background.xhp">Changing
the Slide Background Fill</topic>
+ <topic id="simpress/text/simpress/guide/footer.xhp">Adding a
Header or a Footer to All Slides</topic>
+ <topic id="simpress/text/simpress/guide/masterpage.xhp">Applying
a Slide Design to a Master Slide</topic>
+ <topic id="simpress/text/simpress/guide/move_object.xhp">Moving
Objects</topic>
+ </node>
+ <node id="1105" title="Printing">
+ <topic id="simpress/text/simpress/guide/printing.xhp">Printing
Drawings</topic>
+ <topic id="simpress/text/simpress/guide/print_tofit.xhp">Printing
a Slide to Fit a Paper Size</topic>
+ </node>
+ <node id="1106" title="Effects">
+ <topic id="sdraw/text/sdraw/guide/cross_fading.xhp">Cross-Fading
Two Objects</topic>
+ </node>
+ <node id="1107" title="Objects, Graphics, and Bitmaps">
+ <topic id="sdraw/text/sdraw/guide/combine_etc.xhp">Combining
Objects and Constructing Shapes</topic>
+ <topic id="sdraw/text/sdraw/guide/draw_sector.xhp">Drawing
Sectors and Segments</topic>
+ <topic
id="sdraw/text/sdraw/guide/duplicate_object.xhp">Duplicating Objects</topic>
+ <topic id="sdraw/text/sdraw/guide/rotate_object.xhp">Rotating
Objects</topic>
+ <topic id="sdraw/text/sdraw/guide/join_objects3d.xhp">Assembling
3D Objects</topic>
+ <topic id="sdraw/text/sdraw/guide/join_objects.xhp">Connecting
Lines</topic>
+ <topic
id="simpress/text/simpress/guide/text2curve.xhp">Converting Text Characters
into Drawing Objects</topic>
+ <topic id="simpress/text/simpress/guide/vectorize.xhp">Converting
Bitmap Images into Vector Graphics</topic>
+ <topic id="simpress/text/simpress/guide/3d_create.xhp">Converting
2D Objects to Curves, Polygons, and 3D Objects</topic>
+ <topic
id="simpress/text/simpress/guide/line_arrow_styles.xhp">Loading Line and Arrow
Styles</topic>
+ <topic id="simpress/text/simpress/guide/line_draw.xhp">Drawing
Curves</topic>
+ <topic id="simpress/text/simpress/guide/line_edit.xhp">Editing
Curves</topic>
+ <topic id="sdraw/text/sdraw/guide/graphic_insert.xhp">Inserting
Graphics</topic>
+ <topic
id="simpress/text/simpress/guide/table_insert.xhp">Including Spreadsheets in
Pages</topic>
+ <topic id="simpress/text/simpress/guide/move_object.xhp">Moving
Objects</topic>
+ <topic
id="simpress/text/simpress/guide/select_object.xhp">Selecting Underlying
Objects</topic>
+ <topic id="simpress/text/simpress/guide/orgchart.xhp">Creating a
Flowchart</topic>
+ </node>
+ <node id="1108" title="Groups and Layers">
+ <topic id="sdraw/text/sdraw/guide/groups.xhp">Grouping
Objects</topic>
+ <topic id="simpress/text/simpress/guide/layers.xhp">About
Layers</topic>
+ <topic id="simpress/text/simpress/guide/layer_new.xhp">Inserting
Layers</topic>
+ <topic id="simpress/text/simpress/guide/layer_tipps.xhp">Working
With Layers</topic>
+ <topic id="simpress/text/simpress/guide/layer_move.xhp">Moving
Objects to a Different Layer</topic>
+ </node>
+ <node id="1109" title="Text in Drawings">
+ <topic id="sdraw/text/sdraw/guide/text_enter.xhp">Adding
Text</topic>
+ <topic
id="simpress/text/simpress/guide/text2curve.xhp">Converting Text Characters
into Drawing Objects</topic>
+ </node>
+ <node id="1110" title="Viewing">
+ <topic id="simpress/text/simpress/guide/change_scale.xhp">Zooming
With the Keypad</topic>
+ </node>
+ </help_section>
+ </tree_view>
diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 67d67d062..5698f4c23 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -17,19 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<tree_view version="24-Aug-2004">
- <help_section application="simpress" id="04" title="Presentations and
Drawings (Impress/Draw)">
+ <help_section application="simpress" id="04" title="Presentations
(Impress)">
<node id="0401" title="General Information and User Interface Usage">
<topic id="simpress/text/simpress/main0000.xhp">Welcome to the
%PRODUCTNAME Impress Help</topic>
- <topic id="sdraw/text/sdraw/main0000.xhp">Welcome to the
%PRODUCTNAME Draw Help</topic>
<topic id="simpress/text/simpress/main0503.xhp">%PRODUCTNAME
Impress Features</topic>
- <topic id="sdraw/text/sdraw/main0503.xhp">%PRODUCTNAME Draw
Features</topic>
<topic id="simpress/text/simpress/guide/keyboard.xhp">Using
Shortcut Keys in %PRODUCTNAME Impress </topic>
- <topic id="sdraw/text/sdraw/guide/keyboard.xhp">Shortcut Keys for
Drawing Objects</topic>
<topic id="simpress/text/simpress/04/01020000.xhp">Shortcut Keys
for %PRODUCTNAME Impress</topic>
<topic id="simpress/text/simpress/04/presenter.xhp">Presenter
Console Keyboard Shortcuts</topic>
- <topic id="sdraw/text/sdraw/04/01020000.xhp">Shortcut Keys for
Drawings</topic>
<topic id="simpress/text/simpress/guide/main.xhp">Instructions
for Using %PRODUCTNAME Impress</topic>
- <topic id="sdraw/text/sdraw/guide/main.xhp">Instructions for
Using %PRODUCTNAME Draw</topic>
</node>
<node id="0402" title="Command and Menu Reference">
<node id="040201" title="Presentations (%PRODUCTNAME Impress)">
@@ -64,29 +59,6 @@
<topic id="shared/text/shared/main0227.xhp">Edit Points
Bar</topic>
</node>
</node>
- <node id="040202" title="Drawings (%PRODUCTNAME Draw)">
- <node id="04020201" title="Menus">
- <topic id="sdraw/text/sdraw/main0100.xhp">Menus</topic>
- <topic id="sdraw/text/sdraw/main0101.xhp">File</topic>
- <topic id="sdraw/text/sdraw/main0102.xhp">Edit</topic>
- <topic id="sdraw/text/sdraw/main0103.xhp">View</topic>
- <topic
id="sdraw/text/sdraw/main_insert.xhp">Insert</topic>
- <topic id="sdraw/text/sdraw/main0105.xhp">Format</topic>
- <topic id="sdraw/text/sdraw/main0106.xhp">Tools</topic>
- <topic
id="simpress/text/simpress/main0113.xhp">Modify</topic>
- <topic
id="simpress/text/simpress/main0107.xhp">Window</topic>
- <topic id="shared/text/shared/main0108.xhp">Help</topic>
- </node>
- <node id="04020202" title="Toolbars">
- <topic id="sdraw/text/sdraw/main0200.xhp">Toolbars</topic>
- <topic id="sdraw/text/sdraw/main0210.xhp">Drawing
Bar</topic>
- <topic id="sdraw/text/sdraw/main0213.xhp">Options
Bar</topic>
- <topic id="shared/text/shared/main0201.xhp">Standard
Bar</topic>
- <topic id="shared/text/shared/main0213.xhp">Form
Navigation Bar</topic>
- <topic id="shared/text/shared/main0226.xhp">Form Design
Toolbar</topic>
- <topic id="shared/text/shared/main0227.xhp">Edit Points
Bar</topic>
- </node>
- </node>
</node>
<node id="0403" title="Loading, Saving, Importing, and Exporting">
<topic id="simpress/text/simpress/guide/html_export.xhp">Saving a
Presentation in HTML Format</topic>
@@ -122,6 +94,7 @@
</node>
<node id="0407" title="Objects, Graphics, and Bitmaps">
<topic id="sdraw/text/sdraw/guide/combine_etc.xhp">Combining
Objects and Constructing Shapes</topic>
+ <topic id="sdraw/text/sdraw/guide/groups.xhp">Grouping
Objects</topic>
<topic id="sdraw/text/sdraw/guide/draw_sector.xhp">Drawing
Sectors and Segments</topic>
<topic
id="sdraw/text/sdraw/guide/duplicate_object.xhp">Duplicating Objects</topic>
<topic id="sdraw/text/sdraw/guide/rotate_object.xhp">Rotating
Objects</topic>
@@ -139,14 +112,7 @@
<topic
id="simpress/text/simpress/guide/select_object.xhp">Selecting Underlying
Objects</topic>
<topic id="simpress/text/simpress/guide/orgchart.xhp">Creating a
Flowchart</topic>
</node>
- <node id="0408" title="Groups and Layers">
- <topic id="sdraw/text/sdraw/guide/groups.xhp">Grouping
Objects</topic>
- <topic id="simpress/text/simpress/guide/layers.xhp">About
Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_new.xhp">Inserting
Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_tipps.xhp">Working
With Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_move.xhp">Moving
Objects to a Different Layer</topic>
- </node>
- <node id="0409" title="Text in Presentations and Drawings">
+ <node id="0409" title="Text in Presentations">
<topic id="sdraw/text/sdraw/guide/text_enter.xhp">Adding
Text</topic>
<topic
id="simpress/text/simpress/guide/text2curve.xhp">Converting Text Characters
into Drawing Objects</topic>
</node>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
