openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/doc22update5 into lp:openlp/documentation.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #860681 in OpenLP: "Document dual monitor setup for OS X "
  https://bugs.launchpad.net/openlp/+bug/860681
  Bug #1011074 in OpenLP: "Android documentation and screen shots need updating"
  https://bugs.launchpad.net/openlp/+bug/1011074

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/doc22update5/+merge/272847

Update of android docs.
Updated service manager docs.
Updated faq and trouble shooting guide.
Many other small updates...
Added a scripts folder and placed the gimp-scripts in it.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/doc22update5 into lp:openlp/documentation.

=== modified file 'manual/source/android.rst'
--- manual/source/android.rst	2012-03-18 17:09:48 +0000
+++ manual/source/android.rst	2015-09-29 20:59:16 +0000
@@ -7,46 +7,18 @@
 ------------
 
 OpenLP gives you the ability to control your service from an Android based 
-smartphone. The following tutorial will describe how to download, install and 
-use the application. For this example we will be using the HTC Incredible. Other 
-Android phones may vary slightly in appearance and installation.
-
-Click the screen button on the phone to bring up the start menu for "All apps" 
-and scroll to and select :guilabel:`Play Store` seen at the top right of the 
-image. 
-
-.. image:: pics/droid_all_apps.png
-
-Once selected you will be taken to the Google Play main screen. 
-
-.. image:: pics/droid_play.png
-
-Click on the hardware magnifying glass or the magnifying glass on the top right 
-and type in :kbd:`openlp` and select it.
-
-.. image:: pics/droid_find.png
-
-Once selected, this screen will appear and you will select OpenLP.
-
-.. image:: pics/droid_free.png
-
-Click on :guilabel:`Install`
-
-.. image:: pics/droid_install.png
-
-The next page shows the Permissions you will need to accept to continue the 
-download. Click on :guilabel:`Accept & download`.
-
-.. image:: pics/droid_accept.png
-
-The downloading progress bar will appear verifying you are downloading the app.
-
-.. image:: pics/droid_downloading.png
-
-Once the install is complete you will see a window where you can :guilabel:`Open`
-OpenLP for use. You will also find the OpenLP icon in your application menu.
-
-.. image:: pics/droid_open.png
+smartphone. The following tutorial will describe how to install and 
+use the application. For this example we will be using a LG G2. Other Android
+smartphones or tablet may vary slightly in appearance.
+
+Open the :guilabel:`Google Play Store` app and search for OpenLP, and you will
+find :guilabel:`OpenLP - Remote 2`. As an alternative use `this link
+<https://play.google.com/store/apps/details?id=org.openlp.android2>`_ to go to
+the apps page in Google Play Store. Now install the app.
+
+.. image:: pics/droid_start.png
+
+You can now start the app and when you do you will see the startup screen.
 
 Android application settings
 ----------------------------
@@ -54,206 +26,169 @@
 After the installation is complete and you open the OpenLP Android application 
 you will need to configure your preferences and settings. 
 
-.. image:: pics/droid_configure.png
-
-Text Size Type
+.. image:: pics/droid_right_menu.png
+
+Open the settings by opening the menu in the top right corner and choosing 
+:guilabel:`Settings`. This will show the preferences.
+
+Display Text Size
+^^^^^^^^^^^^^^^^^
+
+.. image:: pics/droid_preferences1.png
+
+**Select display text size:**
+    This allows you to change the the font size for the application display.
+
+Set Custom Timeout
+^^^^^^^^^^^^^^^^^^
+
+In general the OpenLP Android application will work fine without having to 
+change the custom timeout settings. If you experience connection issues or are 
+having trouble staying connected, you can change these settings.
+
+.. image:: pics/droid_preferences2.png
+
+**Enable Custom Timeout:**
+    Check this box to enable setting a custom timeout.
+
+**Connection Timeout:**
+    Once Custom Timeout has been enabled you can set a custom connection timeout
+    here.
+
+Server Details
 ^^^^^^^^^^^^^^
 
