"Updated screenshots for mediamanager, printouts and glossary docs.

Updated backup screenshots.
Updated projector screenshots.
Added docs about new webbible window.
Documented optional splits.
Updated configuration docs.
Added some recommendations to win8/10 setup
Updated most song docs.
And in general updated a bunch of screenshots."

bzr-revno: 123
Fixes: https://launchpad.net/bugs/860684, https://launchpad.net/bugs/1011001, https://launchpad.net/bugs/1072494, https://launchpad.net/bugs/1074860, https://launchpad.net/bugs/1226121, https://launchpad.net/bugs/1233012, https://launchpad.net/bugs/1239950

manual/source/bibles.rst

@@ -24,7 +24,7 @@ You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:`
 
 You will see the Bible Importer window, click :guilabel:`Next`.
 
-.. image:: pics/bibleimport01.png
+.. image:: pics/import_bible_start.png
 
 After clicking :guilabel:`Next` you can select from the various types of
 software that OpenLP will convert Bibles from. Click on the file folder icon to
@@ -32,7 +32,7 @@ choose the file(s) of the Bible database you want to import. See the sections
 below for more information on the different formats that OpenLP will import.
 Click :guilabel:`Next` to continue.
 
-.. image:: pics/bibleimport02.png
+.. image:: pics/import_bible_dropdown.png
 
 After selecting your file(s), you'll be asked to fill in the details of the
 Bible you are importing. Remember to check what information you need to display
@@ -42,12 +42,12 @@ copyright notice. Click :guilabel:`Next` to continue.
 **Note:** You can use one blank space using the space bar in the copyright field 
 to continue if you do not have or need copyright information.
 
-.. image:: pics/bibleimportdetails1.png
+.. image:: pics/import_bible_license.png
 
 After entering the license details, OpenLP will start to import your Bible.
 It may take some time to import your Bible so please be patient.
 
-.. image:: pics/bibleimportfinished1.png
+.. image:: pics/import_bible_finished.png
 
 When the import has finished click :guilabel:`Finish` and you should be
 ready to use your Bible in OpenLP.
@@ -58,6 +58,8 @@ Importing OSIS Bibles
 Importing OSIS files is very simple. Select OSIS as your import source, select
 your OSIS Bible file and continue the import process.
 
+.. image:: pics/import_bible_osis.png
+
 **About OSIS Formatted Bibles**
 
 The OSIS XML standard was designed to provide a common format for distribution
@@ -102,6 +104,8 @@ by right clicking on the downloaded file and select `Extract` or `Extract Here`.
 Note that some of the bibles on OpenSongs webpage are actually in the Zefania
 format, which OpenLP can also import, see :ref:`zefaniaimport`.
 
+.. image:: pics/import_bible_opensong.png
+
 After selecting the OpenSong Bibles you want to import, follow the rest of the
 import process. When the import has finished you should be ready to use your
 OpenSong Bibles.
@@ -119,17 +123,30 @@ as another option and does require an internet connection.
 
 To use the web download feature select web download from the import wizard.
 
-You can select from several options of location to download from and also
-what Bible translation you need. You will probably want to choose the location
-from where you get the best performance or has the translation you need.
+.. image:: pics/import_bible_web1.png
 
-.. image:: pics/webbible1.png
+First click :guilabel:`Download bible list` to download a list of available
+bibles.
+
+.. image:: pics/import_bible_web2.png
+
+This will take a few moments depending on your internet connection and load on
+the servers.
+
+.. image:: pics/import_bible_web3.png
+
+When the download is complete you can select from 3 different sources to 
+download from: `Crosswalk <http://www.biblestudytools.com/>`_, `BibleServer
+<http://www.bibleserver.com/>`_ and `BibleGateway
+<https://www.biblegateway.com/>`_. From each source there are many Bible
+translations available, so there is a good change that you will find what you
+need.
 
 You can also select a proxy server if needed from the `Proxy Server` tab. Your
-network administrator will know if this is necessary, in most cases this will
+network administrator will know if this is necessary. In most cases this will
 not be needed.
 
-.. image:: pics/webbibleproxy1.png
+.. image:: pics/import_bible_web_proxy.png
 
 After selecting your download location and the Bible you wish to use, click
 :guilabel:`Next` to continue the import process. When your import is completed
@@ -148,7 +165,7 @@ 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.
 
-.. image:: pics/csvimport1.png
+.. image:: pics/import_bible_csv.png
 
 After you have selected the file locations you can continue with the import
 process. Once it is complete you should be ready to use your imported CSV Bible.
@@ -164,6 +181,8 @@ Find the Bible you would like to import and download the file. The downloaded
 file is a zip-file from which the Bible must be extracted. This is usually done
 by right clicking on the downloaded file and select `Extract` or `Extract Here`.
 
+.. image:: pics/import_bible_zefania.png
+
 You can now simply select the extracted file for import and click
 :guilabel:`Next` to continue the import process. When your import is completed
 you should now be ready to use the imported Zefania Bible.

manual/source/configure.rst

@@ -62,7 +62,7 @@ Background Audio
 **Repeat track list:**
   With this option selected and you are using background audio, the tracks will
   repeat when it reaches the end of the list (even if there is only one item).
-	
+
 Application Startup
 ^^^^^^^^^^^^^^^^^^^
 
@@ -117,7 +117,7 @@ Global Theme
 Choose the theme you would like to use as your default global theme from the
 drop down box. The theme selected appears below. The global theme use is
 determined by the Theme Level you have selected.
-	
+
 Theme Level
 ^^^^^^^^^^^
 
@@ -138,6 +138,14 @@ Choose from one of three options for the default use of your theme.
   With this level selected, all songs and verses will use the theme selected on
   the left in the Global Theme drop down.
 
+Universal Settings
+^^^^^^^^^^^^^^^^^^
+
+**Wrap footer text:**
+  Check this if you want text in the footer to wrap if the lines are too long to
+  be on one line.
+
+
 Advanced
 ========
 
@@ -205,6 +213,17 @@ time when saving your service file.
 technically inclined, there is more information at 
 `Python.org <http://docs.python.org/library/datetime.html#strftime-strptime-behavior>`_.
 
+Data Location
+^^^^^^^^^^^^^
+
+If you wish to change the default location of where OpenLP stores its data, you
+can enter a custom location here.
+
+|buttons_open| **Browse for a custom data location**
+
+|buttons_revert| **Revert:**
+  Clicking this button will erase your changes and revert to the default data
+  location. 
 
 Default Images
 ^^^^^^^^^^^^^^
@@ -252,8 +271,8 @@ These three settings control
   service from start to finish. Using this setting makes it possible to use a 
   presentation remote controller. 
 
-X11
-^^^
+Display Workarounds
+^^^^^^^^^^^^^^^^^^^
 
 **Bypass X11 Window Manager:**
   Linux and other X users may need to try toggling this flag if the main display 
@@ -264,11 +283,22 @@ X11
   appears to affect different versions and distributions differently, this 
   setting has been added, rather than try and work it out programmatically.
 
+**Use alternating row colors in lists:**
+  Using alternating row colors in most cases makes it easier for the human eye
+  to overview a list of items. Uncheck to disable.
+
+.. _config_players:
+
 Players
 =======
 
-.. image:: pics/configuremedia.png
-  
+.. image:: pics/configureplayers.png
+
+Background color
+^^^^^^^^^^^^^^^^
+Chose the background color to be shown as background for videos with different
+aspect ratio than the display screen.
+
 Available Media Players
 ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -287,7 +317,8 @@ players control the following:
    reputation of being able to handle almost any video or audio format.
 
 **Note:** You must have `VLC <http://www.videolan.org/vlc/>`_ installed for the 
-VLC option to be available.
+VLC option to be available. On Windows you must install the 32-bit version of VLC.
+On Mac OS X you must install the 64-bit version of VLC.
 
 Player Order
 ^^^^^^^^^^^^
@@ -296,6 +327,34 @@ Determines the preference order of the selected media players. The order is
 changed by selecting one of the available players and using the 
 :guilabel:`Down` or :guilabel:`Up` button to change the position of the player.
 
+.. _configure_projectors:
+
+Projectors
+==========
+
+.. image:: pics/configureprojectors.png
+
+Communication Options
+^^^^^^^^^^^^^^^^^^^^^
+
+The options available are:
+
+**Connect to projectors on startup:**
+  Check if you want to attempt to connect to all projectors when OpenLP starts.
+
+**Socket timeout (seconds):**
+  Time in seconds to wait for the projector connection. Available options are 2
+  to 10 seconds.
+
+**Poll timeout (seconds):**
+  How often to poll the projector for status information. Available options are
+  2 to 60 seconds. For quicker response on the status icons, set to a lower
+  value. If you have network congestion, you may need to use a higher value.
+
+**Source select dialog interface:**
+  Select whether you want all video source options on one dialog page or to use
+  tabs to consolidate the inputs based on video group.
+
 .. _config_songs:
 
 Songs
@@ -321,13 +380,21 @@ Songs Mode
   If this box is not selected, your song edit changes will only be available in 
   the :ref:`creating_service` if you add it again.
 
-**Add missing songs when opening service:**
-  With this box selected, when you open an order of service created on another
+**Import missing songs from service files:**
+  With this box selected, when you open a service file created on another
   computer, or if one of the songs are no longer in your :ref:`media-manager`, 
   it will automatically enter the song in your Songs Media Manager. If this box 
   is not checked, the song is available in the service but will not be added to 
   the :ref:`media-manager`.
 
+**Display songbook in footer:**
+  With this box selected the songbook name and number for songs (if available)
+  will be shown in the footer.
+
+**Display "©" symbol before copyright info:**
+  With this box selected the copyright symbol will be displayed in the footer
+  before the copyright information.
+
 Bibles
 ======
 
@@ -336,6 +403,10 @@ Bibles
 Verse Display
 ^^^^^^^^^^^^^
 
+**Show verse numbers:**
+  With this box selected verse numbers are always shown, deselect to hide verse
+  numbers.
+
 **Only show new chapter numbers:**
   With this box selected, the live display of the verse will only show the
   chapter number and verse for the first verse, and just the verse numbers after
@@ -372,6 +443,36 @@ Verse Display
 
 **Note:** Changes do not affect verses already in the service.
 
+Custom Scripture References
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here you can change the default separators used in the scripture references.
+The default values are shown in gray when the custom separators has not be 
+enabled and nothing has been entered. Note that the default separators can
+change if the language of OpenLP is changed.
+
+**Verse Separators:** Enable to enter a custom verse separator.
+
+**Range Separators:** Enable to enter a custom range separator.
+
+**List Separators:** Enable to enter a custom list separator.
+
+**End Mark:** Enable to enter a custom end marker.
+
+Default Bible Language
+^^^^^^^^^^^^^^^^^^^^^^
+
+Choose the language of the bible books. The options are:
+
+**Bible Language:**
+  The language of the books will be determined by the language of the bible.
+
+**Application Language:**
+  The language of the books will be determined by the language set for OpenLP.
+
+**English:**
+  The language of the books will be set to English.
+
 Presentations
 =============
 
@@ -387,6 +488,9 @@ feature you will need to have one of the above-mentioned applications installed,
 due to the fact that OpenLP uses these application to open and run the
 presentation.
 
+Support of PDF is bundled with OpenLP on Mac OS X and Windows. On Linux you will
+need to install :file:`mupdf` (recommended) or :file:`ghostscript`.
+
 Advanced
 ^^^^^^^^
 
@@ -395,6 +499,30 @@ Advanced
   box on the Presentations toolbar in :ref:`media-manager` which gives you the 
   option to select the presentation program you want to use.
 
+PowerPoint options
+^^^^^^^^^^^^^^^^^^
+
+These options are only available if PowerPoint has been detected.
+
+**Clicking on a selected slide in the slidecontroller advances to next effect:**
+  When this is enabled it is possible to go to the next effect of a slide by
+  clicking the slide in the slidecontroller. The default behavior is to restart
+  the slide.
+
+**Let PowerPoint control the size and position of the presentation window (workaround for Windows 8 scaling issue):**
+  Windows 8 and 10 can on computers with multiple monitors use scaling to make
+  windows look the same size on different monitors. Unfortunately this can
+  cause issues with how OpenLP places and resizes the PowerPoint presentation
+  window. Check this box to enable the workaround which let PowerPoint control
+  the presentation window. When you enable this you must setup PowerPoint to
+  present to the correct monitor.
+
+PDF options
+^^^^^^^^^^^
+
+**Use given full path for mudraw or ghostscript binary:**
+  Enable this if you want to enter a custom path for mudraw or ghostscript.
+
 Images
 ======
 
@@ -413,6 +541,8 @@ it is resized.
 Media
 =====
 
+.. image:: pics/configuremedia.png
+
 Advanced
 ^^^^^^^^
 
@@ -420,7 +550,11 @@ Advanced
   With this option selected, you will see :guilabel:`Use Player:` area with a 
   dropdown box on the Media tool bar in the :ref:`media-manager` which gives 
   you the option to select the media player you want to use.
-  
+
+**Start Live items automatically:**
+  With this option selected media items will start to play automatically when
+  sent live.
+
 Custom
 ======
 
@@ -438,6 +572,13 @@ Custom Display
 **Note:** If you have an entry in the Credits box of your custom slide, title and
 credits will always be displayed.
 
+**Import missing custom slides from service files:**
+  With this box selected, when you open a service file created on another
+  computer, or if one of the custom slides are no longer in your
+  :ref:`media-manager`, it will automatically enter the custom slide in your 
+  Custom Slide Media Manager. If this box is not checked, the custom slide is
+  available in the service but will not be added to the :ref:`media-manager`.
+
 .. _configure_alerts:
 
 Alerts
@@ -464,7 +605,7 @@ Font
   This setting will determine how long your :ref:`alerts` will be displayed on 
   the screen, in seconds.
 
-**Location:**
+**Vertical Align:**
   Choose the location where you want the alert displayed on the
   screen, Top, Middle or Bottom.
 

manual/source/configure_shortcuts.rst

@@ -47,8 +47,6 @@ one you can click on |configshortcut| twice. This will remove the shortcut.
 
 All Actions that you click on will show either Default or Custom.
 
-.. image:: pics/configure_shortcuts_bottom.png
-
 If you change or add any shortcut the option button for Custom will be selected. 
 Clicking the Default option button will restore the original shortcut. You can 
 also click |clearshortcut| to change it back to default. 
@@ -63,4 +61,4 @@ save any of your changes click :guilabel:`Cancel`
 
 .. |clearshortcut| image:: pics/configure_shortcuts_clear.png
 
-.. |configshortcut| image:: pics/configure_shortcuts_config.png
+.. |configshortcut| image:: pics/configure_shortcuts_config.png

manual/source/dualmonitors.rst

@@ -83,6 +83,26 @@ different configuration window will appear.
 To change the resolution of the screens you will have to click 
 :guilabel:`Advanced display settings`.
 
+**Recommendations**
+
+Windows 8 and 10 have several features that might seem smart on a normal desktop
+but which is not something that should be enabled when you want to use the
+computer for presenting songs, etc. during a service.
+
+.. image:: pics/task-bar-properties-win8.png
+
+Right click the task bar and choose :guilabel:`Properties`. You should uncheck
+:guilabel:`Use Peek to preview...` since it will totally blank the 2nd display
+if hovering mouse over an icon on the taskbar. You should also uncheck
+:guilabel:`Show taskbar on all displays`.
+
+.. image:: pics/task-bar-right-click-win10.png
+
+If you use Windows 10 you should probably also hide the :guilabel:`Task View`
+button from the taskbar, since clicking it will blank your 2nd display. To
+disable it, right click the taskbar, and uncheck :guilabel:`Show Task View
+button`.
+
 .. _win7monitor:
 
 Windows 7

manual/source/export_songs.rst

@@ -40,11 +40,6 @@ When you are finished with your selection click :guilabel:`Next`.
 **Note:** Exporting songs will create a file for each song, If you export one 
 hundred songs, you will have have one hundred individual files.
 
-.. image:: pics/export_song_process.png
-
-Shows the progress of exporting the songs.
-
 .. image:: pics/export_song_complete.png
 
 Click :guilabel:`Finish` to complete the export process.
-

manual/source/glossary.rst

@@ -133,4 +133,12 @@ Theme Manager
 The theme manager is where themes are created and edited. Themes are the text
 styles and backgrounds that you use to personalize your services.
 
-.. image:: pics/thememanager.png
+.. image:: pics/theme_manager_main.png
+
+
+Projector Manager
+-----------------
+
+The :ref:`projector` is where you can manage and control projectors.
+
+.. image:: pics/projector_manager_list.png

manual/source/install_windows_mac.rst

@@ -75,7 +75,7 @@ enable editing.
 
 .. image:: pics/gatekeeper3.png
 
-I you have not already downloaded the correct file from the OpenLP
+If you have not already downloaded the correct file from the OpenLP
 `download page <http://www.openlp.org/en/download.html>`_, download it now.
 Then double click on the .dmg file. Drag the OpenLP icon over to the Applications
 folder and you will be ready to use OpenLP. OpenLP will be available in your

manual/source/mediamanager.rst

@@ -90,6 +90,9 @@ to find Bible verses and add them to the :ref:`g-service-manager`.
 Toolbar
 ^^^^^^^
 
+|buttons_edit| **Edit the selected bible:**
+    Edit meta data or book names of the selected bible.
+
 |buttons_import| **Import Bible:**
     Import Bibles from a number of formats. This is discussed in detail on the
     :ref:`import_bibles` page.
@@ -263,6 +266,11 @@ media item. The images media item shows a list of imported images.
 Toolbar
 ^^^^^^^
 
+|buttons_image_new_group| **Add group:**
+    Opens a dialog where a new image group can be added.
+
+.. image:: pics/images_add_group.png
+
 |buttons_open| **Load image:**
     Import one or more images. Images need to be imported in order to be used
     in OpenLP.
@@ -290,6 +298,12 @@ Toolbar
 
 **Notes:** Right-clicking on an image will display some of the same options.
 
+.. image:: pics/images_select_image_group.png
+
+When an image is added to the mediamanager, a dialog will ask in which group the
+image should be placed. The options are :guilabel:`No group`,
+:guilabel:`Existing group` or :guilabel:`New group`.
+
 Images can be dragged from the desktop (or any folder) into the Images manager 
 plugin. This allows the selected items to be loaded more quickly. If a folder is 
 selected, all the contacts of the folder will be added. When the items are added, 
@@ -312,6 +326,11 @@ to resolve these issues.
 Toolbar
 ^^^^^^^
 
+|buttons_media_optical| **Load CD/DVD:**
+    Import mediaclip from audio CD or DVD. This feature only works if VLC is
+    installed on the computer and enabled in OpenLP. See :ref:`config_players`
+    for how to configure media players.
+
 |buttons_open| **Load media:**
     Import one or more media files. Media files need to be imported in order to
     be used in OpenLP.
@@ -409,6 +428,10 @@ same options.
 
 .. |BUTTONS_REPLACE_LIVE_BACKGROUND| image:: pics/buttons_replace_live_background.png
 
+.. |BUTTONS_IMAGE_NEW_GROUP| image:: pics/button_image_new_group.png
+
+.. |BUTTONS_MEDIA_OPTICAL| image:: pics/button_media_optical.png
+
 .. |SEARCH_SONG| image:: pics/search_song.png
 
 .. |SEARCH_TITLE| image:: pics/search_title.png

manual/source/menu_items.rst

@@ -41,6 +41,9 @@ File
   **Song:** 
     Import your songs previously exported. :ref:`import_songs`
 
+  **CCLI SongSelect:** 
+    Import your songs from CCLI SongSelect. :ref:`import_songs`
+
   **Bible:** 
     Import Bibles from another program, the internet or a previously exported 
     Bible from OpenLP. :ref:`import_bibles`
@@ -85,6 +88,9 @@ Clicking on any of the next items will hide or show its respective panel.
 |button_mediamanager| **Media Manager:** 
     Hide or show :ref:`media-manager`.
 
+|button_projectormanager| **Projector Manager:** 
+    Hide or show :ref:`projector`.
+
 |button_servicemanager| **Service Manager:** 
     Hide or show :ref:`creating_service`.
 
@@ -119,6 +125,9 @@ If anything is deleted in this folder it is not recoverable through OpenLP.
     Changing screen resolution can have an affect on theme images. Use this to 
     correct the images. 
 
+**Find Duplicate Songs:**
+    Start wizard for detecting and removing duplicate songs.
+
 |plugin_songs| **Re-index Songs:** 
     This rebuilds the internal song indexes to make them work following code 
     corrections. You would generally use this after a software upgrade.
@@ -197,4 +206,6 @@ Help
 
 .. |BUTTON_MEDIAMANAGER| image:: pics/button_mediamanager.png
 
-.. |BUTTON_SERVICEMANAGER| image:: pics/button_servicemanager.png
+.. |BUTTON_SERVICEMANAGER| image:: pics/button_servicemanager.png
+
+.. |BUTTON_PROJECTORMANAGER| image:: pics/button_projector_manager.png