HEAD

manual/source/mediamanager.rst

@@ -12,14 +12,15 @@ everything else that you will project through OpenLP.
 Enabling the Plugins
 --------------------
 
-You may need to enable the plugins that came with OpenLP. As you can see below
+You may need to enable the default plugins that are built in to OpenLP. As you 
-this is what the :ref:`media-manager` looks like with all the plugins enabled.
+can see below this is what the *Media Manager* looks like with all the plugins 
+enabled.
 
-.. image:: pics/mediamanager.png
+.. image:: pics/mediamanager_songs.png
 
 To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
 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.
+would like to enable and select *Active* from the drop down box to the right.
 
 .. image:: pics/plugins.png
 
@@ -62,9 +63,26 @@ Using the buttons in the toolbar you can:
 
 |buttons_db| Maintain the list of authors, topics and books
     Brings up a dialog box to edit authors, topics or song books.
+  over to the Service Manager.
 
 *Note*: Right clicking on a song file will bring up some of the same options.
 
+*Search:*
+  Clicking on the icon in the Search box will display a list of options for you 
+  to search your song database.
+
+.. image:: pics/mediamanager_songs_search.png
+
+You have these options to search.
+
+* *Entire Song:* This option will search Titles, Lyrics and Comments.
+* *Titles:* This option will search Titles only.
+* *Lyrics:* This option will search Lyrics only. 
+* *Authors:* This option will search Authors only.
+* *Themes:* This option will search for the assigned theme to the song.
+
+Use the :guilabel:`Search` button to display your results in the box below.
+
 Bibles
 ^^^^^^
 Clicking on Bibles in the :ref:`media-manager` will display your options for searching 
@@ -89,26 +107,26 @@ Using the buttons you can:
     This will enter your verses into the :ref:`service-manager`. You may also
     drag and drop your verses over to the :ref:`service-manager`.
 
-**Quick tab**
+**Quick** tab
 
 .. image:: pics/mediamanager_bibles_quick.png
 
 *Version*
     Once you have imported a Bible, it will be displayed in the **version**
     drop down box. Select the version of the Bible you want to use here.
-
 *Second*
     If you have "Display second Bible verses" selected in Configure OpenLP,
     Bibles tab, this choice will be visible. This option is for displaying
     another version of the Bible for comparison. Both versions will be
     displayed. If there is not enough space on one slide, the Second verses
     will be displayed on the next slide.
-
 *Search*
     Use the **Search** button to display your results in the box below.
   
 *Find*
     You will type your search query in this box for the following two searches.
+Clicking the icon in the Find box will give you the choice of searching by 
+Scripture Reference or Text Search.
 
     *Scripture Reference*
         You may search for a specific verse using this format below. 
@@ -128,32 +146,69 @@ Using the buttons you can:
 *Results*
     Clear and Keep.
 
-Each search you make will display your verses below. 
+If you have “Display second Bible verses” selected in 
+:menuselection:`Configure OpenLP --> Bibles` tab, this choice will be visible. 
+This option is for displaying another version of the Bible for comparison. Both 
+versions will be displayed. If there is not enough space on one slide, the 
+Second version will be displayed on the next slide.
+
+Click the :guilabel:`Search` button to display your results in the box below.
+
+
+**Layout style**
+
+There are three options to determine how your Bible verses are displayed. 
+
+* *Verse Per Slide* will display one verse per slide.
+* *Verse Per Line* will start each verse on a new line until the slide is full.
+* *Continuous* will run all verses together separated by verse number and chapter if chapter is selected to show above. This setting is also accessible through :menuselection:`Configure OpenLP --> Bibles` tab.
+
+*Note: Changes to Layout Style do not affect verses already in the Service Manager.*
+
+Each search you make will display your verses in the box below.
 
 .. image:: pics/mediamanager_bibles_results.png
 
-If you would like to 
+Toggle lock to keep or clear the previous results.
-display verses that are out of sequence you may select `Keep` in the drop down 
-box and continue your search for the next verse or verses. All searches will be 
-shown and kept below. 
-If you select `Clear` from the drop down box, each new search clears the 
-previous search from the list below.
 