-Clicking on :guilabel:`Text Size Type` will bring up a selection to choose your 
-desired font size for the application display.
-
-.. image:: pics/droid_text.png
+You will need to configure the server settings you will use with your phone.  
+You can find these instructions and settings in the OpenLP desktop application 
+under :ref:`remote_tab`.
+
+**Note:** To use the Android application you will need to be on the same 
+network as the main computer.
+
+**Hostname or IP:**
+    Enter the :guilabel:`Server on IP address` found in :ref:`remote_tab`. After
+    entering the IP address in the box select :guilabel:`OK`
+
+**Port:**
+    Enter the :guilabel:`Port number` found in :ref:`remote_tab` and enter it in
+    the box. By default this is 4316. After entering the port number select
+    :guilabel:`OK`.
+
+**Use HTTPS:**
+    This specifies if HTTPS should be used. **Note:** To use HTTPS you must
+    setup OpenLP to be secure, see :ref:`secure_server`.
+
+**Username:**
+    Here you can enter a username used for accessing OpenLP remotely. This
+    must be the same as set in :ref:`user_auth`.
+
+**Password:**
+    Here you can enter a password used for accessing OpenLP remotely. This
+    must be the same as set in :ref:`user_auth`.
+
+
+Using OpenLP Android Application
+--------------------------------
+
+After you have completed the setup you are now ready to use the app. Touch the
+menu button in the top left corner to see the list of views the app supports.
+
+.. image:: pics/droid_left_menu.png
+
+Service List
+^^^^^^^^^^^^
+
+Selecting :guilabel:`Service List` will take you to the Service Manager. 
+Selecting an item with a short press in the service will immediately take it 
+live on the projection screen and you will stay on the service screen on your 
+device. Selecting an item with a long press in the service will immediately take 
+it live on the projection screen and to the live display on your device.
+
+.. image:: pics/droid_service.png
+
+Live List
+^^^^^^^^^
+
+Selecting :guilabel:`Live List` will display what ever is in Service Manager
+at the time, or what is live at the moment. If there is items in the Service
+Manager they will be shown on the left, and the live item will be shown on the
+right.
+
+.. image:: pics/droid_live_list_portrait.png
+
+When using the :guilabel:`Live List` it can be an advantage to use the device in
+landscape mode.
+
+.. image:: pics/droid_live_list_landscape.png
+
+
+Stage View
+^^^^^^^^^^
+
+Selecting :guilabel:`Stage View` will display the stage view on your Android 
+evice. See the :ref:`stage_view` section in the manual for a detailed
+description.
+
+.. image:: pics/droid_stage_view.png
+
+Live View
+^^^^^^^^^^
+
+Selecting :guilabel:`Live View` will display the live view on your Android
+device. See the :ref:`main_view` section in the manual for a detailed 
+description.
+
+.. image:: pics/droid_live_view.png
+
+Alert
+^^^^^
+
+To send an alert to the display, touch the alert button at the top right of the
+screen.
+
+|droid_alert_button| **Alert button**
+
+You can send an alert to the display by entering the text in the box and
+clicking on :guilabel:`Process`. The alert will be displayed as you have it 
+configured in :ref:`configure_alerts`.
+
+.. image:: pics/droid_alert.png
+
 
 .. _droid_blank:
 
-Display Blank Type
-^^^^^^^^^^^^^^^^^^
+Blank Display
+^^^^^^^^^^^^^
+
+To blank the display, touch the blank button at the top right of the screen.
+
+|droid_blank_button| **Blank button**
 
 Using the display blank type gives you the ability to blank your screen to the 
 methods described below. You can find out more about this feature and how it 
 operates on the main computer at :ref:`blank_control`.
 
-**Screen:**
+**Show Live:**
+    Do not blank, or unblank the display.
+
+**Display Blank:**
     Choosing this option will blank your projector to black as if it were shut 
     off.
 
-**Theme:**
+**Display Theme:**
     Choosing this option will show your blank theme only, without lyrics or 
     verses. If you are blanking a song with an assigned theme it will blank to 
     that theme. If no theme is assigned or you are blanking a presentation or 
     image, it will blank to the global theme.
 
-**Desktop:**
+**Display Desktop:**
     Choosing this option will show your desktop wallpaper or a program that you 
     have open on the extended monitor or projector. You can seamlessly switch 
     between the desktop wallpaper or a program and OpenLP by Blank to Desktop.
 
