diff --git a/manual/source/android.rst b/manual/source/android.rst index 2496f2a..f87760c 100644 --- a/manual/source/android.rst +++ b/manual/source/android.rst @@ -7,46 +7,18 @@ Installation ------------ OpenLP gives you the ability to control your service from an Android based -smartphone. The following tutorial will describe how to download, install and -use the application. For this example we will be using the HTC Incredible. Other -Android phones may vary slightly in appearance and installation. +smartphone. The following tutorial will describe how to install and +use the application. For this example we will be using a LG G2. Other Android +smartphones or tablets may vary slightly in appearance. -Click the screen button on the phone to bring up the start menu for "All apps" -and scroll to and select :guilabel:`Play Store` seen at the top right of the -image. +Open the :guilabel:`Google Play Store` app and search for OpenLP, and you will +find :guilabel:`OpenLP - Remote 2`. As an alternative use `this link +`_ to go to +the apps page in Google Play Store. Now install the app. -.. image:: pics/droid_all_apps.png +.. image:: pics/droid_start.png -Once selected you will be taken to the Google Play main screen. - -.. image:: pics/droid_play.png - -Click on the hardware magnifying glass or the magnifying glass on the top right -and type in :kbd:`openlp` and select it. - -.. image:: pics/droid_find.png - -Once selected, this screen will appear and you will select OpenLP. - -.. image:: pics/droid_free.png - -Click on :guilabel:`Install` - -.. image:: pics/droid_install.png - -The next page shows the Permissions you will need to accept to continue the -download. Click on :guilabel:`Accept & download`. - -.. image:: pics/droid_accept.png - -The downloading progress bar will appear verifying you are downloading the app. - -.. image:: pics/droid_downloading.png - -Once the install is complete you will see a window where you can :guilabel:`Open` -OpenLP for use. You will also find the OpenLP icon in your application menu. - -.. image:: pics/droid_open.png +You can now start the app and when you do you will see the startup screen. Android application settings ---------------------------- @@ -54,44 +26,44 @@ Android application settings After the installation is complete and you open the OpenLP Android application you will need to configure your preferences and settings. -.. image:: pics/droid_configure.png +.. image:: pics/droid_right_menu.png -Text Size Type -^^^^^^^^^^^^^^ +Open the settings by opening the menu in the top right corner and choosing +:guilabel:`Settings`. This will show the preferences. -Clicking on :guilabel:`Text Size Type` will bring up a selection to choose your -desired font size for the application display. +Display Text Size +^^^^^^^^^^^^^^^^^ -.. image:: pics/droid_text.png +.. image:: pics/droid_preferences1.png -.. _droid_blank: +**Select display text size:** + This allows you to change the font size for the application display. -Display Blank Type +Auto center display +^^^^^^^^^^^^^^^^^^^ + +**Allow displays to auto center:** + Check this box to allow the selected item to scroll to the centre of the + list. + +Set Custom Timeout ^^^^^^^^^^^^^^^^^^ -Using the display blank type gives you the ability to blank your screen to the -methods described below. You can find out more about this feature and how it -operates on the main computer at :ref:`blank_control`. +In general the OpenLP Android application will work fine without having to +change the custom timeout settings. If you experience connection issues or are +having trouble staying connected, you can change these settings. -**Screen:** - Choosing this option will blank your projector to black as if it were shut - off. +.. image:: pics/droid_preferences2.png -**Theme:** - Choosing this option will show your blank theme only, without lyrics or - verses. If you are blanking a song with an assigned theme it will blank to - that theme. If no theme is assigned or you are blanking a presentation or - image, it will blank to the global theme. +**Enable Custom Timeout:** + Check this box to enable setting a custom timeout. -**Desktop:** - Choosing this option will show your desktop wallpaper or a program that you - have open on the extended monitor or projector. You can seamlessly switch - between the desktop wallpaper or a program and OpenLP by Blank to Desktop. +**Connection Timeout:** + Once Custom Timeout has been enabled you can set a custom connection timeout + here. -.. image:: pics/droid_blank_type.png - -Server -^^^^^^ +Server Details +^^^^^^^^^^^^^^ You will need to configure the server settings you will use with your phone. You can find these instructions and settings in the OpenLP desktop application @@ -100,160 +72,131 @@ under :ref:`remote_tab`. **Note:** To use the Android application you will need to be on the same network as the main computer. -Select the :guilabel:`Server` button and enter the :guilabel:`Serve on IP address` -found in :ref:`remote_tab`. After entering the IP address in the box select -:guilabel:`OK` +**Hostname or IP:** + Enter the :guilabel:`Server on IP address` found in :ref:`remote_tab`. After + entering the IP address in the box select :guilabel:`OK` -.. image:: pics/droid_server.png +**Port:** + Enter the :guilabel:`Port number` found in :ref:`remote_tab` and enter it in + the box. By default this is 4316. After entering the port number select + :guilabel:`OK`. -The next step is to enter the port number. Select :guilabel:`Port`. Use the -:guilabel:`Port number` found in :ref:`remote_tab` and enter it in the box. -After entering the port number select :guilabel:`OK`. +**Use HTTPS:** + This specifies if HTTPS should be used. **Note:** To use HTTPS you must + setup OpenLP to be secure, see :ref:`secure_server`. -.. image:: pics/droid_port.png +**Username:** + Here you can enter a username used for accessing OpenLP remotely. This + must be the same as set in :ref:`user_auth`. -Custom Timeout -^^^^^^^^^^^^^^ +**Password:** + Here you can enter a password used for accessing OpenLP remotely. This + must be the same as set in :ref:`user_auth`. -In general the OpenLP Android application will work fine without having to -change the custom timeout settings. If you experience connection issues or are -having trouble staying connected, you can change these settings. Select the box -next to :guilabel:`Enable Custom Timeouts`. - -.. image:: pics/droid_connection.png - -Connection Timeout -^^^^^^^^^^^^^^^^^^ - -If you are having trouble connecting please double check your settings first and -be sure you did not type any extra characters or spaces. If your settings are -correct and you are still having trouble, you can increase the -:guilabel:`Connection Timeout` settings and try again. - -.. image:: pics/droid_connection_timeout.png - -Socket Timeout -^^^^^^^^^^^^^^ - -If you are having trouble maintaining a connection you can increase the timeout -settings here. - -.. image:: pics/droid_socket_timeout.png - -When you are happy with your settings you can press the back button on your -phone to check for connection. Make sure OpenLP is running on the main computer. -If you were successful in your setup you will see the OpenLP application running. - -If you need to change or adjust your settings you can always press your hardware -menu button on your phone while OpenLP is running and selecting -:guilabel:`Settings` and it will take you back to the configuration screen. Using OpenLP Android Application -------------------------------- -After you have completed the setup you will be on the main page with six buttons. +After you have completed the setup you are now ready to use the app. Touch the +menu button in the top left corner to see the list of views the app supports. -.. image:: pics/droid_settings_return1.png +.. image:: pics/droid_left_menu.png -Service -^^^^^^^ +Service List +^^^^^^^^^^^^ -Selecting the :guilabel:`Service` button will take you to the Service Manager. -Selecting an item with a short press in the service will immediately take it +Selecting :guilabel:`Service List` will take you to the Service Manager. +Selecting an item with a in the service manager will immediately take it live on the projection screen and you will stay on the service screen on your -device. Selecting an item with a long press in the service will immediately take -it live on the projection screen and to the live display on your device. You can -also move up and down through the service items using the :guilabel:`Previous` -and :guilabel:`Next` buttons as shown below. Use your hardware back button to -take you back to the main screen. +device. You can use the arrows buttons shown on the bottom left and right to +move to the next slide inside the item. .. image:: pics/droid_service.png -Slide -^^^^^ +Live List +^^^^^^^^^ -If you selected a service item with multiple verses or images you can change -verses or images by either selecting them with your finger or using the -:guilabel:`Previous` and :guilabel:`Next` buttons. Use your hardware back button -to take you back to the main screen. +Selecting :guilabel:`Live List` will display what ever is in Service Manager +at the time, or what is live at the moment. If there are items in the Service +Manager they will be shown on the left, and the live item will be shown on the +right. You can use the arrows buttons shown on the bottom left and right to move +to the next slide inside the item. -.. image:: pics/droid_slide.png +.. image:: pics/droid_live_list_portrait.png -Live -^^^^ +When using the :guilabel:`Live List` it can be an advantage to use the device in +landscape mode. -Selecting the :guilabel:`Live` button will display what ever is live at the time -from to your Android device. Use your hardware back button -to take you back to the main screen. +.. image:: pics/droid_live_list_landscape.png -Display -^^^^^^^ -Selecting the :guilabel:`Display` button will give you the ability to blank and -unblank your projection screen from your chosen method :ref:`above `. +Stage View +^^^^^^^^^^ -.. image:: pics/droid_blank_button.png +Selecting :guilabel:`Stage View` will display the stage view on your Android +device. See the :ref:`stage_view` section in the manual for a detailed +description. -The title :guilabel:`Blank display to` means your display is live. Touching the -:guilabel:`Blank display to` will blank the projection screen to the chosen -method defined in Settings and the button will change to -:guilabel:`Reset display from`. Touching it again will cycle back to -:guilabel:`Blank display to` unblanking the screen for the live display. +.. image:: pics/droid_stage_view.png -Stage -^^^^^ +Live View +^^^^^^^^^^ -Selecting the :guilabel:`Stage` button will display the stage view on your -Android device. See the :ref:`stage_view` section in the manual for a detailed -description. Use your hardware back button to take you back to the main screen. +Selecting :guilabel:`Live View` will display the live view on your Android +device. See the :ref:`main_view` section in the manual for a detailed +description. -.. image:: pics/droid_stage.png +.. image:: pics/droid_live_view.png Alert ^^^^^ -You can send an alert to the projection screen by entering the text in the box -and clicking on :guilabel:`Send`. The alert will be displayed as you have -it configured in :ref:`configure_alerts`. Use your hardware back button to take -you back to the main screen. +To send an alert to the display, touch the alert button at the top right of the +screen. + +|droid_alert_button| **Alert button** + +You can send an alert to the display by entering the text in the box and +clicking on :guilabel:`Process`. The alert will be displayed as you have it +configured in :ref:`configure_alerts`. .. image:: pics/droid_alert.png -Search ------- -Using the search function gives you the ability to search for a particular media, -add it to the service or display it immediately. +.. _droid_blank: -To use search, press the hardware magnifying glass button on your phone or you -can press the hardware menu button and then select :guilabel:`Search` and you -will be taken to the search screen. +Blank Display +^^^^^^^^^^^^^ -.. image:: pics/droid_search_all1.png +To blank the display, touch the blank button at the top right of the screen. -Enter the text you want to search for in the text box at the top. For this -example we are using the search word "Jesus". You can click the magnifying glass -next to the text box or press the return on your phone keyboard. You will be -presented with a list of media in which your search word was found. +|droid_blank_button| **Blank button** -**Note:** When searching the Bible you must enter the exact name, chapter, -verse or verses. Searching songs will search titles and lyrics with the text -used. +Using the display blank type gives you the ability to blank your screen to the +methods described below. You can find out more about this feature and how it +operates on the main computer at :ref:`blank_control`. -This screen shows the number of instances your searched text is found. +**Show Live:** + Do not blank, or unblank the display. -.. image:: pics/droid_found1.png +**Display Blank:** + Choosing this option will blank your projector to black as if it were shut + off. -As you can see in the example, there are 130 songs with the word "Jesus" in them. -You can scroll through the list of songs until you find the one you want. +**Display Theme:** + Choosing this option will show your blank theme only, without lyrics or + verses. If you are blanking a song with an assigned theme it will blank to + that theme. If no theme is assigned or you are blanking a presentation or + image, it will blank to the global theme. -.. image:: pics/droid_found_select1.png +**Display Desktop:** + Choosing this option will show your desktop wallpaper or a program that you + have open on the extended monitor or projector. You can seamlessly switch + between the desktop wallpaper or a program and OpenLP by Blank to Desktop. -Click on :guilabel:`Add to Service` to add your media to the bottom of the -:ref:`creating_service`. Click on :guilabel:`Send Live` to immediately display -your media on the projection screen. +.. image:: pics/droid_blank.png -.. image:: pics/droid_found_add1.png -When you have completed your search you must press the back button on your phone -to return to the main screen. +.. |droid_alert_button| image:: pics/droid_alert_button.png + +.. |droid_blank_button| image:: pics/droid_blank_button.png diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index b45b05d..5d49c94 100644 --- a/manual/source/bibles.rst +++ b/manual/source/bibles.rst @@ -24,7 +24,7 @@ You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:` You will see the Bible Importer window, click :guilabel:`Next`. -.. image:: pics/bibleimport01.png +.. image:: pics/import_bible_start.png After clicking :guilabel:`Next` you can select from the various types of software that OpenLP will convert Bibles from. Click on the file folder icon to @@ -32,7 +32,7 @@ choose the file(s) of the Bible database you want to import. See the sections below for more information on the different formats that OpenLP will import. Click :guilabel:`Next` to continue. -.. image:: pics/bibleimport02.png +.. image:: pics/import_bible_dropdown.png After selecting your file(s), you'll be asked to fill in the details of the Bible you are importing. Remember to check what information you need to display @@ -42,12 +42,12 @@ copyright notice. Click :guilabel:`Next` to continue. **Note:** You can use one blank space using the space bar in the copyright field to continue if you do not have or need copyright information. -.. image:: pics/bibleimportdetails1.png +.. image:: pics/import_bible_license.png After entering the license details, OpenLP will start to import your Bible. It may take some time to import your Bible so please be patient. -.. image:: pics/bibleimportfinished1.png +.. image:: pics/import_bible_finished.png When the import has finished click :guilabel:`Finish` and you should be ready to use your Bible in OpenLP. @@ -58,6 +58,8 @@ Importing OSIS Bibles Importing OSIS files is very simple. Select OSIS as your import source, select your OSIS Bible file and continue the import process. +.. image:: pics/import_bible_osis.png + **About OSIS Formatted Bibles** The OSIS XML standard was designed to provide a common format for distribution @@ -102,6 +104,8 @@ by right clicking on the downloaded file and select `Extract` or `Extract Here`. Note that some of the bibles on OpenSongs webpage are actually in the Zefania format, which OpenLP can also import, see :ref:`zefaniaimport`. +.. image:: pics/import_bible_opensong.png + After selecting the OpenSong Bibles you want to import, follow the rest of the import process. When the import has finished you should be ready to use your OpenSong Bibles. @@ -119,17 +123,30 @@ as another option and does require an internet connection. To use the web download feature select web download from the import wizard. -You can select from several options of location to download from and also -what Bible translation you need. You will probably want to choose the location -from where you get the best performance or has the translation you need. +.. image:: pics/import_bible_web1.png -.. image:: pics/webbible1.png +First click :guilabel:`Download bible list` to download a list of available +bibles. + +.. image:: pics/import_bible_web2.png + +This will take a few moments depending on your internet connection and load on +the servers. + +.. image:: pics/import_bible_web3.png + +When the download is complete you can select from 3 different sources to +download from: `Crosswalk `_, `BibleServer +`_ and `BibleGateway +`_. From each source there are many Bible +translations available, so there is a good chance that you will find what you +need. You can also select a proxy server if needed from the `Proxy Server` tab. Your -network administrator will know if this is necessary, in most cases this will +network administrator will know if this is necessary. In most cases this will not be needed. -.. image:: pics/webbibleproxy1.png +.. image:: pics/import_bible_web_proxy.png After selecting your download location and the Bible you wish to use, click :guilabel:`Next` to continue the import process. When your import is completed @@ -140,7 +157,7 @@ Importing CSV formatted Bibles If you have a Bible in .csv format OpenLP can import it. If you wish to create a bible in the CSV format yourself the format is documented in the -`OpenLP API documentation `_. +`OpenLP API documentation `_. CSV Bibles will consist of two files a `books` file and a `verse` file. Select CSV from the list of Bible types to import. @@ -148,7 +165,7 @@ Select CSV from the list of Bible types to import. You are now ready to select your .csv files. You will need to select both your books and verse file location. -.. image:: pics/csvimport1.png +.. image:: pics/import_bible_csv.png After you have selected the file locations you can continue with the import process. Once it is complete you should be ready to use your imported CSV Bible. @@ -164,6 +181,8 @@ Find the Bible you would like to import and download the file. The downloaded file is a zip-file from which the Bible must be extracted. This is usually done by right clicking on the downloaded file and select `Extract` or `Extract Here`. +.. image:: pics/import_bible_zefania.png + You can now simply select the extracted file for import and click :guilabel:`Next` to continue the import process. When your import is completed you should now be ready to use the imported Zefania Bible. diff --git a/manual/source/configure.rst b/manual/source/configure.rst index 5fe04a9..1057fb5 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -62,7 +62,7 @@ Background Audio **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 ^^^^^^^^^^^^^^^^^^^ @@ -117,7 +117,7 @@ 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 ^^^^^^^^^^^ @@ -138,6 +138,14 @@ Choose from one of three options for the default use of your theme. 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 ======== @@ -205,6 +213,17 @@ time when saving your service file. technically inclined, there is more information at `Python.org `_. +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** + +|buttons_revert| **Revert:** + Clicking this button will erase your changes and revert to the default data + location. Default Images ^^^^^^^^^^^^^^ @@ -252,8 +271,8 @@ These three settings control service from start to finish. Using this setting makes it possible to use a presentation remote controller. -X11 -^^^ +Display Workarounds +^^^^^^^^^^^^^^^^^^^ **Bypass X11 Window Manager:** Linux and other X users may need to try toggling this flag if the main display @@ -264,11 +283,22 @@ X11 appears to affect different versions and distributions differently, this setting has been added, rather than try and work it out programmatically. +**Use alternating row colors in lists:** + 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: + Players ======= -.. image:: pics/configuremedia.png - +.. image:: pics/configureplayers.png + +Background color +^^^^^^^^^^^^^^^^ +Choose the background color displayed as background for videos with a different +aspect ratio than the display screen + Available Media Players ^^^^^^^^^^^^^^^^^^^^^^^ @@ -287,7 +317,8 @@ players control the following: reputation of being able to handle almost any video or audio format. **Note:** You must have `VLC `_ installed for the -VLC option to be available. +VLC option to be available. On Windows you must install the 32-bit version of VLC. +On Mac OS X you must install the 64-bit version of VLC. Player Order ^^^^^^^^^^^^ @@ -296,6 +327,34 @@ 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: + +Projectors +========== + +.. image:: pics/configureprojectors.png + +Communication Options +^^^^^^^^^^^^^^^^^^^^^ + +The options available are: + +**Connect to projectors on startup:** + Check if you want to attempt to connect to all projectors when OpenLP starts. + +**Socket timeout (seconds):** + Time in seconds to wait for the projector connection. Available options are 2 + to 10 seconds. + +**Poll timeout (seconds):** + How often to poll the projector for status information. Available options are + 2 to 60 seconds. For quicker response on the status icons, set to a lower + value. If you have network congestion, you may need to use a higher value. + +**Source select dialog interface:** + 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: Songs @@ -321,13 +380,21 @@ Songs Mode If this box is not selected, your song edit changes will only be available in the :ref:`creating_service` if you add it again. -**Add missing songs when opening service:** - With this box selected, when you open an order of service created on another +**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 ====== @@ -336,6 +403,10 @@ Bibles 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 @@ -372,6 +443,38 @@ Verse Display **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 ============= @@ -387,6 +490,9 @@ 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 Mac OS X and Windows. On Linux you will +need to install :file:`mupdf` (recommended) or :file:`ghostscript`. + Advanced ^^^^^^^^ @@ -395,6 +501,30 @@ Advanced box on the Presentations toolbar in :ref:`media-manager` 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 ====== @@ -413,6 +543,8 @@ it is resized. Media ===== +.. image:: pics/configuremedia.png + Advanced ^^^^^^^^ @@ -420,7 +552,11 @@ Advanced 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 ====== @@ -438,6 +574,13 @@ Custom Display **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 @@ -464,7 +607,7 @@ Font This setting will determine how long your :ref:`alerts` will be displayed on the screen, in seconds. -**Location:** +**Vertical Align:** Choose the location where you want the alert displayed on the screen, Top, Middle or Bottom. @@ -495,8 +638,8 @@ same network, wired or wireless. .. _non_secure: -Server Settings- Non Secure -^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Server Settings - Non Secure +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. image:: pics/configureremotes.png @@ -523,9 +666,11 @@ Android app. 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 stage view. - -Server Settings- Secure -^^^^^^^^^^^^^^^^^^^^^^^ + +.. _secure_server: + +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 @@ -533,6 +678,8 @@ Generate SSL certificate :ref:`ssl_config`. *Changing from a Secure to Non Secure setup requires a restart of OpenLP.* +.. _user_auth: + User Authentication ^^^^^^^^^^^^^^^^^^^ This option allows the additional security for update functions via the web or diff --git a/manual/source/configure_shortcuts.rst b/manual/source/configure_shortcuts.rst index 6dbe53e..92e97ec 100644 --- a/manual/source/configure_shortcuts.rst +++ b/manual/source/configure_shortcuts.rst @@ -47,8 +47,6 @@ one you can click on |configshortcut| twice. This will remove the shortcut. All Actions that you click on will show either Default or Custom. -.. image:: pics/configure_shortcuts_bottom.png - If you change or add any shortcut the option button for Custom will be selected. Clicking the Default option button will restore the original shortcut. You can also click |clearshortcut| to change it back to default. @@ -63,4 +61,4 @@ save any of your changes click :guilabel:`Cancel` .. |clearshortcut| image:: pics/configure_shortcuts_clear.png -.. |configshortcut| image:: pics/configure_shortcuts_config.png \ No newline at end of file +.. |configshortcut| image:: pics/configure_shortcuts_config.png diff --git a/manual/source/creating_service.rst b/manual/source/creating_service.rst index 53e667b..33ba941 100644 --- a/manual/source/creating_service.rst +++ b/manual/source/creating_service.rst @@ -20,7 +20,7 @@ On the right side of your screen at the top is the Service Manager. Everything you want to display should be in the Service Manager and preferably in the order you want to display it. -.. image:: pics/service_manager.png +.. image:: pics/servicemanager.png .. _new_service: @@ -51,10 +51,7 @@ You can create your service file on a different computer than the projection computer. If a song is not in the projection computer database when you open the saved file OpenLP will automatically import the song into the song database with this option checked here :ref:`config_songs` "Add missing songs when opening -service." If this option is not selected, and the song is not in your database, -you will see a popup when you mouseover the song in the service manager. - -.. image:: pics/service_manager_edit.png +service." You always have the ability to edit the song in the service manager by right clicking on the song and choosing :menuselection:`Edit Item` from the context @@ -94,6 +91,8 @@ Double-click on the verse you want to display live. |live| Send the selected item to Live. +|custom_delete| Remove the 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 details. @@ -124,11 +123,6 @@ it Live and you notice you don't have the correct theme for it, you can right click the item and mouseover :guilabel:`Change Item Theme` and select the theme you want to use. -An easy way to check which theme you are using is to move your mouse cursor over -an item in your service and you will see a popup with the theme being used. - -.. image:: pics/service_manager_theme.png - Moving Through a Service ------------------------ @@ -188,14 +182,16 @@ 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. Once you add your images to the :ref:`media-manager` hold the :kbd:`Ctrl` +reason. You can either create the group in the :ref:`media-manager` 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 click the images they will remain highlighted. When you are done with your selections you can either click the |buttons_add| icon above the images or, click on one of the highlighted images, hold the mouse button and drag them over to the Service Manager side and place them where you need them. -.. image:: pics/service_images.png +.. image:: pics/service_manager_image_group.png Sorting a Group of Images ------------------------- @@ -203,11 +199,11 @@ Sorting a Group of Images If you do not like the order the images are in, right click Images. -.. image:: pics/service_reorder.png +.. image:: pics/service_manager_image_group_right_click.png Left click Reorder Item. -.. image:: pics/service_reorder_service_item.png +.. image:: pics/service_manager_reorder_images.png From this box you will be able to rearrange the order of your images by clicking on one and using the :guilabel:`Up` and :guilabel:`Down` arrows to move it to @@ -220,7 +216,7 @@ 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`. -.. image:: pics/service_add.png +.. image:: pics/service_manager_image_dnd_menu.png If you click :guilabel:`Add New Item` your image will be separate from your group of images as another item at the bottom of the Service. If you click @@ -242,12 +238,12 @@ You can type your note in the box and click :guilabel:`Save`. If you change your mind you can click :guilabel:`Cancel`. Your note will appear as a yellow note on your item. -.. image:: pics/service_note.png +.. image:: pics/service_manager_note_icon.png To view your note move your mouse cursor over the item in your service and you will see a popup with the information you typed in your note. -.. image:: pics/service_manager_noteview.png +.. image:: pics/service_manager_note_hover.png If you need to change your Note or delete it, open it again, delete your text and click :guilabel:`Save` @@ -301,29 +297,29 @@ After adding your media file to the :ref:`creating_service` you can mouseover your file and the popup will show you the play time "Length" in hours, minutes and seconds. -.. image:: pics/service_media_timer.png +.. image:: pics/service_manager_media_hover.png Right click on your media file and left click |service_timer| :guilabel:`Start Time`. -.. image:: pics/service_media_timer_start.png +.. image:: pics/service_manager_media_right_click.png **Item Start and Finish Time** The start and stop time default to the beginning and end of the video. -.. image:: pics/service_media_timer_config.png +.. image:: pics/service_manager_media_times.png Change the hours, minutes and seconds to the times you want your video to begin and end. When you are finished click :guilabel:`Ok` to save your changes or :guilabel:`Cancel` to leave the times as they were originally. When you display your media live it will start and stop with the times you configured. -.. image:: pics/service_media_timer_configend.png +.. image:: pics/service_manager_media_times2.png -After your changes have been saved you can check your start and stop times by +After your changes have been saved you can check your start and stop times by putting your mouse cursor over the media file. -.. image:: pics/service_media_timerend.png +.. image:: pics/service_manager_media_hover2.png .. _blank_control: @@ -331,10 +327,14 @@ Using the "Blank to" Control ---------------------------- On the *Live Controller Bar* in between the Live windows are three options to -Blank your screen. Clicking on the down arrow next to the blank button will show -you your three options. +Blank your screen. Depending on how narrow your slidecontroller is, the three +options will be presented as a dropdown menu in the toolbar. -.. image:: pics/service_blank.png +.. image:: pics/blank_screen_dropdown.png + +Or as three separate buttons in the toolbar. + +.. image:: pics/blank_screen_toolbar.png |slide_blank| **Blank Screen:** Choosing this option will blank your projector to black as if it were shut off. @@ -396,4 +396,4 @@ want to save your file and click :guilabel:`Ok`. .. |SERVICE_OPEN| image:: pics/service_open.png .. |SERVICE_SAVE| image:: pics/service_save.png .. |AUDIO_PAUSE| image:: pics/media_playback_pause.png -.. |BUTTONS_ADD| image:: pics/buttons_add.png \ No newline at end of file +.. |BUTTONS_ADD| image:: pics/buttons_add.png diff --git a/manual/source/dualmonitors.rst b/manual/source/dualmonitors.rst index 31037e8..7aba402 100644 --- a/manual/source/dualmonitors.rst +++ b/manual/source/dualmonitors.rst @@ -83,6 +83,26 @@ different configuration window will appear. To change the resolution of the screens you will have to click :guilabel:`Advanced display settings`. +**Recommendations** + +Windows 8 and 10 have several features that might seem smart on a normal desktop +but which is not something that should be enabled when you want to use the +computer for presenting songs, etc. during a service. + +.. image:: pics/task-bar-properties-win8.png + +Right click the task bar and choose :guilabel:`Properties`. You should uncheck +:guilabel:`Use Peek to preview...` since it will totally blank the 2nd display +if hovering mouse over an icon on the taskbar. You should also uncheck +:guilabel:`Show taskbar on all displays`. + +.. image:: pics/task-bar-right-click-win10.png + +If you use Windows 10 you should probably also hide the :guilabel:`Task View` +button from the taskbar, since clicking it will blank your 2nd display. To +disable it, right click the taskbar, and uncheck :guilabel:`Show Task View +button`. + .. _win7monitor: Windows 7 @@ -129,20 +149,14 @@ assumes you have properly set up any proprietary drivers if needed. You should seek out your distributions documentation if this general guide does not work. -**Note to Ubuntu 11.04 Users:** Ubuntu 11.04 uses the new Unity interface. It -is recommended to use the *Classic Desktop* option. OpenLP and other -applications requiring dual monitors may not work well with Unity due to issues -experienced by other users with the Unity interface. - -GNOME 2 -^^^^^^^ - -This guide is for users of the GNOME 2 desktop who do not use proprietary -drivers. From most distros go to :menuselection:`System --> Preferences --> -Display Settings (Monitors)`. Set up your projector with the correct resolution -and make sure that :guilabel:`Same image on all monitors` is **unchecked**. - -.. image:: pics/gnome.png +**Note to Ubuntu Users:** Standard Ubuntu uses the Unity interface. +Unfortunately we cannot recommend using Unity for a dual display setup with +OpenLP, since there seems to be no reliable way to hide the menubar from the +secondary display, as well as other issues. Instead we recommend using a +different desktop environment like GNOME, KDE or Xfce, all of which are +available from the Ubuntu repositories, and via special Ubuntu variants, such as +`Ubuntu GNOME `_, `Kubuntu `_ or +`Xubuntu `_. GNOME 3 ^^^^^^^ @@ -150,16 +164,25 @@ GNOME 3 This guide is for users of the GNOME 3 or GNOME Shell desktop who do not use proprietary drivers. In GNOME shell in the search box type *Displays* or in GNOME shell or fall back mode go to :menuselection:`Applications --> System Tools --> System Settings` -then select Displays. Set up your projector with the correct resolution and -make sure that :guilabel:`Mirror displays` is **unchecked** +then select Displays. .. image:: pics/gnome3displays.png -If after setting up your monitors you have the top panel on the wrong monitor -simply drag it to the monitor you want to serve as the primary screen. +By clicking on each of the displays listed you can change the mode, resolution +and orientation of the displays. + +.. image:: pics/gnome3displaysettings.png + +Make sure to put the display you plan to use for presenting to be the +:guilabel:`Secondary Display`. .. image:: pics/gnome3drag.png +Back in the :guilabel:`Displays` window, click :guilabel:`Arrange Combined +Displays` to arrange the displays. +If after setting up your monitors you have the top panel on the wrong monitor +simply drag it to the monitor you want to serve as the primary screen. + KDE ^^^ @@ -167,16 +190,44 @@ This guide is for users of the KDE desktop who do not use proprietary drivers. From most distros click the Kick Off menu and navigate to :guilabel:`System Settings` -.. image:: pics/kdesystemsettings.png +.. image:: pics/kde5systemsettings.png -Click on the display and monitor icon. +Click on the :guilabel:`Display and Monitor` icon. -.. image:: pics/kdedisplay.png +.. image:: pics/kde5display.png From here you will need to set up your projector with the appropriate resolution, and position. OpenLP works best projecting to the monitor on the right. +.. _xfce4display: + +Xfce4 +^^^^^ + +This guide is for users of the Xfce4 desktop. Open the Xfce4 menu and chose +:guilabel:`Settings Manager`. + +.. image:: pics/xfce4-settings.png + +Open :guilabel:`Display` to open the settings for displays. + +.. image:: pics/xfce4-display.png + +If the second display has not yet been enabled, enable it by selecting it in the +window and tick `Use this display`. + +There is an issue with the Xfce4 compositor that makes OpenLP freeze when using +a dual monitor setup. This issue can be worked around by disabling an option for +the compositor. To do this open :guilabel:`Settings Manager` and open +:guilabel:`Window Manager Tweaks`. + +.. image:: pics/xfce4-win-manager-tweaks-comp.png + +Go to the :guilabel:`Compositor` tab and disable :guilabel:`Display fullscreen +overlay windows directly`. Click :guilabel:`Close` and now OpenLP should run +without issues. + Linux Systems Using nVidia Drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -277,3 +328,23 @@ connect your projector and enter:: **Note** it has been reported that when this issue is occurring you will not want to connect your projector until your desktop is running. + + +Mac OS X +-------- + +This short guide will tell users of Mac OS X how to setup dual displays. + +.. image:: pics/mac-os-x-system-menu.png + +Open :guilabel:`System Preferences` in the Apple menu. + +.. image:: pics/mac-os-x-settings.png + +Choose the :guilabel:`Displays` option. + +.. image:: pics/mac-os-x-display-settings.png + +Click :guilabel:`Arrangement` in the top of the window. Make sure that +:guilabel:`Mirror Displays` is unchecked. You can now arrange the displays as +you wish. diff --git a/manual/source/export_songs.rst b/manual/source/export_songs.rst index 39e7d28..a6b5528 100644 --- a/manual/source/export_songs.rst +++ b/manual/source/export_songs.rst @@ -40,11 +40,6 @@ When you are finished with your selection click :guilabel:`Next`. **Note:** Exporting songs will create a file for each song, If you export one hundred songs, you will have have one hundred individual files. -.. image:: pics/export_song_process.png - -Shows the progress of exporting the songs. - .. image:: pics/export_song_complete.png Click :guilabel:`Finish` to complete the export process. - diff --git a/manual/source/faq.rst b/manual/source/faq.rst index 12c7d1a..bfb17b0 100644 --- a/manual/source/faq.rst +++ b/manual/source/faq.rst @@ -151,7 +151,7 @@ The Bible plugin has a `Import Wizard` which can import Bibles from a variety of sources. The following sources are supported: CSV - The format is documented in the `OpenLP API documentation `_. + The format is documented in the `OpenLP API documentation `_. OSIS An XML format for Bible. You can export Bibles from the `Sword Project `_ @@ -404,16 +404,10 @@ phonon-backend-vlc may also be worth trying on some systems. Windows & Mac OS X ^^^^^^^^^^^^^^^^^^ -Phonon should already be set up properly. If you are still having issues, let the +Phonon should already be set up properly. If you are still having issues see +:ref:`t-no-media` in the Troubleshooting section. If that does not work, let the developers know. -There are no menu icons in OpenLP ---------------------------------- - -This may affect (only) Linux users with XFCE or Gnome. To solve the problem, -follow the instructions on `this bug report `_. - - MP3's and other audio formats do not work ----------------------------------------- @@ -430,6 +424,19 @@ monitor resolution and avoiding shadows and outline text will help. We are hoping a future release of the toolkit we are using (QtWebKit) will help improve this, but there is no timeframe at present. +Why do live backgrounds not work in OpenLP 2.2 on Windows & Mac OS X +-------------------------------------------------------------------- + +Due to changes in one of the underlying frameworks that OpenLP uses (Qt4), +live backgrounds do not work in OpenLP 2.2. This will be fixed in OpenLP 2.4. + +Why do playback of linked audio not work in OpenLP 2.2 on Mac OS X +------------------------------------------------------------------ + +Due to changes in one of the underlying frameworks that OpenLP uses (Qt4), +playback of linked audio does not work in OpenLP 2.2. This will be fixed in +OpenLP 2.4. + Features ======== diff --git a/manual/source/glossary.rst b/manual/source/glossary.rst index f8db127..31b43c3 100644 --- a/manual/source/glossary.rst +++ b/manual/source/glossary.rst @@ -133,4 +133,12 @@ Theme Manager The theme manager is where themes are created and edited. Themes are the text styles and backgrounds that you use to personalize your services. -.. image:: pics/thememanager.png +.. image:: pics/theme_manager_main.png + + +Projector Manager +----------------- + +The :ref:`projector` is where you can manage and control projectors. + +.. image:: pics/projector_manager_list.png diff --git a/manual/source/install_linux.rst b/manual/source/install_linux.rst index 46ab548..52de413 100644 --- a/manual/source/install_linux.rst +++ b/manual/source/install_linux.rst @@ -13,59 +13,19 @@ Installation of OpenLP on Ubuntu can either be done through the Software Center or the command line. Command line instructions will be included at the end of this section on Ubuntu and its variants. -Ubuntu 12.04 or later -^^^^^^^^^^^^^^^^^^^^^^^^^ +OpenLP 2.2 supports Ubuntu 14.04 or later versions. There is currently an older +version of OpenLP available in the official Ubuntu repositories, which can be +found using the Software Center, but to get OpenLP 2.2 it is necessary to add +the OpenLP Personal Package Archive (PPA) to your system. -If you are using Ubuntu 12.10 or a more recent version then OpenLP is -included in the standard distribution. If you are using Ubuntu 12.04 then -OpenLP has been added to the backports packages and so is available -with the appropriate setting below. - -Open up the software center by clicking on the :guilabel:`Software Center` icon -in the Launcher if you are using the Unity desktop, or if you are using an -older version of Ubuntu, or the Classic Desktop go to :menuselection:`Applications` -and select the Software Center from the bottom of the menu. You will need to -be the administrator of the system to install OpenLP and will be asked for the -administrator password several times through this process. - -If using Ubuntu 12.04 then when you have the Software Center running you need to -turn on support for backports. From the menu choose Edit/Software Sources and -then the "Updates" tab. Now make sure that "Unsupported Updates -(precise-backports) is ticked. Then click :guilabel:`close`. - -.. image:: pics/ubuntu-backports.png - -Next in any of these versions simply search for OpenLP in the Software Center -and click :guilabel:`Install`. - -.. image:: pics/4searchopenlp.png - -You will see the install progress as OpenLP and the dependencies required for -it to run are downloaded. - -.. image:: pics/5installprogressubuntu.png - -After installation you should see that OpenLP is installed. - -.. image:: pics/6installcompleteubuntu.png - -You can now run OpenLP by either searching for it in the *Dash*, or clicking on -the category *Media Apps* in Unity. If you are running the Classic Desktop you -will have OpenLP available by clicking -:menuselection:`Applications --> Sound and Video --> OpenLP` - -Ubuntu older than 12.04 -^^^^^^^^^^^^^^^^^^^^^^^^ - -In older versions of Ubuntu you will first need to add the -OpenLP Personal Package Archive (PPA) to your system. +Ubuntu, Ubuntu GNOME, Xubuntu +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Open up the software center using :menuselection:`Applications` and select the Software Center from the bottom of the menu. You will need to be the administrator of the system to install OpenLP and will be asked for the administrator password several times through this process. - Then go to :menuselection:`Edit --> Software Sources` .. image:: pics/1softwaresources.png @@ -104,7 +64,7 @@ will have OpenLP available by clicking :menuselection:`Applications --> Sound and Video --> OpenLP` Kubuntu -------- +^^^^^^^ From the Kickoff Menu click :guilabel:`System Settings` Then click on :guilabel:`Software Management`. @@ -160,22 +120,10 @@ menu. .. image:: pics/kubuntuopenlplaunch.png Ubuntu Command Line Install ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If you are using Ubuntu 12.10 or a more recent version then OpenLP is included -in the standard distribution. To Install OpenLP open a terminal and type:: - - user@ubuntu:~$ sudo apt-get install openlp - -OpenLP should now be available in your desktop's menu system, but if you wish -to run OpenLP from the command line type:: - - user@ubuntu:~$ openlp - -If you are using an older Ubuntu that does not include OpenLP in the standard -distribution then the following install procedure should work across all Ubuntu -variants. First you will need to add the Personal Package Archive (PPA) to -Ubuntu's software sources. From a terminal type:: +First you will need to add the Personal Package Archive (PPA) to Ubuntu's +software sources. From a terminal type:: user@ubuntu:~$ sudo add-apt-repository ppa:openlp-core/release @@ -192,12 +140,18 @@ to run OpenLP from the command line type:: user@ubuntu:~$ openlp -Fedora (GNOME) --------------- +Fedora +------ + +To install OpenLP on Fedora follow the instructions below. The instructions +describes how to do the install when using GNOME, KDE or the command line. **Note** When installing OpenLP you will need to have administrator privileges. You will be asked for the administrator password to install. +Fedora (GNOME) +^^^^^^^^^^^^^^ + Installing with Fedora you will use the default Add/Remove Programs available from :menuselection:`System --> Administration --> Add/Remove Programs` in Fedora 14 and below or in :menuselection:`Applications --> System Tools --> @@ -229,10 +183,7 @@ later. OpenLP will be available in :menuselection:`Applications --> Sound & Video --> OpenLP` Fedora (KDE) ------------- - -**Note** when installing OpenLP you will need to have administrator privileges. -You will be asked for the administrator password to install. +^^^^^^^^^^^^ From the Kickoff open *Software Management*. Type OpenLP into the search box. Then click :guilabel:`Find by name` or press :kbd:`Enter`. @@ -254,7 +205,7 @@ install notification, or from the Kickoff menu. .. image:: pics/4fedoracompleted.png Fedora Command Line Install ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ To install OpenLP from the command line type:: @@ -269,9 +220,15 @@ Linux Mint ---------- The following instructions are for a standard Linux Mint install. These -instructions will not work with Linux Mint Debian Edition. If your are running -Linux Mint without the standard desktop please see the :ref:`mint-command` -install instructions. +instructions will not work with Linux Mint Debian Edition. Most users should +be able to follow the instructions for :ref:`mint-softman`, but if your are +running Linux Mint without the standard desktop please see the +:ref:`mint-command` install instructions. + +.. _mint-softman: + +Software Manager Install +^^^^^^^^^^^^^^^^^^^^^^^^ The administrator password will be required several times during the installation. To install OpenLP open the Software Manager from the Mint Menu. @@ -317,7 +274,7 @@ from the *Sound and Video* section of the Mint Menu. .. _mint-command: Linux Mint Command Line Install -------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You will need to add the Personal Package Archive (PPA) to Linux Mint's software sources. From a terminal type:: diff --git a/manual/source/install_windows_mac.rst b/manual/source/install_windows_mac.rst index 585faf2..1cd2620 100644 --- a/manual/source/install_windows_mac.rst +++ b/manual/source/install_windows_mac.rst @@ -2,7 +2,7 @@ Installing OpenLP on Microsoft Windows ====================================== Installing OpenLP is identical over all supported versions of Windows. After -downloading the file from the `download page `_ +downloading the file from the `website `_ open the file by double clicking when the download is complete. After opening the downloaded file agree to open the unverified file if you are prompted. On Windows 8 you might have to click :guilabel:`More info` before you can @@ -63,22 +63,23 @@ Privacy Settings to run OpenLP. Click the Apple icon and open System Preferences -.. image:: pics/gatekeeper1.png +.. image:: pics/mac-os-x-system-menu.png Open the Security & Privacy settings -.. image:: pics/gatekeeper2.png +.. image:: pics/mac-os-x-settings.png Change the setting from Mac App Store to Anywhere. If the settings are grayed out click on the lock in the lower lefthand corner of the settings window to enable editing. -.. image:: pics/gatekeeper3.png +.. image:: pics/mac-os-x-security-and-privacy.png -I you have not already downloaded the correct file from the OpenLP -`download page `_, download it now. -Then double click on the .dmg file. Drag the OpenLP icon over to the Applications -folder and you will be ready to use OpenLP. OpenLP will be available in your -Applications folder. +If you have not already downloaded the correct file from the OpenLP +`website `_, download it now. Then double click on the +.dmg file. This will open a window with two icons: An OpenLP icon and an +Applications Folder icon. To install OpenLP, simply drag the OpenLP icon over to +the Applications folder icon and you will be ready to use OpenLP. OpenLP will be +available in your Applications folder. -.. image:: pics/osxinstall.png +.. image:: pics/mac-os-x-dnd-install.png diff --git a/manual/source/mediamanager.rst b/manual/source/mediamanager.rst index 5b3cd61..e44e653 100644 --- a/manual/source/mediamanager.rst +++ b/manual/source/mediamanager.rst @@ -90,6 +90,9 @@ to find Bible verses and add them to the :ref:`g-service-manager`. Toolbar ^^^^^^^ +|buttons_edit| **Edit the selected 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 :ref:`import_bibles` page. @@ -140,7 +143,7 @@ The following options are available on the quick search tab: A detailed description of the format and how it is parsed by OpenLP can be read `In the OpenLP API documentation - `_. + `_. If an invalid format is used for a search a popup window will show the examples also shown above. @@ -252,6 +255,16 @@ 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, an error message will be generated. +In :ref:`presentation_configure` configuration it is possible to enable +:guilabel:`Allow presentation application to be overridden`, which shows a +dropdown box which gives you the option to select the presentation application +you want to use. The default is :guilabel:`Automatic`, but you can choose any +available presentation application. Note that this can lead to unexpected +behavior if the application chosen is not compatible with the presentation. + +.. image:: pics/media_manager_presentation_select.png + + Images ------ @@ -263,6 +276,11 @@ media item. The images media item shows a list of imported images. Toolbar ^^^^^^^ +|buttons_image_new_group| **Add group:** + 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 in OpenLP. @@ -290,6 +308,12 @@ Toolbar **Notes:** Right-clicking on an image will display some of the same options. +.. image:: pics/images_select_image_group.png + +When an image is added to the mediamanager, 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`. + Images can be dragged from the desktop (or any folder) into the Images 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, @@ -304,14 +328,24 @@ 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. **Note:** On some computers OpenLP has trouble displaying videos. Please read -the `Frequently Asked Questions `_ for tips on how -to resolve these issues. +the :ref:`troubleshooting` for tips on how to resolve these issues. .. image:: pics/mediamanager_media.png 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. + +.. 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. @@ -346,6 +380,13 @@ 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, an error message will be generated. +In :ref:`media_configure` configuration it is possible to enable +:guilabel:`Allow media player to be overridden`, which shows a dropdown box +which gives you the option to select the media player you want to use. The +default is :guilabel:`Automatic`, but you can choose any available player. + +.. image:: pics/media_manager_media_select.png + Custom Slides ------------- @@ -409,6 +450,10 @@ same options. .. |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 + .. |SEARCH_SONG| image:: pics/search_song.png .. |SEARCH_TITLE| image:: pics/search_title.png diff --git a/manual/source/menu_items.rst b/manual/source/menu_items.rst index 4f273cd..38d0ffc 100644 --- a/manual/source/menu_items.rst +++ b/manual/source/menu_items.rst @@ -41,6 +41,9 @@ File **Song:** Import your songs previously exported. :ref:`import_songs` + **CCLI SongSelect:** + Import your songs from CCLI SongSelect. :ref:`import_songs` + **Bible:** Import Bibles from another program, the internet or a previously exported Bible from OpenLP. :ref:`import_bibles` @@ -85,6 +88,9 @@ Clicking on any of the next items will hide or show its respective panel. |button_mediamanager| **Media Manager:** Hide or show :ref:`media-manager`. +|button_projectormanager| **Projector Manager:** + Hide or show :ref:`projector`. + |button_servicemanager| **Service Manager:** Hide or show :ref:`creating_service`. @@ -119,6 +125,9 @@ If anything is deleted in this folder it is not recoverable through OpenLP. Changing screen resolution can have an affect on theme images. Use this to correct the images. +**Find Duplicate Songs:** + Start wizard for detecting and removing duplicate songs. + |plugin_songs| **Re-index Songs:** This rebuilds the internal song indexes to make them work following code corrections. You would generally use this after a software upgrade. @@ -197,4 +206,6 @@ Help .. |BUTTON_MEDIAMANAGER| image:: pics/button_mediamanager.png -.. |BUTTON_SERVICEMANAGER| image:: pics/button_servicemanager.png \ No newline at end of file +.. |BUTTON_SERVICEMANAGER| image:: pics/button_servicemanager.png + +.. |BUTTON_PROJECTORMANAGER| image:: pics/button_projector_manager.png diff --git a/manual/source/pics/backup_data_folder.png b/manual/source/pics/backup_data_folder.png index 4faf61e..30c7222 100644 Binary files a/manual/source/pics/backup_data_folder.png and b/manual/source/pics/backup_data_folder.png differ diff --git a/manual/source/pics/backup_export.png b/manual/source/pics/backup_export.png index bcf3b7f..c454872 100644 Binary files a/manual/source/pics/backup_export.png and b/manual/source/pics/backup_export.png differ diff --git a/manual/source/pics/backup_export_settings.png b/manual/source/pics/backup_export_settings.png index c5d6216..11a277f 100644 Binary files a/manual/source/pics/backup_export_settings.png and b/manual/source/pics/backup_export_settings.png differ diff --git a/manual/source/pics/backup_folders_all.png b/manual/source/pics/backup_folders_all.png index b697368..6bf13bc 100644 Binary files a/manual/source/pics/backup_folders_all.png and b/manual/source/pics/backup_folders_all.png differ diff --git a/manual/source/pics/backup_import.png b/manual/source/pics/backup_import.png index 1034a11..b57a3c2 100644 Binary files a/manual/source/pics/backup_import.png and b/manual/source/pics/backup_import.png differ diff --git a/manual/source/pics/backup_import_restart.png b/manual/source/pics/backup_import_restart.png index 9d79805..96c3059 100644 Binary files a/manual/source/pics/backup_import_restart.png and b/manual/source/pics/backup_import_restart.png differ diff --git a/manual/source/pics/backup_import_settings.png b/manual/source/pics/backup_import_settings.png index 44cb668..59e538c 100644 Binary files a/manual/source/pics/backup_import_settings.png and b/manual/source/pics/backup_import_settings.png differ diff --git a/manual/source/pics/backup_import_sure.png b/manual/source/pics/backup_import_sure.png index 01007a4..812cb23 100644 Binary files a/manual/source/pics/backup_import_sure.png and b/manual/source/pics/backup_import_sure.png differ diff --git a/manual/source/pics/bibleimport01.png b/manual/source/pics/bibleimport01.png deleted file mode 100644 index be8bdfb..0000000 Binary files a/manual/source/pics/bibleimport01.png and /dev/null differ diff --git a/manual/source/pics/bibleimport02.png b/manual/source/pics/bibleimport02.png deleted file mode 100644 index d713b3b..0000000 Binary files a/manual/source/pics/bibleimport02.png and /dev/null differ diff --git a/manual/source/pics/bibleimportdetails1.png b/manual/source/pics/bibleimportdetails1.png deleted file mode 100644 index 519c369..0000000 Binary files a/manual/source/pics/bibleimportdetails1.png and /dev/null differ diff --git a/manual/source/pics/blank_screen_dropdown.png b/manual/source/pics/blank_screen_dropdown.png new file mode 100644 index 0000000..09ed29a Binary files /dev/null and b/manual/source/pics/blank_screen_dropdown.png differ diff --git a/manual/source/pics/blank_screen_toolbar.png b/manual/source/pics/blank_screen_toolbar.png new file mode 100644 index 0000000..a1b65c0 Binary files /dev/null and b/manual/source/pics/blank_screen_toolbar.png differ diff --git a/manual/source/pics/button_image_new_group.png b/manual/source/pics/button_image_new_group.png new file mode 100644 index 0000000..ae2e0f8 Binary files /dev/null and b/manual/source/pics/button_image_new_group.png differ diff --git a/manual/source/pics/button_media_optical.png b/manual/source/pics/button_media_optical.png new file mode 100644 index 0000000..5890416 Binary files /dev/null and b/manual/source/pics/button_media_optical.png differ diff --git a/manual/source/pics/button_projector_manager.png b/manual/source/pics/button_projector_manager.png new file mode 100644 index 0000000..770fa57 Binary files /dev/null and b/manual/source/pics/button_projector_manager.png differ diff --git a/manual/source/pics/configure_shortcuts_bottom.png b/manual/source/pics/configure_shortcuts_bottom.png deleted file mode 100644 index 9f29cf8..0000000 Binary files a/manual/source/pics/configure_shortcuts_bottom.png and /dev/null differ diff --git a/manual/source/pics/configure_shortcuts_main.png b/manual/source/pics/configure_shortcuts_main.png index 2e0922c..87ab3be 100644 Binary files a/manual/source/pics/configure_shortcuts_main.png and b/manual/source/pics/configure_shortcuts_main.png differ diff --git a/manual/source/pics/configureadvanced.png b/manual/source/pics/configureadvanced.png index 7ad7680..5c40101 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 4f7f268..24728ab 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 9afbb28..4ba427e 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 1755e85..87ebbe7 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 f316364..f0b6e2c 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 e6cf73c..f7e1f09 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 1b57695..0d97f9c 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 new file mode 100644 index 0000000..05f37bf Binary files /dev/null and b/manual/source/pics/configureplayers.png differ diff --git a/manual/source/pics/configurepresentations.png b/manual/source/pics/configurepresentations.png index a663c60..8687114 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 new file mode 100644 index 0000000..128e4a4 Binary files /dev/null and b/manual/source/pics/configureprojectors.png differ diff --git a/manual/source/pics/configureremotes.png b/manual/source/pics/configureremotes.png index bb682f0..7da12b9 100644 Binary files a/manual/source/pics/configureremotes.png and b/manual/source/pics/configureremotes.png differ diff --git a/manual/source/pics/configuresongs.png b/manual/source/pics/configuresongs.png index 34da956..165f50a 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 f56ea76..2e3a512 100644 Binary files a/manual/source/pics/configurethemes.png and b/manual/source/pics/configurethemes.png differ diff --git a/manual/source/pics/csvimport1.png b/manual/source/pics/csvimport1.png deleted file mode 100644 index 9a4214a..0000000 Binary files a/manual/source/pics/csvimport1.png and /dev/null differ diff --git a/manual/source/pics/droid_alert.png b/manual/source/pics/droid_alert.png index 0befb71..ed99479 100644 Binary files a/manual/source/pics/droid_alert.png and b/manual/source/pics/droid_alert.png differ diff --git a/manual/source/pics/droid_alert_button.png b/manual/source/pics/droid_alert_button.png new file mode 100644 index 0000000..6b61381 Binary files /dev/null and b/manual/source/pics/droid_alert_button.png differ diff --git a/manual/source/pics/droid_blank.png b/manual/source/pics/droid_blank.png new file mode 100644 index 0000000..cb1744b Binary files /dev/null and b/manual/source/pics/droid_blank.png differ diff --git a/manual/source/pics/droid_blank_button.png b/manual/source/pics/droid_blank_button.png index 6dc09a9..6402de2 100644 Binary files a/manual/source/pics/droid_blank_button.png and b/manual/source/pics/droid_blank_button.png differ diff --git a/manual/source/pics/droid_left_menu.png b/manual/source/pics/droid_left_menu.png new file mode 100644 index 0000000..9aa307e Binary files /dev/null and b/manual/source/pics/droid_left_menu.png differ diff --git a/manual/source/pics/droid_live_list_landscape.png b/manual/source/pics/droid_live_list_landscape.png new file mode 100644 index 0000000..e982890 Binary files /dev/null and b/manual/source/pics/droid_live_list_landscape.png differ diff --git a/manual/source/pics/droid_live_list_portrait.png b/manual/source/pics/droid_live_list_portrait.png new file mode 100644 index 0000000..8e2b6a1 Binary files /dev/null and b/manual/source/pics/droid_live_list_portrait.png differ diff --git a/manual/source/pics/droid_live_view.png b/manual/source/pics/droid_live_view.png new file mode 100644 index 0000000..ff2dce7 Binary files /dev/null and b/manual/source/pics/droid_live_view.png differ diff --git a/manual/source/pics/droid_preferences1.png b/manual/source/pics/droid_preferences1.png new file mode 100644 index 0000000..fed8925 Binary files /dev/null and b/manual/source/pics/droid_preferences1.png differ diff --git a/manual/source/pics/droid_preferences2.png b/manual/source/pics/droid_preferences2.png new file mode 100644 index 0000000..f4a0276 Binary files /dev/null and b/manual/source/pics/droid_preferences2.png differ diff --git a/manual/source/pics/droid_right_menu.png b/manual/source/pics/droid_right_menu.png new file mode 100644 index 0000000..d02a8cd Binary files /dev/null and b/manual/source/pics/droid_right_menu.png differ diff --git a/manual/source/pics/droid_service.png b/manual/source/pics/droid_service.png index b2ae28a..6f8ce29 100644 Binary files a/manual/source/pics/droid_service.png and b/manual/source/pics/droid_service.png differ diff --git a/manual/source/pics/droid_stage_view.png b/manual/source/pics/droid_stage_view.png new file mode 100644 index 0000000..f6fe5f5 Binary files /dev/null and b/manual/source/pics/droid_stage_view.png differ diff --git a/manual/source/pics/droid_start.png b/manual/source/pics/droid_start.png new file mode 100644 index 0000000..6fc882e Binary files /dev/null and b/manual/source/pics/droid_start.png differ diff --git a/manual/source/pics/export_song_complete.png b/manual/source/pics/export_song_complete.png index d71b52e..0436c34 100644 Binary files a/manual/source/pics/export_song_complete.png and b/manual/source/pics/export_song_complete.png differ diff --git a/manual/source/pics/export_song_directory.png b/manual/source/pics/export_song_directory.png index 2e6ea71..f21fb19 100644 Binary files a/manual/source/pics/export_song_directory.png and b/manual/source/pics/export_song_directory.png differ diff --git a/manual/source/pics/export_song_select.png b/manual/source/pics/export_song_select.png index 53f56b6..dff2616 100644 Binary files a/manual/source/pics/export_song_select.png and b/manual/source/pics/export_song_select.png differ diff --git a/manual/source/pics/export_song_welcome.png b/manual/source/pics/export_song_welcome.png index fa0928d..b9cbdcb 100644 Binary files a/manual/source/pics/export_song_welcome.png and b/manual/source/pics/export_song_welcome.png differ diff --git a/manual/source/pics/finishedimport.png b/manual/source/pics/finishedimport.png index 90d9d20..b9d9686 100644 Binary files a/manual/source/pics/finishedimport.png and b/manual/source/pics/finishedimport.png differ diff --git a/manual/source/pics/gnome3displays.png b/manual/source/pics/gnome3displays.png index 7c41f52..6304eee 100644 Binary files a/manual/source/pics/gnome3displays.png and b/manual/source/pics/gnome3displays.png differ diff --git a/manual/source/pics/gnome3displaysettings.png b/manual/source/pics/gnome3displaysettings.png new file mode 100644 index 0000000..145256a Binary files /dev/null and b/manual/source/pics/gnome3displaysettings.png differ diff --git a/manual/source/pics/gnome3drag.png b/manual/source/pics/gnome3drag.png index 2222fee..471235b 100644 Binary files a/manual/source/pics/gnome3drag.png and b/manual/source/pics/gnome3drag.png differ diff --git a/manual/source/pics/images_add_group.png b/manual/source/pics/images_add_group.png new file mode 100644 index 0000000..73b99df Binary files /dev/null and b/manual/source/pics/images_add_group.png differ diff --git a/manual/source/pics/images_select_image_group.png b/manual/source/pics/images_select_image_group.png new file mode 100644 index 0000000..ddd7ac7 Binary files /dev/null and b/manual/source/pics/images_select_image_group.png differ diff --git a/manual/source/pics/import_bible_csv.png b/manual/source/pics/import_bible_csv.png new file mode 100644 index 0000000..3f7c475 Binary files /dev/null and b/manual/source/pics/import_bible_csv.png differ diff --git a/manual/source/pics/import_bible_dropdown.png b/manual/source/pics/import_bible_dropdown.png new file mode 100644 index 0000000..3a61e32 Binary files /dev/null and b/manual/source/pics/import_bible_dropdown.png differ diff --git a/manual/source/pics/import_bible_finished.png b/manual/source/pics/import_bible_finished.png new file mode 100644 index 0000000..21820ac Binary files /dev/null and b/manual/source/pics/import_bible_finished.png differ diff --git a/manual/source/pics/import_bible_license.png b/manual/source/pics/import_bible_license.png new file mode 100644 index 0000000..24223ab Binary files /dev/null and b/manual/source/pics/import_bible_license.png differ diff --git a/manual/source/pics/import_bible_opensong.png b/manual/source/pics/import_bible_opensong.png new file mode 100644 index 0000000..f76e61b Binary files /dev/null and b/manual/source/pics/import_bible_opensong.png differ diff --git a/manual/source/pics/import_bible_osis.png b/manual/source/pics/import_bible_osis.png new file mode 100644 index 0000000..a6a6afe Binary files /dev/null and b/manual/source/pics/import_bible_osis.png differ diff --git a/manual/source/pics/import_bible_start.png b/manual/source/pics/import_bible_start.png new file mode 100644 index 0000000..f58a557 Binary files /dev/null and b/manual/source/pics/import_bible_start.png differ diff --git a/manual/source/pics/import_bible_web1.png b/manual/source/pics/import_bible_web1.png new file mode 100644 index 0000000..2195e3c Binary files /dev/null and b/manual/source/pics/import_bible_web1.png differ diff --git a/manual/source/pics/import_bible_web2.png b/manual/source/pics/import_bible_web2.png new file mode 100644 index 0000000..2246d08 Binary files /dev/null and b/manual/source/pics/import_bible_web2.png differ diff --git a/manual/source/pics/import_bible_web3.png b/manual/source/pics/import_bible_web3.png new file mode 100644 index 0000000..055769e Binary files /dev/null and b/manual/source/pics/import_bible_web3.png differ diff --git a/manual/source/pics/import_bible_web_proxy.png b/manual/source/pics/import_bible_web_proxy.png new file mode 100644 index 0000000..e56fe56 Binary files /dev/null and b/manual/source/pics/import_bible_web_proxy.png differ diff --git a/manual/source/pics/import_bible_zefania.png b/manual/source/pics/import_bible_zefania.png new file mode 100644 index 0000000..032b9d7 Binary files /dev/null and b/manual/source/pics/import_bible_zefania.png differ diff --git a/manual/source/pics/kde5display.png b/manual/source/pics/kde5display.png new file mode 100644 index 0000000..4450d5e Binary files /dev/null and b/manual/source/pics/kde5display.png differ diff --git a/manual/source/pics/kde5systemsettings.png b/manual/source/pics/kde5systemsettings.png new file mode 100644 index 0000000..2062d79 Binary files /dev/null and b/manual/source/pics/kde5systemsettings.png differ diff --git a/manual/source/pics/mac-os-x-display-settings.png b/manual/source/pics/mac-os-x-display-settings.png new file mode 100644 index 0000000..a2e31a9 Binary files /dev/null and b/manual/source/pics/mac-os-x-display-settings.png differ diff --git a/manual/source/pics/mac-os-x-dnd-install.png b/manual/source/pics/mac-os-x-dnd-install.png new file mode 100644 index 0000000..c0b2cbe Binary files /dev/null and b/manual/source/pics/mac-os-x-dnd-install.png differ diff --git a/manual/source/pics/mac-os-x-security-and-privacy.png b/manual/source/pics/mac-os-x-security-and-privacy.png new file mode 100644 index 0000000..589b223 Binary files /dev/null and b/manual/source/pics/mac-os-x-security-and-privacy.png differ diff --git a/manual/source/pics/mac-os-x-settings.png b/manual/source/pics/mac-os-x-settings.png new file mode 100644 index 0000000..184261e Binary files /dev/null and b/manual/source/pics/mac-os-x-settings.png differ diff --git a/manual/source/pics/mac-os-x-system-menu.png b/manual/source/pics/mac-os-x-system-menu.png new file mode 100644 index 0000000..6cfc626 Binary files /dev/null and b/manual/source/pics/mac-os-x-system-menu.png differ diff --git a/manual/source/pics/media_manager_media_select.png b/manual/source/pics/media_manager_media_select.png new file mode 100644 index 0000000..726baca Binary files /dev/null and b/manual/source/pics/media_manager_media_select.png differ diff --git a/manual/source/pics/media_manager_presentation_select.png b/manual/source/pics/media_manager_presentation_select.png new file mode 100644 index 0000000..dd1d161 Binary files /dev/null and b/manual/source/pics/media_manager_presentation_select.png differ diff --git a/manual/source/pics/mediamanager_bibles.png b/manual/source/pics/mediamanager_bibles.png index 0d6ae44..f91dcb2 100644 Binary files a/manual/source/pics/mediamanager_bibles.png and b/manual/source/pics/mediamanager_bibles.png differ diff --git a/manual/source/pics/mediamanager_bibles_advanced.png b/manual/source/pics/mediamanager_bibles_advanced.png index 3eb73f4..413fdad 100644 Binary files a/manual/source/pics/mediamanager_bibles_advanced.png and b/manual/source/pics/mediamanager_bibles_advanced.png differ diff --git a/manual/source/pics/mediamanager_bibles_find.png b/manual/source/pics/mediamanager_bibles_find.png index 4e34775..4aa7c25 100644 Binary files a/manual/source/pics/mediamanager_bibles_find.png and b/manual/source/pics/mediamanager_bibles_find.png differ diff --git a/manual/source/pics/mediamanager_bibles_quick.png b/manual/source/pics/mediamanager_bibles_quick.png index 55e924e..db4b23b 100644 Binary files a/manual/source/pics/mediamanager_bibles_quick.png and b/manual/source/pics/mediamanager_bibles_quick.png differ diff --git a/manual/source/pics/mediamanager_bibles_results.png b/manual/source/pics/mediamanager_bibles_results.png index 43c5b64..64118f1 100644 Binary files a/manual/source/pics/mediamanager_bibles_results.png and b/manual/source/pics/mediamanager_bibles_results.png differ diff --git a/manual/source/pics/mediamanager_custom.png b/manual/source/pics/mediamanager_custom.png index 16cd546..ccf7159 100644 Binary files a/manual/source/pics/mediamanager_custom.png and b/manual/source/pics/mediamanager_custom.png differ diff --git a/manual/source/pics/mediamanager_custom_edit.png b/manual/source/pics/mediamanager_custom_edit.png index 0e467d9..af47ef8 100644 Binary files a/manual/source/pics/mediamanager_custom_edit.png and b/manual/source/pics/mediamanager_custom_edit.png differ diff --git a/manual/source/pics/mediamanager_images.png b/manual/source/pics/mediamanager_images.png index 9f98df5..3920396 100644 Binary files a/manual/source/pics/mediamanager_images.png and b/manual/source/pics/mediamanager_images.png differ diff --git a/manual/source/pics/mediamanager_media.png b/manual/source/pics/mediamanager_media.png index ae3edd9..0be1022 100644 Binary files a/manual/source/pics/mediamanager_media.png and b/manual/source/pics/mediamanager_media.png differ diff --git a/manual/source/pics/mediamanager_presentations.png b/manual/source/pics/mediamanager_presentations.png index e280d2e..56033f8 100644 Binary files a/manual/source/pics/mediamanager_presentations.png and b/manual/source/pics/mediamanager_presentations.png differ diff --git a/manual/source/pics/mediamanager_songs.png b/manual/source/pics/mediamanager_songs.png index c65e0fc..b214d85 100644 Binary files a/manual/source/pics/mediamanager_songs.png and b/manual/source/pics/mediamanager_songs.png differ diff --git a/manual/source/pics/mediamanager_songs_search.png b/manual/source/pics/mediamanager_songs_search.png index 791142d..5c2763f 100644 Binary files a/manual/source/pics/mediamanager_songs_search.png and b/manual/source/pics/mediamanager_songs_search.png differ diff --git a/manual/source/pics/preview.png b/manual/source/pics/preview.png index c47037c..3dca465 100644 Binary files a/manual/source/pics/preview.png and b/manual/source/pics/preview.png differ diff --git a/manual/source/pics/printservice1.png b/manual/source/pics/printservice1.png index 3a428d0..0dde68e 100644 Binary files a/manual/source/pics/printservice1.png and b/manual/source/pics/printservice1.png differ diff --git a/manual/source/pics/printservice2.png b/manual/source/pics/printservice2.png index 6df9aaf..3544ecf 100644 Binary files a/manual/source/pics/printservice2.png and b/manual/source/pics/printservice2.png differ diff --git a/manual/source/pics/printservice3.png b/manual/source/pics/printservice3.png index d22278f..e048346 100644 Binary files a/manual/source/pics/printservice3.png and b/manual/source/pics/printservice3.png differ diff --git a/manual/source/pics/projector_add_new.png b/manual/source/pics/projector_add_new.png index d00cf1e..5e7cbd8 100644 Binary files a/manual/source/pics/projector_add_new.png and b/manual/source/pics/projector_add_new.png differ diff --git a/manual/source/pics/projector_item_connected_cooldown.png b/manual/source/pics/projector_item_connected_cooldown.png index 554a2ed..bf91c2f 100644 Binary files a/manual/source/pics/projector_item_connected_cooldown.png and b/manual/source/pics/projector_item_connected_cooldown.png differ diff --git a/manual/source/pics/projector_item_connected_off.png b/manual/source/pics/projector_item_connected_off.png index 3a9368d..d6574c0 100644 Binary files a/manual/source/pics/projector_item_connected_off.png and b/manual/source/pics/projector_item_connected_off.png differ diff --git a/manual/source/pics/projector_item_connected_warmup.png b/manual/source/pics/projector_item_connected_warmup.png index 554a2ed..bf91c2f 100644 Binary files a/manual/source/pics/projector_item_connected_warmup.png and b/manual/source/pics/projector_item_connected_warmup.png differ diff --git a/manual/source/pics/projector_item_not_connected.png b/manual/source/pics/projector_item_not_connected.png index ade17c7..1a1cd5b 100644 Binary files a/manual/source/pics/projector_item_not_connected.png and b/manual/source/pics/projector_item_not_connected.png differ diff --git a/manual/source/pics/projector_item_power_on.png b/manual/source/pics/projector_item_power_on.png index b02c2f1..6d3718d 100644 Binary files a/manual/source/pics/projector_item_power_on.png and b/manual/source/pics/projector_item_power_on.png differ diff --git a/manual/source/pics/projector_item_view.png b/manual/source/pics/projector_item_view.png index 960e0d5..9af11a7 100644 Binary files a/manual/source/pics/projector_item_view.png and b/manual/source/pics/projector_item_view.png differ diff --git a/manual/source/pics/projector_manager.png b/manual/source/pics/projector_manager.png index 1f5b2ba..24db1ad 100644 Binary files a/manual/source/pics/projector_manager.png and b/manual/source/pics/projector_manager.png differ diff --git a/manual/source/pics/projector_manager_list.png b/manual/source/pics/projector_manager_list.png index d4af5c7..f2047f0 100644 Binary files a/manual/source/pics/projector_manager_list.png and b/manual/source/pics/projector_manager_list.png differ diff --git a/manual/source/pics/projector_multiple_selection.png b/manual/source/pics/projector_multiple_selection.png index 784ba74..b4dbde3 100644 Binary files a/manual/source/pics/projector_multiple_selection.png and b/manual/source/pics/projector_multiple_selection.png differ diff --git a/manual/source/pics/projector_source_edit_tabbed.png b/manual/source/pics/projector_source_edit_tabbed.png index 96ccaef..017ec1e 100644 Binary files a/manual/source/pics/projector_source_edit_tabbed.png and b/manual/source/pics/projector_source_edit_tabbed.png differ diff --git a/manual/source/pics/projector_source_select_tabbed.png b/manual/source/pics/projector_source_select_tabbed.png index d103132..6d18b45 100644 Binary files a/manual/source/pics/projector_source_select_tabbed.png and b/manual/source/pics/projector_source_select_tabbed.png differ diff --git a/manual/source/pics/rerunwizard.png b/manual/source/pics/rerunwizard.png index 49a7a10..c01b0e6 100644 Binary files a/manual/source/pics/rerunwizard.png and b/manual/source/pics/rerunwizard.png differ diff --git a/manual/source/pics/select_formatting.png b/manual/source/pics/select_formatting.png index 20429ce..16e592d 100644 Binary files a/manual/source/pics/select_formatting.png and b/manual/source/pics/select_formatting.png differ diff --git a/manual/source/pics/select_media_clip.png b/manual/source/pics/select_media_clip.png new file mode 100644 index 0000000..9a8a6df Binary files /dev/null and b/manual/source/pics/select_media_clip.png differ diff --git a/manual/source/pics/select_text.png b/manual/source/pics/select_text.png index 1a81461..e7f9d54 100644 Binary files a/manual/source/pics/select_text.png and b/manual/source/pics/select_text.png differ diff --git a/manual/source/pics/selectsongs.png b/manual/source/pics/selectsongs.png index 32acc0a..ce1bcc3 100644 Binary files a/manual/source/pics/selectsongs.png and b/manual/source/pics/selectsongs.png differ diff --git a/manual/source/pics/service_item_notes.png b/manual/source/pics/service_item_notes.png index 765128c..0f27734 100644 Binary files a/manual/source/pics/service_item_notes.png and b/manual/source/pics/service_item_notes.png differ diff --git a/manual/source/pics/service_manager_image_dnd_menu.png b/manual/source/pics/service_manager_image_dnd_menu.png new file mode 100644 index 0000000..26a2d6f Binary files /dev/null and b/manual/source/pics/service_manager_image_dnd_menu.png differ diff --git a/manual/source/pics/service_manager_image_group.png b/manual/source/pics/service_manager_image_group.png new file mode 100644 index 0000000..92c55a8 Binary files /dev/null and b/manual/source/pics/service_manager_image_group.png differ diff --git a/manual/source/pics/service_manager_image_group_right_click.png b/manual/source/pics/service_manager_image_group_right_click.png new file mode 100644 index 0000000..a3037e4 Binary files /dev/null and b/manual/source/pics/service_manager_image_group_right_click.png differ diff --git a/manual/source/pics/service_manager_media_hover.png b/manual/source/pics/service_manager_media_hover.png new file mode 100644 index 0000000..ec8eac2 Binary files /dev/null and b/manual/source/pics/service_manager_media_hover.png differ diff --git a/manual/source/pics/service_manager_media_hover2.png b/manual/source/pics/service_manager_media_hover2.png new file mode 100644 index 0000000..2055ca3 Binary files /dev/null and b/manual/source/pics/service_manager_media_hover2.png differ diff --git a/manual/source/pics/service_manager_media_right_click.png b/manual/source/pics/service_manager_media_right_click.png new file mode 100644 index 0000000..0280827 Binary files /dev/null and b/manual/source/pics/service_manager_media_right_click.png differ diff --git a/manual/source/pics/service_manager_media_times.png b/manual/source/pics/service_manager_media_times.png new file mode 100644 index 0000000..9baf20e Binary files /dev/null and b/manual/source/pics/service_manager_media_times.png differ diff --git a/manual/source/pics/service_manager_media_times2.png b/manual/source/pics/service_manager_media_times2.png new file mode 100644 index 0000000..8d01fa8 Binary files /dev/null and b/manual/source/pics/service_manager_media_times2.png differ diff --git a/manual/source/pics/service_manager_note_hover.png b/manual/source/pics/service_manager_note_hover.png new file mode 100644 index 0000000..52b8631 Binary files /dev/null and b/manual/source/pics/service_manager_note_hover.png differ diff --git a/manual/source/pics/service_manager_note_icon.png b/manual/source/pics/service_manager_note_icon.png new file mode 100644 index 0000000..57c2fec Binary files /dev/null and b/manual/source/pics/service_manager_note_icon.png differ diff --git a/manual/source/pics/service_manager_reorder_images.png b/manual/source/pics/service_manager_reorder_images.png new file mode 100644 index 0000000..35dde3f Binary files /dev/null and b/manual/source/pics/service_manager_reorder_images.png differ diff --git a/manual/source/pics/service_timer.png b/manual/source/pics/service_timer.png index 27b9d2b..da1f94b 100644 Binary files a/manual/source/pics/service_timer.png and b/manual/source/pics/service_timer.png differ diff --git a/manual/source/pics/service_timer_select.png b/manual/source/pics/service_timer_select.png index 1b06d9a..6870557 100644 Binary files a/manual/source/pics/service_timer_select.png and b/manual/source/pics/service_timer_select.png differ diff --git a/manual/source/pics/servicemanager.png b/manual/source/pics/servicemanager.png index 00f6b21..1356e22 100644 Binary files a/manual/source/pics/servicemanager.png and b/manual/source/pics/servicemanager.png differ diff --git a/manual/source/pics/slidecontroller.png b/manual/source/pics/slidecontroller.png index 34174be..d746716 100644 Binary files a/manual/source/pics/slidecontroller.png and b/manual/source/pics/slidecontroller.png differ diff --git a/manual/source/pics/song_edit_author_maintenance.png b/manual/source/pics/song_edit_author_maintenance.png index 56b5550..00acad2 100644 Binary files a/manual/source/pics/song_edit_author_maintenance.png and b/manual/source/pics/song_edit_author_maintenance.png differ diff --git a/manual/source/pics/song_edit_authors.png b/manual/source/pics/song_edit_authors.png index cd4c9a6..aee1051 100644 Binary files a/manual/source/pics/song_edit_authors.png and b/manual/source/pics/song_edit_authors.png differ diff --git a/manual/source/pics/song_edit_clone.png b/manual/source/pics/song_edit_clone.png index 3298b0c..db8217d 100644 Binary files a/manual/source/pics/song_edit_clone.png and b/manual/source/pics/song_edit_clone.png differ diff --git a/manual/source/pics/song_edit_copy.png b/manual/source/pics/song_edit_copy.png index 75fad75..e92737c 100644 Binary files a/manual/source/pics/song_edit_copy.png and b/manual/source/pics/song_edit_copy.png differ diff --git a/manual/source/pics/song_edit_linked.png b/manual/source/pics/song_edit_linked.png index 90aca98..d12f26a 100644 Binary files a/manual/source/pics/song_edit_linked.png and b/manual/source/pics/song_edit_linked.png differ diff --git a/manual/source/pics/song_edit_lyrics.png b/manual/source/pics/song_edit_lyrics.png index 3a104df..0ce022f 100644 Binary files a/manual/source/pics/song_edit_lyrics.png and b/manual/source/pics/song_edit_lyrics.png differ diff --git a/manual/source/pics/song_edit_maintenance.png b/manual/source/pics/song_edit_maintenance.png index 23bcb62..a80f1a7 100644 Binary files a/manual/source/pics/song_edit_maintenance.png and b/manual/source/pics/song_edit_maintenance.png differ diff --git a/manual/source/pics/song_edit_theme_copyright.png b/manual/source/pics/song_edit_theme_copyright.png index 5b37d23..dcf311d 100644 Binary files a/manual/source/pics/song_edit_theme_copyright.png and b/manual/source/pics/song_edit_theme_copyright.png differ diff --git a/manual/source/pics/song_edit_verse_error.png b/manual/source/pics/song_edit_verse_error.png index 4fa10fe..ba1c1d2 100644 Binary files a/manual/source/pics/song_edit_verse_error.png and b/manual/source/pics/song_edit_verse_error.png differ diff --git a/manual/source/pics/song_edit_verse_in_use.png b/manual/source/pics/song_edit_verse_in_use.png index 655d8ce..9473bd4 100644 Binary files a/manual/source/pics/song_edit_verse_in_use.png and b/manual/source/pics/song_edit_verse_in_use.png differ diff --git a/manual/source/pics/song_edit_verse_type.png b/manual/source/pics/song_edit_verse_type.png index e4cdfa1..c10715e 100644 Binary files a/manual/source/pics/song_edit_verse_type.png and b/manual/source/pics/song_edit_verse_type.png differ diff --git a/manual/source/pics/songimporter.png b/manual/source/pics/songimporter.png index 5175c50..9bf2b62 100644 Binary files a/manual/source/pics/songimporter.png and b/manual/source/pics/songimporter.png differ diff --git a/manual/source/pics/songimporter_zionworx.png b/manual/source/pics/songimporter_zionworx.png index c58addd..5799e43 100644 Binary files a/manual/source/pics/songimporter_zionworx.png and b/manual/source/pics/songimporter_zionworx.png differ diff --git a/manual/source/pics/songimporterchoices.png b/manual/source/pics/songimporterchoices.png index 281ae84..6ede943 100644 Binary files a/manual/source/pics/songimporterchoices.png and b/manual/source/pics/songimporterchoices.png differ diff --git a/manual/source/pics/songs_right_click.png b/manual/source/pics/songs_right_click.png new file mode 100644 index 0000000..5223a05 Binary files /dev/null and b/manual/source/pics/songs_right_click.png differ diff --git a/manual/source/pics/songusage.png b/manual/source/pics/songusage.png index 3c4fb4e..e2cc636 100644 Binary files a/manual/source/pics/songusage.png and b/manual/source/pics/songusage.png differ diff --git a/manual/source/pics/tags_inserted.png b/manual/source/pics/tags_inserted.png index 3755fba..bcc84ae 100644 Binary files a/manual/source/pics/tags_inserted.png and b/manual/source/pics/tags_inserted.png differ diff --git a/manual/source/pics/task-bar-properties-win8.png b/manual/source/pics/task-bar-properties-win8.png new file mode 100644 index 0000000..f4ffc7f Binary files /dev/null and b/manual/source/pics/task-bar-properties-win8.png differ diff --git a/manual/source/pics/task-bar-right-click-win10.png b/manual/source/pics/task-bar-right-click-win10.png new file mode 100644 index 0000000..1128d53 Binary files /dev/null and b/manual/source/pics/task-bar-right-click-win10.png differ diff --git a/manual/source/pics/theme_manager_background.png b/manual/source/pics/theme_manager_background.png index 378adf3..78ab8cf 100644 Binary files a/manual/source/pics/theme_manager_background.png and b/manual/source/pics/theme_manager_background.png differ diff --git a/manual/source/pics/theme_manager_gradient.png b/manual/source/pics/theme_manager_gradient.png index 5c8d47d..b232cba 100644 Binary files a/manual/source/pics/theme_manager_gradient.png and b/manual/source/pics/theme_manager_gradient.png differ diff --git a/manual/source/pics/theme_manager_image.png b/manual/source/pics/theme_manager_image.png index 88cdb14..8389c4e 100644 Binary files a/manual/source/pics/theme_manager_image.png and b/manual/source/pics/theme_manager_image.png differ diff --git a/manual/source/pics/theme_manager_layout.png b/manual/source/pics/theme_manager_layout.png index 23e4683..f247852 100644 Binary files a/manual/source/pics/theme_manager_layout.png and b/manual/source/pics/theme_manager_layout.png differ diff --git a/manual/source/pics/theme_manager_layoutchanged.png b/manual/source/pics/theme_manager_layoutchanged.png index 49df6f7..5a4a41d 100644 Binary files a/manual/source/pics/theme_manager_layoutchanged.png and b/manual/source/pics/theme_manager_layoutchanged.png differ diff --git a/manual/source/pics/theme_manager_main.png b/manual/source/pics/theme_manager_main.png index 27d31d2..c7a8964 100644 Binary files a/manual/source/pics/theme_manager_main.png and b/manual/source/pics/theme_manager_main.png differ diff --git a/manual/source/pics/theme_manager_outputchanged.png b/manual/source/pics/theme_manager_outputchanged.png index 525b66e..0211a10 100644 Binary files a/manual/source/pics/theme_manager_outputchanged.png and b/manual/source/pics/theme_manager_outputchanged.png differ diff --git a/manual/source/pics/theme_manager_selectcolor.png b/manual/source/pics/theme_manager_selectcolor.png index e88da21..7dc8484 100644 Binary files a/manual/source/pics/theme_manager_selectcolor.png and b/manual/source/pics/theme_manager_selectcolor.png differ diff --git a/manual/source/pics/theme_manager_transparent.png b/manual/source/pics/theme_manager_transparent.png new file mode 100644 index 0000000..1a5d4ee Binary files /dev/null and b/manual/source/pics/theme_manager_transparent.png differ diff --git a/manual/source/pics/webbible1.png b/manual/source/pics/webbible1.png deleted file mode 100644 index 6ff1b65..0000000 Binary files a/manual/source/pics/webbible1.png and /dev/null differ diff --git a/manual/source/pics/webbibleproxy1.png b/manual/source/pics/webbibleproxy1.png deleted file mode 100644 index 23ba9ad..0000000 Binary files a/manual/source/pics/webbibleproxy1.png and /dev/null differ diff --git a/manual/source/pics/xfce4-display.png b/manual/source/pics/xfce4-display.png new file mode 100644 index 0000000..9a64d40 Binary files /dev/null and b/manual/source/pics/xfce4-display.png differ diff --git a/manual/source/pics/xfce4-settings.png b/manual/source/pics/xfce4-settings.png new file mode 100644 index 0000000..f4c24ce Binary files /dev/null and b/manual/source/pics/xfce4-settings.png differ diff --git a/manual/source/pics/xfce4-win-manager-tweaks-comp.png b/manual/source/pics/xfce4-win-manager-tweaks-comp.png new file mode 100644 index 0000000..ff49add Binary files /dev/null and b/manual/source/pics/xfce4-win-manager-tweaks-comp.png differ diff --git a/manual/source/projector.rst b/manual/source/projector.rst index 39df5ab..718e0a6 100644 --- a/manual/source/projector.rst +++ b/manual/source/projector.rst @@ -1,8 +1,8 @@ .. _projector: -======================== -Projector Remote Control -======================== +================= +Projector Manager +================= The Projector Manager allows you to remotely control a network-connected projector that conforms to the Japan Business Machine and Information System @@ -10,32 +10,12 @@ Association (JBMIA) PJLink specification. Available in OpenLP v2.2. .. _projector_settings: -Projector Settings ------------------- +Projector Configuration +----------------------- The available projector options can be changed using the main settings menu by going to :guilabel:`Settings` -> :guilabel:`Configure OpenLP` -> :guilabel:`Projectors` tab. - -|projector_settings_tab| - -The options available are: - - Connect to projectors on startup : Check if you want to attempt to connect - to all projectors when OpenLP starts - - Socket timeout (seconds): Time in seconds to wait for the projector connection. - Available options are 2 to 10 seconds. - - Poll timeout (seconds): How often to poll the projector for status information. - Available options are 2 to 60 seconds. For quicker response on the status icons, - set to a lower value. If you have network congestion, you may need to use a higher - value. - - Source select dialog interface: Select whether you want all video source options - on one dialog page or to use tabs to consolidate the inputs based on video group. - -Once you are satisfied with the settings, click on the :guilabel:`OK` button, otherwise click -on the :guilabel:`Cancel` button to ignore changes and close the dialog. +See :ref:`configure_projectors`. .. _projector_manager: @@ -283,7 +263,7 @@ the "Source Select dialog interface" option. NOTE: These images are examples only - what options you will have will vary depending on the projector you have. These images show the default PJLink text. -|projector_source_select_single| |projector_source_select_tabbed| +|projector_source_select_tabbed| .. _projector_video_source_edit: @@ -298,7 +278,7 @@ bring up the source edit dialog box. NOTE: These images are examples only - what options you will have will vary depending on the projector you have. These images show the default PJLink text. -|projector_source_edit_single| |projector_source_edit_tabbed| +|projector_source_edit_tabbed| Once you are satisfied, you can click on the :guilabel:`OK` button to save the changes, or click on the :guilabel:`Cancel` button to discard these changes and continue to use @@ -347,11 +327,8 @@ PJLink defaults. .. |PROJECTOR_POWER_OFF_TILED| image:: pics/projector_power_off_tiled.png .. |PROJECTOR_POWER_ON| image:: pics/projector_power_on.png .. |PROJECTOR_POWER_ON_TILED| image:: pics/projector_power_on_tiled.png -.. |PROJECTOR_SETTINGS_TAB| image:: pics/projector_settings_tab.png .. |PROJECTOR_SHOW| image:: pics/projector_show.png .. |PROJECTOR_SHOW_TILED| image:: pics/projector_show_tiled.png -.. |PROJECTOR_SOURCE_EDIT_SINGLE| image:: pics/projector_source_edit_single.png .. |PROJECTOR_SOURCE_EDIT_TABBED| image:: pics/projector_source_edit_tabbed.png .. |PROJECTOR_SOURCE| image:: pics/projector_hdmi.png -.. |PROJECTOR_SOURCE_SELECT_SINGLE| image:: pics/projector_source_select_single.png .. |PROJECTOR_SOURCE_SELECT_TABBED| image:: pics/projector_source_select_tabbed.png diff --git a/manual/source/songs.rst b/manual/source/songs.rst index 43ed645..ed670c5 100644 --- a/manual/source/songs.rst +++ b/manual/source/songs.rst @@ -28,29 +28,27 @@ Click on the file folder icon to choose the file of the song database you want to import. See the following sections for information on some of the different formats that OpenLP will import. -Importing from OpenLP Version 1 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Importing from OpenLyrics or OpenLP 2.0 Exported Song +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Converting from OpenLP Version 1 is a simple process. First you will -need to locate your version 1 database file. +OpenLyrics is an open format for song lyrics defined at `openlyrics.info +`_, and is the format the OpenLP can export songs to, see +:ref:`export_songs`. -Windows XP:: +.. image:: pics/selectsongs.png - C:\Documents and Settings\All Users\Application Data\openlp.org\Data\songs.olp +To import press :guilabel:`Add Files...` and select the OpenLyrics files. +Then press :guilabel:`Next` to import the files. -Windows Vista / Windows 7:: +Importing from EasyWorship Song Database +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - C:\ProgramData\openlp.org\Data\songs.olp +OpenLP can import the song database from EasyWorship 2007 and 2009. To import +songs from EasyWorship's database you must find and select the file +:file:`Songs.DB`. You will normally find the file in +:file:`C:\\Users\\Public\\Documents\\Softouch\\EasyWorship\\Default\\Databases\\Data\\`. -After clicking :guilabel:`Next` your conversion will be complete. - -.. image:: pics/finishedimport.png - -Press :guilabel:`Finish` and you will now be ready to use your OpenLP -version 1 songs. - -**Note:** To retain a theme assigned to a song, you must import your themes -first. +OpenLP will import all the songs it finds in the database. Importing from OpenSong ^^^^^^^^^^^^^^^^^^^^^^^ @@ -62,8 +60,6 @@ contain files with all your songs in them, without a file extension (file.xxx). When you have located this folder you will need to select the songs from the folder. -.. image:: pics/selectsongs.png - On most operating systems, to select all the songs, first select the first song in the list, press the shift key, and select the last song in the list. After this press :guilabel:`Next` and you will see that your import has been @@ -131,7 +127,7 @@ contain a collection of files such as :file:`Data.tdbd` and C:\Documents and Settings\All Users\ZionWorx\2.6\Data - Default location for ZionWorx 2.6 on Windows Vista / Windows 7:: + Default location for ZionWorx 2.6 on Windows Vista or later:: C:\ProgramData\ZionWorx\2.6\Data @@ -246,6 +242,9 @@ Not all of the verses are in use." .. image:: pics/song_edit_verse_in_use.png +If you have not entered a verse order, you will see a notification in the same +place saying "**Warning:** You have not entered a verse order." + **Clone:** OpenLP gives you the ability to clone a song. This could be useful if you use a different version of the song with slightly different lyrics. Instead @@ -255,7 +254,7 @@ Not all of the verses are in use." To *Clone* a song right-click on the song you would like to duplicate and left- click :guilabel:`Clone`. -.. image:: pics/song_edit_clone.png +.. image:: pics/songs_right_click.png After you click *Clone* you will see the copy of the song with in the title. @@ -300,6 +299,13 @@ asked again, it will be deleted immediately. Select one of seven ways to classify your lyrics. Verse, Chorus, Bridge, Pre-Chorus, Intro, Ending, Other. +**Optional Split:** + Inserts an optional split into the verse. An optional split is used by + OpenLP to improve splitting verses when presenting on a screen where there + is not room for the entire verse on one screen. If an optional split exists, + OpenLP will use it when splitting the verse, otherwise it will simply split + the verse when reaching the end of the screen. + If you have more than one verse, you would number them Verse 1, 2, 3 as needed. If you find the verse has too many lines for your screen, you can edit and shorten the verse and :guilabel:`Add` another slide. diff --git a/manual/source/system_requirements.rst b/manual/source/system_requirements.rst index 1410e46..7367613 100644 --- a/manual/source/system_requirements.rst +++ b/manual/source/system_requirements.rst @@ -14,7 +14,7 @@ on less powerful hardware but you may not get the performance you desire. * For Presentation support: * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007 (not 2010) - or LibreOffice Impress 4 or later + or LibreOffice Impress 4 or later (32 bit) * Linux: LibreOffice Impress 4 or later * Mac: Not supported yet * The Generic Document/Presentation and Songs of Fellowship song import options diff --git a/manual/source/themes.rst b/manual/source/themes.rst index c590f8a..3c05743 100644 --- a/manual/source/themes.rst +++ b/manual/source/themes.rst @@ -57,6 +57,8 @@ displaying unless you want a background color for a border. Using the transparent theme will use whatever wallpaper or background color that your desktop is using for the theme background. +.. image:: /pics/theme_manager_transparent.png + When finished with your selection for background, click the :guilabel:`Next` button. @@ -253,4 +255,4 @@ default. This option is covered in greater detail under :ref:`configure`. .. |THEME_NEW| image:: pics/theme_new.png -.. |BUTTONS_OPEN| image:: pics/buttons_open.png \ No newline at end of file +.. |BUTTONS_OPEN| image:: pics/buttons_open.png diff --git a/manual/source/troubleshooting.rst b/manual/source/troubleshooting.rst index dc53789..71993c9 100644 --- a/manual/source/troubleshooting.rst +++ b/manual/source/troubleshooting.rst @@ -1,3 +1,5 @@ +.. _troubleshooting: + =============== Troubleshooting =============== @@ -7,17 +9,13 @@ Troubleshooting I can not play videos or other media ------------------------------------ -If you can not play video or audio through openlp, there are several areas that -could be an issue. First thing is to make sure you can play the media file -through your default media player. OpenLP should be able to play any file that -you can play through your default media player. +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 +setup VLC as your default player. -If you can play a file through your media player but not on OpenLP it may help -to enable Phonon for multimedia playback. Go to the OpenLP configuration -:menuselection:`Settings --> Configure OpenLP...` and select the Media tab. -Make sure the check box for `Use Phonon for video playback` is checked. - -.. image:: pics/phononcheckbox.png +If you want to use the Phonon player, but it cannot play your media files, you +can look below for how best to set it up. Codecs ^^^^^^ @@ -120,7 +118,7 @@ To enable the plugins navigate to :menuselection:`Settings --> Plugins` or press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you would like to enable and select **active** from the drop down box to the right. -.. image:: pics/plugins.png +.. image:: pics/plugin_list_main.png By default all plugins should be enabled during the first run wizard except the remotes plugin, unless you specify differently. @@ -133,12 +131,6 @@ you can not see this your theme probably has the text size too small for the info to be seen. See the section of the manual on :ref:`themes` if you need more info on text sizes in themes. -I am running Mac OS X and I do not have a presentations plugin --------------------------------------------------------------- - -Due to software limitations with Keynote and OpenOffice Impress, the -presentations plugin on OS X is not currently available. - I am using PowerPoint 2010 or PowerPoint Viewer 2010 and presentations do not work ---------------------------------------------------------------------------------- @@ -201,3 +193,26 @@ image format and yields the best performance. Images should also be sized to the size of your output. For example, if your output screen is 1024x768 you should size your background image to 1024x768 also. OpenLP does not scale images. + +OpenLP crashes on startup on Windows +------------------------------------ + +If Windows is missing a proper driver for the graphics card on the computer, it +might cause OpenLP to crash on startup, resulting in a message saying +:guilabel:`OpenLP has stopped working`. To fix this find, download and install +the newest driver for your graphics card. + +I saved service-files in the servicemanager folder but now they are gone +------------------------------------------------------------------------ + +The `servicemanager` folder which can be found in OpenLP's data folder is used +internally by OpenLP for temporary files and anything in there can and will be +deleted by OpenLP. In general you should not modify or create files in OpenLP's +data folder unless you know what you are doing. + +OpenLP freezes on Xfce4 in a dual monitor setup +----------------------------------------------- + +There is an issue with the Xfce4 compositor that makes OpenLP freeze when using +a dual monitor setup. See configuration of dual monitor for :ref:`xfce4display` +for a solution. diff --git a/batch-drop-shadow.scm b/scripts/batch-drop-shadow.scm similarity index 92% rename from batch-drop-shadow.scm rename to scripts/batch-drop-shadow.scm index 6aaa637..6fbaf80 100644 --- a/batch-drop-shadow.scm +++ b/scripts/batch-drop-shadow.scm @@ -3,7 +3,7 @@ ; ; Place the script in your gimp scripts folder (eg. ~/.gimp-2.8/scripts) go to the ; folder with images you wish to add shadow to and execute like this: - ; gimp --no-data -i -b '(batch-drop-shadow "*.png" 8 8 10)' -b '(gimp-quit 0)' + ; gimp --no-data -i -b '(batch-drop-shadow "*.png" 3 3 5)' -b '(gimp-quit 0)' ; (define (batch-drop-shadow pattern diff --git a/scripts/round-top-corners.scm b/scripts/round-top-corners.scm new file mode 100644 index 0000000..f5658e8 --- /dev/null +++ b/scripts/round-top-corners.scm @@ -0,0 +1,32 @@ + ; Place the script in your gimp scripts folder (eg. ~/.gimp-2.8/scripts) go to the + ; folder with images you wish to round corners on and execute like this: + ; gimp --no-data -i -b '(round-top-corners "*.png")' -b '(gimp-quit 0)' + ; + + (define (round-top-corners pattern) + (let* ((filelist (cadr (file-glob pattern 1)))) + (while (not (null? filelist)) + (let* ((filename (car filelist)) + (image (car (gimp-file-load RUN-NONINTERACTIVE filename filename))) + (width (car (gimp-image-width image))) + (drawable (car (gimp-image-get-active-layer image)))) + ; select 6 pixels in the top left corner and clear them + (gimp-rect-select image 0 0 2 2 REPLACE 0 0) + (gimp-rect-select image 0 2 1 1 ADD 0 0) + (gimp-rect-select image 2 0 1 1 ADD 0 0) + (define cornerselectionleft (car (gimp-image-active-drawable image))) + (gimp-edit-clear cornerselectionleft) + ; select 6 pixels in the top right corner and clear them + (gimp-rect-select image (- width 2) 0 2 2 REPLACE 0 0) + (gimp-rect-select image (- width 3) 0 1 1 ADD 0 0) + (gimp-rect-select image (- width 1) 2 1 1 ADD 0 0) + (define cornerselectionright (car (gimp-image-active-drawable image))) + (gimp-edit-clear cornerselectionright) + (set! drawable (car (gimp-image-merge-visible-layers image 0))) + (gimp-file-save RUN-NONINTERACTIVE image drawable filename filename) + (gimp-image-delete image) + ) + (set! filelist (cdr filelist)) + ) + ) + )