Merge branch 'remote' into 'master'

Change Media Manager to Library and update configuration to Beta

Closes #42

See merge request openlp/documentation!23

manual/source/android-remote.rst

@@ -168,7 +168,7 @@ you to search that library item.
 
 Selecting the blank line to the right of :guilabel:`Search Text` will allow you
 to enter the text you want to find.  The search is the same search you would 
-make on the instance of OpenLP :ref:`media-manager` and will find parts of the lyrics within a 
+make on the instance of OpenLP :ref:`library` and will find parts of the lyrics within a 
 song if you type in part of the lyrics.  When you have typed in your search
 criteria, select the search icon in the keyboard to activate the search.
 

manual/source/bibles.rst

@@ -275,8 +275,8 @@ Adding scriptures to a service can be done by selecting a group of verses
 or by moving one verse at a time.
 
 To add Bible verses you can click on a verse, hold and drag your selection
-from the :ref:`media-manager` over to the *Service Manager* 
+from the :ref:`library` over to the *Service Manager* 
-or, after clicking the media or verse you want to use, click the 
+or, after selecting the verse or group of verses you want to use, click the 
 |bibleadd| Add to Service icon. This will add your scriptures at the bottom 
 of the *Service*. 
 

manual/source/glossary.rst

@@ -35,24 +35,24 @@ the tools and plugins that make OpenLP function.
 
 .. image:: pics/mainwindow.png
 
-.. _g-media-manager:
+.. _g-library:
 
-Media Manager
+Library
--------------
+-------
 
-The Media Manager contains a number of tabs which the plugins supply to OpenLP.
+The Library contains a number of tabs which the plugins supply to OpenLP.
-Each tab in the Media Manager is called a :ref:`g-media-item`. You can send
+Each tab in the Library is called a :ref:`g-library-item`. You can send
-songs, Bibles, etc from the :ref:`g-media-item` to the
+songs, Bibles, etc from the :ref:`g-library-item` to the
 :ref:`g-preview-slide-controller` or :ref:`g-live-slide-controller`.
 
 .. image:: pics/mediamanager_songs.png
 
-.. _g-media-item:
+.. _g-library-item:
 
-Media Item
+Library Item
-----------
+------------
 
-A media item is a tab in the :ref:`g-media-manager`. The media item contains
+A library item is a tab in the :ref:`g-library`. The library item contains
 any items from the various plugins which can be displayed on the display screen.
 
 .. g-platform:
@@ -68,7 +68,7 @@ system, Windows, Linux, (Mac) OS X or FreeBSD/PC-BSD.
 Preview Pane
 ------------
 
-The preview pane is a section to preview your media items before you go live
+The preview pane is a section to preview your library items before you go live
 with them.
 
 .. image:: pics/preview.png
@@ -86,15 +86,15 @@ The service file consist of :ref:`g-service-item`
 Service Items
 -------------
 
-Service items are the :ref:`g-media-item` that are in the :ref:`g-service-manager`.
+Service items are the :ref:`g-library-item` that are in the :ref:`g-service-manager`.
 
 .. _g-service-manager:
 
 Service Manager
 ---------------
 
-The service manager contains the media items in your service file. This is the
+The service manager contains the library items in your service file. This is the
-area where your media items go live. You can also save, open, and edit
+area where your library items go live. You can also save, open, and edit
 services files from here.
 
 .. image:: pics/servicemanager.png

manual/source/index.rst

@@ -40,7 +40,7 @@ Reference Manual
    configure_ui
    backing_up
    dualmonitors
-   mediamanager
+   library
    service
    print_service
    projector

manual/source/library.rst

@@ -1,23 +1,23 @@
-.. _media-manager:
+.. _library:
 
-Media Manager
+Library
-=============
+=======
 
 Once you get your system set up for OpenLP you will be ready to add content to
 your :ref:`g-service-manager`. This will all happen through the
-:ref:`g-media-manager`. The :ref:`g-media-manager` contains all the Bibles,
+:ref:`g-library`. The :ref:`g-library` contains all the Bibles,
-Songs, Presentations, Media, and Custom Slides that you will project through
+Songs, Presentations, Audio files, Visual files, and Custom Slides
-OpenLP.
+that you will project through OpenLP.
 
-If you don't see the "Songs", "Bibles" and other media items in the
+If you don't see the "Songs", "Bibles" and other library items in the
-:ref:`g-media-manager`, then refer to :ref:`t-no-media-items` in the
+:ref:`g-library`, then refer to :ref:`t-no-library-items` in the
 troubleshooting guide.
 
 Songs
 -----
 
