diff --git a/manual/source/creating_service.rst b/manual/source/creating_service.rst index f5bcc13..60e91ce 100644 --- a/manual/source/creating_service.rst +++ b/manual/source/creating_service.rst @@ -9,16 +9,24 @@ under their respective categories. Using the Media Manager you will load new Media, Songs, Images, Bibles, or create a Custom slide as discussed earlier in :ref:`mediamanager`. -On the right side of your screen at the top is the Service Manager. Anything you -want to display should be in the Service Manager and preferably in the order you -want to display it. To add your media you can click on the item, hold and drag -your selection from the Media Manager over to the Service Manager or, after -clicking the media or verse you want to use, click the + sign icon above. This -will add your media to the service side at the bottom. Once it is in the Service -Manager you can click on your item and drag and drop it in the order you want or, -click the item and use the arrow icons below to move it up or down in the order -you want. Note: You always have the option to send any media live direct from -the Media Manager. Please see :ref:`mediamanager` for more details. +.. image:: pics/mediamanager.png + +On the right side of your screen at the top is the Service Manager. + +.. image:: pics/service_manager.png + +Anything you want to display should be in the Service Manager and preferably in +the order you want to display it. To add your media you can click on an item in +the *Media Manager* hold and drag your selection from the Media Manager over to +the *Service Manager* or, after clicking the media or verse you want to use, +click the + sign icon above. This will add your media to the service side at the +bottom. Once it is in the Service Manager you can click on your item and drag +and drop it in the order you want or, click the item and use the arrow icons +below to move it up or down in the order you want. Note: You always have the +option to send any media live direct from the Media Manager. Please see +:ref:`mediamanager` for more details. + +.. image:: pics/service_arrows.png Displaying an Item ------------------ @@ -31,11 +39,13 @@ bottom of the Service Manager. Any of these methods will display your item on the screen. When your item is displayed, it will appear in the Live windows just to the left of the Service Manager. +.. image:: pics/service_live.png + Moving through a Service ------------------------ Once you have your first item displayed live you can move through the service in -a couple of ways. You can double-click on each item you need displayed or, click +a couple of ways. You can double-click on each item you need displayed, or click it once and press enter. If your songs, verses, etc. are in the order you will be displaying them, you can use the :kbd:`Right Arrow` key on your keyboard to move down through your service. Pressing the :kbd:`Left Arrow` key will move up @@ -50,9 +60,13 @@ move through them. When a song or verse is being displayed you will see the lyrics in the top Live window and how it actually appears on your display in the bottom Live window. To change slides you can use your mouse to click on each slide in the top Live window, use the Left Arrow and Right Arrow icons -under the top Live window or, use the :kbd:`Down Arrow` key to move down through -the song or verses. Using the :kbd:`Up Arrow` will move you from bottom to top. -:kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing. +under the top Live window. + +service_live_arrows.png + +You can also use the :kbd:`Down Arrow` key to move down through +the song or verses. Using the :kbd:`Up Arrow` key will move you from bottom to +top. :kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing. Adding a group of Images ------------------------ @@ -66,33 +80,50 @@ you can either click the + 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 + Sorting a group of Images ------------------------- If you do not like the order the images are in, -right click Images and left click Reorder Item. 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 where you want it. If -there is an image you do not want in your order, click on it and then click the -:guilabel:`Delete` button. When you are done arranging your images click -:guilabel:`Save`. If you need to add another image from the Media Manager to -your group of images, left click the image you want to add and hold the mouse -button and drag it over your group of Images and release the mouse button. You -will be given two options, :guilabel:`Add New Item` and :guilabel:`Add to Selected Item`. +right click Images and left click Reorder Item. + +.. image:: pics/service_reorder.png + +.. image:: pics/service_reorder_service_item.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 +where you want it. If there is an image you do not want in your order, click on +it and then click the :guilabel:`Delete` button. When you are done arranging +your images click :guilabel:`Save`. + +If you need to add another image from the Media Manager to your group of images, +left click the image you want to add and hold the mouse button and drag it over +your group of Images and release the mouse button. You will be given two options, +:guilabel:`Add New Item` and :guilabel:`Add to Selected Item`. + +.. image:: pics/service_add.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 -:guilabel:`Add to Selected Item` your image will be added to your group of images. +:guilabel:`Add to Selected Item` your image will be added to your group of +images. Using the Continuous Loop Timer ------------------------------- Once you have a group of images you can easily cycle through them by using the -*Live Controller Bar* timer in between the Live panes. Adjust the time delay for -the seconds in between each image by adjusting the timer. This timer counter is -in seconds. Immediately to the left of the timer is the button to start the -images looping. Click it once to start the continuous loop and once to stop it. -You can also use the keyboard shortcut :kbd:`L` to start and stop the continuous -loop. The timer will also cycle through Bible verses and song lyrics. +*Live Controller Bar* timer in between the Live panes. + +.. image:: pics/service_timer.png + +Adjust the time delay for the seconds in between each image by adjusting the +timer. This timer counter is in seconds. Immediately to the left of the timer is +the button to start the images looping. Click it once to start the continuous +loop and once to stop it. You can also use the keyboard shortcut :kbd:`L` to +start and stop the continuous loop. The timer will also cycle through Bible +verses and song lyrics. Using the "Blank to" Control ---------------------------- @@ -101,6 +132,8 @@ 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. +.. image:: pics/service_blank.png + **Blank Screen** Choosing this option will blank your projector to black as if it were shut off. The shortcut for this option is :kbd:`.` (fullstop/period on your keyboard). @@ -115,9 +148,19 @@ you your three options. 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 one program and OpenLP by Blank to Desktop. The shortcut for this option is :kbd:`D`. + +You can change or add the keyboard shortcuts here +:menuselection:`Settings --> Configure Shortcuts`. -Saving your service -------------------- +New, Open and Saving the service +--------------------------------- + +.. image:: pics/service_save.png + +These three icons at the top of the *Service Manager* will do the following: +The first icon will create a New Service. The second icon will Open an already +created service file. The third icon will Save the service you created, added to +or rearranged. Now that you created your service, tested it and are ready for your worship service, you will want to save your service file. OpenLP will remind you to do diff --git a/manual/source/installation.rst b/manual/source/installation.rst index 21fcfec..32cda07 100644 --- a/manual/source/installation.rst +++ b/manual/source/installation.rst @@ -63,4 +63,116 @@ Applications folder. Linux ----- -Installation process on Linux distributions vary by distribution. See the OpenLP `download page `_ for distribution specific instructions. +Setting up OpenLP varies by distribution. We have included documentation on +popular distributions or distributions that have OpenLP available from their +package managers. It should be possible to get OpenLP running on +nearly any Linux distribution. + +Ubuntu +^^^^^^ + +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. + +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. + +First you will need to add the OpenLP Personal Package Archive (PPA) to +your system. Go to :menuselection:`Edit --> Software Sources` + +.. image:: pics/1softwaresources.png + +Click on the :menuselection:`Other Software` tab then click on the +:guilabel:`Add...` button to add the new software source. + +.. image:: pics/2othersoftware.png + +Add the APT line:: + + ppa:openlp-core/release + +Click :guilabel:`Add Source` + +.. image:: pics/3aptline.png + +You now need to restart the Software Center to refresh the package list. When +you have the Software Center running simply search for OpenLP 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 Command Line Install +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The following install procedure should work across all Ubuntu variants. 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 + +Now you need to refresh the package list:: + + user@ubuntu:~$ sudo apt-get update + +Install OpenLP:: + + user@ubuntu:~$ sudo apt-get install openlp + +OpenLP should now be available in your desktops menu system, but if you wish +to run OpenLP from the command line type:: + + user@ubuntu:~$ openlp + +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 --> +Add/Remove Programs` + +.. image:: pics/1fedoraaddremove.png + +Search for OpenLP in the search box + +.. image:: pics/2fedoraaddremove.png + +Check the check box for OpenLP then click :guilabel:`Apply` + +.. image:: pics/3fedoraaddremove.png + +Click :guilabel:`Continue` to confirm installing any additional software. + +.. image:: pics/4fedoraadditionalconfirm.png + +You should now see the packages downloading in the lower left corner. + +.. image:: pics/5fedoraaddremove.png + +Click :guilabel:`Run` to run OpenLP now, or :guilabel:`Close` to run OpenLP +later. + +.. image:: pics/6fedoracomplete.png + +OpenLP will be available in :menuselection:`Applications --> Sound & Video --> OpenLP` + + diff --git a/manual/source/pics/1fedoraaddremove.png b/manual/source/pics/1fedoraaddremove.png new file mode 100644 index 0000000..52df6ba Binary files /dev/null and b/manual/source/pics/1fedoraaddremove.png differ diff --git a/manual/source/pics/1softwaresources.png b/manual/source/pics/1softwaresources.png new file mode 100644 index 0000000..26f5c47 Binary files /dev/null and b/manual/source/pics/1softwaresources.png differ diff --git a/manual/source/pics/2fedoraaddremove.png b/manual/source/pics/2fedoraaddremove.png new file mode 100644 index 0000000..d70c1c8 Binary files /dev/null and b/manual/source/pics/2fedoraaddremove.png differ diff --git a/manual/source/pics/2othersoftware.png b/manual/source/pics/2othersoftware.png new file mode 100644 index 0000000..937960b Binary files /dev/null and b/manual/source/pics/2othersoftware.png differ diff --git a/manual/source/pics/3aptline.png b/manual/source/pics/3aptline.png new file mode 100644 index 0000000..1611e02 Binary files /dev/null and b/manual/source/pics/3aptline.png differ diff --git a/manual/source/pics/3fedoraaddremove.png b/manual/source/pics/3fedoraaddremove.png new file mode 100644 index 0000000..c26512a Binary files /dev/null and b/manual/source/pics/3fedoraaddremove.png differ diff --git a/manual/source/pics/4fedoraadditionalconfirm.png b/manual/source/pics/4fedoraadditionalconfirm.png new file mode 100644 index 0000000..d59c1e8 Binary files /dev/null and b/manual/source/pics/4fedoraadditionalconfirm.png differ diff --git a/manual/source/pics/4searchopenlp.png b/manual/source/pics/4searchopenlp.png new file mode 100644 index 0000000..61798d8 Binary files /dev/null and b/manual/source/pics/4searchopenlp.png differ diff --git a/manual/source/pics/5fedoraaddremove.png b/manual/source/pics/5fedoraaddremove.png new file mode 100644 index 0000000..646df6a Binary files /dev/null and b/manual/source/pics/5fedoraaddremove.png differ diff --git a/manual/source/pics/5installprogressubuntu.png b/manual/source/pics/5installprogressubuntu.png new file mode 100644 index 0000000..6fd0dcb Binary files /dev/null and b/manual/source/pics/5installprogressubuntu.png differ diff --git a/manual/source/pics/6fedoracomplete.png b/manual/source/pics/6fedoracomplete.png new file mode 100644 index 0000000..35a2001 Binary files /dev/null and b/manual/source/pics/6fedoracomplete.png differ diff --git a/manual/source/pics/6installcompleteubuntu.png b/manual/source/pics/6installcompleteubuntu.png new file mode 100644 index 0000000..ad442e5 Binary files /dev/null and b/manual/source/pics/6installcompleteubuntu.png differ