Finished most of the changes and fixes.

This commit is contained in:
Raoul Snyman 2011-06-16 23:34:17 +02:00
parent b9ba957249
commit e55e3939f4
4 changed files with 142 additions and 122 deletions

View File

@ -0,0 +1,27 @@
.. _custom-slides:
Custom Slides
=============
When you Add a new custom slide a dialog box will appear.
.. image:: pics/mediamanager_custom_edit.png
*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.
*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 :guilabel:`Save` button.
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.

View File

@ -1,8 +1,3 @@
.. OpenLP documentation master file, created by
sphinx-quickstart on Thu Sep 30 21:24:54 2010.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to the OpenLP 2.0 User Manual Welcome to the OpenLP 2.0 User Manual
===================================== =====================================
@ -25,14 +20,15 @@ Reference Manual
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
alert wizard
bibles
configure configure
dualmonitors dualmonitors
wizard
mediamanager mediamanager
songs
themes themes
songs
bibles
custom_slides
alert
glossary glossary
Questions and Troubleshooting Questions and Troubleshooting

View File

@ -1,6 +1,5 @@
.. _media-manager: .. _media-manager:
=============
Media Manager Media Manager
============= =============
@ -18,8 +17,7 @@ Songs
----- -----
Clicking on *Songs* in the :ref:`g-media-manager` will display the songs media Clicking on *Songs* in the :ref:`g-media-manager` will display the songs media
item. The songs media item shows a list of all the songs you have added to the item. The songs media item shows a list of all the songs in the songs database.
songs database.
.. image:: pics/mediamanager_songs.png .. image:: pics/mediamanager_songs.png
@ -51,7 +49,7 @@ Toolbar
Open the song maintenance dialog to add, edit or delete authors, topics or Open the song maintenance dialog to add, edit or delete authors, topics or
song books. song books.
**Note:** Right clicking on a song in the list will bring up some of the same **Note:** Right-clicking on a song in the list will display some of the same
options. options.
Search Search
@ -83,9 +81,9 @@ in the song list.
Bibles Bibles
------ ------
Clicking on Bibles in the :ref:`g-media-manager` will display the Bibles media Clicking on *Bibles* in the :ref:`g-media-manager` will display the Bibles media
item. The Bibles media item gives you the ability to search for Bible verses and item. The Bibles media item shows Bible verses and provides a search function
add them to the :ref:`g-service-manager`. to find Bible verses and add them to the :ref:`g-service-manager`.
.. image:: pics/mediamanager_bibles.png .. image:: pics/mediamanager_bibles.png
@ -108,6 +106,9 @@ Toolbar
added to the :ref:`g-service-manager` by means of drag and drop from the added to the :ref:`g-service-manager` by means of drag and drop from the
:ref:`g-media-manager`. :ref:`g-media-manager`.
**Note:** Right-clicking on a selection of verses will display some of the
same options.
Quick Search Tab Quick Search Tab
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
@ -196,159 +197,153 @@ in the verse list.
Presentations Presentations
------------- -------------
Clicking on *Presentations* in the :ref:`g-media-manager` will display the
Presentations media item. The Presentations media item shows a list of imported
presentations.
.. image:: pics/mediamanager_presentations.png .. image:: pics/mediamanager_presentations.png
Using the buttons you can: Toolbar
^^^^^^^
.. image:: pics/mediamanager_presentations_buttons.png |buttons_open| **Load presentation**
Import a presentation. Presentations need to be imported in order to
control them from within OpenLP.
|buttons_open| Load a new presentation |buttons_delete| **Delete presentation**
This brings up a dialog box to find your presentation and load it into Removes the selected presentation from the list. Note that this does not
OpenLP. delete the original presentation from the disk.
|buttons_delete| Delete the selected presentation |buttons_preview| **Preview presentation**
This removes your presentation from the list. Send the selected presentation to the :ref:`g-preview-slide-controller`.
*Please note*: this will not delete the presentation from your computer, |buttons_live| **Send presentation live**
only from the OpenLP list. Send the selected presentation to the :ref:`g-live-slide-controller` to be
shown on the display screen.
|buttons_preview| Preview the selected presentation |buttons_add| **Add presentation to service**
Sends your selected presentation to the preview window. 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`.
*Send the selected Presentation live:* **Note:** Right-clicking on a presentation will display some of the same options.
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 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.
Images Images
------ ------
Clicking on *Images* in the :ref:`g-media-manager` will display the Images
media item. The Images media item shows a list of imported images.
.. image:: pics/mediamanager_images.png .. image:: pics/mediamanager_images.png
Using the buttons you can: Toolbar
^^^^^^^
.. image:: pics/mediamanager_images_buttons.png |buttons_open| **Load image**
Import one or more images. Images need to be imported in order to be used
in OpenLP.
*Load a new Image:* |buttons_delete| **Delete images**
This brings up a dialog box to find your Image and list it in OpenLP. Removes the selected image(s) from the list. Note that this does not
delete the original image(s) from the disk.
*Delete the selected Image:* |buttons_preview| **Preview image**
This removes your Image from the list. Please note: this will not delete the Send the selected image(s) to the :ref:`g-preview-slide-controller`.
Image from your computer, just the OpenLP list.
*Preview the selected Image:* |buttons_live| **Send image live**
Sends your selected Image to the Preview window. Send the selected image(s) to the :ref:`g-live-slide-controller` to be
shown on the display screen.
*Send the selected Image live:* |buttons_add| **Add image to service**
This option will immediately display your selected Image live. 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`.
*Add the selected Image to the service:* |buttons_replace_live_background| **Replace live background**
This will enter your Image into the Service Manager. You can also click and Replace the current live theme background with the selected image. This
drag your Image over to the Service Manager. has effect until the theme changes, or the *Remove Backgound* button is
clicked.
*Replace Live Background:* **Note:** Right-clicking on an image will display some of the same options.
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.
Media Media
----- -----
Media is an audio or video file. Generally if you can play or view your media
on your computer without OpenLP, you can also play it in OpenLP. Clicking on *Media* in the :ref:`g-media-manager` will display the Media
media item. The Media media item shows a list of imported audio or video files.
**Note:** On some computers OpenLP has trouble displaying videos. Please read
the `Frequently Asked Questions <http://wiki.openlp.org/faq>`_ for tips on how
to resolve these issues.
.. image:: pics/mediamanager_media.png .. image:: pics/mediamanager_media.png
Using the buttons you can: Toolbar
^^^^^^^
.. image:: pics/mediamanager_media_buttons.png |buttons_open| **Load media**
Import one or more media files. Media files need to be imported in order to
be used in OpenLP.
*Load a new Media:* |buttons_delete| **Delete media**
This brings up a dialog box to find your Media and list it in OpenLP. Removes the selected media file(s) from the list. Note that this does not
delete the original media file(s) from the disk.
*Delete the selected Media:* |buttons_preview| **Preview media**
This removes your Media from the list. Please note: this will not delete the Send the selected media to the :ref:`g-preview-slide-controller`.
Media from your computer, just the OpenLP list.
*Preview the selected Media:* |buttons_live| **Send media live**
Sends your selected Media to the Preview window. Send the selected media to the :ref:`g-live-slide-controller` to be shown
on the display screen.
*Send the selected Media live:* |buttons_add| **Add media to service**
This option will immediately display your selected Media live. Add the selected media to the :ref:`g-service-manager`. Media can also be
added to the :ref:`g-service-manager` by means of drag and drop from the
:ref:`g-media-manager`.
*Add the selected Media to the service:* |buttons_replace_live_background| **Replace live background**
This will enter your Media into the Service Manager. You can also click and Replace the current live theme background with the selected media. This
drag your Media over to the Service Manager. has effect until the theme changes, or the *Remove Backgound* button is
clicked.
*Replace Live Background:* **Note:** Right-clicking on a media file will display some of the same options.
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 Slides Custom Slides
------------- -------------
Custom Slides gives you the option of creating your own slide. This is useful
for displaying readings, liturgy or any text that may not be found in songs or Clicking on *Custom Slides* in the :ref:`g-media-manager` will display the
Bibles. Custom Slides media item. The Custom Slides media item shows a list of custom
textual items. Custom slides are useful for creating unstructured text items,
such as liturgy or prayers.
.. image:: pics/mediamanager_custom.png .. image:: pics/mediamanager_custom.png
Using the buttons you can: Toolbar
^^^^^^^
.. image:: pics/mediamanager_custom_buttons.png |buttons_new| **Add custom slide**
Open the song edit dialog to add a new custom slide.
|buttons_new| *Add a new custom slide* |buttons_edit| **Edit custom slide**
Brings up the dialog box to add a new custom slide. Open the song edit dialog to make changed to the selected new custom slide.
|buttons_edit| *Edit the selected custom slide:* |buttons_delete| **Delete custom slide**
Brings up the dialog box to make changes to the custom slide. Remove the selected custom slide(s) from the list.
|buttons_delete| *Delete the selected custom slide* |buttons_preview| **Preview custom slide**
Removes the custom slide from your list. Send the selected custom slide to the :ref:`g-preview-slide-controller`.
|buttons_preview| *Preview the selected custom slide* |buttons_live| **Send custom slide live**
Sends your custom slide to the :ref:`g-preview-slide-controller` to Send the selected custom slide to the :ref:`g-live-slide-controller` to be
see what it will look like when live. shown on the display screen.
|buttons_live| *Send the selected custom slide live* |buttons_add| **Add custom slide to service**
Immediately display your custom slide live, sending it to the Add the selected custom slide(s) to the :ref:`g-service-manager`. Custom
:ref:`g-live-slide-controller`. slides can also be added to the :ref:`g-service-manager` by means of drag
and drop from the :ref:`g-media-manager`.
|buttons_add| *Add the selected custom slide to the service* **Note:** Right-clicking on a custom slide in the list will display some of the
This will add your custom slide to the :ref:`g-service-manager`. You can same options.
also drag your custom slide over to the :ref:`g-service-manager`.
*Note:*
Right clicking on a custom slide will bring up some of the same options.
When you Add a new custom slide a dialog box will appear.
.. image:: pics/mediamanager_custom_edit.png
*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.
*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 :guilabel:`Save` button.
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.
.. These are all the image templates that are used in this page. .. These are all the image templates that are used in this page.
@ -374,6 +369,8 @@ arrows to change the arrangement of your custom slide.
.. |BUTTONS_CLEAR_RESULTS| image:: pics/buttons_clear_results.png .. |BUTTONS_CLEAR_RESULTS| image:: pics/buttons_clear_results.png
.. |BUTTONS_REPLACE_LIVE_BACKGROUND| image:: pics/buttons_replace_live_background.png
.. |SEARCH_SONG| image:: pics/search_song.png .. |SEARCH_SONG| image:: pics/search_song.png
.. |SEARCH_TITLE| image:: pics/search_title.png .. |SEARCH_TITLE| image:: pics/search_title.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B