diff --git a/manual/source/android-remote.rst b/manual/source/android-remote.rst index cbdeb20..8085566 100644 --- a/manual/source/android-remote.rst +++ b/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. diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index a24f980..3782586 100644 --- a/manual/source/bibles.rst +++ b/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* -or, after clicking the media or verse you want to use, click the +from the :ref:`library` over to the *Service Manager* +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*. diff --git a/manual/source/configure.rst b/manual/source/configure.rst index af97973..880f121 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -9,39 +9,54 @@ self-explanatory and we will quickly review them. To configure OpenLP, click on :menuselection:`Settings --> Configure OpenLP...` +.. image:: pics/Settings_configure.png + The plugins you have activated will have configure options. If all the plugins -are activated there will be 10 items down the left side you can configure. +are activated there will be 14 items down the left side you can configure. General ======= .. image:: pics/configuregeneral.png -Monitors -^^^^^^^^ +Application Startup +^^^^^^^^^^^^^^^^^^^ -To choose which monitor you want OpenLP's output display on, click the -drop-down box and select the appropriate monitor. +**Show blank screen warning** + When this box is selected, you will get a warning when opening OpenLP that the + output display has been blanked. You may have blanked it and shut down the + program and this will warn you it is still blanked. -Override Display Position -^^^^^^^^^^^^^^^^^^^^^^^^^ +**Automatically open the previous service** + When this box is selected, OpenLP will remember the last service you were + working on when you closed the program. -This setting overrides the exact position on your screen where the display -output appears. If you have a custom projector setup, click the -:guilabel:`Override display position` checkbox, and manually set the position -of the display output using the :guilabel:`X`, :guilabel:`Y`, :guilabel:`Width` -and :guilabel:`Height` values. +**Show the splash screen** + The OpenLP logo is displayed while OpenLP loads when this checkbox is checked. + This is useful to give some indication that the program is loading. -This setting often comes in useful when you only have a single display, and you -want to be able to make the display smaller so that it does not cover your -entire screen. +**Check for updates to OpenLP** + OpenLP will check to see if there is a newer version available on a regular + basis when this checkbox is checked. Please note that this requires Internet + access. -Display if a Single Screen -^^^^^^^^^^^^^^^^^^^^^^^^^^ +Logo +^^^^ -Checking this checkbox will show the display output in a separate window when -you only have a single monitor. To close the display window, click on it and -press the :kbd:`Esc` key. +**Logo file:** + Select an image file to be displayed when OpenLP is started. Using an image + file will override a background color. + +|buttons_open| **Browse for an image file to display** + +|buttons_revert| **Revert to the default OpenLP logo** + +**Background color:** + You can choose the background color that will be displayed when you start + OpenLP. + +**Don't show logo on startup** + With this box is checked the OpenLP log will not be displayed on startup. CCLI Details ^^^^^^^^^^^^ @@ -50,141 +65,64 @@ CCLI Details If you subscribe to CCLI, this box is for your License number. This number is also displayed in the Song Footer box. -Background Audio -^^^^^^^^^^^^^^^^ - -**Start background audio paused:** - If you have a :ref:`songs_linked` assigned to a song, with this box selected - and when the song is displayed live, the audio will be paused until you start - it using :ref:`linked-audio`. If this box is not selected the audio will play - immediately when the song is displayed live. - -**Repeat track list:** - With this option selected and you are using background audio, the tracks will - repeat when it reaches the end of the list (even if there is only one item). - -Application Startup -^^^^^^^^^^^^^^^^^^^ - -**Show blank screen warning:** - When this box is selected, you will get a warning when opening OpenLP that the - output display has been blanked. You may have blanked it and shut down the - program and this will warn you it is still blanked. - -**Automatically open the last service:** - When this box is selected, OpenLP will remember the last service you were - working on when you closed the program. - -**Show the splash screen:** - The OpenLP logo is displayed while OpenLP loads when this checkbox is checked. - This is useful to give some indication that the program is loading. - -**Check for updates to OpenLP:** - OpenLP will check to see if there is a newer version available on a regular - basis when this checkbox is checked. Please note that this requires Internet - access. - -Application Settings -^^^^^^^^^^^^^^^^^^^^ - -**Prompt to save before starting a new service:** - When this box is selected, OpenLP will prompt you to save the service you are - working on before starting a new service. - -**Unblank display when adding new live item:** - When using the :guilabel:`blank to` button with this checkbox checked, on going - live with the next item, the screen will be automatically re-enabled. If this - checkbox is not checked you will need to click the :guilabel:`blank to` button - again to reverse the action. - -**Automatically preview next item in service:** - When this box is selected, the next item in the :ref:`creating_service` will - be displayed in the Preview pane. - -**Timed slide interval:** - This setting is the time delay in seconds. This is used to continuously loop - a group of images, verses, or the lyrics in a song. This control timer is - also accessible on the :ref:`using_timer` - -.. _configtheme: - -Themes -====== - -.. image:: pics/configurethemes.png - -Global Theme -^^^^^^^^^^^^ - -Choose the theme you would like to use as your default global theme from the -drop down box. The theme selected appears below. The global theme use is -determined by the Theme Level you have selected. - -Theme Level -^^^^^^^^^^^ - -Choose from one of three options for the default use of your theme. - -**Song Level:** - 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 - takes priority. If your song does not have a theme associated with it, OpenLP - will use the theme set in the :ref:`creating_service`. - -**Service Level:** - With this level selected, your theme is controlled at the top of the - :ref:`creating_service`. Select your default service theme there. This setting - will override your Song theme. - -**Global Level:** - With this level selected, all songs and verses will use the theme selected on - the left in the Global Theme drop down. - -Universal Settings -^^^^^^^^^^^^^^^^^^ - -**Wrap footer text:** - Check this if you want text in the footer to wrap if the lines are too long to - be on one line. - - -Advanced -======== - -.. image:: pics/configureadvanced.png - -.. _configure_ui: UI Settings (user interface) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -**Number of recent files to display:** +**Number of recent files to display** Set this number for OpenLP to remember your last files open. These will show under :menuselection:`File --> Recent Files`. -**Remember active media manager tab on startup:** - With this box selected OpenLP :ref:`media-manager` will open on the same tab +**Open the last used Library tab on startup** + With this box selected OpenLP :ref:`library` will open on the same tab that it was closed on. -**Double-click to send items straight to live:** - With this box selected, double-clicking on anything in the :ref:`media-manager` +**Hide mouse cursor when over display window** + With this box selected your mouse cursor will not be visible if you move it + from Display 1 onto Display 2. + +**Double-click to send items straight to live** + With this box selected, double-clicking on anything in the :ref:`library` will immediately send it live instead of to Preview. -**Preview items when clicked in Media Manager:** - With this box selected, clicking any item in the :ref:`media-manager` will +**Preview items when clicked in Library** + With this box selected, clicking any item in the :ref:`library` will immediately display it in the Preview pane. -**Expand new service items on creation:** +**Preview items when clicked in Service** + With this box selected, clicking any item in the :ref:`creating_service` will + immediately display it in the Preview pane. + +**Expand new service items on creation** With this box selected, everything you add to the :ref:`creating_service` will be expanded so you can see all the verses, lyrics and presentations, line by line. When you open OpenLP, everything will automatically be expanded in the :ref:`creating_service`. -**Enable application exit confirmation:** +**Max height for non-text slides in slide controller** With this box selected, on closing OpenLP you will be presented with a dialog box to confirm closing the program. -Default Service Name +**When changing slides** + This dropdown controls how the Live and Preview controllers scroll the verses + displayed as you progress through the item slides. + +**Enable search as you type** + With this box selected, as you type into text boxes suggestions will be shown. + +**Enable application exit confirmation** + With this box selected, you will be asked if you really want to close OpenLP. + + + +.. _configservice: + +Service +======= + +.. image:: pics/configurationservice.png + +Default service name ^^^^^^^^^^^^^^^^^^^^ The default service name gives you the ability to have a preset name, date and @@ -214,44 +152,29 @@ time when saving your service file. **Note:** If the date and time format does not suit your needs and you are technically inclined, there is more information at `Python.org`_. -Data Location -^^^^^^^^^^^^^ +Slide Controller +^^^^^^^^^^^^^^^^ -If you wish to change the default location of where OpenLP stores its data, you -can enter a custom location here. +**Unblank display when sending items to Live** + When using the :guilabel:`blank to` button with this checkbox checked, on going + live with the next item, the screen will be automatically re-enabled. If this + checkbox is not checked you will need to click the :guilabel:`blank to` button + again to reverse the action. -|buttons_open| **Browse for a custom data location** +**Unblank display when changing slide in live** -|buttons_revert| **Revert:** - Clicking this button will erase your changes and revert to the default data - location. +**Automatically preview next item in service:** + When this box is selected, the next item in the :ref:`creating_service` will + be displayed in the Preview pane. -Default Images -^^^^^^^^^^^^^^ +**Timed slide interval:** + This setting is the time delay in seconds. This is used to continuously loop + a group of images, verses, or the lyrics in a song. This control timer is + also accessible on the :ref:`using_timer` -**Background color:** - You can choose the background color that will be displayed when you start - OpenLP. -**Image file:** - Select an image file to be displayed when OpenLP is started. Using an image - file will override a background color. - -|buttons_open| **Browse for an image file to display** - -|buttons_revert| **Revert to the default OpenLP logo** - -Mouse Cursor -^^^^^^^^^^^^ - -**Hide mouse cursor when over display window:** - With this box selected your mouse cursor will not be visible if you move it - from Display 1 onto Display 2. - -Service Item Slide Limits -^^^^^^^^^^^^^^^^^^^^^^^^^ - -These three settings control +Service Item Wrapping +^^^^^^^^^^^^^^^^^^^^^ **End Slide:** Up and down arrow keys stop at the top and bottom slides of each Service item. @@ -271,10 +194,38 @@ These three settings control 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 presentation remote controller. + +.. _configtheme: + +Advanced +======== + +.. image:: pics/configureadvanced.png + +.. _configure_ui: + + +Data Location +^^^^^^^^^^^^^ + +If you wish to change the default location of where OpenLP stores its data, you +can enter a custom location here. + +|buttons_open| **Browse for a custom data location** + Clicking this button will open the open file dialog and allow you to select ability + new location for the Data directory. + +|buttons_revert| **Revert:** + Clicking this button will erase your changes and revert to the default data + location. Display Workarounds ^^^^^^^^^^^^^^^^^^^ +**Ignore Aspect Ratio** + Selecting this option will allow service items to be displayed as it was originally + formated without regard for how the screen is formated. + **Bypass X11 Window Manager:** 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 @@ -288,45 +239,145 @@ Display Workarounds Using alternating row colors in most cases makes it easier for the human eye to overview a list of items. Uncheck to disable. -.. _config_players: +**Disable display transparency** + Selecting this option prevents the Live display from being transparent. -Players +Proxy Server Settings +^^^^^^^^^^^^^^^^^^^^^ + + You can select a proxy server if needed. Your network administrator will know + if this is necessary. In most cases this will not be needed. + +**No proxy** + Select this option if you do not want to use a Proxy Server. + +**Use system proxy** + Select this option if you want to use your computers default Proxy Server. + +**Manual proxy configuration** + Select this option if you want to setup the Proxy Server manually. The + remaining options are only active if you select the Manual proxy + configuration. + +**HTTP:** + Enter the HTTP: 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. + +**HTTPS:** + Enter the HTTP: 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. + +**Username:** + Please enter your username if a username is required by you proxy server. + Leave this blank if your proxy server does not require user authenication. + +**Password:** + Please enter your password if a username and password is required by you + proxy server. Leave this blank if your proxy server does not require + user authenication. + +Screens ======= -.. image:: pics/configureplayers.png +.. image:: pics/configurescreens.png -Background color -^^^^^^^^^^^^^^^^ -Choose the background color displayed as background for videos with a different -aspect ratio than the display screen +To choose which monitor you want OpenLP's Live display on, select the +appropriate monitor. If only one screen is displayed your system has +determined you only have one display it can output to. If you are +unsure about what display to use for you Live display select the +:guilabel:`Identify Screens` button. -Available Media Players -^^^^^^^^^^^^^^^^^^^^^^^ +Use this screen as display +^^^^^^^^^^^^^^^^^^^^^^^^^^ + This box needs to be checked for one display. -Select the media players you want to be available for use. As a general rule the -players control the following: +**Full Screen** + Select this option if you want to use the full screen area. -**System:** - System is an internal media player which uses your operating system's - built-in media player capabilities. +**Custom geometry** + This setting overrides the exact position on your screen where the display + output appears. If you have a custom projector setup, click the + :guilabel:`Override display position` checkbox, and manually set the position + of the display output using the :guilabel:`X`, :guilabel:`Y`, :guilabel:`Width` + and :guilabel:`Height` values. -**Webkit:** - WebKit is another internal media player, which adds text-over-video to OpenLP. + This setting often comes in useful when you only have a single display, and you + want to be able to make the display smaller so that it does not cover your + entire screen. -**VLC:** - This uses the well-known VLC media player to show videos. VLC has a - reputation of being able to handle almost any video or audio format. +Generic Screen Settings +^^^^^^^^^^^^^^^^^^^^^^^ -**Note:** You must have `VLC`_ installed for the VLC option to be available. On -Windows you must install the 32-bit version of VLC. On macOS you must install -the 64-bit version of VLC. +**Display if a Single Screen** + Checking this checkbox will show the display output in a separate window when + you only have a single monitor. To close the display window, click on it and + press the :kbd:`Esc` key. -Player Order +Themes +====== + +.. image:: pics/configurethemes.png + +Global Theme ^^^^^^^^^^^^ + +Choose the theme you would like to use as your default global theme from the +drop down box. The theme selected appears below unless the theme is a movie +theme. The global theme use is determined by the Theme Level you have selected. + +Theme Level +^^^^^^^^^^^ + +Choose from one of three options for the default use of your theme. + +**Song Level:** + 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 + takes priority. If your song does not have a theme associated with it, OpenLP + will use the theme set in the :ref:`creating_service`. + +**Service Level:** + With this level selected, your theme is controlled at the top of the + :ref:`creating_service`. Select your default service theme there. This setting + will override your Song theme. + +**Global Level:** + With this level selected, all songs and verses will use the theme selected on + the left in the Global Theme drop down. + +Universal Settings +^^^^^^^^^^^^^^^^^^ + +**Transition between service items** + Checking this option will force the theme to use it's transition between items + in the service (so when you change from a song to a Bible verse you'll get a transition) + +**Reload live theme when changed** + Check this option if you want the theme reloaded when you edit it while it is + currently being used in the current live item. + + +.. _media_configure: + + +Media +===== + +.. image:: pics/configuremedia.png + +Live Media +^^^^^^^^^^ + +**Start Live items automatically:** + With this option selected songs and videos will start to play automatically when + sent live. + +VLC (requires restart) +^^^^^^^^^^^^^^^^^^^^^^ + +**Extra arguments:** + If needed you can add command line arguments to be used with VLC. -Determines the preference order of the selected media players. The order is -changed by selecting one of the available players and using the -:guilabel:`Down` or :guilabel:`Up` button to change the position of the player. .. _configure_projectors: @@ -338,7 +389,7 @@ Projectors Communication Options ^^^^^^^^^^^^^^^^^^^^^ -The options available are: +The following options available are: **Connect to projectors on startup:** Check if you want to attempt to connect to all projectors when OpenLP starts. @@ -356,269 +407,17 @@ The options available are: Select whether you want all video source options on one dialog page or to use tabs to consolidate the inputs based on video group. -.. _config_songs: +**Enable listening for PJLink2 broadcast messages*** + Select this option to Enable listening on UDP ports for PJLink2 broadcasts. -Songs -===== - -.. image:: pics/configuresongs.png - -Songs Mode -^^^^^^^^^^ - -**Enable search as you type:** - With this box selected, Media Manager/Songs will display the song you are - searching for as you are typing. If this box is not selected, you need to type - in your search box and then click on the Search button. - -**Display verses on live tool bar:** - With this box selected, a Go To drop down box is available on the live toolbar - to select any part of the verse type you want displayed live. - -**Update service from song edit:** - With this box selected and you edit a song in the :ref:`media-manager`, the - 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 - the :ref:`creating_service` if you add it again. - -**Import missing songs from service files:** - 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:`media-manager`, - it will automatically enter the song in your Songs Media Manager. If this box - is not checked, the song is available in the service but will not be added to - the :ref:`media-manager`. - -**Display songbook in footer:** - With this box selected the songbook name and number for songs (if available) - will be shown in the footer. - -**Display "©" symbol before copyright info:** - With this box selected the copyright symbol will be displayed in the footer - before the copyright information. - -Bibles -====== - -.. image:: pics/configurebibles.png - -Verse Display -^^^^^^^^^^^^^ - -**Show verse numbers:** - With this box selected verse numbers are always shown, deselect to hide verse - numbers. - -**Only show new chapter numbers:** - 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 - 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. - -**Display style:** - 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. - -**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 will only add the next verse if it - 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. - -**Display second Bible verses:** - 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 - choice in the Bible Media Manager to use this option. Verses will display with - one verse per slide with the second Bible verse below. - -**Bible theme:** - 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*. - -**Note:** Changes do not affect verses already in the service. - -Custom Scripture References -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Here you can change the default separators used in the scripture references. -The default values are shown in gray when the custom separators has not be -enabled and nothing has been entered. Note that the default separators can -change if the language of OpenLP is changed. - -**Verse Separators:** Enable to enter a custom verse separator. - -**Range Separators:** Enable to enter a custom range separator. - -**List Separators:** Enable to enter a custom list separator. - -**End Mark:** Enable to enter a custom end marker. - -Default Bible Language -^^^^^^^^^^^^^^^^^^^^^^ - -Choose the language of the bible books. The options are: - -**Bible Language:** - The language of the books will be determined by the language of the bible. - -**Application Language:** - The language of the books will be determined by the language set for OpenLP. - -**English:** - The language of the books will be set to English. - -.. _presentation_configure: - -Presentations -============= - -.. image:: pics/configurepresentations.png - -Available Controllers -^^^^^^^^^^^^^^^^^^^^^ - -OpenLP has the ability to import OpenOffice Impress or Microsoft PowerPoint -presentations, and use Impress, PowerPoint, or PowerPoint Viewer to display and -control them from within OpenLP. Please remember that in order to use this -feature you will need to have one of the above-mentioned applications installed, -due to the fact that OpenLP uses these application to open and run the -presentation. - -Support of PDF is bundled with OpenLP on macOS and Windows. On Linux you will -need to install :file:`mupdf` (recommended) or :file:`ghostscript`. - -Advanced -^^^^^^^^ - -**Allow presentation application to be overridden:** - With this option selected, you will see *Present using* area with a dropdown - box on the Presentations toolbar in the Library :ref:`media-manager-presentations` which gives you the - option to select the presentation program you want to use. - -PowerPoint options -^^^^^^^^^^^^^^^^^^ - -These options are only available if PowerPoint has been detected. - -**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 - clicking the slide in the slidecontroller. The default behavior is to restart - the slide. - -**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 look the same size on different monitors. Unfortunately this can - cause issues with how OpenLP places and resizes the PowerPoint presentation - window. Check this box to enable the workaround which let PowerPoint control - the presentation window. When you enable this you must setup PowerPoint to - present to the correct monitor. - -PDF options -^^^^^^^^^^^ - -**Use given full path for mudraw or ghostscript binary:** - Enable this if you want to enter a custom path for mudraw or ghostscript. - -Images -====== - -Provides border where an image is not the correct dimensions for the screen when -it is resized. - -.. image:: pics/configureimages.png - -**Default Color:** - Click on the black button next to Default Color. You have the option of - choosing among the colors you see or entering your own. - -.. _media_configure: - - -Media -===== - -.. image:: pics/configuremedia.png - -Advanced -^^^^^^^^ - -**Allow media player to be overridden:** - With this option selected, you will see :guilabel:`Use Player:` area with a - dropdown box on the Media tool bar in the :ref:`media-manager` which gives - you the option to select the media player you want to use. - -**Start Live items automatically:** - With this option selected media items will start to play automatically when - sent live. - -Custom -====== - -.. image:: pics/configurecustom.png - -.. _configure_custom: - -Custom Display -^^^^^^^^^^^^^^ - -**Display Footer:** - With this option selected, your Custom slide Title will be displayed in the - footer. - -**Note:** If you have an entry in the Credits box of your custom slide, title and -credits will always be displayed. - -**Import missing custom slides from service files:** - 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 - :ref:`media-manager`, it will automatically enter the custom slide in your - Custom Slide Media Manager. If this box is not checked, the custom slide is - available in the service but will not be added to the :ref:`media-manager`. - -.. _configure_alerts: - -Alerts -====== - -.. image:: pics/configurealerts.png - -Font -^^^^ - -**Font name:** - Choose your desired font from the drop down menu - -**Font color:** - Choose your font color here. - -**Background color:** - Choose the background color the font will be displayed on. - -**Font size:** - This will adjust the size of the font. - -**Alert timeout:** - This setting will determine how long your :ref:`alerts` will be displayed on - the screen, in seconds. - -**Vertical Align:** - Choose the location where you want the alert displayed on the - screen, Top, Middle or Bottom. - -**Preview:** - Your choices will be displayed here. +**Convert to projector when LINKUP received** + Select this option so a projector can be enabled when the LINKUP signal is + received from the projector. .. _remote_tab: -Remote -====== +Remote Interface +================ OpenLP gives you the ability to control the :ref:`creating_service` or send an :ref:`alerts` from a remote computer through a web browser. This could be useful @@ -644,13 +443,17 @@ Server Settings - Non Secure .. image:: pics/configureremotes.png -**Serve on IP address:** +**IP address:** Put your projection computer's IP address here or use 0.0.0.0 which will - display your IP address links below. + display your IP address links below. **Display stage time in 12h 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.** + Check this option if you want to see thumbnails of non-text slides on the Stage + and Remote Views. + **Port Number:** 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. @@ -668,16 +471,12 @@ Android app. format. This URL shows the address you will use in the remote browser for stage view. -.. _secure_server: +**Chord view URL:** + 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. -Server Settings - Secure -^^^^^^^^^^^^^^^^^^^^^^^^ -These options are identical in meaning to the ones documented in :ref:`non_secure`. -The only difference is these require an SSL cetificate to provide the security. -Instructions for creating and installing a certificate are documented in -Generate SSL certificate :ref:`ssl_config`. - -*Changing from a Secure to Non Secure setup requires a restart of OpenLP.* +**Live view URL:** + Using the live view, you can display the Live output on multiple devices. .. _user_auth: @@ -688,61 +487,22 @@ android interfaces. Once the userid and password have been accepted then updates will be possible for duration of the web session. This option can be changed without the need to restart OpenLP. -.. _ssl_config: +.. _web_remote_version: -Generating and Installing a Certificate -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -To make the Remote access run in a secure manner ssl certificates need to be -provided to OpenLP. This is completely optional. On Linux you will need the -"openssl" package installed. On macOS openssl should be installed by default. -On Windows you will need to download OpenSSL for Windows. +Web Remote +^^^^^^^^^^ -First create a configuration file for OpenSSL named openlp.cnf:: +**Current version:** + The current version of the remote interface is displayed here. If the + current version is different from the latest version, press the :guilabel:`Upgrade` + button. - #-------------openssl.cnf---------------- - [ req ] - default_bits = 1024 # Size of keys - default_keyfile = key.pem # name of generated keys - default_md = des3 # message digest algorithm - string_mask = nombstr # permitted characters - distinguished_name = req_distinguished_name - - [ req_distinguished_name ] - # Variable name Prompt string - 0.organizationName = Organization Name (company) - organizationalUnitName = Organizational Unit Name (department, division) - emailAddress = Email Address - emailAddress_max = 40 - localityName = Locality Name (city, district) - stateOrProvinceName = State or Province Name (full name) - countryName = Country Name (2 letter code) - countryName_min = 2 - countryName_max = 2 - commonName = Common Name (hostname, IP, or your name) - commonName_max = 64 - - #-------------------Edit this section------------------------------ - countryName_default = -- - stateOrProvinceName_default = None - localityName_default = Everywhere - 0.organizationName_default = OpenLP - organizationalUnitName_default = Remote - commonName_default = 0.0.0.0 - emailAddress_default = openlp@localhost - -Then generate your keys and certificate:: - - echo openlp | openssl genrsa -passout stdin -des3 -out openlp.key 1024 - cp openlp.key openlp.key.bak - echo openlp | openssl rsa -passin stdin -in openlp.key.bak -out openlp.key - - openssl req -new -key openlp.key -out openlp.csr -config openlp.cnf -batch - openssl x509 -req -days 365 -in openlp.csr -signkey openlp.key -out openlp.crt - -The crt and key files need to then be placed in {data}/remotes directory. - -Android and iOS Remotes -^^^^^^^^^^^^^^^^^^^^^^^ +**Latest Version** + The latest version of the remote interface is displayed here after you + press the :guilabel:`check for Updates` button. + +Remote App +^^^^^^^^^^ You can quickly find and download the OpenLP Android or iOS remote apps using your barcode scanner or by clicking on the :guilabel:`download` link. See the sections on @@ -793,6 +553,308 @@ and enter the IP address followed by a colon and then the port number, ie: Controller. 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. +.. _config_songs: + + +Songs +===== + +.. image:: pics/configuresongs.png + +Song related settings +^^^^^^^^^^^^^^^^^^^^^ + +**Enable `Go to verse` button in Live panel** + With this box selected, a :guilabel:`Go To` drop down box is available on + 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. + +**Update service from song edit:** + 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`. + If this box is not selected, your song edit changes will only be available in + the :ref:`creating_service` if you add it again. + +**Import missing songs from service files:** + 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`, + it will automatically enter the song in your Songs Media Manager. If this box + is not checked, the song is available in the service but will not be added to + the :ref:`library`. + +**Add Songbooks as first slide** + With this box selected the songbook name for songs (if available) will be + shown as an introduction slide for the song. This option is implemented as + songs are added to the Service. If you already have a song in the service, you + 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. + +Chords +^^^^^^ + Enabling this option allows songs with chords to show the chords on the Stage + views. Any text in the song that is between "[" and "]" will be regarded as + chords. + +**Ignore chords when importing songs** + This option will allow the song importer to ignore cords in the imported song. + +**Chord notation to use:** + Select the English, German or Neo-Latin notation to match your location or need. + +SongSelect Login +^^^^^^^^^^^^^^^^ + You must have a valid SongSelect account to use this option. Type in your + username and password to enable automatic login when importing SongSelect songs. + +Footer +^^^^^^ + This is a list of the Placeholders that can be used in the Footer Template. + +Footer Template +^^^^^^^^^^^^^^^ + You can cutomize the Footer information for a song. To make changes click into + the text box and type your changes. If you need to reset the template, press + the :guilabel:`Reset Template` button. + + +Bibles +====== + +.. image:: pics/configurebibles.png + +Verse Display +^^^^^^^^^^^^^ + +**Show verse numbers:** + With this box selected verse numbers are always shown, deselect to hide verse + numbers. + +**Only show new chapter numbers:** + 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 + 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. + +**Display style:** + 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. + +**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 will only add the next verse if it + 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. + +**Display second Bible verses:** + 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 + choice in the Bible Media Manager to use this option. Verses will display with + one verse per slide with the second Bible verse below. + +**Bible theme:** + 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*. + +**Note:** Changes do not affect verses already in the service. + +Custom Scripture References +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Here you can change the default separators used in the scripture references. +The default values are shown in gray when the custom separators has not be +enabled and nothing has been entered. Note that the default separators can +change if the language of OpenLP is changed. + +**Verse Separators:** Enable to enter a custom verse separator. + +**Range Separators:** Enable to enter a custom range separator. + +**List Separators:** Enable to enter a custom list separator. + +**End Mark:** Enable to enter a custom end marker. + +Default Bible Language +^^^^^^^^^^^^^^^^^^^^^^ + +Choose the language of the bible books. The options are: + +**Bible Language:** + The language of the books will be determined by the language of the bible. + +**Application Language:** + The language of the books will be determined by the language set for OpenLP. + +**English:** + The language of the books will be set to English. + +Quick Search Settings +^^^^^^^^^^^^^^^^^^^^^ + +**Reset search type to `Text or Scripture Reference` on Startup** + Select this option if you want the bible search type to be Text or + scripture Reference when OpenLP is started. + +**Don't show error if nothing is found in `Text or Scripture Reference`** + Select this option to remove the error message when there are no + results for your text or scripture reference search. + +**Seach automatically while typing** + Select this option if you want a display of possible results to appear + as you type in your search criteria. The list will appear after 8 + charactors are entered or a space is entered. + +.. _presentation_configure: + +Presentations +============= + +.. image:: pics/configurepresentations.png + +Available Controllers +^^^^^^^^^^^^^^^^^^^^^ + +OpenLP has the ability to import OpenOffice Impress or Microsoft PowerPoint +presentations, and use Impress, PowerPoint, or PowerPoint Viewer to display and +control them from within OpenLP. Please remember that in order to use this +feature you will need to have one of the above-mentioned applications installed, +due to the fact that OpenLP uses these application to open and run the +presentation. + +Support of PDF is bundled with OpenLP on macOS and Windows. On Linux you will +need to install :file:`mupdf` (recommended) or :file:`ghostscript`. + +Advanced +^^^^^^^^ + +**Allow presentation application to be overridden:** + 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 + option to select the presentation program you want to use. + +PowerPoint options +^^^^^^^^^^^^^^^^^^ + +These options are only available if PowerPoint has been detected. + +**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 + clicking the slide in the slidecontroller. The default behavior is to restart + the slide. + +**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 look the same size on different monitors. Unfortunately this can + cause issues with how OpenLP places and resizes the PowerPoint presentation + window. Check this box to enable the workaround which let PowerPoint control + the presentation window. When you enable this you must setup PowerPoint to + present to the correct monitor. + + +Images +====== + +Provides border where an image is not the correct dimensions for the screen when +it is resized. + +.. image:: pics/configureimages.png + +Image Background +^^^^^^^^^^^^^^^^ + +**Use Blank Theme** + Select this option to place the image on a blank background. If the + image is smaller than the screen, the area around the imabe will be + black. + +**Custom Theme** + Select this option and use the dropdown box to use one of the current + themes as a background for the imate. + + +Custom Slides +============= + +.. image:: pics/configurecustom.png + +.. _configure_custom: + +Custom Display +^^^^^^^^^^^^^^ + +**Display Footer:** + With this option selected, your Custom slide Title will be displayed in the + footer. + +**Note:** If you have an entry in the Credits box of your custom slide, title and +credits will always be displayed. + +**Import missing custom slides from service files:** + 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 + :ref:`library`, it will automatically enter the custom slide in your + Custom Slide Media Manager. If this box is not checked, the custom slide is + available in the service but will not be added to the :ref:`library`. + +.. _configure_alerts: + +Alerts +====== + +.. image:: pics/configurealerts.png + +Font Settings +^^^^^^^^^^^^^ + +**Font name:** + Choose your desired font from the drop down menu + +**Font color:** + Choose your font color here. + +**Background color:** + Choose the background color the font will be displayed on. + +**Font size:** + This will adjust the size of the font. + +Background Settings +^^^^^^^^^^^^^^^^^^^ + +**Background Color** + Select the color box and you can select the background color for the alert. + +Enable Scrolling +^^^^^^^^^^^^^^^^ + Select this option and the alert text will scroll across the screen. + +**Repeat(no. of times)** + If Enable Scrolling has been selected this sets the number of times + the alert will scroll across the screen. + +Other Settings +^^^^^^^^^^^^^^ + +**Alert timeout:** + This setting will determine how long your :ref:`alerts` will be displayed on + the screen, in seconds. + +**Vertical Align:** + Choose the location where you want the alert displayed on the + screen, Top, Middle or Bottom. + +Preview +^^^^^^^ + Your choices will be displayed here. + + .. These are all the image templates that are used in this page. .. |BUTTONS_OPEN| image:: pics/buttons_open.png @@ -801,3 +863,4 @@ port number or one or both computers are not connected to the network. .. _Python.org: http://docs.python.org/library/datetime.html#strftime-strptime-behavior .. _VLC: http://www.videolan.org/vlc/ + diff --git a/manual/source/glossary.rst b/manual/source/glossary.rst index 31b43c3..4ffabba 100644 --- a/manual/source/glossary.rst +++ b/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. -Each tab in the Media Manager is called a :ref:`g-media-item`. You can send -songs, Bibles, etc from the :ref:`g-media-item` to the +The Library contains a number of tabs which the plugins supply to OpenLP. +Each tab in the Library is called a :ref:`g-library-item`. You can send +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 -area where your media items go live. You can also save, open, and edit +The service manager contains the library items in your service file. This is the +area where your library items go live. You can also save, open, and edit services files from here. .. image:: pics/servicemanager.png diff --git a/manual/source/index.rst b/manual/source/index.rst index 9705480..f7ce0ea 100644 --- a/manual/source/index.rst +++ b/manual/source/index.rst @@ -40,7 +40,7 @@ Reference Manual configure_ui backing_up dualmonitors - mediamanager + library service print_service projector diff --git a/manual/source/mediamanager.rst b/manual/source/library.rst similarity index 80% rename from manual/source/mediamanager.rst rename to manual/source/library.rst index 095cc5c..512714b 100644 --- a/manual/source/mediamanager.rst +++ b/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, -Songs, Presentations, Media, and Custom Slides that you will project through -OpenLP. +:ref:`g-library`. The :ref:`g-library` contains all the Bibles, +Songs, Presentations, Audio files, Visual files, and Custom Slides +that you will project through OpenLP. -If you don't see the "Songs", "Bibles" and other media items in the -:ref:`g-media-manager`, then refer to :ref:`t-no-media-items` in the +If you don't see the "Songs", "Bibles" and other library 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 -item. The songs media item shows a list of all the songs in the songs database. +Clicking on *Songs* in the :ref:`g-library` will display the songs library +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 -item. The Bibles media item shows Bible verses and provides a search function +Clicking on *Bibles* in the :ref:`g-library` will display the Bibles +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 -presentations media item. The presentations media item shows a list of imported +Clicking on *Presentations* in the :ref:`g-library` will display the +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 -media item. The images media item shows a list of imported images. +Clicking on *Images* in the :ref:`g-library` will display the 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 -for media. The media item shows a list of imported audio or video files. +Clicking on *Media* in the :ref:`g-library` will display the 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 - installed on the computer and enabled in OpenLP. See :ref:`config_players` - 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 a range and save - it as a named media clip. Note that the audio CD or DVD is still required - when playing the media clip, even if the media clip is saved to a service - file. + 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 + 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 + when playing the clip, even if the clip is saved to a service file. .. image:: pics/select_media_clip.png -|buttons_open| **Load media:** - Import one or more media files. Media files need to be imported in order to - be used in OpenLP. +|buttons_open| **Open device stream:** + Connect to a video stream that is physically connected to the OpenLP computer. -|buttons_delete| **Delete media:** - Removes the selected media file(s) from the list. Note that this does not - delete the original media file(s) from the disk. +|buttons_video| **Open network stream:** + Connect to a video stream that is accessable over the network connected to + the OpenLP computer. -|buttons_preview| **Preview media:** - Send the selected media to the :ref:`g-preview-slide-controller`. +|buttons_link| **Load new 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_live| **Send media live:** - Send the selected media to the :ref:`g-live-slide-controller` to be shown +|buttons_delete| **Delete the selected media:** + 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:** - 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`. +|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 + files 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:** - 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 audio or video file will display some of the same options. -**Notes:** Right-clicking on a media file will display some of the same options. - -Media items can be dragged from the desktop (or any folder) into the Media +Audio and video 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 -custom slides media item. The custom slides media item shows a list of custom +Clicking on *Custom Slides* in the :ref:`g-library` will display the +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 diff --git a/manual/source/menu_items.rst b/manual/source/menu_items.rst index de12bc5..29bd784 100644 --- a/manual/source/menu_items.rst +++ b/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`. diff --git a/manual/source/pics/Settings_configure.png b/manual/source/pics/Settings_configure.png new file mode 100644 index 0000000..9eab659 Binary files /dev/null and b/manual/source/pics/Settings_configure.png differ diff --git a/manual/source/pics/buttons_link.png b/manual/source/pics/buttons_link.png new file mode 100644 index 0000000..f538aac Binary files /dev/null and b/manual/source/pics/buttons_link.png differ diff --git a/manual/source/pics/buttons_open.png b/manual/source/pics/buttons_open.png index eb211e2..a5ad69c 100644 Binary files a/manual/source/pics/buttons_open.png and b/manual/source/pics/buttons_open.png differ diff --git a/manual/source/pics/buttons_replace_live_background.png b/manual/source/pics/buttons_replace_live_background.png index a878468..cc5ef7b 100644 Binary files a/manual/source/pics/buttons_replace_live_background.png and b/manual/source/pics/buttons_replace_live_background.png differ diff --git a/manual/source/pics/buttons_video.png b/manual/source/pics/buttons_video.png new file mode 100644 index 0000000..4e93e0f Binary files /dev/null and b/manual/source/pics/buttons_video.png differ diff --git a/manual/source/pics/configurationscreens.png b/manual/source/pics/configurationscreens.png new file mode 100644 index 0000000..b8e0547 Binary files /dev/null and b/manual/source/pics/configurationscreens.png differ diff --git a/manual/source/pics/configurationservice.png b/manual/source/pics/configurationservice.png new file mode 100644 index 0000000..3c1de5a Binary files /dev/null and b/manual/source/pics/configurationservice.png differ diff --git a/manual/source/pics/configureadvanced.png b/manual/source/pics/configureadvanced.png index 5c40101..a585a08 100644 Binary files a/manual/source/pics/configureadvanced.png and b/manual/source/pics/configureadvanced.png differ diff --git a/manual/source/pics/configurealerts.png b/manual/source/pics/configurealerts.png index 24728ab..adb31ba 100644 Binary files a/manual/source/pics/configurealerts.png and b/manual/source/pics/configurealerts.png differ diff --git a/manual/source/pics/configurebibles.png b/manual/source/pics/configurebibles.png index 4ba427e..9c3cb7f 100644 Binary files a/manual/source/pics/configurebibles.png and b/manual/source/pics/configurebibles.png differ diff --git a/manual/source/pics/configurecustom.png b/manual/source/pics/configurecustom.png index 87ebbe7..ffd12f5 100644 Binary files a/manual/source/pics/configurecustom.png and b/manual/source/pics/configurecustom.png differ diff --git a/manual/source/pics/configuregeneral.png b/manual/source/pics/configuregeneral.png index f0b6e2c..613045f 100644 Binary files a/manual/source/pics/configuregeneral.png and b/manual/source/pics/configuregeneral.png differ diff --git a/manual/source/pics/configureimages.png b/manual/source/pics/configureimages.png index f7e1f09..53063a7 100644 Binary files a/manual/source/pics/configureimages.png and b/manual/source/pics/configureimages.png differ diff --git a/manual/source/pics/configuremedia.png b/manual/source/pics/configuremedia.png index 0d97f9c..2893ba3 100644 Binary files a/manual/source/pics/configuremedia.png and b/manual/source/pics/configuremedia.png differ diff --git a/manual/source/pics/configureplayers.png b/manual/source/pics/configureplayers.png deleted file mode 100644 index 05f37bf..0000000 Binary files a/manual/source/pics/configureplayers.png and /dev/null differ diff --git a/manual/source/pics/configurepresentations.png b/manual/source/pics/configurepresentations.png index 8687114..d9fc3ce 100644 Binary files a/manual/source/pics/configurepresentations.png and b/manual/source/pics/configurepresentations.png differ diff --git a/manual/source/pics/configureprojectors.png b/manual/source/pics/configureprojectors.png index 128e4a4..1a5a40c 100644 Binary files a/manual/source/pics/configureprojectors.png and b/manual/source/pics/configureprojectors.png differ diff --git a/manual/source/pics/configureremotes.png b/manual/source/pics/configureremotes.png index 7da12b9..5b06bb7 100644 Binary files a/manual/source/pics/configureremotes.png and b/manual/source/pics/configureremotes.png differ diff --git a/manual/source/pics/configurescreens.png b/manual/source/pics/configurescreens.png new file mode 100644 index 0000000..a55140c Binary files /dev/null and b/manual/source/pics/configurescreens.png differ diff --git a/manual/source/pics/configuresongs.png b/manual/source/pics/configuresongs.png index 165f50a..0aba1d2 100644 Binary files a/manual/source/pics/configuresongs.png and b/manual/source/pics/configuresongs.png differ diff --git a/manual/source/pics/configurethemes.png b/manual/source/pics/configurethemes.png index 2e3a512..7991d15 100644 Binary files a/manual/source/pics/configurethemes.png and b/manual/source/pics/configurethemes.png differ diff --git a/manual/source/print_service.rst b/manual/source/print_service.rst index a636d2a..98f1eb2 100644 --- a/manual/source/print_service.rst +++ b/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: diff --git a/manual/source/service.rst b/manual/source/service.rst index 1d8ea73..6c07e06 100644 --- a/manual/source/service.rst +++ b/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-media-manager` you can add new media, songs, images, Bibles or create a -custom slide as discussed earlier in the :ref:`media-manager` section. +:ref:`g-library`, under their respective categories. Using the +:ref:`g-library` you can add new media, songs, images, Bibles or create a +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` -will be applied to the song in your :ref:`media-manager`. This can be changed +the :ref:`creating_service` song database. Editing a song in the :ref:`library` +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 -drag your selection from the :ref:`media-manager` over to the *Service Manager* +To add your media you can click on an item in the :ref:`library` hold and +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: diff --git a/manual/source/songs.rst b/manual/source/songs.rst index d80e0e6..4c191e5 100644 --- a/manual/source/songs.rst +++ b/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` - or right click a song from either the :ref:`media-manager` or additionally + :ref:`library` and then click the button to :guilabel:`Edit the selected song` + 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:** diff --git a/manual/source/troubleshooting.rst b/manual/source/troubleshooting.rst index e7e0057..25fd54d 100644 --- a/manual/source/troubleshooting.rst +++ b/manual/source/troubleshooting.rst @@ -134,17 +134,17 @@ directory:: ```` 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 -player for OpenLP is VLC, see the manual for :ref:`config_players` for how to +that the players have not be properly configured. The recommended +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 `_ 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 diff --git a/manual/source/web_remote.rst b/manual/source/web_remote.rst index be2f6bb..26b9b97 100644 --- a/manual/source/web_remote.rst +++ b/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 diff --git a/manual/source/wizard.rst b/manual/source/wizard.rst index 29b5d7c..aa25e0a 100644 --- a/manual/source/wizard.rst +++ b/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.