update to media manager

bzr-revno: 12

manual/source/mediamanager.rst

@@ -6,20 +6,21 @@ Media Manager
 
 Once you get your system set up for OpenLP you will be ready to add content to
 your Service Manager. This will all happen through the **Media Manager**. The
-`Media Manager` contains all the Bibles, Songs, Presentations, Media, and 
+Media Manager contains all the Bibles, Songs, Presentations, Media, and 
 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
-this is what the `Media Manager` looks like with all the plugins enabled.
+You may need to enable the default plugins that are built in to OpenLP. As you 
+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
 
@@ -43,24 +44,44 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_songs_buttons.png
 
-`Add a song:` Brings up the dialog box to add a new song
+*Add a song:*
+  Brings up the dialog box to add a new song
 
-`Edit the selected song:` Brings up the dialog box to make changes to the song
+*Edit the selected song:*
+  Brings up the dialog box to make changes to the song
 
-`Delete the selected song:` Removes the song from your song list
+*Delete the selected song:*
+  Removes the song from your song list
 
-`Preview the selected song:` Lets you see what your song will look like 
-displayed live
+*Preview the selected song:*
+  Lets you see what your song will look like displayed live
 
-`Send the selected song live:` This option will immediately display your song 
-live.
+*Send the selected song live:*
+  This option will immediately display your song live.
 
-`Add the selected Song to the service:` This will enter your song in the Service 
-Manager. You may also drag your song over to the Service Manager.
+*Add the selected Song to the service:*
+  This will enter your song in the Service Manager. You can also drag your song 
+  over to the Service Manager.
 
-`Maintain the list of authors, topics and books:` Brings up a dialog box to edit 
-Authors, Topics or Song Books. 
-Note: Right clicking on a song file will bring up some of the same options.
+*Maintain the list of authors, topics and books:*
+  Brings up a dialog box to edit Authors, Topics or Song Books. 
+  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
 ^^^^^^
@@ -73,40 +94,31 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_bibles_buttons.png
 
-`Import a Bible:` This is discussed in detail on the Bible Importer page in the 
-manual. 
+*Import a Bible:*
+  This is discussed in detail on the Bible Importer page in the manual. 
 
-`Preview the selected Bible:` Sends your selected verses to the Preview window 
+*Preview the selected Bible:*
+  Sends your selected verses to the Preview window 
 
-`Send the selected Bible live:` This option will immediately display your 
-selected verses live.
+*Send the selected Bible live:*
+  This option will immediately display your selected verses live.
 
-`Add the selected Bible to the service:` This will enter your verses into the 
-Service Manager. You may also click and drag your verses over to the Service 
-Manager. 
+*Add the selected Bible to the service:*
+  This will enter your verses into the Service Manager. You can also click and 
+  drag your verses over to the 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 version will be displayed on the next 
-slide.
-
-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.
 
-You will type your search query in this box for the following two searches.
-
-`Search type:` You may search for a specific verse using this format below. 
+*Scripture Reference:*
+You can search for a specific verse using this format below. 
 
 * Book Chapter 
 * Book Chapter-Chapter
@@ -116,40 +128,80 @@ You will type your search query in this box for the following two searches.
 * Book Chapter:Verse-Verse, Chapter:Verse-Verse
 * Book Chapter:Verse-Chapter:Verse
 
+*Text Search*
+  You can also search by a keyword or words. The more words you use for the 
+  search, the more you will narrow down your results.
 
-`Text Search:`
+**Version** 
 
-You may also search by a keyword or words. The more words you use for the 
-search, the more you will narrow down your results.
+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.
 
-**Results** `Clear and Keep.`
- 
-Each search you make will display your verses below. 
+**Second**
+
+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 
-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.
+Toggle lock to keep or clear the previous results.
 
-**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. 
-`Chapter: Verse:` Select your chapter From and To and Verse From and To
+There are three options to determine how your Bible verses are displayed. 
 
-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
 ^^^^^^^^^^^^^
