Merge branch 'master' into 'master'

library and configure pages updated

See merge request openlp/documentation!27
This commit is contained in:
Raoul Snyman 2023-01-16 22:54:08 +00:00
commit bb61a6a074
27 changed files with 244 additions and 182 deletions

View File

@ -107,12 +107,22 @@ UI Settings (user interface)
This dropdown controls how the Live and Preview controllers scroll the verses This dropdown controls how the Live and Preview controllers scroll the verses
displayed as you progress through the item slides. displayed as you progress through the item slides.
**Include slide number in footer**
With this box selected, current slide number and total slides number will be
visible in the footer.
**Enable search as you type** **Enable search as you type**
With this box selected, as you type into text boxes suggestions will be shown. With this box selected, as you type into text boxes suggestions will be shown.
**Enable application exit confirmation** **Enable application exit confirmation**
With this box selected, you will be asked if you really want to close OpenLP. With this box selected, you will be asked if you really want to close OpenLP.
**Alert if New clicked on blank service**
With this box selected, the warning will be displayed when File - New Service
is being clicked while the existing service is blank.
**Interface Theme (needs restart)**
This dropdown allows to change the UI colour scheme.
.. _configservice: .. _configservice:
@ -165,7 +175,7 @@ Slide Controller
**Unblank display when changing slide in live** **Unblank display when changing slide in live**
**Automatically preview next item in service:** **Automatically preview next item in service**
When this box is selected, the next item in the :ref:`creating_service` will When this box is selected, the next item in the :ref:`creating_service` will
be displayed in the Preview pane. be displayed in the Preview pane.
@ -178,25 +188,31 @@ Slide Controller
Service Item Wrapping Service Item Wrapping
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
**End Slide:** **Remain on Slide**
Up and down arrow keys stop at the top and bottom slides of each Service item. Up and down arrow keys stop at the top and bottom slides of each Service item.
You will need to use the :kbd:`Right Arrow` key or the mouse to move to the You will need to use the :kbd:`Right Arrow` key or the mouse to move to the
next Service Item. next Service Item.
**Wrap Slide:** **Wrap Around**
Up and down arrow keys wrap around at the top and bottom slides of each Up and down arrow keys wrap around at the top and bottom slides of each
Service item, eg: When you reach the last slide of a song or verse and Service item, eg: When you reach the last slide of a song or verse and
:kbd:`Down Arrow` you will be back on the first slide. Likewise if you are on :kbd:`Down Arrow` you will be back on the first slide. Likewise if you are on
the first slide and :kbd:`Up Arrow` you will wrap-around to the last slide of the first slide and :kbd:`Up Arrow` you will wrap-around to the last slide of
the song, images or Bible verses. the song, images or Bible verses.
**Next Slide:** **Next Slide**
Up and down arrow keys advance to the next or previous Service Item from the Up and down arrow keys advance to the next or previous Service Item from the
top and bottom slides of each Service Item. As long as you have your songs and top and bottom slides of each Service Item. As long as you have your songs and
verses in order, you can use the :kbd:`Down Arrow` to move through your verses in order, you can use the :kbd:`Down Arrow` to move through your
service from start to finish. Using this setting makes it possible to use a service from start to finish. Using this setting makes it possible to use a
presentation remote controller. presentation remote controller.
Service Editing
^^^^^^^^^^^^^^^
**Show confirmation box when deleting item from service**
.. _configtheme: .. _configtheme:
Advanced Advanced
@ -228,7 +244,7 @@ Display Workarounds
Selecting this option will allow service items to be displayed as it was originally Selecting this option will allow service items to be displayed as it was originally
formated without regard for how the screen is formated. formated without regard for how the screen is formated.
**Bypass X11 Window Manager:** **Bypass X11 Window Manager**
Linux and other X users may need to try toggling this flag if the main display Linux and other X users may need to try toggling this flag if the main display
window is causing them problems. For example with this unset, KDE users may window is causing them problems. For example with this unset, KDE users may
find the main display window disappears if they switch windows. Ubuntu users find the main display window disappears if they switch windows. Ubuntu users
@ -237,7 +253,7 @@ Display Workarounds
appears to affect different versions and distributions differently, this appears to affect different versions and distributions differently, this
setting has been added, rather than try and work it out programmatically. setting has been added, rather than try and work it out programmatically.
**Use alternating row colors in lists:** **Use alternating row colors in lists**
Using alternating row colors in most cases makes it easier for the human eye Using alternating row colors in most cases makes it easier for the human eye
to overview a list of items. Uncheck to disable. to overview a list of items. Uncheck to disable.
@ -262,11 +278,11 @@ Proxy Server Settings
configuration. configuration.
**HTTP:** **HTTP:**
Enter the HTTP: address for your proxy server followed by the port to be Enter the IP address for your proxy server followed by the port to be
used on your proxy server. Please use the `120.002.168.064:4000` format. used on your proxy server. Please use the `120.002.168.064:4000` format.
**HTTPS:** **HTTPS:**
Enter the HTTP: address for your proxy server followed by the port to be Enter the IP address for your proxy server followed by the port to be
used on your proxy server. Please use the `120.002.168.064:4000` format. used on your proxy server. Please use the `120.002.168.064:4000` format.
**Username:** **Username:**
@ -334,18 +350,18 @@ Theme Level
Choose from one of three options for the default use of your theme. Choose from one of three options for the default use of your theme.
**Song Level:** **Song Level**
With this level selected, your theme is associated with the song. The theme is With this level selected, your theme is associated with the song. The theme is
controlled by adding or editing a song in the Song editor and your song theme controlled by adding or editing a song in the Song editor and your song theme
takes priority. If your song does not have a theme associated with it, OpenLP takes priority. If your song does not have a theme associated with it, OpenLP
will use the theme set in the :ref:`creating_service`. will use the theme set in the :ref:`creating_service`.
**Service Level:** **Service Level**
With this level selected, your theme is controlled at the top of the With this level selected, your theme is controlled at the top of the
:ref:`creating_service`. Select your default service theme there. This setting :ref:`creating_service`. Select your default service theme there. This setting
will override your Song theme. will override your Song theme.
**Global Level:** **Global Level**
With this level selected, all songs and verses will use the theme selected on With this level selected, all songs and verses will use the theme selected on
the left in the Global Theme drop down. the left in the Global Theme drop down.
@ -372,7 +388,7 @@ Media
Live Media Live Media
^^^^^^^^^^ ^^^^^^^^^^
**Start Live items automatically:** **Start Live items automatically**
With this option selected songs and videos will start to play automatically when With this option selected songs and videos will start to play automatically when
sent live. sent live.
@ -395,7 +411,7 @@ Communication Options
The following options available are: The following options available are:
**Connect to projectors on startup:** **Connect to projectors on startup**
Check if you want to attempt to connect to all projectors when OpenLP starts. Check if you want to attempt to connect to all projectors when OpenLP starts.
**Socket timeout (seconds):** **Socket timeout (seconds):**
@ -411,7 +427,7 @@ The following options available are:
Select whether you want all video source options on one dialog page or to use Select whether you want all video source options on one dialog page or to use
tabs to consolidate the inputs based on video group. tabs to consolidate the inputs based on video group.
**Enable listening for PJLink2 broadcast messages*** **Enable listening for PJLink2 broadcast messages**
Select this option to Enable listening on UDP ports for PJLink2 broadcasts. Select this option to Enable listening on UDP ports for PJLink2 broadcasts.
**Convert to projector when LINKUP received** **Convert to projector when LINKUP received**
@ -429,16 +445,16 @@ for a nursery or daycare to display an :ref:`alerts` message or, use it as an
interface to control the whole service remotely by a visiting missionary or interface to control the whole service remotely by a visiting missionary or
worship team leader. worship team leader.
Stage view gives you the opportunity to set up a remote computer, netbook or Stage view gives you the opportunity to set up a remote computer, netbook,
smartphone to view the service being displayed in an easy to read font with a tablet or smartphone to view the service being displayed in an easy to read font
black background. Stage view is a text only viewer. with a black background. Stage view is a text only viewer.
The remote feature will work in any web browser that has network access whether The remote feature will work in any web browser that has network access whether
it is another computer, a netbook or a smartphone. You can find more information it is another computer, a netbook or a smartphone. You can find more information
about this feature here: :ref:`web_remote`. about this feature here: :ref:`web_remote`.
**Note:** To use either of these features, your computers will need to be on the **Note:** To use either of these features, your computers will need to be on the
same network, wired or wireless. same network, wired or wireless.
.. _non_secure: .. _non_secure:
@ -447,14 +463,14 @@ Server Settings - Non Secure
.. image:: pics/configureremotes.png .. image:: pics/configureremotes.png
**IP address:** **Listen IP address:**
Put your projection computer's IP address here or use 0.0.0.0 which will Put your OpenLP computer's IP address here or use 0.0.0.0 which will
display your IP address links below. allow to listen on all network interfaces.
**Display stage time in 12h format:** **Display stage time in 12h format**
This setting displays the time in stage view in 12h or 24h format. This setting displays the time in stage view in 12h or 24h format.
**Show Thumbnails of non-text slides in remote and stage views.** **Show Thumbnails of non-text slides in remote and stage view**
Check this option if you want to see thumbnails of non-text slides on the Stage Check this option if you want to see thumbnails of non-text slides on the Stage
and Remote Views. and Remote Views.
@ -462,32 +478,29 @@ Server Settings - Non Secure
You can use the default port number or change it to another number. If you You can use the default port number or change it to another number. If you
do not understand this setting you should leave it as is. do not understand this setting you should leave it as is.
**Remote URL:** **Remote URL**
Using the remote URL, you have the ability to control the live service from Using the remote URL, you have the ability to control the live service from
another computer, netbook or smartphone that has a browser. another computer, netbook, tablet or smartphone using a web browser.
**Note:** This URL and port number are also used to map the value for OpenLP's **Stage view URL**
Android app.
**Stage view URL:**
Using stage view gives you the ability, using a remote computer, netbook or Using stage view gives you the ability, using a remote computer, netbook or
smartphone, to view the live service display in a basic black and white 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 format. This URL shows the address you will use in the remote browser for
stage view. stage view.
**Chord view URL:** **Chords view URL**
Using the chord view adds chords to the Stage view lyrics. This can be Using the chord view adds chords to the Stage view lyrics. This can be
helpful when the stage view is used for the musicians that play the cords. helpful when the stage view is used for the musicians that play the cords.
**Live view URL:** **Live view URL**
Using the live view, you can display the Live output on multiple devices. Using the live view, you can display the Live output on multiple devices.
.. _user_auth: .. _user_auth:
User Authentication User Authentication
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
This option allows the additional security for update functions via the web or This option allows the additional security for update functions via the remote
android interfaces. Once the userid and password have been accepted then interface. Once the userid and password have been accepted then
updates will be possible for duration of the web session. This option can be updates will be possible for duration of the web session. This option can be
changed without the need to restart OpenLP. changed without the need to restart OpenLP.
@ -496,22 +509,20 @@ changed without the need to restart OpenLP.
Web Remote Web Remote
^^^^^^^^^^ ^^^^^^^^^^
**Current version:** **Installed version**
The current version of the remote interface is displayed here. If the The current version of the remote interface is displayed here. If the
current version is different from the latest version, press the :guilabel:`Upgrade` current version is different from the latest version, press the :guilabel:`Upgrade`
button. button.
**Latest Version** **Latest Version**
The latest version of the remote interface is displayed here after you The latest version of the remote interface is displayed here after you
press the :guilabel:`check for Updates` button. press the :guilabel:`Check for Updates` button.
Remote App Remote App
^^^^^^^^^^ ^^^^^^^^^^
You can quickly find and download the OpenLP Android or iOS remote apps using your You can quickly navigate your phone or tablet to the Remote Interface using
barcode scanner or by clicking on the :guilabel:`download` link. See the sections on QR code reader.
the :ref:`android-remote` and :ref:`ios-remote` for more details on how to install
and use them.
Finding your IP address Finding your IP address
^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
@ -526,8 +537,8 @@ Open *Command Prompt* and type::
C:\Documents and Settings\user>ipconfig C:\Documents and Settings\user>ipconfig
Press the :kbd:`Enter` key and the output of your command will display the Press the :kbd:`Enter` key and the output of your command will display the
adapter IP address. The IP address will always have a format of xxx.xxx.xxx.xxx adapter IP address. The IP address have a format of x.x.x.x
where x is one to three digits long. where x is in range 0-255.
**Linux:** **Linux:**
@ -535,27 +546,24 @@ Open *Terminal* and type::
linux@user:~$ifconfig linux@user:~$ifconfig
Some Linux systems will require the full path::
linux@user:~$/sbin/ifconfig
Press the :kbd:`Enter` key. This will display a fair amount of technical Press the :kbd:`Enter` key. This will display a fair amount of technical
information about your network cards. On most computers, the network card is information about your network cards. On most computers, the network card is
named "eth0". The IP address for your network card is just after "inet addr:" in named "eth0". The IP address for your network card is just after "inet addr:" in
the section with your network card's name. The IP address will always have a the section with your network card's name. The IP address have a
format of xxx.xxx.xxx.xxx where x is one to three digits long. format of x.x.x.x where x is in range 0-255.
**OS X 10.6 or 10.5** **OS X**
From the Apple menu, select :menuselection:`System Preferences --> View --> Network`. From the Apple menu, select :menuselection:`System Settings --> Network`.
In the Network preference window, click a network port (e.g., Ethernet, AirPort, Select active network connection (e.g. Wi-Fi, Ethernet, AirPort,
modem). If you are connected, you'll see its IP address under "Status:". modem). If you are connected, you'll see its IP address under the
"Network Settings..." menu.
With these two settings written down, open a web browser in the remote computer With these IP address written down, open a web browser in the remote computer
and enter the IP address followed by a colon and then the port number, ie: and enter the IP address followed by a colon and then the port number, e.g.
192.168.1.104:4316 then press enter. You should now have access to the OpenLP 192.168.1.104:4316 then press :kbd:`Enter`. You should now have access to the OpenLP
Controller. If it does not come up, you either entered the wrong IP address, Remote view. If it does not come up, you either entered the wrong IP address,
port number or one or both computers are not connected to the network. port number or one or both computers are not connected to the same network.
.. _config_songs: .. _config_songs:
@ -573,13 +581,13 @@ Song related settings
the live toolbar to select any part of the song. You can also type you the live toolbar to select any part of the song. You can also type you
the part of the song you want displayed on live display. the part of the song you want displayed on live display.
**Update service from song edit:** **Update service from song edit**
With this box selected and you edit a song in the :ref:`library`, the With this box selected and you edit a song in the :ref:`library`, the
results will also change the song if it is added to the :ref:`creating_service`. results will also change the song if it is added to the :ref:`creating_service`.
If this box is not selected, your song edit changes will only be available in If this box is not selected, your song edit changes will only be available in
the :ref:`creating_service` if you add it again. the :ref:`creating_service` if you add it again.
**Import missing songs from service files:** **Import missing songs from service files**
With this box selected, when you open a service file created on another With this box selected, when you open a service file created on another
computer, or if one of the songs are no longer in your :ref:`library`, computer, or if one of the songs are no longer in your :ref:`library`,
it will automatically enter the song in your Songs Media Manager. If this box it will automatically enter the song in your Songs Media Manager. If this box
@ -593,6 +601,10 @@ Song related settings
will need to remove the song and re-add the song to the service for the songbook will need to remove the song and re-add the song to the service for the songbook
name slide to be added to the song. name slide to be added to the song.
**Auto-play background audio**
With this box selected the linked audio will be played automaticaly when item
is selected.
Chords Chords
^^^^^^ ^^^^^^
Enabling this option allows songs with chords to show the chords on the Stage Enabling this option allows songs with chords to show the chords on the Stage
@ -602,7 +614,11 @@ Chords
**Ignore chords when importing songs** **Ignore chords when importing songs**
This option will allow the song importer to ignore cords in the imported song. This option will allow the song importer to ignore cords in the imported song.
**Chord notation to use:** **Warn about missing song key**
This option will display warning when no song key is defined before the first
chord used in the song. E.g. [=G][G] ...
**Chord notation to use**
Select the English, German or Neo-Latin notation to match your location or need. Select the English, German or Neo-Latin notation to match your location or need.
SongSelect Login SongSelect Login
@ -629,21 +645,21 @@ Bibles
Verse Display Verse Display
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
**Show verse numbers:** **Show verse numbers**
With this box selected verse numbers are always shown, deselect to hide verse With this box selected verse numbers are always shown, deselect to hide verse
numbers. numbers.
**Only show new chapter numbers:** **Only show new chapter numbers**
With this box selected, the live display of the verse will only show the With this box selected, the live display of the verse will only show the
chapter number and verse for the first verse, and just the verse numbers after chapter number and verse for the first verse, and just the verse numbers after
that. If the chapter changes, the new chapter number will be displayed with the that. If the chapter changes, the new chapter number will be displayed with the
verse number for the first line, and only the verse number displayed thereafter. verse number for the first line, and only the verse number displayed thereafter.
**Display style:** **Display style**
This option will put brackets around the chapter and verse numbers. You may This option will put brackets around the chapter and verse numbers. You may
select No Brackets or your bracket style from the drop down menu. select No Brackets or your bracket style from the drop down menu.
**Layout style:** **Layout style**
There are three options to determine how your Bible verses are displayed. There are three options to determine how your Bible verses are displayed.
* Verse Per Slide: * Verse Per Slide:
@ -651,19 +667,22 @@ Verse Display
* Verse Per Line: * Verse Per Line:
Will start each verse on a new line until the slide is full. Will start each verse on a new line until the slide is full.
* Continuous: * Continuous:
Will run all verses together, separated by verse number and chapter, if Will run all verses together, separated by verse number and chapter (if
chapter is selected to show above. This will only add the next verse if it chapter is selected to show above).
* Continuous (whole verses):
Will run all verses together, separated by verse number and chapter (if
chapter is selected to show above). This will only add the next verse if it
wholly fits on the slide. If it does not fit, it will begin a new slide. wholly fits on the slide. If it does not fit, it will begin a new slide.
**Note:** Changes do not affect verses already in the service. **Note:** Changes do not affect verses already in the service.
**Display second Bible verses:** **Display second Bible verses**
OpenLP has the ability to display the same verse in two different Bible OpenLP has the ability to display the same verse in two different Bible
versions for comparison. With this option selected, there will be a Second versions for comparison. With this option selected, there will be a Second
choice in the Bible Media Manager to use this option. Verses will display with choice in the Bible Media Manager to use this option. Verses will display with
one verse per slide with the second Bible verse below. one verse per slide with the second Bible verse below.
**Bible theme:** **Bible theme**
You may select your default Bible theme from this drop down box. This selected You may select your default Bible theme from this drop down box. This selected
theme will only be used if your *Theme Level* is set at *Song Level*. theme will only be used if your *Theme Level* is set at *Song Level*.
@ -690,13 +709,13 @@ Default Bible Language
Choose the language of the bible books. The options are: Choose the language of the bible books. The options are:
**Bible Language:** **Bible Language**
The language of the books will be determined by the language of the bible. The language of the books will be determined by the language of the bible.
**Application Language:** **Application Language**
The language of the books will be determined by the language set for OpenLP. The language of the books will be determined by the language set for OpenLP.
**English:** **English**
The language of the books will be set to English. The language of the books will be set to English.
Quick Search Settings Quick Search Settings
@ -738,7 +757,7 @@ need to install :file:`mupdf` (recommended) or :file:`ghostscript`.
Advanced Advanced
^^^^^^^^ ^^^^^^^^
**Allow presentation application to be overridden:** **Allow presentation application to be overridden**
With this option selected, you will see *Present using* area with a dropdown With this option selected, you will see *Present using* area with a dropdown
box on the Presentations toolbar in the Library :ref:`library-presentations` which gives you the box on the Presentations toolbar in the Library :ref:`library-presentations` which gives you the
option to select the presentation program you want to use. option to select the presentation program you want to use.
@ -748,12 +767,12 @@ PowerPoint options
These options are only available if PowerPoint has been detected. These options are only available if PowerPoint has been detected.
**Clicking on a selected slide in the slidecontroller advances to next effect:** **Clicking on a selected slide in the slidecontroller advances to next effect**
When this is enabled it is possible to go to the next effect of a slide by When this is enabled it is possible to go to the next effect of a slide by
clicking the slide in the slidecontroller. The default behavior is to restart clicking the slide in the slidecontroller. The default behavior is to restart
the slide. the slide.
**Let PowerPoint control the size and position of the presentation window (workaround for Windows 8 scaling issue):** **Let PowerPoint control the size and position of the presentation window (workaround for Windows 8 scaling issue)**
Windows 8 and 10 can on computers with multiple monitors use scaling to make Windows 8 and 10 can on computers with multiple monitors use scaling to make
windows look the same size on different monitors. Unfortunately this can windows look the same size on different monitors. Unfortunately this can
cause issues with how OpenLP places and resizes the PowerPoint presentation cause issues with how OpenLP places and resizes the PowerPoint presentation
@ -762,6 +781,12 @@ These options are only available if PowerPoint has been detected.
present to the correct monitor. present to the correct monitor.
Impress options
^^^^^^^^^^^^^^^
**Use Impress Slide Show Settings / Presentation Display Setting**
Images Images
====== ======
@ -793,14 +818,14 @@ Custom Slides
Custom Display Custom Display
^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
**Display Footer:** **Display Footer**
With this option selected, your Custom slide Title will be displayed in the With this option selected, your Custom slide Title will be displayed in the
footer. footer.
**Note:** If you have an entry in the Credits box of your custom slide, title and **Note:** If you have an entry in the Credits box of your custom slide, title and
credits will always be displayed. credits will always be displayed.
**Import missing custom slides from service files:** **Import missing custom slides from service files**
With this box selected, when you open a service file created on another With this box selected, when you open a service file created on another
computer, or if one of the custom slides are no longer in your computer, or if one of the custom slides are no longer in your
:ref:`library`, it will automatically enter the custom slide in your :ref:`library`, it will automatically enter the custom slide in your
@ -850,7 +875,7 @@ Other Settings
This setting will determine how long your :ref:`alerts` will be displayed on This setting will determine how long your :ref:`alerts` will be displayed on
the screen, in seconds. the screen, in seconds.
**Vertical Align:** **Vertical Align**
Choose the location where you want the alert displayed on the Choose the location where you want the alert displayed on the
screen, Top, Middle or Bottom. screen, Top, Middle or Bottom.

View File

@ -24,33 +24,33 @@ item. The songs library item shows a list of all the songs in the songs database
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_new| **Add song:** |buttons_new| **Add song**
Open the song edit dialog to add a new song. Open the song edit dialog to add a new song.
|buttons_edit| **Edit song:** |buttons_edit| **Edit song**
Open the song edit dialog to make changes to the selected song. Open the song edit dialog to make changes to the selected song.
|buttons_delete| **Delete song:** |buttons_delete| **Delete song**
Remove the selected song(s) from the song list. Remove the selected song(s) from the song list.
|buttons_preview| **Preview song:** |buttons_db| **Maintain authors, topics and books**
Open the song maintenance dialog to add, edit or delete authors, topics or
song books.
|buttons_preview| **Preview song**
Send the selected song to the :ref:`g-preview-slide-controller`. Send the selected song to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send song live:** |buttons_live| **Send song live**
Send the selected song to the :ref:`g-live-slide-controller` to be shown on Send the selected song to the :ref:`g-live-slide-controller` to be shown on
the display screen. the display screen.
|buttons_add| **Add song to service:** |buttons_add| **Add song to service**
Add the selected song(s) to the :ref:`g-service-manager`. Songs can also be 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 added to the :ref:`g-service-manager` by means of drag and drop from the
:ref:`g-library`. :ref:`g-library`.
|buttons_db| **Maintain authors, topics and books:**
Open the song maintenance dialog to add, edit or delete authors, topics or
song books.
**Note:** Right-clicking on a song in the list will display some of the same **Note:** Right-clicking on a song in the list will display some of the same
options. options and Clone option.
Search Search
^^^^^^ ^^^^^^
@ -60,21 +60,33 @@ Search
Clicking on the icon in the search box displays a list of search options. The Clicking on the icon in the search box displays a list of search options. The
following options are available: following options are available:
|search_song| **Entire Song:** |search_song| **Entire Song**
Search the title, lyrics and comments fields. Search the title, lyrics and comments fields.
|search_title| **Titles:** |search_title| **Titles**
Search the title field only. Search the title field only.
|search_text| **Lyrics:** |search_lyric| **Lyrics**
Search the lyrics field only. Search the lyrics field only.
|search_author| **Authors:** |search_author| **Authors**
Search the associated authors. Search the associated authors.
|search_theme| **Themes:** |search_topic| **Topics**
Search the assigned topics.
|search_songbook| **Songbooks**
Search the assigned songbooks.
|search_theme| **Themes**
Search the assigned themes. Search the assigned themes.
|search_copyright| **Copyright**
Search the assigned copyrights.
|search_ccli| **CCLI number**
Search the assigned copyrights.
Click the :guilabel:`Search` button to perform a search and display the results Click the :guilabel:`Search` button to perform a search and display the results
in the song list. in the song list.
@ -90,21 +102,24 @@ to find Bible verses and add them to the :ref:`g-service-manager`.
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_edit| **Edit the selected bible:** |buttons_import| **Import Bible**
Edit meta data or book names of the selected bible.
|buttons_import| **Import Bible:**
Import Bibles from a number of formats. This is discussed in detail on the Import Bibles from a number of formats. This is discussed in detail on the
:ref:`import_bibles` page. :ref:`import_bibles` page.
|buttons_preview| **Preview verses:** |buttons_edit| **Edit the selected bible**
Edit meta data or book names of the selected bible.
|buttons_delete| **Delete the selected bible**
Delete the selected bible.
|buttons_preview| **Preview verses**
Send the selected verses to the :ref:`g-preview-slide-controller`. Send the selected verses to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send verses live:** |buttons_live| **Send verses live**
Send the selected verses to the :ref:`g-live-slide-controller` to be shown Send the selected verses to the :ref:`g-live-slide-controller` to be shown
on the display screen. on the display screen.
|buttons_add| **Add verses to service:** |buttons_add| **Add verses to service**
Add the selected verses to the :ref:`g-service-manager`. Verses can also be 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 added to the :ref:`g-service-manager` by means of drag and drop from the
:ref:`g-library`. :ref:`g-library`.
@ -112,8 +127,8 @@ Toolbar
**Note:** Right-clicking on a selection of verses will display some of the **Note:** Right-clicking on a selection of verses will display some of the
same options. same options.
Quick Search Tab Find Tab
^^^^^^^^^^^^^^^^ ^^^^^^^^
The following options are available on the quick search tab: The following options are available on the quick search tab:
@ -123,9 +138,11 @@ The following options are available on the quick search tab:
Clicking the icon in the Find box displays a list of search options. The Clicking the icon in the Find box displays a list of search options. The
following options are available: following options are available:
|search_options|
|search_reference| **Scripture Reference:** |search_text_reference| **Text or Reference**
Search by keyword or using scripture reference format. See below.
|search_reference| **Scripture Reference**
Search for a specific verse using a scripture reference format. Below Search for a specific verse using a scripture reference format. Below
is some examples on supported formats: is some examples on supported formats:
@ -148,51 +165,24 @@ The following options are available on the quick search tab:
If an invalid format is used for a search a popup window will show the If an invalid format is used for a search a popup window will show the
examples also shown above. examples also shown above.
|search_text| **Text Search:** |search_text| **Text Search**
Search by a keyword or words. Use more words to narrow down the list Search by a keyword or words. Use more words to narrow down the list
of results. If you search for "Jesus God" it searches sentences of results. If you search for "Jesus God" it searches sentences
which contain both words, Jesus and God. If you search for "Jesus, God" which contain both words, Jesus and God. If you search for "Jesus, God"
separated by a comma, it searches for sentences which contain at least separated by a comma, it searches for sentences which contain at least
one of the words, Jesus or God. one of the words, Jesus or God.
**Version:**
Once a Bible has been imported, it will be displayed in the drop down box.
Select a version from the list of the Bibles.
**Second:**
If :guilabel:`Display second Bible verses` has been selected in the Bibles
configuration, this option will be available. This is used to display
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.
**Layout Style:**
The following options are available to set how Bible verses are displayed:
**Verse Per Slide:** |buttons_clear_results| **Clear Tab Contents**
Display one verse per slide. This will clear the results on the currently active tab (Saved or Results).
**Verse Per Line:** |buttons_keep_results| **Save Results**
Start each verse on a new line until the slide is full. This will add contents of the Results tab to the Saved tab.
**Continuous:**
Verses flow together, separated by verse number and chapter
if chapter is selected to show above.
This setting is also accessible in :menuselection:`Setttings --> Configure OpenLP`
on the *Bibles* tab.
**Note:** Changes to layout style do not affect verses already in the
:ref:`g-service-manager`.
|buttons_clear_results| |buttons_keep_results| **Keep/Clear Results:**
Normally, when a search is run, the previous verses are cleared. To retain
the previous set of verses, toggle this button.
Click the :guilabel:`Search` button to perform a search and display the results Click the :guilabel:`Search` button to perform a search and display the results
in the verse list. in the verse list.
Advanced Tab Select Tab
^^^^^^^^^^^^ ^^^^^^^^^^^^
.. image:: pics/mediamanager_bibles_advanced.png .. image:: pics/mediamanager_bibles_advanced.png
@ -200,20 +190,53 @@ Advanced Tab
The Advanced tab is convenient for selecting Bible verses by book, chapter and The Advanced tab is convenient for selecting Bible verses by book, chapter and
verse from a set of drop down boxes. verse from a set of drop down boxes.
**Book:** **Book**
Click on the drop down box and select a book from the list. Click on the drop down box and select a book from the list.
**Chapter/Verse:** **Chapter/Verse**
Select the *From* chapter and verse, and the *To* chapter and verse. Select the *From* chapter and verse, and the *To* chapter and verse.
**Note** *Version*, *Second* and *Layout Style* are the same as in the *Quick*
search tab.
Click the :guilabel:`Search` button to perform a search and display the results Click the :guilabel:`Search` button to perform a search and display the results
in the verse list. in the verse list.
.. image:: pics/mediamanager_bibles_results.png .. image:: pics/mediamanager_bibles_results.png
Options Tab
^^^^^^^^^^^
**Version**
Once a Bible has been imported, it will be displayed in the drop down box.
Select a version from the list of the Bibles.
**Second**
If :guilabel:`Display second Bible verses` has been selected in the Bibles
configuration, this option will be available. This is used to display
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.
**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).
* Continuous (whole verses):
Will run all verses together, separated by verse number and chapter (if
chapter is selected to show above). This will only add the next verse if it
wholly fits on the slide. If it does not fit, it will begin a new slide.
This setting is also accessible in :menuselection:`Setttings --> Configure OpenLP`
on the *Bibles* tab.
**Note:** Changes to layout style do not affect verses already in the
:ref:`g-service-manager`.
.. _library-presentations: .. _library-presentations:
Presentations Presentations
@ -228,22 +251,27 @@ presentations.
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_open| **Load presentation:** |buttons_open| **Load presentation**
Import a presentation. Presentations need to be imported in order to Import a presentation. Presentations need to be imported in order to
control them from within OpenLP. control them from within OpenLP.
|buttons_delete| **Delete presentation:** |buttons_delete| **Delete presentation**
Removes the selected presentation from the list. Note that this does not Removes the selected presentation from the list. Note that this does not
delete the original presentation from the disk. delete the original presentation from the disk.
|buttons_preview| **Preview presentation:** |buttons_image_new_group| **Add group**
Opens a dialog where a new group can be added.
.. image:: pics/images_add_group.png
|buttons_preview| **Preview presentation**
Send the selected presentation to the :ref:`g-preview-slide-controller`. Send the selected presentation to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send presentation live:** |buttons_live| **Send presentation live**
Send the selected presentation to the :ref:`g-live-slide-controller` to be Send the selected presentation to the :ref:`g-live-slide-controller` to be
shown on the display screen. shown on the display screen.
|buttons_add| **Add presentation to service:** |buttons_add| **Add presentation to service**
Add the selected presentation to the :ref:`g-service-manager`. Presentations 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 can also be added to the :ref:`g-service-manager` by means of drag and drop
from the :ref:`g-library`. from the :ref:`g-library`.
@ -278,36 +306,36 @@ item. The images item shows a list of imported images.
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_image_new_group| **Add group:** |buttons_open| **Load image**
Opens a dialog where a new image group can be added.
.. image:: pics/images_add_group.png
|buttons_open| **Load image:**
Import one or more images. Images need to be imported in order to be used Import one or more images. Images need to be imported in order to be used
in OpenLP. in OpenLP.
|buttons_delete| **Delete images:** |buttons_delete| **Delete images**
Removes the selected image(s) from the list. Note that this does not Removes the selected image(s) from the list. Note that this does not
delete the original image(s) from the disk. delete the original image(s) from the disk.
|buttons_preview| **Preview image:** |buttons_image_new_group| **Add group**
Send the selected image(s) to the :ref:`g-preview-slide-controller`. Opens a dialog where a new image group can be added.
|buttons_live| **Send image live:** .. image:: pics/images_add_group.png
Send the selected image(s) to the :ref:`g-live-slide-controller` to be
shown on the display screen.
|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-library`.
|buttons_replace_live_background| **Replace live background:** |buttons_replace_live_background| **Replace live background:**
Replace the current live theme background with the selected image. This Replace the current live theme background with the selected image. This
has effect until the theme changes, or the *Remove Backgound* button is has effect until the theme changes, or the *Remove Backgound* button is
clicked. clicked.
|buttons_preview| **Preview image**
Send the selected image(s) to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send image live**
Send the selected image(s) to the :ref:`g-live-slide-controller` to be
shown on the display screen.
|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-library`.
**Notes:** Right-clicking on an image will display some of the same options. **Notes:** Right-clicking on an image will display some of the same options.
.. image:: pics/images_select_image_group.png .. image:: pics/images_select_image_group.png
@ -337,38 +365,36 @@ the :ref:`troubleshooting` for tips on how to resolve these issues.
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_media_optical| **Load CD/DVD:** |buttons_open| **Load new media**
**Load CD/DVD**
This feature only works if VLC is installed on the computer and enabled in OpenLP. This feature only works if VLC is installed on the computer and enabled in OpenLP.
See :ref:`media_configure` for how to configure media players. Clicking the icon See :ref:`media_configure` for how to configure media players. Clicking the icon
will bring up a window where you can load a DVD or audio CD, select a track and will bring up a window where you can load a DVD or audio CD, select a track and
a range and save it as a named clip. Note that the audio CD or DVD is still required a range and save it as a named 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 clip, even if the clip is saved to a service file.
.. image:: pics/select_media_clip.png .. image:: pics/select_media_clip.png
|buttons_open| **Open device stream:** **Open device stream**
Connect to a video stream that is physically connected to the OpenLP computer. Connect to a video stream that is physically connected to the OpenLP computer.
|buttons_video| **Open network stream:** **Open network stream**
Connect to a video stream that is accessable over the network connected to Connect to a video stream that is accessable over the network connected to
the OpenLP computer. the OpenLP computer.
|buttons_link| **Load new media:** |buttons_delete| **Delete the selected media**
Import one or more audio and video files. Audio and video files need to be
imported in order to be used in OpenLP.
|buttons_delete| **Delete the selected media:**
Removes the selected audio or video file(s) from the list. Note that this does not Removes the selected audio or video file(s) from the list. Note that this does not
delete the original file(s) from the disk. delete the original file(s) from the disk.
|buttons_preview| **Preview the selected media:** |buttons_preview| **Preview the selected media**
Send the selected audio and video files to the :ref:`g-preview-slide-controller`. Send the selected audio and video files to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send the selected media live:** |buttons_live| **Send the selected media live**
Send the selected audio or video file to the :ref:`g-live-slide-controller` to be shown Send the selected audio or video file to the :ref:`g-live-slide-controller` to be shown
on the display screen. on the display screen.
|buttons_add| **Add the selected media to the service:** |buttons_add| **Add the selected media to the service**
Add the selected audio and video files to the :ref:`g-service-manager`. Audio and video Add the selected audio and video files to the :ref:`g-service-manager`. Audio and video
files can also be added to the :ref:`g-service-manager` by means of drag and drop files can also be added to the :ref:`g-service-manager` by means of drag and drop
from the :ref:`g-library`. from the :ref:`g-library`.
@ -402,23 +428,23 @@ such as liturgy or prayers.
Toolbar Toolbar
^^^^^^^ ^^^^^^^
|buttons_new| **Add custom slide:** |buttons_new| **Add custom slide**
Open the song edit dialog to add a new custom slide. Open the song edit dialog to add a new custom slide.
|buttons_edit| **Edit custom slide:** |buttons_edit| **Edit custom slide**
Open the song edit dialog to make changed to the selected new custom slide. Open the song edit dialog to make changed to the selected new custom slide.
|buttons_delete| **Delete custom slide:** |buttons_delete| **Delete custom slide**
Remove the selected custom slide(s) from the list. Remove the selected custom slide(s) from the list.
|buttons_preview| **Preview custom slide:** |buttons_preview| **Preview custom slide**
Send the selected custom slide to the :ref:`g-preview-slide-controller`. Send the selected custom slide to the :ref:`g-preview-slide-controller`.
|buttons_live| **Send custom slide live:** |buttons_live| **Send custom slide live**
Send the selected custom slide to the :ref:`g-live-slide-controller` to be Send the selected custom slide to the :ref:`g-live-slide-controller` to be
shown on the display screen. shown on the display screen.
|buttons_add| **Add custom slide to service:** |buttons_add| **Add custom slide to service**
Add the selected custom slide(s) to the :ref:`g-service-manager`. Custom 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 slides can also be added to the :ref:`g-service-manager` by means of drag
and drop from the :ref:`g-library`. and drop from the :ref:`g-library`.
@ -462,14 +488,25 @@ same options.
.. |SEARCH_SONG| image:: pics/search_song.png .. |SEARCH_SONG| image:: pics/search_song.png
.. |SEARCH_SONGBOOK| image:: pics/search_songbook.png
.. |SEARCH_COPYRIGHT| image:: pics/search_copyright.png
.. |SEARCH_CCLI| image:: pics/search_ccli.png
.. |SEARCH_TITLE| image:: pics/search_title.png .. |SEARCH_TITLE| image:: pics/search_title.png
.. |SEARCH_LYRIC| image:: pics/search_lyric.png
.. |SEARCH_AUTHOR| image:: pics/search_author.png .. |SEARCH_AUTHOR| image:: pics/search_author.png
.. |SEARCH_THEME| image:: pics/search_theme.png .. |SEARCH_THEME| image:: pics/search_theme.png
.. |SEARCH_TOPIC| image:: pics/search_topic.png
.. |SEARCH_TEXT_REFERENCE| image:: pics/search_text_reference.png
.. |SEARCH_REFERENCE| image:: pics/search_reference.png .. |SEARCH_REFERENCE| image:: pics/search_reference.png
.. |SEARCH_TEXT| image:: pics/search_text.png .. |SEARCH_TEXT| image:: pics/search_text.png
.. |SEARCH_OPTIONS| image:: pics/mediamanager_bibles_find.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 761 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 756 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

After

Width:  |  Height:  |  Size: 950 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 777 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 790 B

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 747 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB