OpenLP

Merge lp:~springermac/openlp/documentation-applehelp into lp:~openlp-documentation/openlp/trunk

  1. documentation-applehelp
  2. Merge into trunk
Proposed by Jonathan Springer
Status: Merged
Approved by: Raoul Snyman
Approved revision: 118
Merged at revision: 118
Proposed branch: lp:~springermac/openlp/documentation-applehelp
Merge into: lp:~openlp-documentation/openlp/trunk
Diff against target: 44 lines (+11/-1)
2 files modified
manual/Makefile (+6/-0)
manual/source/conf.py (+5/-1)
To merge this branch: bzr merge lp:~springermac/openlp/documentation-applehelp
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+268959@code.launchpad.net

Description of the change

Add support for generating applehelp

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Clueless it's OSX

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manual/Makefile'
2--- manual/Makefile 2012-06-15 06:01:35 +0000
3+++ manual/Makefile 2015-08-24 18:22:06 +0000
4@@ -21,6 +21,7 @@
5 @echo " json to make JSON files"
6 @echo " htmlhelp to make HTML files and a HTML help project"
7 @echo " qthelp to make HTML files and a qthelp project"
8+ @echo " applehelp to make HTML files and a applehelp project"
9 @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
10 @echo " changes to make an overview of all changed/added/deprecated items"
11 @echo " linkcheck to check all external links for integrity"
12@@ -64,6 +65,11 @@
13 @echo "To view the help file:"
14 @echo "# assistant -collectionFile build/qthelp/OpenLP.qhc"
15
16+applehelp:
17+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) build/applehelp
18+ @echo
19+ @echo "Build finished. The help file is in build/applehelp."
20+
21 latex:
22 $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
23 @echo
24
25=== modified file 'manual/source/conf.py'
26--- manual/source/conf.py 2012-10-13 16:53:21 +0000
27+++ manual/source/conf.py 2015-08-24 18:22:06 +0000
28@@ -95,7 +95,7 @@
29 if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp':
30 html_theme = 'openlp_qthelp'
31 else:
32- html_theme = 'default'
33+ html_theme = 'classic'
34
35 # Theme options are theme-specific and customize the look and feel of a theme
36 # further. For a list of options available for each theme, see the
37@@ -226,3 +226,7 @@
38 ('index', 'openlp', u'OpenLP Reference Manual',
39 [u'Wesley Stout'], 1)
40 ]
41+
42+# -- Options for apple help output --------------------------------------------
43+
44+applehelp_bundle_id = 'org.openlp.OpenLP.help'

Subscribers

People subscribed via source and target branches