-**Advanced tab**
+.. image:: pics/mediamanager_bibles_lock.png 
+.. image:: pics/mediamanager_bibles_unlock.png
+
+If you would like to display verses that are out of sequence you can click on 
+the lock icon and continue your search for the next verse or verses. All 
+searches will be shown and kept below. If you click the lock icon again, each 
+new search clears the previous search from the list below.
+
+**Advanced** tab
 
 .. image:: pics/mediamanager_bibles_advanced.png
 
-This tab is convenient for selecting book, chapter and verse by name and number.
+The Advanced tab is convenient for selecting book, chapter and verse by name and 
+number.
+
+*Book:*
+  Click on the drop down box and select the book you want to display. 
+
+*Chapter: Verse:*
+  Select your chapter From and To and Verse From and To.
+
 Version and Second are the same as in Quick tab above. Click on each box and 
 select the version you wish to display and Second version if you wish to display 
-an alternative version.
+an alternative version for comparison.
 
-Use the `Search` button to display your results in the box below.
+**Layout style**
 
-`Book:` Click on the drop down box and select the book you want to display. 
+There are three options to determine how your Bible verses are displayed. 
-`Chapter: Verse:` Select your chapter From and To and Verse From and To
 
-Results will work the same as the Quick tab above.
+* *Verse Per Slide* will display one verse per slide.
+* *Verse Per Line* will start each verse on a new line until the slide is full.
+* *Continuous* will run all verses together separated by verse number and chapter if chapter is selected to show above. This setting is also accessible through :menuselection:`Configure OpenLP --> Bibles` tab.
+
+*Note: Changes to Layout Style do not affect verses already in the Service Manager.*
+
+Click the :guilabel:`Search` button to display your results in the box below.
+
+Each search you make will display your verses in the box below.
 
 Presentations
 ^^^^^^^^^^^^^
@@ -177,12 +232,12 @@ Using the buttons you can:
 |button_preview| Preview the selected presentation
     Sends your selected presentation to the preview window.
 
-`Send the selected Presentation live:` This option will immediately display your 
+*Send the selected Presentation live:*
-selected Presentation live.
+  This option will immediately display your selected Presentation live.
 
-`Add the selected Presentation to the service:` This will enter your 
+*Add the selected Presentation to the service:*
-Presentation into the Service Manager. You may also click and drag your 
+  This will enter your Presentation into the Service Manager. You can also click 
-Presentation over to the Service Manager. 
+  and drag your Presentation over to the Service Manager. 
 
 Right clicking on a Presentation file will bring up some of the same options.
 
@@ -195,26 +250,27 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_images_buttons.png
 
-`Load a new Image:` This brings up a dialog box to find your Image and list it 
+*Load a new Image:*
-in OpenLP.
+  This brings up a dialog box to find your Image and list it in OpenLP.
 
-`Delete the selected Image:` This removes your Image from the list. Please note: 
+*Delete the selected Image:*
-this will not delete the Image from your computer, just the OpenLP list.
+  This removes your Image from the list. Please note: this will not delete the 
+  Image from your computer, just the OpenLP list.
 
-`Preview the selected Image:` Sends your selected Image to the Preview window 
+*Preview the selected Image:*
+  Sends your selected Image to the Preview window. 
 
-`Send the selected Image live:` This option will immediately display your 
+*Send the selected Image live:*
-selected Image live.
+  This option will immediately display your selected Image live.
 
-`Add the selected Image to the service:` This will enter your Image into the 
+*Add the selected Image to the service:*
-Service Manager. You may also click and drag your Image over to the Service 
+  This will enter your Image into the Service Manager. You can also click and 
-Manager. 
+  drag your Image over to the Service Manager. 
-
-`Replace Live Background:` With an Image selected, clicking this button will 
-immediately replace the live background being displayed with your selection.
-The Image will replace the theme background until the theme changes or the 
-"Remove Background" button is pressed.
 
+*Replace Live Background:*
+  With an Image selected, clicking this button will immediately replace the live 
+  background being displayed with your selection. The Image will replace the theme 
+  background until the theme changes or the "Remove Background" button is pressed.
 
 Right clicking on an Image file will bring up some of the same options.
 
@@ -229,28 +285,34 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_media_buttons.png
 
-`Load a new Media:` This brings up a dialog box to find your Media and list it 
+*Load a new Media:*
-in OpenLP.
+  This brings up a dialog box to find your Media and list it in OpenLP.
 
