From a92f6e8d2f89b32c86b61c2ea0d7da48c87c4d57 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 13 Oct 2012 18:53:21 +0200 Subject: [PATCH] Moved things around a bit, put shared stuff into common. --- .../source/pics => common/images}/logo.png | Bin .../source/pics => common/images}/openlp.ico | Bin .../themes/openlp_qthelp/layout.html | 0 .../openlp_qthelp/static/alert_info_32.png | Bin .../openlp_qthelp/static/alert_warning_32.png | Bin .../themes/openlp_qthelp/static/bg-page.png | Bin .../openlp_qthelp/static/bullet_orange.png | Bin .../openlp_qthelp/static/openlp_qthelp.css_t | 0 .../themes/openlp_qthelp/theme.conf | 0 manual/source/conf.py | 6 ++--- user-guide/source/conf.py | 23 +++++++++++++----- 11 files changed, 20 insertions(+), 9 deletions(-) rename {manual/source/pics => common/images}/logo.png (100%) rename {manual/source/pics => common/images}/openlp.ico (100%) rename {manual => common}/themes/openlp_qthelp/layout.html (100%) rename {manual => common}/themes/openlp_qthelp/static/alert_info_32.png (100%) rename {manual => common}/themes/openlp_qthelp/static/alert_warning_32.png (100%) rename {manual => common}/themes/openlp_qthelp/static/bg-page.png (100%) rename {manual => common}/themes/openlp_qthelp/static/bullet_orange.png (100%) rename {manual => common}/themes/openlp_qthelp/static/openlp_qthelp.css_t (100%) rename {manual => common}/themes/openlp_qthelp/theme.conf (100%) diff --git a/manual/source/pics/logo.png b/common/images/logo.png similarity index 100% rename from manual/source/pics/logo.png rename to common/images/logo.png diff --git a/manual/source/pics/openlp.ico b/common/images/openlp.ico similarity index 100% rename from manual/source/pics/openlp.ico rename to common/images/openlp.ico diff --git a/manual/themes/openlp_qthelp/layout.html b/common/themes/openlp_qthelp/layout.html similarity index 100% rename from manual/themes/openlp_qthelp/layout.html rename to common/themes/openlp_qthelp/layout.html diff --git a/manual/themes/openlp_qthelp/static/alert_info_32.png b/common/themes/openlp_qthelp/static/alert_info_32.png similarity index 100% rename from manual/themes/openlp_qthelp/static/alert_info_32.png rename to common/themes/openlp_qthelp/static/alert_info_32.png diff --git a/manual/themes/openlp_qthelp/static/alert_warning_32.png b/common/themes/openlp_qthelp/static/alert_warning_32.png similarity index 100% rename from manual/themes/openlp_qthelp/static/alert_warning_32.png rename to common/themes/openlp_qthelp/static/alert_warning_32.png diff --git a/manual/themes/openlp_qthelp/static/bg-page.png b/common/themes/openlp_qthelp/static/bg-page.png similarity index 100% rename from manual/themes/openlp_qthelp/static/bg-page.png rename to common/themes/openlp_qthelp/static/bg-page.png diff --git a/manual/themes/openlp_qthelp/static/bullet_orange.png b/common/themes/openlp_qthelp/static/bullet_orange.png similarity index 100% rename from manual/themes/openlp_qthelp/static/bullet_orange.png rename to common/themes/openlp_qthelp/static/bullet_orange.png diff --git a/manual/themes/openlp_qthelp/static/openlp_qthelp.css_t b/common/themes/openlp_qthelp/static/openlp_qthelp.css_t similarity index 100% rename from manual/themes/openlp_qthelp/static/openlp_qthelp.css_t rename to common/themes/openlp_qthelp/static/openlp_qthelp.css_t diff --git a/manual/themes/openlp_qthelp/theme.conf b/common/themes/openlp_qthelp/theme.conf similarity index 100% rename from manual/themes/openlp_qthelp/theme.conf rename to common/themes/openlp_qthelp/theme.conf diff --git a/manual/source/conf.py b/manual/source/conf.py index 4b894e2..2d298a7 100644 --- a/manual/source/conf.py +++ b/manual/source/conf.py @@ -111,7 +111,7 @@ if sys.argv[2] == 'html': } # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [os.path.join(os.path.abspath('..'), 'themes')] +html_theme_path = [os.path.abspath(os.path.join('..', '..', 'common', 'themes'))] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". @@ -122,12 +122,12 @@ html_title = u'OpenLP 2.0 Reference Manual' # The name of an image file (relative to this directory) to place at the top # of the sidebar. -html_logo = 'pics/logo.png' +html_logo = '../../common/images/logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'pics/openlp.ico' +html_favicon = '../../common/images/openlp.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, diff --git a/user-guide/source/conf.py b/user-guide/source/conf.py index da73df7..fc2ca81 100644 --- a/user-guide/source/conf.py +++ b/user-guide/source/conf.py @@ -25,7 +25,7 @@ import sys, os # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc','rst2pdf.pdfbuilder'] +extensions = ['rst2pdf.pdfbuilder'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -91,15 +91,26 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp': + html_theme = 'openlp_qthelp' +else: + html_theme = 'default' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -#html_theme_options = {} +if sys.argv[2] == 'html': + html_theme_options = { + 'sidebarbgcolor': '#3a60a9', + 'relbarbgcolor': '#203b6f', + 'footerbgcolor': '#26437c', + 'headtextcolor': '#203b6f', + 'linkcolor': '#26437c', + 'sidebarlinkcolor': '#ceceff' + } # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +html_theme_path = [os.path.abspath(os.path.join('..', '..', 'common', 'themes'))] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". @@ -110,12 +121,12 @@ html_title = 'OpenLP 2.0 User Guide' # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +html_logo = '../../common/images/logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +html_favicon = '../../common/images/openlp.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,