@@ -160,22 +212,22 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_presentations_buttons.png
 
-`Load a new presentation:` This brings up a dialog box to find your presentation 
-and list it in OpenLP.
+*Load a new presentation:*
+  This brings up a dialog box to find your presentation and list it in OpenLP.
 
-`Delete the selected Presentation:` This removes your Presentation from the list. 
-Please note: this will not delete the presentation from your computer, only from  
-the OpenLP list.
+*Delete the selected Presentation:*
+  This removes your Presentation from the list. Please note: this will not delete 
+  the presentation from your computer, only from the OpenLP list.
 
-`Preview the selected Presentation:` Sends your selected Presentation to the 
-Preview window 
+*Preview the selected Presentation:*
+  Sends your selected Presentation to the Preview window 
 
-`Send the selected Presentation live:` This option will immediately display your 
-selected Presentation live.
+*Send the selected Presentation live:*
+  This option will immediately display your selected Presentation live.
 
-`Add the selected Presentation to the service:` This will enter your 
-Presentation into the Service Manager. You may also click and drag your 
-Presentation over to the Service Manager. 
+*Add the selected Presentation to the service:*
+  This will enter your Presentation into the Service Manager. You can also click 
+  and drag your Presentation over to the Service Manager. 
 
 Right clicking on a Presentation file will bring up some of the same options.
 
@@ -188,26 +240,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 
-in OpenLP.
+*Load a new Image:*
+  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: 
-this will not delete the Image from your computer, just the OpenLP list.
+*Delete the selected Image:*
+  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 
-selected Image live.
+*Send the 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 
-Service Manager. You may also click and 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.
+*Add the selected Image to the service:*
+  This will enter your Image into the Service Manager. You can also click and 
+  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.
 
 Right clicking on an Image file will bring up some of the same options.
 
@@ -222,28 +275,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 
-in OpenLP.
+*Load a new Media:*
+  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: 
-this will not delete the Media from your computer, just the OpenLP list.
+*Delete the selected Media:*
+  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 
-selected Media live.
+*Send the 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 
-Service Manager. You may also click and drag your Media over to the Service 
-Manager. 
+*Add the selected Media to the service:*
+  This will enter your Media into the Service Manager. You can also click and 
+  drag your Media over to the Service Manager. 
 
-`Replace Live Background:` With a Media file selected, clicking this button will 
-immediately replace the live background being displayed with your selection.
+*Replace Live Background:*
+  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
 
@@ -251,24 +310,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 
-displaying readings, liturgy or any text that may not be found in Songs or 
-Bibles.
+*Add a new Custom:*
+  Brings up the dialog box to add a new Custom display. *Edit the selected Custom:* 
+  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.
-`Edit the selected Custom:` Brings up the dialog box to make changes to the 
-Custom display.
+*Delete the selected Custom:*
+  Remove the Custom from your list.
 
-`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 
-displayed live
+*Send the selected Custom live:*
+  This option will immediately display your Custom live.
 
-`Send the selected Custom live:` This option will immediately display your 
-Custom live
-
-`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.
+*Add the selected Custom to the service:*
+  This will enter your Custom slide in the Service Manager. You can also drag 
+  your Custom slide over to the Service Manager.
 
 Right clicking on a Custom file will bring up some of the same options.
 
@@ -276,18 +333,21 @@ 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 
-this box. To create multiple slides, click the Split Slide button. When you have 
-finished adding your text, click on the Save button.
+*Add:*
+  After clicking on Add you will enter your text you want to display in this box. 
+  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 
-down box.
+*Theme:*
+  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 
-information on the display. When you are finished, click the Save button.
+*Credits:*
+  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 
-if you need to make multiple changes. Use the Up and Down arrows to change the 
-arrangement of your Custom slide.
+To Edit your slide, click on :guilabel:`Edit` to edit part of it or 
+:guilabel:`Edit All` if you need to make multiple changes. Use the Up and Down 
+arrows to change the arrangement of your Custom slide.