-.. image:: pics/droid_blank_type.png
-
-Server
-^^^^^^
-
-You will need to configure the server settings you will use with your phone.  
-You can find these instructions and settings in the OpenLP desktop application 
-under :ref:`remote_tab`.
-
-**Note:** To use the Android application you will need to be on the same 
-network as the main computer.
-
-Select the :guilabel:`Server` button and enter the :guilabel:`Serve on IP address`
-found in :ref:`remote_tab`. After entering the IP address in the box select 
-:guilabel:`OK`
-
-.. image:: pics/droid_server.png
-
-The next step is to enter the port number. Select :guilabel:`Port`. Use the 
-:guilabel:`Port number` found in :ref:`remote_tab` and enter it in the box. 
-After entering the port number select :guilabel:`OK`.
-
-.. image:: pics/droid_port.png
-
-Custom Timeout
-^^^^^^^^^^^^^^
-
-In general the OpenLP Android application will work fine without having to 
-change the custom timeout settings. If you experience connection issues or are 
-having trouble staying connected, you can change these settings. Select the box
-next to :guilabel:`Enable Custom Timeouts`.
-
-.. image:: pics/droid_connection.png
-
-Connection Timeout
-^^^^^^^^^^^^^^^^^^
-
-If you are having trouble connecting please double check your settings first and 
-be sure you did not type any extra characters or spaces. If your settings are 
-correct and you are still having trouble, you can increase the 
-:guilabel:`Connection Timeout` settings and try again.
-
-.. image:: pics/droid_connection_timeout.png
-
-Socket Timeout
-^^^^^^^^^^^^^^
-
-If you are having trouble maintaining a connection you can increase the timeout 
-settings here.
-
-.. image:: pics/droid_socket_timeout.png
-
-When you are happy with your settings you can press the back button on your 
-phone to check for connection. Make sure OpenLP is running on the main computer. 
-If you were successful in your setup you will see the OpenLP application running.
-
-If you need to change or adjust your settings you can always press your hardware 
-menu button on your phone while OpenLP is running and selecting 
-:guilabel:`Settings` and it will take you back to the configuration screen.
-
-Using OpenLP Android Application
---------------------------------
-
-After you have completed the setup you will be on the main page with six buttons.
-
-.. image:: pics/droid_settings_return1.png
-
-Service
-^^^^^^^
-
-Selecting the :guilabel:`Service` button will take you to the Service Manager. 
-Selecting an item with a short press in the service will immediately take it 
-live on the projection screen and you will stay on the service screen on your 
-device. Selecting an item with a long press in the service will immediately take 
-it live on the projection screen and to the live display on your device. You can 
-also move up and down through the service items using the :guilabel:`Previous` 
-and :guilabel:`Next` buttons as shown below. Use your hardware back button to 
-take you back to the main screen.
-
-.. image:: pics/droid_service.png
-
-Slide
-^^^^^
-
-If you selected a service item with multiple verses or images you can change 
-verses or images by either selecting them with your finger or using the 
-:guilabel:`Previous` and :guilabel:`Next` buttons. Use your hardware back button 
-to take you back to the main screen.
-
-.. image:: pics/droid_slide.png
-
-Live
-^^^^
-
-Selecting the :guilabel:`Live` button will display what ever is live at the time 
-from to your Android device. Use your hardware back button 
-to take you back to the main screen.
-
-Display
-^^^^^^^
-
-Selecting the :guilabel:`Display` button will give you the ability to blank and 
-unblank your projection screen from your chosen method :ref:`above <droid_blank>`.
-
-.. image:: pics/droid_blank_button.png
-
-The title :guilabel:`Blank display to` means your display is live. Touching the 
-:guilabel:`Blank display to` will blank the projection screen to the chosen 
-method defined in Settings and the button will change to 
-:guilabel:`Reset display from`. Touching it again will cycle back to 
-:guilabel:`Blank display to` unblanking the screen for the live display.
-
-Stage
-^^^^^
-
-Selecting the :guilabel:`Stage` button will display the stage view on your 
-Android device. See the :ref:`stage_view` section in the manual for a detailed 
-description. Use your hardware back button to take you back to the main screen.
-
-.. image:: pics/droid_stage.png
-
-Alert
-^^^^^
-
-You can send an alert to the projection screen by entering the text in the box 
-and clicking on :guilabel:`Send`. The alert will be displayed as you have 
-it configured in :ref:`configure_alerts`. Use your hardware back button to take 
-you back to the main screen.
-
-.. image:: pics/droid_alert.png
-
-Search
-------
-
-Using the search function gives you the ability to search for a particular media, 
-add it to the service or display it immediately.
-
-To use search, press the hardware magnifying glass button on your phone or you 
-can press the hardware menu button and then select :guilabel:`Search` and you 
-will be taken to the search screen.
-
-.. image:: pics/droid_search_all1.png
-
-Enter the text you want to search for in the text box at the top. For this 
-example we are using the search word "Jesus". You can click the magnifying glass 
-next to the text box or press the return on your phone keyboard. You will be 
-presented with a list of media in which your search word was found. 
-
-**Note:** When searching the Bible you must enter the exact name, chapter, 
-verse or verses. Searching songs will search titles and lyrics with the text 
-used.
-
-This screen shows the number of instances your searched text is found. 
-
-.. image:: pics/droid_found1.png
-
-As you can see in the example, there are 130 songs with the word "Jesus" in them. 
-You can scroll through the list of songs until you find the one you want.
-
-.. image:: pics/droid_found_select1.png
-
-Click on :guilabel:`Add to Service` to add your media to the bottom of the 
-:ref:`creating_service`. Click on :guilabel:`Send Live` to immediately display 
-your media on the projection screen.
-
-.. image:: pics/droid_found_add1.png
-
-When you have completed your search you must press the back button on your phone 
-to return to the main screen.
+.. image:: pics/droid_blank.png
+
+
+.. |droid_alert_button| image:: pics/droid_alert_button.png
+
+.. |droid_blank_button| image:: pics/droid_blank_button.png

=== modified file 'manual/source/bibles.rst'
--- manual/source/bibles.rst	2015-09-21 20:45:50 +0000
+++ manual/source/bibles.rst	2015-09-29 20:59:16 +0000
@@ -139,7 +139,7 @@
 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
+translations available, so there is a good chance that you will find what you
 need.
 
 You can also select a proxy server if needed from the `Proxy Server` tab. Your