-Clicking on *Songs* in the :ref:`g-media-manager` will display the songs media
+Clicking on *Songs* in the :ref:`g-library` will display the songs library
-item. The songs media item shows a list of all the songs in the songs database.
+item. The songs library item shows a list of all the songs in the songs database.
 
 .. image:: pics/mediamanager_songs.png
 
@@ -43,7 +43,7 @@ Toolbar
 |buttons_add| **Add song to service:**
     Add the selected song(s) to the :ref:`g-service-manager`. Songs can also be
     added to the :ref:`g-service-manager` by means of drag and drop from the
-    :ref:`g-media-manager`.
+    :ref:`g-library`.
 
 |buttons_db| **Maintain authors, topics and books:**
     Open the song maintenance dialog to add, edit or delete authors, topics or
@@ -81,8 +81,8 @@ in the song list.
 Bibles
 ------
 
-Clicking on *Bibles* in the :ref:`g-media-manager` will display the Bibles media
+Clicking on *Bibles* in the :ref:`g-library` will display the Bibles
-item. The Bibles media item shows Bible verses and provides a search function
+item. The Bibles item shows Bible verses and provides a search function
 to find Bible verses and add them to the :ref:`g-service-manager`.
 
 .. image:: pics/mediamanager_bibles.png
@@ -107,7 +107,7 @@ Toolbar
 |buttons_add| **Add verses to service:**
     Add the selected verses to the :ref:`g-service-manager`. Verses can also be
     added to the :ref:`g-service-manager` by means of drag and drop from the
-    :ref:`g-media-manager`.
+    :ref:`g-library`.
 
 **Note:** Right-clicking on a selection of verses will display some of the
 same options.
@@ -214,13 +214,13 @@ in the verse list.
 
 .. image:: pics/mediamanager_bibles_results.png
 
-.. _media-manager-presentations:
+.. _library-presentations:
 
 Presentations
 -------------
 
-Clicking on *Presentations* in the :ref:`g-media-manager` will display the
+Clicking on *Presentations* in the :ref:`g-library` will display the
-presentations media item. The presentations media item shows a list of imported
+presentations item. The presentations item shows a list of imported
 presentations.
 
 .. image:: pics/mediamanager_presentations.png
@@ -246,12 +246,12 @@ Toolbar
 |buttons_add| **Add presentation to service:**
     Add the selected presentation to the :ref:`g-service-manager`. Presentations
     can also be added to the :ref:`g-service-manager` by means of drag and drop
-    from the :ref:`g-media-manager`.
+    from the :ref:`g-library`.
 
 **Notes:** Right-clicking on a presentation will display some of the same options.
 
 Presentation items can be dragged from the desktop (or any folder) into the 
-Presentation media manager plugin. This allows the selected items to be loaded 
+Presentation library 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, only items with the correct file suffix for the 
 plugin will be loaded. If you try to drop a presentation into the images folder, 
@@ -270,8 +270,8 @@ behavior if the application chosen is not compatible with the presentation.
 Images
 ------
 
-Clicking on *Images* in the :ref:`g-media-manager` will display the images
+Clicking on *Images* in the :ref:`g-library` will display the images
-media item. The images media item shows a list of imported images.
+item. The images item shows a list of imported images.
 
 .. image:: pics/mediamanager_images.png
 
@@ -301,7 +301,7 @@ Toolbar
 |buttons_add| **Add image to service:**
     Add the selected image(s) to the :ref:`g-service-manager`. Images can also
     be added to the :ref:`g-service-manager` by means of drag and drop from the
-    :ref:`g-media-manager`.
+    :ref:`g-library`.
 
 |buttons_replace_live_background| **Replace live background:**
     Replace the current live theme background with the selected image. This
@@ -312,7 +312,7 @@ Toolbar
 
 .. image:: pics/images_select_image_group.png
 
