openlp-core team mailing list archive

[Wesley Stout <wesleystout@xxxxxxxxx>]

Wesley Stout has proposed merging lp:~wesleystout/openlp/documentation into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


hope i fixed some things

-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42287
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.

=== modified file 'documentation/manual/source/dualmonitors.rst'
--- documentation/manual/source/dualmonitors.rst	2010-10-19 18:54:43 +0000
+++ documentation/manual/source/dualmonitors.rst	2010-11-30 19:00:29 +0000
@@ -4,7 +4,7 @@
 
 The first step in getting OpenLP working on your system is to setup your
 computer properly for dual monitors. This is not very difficult, but the steps
-do vary depending on operating system.
+will vary depending on operating system.
 
 Most modern computers do have the ability for dual monitors. To be certain
 check your computer's documentation. A typical desktop computer capable of dual
@@ -18,16 +18,15 @@
 
 .. image:: pics/dvi.png
 
-A laptop computer setup only varies slightly, generally you will need only one
+A laptop computer setup varies only slightly, generally you will need only one
 of outputs pictured above since your laptops screen serves as one of the
-monitors. Sometimes with older laptops a key stroke generally involving the
-:kbd:`Fn` key and another key is required to enable the second monitor on
-laptops.
+monitors. Sometimes older laptops require a key stroke generally involving the
+:kbd:`Fn` key and another key to enable the second monitor on laptops.
 
 Some computers also incorporate the use of :abbr:`S-Video (Separate Video)` or
 :abbr:`HDMI (High-Definition Multimedia Interface)` connections.
 
-A typical OpenLP set up consist of your normal single monitor setup, with your
+A typical OpenLP setup consist of your normal single monitor setup, with your
 projector setup as the second monitor. With the option of extending your
 desktop across the second monitor, or your operating system's equivalent.
 
@@ -46,14 +45,13 @@
 
 The more traditional way is also fairly straight forward. Go to
 :guilabel:`Control Panel` and click on :guilabel:`Display`. This will open up
-the :guilabel:`Display` dialog. You can also bypass this step by right click on
-a blank area on your desktop and selecting :guilabel:`Resolution`.
+the :guilabel:`Display` dialog. You can also bypass this step by right clicking 
+on a blank area on your desktop and selecting :guilabel:`Resolution`.
 
 .. image:: pics/winsevendisplay.png
 
 Then click on the :guilabel:`Adjust resolution` link in the left pane. Enable
-your projector and make sure that the selected value for :guilabel:`Multiple
-displays` is :guilabel:`Extend these displays`.
+your projector and make sure the selected value for :guilabel:`Multiple displays` is :guilabel:`Extend these displays`.
 
 .. image:: pics/winsevenresolution.png
 

=== added file 'documentation/manual/source/pics/addsong.png'
Binary files documentation/manual/source/pics/addsong.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/addsong.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/logo.png'
Binary files documentation/manual/source/pics/logo.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/logo.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/openlp.ico'
Binary files documentation/manual/source/pics/openlp.ico	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/openlp.ico	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor1.png'
Binary files documentation/manual/source/pics/songeditor1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor1.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor11.png'
Binary files documentation/manual/source/pics/songeditor11.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor11.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor2.png'
Binary files documentation/manual/source/pics/songeditor2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor2.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor3.png'
Binary files documentation/manual/source/pics/songeditor3.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor3.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor4.png'
Binary files documentation/manual/source/pics/songeditor4.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor4.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor5.png'
Binary files documentation/manual/source/pics/songeditor5.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor5.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor6.png'
Binary files documentation/manual/source/pics/songeditor6.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor6.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor7.png'
Binary files documentation/manual/source/pics/songeditor7.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor7.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor8.png'
Binary files documentation/manual/source/pics/songeditor8.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor8.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songeditor9.png'
Binary files documentation/manual/source/pics/songeditor9.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songeditor9.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs12.png'
Binary files documentation/manual/source/pics/songs12.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs12.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs13.png'
Binary files documentation/manual/source/pics/songs13.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs13.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs14.png'
Binary files documentation/manual/source/pics/songs14.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs14.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs15.png'
Binary files documentation/manual/source/pics/songs15.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs15.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs16.png'
Binary files documentation/manual/source/pics/songs16.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs16.png	2010-11-30 19:00:29 +0000 differ
=== added file 'documentation/manual/source/pics/songs17.png'
Binary files documentation/manual/source/pics/songs17.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songs17.png	2010-11-30 19:00:29 +0000 differ
=== modified file 'documentation/manual/source/songs.rst'
--- documentation/manual/source/songs.rst	2010-11-27 14:58:27 +0000
+++ documentation/manual/source/songs.rst	2010-11-30 19:00:29 +0000
@@ -97,4 +97,226 @@
 Press :guilabel:`Finish` and you will now be ready to use your songs imported
 from CCLI SongSelect.
 
+Importing from EasyWorship
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To import your songs from EasyWorship you need to find the database file.
+Locate the file here:
+
+Windows Vista / Windows 7::
+
+    C:\ProgramData\Documents\Softouch\EasyWorship\Default\Databases\Data\Songs.DB
+
+Windows XP::
+
+    C:\Documents and Settings\All Users\Documents\Softouch\EasyWorship\Default\atabases\Data\Songs.DB
+
+After selecting your EasyWorship database file click :guilabel:`Next` 
+
+.. image:: pics/finishedimport.png
+
+Once the importer is comlplete click :guilabel:`Finish` your EasyWorship songs
+are now ready to use.
+
+Importing OpenLyrics
+^^^^^^^^^^^^^^^^^^^^
+OpenLyrics is a free, open XML standard for Christian worship songs. The goal
+of OpenLyrics is to provide an application-independant and operating 
+system-independant song format for interoperability between applications.
+
+More info can be found it about OpenLyrics at http://openlyrics.info
+
+Importing OpenLyrics formatted songs is very simple. Select the OpenLyrics 
+files from the OpenLP import window and then click :guilabel:`Next` You can
+also select multiple songs for import at once on most operating systems by 
+selecting the first item in the list then holding shift select the last item in
+the list. When finished you should see that your import has completed. 
+
+.. image:: pics/finishedimport.png
+
+Then click :guilabel:`Finish` and your OpenLyrics songs are now ready to use. 
+
+Importing From Songs of Fellowship
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To import songs from Songs of Fellowship simply select the .rtf file from the 
+book you are wanting to import and click :guilabel:`Next`. This import may take
+some time so be patient, but when completed you should have your Songs of
+Fellowship songs in OpenLP.
+
+.. image:: pics/finishedimport.png
+
+Once the import is completed click :guilabel:`Finish` to use your songs.
+
+Manually Entering New Songs
+===========================
+
+There maybe times when you need to manually need to enter in a new song with 
+out importing. To do this click on the add song icon 
+
+.. image:: pics/addsong.png
+
+This will bring up the song editor window
+
+.. image:: pics/songeditor1.png
+
+Next you will want to add the song title and an alternate title if any
+
+.. image:: pics/songeditor2.png
+
+You are now ready to add verses, choruses, etc to your new song. Do this by 
+clicking the :guilabel:`Add` button.
+
+.. image:: pics/songeditor3.png
+
+Enter your lyrics into the text box, then select the correct `Verse Type` from
+the menu and also enter the correct number.
+
+.. image:: pics/songeditor4.png
+
+When you are satisfied click the :guilabel:`Save` button. Then repeat the 
+process to add additional lyrics.
+
+.. image:: pics/songeditor5.png
+
+When you have all of your lyrics entered then you can optionally enter the
+order of the song to help while projecting the song live. An example would be
+`V1 C1 V2 C1` This would be the order of verse 1 followed by the chorus 
+followed by verse 2 followed by the chorus. 
+
+You are now ready to move on to the :guilabel:`Authors, Topics & Song Book Tab`
+
+.. image:: pics/songeditor6.png
+
+First you will need to add the author(s) to the song. Simply select the author
+from the list and click :guilabel:`Add to Song` If the author is not available
+click on :guilabel:`Manage Authors, Topics, Song Books`
+
+.. image:: pics/songeditor7.png
+
+From the left select from Authors, Topics or Song Books. Click :guilabel:`Authors`
+then click :guilabel:`Add`
+
+.. image:: pics/songeditor8.png
+
+Enter in your authors information then click :guilabel:`Save` Repeat this 
+process to add authors as needed.
+
+Next you will want to add any topics associated with the song or any song book 
+information. To add that info simply follow the same process as adding authors
+from the Authors Topics and Song Books Manager. Topic and song book info is 
+optional and not required but can be very useful to help track songs.
+
+.. image:: pics/songeditor9.png
+
+After you are finished with the Author, Topic, and Song Book info you can now 
+go to the :guilabel:`Theme, Copyright Info & Comments` tab.
+
+.. image:: pics/songeditor11.png
+
+You can now select a theme for the song. If you do not select a theme the
+global theme or service level theme will be used for the song. You can also 
+enter any copyright or CCLI information and also include notes about the song.
+When you are finished you can click :guilabel:`Save` to save the song and make 
+it ready for you to use in your services.
+
+Editing Songs
+^^^^^^^^^^^^^
+
+Editing songs is very similar to adding a new song. First select the song from 
+the songs tab of the Media Manager. Right clikcing and then select :guilabel:`Edit Song`
+
+.. image:: pics/songs12.png
+
+or you can select the song and press the song edit icon
+
+.. image:: pics/songs13.png
+
+This will open up the `Song Editor`. From the `Title & Lyrics` tab you can edit
+the title, alternate title, lyrics and the verse order.
+
+Editing the title and alternate title just require changing the text in the 
+text box.
+
+To edit the lyrics select the verse you want to edit and click the :guilabel:`Edit`
+button.
+
+.. image:: pics/songeditor4.png
+
+You can edit the text of the selected verse and also change the `Verse Type`
+click :guilabel:`Save` when you are satisfied with your changes.
+
+To add a single verse click the :guilabel:`Add` to add a verse and to delete a
+single verse select the verse from the `Lyrics List` and click :guilabel:`Delete`
+
+You can also edit all the lyrics of a song including all verses at once. To do 
+this click :guilabel:`Edit All`
+
+.. image:: pics/songs15.png
+
+This gives you the ability to edit lyrics across all verses. You can also add
+verses by selecting the correct verse type and number and clicking :guilabel:`Insert`
+when you are satisfied with your changes click :guilabel:`Save`.
+
+From the `Authors, Topics, & Song Book` tab you can edit information about the 
+author, add any related topics, or song books.
+
+.. image:: pics/songeditor9.png
+
+To add an author to the song select the author from the drop menu and click
+:guilabel:`Add to Song` to remove an author click on the author and click
+:guilabel:`Remove`. 
+
+To add a topic to the song select the topic from the drop menu and click
+:guilabel:`Add to Song` to remove an topic click on the author and click
+:guilabel:`Remove`. 
+
+You can change the song book by selecting the correct book from the Song Book
+drop menu and entering the correct number into the text box.
+
+If you need to add an author, topic, or song book, click the 
+:guilabel:`Manage Authors, Topics, Song Books` button.
+
+From the left select from Authors, Topics or Song Books. Click :guilabel:`Authors`
+then click :guilabel:`Add`
+
+.. image:: pics/songeditor8.png
+
+Enter in your authors information then click :guilabel:`Save` Repeat this 
+process to add authors as needed.
+
+Next you will want to add any topics associated with the song or any song book 
+information. To add that info simply follow the same process as adding authors
+from the Authors Topics and Song Books Manager. Topic and song book info is 
+optional and not required but can be very useful to help track songs.
+
+After you are finished with the Author, Topic, and Song Book info you can now 
+go to the :guilabel:`Theme, Copyright Info & Comments` tab.
+
+.. image:: pics/songeditor11.png
+
+You can now select a theme for the song. If you do not select a theme the
+global theme or service level theme will be used for the song. You can also 
+enter any copyright or CCLI information and also include notes about the song.
+When you are finished you can click :guilabel:`Save` to save the song and make 
+it ready for you to use in your services.
+
+Deleting Songs
+^^^^^^^^^^^^^^
+
+**Warning -** when you delete a song it can not be recovered. Please be certain
+that you will not need the song again before deleting.
+
+To delete a song select the song.
+
+.. image:: pics/songs16.png
+
+You can delete the song by right clicking the song and selecting delete. Or by 
+slecting the song and pressing the delete icon.
+
+.. image:: pics/songs17.png 
+
+
+
+