=== modified file 'manual/source/configure.rst'
--- manual/source/configure.rst	2015-09-21 20:45:50 +0000
+++ manual/source/configure.rst	2015-09-29 20:59:16 +0000
@@ -296,7 +296,7 @@
 
 Background color
 ^^^^^^^^^^^^^^^^
-Chose the background color to be shown as background for videos with different
+Choose the background color displayed as background for videos with different
 aspect ratio than the display screen.
 
 Available Media Players
@@ -473,6 +473,8 @@
 **English:**
   The language of the books will be set to English.
 
+.. _presentation_configure:
+
 Presentations
 =============
 
@@ -636,8 +638,8 @@
 
 .. _non_secure:
 
-Server Settings- Non Secure
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Server Settings - Non Secure
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. image:: pics/configureremotes.png
 
@@ -664,9 +666,11 @@
   smartphone, to view the live service display in a basic black and white 
   format. This URL shows the address you will use in the remote browser for 
   stage view.
-  
-Server Settings- Secure
-^^^^^^^^^^^^^^^^^^^^^^^
+
+.. _secure_server:
+
+Server Settings - Secure
+^^^^^^^^^^^^^^^^^^^^^^^^
 These options are identical in meaning to the ones documented in :ref:`non_secure`.
 The only difference is these require an SSL cetificate to provide the security.
 Instructions for creating and installing a certificate are documented in
@@ -674,6 +678,8 @@
 
 *Changing from a Secure to Non Secure setup requires a restart of OpenLP.*
 
+.. _user_auth:
+
 User Authentication 
 ^^^^^^^^^^^^^^^^^^^
 This option allows the additional security for update functions via the web or

=== modified file 'manual/source/creating_service.rst'
--- manual/source/creating_service.rst	2012-01-06 20:35:59 +0000
+++ manual/source/creating_service.rst	2015-09-29 20:59:16 +0000
@@ -20,7 +20,7 @@
 you want to display should be in the Service Manager and preferably in the order 
 you want to display it.
 
-.. image:: pics/service_manager.png
+.. image:: pics/servicemanager.png
 
 .. _new_service:
 
@@ -51,10 +51,7 @@
 computer. If a song is not in the projection computer database when you open the
 saved file OpenLP will automatically import the song into the song database with 
 this option checked here :ref:`config_songs` "Add missing songs when opening 
-service." If this option is not selected, and the song is not in your database, 
-you will see a popup when you mouseover the song in the service manager.
-
-.. image:: pics/service_manager_edit.png
+service."
 
 You always have the ability to edit the song in the service manager by right 
 clicking on the song and choosing :menuselection:`Edit Item` from the context 
@@ -94,6 +91,8 @@
 
 |live| Send the selected item to Live.
 
+|custom_delete| Remove the service item.
+
 **Note:** You always have the option to send any media live direct from the 
 :ref:`media-manager`. Please see the :ref:`media-manager` section for more 
 details.
@@ -124,11 +123,6 @@
 click the item and mouseover :guilabel:`Change Item Theme` and select the theme
 you want to use.
 
-An easy way to check which theme you are using is to move your mouse cursor over
-an item in your service and you will see a popup with the theme being used.
-
-.. image:: pics/service_manager_theme.png
-
 Moving Through a Service
 ------------------------
 
@@ -188,14 +182,16 @@
 
 At some point you may have a group of images to display together. It may be
 pictures from a youth group adventure, bulletin announcements, or some other
-reason. Once you add your images to the :ref:`media-manager` hold the :kbd:`Ctrl` 
+reason. You can either create the group in the :ref:`media-manager`, and then
+click the |buttons_add| icon above the images, or you can manually select a
+group of images. Do this by holding the :kbd:`Ctrl` 
 key on your keyboard and click each image you want to add as a group. As you 
 click the images they will remain highlighted. When you are done with your 
 selections you can either click the |buttons_add| icon above the images or, 
 click on one of the highlighted images, hold the mouse button and drag them over 
 to the Service Manager side and place them where you need them.
 
-.. image:: pics/service_images.png
+.. image:: pics/service_manager_image_group.png
 
 Sorting a Group of Images
 -------------------------
@@ -203,11 +199,11 @@
 If you do not like the order the images are in,
 right click Images.
 
-.. image:: pics/service_reorder.png
+.. image:: pics/service_manager_image_group_right_click.png
 
 Left click Reorder Item.
 
-.. image:: pics/service_reorder_service_item.png
+.. image:: pics/service_manager_reorder_images.png
 
 From this box you will be able to rearrange the order of your images by clicking
 on one and using the :guilabel:`Up` and :guilabel:`Down` arrows to move it to
@@ -220,7 +216,7 @@
 it over your group of Images and release the mouse button. You will be given 
 two options, :guilabel:`Add New Item` and :guilabel:`Add to Selected Item`.
 
-.. image:: pics/service_add.png
+.. image:: pics/service_manager_image_dnd_menu.png
 
 If you click :guilabel:`Add New Item` your image will be separate from your
 group of images as another item at the bottom of the Service. If you click