-When an image is added to the mediamanager, a dialog will ask in which group the
+When an image is added to the library, 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`.
 
@@ -326,8 +326,8 @@ generated.
 Media
 -----
 
-Clicking on *Media* in the :ref:`g-media-manager` will display the media item
+Clicking on *Media* in the :ref:`g-library` will display the audio or video files
-for media. The media item shows a list of imported audio or video files.
+in the Library.
 
 **Note:** On some computers OpenLP has trouble displaying videos. Please read
 the :ref:`troubleshooting` for tips on how to resolve these issues.
@@ -338,44 +338,44 @@ Toolbar
 ^^^^^^^
 
 |buttons_media_optical| **Load CD/DVD:**
-    Import mediaclip from audio CD or DVD. This feature only works if VLC is
+    This feature only works if VLC is installed on the computer and enabled in OpenLP.
-    installed on the computer and enabled in OpenLP. See :ref:`config_players`
+    See :ref:`media_configure` for how to configure media players. Clicking the icon
-    for how to configure media players. Clicking the icon will bring up a window
+    will bring up a window where you can load a DVD or audio CD, select a track and
-    where you can load a DVD or audio CD, select a track and a range and save
+    a range and save it as a named clip. Note that the audio CD or DVD is still required
-    it as a named media clip. Note that the audio CD or DVD is still required
+    when playing the clip, even if the clip is saved to a service file.
-    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:**
+|buttons_open| **Open device stream:**
-    Import one or more media files. Media files need to be imported in order to
+    Connect to a video stream that is physically connected to the OpenLP computer.
-    be used in OpenLP.
 
-|buttons_delete| **Delete media:**
+|buttons_video| **Open network stream:**
-    Removes the selected media file(s) from the list. Note that this does not
+    Connect to a video stream that is accessable over the network connected to
-    delete the original media file(s) from the disk.
+    the OpenLP computer.
 
-|buttons_preview| **Preview media:**
+|buttons_link| **Load new media:**
-    Send the selected media to the :ref:`g-preview-slide-controller`.
+    Import one or more audio and video files. Audio and video files need to be
+    imported in order to be used in OpenLP.
 
-|buttons_live| **Send media live:**
+|buttons_delete| **Delete the selected media:**
-    Send the selected media to the :ref:`g-live-slide-controller` to be shown
+    Removes the selected audio or video file(s) from the list. Note that this does not
+    delete the original file(s) from the disk.
+
+|buttons_preview| **Preview the selected media:**
+    Send the selected audio and video files to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send the selected media live:**
+    Send the selected audio or video file to the :ref:`g-live-slide-controller` to be shown
     on the display screen.
 
-|buttons_add| **Add media to service:**
+|buttons_add| **Add the selected media to the service:**
-    Add the selected media to the :ref:`g-service-manager`. Media can also be
+    Add the selected audio and video files to the :ref:`g-service-manager`. Audio and video
-    added to the :ref:`g-service-manager` by means of drag and drop from the
+    files can also be added to the :ref:`g-service-manager` by means of drag and drop
-    :ref:`g-media-manager`.
+    from the     :ref:`g-library`.
 
-|buttons_replace_live_background| **Replace live background:**
+**Notes:** Right-clicking on a audio or video file will display some of the same options.
-    Replace the current live theme background with the selected media. This
-    has effect until the theme changes, or the *Remove Background* button is
-    clicked.
 
-**Notes:** Right-clicking on a media file will display some of the same options.
+Audio and video items can be dragged from the desktop (or any folder) into the Media 
-
-Media items can be dragged from the desktop (or any folder) into the Media 
 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, only items with the correct file suffix for the plugin will be loaded. 
@@ -392,8 +392,8 @@ default is :guilabel:`Automatic`, but you can choose any available player.
 Custom Slides
 -------------
 
-Clicking on *Custom Slides* in the :ref:`g-media-manager` will display the
+Clicking on *Custom Slides* in the :ref:`g-library` will display the
-custom slides media item. The custom slides media item shows a list of custom
+custom slides libruary item. The custom slides item shows a list of custom
 textual items. Custom slides are useful for creating unstructured text items,
 such as liturgy or prayers.
 
@@ -421,7 +421,7 @@ Toolbar
 |buttons_add| **Add custom slide to service:**
     Add the selected custom slide(s) to the :ref:`g-service-manager`. Custom
     slides can also be added to the :ref:`g-service-manager` by means of drag
-    and drop from the :ref:`g-media-manager`.
+    and drop from the :ref:`g-library`.
 
 **Note:** Right-clicking on a custom slide in the list will display some of the
 same options.
@@ -436,6 +436,12 @@ same options.
 
 .. |BUTTONS_PREVIEW| image:: pics/buttons_preview.png
 
+.. |BUTTONS_REPLACE_LIVE_BACKGROUND| image:: pics/buttons_replace_live_background.png
+
+.. |BUTTONS_VIDEO| image:: pics/buttons_video.png
+
+.. |BUTTONS_LINK| image:: pics/buttons_link.png
+
 .. |BUTTONS_LIVE| image:: pics/buttons_live.png
 
 .. |BUTTONS_ADD| image:: pics/buttons_add.png
@@ -450,8 +456,6 @@ same options.
 
 .. |BUTTONS_CLEAR_RESULTS| image:: pics/buttons_clear_results.png
 
-.. |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

manual/source/menu_items.rst

@@ -80,7 +80,7 @@ View
     Displays all of the panels of OpenLP. 
 
   **Setup:** 
-    Displays Preview, :ref:`media-manager` and :ref:`creating_service`.
+    Displays Preview, :ref:`library` and :ref:`creating_service`.
 
   **Live:** 
     Displays the live panel and :ref:`creating_service`
@@ -88,7 +88,7 @@ View
 Clicking on any of the next items will hide or show its respective panel.
 
 |button_mediamanager| **Media Manager:** 
-    Hide or show :ref:`media-manager`.
+    Hide or show :ref:`library`.
 
 |button_projectormanager| **Projector Manager:** 
     Hide or show :ref:`projector`.

manual/source/print_service.rst

@@ -74,7 +74,7 @@ Options
   This option will include any notes you have added to the service items.
 
 **Include play length of media items:**
-  This option will print the length of media items in the service.
+  This option will print the length of audio and video items in the service.
 
 .. _advanced:
 

manual/source/service.rst

@@ -10,9 +10,9 @@ Creating a Service
 Now that you have OpenLP set up the way you want, it is time to put it to use.
 
 Everything you need to display will be in the left panel called the
-:ref:`g-media-manager`, under their respective categories. Using the
+:ref:`g-library`, under their respective categories. Using the
-:ref:`g-media-manager` you can add new media, songs, images, Bibles or create a
+:ref:`g-library` you can add new media, songs, images, Bibles or create a
-custom slide as discussed earlier in the :ref:`media-manager` section.
+custom slide as discussed earlier in the :ref:`library` section.
 
 .. image:: pics/mediamanager_songs.png
 
@@ -69,17 +69,17 @@ menu. Follow the directions here :ref:`songs_create_edit` to make changes to
 your song. 
 
 **Note:** Editing a song in :ref:`creating_service` will be applied to 
-the :ref:`creating_service` song database. Editing a song in the :ref:`media-manager` 
+the :ref:`creating_service` song database. Editing a song in the :ref:`library` 
-will be applied to the song in your :ref:`media-manager`.  This can be changed
+will be applied to the song in your :ref:`library`.  This can be changed
 so that changes made in the :ref:`creating_service` song database update 
-the :ref:`media-manager` song database and changes made in the :ref:`media-manager`
+the :ref:`library` song database and changes made in the :ref:`library`
 song database update the :ref:`creating_service` song database in :ref:`configure`.
 
 Adding Media
 ------------
 
-To add your media you can click on an item in the :ref:`media-manager` hold and 
+To add your media you can click on an item in the :ref:`library` hold and 
-drag your selection from the :ref:`media-manager` over to the *Service Manager* 
+drag your selection from the :ref:`library` over to the *Service Manager* 
 or, after clicking the media or verse you want to use, click the |add_plus|. 
 This will add your media to the service side at the bottom. Once it is in the 
 Service Manager you can click on your item and drag and drop it in the order you 
@@ -114,7 +114,7 @@ buttons to the right of a list item to expand or collapse a single list item.
 |COLLAPSE_SINGLE| Collapse a single 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 
+:ref:`library`. Please see the :ref:`library` section for more 
 details.
 
 Displaying an Item
@@ -202,7 +202,7 @@ Adding a Group of Images
 
 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. You can either create the group in the :ref:`media-manager` and then
+reason. You can either create the group in the :ref:`library` 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 
@@ -231,7 +231,7 @@ where you want it. If there is an image you do not want in your order, click on
 it and then click the :guilabel:`Delete` button. When you are done arranging
 your images click :guilabel:`Save`.
 
-If you need to add another image from the :ref:`media-manager` to your group of 
+If you need to add another image from the :ref:`library` to your group of 
 images, left click the image you want to add and hold the mouse button and drag 
 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`.
