From 9e7624fad2d5a1fd9b2b0f62ea6f215d6aa46fd8 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 6 Sep 2015 16:22:40 +0100 Subject: [PATCH 01/11] update conf to new theme and version. --- manual/source/conf.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/manual/source/conf.py b/manual/source/conf.py index c4898b1..d94f14c 100644 --- a/manual/source/conf.py +++ b/manual/source/conf.py @@ -42,16 +42,16 @@ master_doc = 'index' # General information about the project. project = u'OpenLP' -copyright = u'2004 - 2012, Raoul Snyman' +copyright = u'2004 - 2015, Raoul Snyman' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '2.0' +version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.0' +release = '2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -95,27 +95,27 @@ pygments_style = 'sphinx' if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp': html_theme = 'openlp_qthelp' else: - html_theme = 'classic' + html_theme = 'sphinx_rtd_theme' # 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. -if sys.argv[2] == 'html': - html_theme_options = { - 'sidebarbgcolor': '#3a60a9', - 'relbarbgcolor': '#203b6f', - 'footerbgcolor': '#26437c', - 'headtextcolor': '#203b6f', - 'linkcolor': '#26437c', - 'sidebarlinkcolor': '#ceceff' - } +#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 = [os.path.abspath(os.path.join('..', '..', 'common', 'themes'))] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = u'OpenLP 2.0 Reference Manual' +html_title = u'OpenLP 2.2 Reference Manual' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -191,7 +191,7 @@ htmlhelp_basename = 'OpenLP' # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'OpenLP.tex', u'OpenLP Reference Manual', - u'Wesley Stout', 'manual'), + u'OpenLP Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -224,7 +224,7 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'openlp', u'OpenLP Reference Manual', - [u'Wesley Stout'], 1) + [u'OpenLP Developers'], 1) ] # -- Options for apple help output -------------------------------------------- From 986bd94cde3d76baf0ae2a9dc506ec0851724c32 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 6 Sep 2015 16:23:14 +0100 Subject: [PATCH 02/11] updated system requirements. --- manual/source/system_requirements.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/manual/source/system_requirements.rst b/manual/source/system_requirements.rst index de2ce8a..f766aa1 100644 --- a/manual/source/system_requirements.rst +++ b/manual/source/system_requirements.rst @@ -9,14 +9,13 @@ on less powerful hardware but you may not get the performance you desire. * 2Ghz CPU * 1GB RAM * 100MB free disk space -* Windows XP/Vista/Windows 7, Linux, Mac OS X (10.5 or 10.6), Free BSD +* Windows Vista/7/8/10, Linux, Mac OS X (10.9 or 10.10), FreeBSD * Multiple Monitor Support is highly recommended (not required) * For Presentation support: - * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007, - OpenOffie.org Impress 3.2 or LibreOffice Impress 3.3 - * Linux: OpenOffice.org Impress 3.2 or LibreOffice Impress 3.3 + * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010), + OpenOffie.org Impress 4 or LibreOffice Impress 4 + * Linux: OpenOffice.org Impress 4 or LibreOffice Impress 4 * Mac: Not supported yet * The Generic Document/Presentation and Songs of Fellowship song import options - require OpenOffice.org 3.2 or LibreOffice 3.3 - + require OpenOffice.org 4 or LibreOffice 4 From 8f06765024e53fe0d8522d8f8a40f942783e95de Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 6 Sep 2015 20:47:19 +0100 Subject: [PATCH 03/11] Update the FAQ --- manual/source/faq.rst | 162 +++++++------------------- manual/source/system_requirements.rst | 2 +- 2 files changed, 41 insertions(+), 123 deletions(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 1436b4e..5f9a1a6 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -30,18 +30,18 @@ A variety of places! * If you are a member of any Christian Forums or websites, and their rules allow it, then perhaps review the software or ask others to review it. -What operating systems will OpenLP 2.0 support? +What operating systems will OpenLP 2.2 support? ----------------------------------------------- -OpenLP 2.0 is designed to be cross platform. Currently it has been known to run -on Windows (XP, Vista, 7), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OSX. +OpenLP 2.2 is designed to be cross platform. Currently it has been known to run +on Windows (XP, Vista, 7), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. `Please let us know `_ if you've successfully run it on something else. -Which programming language is 2.0 developed in? +Which programming language is 2.2 developed in? ----------------------------------------------- -OpenLP 2.0 is written in `Python `_ and uses the +OpenLP 2.2 is written in `Python3 `_ and uses the `Qt4 toolkit `_. Both are cross-platform which allows the software to run on different types of machine and so allow more people access to free worship software. Python is one of the easier programming languages to @@ -72,82 +72,28 @@ release then just `download it `_. Upgrading ========= -Does 2.0 replace 1.2, or can they be run side by side? ------------------------------------------------------- +Can I upgrade from any 1.9.x or 2.0.x to 2.2? +--------------------------------------------- -It is perfectly safe to install 2.0 on a system with 1.2. Both versions are -installed in separate places, so you can still go back to 1.2. You can even run -them at the same time! +No, you should first upgrade to the last stable release in the 2.0-series +(2.0.5) and the upgrade to 2.2 to ensure that data is correctly upgraded. -2.0 stores its data in a separate folder to 1.2, so your data is perfectly safe, -and whatever you do in 2.0 will not damage 1.2 - -Are 1.2 and 2.0 compatible? ---------------------------- - -No. However imports exist to transfer your data to the new version. - -I have a computer that is quite old, should I upgrade? ------------------------------------------------------- - -2.0 does require significantly more resources than v1.2. Therefore if your -computer does not have much memory you may find 2.0 will struggle, `especially` -when changing between slides. - -Why can I not see my 1.2 songs, bibles and themes in 2.0? ---------------------------------------------------------- - -This is an beta release, which means it is not finished and one of the things we -haven't completely finished yet is importing 1.2 data automatically. We plan to -do this `Version 1.9.6 (beta 2) `_. - -How do I transfer my 1.2 song database? +Can I upgrade directly from 1.2 to 2.2? --------------------------------------- -In OpenLP 2.0, go to the :menuselection:`File --> Import --> Song` menu. -In the Wizard that appears, click Next and choose "openlp.org v1.x" from the -Format list. Click the search button on the Filename prompt, and at the bottom -of the dialog, copy the following into the File name prompt:: +No, you will have to install 2.0.5 first, then import the 1.2 data and then +upgrade to 2.2. See the 2.0 documentation for how to upgrade from 1.2 to +2.0. - %ALLUSERSPROFILE%\Application Data\openlp.org\Data\songs.olp +Does 2.2 replace 2.0, or can they be run side by side? +------------------------------------------------------ -*(This must be in the popup file chooser dialog. Don't enter it directly into -the wizard).* - -Click Open, then in the wizard just click Next and wait for the import to complete. - -How do I transfer my 1.2 Bibles? --------------------------------- - -In OpenLP 2.0, go to the :menuselection:`File --> Import --> Bible` menu. -In the Wizard that appears, click Next and choose "openlp.org v1.x" from the -Format list. -Click the search button on the Filename prompt, and at the bottom of the dialog, -copy the following into the File name prompt:: - - %ALLUSERSPROFILE%\Application Data\openlp.org\Data\Bibles - -*(This must be in the popup file chooser dialog. Don't enter it directly into -the wizard).* - -Choose the Bible, Click Open, then in the wizard just click Next, enter the -License details, and wait for the import to complete. - -How do I transfer my 1.2 Themes? --------------------------------- - -In openlp.org v1, export each theme by selecting it in the Theme Manager, and -then clicking the picture of a blue folder with red arrow on the Theme Managers -toolbox. This theme file can then be imported into V2 using the -:menuselection:`File --> Import --> Theme` menu. - -I can't get my 2.0 theme to look the same as 1.2 ------------------------------------------------- - -OpenLP 2.0 is a complete rewrite using a completely different programming -language so it would work on different types of system. There are differences in -how the old and new languages draw text on the screen, and therefore it is -unlikely you'll get an exact match. +OpenLP 2.2 and 2.0 cannot run side by side. When running 2.2 for first time +any existing 2.0 data will automatically be upgraded to the 2.2 format. +Note that OpenLP 2.2 is not backwards compatible with 2.0. Once you have +upgraded from 2.0, version 2.0 cannot read the upgraded files. OpenLP 2.2 will +ask if it should make a backup on startup, which can be used in case you want +to downgrade to 2.0 again. Using OpenLP ============ @@ -157,8 +103,7 @@ I've started OpenLP, but I can't see the songs or bibles section in the Media Ma When you installed OpenLP, the first time wizard would have asked which plugins you wanted, and songs and bibles should have been selected. If for some reason -they were not, then you will need to activate them yourself. See -`How do I activate / deactivate a plugin `_ +they were not, then you will need to activate them yourself. See below for instructions. How do I activate / deactivate a plugin? @@ -187,9 +132,6 @@ appropriate checkbox(es). Check the applications you require, and then restart OpenLP for the change to be detected. Note, PowerPoint Viewer 2010 is not yet supported, use 2003 or 2007. -See also `I'm on Windows and PowerPoint is installed, but it doesn't appear as an option `_ -and `Why is there no presentations plugin available on OS X? `_ - Why is there no presentations plugin available on OS X? ------------------------------------------------------- @@ -200,14 +142,19 @@ called pyuno bridge) which could be used by OpenLP. As soon as the interoperability component works on OS X we can re-enable the plugin and bundle it. We are really sorry for that. +I'm on Windows and PowerPoint is installed, but it doesn't appear as an option +------------------------------------------------------------------------------ + +Try installing the `Visual C++ Runtime Redistributable `_. + Is it possible to get Bible x? How? ----------------------------------- -The Bible plugin has a much improved `Import Wizard` which can import Bibles +The Bible plugin has a `Import Wizard` which can import Bibles from a variety of sources. The following sources are supported: CSV - The same format as documented for `openlp.org 1.x `_. + The format is documented in the `OpenLP API documentation `_. OSIS An XML format for Bible. You can export Bibles from the `Sword Project `_ @@ -234,6 +181,9 @@ Web Download * `BibleGateway `_ * `BibleServer `_ +Zefania + The Zefania project has many bibles available from `their website `_ + Why do my Bible verses take a long time to load? ------------------------------------------------ @@ -298,8 +248,8 @@ this to us so that OpenLP can be improved. Before reporting any bugs please first make sure that there isn't already a bug report about your problem: #. Check the `Launchpad bug list `_ -#. `OpenLP support System `_ -#. Check the `bug reports `_ forum +#. `OpenLP support System `_ +#. Check the ``_ forum If there **is already a bug report**, you may be able to help by providing further information. However, **if no one else has reported** it yet, then @@ -309,9 +259,9 @@ please post a new bug report. `bugs list `_ on Launchpad. #. Alternatively, if you don't have a Launchpad account and don't want to sign up for one, you can post in the - `bug reports forum `_. + `bug reports forum `_. #. If none of these ways suits you, you can send an email to - ``bugs (at) openlp.org``. + ``support (at) openlp.org``. What information should I include in a bug report? -------------------------------------------------- @@ -366,7 +316,7 @@ the link to the page that is created. Windows ^^^^^^^ -Find the OpenLP 2.0 folder in your Start menu. Choose the "OpenLP (Debug)" option. +Find the OpenLP 2.2 folder in your Start menu. Choose the "OpenLP (Debug)" option. OpenLP will start up. Go to the :menuselection:`Tools --> Open Data Folder` menu option, and an Explorer window will appear containing folders such as alerts, @@ -422,11 +372,6 @@ directory:: ```` is your username. -I'm on Windows and PowerPoint is installed, but it doesn't appear as an option ------------------------------------------------------------------------------- - -Try installing the `Visual C++ Runtime Redistributable `_. - The command line shows many error messages ------------------------------------------ @@ -465,29 +410,12 @@ Windows & Mac OS X Phonon should already be set up properly. If you're still having issues, let the developers know. -I've upgraded from 1.9.2 to a newer version, and now OpenLP crashes on load ---------------------------------------------------------------------------- - -You need to upgrade your song database. See this `blog post `_ -for information on how to do this. - -I've upgraded to 1.9.5, and now OpenLP has duplicates of many songs in the Media Manager ----------------------------------------------------------------------------------------- - -You need to run :menuselection:`Tools --> Re-index Songs`. - There are no menu icons in OpenLP --------------------------------- This may affect (only) Linux users with XFCE or Gnome. To solve the problem, follow the instructions on `this bug report `_. -JPEG images don't work ----------------------- - -This is a known issue on some Mac OS X 10.5 systems, and has also been seen on -Windows XP too. The solution is to convert the image into another format such as -PNG. MP3's and other audio formats don't work ---------------------------------------- @@ -509,20 +437,11 @@ this, but there is no timeframe at present. Features ======== -What new features will I find in 2.0? -------------------------------------- - -Since 2.0 was a rewrite from the ground up, you won't find a great deal of new -features since initially we want to ensure all the 1.2 features are included. -However the developers have managed to sneak a few in. Take a look at the -`complete list `_. - Why hasn't popular feature request X been implemented? ------------------------------------------------------ -We made a decision to first implement 1.2 features, before going wild on new -features. There are only a handful of developers working in their spare time. If -we were to try and include everything we wanted to implement, then 2.0 would not +There are only a handful of developers working in their spare time. If +we were to try and include everything we wanted to implement, then 2.2 would not likely ever get released. I have a great idea for a new feature, where should I suggest it? @@ -530,6 +449,5 @@ I have a great idea for a new feature, where should I suggest it? First of all check it isn't on the `Feature Requests `_ page. If it is, then you need to say no more, it's already been suggested! If it -isn't on the list, then head to the -`feature request forum `_ +isn't on the list, then head to the `forum `_ and post the idea there. diff --git a/manual/source/system_requirements.rst b/manual/source/system_requirements.rst index f766aa1..374b4a6 100644 --- a/manual/source/system_requirements.rst +++ b/manual/source/system_requirements.rst @@ -9,7 +9,7 @@ on less powerful hardware but you may not get the performance you desire. * 2Ghz CPU * 1GB RAM * 100MB free disk space -* Windows Vista/7/8/10, Linux, Mac OS X (10.9 or 10.10), FreeBSD +* Windows Vista/7/8/10, Linux, Mac OS X (10.8 or later), FreeBSD * Multiple Monitor Support is highly recommended (not required) * For Presentation support: From 5614167a719260aaeb968a88eef52d78f37de1cf Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 7 Sep 2015 12:52:25 +0100 Subject: [PATCH 04/11] updates to the faq --- manual/source/faq.rst | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 5f9a1a6..e21a7fe 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -10,7 +10,7 @@ Can I help with OpenLP? OpenLP is possible because of the commitment of individuals. If you would like to help there are several things that you can get involved with. Please see: -`Contributing `_ +`Contributing `_ for more information. I use and like OpenLP and would like to tell others online. Where can I do this? @@ -34,7 +34,7 @@ What operating systems will OpenLP 2.2 support? ----------------------------------------------- OpenLP 2.2 is designed to be cross platform. Currently it has been known to run -on Windows (XP, Vista, 7), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. +on Windows (XP, Vista, 7, 8, 10), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. `Please let us know `_ if you've successfully run it on something else. @@ -72,11 +72,11 @@ release then just `download it `_. Upgrading ========= -Can I upgrade from any 1.9.x or 2.0.x to 2.2? ---------------------------------------------- +Can I upgrade from any 1.9.x or 2.0.x release to 2.2? +----------------------------------------------------- No, you should first upgrade to the last stable release in the 2.0-series -(2.0.5) and the upgrade to 2.2 to ensure that data is correctly upgraded. +(2.0.5) and then upgrade to 2.2 to ensure that data is correctly converted. Can I upgrade directly from 1.2 to 2.2? --------------------------------------- @@ -89,12 +89,15 @@ Does 2.2 replace 2.0, or can they be run side by side? ------------------------------------------------------ OpenLP 2.2 and 2.0 cannot run side by side. When running 2.2 for first time -any existing 2.0 data will automatically be upgraded to the 2.2 format. +any existing 2.0 data will automatically be converted to the 2.2 format. Note that OpenLP 2.2 is not backwards compatible with 2.0. Once you have upgraded from 2.0, version 2.0 cannot read the upgraded files. OpenLP 2.2 will ask if it should make a backup on startup, which can be used in case you want to downgrade to 2.0 again. +OpenLP 2.2 cannot read service files created by OpenLP 2.0.4 and earlier, it can only +read service files created by OpenLP 2.0.5. + Using OpenLP ============ From 39e46961a93021a0f6116935b3abfdf5d441ba8e Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 7 Sep 2015 20:17:22 +0100 Subject: [PATCH 05/11] Added gimp-script for adding shadow to screenshots. --- batch-drop-shadow.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 batch-drop-shadow.scm diff --git a/batch-drop-shadow.scm b/batch-drop-shadow.scm new file mode 100644 index 0000000..6aaa637 --- /dev/null +++ b/batch-drop-shadow.scm @@ -0,0 +1,26 @@ + ; Based on script by Michiel Roos, found on: + ; http://www.typofree.org/article/archive/2009/january/title/create-a-drop-shadow-folder-action/ + ; + ; Place the script in your gimp scripts folder (eg. ~/.gimp-2.8/scripts) go to the + ; folder with images you wish to add shadow to and execute like this: + ; gimp --no-data -i -b '(batch-drop-shadow "*.png" 8 8 10)' -b '(gimp-quit 0)' + ; + + (define (batch-drop-shadow pattern + offsetx + offsety + radius) + (let* ((filelist (cadr (file-glob pattern 1)))) + (while (not (null? filelist)) + (let* ((filename (car filelist)) + (image (car (gimp-file-load RUN-NONINTERACTIVE filename filename))) + (drawable (car (gimp-image-get-active-layer image)))) + (script-fu-drop-shadow image drawable offsetx offsety radius '(0 0 0) 80.0 TRUE) + (set! drawable (car (gimp-image-merge-visible-layers image 0))) + (gimp-file-save RUN-NONINTERACTIVE image drawable filename filename) + (gimp-image-delete image) + ) + (set! filelist (cdr filelist)) + ) + ) + ) From fef8b52c34c1e0fd207b6b82f88ea259c05b4675 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 7 Sep 2015 21:54:06 +0100 Subject: [PATCH 06/11] Removed unused html theme options. --- manual/source/conf.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/manual/source/conf.py b/manual/source/conf.py index d94f14c..e66d7e6 100644 --- a/manual/source/conf.py +++ b/manual/source/conf.py @@ -102,12 +102,7 @@ else: # documentation. #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. From 98ae2efee18d34fc7bac09ffc0cb693ed765ea9f Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 7 Sep 2015 22:26:02 +0100 Subject: [PATCH 07/11] Updated faq. Removed references to OOo and XP. Added som Mac-impress-powerpoint answers. --- manual/source/faq.rst | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index e21a7fe..96676df 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -34,7 +34,7 @@ What operating systems will OpenLP 2.2 support? ----------------------------------------------- OpenLP 2.2 is designed to be cross platform. Currently it has been known to run -on Windows (XP, Vista, 7, 8, 10), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. +on Windows (Vista, 7, 8, 10), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. `Please let us know `_ if you've successfully run it on something else. @@ -135,15 +135,21 @@ appropriate checkbox(es). Check the applications you require, and then restart OpenLP for the change to be detected. Note, PowerPoint Viewer 2010 is not yet supported, use 2003 or 2007. -Why is there no presentations plugin available on OS X? -------------------------------------------------------- +Why can LibreOffice Impress not be used on Mac OS X? +---------------------------------------------------- -Currently the presentations plugin is not bundled with OpenLP on OS X. The -reason for that is that the OpenOffice.org version on Mac OS X does not contain -the (more exact: does only contain a broken) interoperability component (the so -called pyuno bridge) which could be used by OpenLP. As soon as the -interoperability component works on OS X we can re-enable the plugin and bundle -it. We are really sorry for that. +Currently the presentations plugin does not support Impress on OS X. The +reason for that is that the interoperability component (pyuno) in LibreOffice on +Mac OS X cannot be used by OpenLP due to incompatibilities between the version +of Python used by LibreOffice and the Python version used by OpenLP. + +Why can MS PowerPoint not be used on Mac OS X? +---------------------------------------------------- + +Currently the presentations plugin does not support PowerPoint on OS X. The +reason for that is that so far we have found that the available method to +control PowerPoint on OS X is not good enough for integration with OpenLP. +If this changes we will look at including this feature. I'm on Windows and PowerPoint is installed, but it doesn't appear as an option ------------------------------------------------------------------------------ @@ -285,9 +291,9 @@ Version of OpenLP Steps to Reproduce The exact steps the developers need to follow in order to reproduce the bug. -Version of MS Office or OpenOffice +Version of MS Office or LibreOffice If you're using the song imports or the presentation plugin, you'll need to - supply the version of Office, OpenOffice.org or LibreOffice. + supply the version of Office or LibreOffice. Bible Translation and Source If the bug occurred while you were working with Bibles, specify the @@ -423,8 +429,7 @@ follow the instructions on `this bug report Date: Tue, 8 Sep 2015 09:32:01 +0100 Subject: [PATCH 08/11] More updates. --- manual/source/faq.rst | 78 +++++++++++++-------------- manual/source/system_requirements.rst | 8 +-- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 96676df..42c26c5 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -35,7 +35,7 @@ What operating systems will OpenLP 2.2 support? OpenLP 2.2 is designed to be cross platform. Currently it has been known to run on Windows (Vista, 7, 8, 10), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. -`Please let us know `_ if you've +`Please let us know `_ if you have successfully run it on something else. Which programming language is 2.2 developed in? @@ -61,11 +61,11 @@ What is a beta release? A beta release is a release which is almost feature complete and is fairly stable. However there may still be a few `features `_ -to complete, and `bugs `_ we've not yet fixed. +to complete, and `bugs `_ we have not yet fixed. It is used by several people without serious problems. However there is a small possibility that it could still crash occasionally or do unexpected things. It is intended for those who want the latest version, and are prepared to give the -program a good test before using it in a live situation to ensure they won't +program a good test before using it in a live situation to ensure they will not encounter any unexpected problems. If you want to have a look at the latest beta release then just `download it `_. @@ -101,8 +101,8 @@ read service files created by OpenLP 2.0.5. Using OpenLP ============ -I've started OpenLP, but I can't see the songs or bibles section in the Media Manager -------------------------------------------------------------------------------------- +I have started OpenLP, but I cannot see the songs or bibles section in the Media Manager +---------------------------------------------------------------------------------------- When you installed OpenLP, the first time wizard would have asked which plugins you wanted, and songs and bibles should have been selected. If for some reason @@ -113,7 +113,7 @@ How do I activate / deactivate a plugin? ---------------------------------------- Plugins can be turned on and off from the Plugin List Screen. Select the plugin -you wish to start/stop and change it's status. You should not need to restart +you wish to start/stop and change its status. You should not need to restart OpenLP. What are these plugins that I keep seeing mentioned? @@ -144,15 +144,15 @@ Mac OS X cannot be used by OpenLP due to incompatibilities between the version of Python used by LibreOffice and the Python version used by OpenLP. Why can MS PowerPoint not be used on Mac OS X? ----------------------------------------------------- +---------------------------------------------- Currently the presentations plugin does not support PowerPoint on OS X. The reason for that is that so far we have found that the available method to control PowerPoint on OS X is not good enough for integration with OpenLP. If this changes we will look at including this feature. -I'm on Windows and PowerPoint is installed, but it doesn't appear as an option ------------------------------------------------------------------------------- +I am on Windows and PowerPoint is installed, but it does not appear as an option +-------------------------------------------------------------------------------- Try installing the `Visual C++ Runtime Redistributable `_. @@ -200,10 +200,10 @@ In order to better conform to copyright law, the Web Download Bibles are not downloaded when you import them, but on the fly as you search for them. As a result, the search takes a little longer if you need to download those particular verses. Having said that, the Web Download Bibles cache downloaded -verses so that you don't need to download them again. +verses so that you do not need to download them again. -My Bible is on the Web Download sites, but my Church isn't on the internet. What options do I have? ---------------------------------------------------------------------------------------------------- +My Bible is on the Web Download sites, but my Church is not on the internet. What options do I have? +---------------------------------------------------------------------------------------------------- When you create and save a service, all the items in the service are saved with it. That means any images, presentations, songs and media items are saved. This @@ -218,7 +218,7 @@ Note this can also be done with songs, etc! Linux, FreeBSD & PC-BSD ----------------------- -If your distribution supports the XDG standard, you'll find OpenLP's +If your distribution supports the XDG standard, you will find OpenLP's configuration file in:: /home//.config/OpenLP/OpenLP.conf @@ -232,7 +232,7 @@ If that file and/or directory does not exist, look for:: OS X ---- -You'll find your configuration file here:: +You will find your configuration file here:: /Users//Library/Preferences/org.openlp.OpenLP.plist @@ -254,7 +254,7 @@ Something has gone wrong, what should I do to help get it fixed? If you have found an error in the program (what we call a bug) you should report this to us so that OpenLP can be improved. Before reporting any bugs please -first make sure that there isn't already a bug report about your problem: +first make sure that there is not already a bug report about your problem: #. Check the `Launchpad bug list `_ #. `OpenLP support System `_ @@ -266,7 +266,7 @@ please post a new bug report. #. The **preferred place** for reporting bugs is the `bugs list `_ on Launchpad. -#. Alternatively, if you don't have a Launchpad account and don't want to sign +#. Alternatively, if you do not have a Launchpad account and do not want to sign up for one, you can post in the `bug reports forum `_. #. If none of these ways suits you, you can send an email to @@ -276,14 +276,14 @@ What information should I include in a bug report? -------------------------------------------------- Since OpenLP 1.9.4, there is a bug report dialog which automatically opens when -OpenLP hits a serious bug. However, this doesn't appear all the time, and in -some behavioural bugs, you'll have to file a bug report yourself. The following +OpenLP hits a serious bug. However, this does not appear all the time, and in +some behavioural bugs, you will have to file a bug report yourself. The following items are information the developers need in order to reproduce the bug. Operating System Include information such as the version of your operating system, the - distribution (e.g. Ubuntu, Fedora, etc.) if you're using Linux, or the - edition (e.g. Home, Basic, Business, etc.) if you're using Windows. + distribution (e.g. Ubuntu, Fedora, etc.) if you are using Linux, or the + edition (e.g. Home, Basic, Business, etc.) if you are using Windows. Version of OpenLP You can find out the version of OpenLP by going to :menuselection:`Help --> About` @@ -292,7 +292,7 @@ Steps to Reproduce The exact steps the developers need to follow in order to reproduce the bug. Version of MS Office or LibreOffice - If you're using the song imports or the presentation plugin, you'll need to + If you are using the song imports or the presentation plugin, you will need to supply the version of Office or LibreOffice. Bible Translation and Source @@ -307,8 +307,8 @@ Bible Translation and Source The more information you give us, the better we can help you. -I've been asked to email a debug log, where do I find this? ------------------------------------------------------------ +I have been asked to email a debug log, where do I find this? +------------------------------------------------------------- We may need a debug log to help pin-point the issue. A new log file is created each time you start OpenLP so copy the file before you run the software a second @@ -316,7 +316,7 @@ time. On Windows a Debug option is available in the start menu. On other systems you will need to run OpenLP from the command line, with the following option: ```-l debug```. Please note, that is a lowercase **L**. -If you haven't been given a specific email address to send it to, then please do +If you have not been given a specific email address to send it to, then please do not paste the log contents straight into a forum post. Instead, open the log file in a text editor (such as notepad on Windows) and copy and paste the contents into somewhere like `pastebin.com `_. Then give us @@ -344,15 +344,15 @@ If you installed OpenLP from a package:: @:~$ openlp -l debug -Alternately, if you're running OpenLP from source:: +Alternately, if you are running OpenLP from source:: @:~$ ./openlp.pyw -l debug -If your Linux distribution supports the XDG standard, you'll find the log in:: +If your Linux distribution supports the XDG standard, you will find the log in:: ~/.cache/openlp/openlp.log -Otherwise, you'll find the log file in:: +Otherwise, you will find the log file in:: ~/.openlp/openlp.log @@ -372,7 +372,7 @@ And then run OpenLP in debug mode:: @:~$ ./openlp -l debug -Once you've done that, you need to get the log file. In your home directory, +Once you have done that, you need to get the log file. In your home directory, open the Library directory, and the Application Support directory within that. Then open the openlp directory, and you should find the openlp.log file in that directory:: @@ -398,17 +398,17 @@ for Phonon. Linux/FreeBSD ^^^^^^^^^^^^^ -If you're using Gnome, you need to install the GStreamer backend for Phonon. On +If you are using Gnome, you need to install the GStreamer backend for Phonon. On Ubuntu you would install the ```phonon-backend-gstreamer``` package:: @:~$ sudo aptitude install phonon-backend-gstreamer -If you're using KDE, you need to install the Xine backend for Phonon. On Kubuntu +If you are using KDE, you need to install the Xine backend for Phonon. On Kubuntu you would install the ```phonon-backend-xine``` package:: @:~$ sudo aptitude install phonon-backend-xine -If you know which audiovisual system you're using, then install the appropriate +If you know which audiovisual system you are using, then install the appropriate backend. phonon-backend-vlc may also be worth trying on some systems. @@ -416,7 +416,7 @@ phonon-backend-vlc may also be worth trying on some systems. Windows & Mac OS X ^^^^^^^^^^^^^^^^^^ -Phonon should already be set up properly. If you're still having issues, let the +Phonon should already be set up properly. If you are still having issues, let the developers know. There are no menu icons in OpenLP @@ -426,8 +426,8 @@ This may affect (only) Linux users with XFCE or Gnome. To solve the problem, follow the instructions on `this bug report `_. -MP3's and other audio formats don't work ----------------------------------------- +MP3's and other audio formats do not work +----------------------------------------- This is a known issue on some systems, and we have no solution at the moment. @@ -445,8 +445,8 @@ this, but there is no timeframe at present. Features ======== -Why hasn't popular feature request X been implemented? ------------------------------------------------------- +Why has popular feature request X not been implemented? +------------------------------------------------------- There are only a handful of developers working in their spare time. If we were to try and include everything we wanted to implement, then 2.2 would not @@ -455,7 +455,7 @@ likely ever get released. I have a great idea for a new feature, where should I suggest it? ----------------------------------------------------------------- -First of all check it isn't on the `Feature Requests `_ -page. If it is, then you need to say no more, it's already been suggested! If it -isn't on the list, then head to the `forum `_ +First of all check it is not on the `Feature Requests `_ +page. If it is, then you need to say no more, it has already been suggested! If it +is not on the list, then head to the `forum `_ and post the idea there. diff --git a/manual/source/system_requirements.rst b/manual/source/system_requirements.rst index 374b4a6..1410e46 100644 --- a/manual/source/system_requirements.rst +++ b/manual/source/system_requirements.rst @@ -13,9 +13,9 @@ on less powerful hardware but you may not get the performance you desire. * Multiple Monitor Support is highly recommended (not required) * For Presentation support: - * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010), - OpenOffie.org Impress 4 or LibreOffice Impress 4 - * Linux: OpenOffice.org Impress 4 or LibreOffice Impress 4 + * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010) + or LibreOffice Impress 4 or later + * Linux: LibreOffice Impress 4 or later * Mac: Not supported yet * The Generic Document/Presentation and Songs of Fellowship song import options - require OpenOffice.org 4 or LibreOffice 4 + require LibreOffice 4 or later From 010df9fef08d83d57c65182aab33db3fb2bd7d23 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 8 Sep 2015 10:18:39 +0100 Subject: [PATCH 09/11] Updated supported linux distros. Fixes bug 1011003. Fixes: https://launchpad.net/bugs/1011003 --- manual/source/faq.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 42c26c5..4c3824e 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -34,7 +34,8 @@ What operating systems will OpenLP 2.2 support? ----------------------------------------------- OpenLP 2.2 is designed to be cross platform. Currently it has been known to run -on Windows (Vista, 7, 8, 10), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OS X. +on Windows (Vista, 7, 8, 10), Linux (Ubuntu and its variants, Fedora, Debian, +ArchLinux, Mint, OpenSUSE and many many others), FreeBSD & Mac OS X. `Please let us know `_ if you have successfully run it on something else. From b0171bda7a1f7a116d793df21a94ee8329a51ab6 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 8 Sep 2015 10:31:30 +0100 Subject: [PATCH 10/11] Added link to cvs-bible format. Fixes bug 1134050. Fixes: https://launchpad.net/bugs/1134050 --- manual/source/bibles.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index 37abff4..7214e28 100644 --- a/manual/source/bibles.rst +++ b/manual/source/bibles.rst @@ -153,9 +153,12 @@ you should now be ready to use the web Bible. Importing CSV formatted Bibles ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you have a Bible in .csv format OpenLP can import it. CSV Bibles will -consist of two files a `books` file and a `verse` file. Select CSV from the list -of Bible types to import. +If you have a Bible in .csv format OpenLP can import it. If you wish to create +a bible in the CSV format yourself the format is documented in the +`OpenLP API documentation `_. + +CSV Bibles will consist of two files a `books` file and a `verse` file. +Select CSV from the list of Bible types to import. You are now ready to select your .csv files. You will need to select both your books and verse file location. From d6057692594e5dd6029096596e99d6223afa296e Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 8 Sep 2015 10:36:49 +0100 Subject: [PATCH 11/11] Removed reference to beta release. Fixes bug 1011004. Fixes: https://launchpad.net/bugs/1011004 --- manual/source/faq.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 4c3824e..12c7d1a 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -57,19 +57,6 @@ OpenLP has support for multiple languages which can be seen on the are incomplete. If you would like to help complete or start to translate OpenLP into your language then see the `Getting started page `_. -What is a beta release? ------------------------ - -A beta release is a release which is almost feature complete and is fairly -stable. However there may still be a few `features `_ -to complete, and `bugs `_ we have not yet fixed. -It is used by several people without serious problems. However there is a small -possibility that it could still crash occasionally or do unexpected things. It -is intended for those who want the latest version, and are prepared to give the -program a good test before using it in a live situation to ensure they will not -encounter any unexpected problems. If you want to have a look at the latest beta -release then just `download it `_. - Upgrading =========