@@ -242,12 +238,12 @@
 mind you can click :guilabel:`Cancel`. Your note will appear as a yellow note on
 your item.
 
-.. image:: pics/service_note.png
+.. image:: pics/service_manager_note_icon.png
 
 To view your note move your mouse cursor over the item in your service and you 
 will see a popup with the information you typed in your note.
 
-.. image:: pics/service_manager_noteview.png
+.. image:: pics/service_manager_note_hover.png
 
 If you need to change your Note or delete it, open it again, delete your text
 and click :guilabel:`Save`
@@ -301,29 +297,29 @@
 your file and the popup will show you the play time "Length" in hours, minutes 
 and seconds.
 
-.. image:: pics/service_media_timer.png
+.. image:: pics/service_manager_media_hover.png
 
 Right click on your media file and left click 
 |service_timer| :guilabel:`Start Time`.
 
-.. image:: pics/service_media_timer_start.png
+.. image:: pics/service_manager_media_right_click.png
 
 **Item Start and Finish Time**
     The start and stop time default to the beginning and end of the video.
 
-.. image:: pics/service_media_timer_config.png
+.. image:: pics/service_manager_media_times.png
 
 Change the hours, minutes and seconds to the times you want your video to begin 
 and end. When you are finished click :guilabel:`Ok` to save your changes or 
 :guilabel:`Cancel` to leave the times as they were originally. When you display 
 your media live it will start and stop with the times you configured.
 
-.. image:: pics/service_media_timer_configend.png
+.. image:: pics/service_manager_media_times2.png
 
-After your changes have been saved you can check your start and stop times by 
+After your changes have been saved you can check your start and stop times by
 putting your mouse cursor over the media file. 
 
-.. image:: pics/service_media_timerend.png
+.. image:: pics/service_manager_media_hover2.png
 
 .. _blank_control:
 
@@ -331,10 +327,14 @@
 ----------------------------
 
 On the *Live Controller Bar* in between the Live windows are three options to
-Blank your screen. Clicking on the down arrow next to the blank button will show
-you your three options.
-
-.. image:: pics/service_blank.png
+Blank your screen. Depending on how narrow your slidecontroller is, the three 
+options will be presented as a dropdown menu in the toolbar.
+
+.. image:: pics/blank_screen_dropdown.png
+
+Or as three separate buttons in the toolbar.
+
+.. image:: pics/blank_screen_toolbar.png
 
 |slide_blank| **Blank Screen:**
     Choosing this option will blank your projector to black as if it were shut off.
@@ -396,4 +396,4 @@
 .. |SERVICE_OPEN| image:: pics/service_open.png
 .. |SERVICE_SAVE| image:: pics/service_save.png
 .. |AUDIO_PAUSE| image:: pics/media_playback_pause.png
-.. |BUTTONS_ADD| image:: pics/buttons_add.png
\ No newline at end of file
+.. |BUTTONS_ADD| image:: pics/buttons_add.png

=== modified file 'manual/source/dualmonitors.rst'
--- manual/source/dualmonitors.rst	2015-09-21 20:45:50 +0000
+++ manual/source/dualmonitors.rst	2015-09-29 20:59:16 +0000
@@ -154,32 +154,31 @@
 applications requiring dual monitors may not work well with Unity due to issues
 experienced by other users with the Unity interface.
 
-GNOME 2
-^^^^^^^
-
-This guide is for users of the GNOME 2 desktop who do not use proprietary 
-drivers. From most distros go to :menuselection:`System --> Preferences --> 
-Display Settings (Monitors)`. Set up your projector with the correct resolution
-and make sure that :guilabel:`Same image on all monitors` is **unchecked**.
-
-.. image:: pics/gnome.png
-
 GNOME 3
 ^^^^^^^
 
 This guide is for users of the GNOME 3 or GNOME Shell desktop who do not use
 proprietary drivers. In GNOME shell in the search box type *Displays* or in 
 GNOME shell or fall back mode go to :menuselection:`Applications --> System Tools --> System Settings`
-then select Displays. Set up your projector with the correct resolution and
-make sure that :guilabel:`Mirror displays` is **unchecked**
+then select Displays. 
 
 .. image:: pics/gnome3displays.png 
 
+By clicking on each of the display listed you can change the mode, resolution
+andorientation of the displays. 
+
+.. image:: pics/gnome3displaysettings.png 
+
+Make sure to put the display you plan to use for presenting to be the
+:guilabel:`Secondary Display`.
+
+.. image:: pics/gnome3drag.png
+
+Back in the :guilabel:`Displays` window, click :guilabel:`Arrange Combined
+Displays` to arrange the displays.
 If after setting up your monitors you have the top panel on the wrong monitor
 simply drag it to the monitor you want to serve as the primary screen.
 
-.. image:: pics/gnome3drag.png
-
 KDE
 ^^^
 