@@ -280,7 +280,7 @@ Creating a New Custom Slide
 You have the ability to create a custom slide in the service manager by right 
 clicking on the Song, Bible Verse or Custom Slide then 
 choosing :menuselection:`Create new Custom Slide` from the context menu. 
-Follow the directions here :ref:`media-manager` to 
+Follow the directions here :ref:`library` to 
 create your new custom slide.
 
 .. _using_timer:

manual/source/songs.rst

@@ -125,7 +125,7 @@ corner and choose either the .txt or .usr file.
 You will be asked to choose a download location if your browser does not 
 automatically select one for you. Select the downloaded file from the OpenLP 
 import window and then click :guilabel:`Next`. When import is finished, you will 
-find your song in the :ref:`g-media-manager`.
+find your song in the :ref:`g-library`.
 
 **Note:** Most operating systems allow you to select multiple songs for import 
 by selecting the first item in the list and then holding the :kbd:`Shift` and 
@@ -344,10 +344,10 @@ assign a Theme, or edit Copyright Info & Comments, you will do this through the
 
 **Edit:** 
     To edit an existing song you can either click on a song in the 
-    :ref:`media-manager` and then click the button to :guilabel:`Edit the selected song` 
+    :ref:`library` and then click the button to :guilabel:`Edit the selected song` 
-    or right click a song from either the :ref:`media-manager` or additionally 
+    or right click a song from either the :ref:`library` or additionally 
     from the :ref:`creating_service` and click :guilabel:`Edit item`. If you are 