-`Delete the selected Media:` This removes your Media from the list. Please note: 
+*Delete the selected Media:*
-this will not delete the Media from your computer, just the OpenLP list.
+  This removes your Media from the list. Please note: this will not delete the 
+  Media from your computer, just the OpenLP list.
 
-`Preview the selected Media:` Sends your selected Media to the Preview window 
+*Preview the selected Media:*
+  Sends your selected Media to the Preview window. 
 
-`Send the selected Media live:` This option will immediately display your 
+*Send the selected Media live:*
-selected Media live.
+  This option will immediately display your selected Media live.
 
-`Add the selected Media to the service:` This will enter your Media into the 
+*Add the selected Media to the service:*
-Service Manager. You may also click and drag your Media over to the Service 
+  This will enter your Media into the Service Manager. You can also click and 
-Manager. 
+  drag your Media over to the Service Manager. 
 
-`Replace Live Background:` With a Media file selected, clicking this button will 
+*Replace Live Background:*
-immediately replace the live background being displayed with your selection.
+  With a Media file selected, clicking this button will immediately replace the 
+  live background being displayed with your selection.
 
 Right clicking on a Media file will bring up some of the same options.
 
 Custom
 ^^^^^^
+Custom gives you the option of creating your own slide. This could be useful for 
+displaying readings, liturgy or any text that may not be found in Songs or 
+Bibles.
 
 .. image:: pics/mediamanager_custom.png
 
@@ -258,24 +320,22 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_custom_buttons.png
 
-Custom gives you the option of creating your own slide. This could be useful for 
+*Add a new Custom:*
-displaying readings, liturgy or any text that may not be found in Songs or 
+  Brings up the dialog box to add a new Custom display. *Edit the selected Custom:* 
-Bibles.
+  Brings up the dialog box to make changes to the Custom display.
 
-`Add a new Custom:` Brings up the dialog box to add a new Custom display.
+*Delete the selected Custom:*
-`Edit the selected Custom:` Brings up the dialog box to make changes to the 
+  Remove the Custom from your list.
-Custom display.
 
-`Delete the selected Custom:` Remove the Custom from your list
+*Preview the selected Custom:*
+  Lets you see what your Custom will look like displayed live.
 
-`Preview the selected Custom:` Lets you see what your Custom will look like 
+*Send the selected Custom live:*
-displayed live
+  This option will immediately display your Custom live.
 
-`Send the selected Custom live:` This option will immediately display your 
+*Add the selected Custom to the service:*
-Custom live
+  This will enter your Custom slide in the Service Manager. You can also drag 
-
+  your Custom slide over to the Service Manager.
-`Add the selected Custom to the service:` This will enter your Custom in the 
-Service Manager. You may also drag your Custom over to the Service Manager.
 
 Right clicking on a Custom file will bring up some of the same options.
 
@@ -283,21 +343,24 @@ When you Add a new Custom slide a dialog box will appear.
 
 .. image:: pics/mediamanager_custom_edit.png
 
-`Title:` Name of your Custom slide.
+*Title:*
+  Name of your Custom slide.
 
-`Add:` After clicking on Add you will enter your text you want to display in 
+*Add:*
-this box. To create multiple slides, click the Split Slide button. When you have 
+  After clicking on Add you will enter your text you want to display in this box. 
-finished adding your text, click on the Save button.
+  To create multiple slides, click the Split Slide button. When you have finished 
+  adding your text, click on the Save button.
 
-`Theme:` Select the theme you want to use for your Custom slide from this drop 
+*Theme:*
-down box.
+  Select the theme you want to use for your Custom slide from this drop down box.
 
-`Credits:` Anything typed in this box will be displayed in the footer 
+*Credits:*
-information on the display. When you are finished, click the Save button.
+  Anything typed in this box will be displayed in the footer information on the 
+  display. When you are finished, click the :guilabel:`Save` button.
 
-To Edit your slide, click on the Edit button to edit part of it or the Edit All 
+To Edit your slide, click on :guilabel:`Edit` to edit part of it or 
-if you need to make multiple changes. Use the Up and Down arrows to change the 
+:guilabel:`Edit All` if you need to make multiple changes. Use the Up and Down 
-arrangement of your Custom slide.
+arrows to change the arrangement of your Custom slide.
 
 .. These are all the image templates that are used in this page.