@@ -187,11 +186,11 @@
 From most distros click the Kick Off menu and navigate to
 :guilabel:`System Settings`
 
-.. image:: pics/kdesystemsettings.png
-
-Click on the display and monitor icon.
-
-.. image:: pics/kdedisplay.png
+.. image:: pics/kde5systemsettings.png
+
+Click on the :guilabel:`Display and Monitor` icon.
+
+.. image:: pics/kde5display.png
 
 From here you will need to set up your projector with the appropriate
 resolution, and position. OpenLP works best projecting to the monitor on the
@@ -297,3 +296,23 @@
 
 **Note** it has been reported that when this issue is occurring you will not 
 want to connect your projector until your desktop is running. 
+
+
+Mac OS X
+--------
+
+This short guide will tell users of Mac OS X how to setup dual displays.
+
+.. image:: pics/mac-os-x-system-menu.png
+
+Open :guilabel:`System Preferences` in the Apple menu.
+
+.. image:: pics/mac-os-x-settings.png
+
+Choose the :guilabel:`Displays` option.
+
+.. image:: pics/mac-os-x-display-settings.png
+
+Click :guilabel:`Arrangement` in the top of the window. Make sure that
+:guilabel:`Mirror Displays` is unchecked. You can now arrange the displays as
+you wish.

=== modified file 'manual/source/faq.rst'
--- manual/source/faq.rst	2015-09-08 09:36:49 +0000
+++ manual/source/faq.rst	2015-09-29 20:59:16 +0000
@@ -404,16 +404,10 @@
 Windows & Mac OS X
 ^^^^^^^^^^^^^^^^^^
 
-Phonon should already be set up properly. If you are still having issues, let the 
+Phonon should already be set up properly. If you are still having issues see
+:ref:`t-no-media` in the Troubleshooting section. If that does not work, let the
 developers know.
 