-    adding a new song click :guilabel:`Add a new Song` in the :ref:`media-manager`.
+    adding a new song click :guilabel:`Add a new Song` in the :ref:`library`.
 
 .. image:: pics/song_edit_lyrics.png
 
@@ -539,7 +539,7 @@ the song is displayed live.
     Add an audio file from a folder on your computer by clicking :guilabel:`Add File(s)`.
 
 **Add Media:** 
-    Add an audio file that is already in the :ref:`media-manager` by   clicking 
+    Add an audio file that is already in the :ref:`library` by   clicking 
     :guilabel:`Add Media`.
 
 **Remove:** 

manual/source/troubleshooting.rst

@@ -134,17 +134,17 @@ directory::
 
 ``<username>`` is your username.
 
-.. _t-no-media:
+.. _t-no-library:
 
-I can not play videos or other media
+I can not play videos or other library items.
-------------------------------------
+---------------------------------------------
 
 If you can not play video or audio through OpenLP, the problem is most likely
-that the media players have not be properly configured. The recommended media
+that the players have not be properly configured. The recommended
-player for OpenLP is VLC, see the manual for :ref:`config_players` for how to 
+player for OpenLP is VLC, see the manual for :ref:`media_configure` for how to 
 setup VLC as your default player.
 
-If you want to use the System player, but it cannot play your media files, you
+If you want to use the System player, but it cannot play your audio or video files, you
 can look below for how best to set it up.
 
 Codecs
@@ -234,12 +234,12 @@ install.
 Follow the tutorial `using the rpmfusion repository <http://www.linuxjournal.com/video/getting-mp3-support-fedora-using-rpmfusion-repositories>`_
 to enable extra audio and video formats on Fedora
 
-.. _t-no-media-items:
+.. _t-no-library-items:
 
-The Media Manager appears to be missing some features
+The Library appears to be missing some features
------------------------------------------------------
+-----------------------------------------------
 
-If you do not see all the features listed in the Media Manager, you may need
+If you do not see all the features listed in the Library, you may need
 to enable them.
 
 To enable the plugins navigate to :menuselection:`Settings --> Plugins` or

manual/source/web_remote.rst

@@ -5,12 +5,20 @@ The Web Remote
 
 OpenLP gives you the ability to control the :ref:`creating_service`. You also 
 have the ability to search for and add or display media from the 
-:ref:`media-manager` or send an :ref:`alerts`, using a remote computer, netbook 
+:ref:`library` or send an :ref:`alerts`, using a remote computer, netbook 
 or smartphone and a web browser. You can use the web remote to control the 
 entire service away from the main computer or, have the nursery or daycare send 
 an :ref:`alerts` message to the projection screen. This could also be used for a 
 guest speaker or worship team leader to control their own slides if needed.
 
+The Web Remote was moved to being part of the core program in version 2.9.2.
+The only thing you need to do is go into :ref:`configure`, select the Remote Interface
+item int the menu on the left side of the Settings window then press the
+Check for Updates button.  If the Current version number is not the same as
+Latest Version then press the Upgrade button.  When the numbers match, press the
+OK button at the bottom of the settings window.
+
+Versions before 2.9.2
 The first step is to make sure the Remote plugin is activated. You can accomplish
 this by following the instructions in the :ref:`plugin_list`. The second step is 
 to configure the settings you will use with the web browser. You can find these 

manual/source/wizard.rst

@@ -36,7 +36,7 @@ Activate Required Plugins
 
 OpenLP has several plugins to choose from. By default, all plugins are enabled, 
 except the *Remote Access* plugin. For more information on these plugins, please 
-read the :doc:`mediamanager` section in the manual. If you are not sure of which 
+read the :doc:`library` section in the manual. If you are not sure of which 
 plugins to enable or disable, leave the selection as is. You can easily activate 
 or deactivate plugins later, when OpenLP is running, by going to 
 :menuselection:`Settings --> Plugin List`. Click :guilabel:`Next` to continue.