-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 <https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/501468/comments/3>`_.
-
-
 MP3's and other audio formats do not work
 -----------------------------------------
 
@@ -430,6 +424,19 @@
 hoping a future release of the toolkit we are using (QtWebKit) will help improve
 this, but there is no timeframe at present.
 
+Why does live backgrounds not work in OpenLP 2.2 on Windows & Mac OS X
+----------------------------------------------------------------------
+
+Due to changes in the one of the underlying frameworks that OpenLP uses (Qt4),
+live backgrounds does not work in OpenLP 2.2. This will be fixed in OpenLP 2.4.
+
+Why does playback of linked audio not work in OpenLP 2.2 on Mac OS X
+--------------------------------------------------------------------
+
+Due to changes in the one of the underlying frameworks that OpenLP uses (Qt4),
+playback of linked audio  does not work in OpenLP 2.2. This will be fixed in
+OpenLP 2.4.
+
 Features
 ========
 

=== modified file 'manual/source/mediamanager.rst'
--- manual/source/mediamanager.rst	2015-09-21 20:45:50 +0000
+++ manual/source/mediamanager.rst	2015-09-29 20:59:16 +0000
@@ -255,6 +255,16 @@
 plugin will be loaded. If you try to drop a presentation into the images folder, 
 an error message will be generated.
 
+In :ref:`presentation_configure` configuration it is possible to enable 
+:guilabel:`Allow presentation application to be overridden`, which shows a
+dropdown box which gives you the option to select the presentation application
+you want to use. The default is :guilabel:`Automatic`, but you can choose any
+available presentation application. Note that this can lead to unexpected
+behaviour if the application chosen is not compatible with the presentation.
+
+.. image:: pics/media_manager_presentation_select.png
+
+
 Images
 ------
 
@@ -329,7 +339,13 @@
 |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.
+    for how to configure media players. Clicking the icon will bring up a window
+    where you can load a DVD or audio CD and select a track and a range and save
+    it as a named media clip. Note that the audio CD or DVD is still required
+    when playing the media clip, even if the media clip is saved to a service
+    file.
+
+.. image:: pics/select_media_clip.png
 
 |buttons_open| **Load media:**
     Import one or more media files. Media files need to be imported in order to
@@ -365,6 +381,13 @@
 If you try to drop a presentation into the images folder, an error message will 
 be generated.
 
+In :ref:`media_configure` configuration it is possible to enable 
+:guilabel:`Allow media player to be overridden`, which shows a dropdown box
+which gives you the option to select the media player you want to use. The
+default is :guilabel:`Automatic`, but you can choose any available player.
+
+.. image:: pics/media_manager_media_select.png
+
 Custom Slides
 -------------
 

=== added file 'manual/source/pics/blank_screen_dropdown.png'
Binary files manual/source/pics/blank_screen_dropdown.png	1970-01-01 00:00:00 +0000 and manual/source/pics/blank_screen_dropdown.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/blank_screen_toolbar.png'
Binary files manual/source/pics/blank_screen_toolbar.png	1970-01-01 00:00:00 +0000 and manual/source/pics/blank_screen_toolbar.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/droid_alert.png'
Binary files manual/source/pics/droid_alert.png	2012-03-10 10:50:28 +0000 and manual/source/pics/droid_alert.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_alert_button.png'
Binary files manual/source/pics/droid_alert_button.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_alert_button.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_blank.png'
Binary files manual/source/pics/droid_blank.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_blank.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/droid_blank_button.png'
Binary files manual/source/pics/droid_blank_button.png	2012-03-10 10:50:28 +0000 and manual/source/pics/droid_blank_button.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_left_menu.png'
Binary files manual/source/pics/droid_left_menu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_left_menu.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_live_list_landscape.png'
Binary files manual/source/pics/droid_live_list_landscape.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_live_list_landscape.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_live_list_portrait.png'
Binary files manual/source/pics/droid_live_list_portrait.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_live_list_portrait.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_live_view.png'
Binary files manual/source/pics/droid_live_view.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_live_view.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_preferences1.png'
Binary files manual/source/pics/droid_preferences1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_preferences1.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_preferences2.png'
Binary files manual/source/pics/droid_preferences2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_preferences2.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_right_menu.png'
Binary files manual/source/pics/droid_right_menu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_right_menu.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/droid_service.png'
Binary files manual/source/pics/droid_service.png	2012-03-10 10:50:28 +0000 and manual/source/pics/droid_service.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_stage_view.png'
Binary files manual/source/pics/droid_stage_view.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_stage_view.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/droid_start.png'
Binary files manual/source/pics/droid_start.png	1970-01-01 00:00:00 +0000 and manual/source/pics/droid_start.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/gnome3displays.png'
Binary files manual/source/pics/gnome3displays.png	2011-06-11 12:32:16 +0000 and manual/source/pics/gnome3displays.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/gnome3displaysettings.png'
Binary files manual/source/pics/gnome3displaysettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/gnome3displaysettings.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/gnome3drag.png'
Binary files manual/source/pics/gnome3drag.png	2011-06-11 12:32:16 +0000 and manual/source/pics/gnome3drag.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/kde5display.png'
Binary files manual/source/pics/kde5display.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kde5display.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/kde5systemsettings.png'
Binary files manual/source/pics/kde5systemsettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kde5systemsettings.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/mac-os-x-display-settings.png'
Binary files manual/source/pics/mac-os-x-display-settings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mac-os-x-display-settings.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/mac-os-x-settings.png'
Binary files manual/source/pics/mac-os-x-settings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mac-os-x-settings.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/mac-os-x-system-menu.png'
Binary files manual/source/pics/mac-os-x-system-menu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mac-os-x-system-menu.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/media_manager_media_select.png'
Binary files manual/source/pics/media_manager_media_select.png	1970-01-01 00:00:00 +0000 and manual/source/pics/media_manager_media_select.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/media_manager_presentation_select.png'
Binary files manual/source/pics/media_manager_presentation_select.png	1970-01-01 00:00:00 +0000 and manual/source/pics/media_manager_presentation_select.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/select_media_clip.png'
Binary files manual/source/pics/select_media_clip.png	1970-01-01 00:00:00 +0000 and manual/source/pics/select_media_clip.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/service_item_notes.png'
Binary files manual/source/pics/service_item_notes.png	2011-07-25 08:20:50 +0000 and manual/source/pics/service_item_notes.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_image_dnd_menu.png'
Binary files manual/source/pics/service_manager_image_dnd_menu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_image_dnd_menu.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_image_group.png'
Binary files manual/source/pics/service_manager_image_group.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_image_group.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_image_group_right_click.png'
Binary files manual/source/pics/service_manager_image_group_right_click.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_image_group_right_click.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_media_hover.png'
Binary files manual/source/pics/service_manager_media_hover.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_media_hover.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_media_hover2.png'
Binary files manual/source/pics/service_manager_media_hover2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_media_hover2.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_media_right_click.png'
Binary files manual/source/pics/service_manager_media_right_click.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_media_right_click.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_media_times.png'
Binary files manual/source/pics/service_manager_media_times.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_media_times.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_media_times2.png'
Binary files manual/source/pics/service_manager_media_times2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_media_times2.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_note_hover.png'
Binary files manual/source/pics/service_manager_note_hover.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_note_hover.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_note_icon.png'
Binary files manual/source/pics/service_manager_note_icon.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_note_icon.png	2015-09-29 20:59:16 +0000 differ
=== added file 'manual/source/pics/service_manager_reorder_images.png'
Binary files manual/source/pics/service_manager_reorder_images.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager_reorder_images.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/service_timer.png'
Binary files manual/source/pics/service_timer.png	2011-06-27 13:26:27 +0000 and manual/source/pics/service_timer.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/pics/service_timer_select.png'
Binary files manual/source/pics/service_timer_select.png	2011-06-28 19:10:51 +0000 and manual/source/pics/service_timer_select.png	2015-09-29 20:59:16 +0000 differ
=== modified file 'manual/source/system_requirements.rst'
--- manual/source/system_requirements.rst	2015-09-08 08:32:01 +0000
+++ manual/source/system_requirements.rst	2015-09-29 20:59:16 +0000
@@ -14,7 +14,7 @@
 * For Presentation support:
 
   * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010)
-    or LibreOffice Impress 4 or later
+    or LibreOffice Impress 4 or later (32 bit)
   * Linux: LibreOffice Impress 4 or later
   * Mac: Not supported yet
 * The Generic Document/Presentation and Songs of Fellowship song import options

=== modified file 'manual/source/troubleshooting.rst'
--- manual/source/troubleshooting.rst	2013-12-21 23:18:14 +0000
+++ manual/source/troubleshooting.rst	2015-09-29 20:59:16 +0000
@@ -7,17 +7,13 @@
 I can not play videos or other media
 ------------------------------------
 
-If you can not play video or audio through openlp, there are several areas that
-could be an issue. First thing is to make sure you can play the media file
-through your default media player. OpenLP should be able to play any file that
-you can play through your default media player.
-
-If you can play a file through your media player but not on OpenLP it may help
-to enable Phonon for multimedia playback. Go to the OpenLP configuration
-:menuselection:`Settings --> Configure OpenLP...` and select the Media tab.
-Make sure the check box for `Use Phonon for video playback` is checked.
-
-.. image:: pics/phononcheckbox.png
+If you can not play video or audio through OpenLP, the problem is most likely
+that the media players has not be properly configured. The recommended media
+player for OpenLP is VLC, see the manual for :ref:`config_players` for how to 
+setup VLC as your default player.
+
+If you want to use the Phonon player, but it cannot play your media files you
+can look below for who best to set it up.
 
 Codecs
 ^^^^^^
@@ -120,7 +116,7 @@
 press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
 would like to enable and select **active** from the drop down box to the right.
 
-.. image:: pics/plugins.png
+.. image:: pics/plugin_list_main.png
 
 By default all plugins should be enabled during the first run wizard except the
 remotes plugin, unless you specify differently.
@@ -133,12 +129,6 @@
 info to be seen. See the section of the manual on :ref:`themes` if you need more info
 on text sizes in themes.
 
-I am running Mac OS X and I do not have a presentations plugin
---------------------------------------------------------------
-
-Due to software limitations with Keynote and OpenOffice Impress, the
-presentations plugin on OS X is not currently available.
-
 I am using PowerPoint 2010 or PowerPoint Viewer 2010 and presentations do not work
 ----------------------------------------------------------------------------------
 
@@ -201,3 +191,11 @@
 the size of your output. For example, if your output screen is 1024x768 you 
 should size your background image to 1024x768 also. OpenLP does not scale
 images.
+
+OpenLP crashes on startup on Windows
+------------------------------------
+
+If Windows is missing a proper driver for the graphics card on the computer, it
+might cause OpenLP to crash on startup, resulting in a message saying 
+:guilabel:`OpenLP has stopped working`. To fix this find, download and install
+the newest driver for your graphics card.

=== added directory 'scripts'
=== renamed file 'batch-drop-shadow.scm' => 'scripts/batch-drop-shadow.scm'
=== added file 'scripts/round-top-corners.scm'
--- scripts/round-top-corners.scm	1970-01-01 00:00:00 +0000
+++ scripts/round-top-corners.scm	2015-09-29 20:59:16 +0000
@@ -0,0 +1,32 @@
+ ; Place the script in your gimp scripts folder (eg. ~/.gimp-2.8/scripts) go to the
+ ; folder with images you wish to round corners on and execute like this:
+ ; gimp --no-data -i -b '(round-top-corners "*.png")' -b '(gimp-quit 0)'
+ ;
+
+ (define (round-top-corners pattern)
+   (let* ((filelist (cadr (file-glob pattern 1))))
+     (while (not (null? filelist))
+       (let* ((filename (car filelist))
+         (image (car (gimp-file-load RUN-NONINTERACTIVE filename filename)))
+         (width (car (gimp-image-width image)))
+         (drawable (car (gimp-image-get-active-layer image))))
+         ; select 6 pixels in the top left corner and clear them
+         (gimp-rect-select image 0 0 2 2 REPLACE 0 0)
+         (gimp-rect-select image 0 2 1 1 ADD 0 0)
+         (gimp-rect-select image 2 0 1 1 ADD 0 0)
+         (define cornerselectionleft (car (gimp-image-active-drawable image)))
+         (gimp-edit-clear cornerselectionleft)
+         ; select 6 pixels in the top right corner and clear them
+         (gimp-rect-select image (- width 2) 0 2 2 REPLACE 0 0)
+         (gimp-rect-select image (- width 3) 0 1 1 ADD 0 0)
+         (gimp-rect-select image (- width 1) 2 1 1 ADD 0 0)
+         (define cornerselectionright (car (gimp-image-active-drawable image)))
+         (gimp-edit-clear cornerselectionright)
+         (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))
+     )
+   )
+ )