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)


added jseagull1's changes, started some on bibles
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/43483
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.

=== added file 'documentation/manual/source/bibles.rst'
--- documentation/manual/source/bibles.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/bibles.rst	2010-12-12 21:48:57 +0000
@@ -0,0 +1,21 @@
+======
+Bibles
+======
+
+Managing bibles in OpenLP is a relatively simple process. There are also 
+converters provided to get data from other formats into OpenLP.
+
+Bible Importer
+==============
+
+If you are using an earlier version of OpenLP or come from another software 
+package, you may be able to convert your existing database to work in OpenLP
+2.0. To access the Bible Importer :menuselection:`File --> Import --> Bible`.
+You will then see the Bible Importer window, then click :guilabel:`Next`.
+
+.. image:: pics/bibleimport1.png
+
+After choosing :guilabel:`Next` you can then select from the various types of 
+software that OpenLP will convert bibles from.
+
+.. image:: pics/bibleimport2.png

=== added file 'documentation/manual/source/configure.rst'
--- documentation/manual/source/configure.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/configure.rst	2010-12-12 21:48:57 +0000
@@ -0,0 +1,76 @@
+==================
+Configuring OpenLP
+==================
+
+OpenLP has many options you can configure to suit your needs. Most options are
+self-explanatory and we will quickly review them.
+
+To configure OpenLP, click on :menuselection:`Settings --> Configure OpenLP...`
+
+There are 9 tabs across the top.
+
+General tab
+============
+
+.. image:: pics/configuregeneral.png
+
+**Monitors**
+
+To select the monitor you want to display OpenLP on, click the drop-down box 
+and choose. 
+
+**Display if a single screen** 
+When this box is ticked, you will be able to see your display on a separate 
+window on the monitor you are using. Click the display and push the Esc button
+on your keyboard to close the display window.
+	
+**Application Startup**
+
+Show blank screen warning: When this box is ticked, you will get a warning when opening OpenLP that the output display has been blanked. You may have blanked it and shut down the program and this will warn you it is still blanked.
+Automatically open the last service:
+When this box is ticked, OpenLP will remember the last service you were working on when you closed the program.
+Show the splash screen:
+When this box it ticked, the OpenLP logo will be displayed in the center of the screen until the program opens. This is useful to know if the program is opening.
+
+**Application Settings**
+
+**Prompt to save before starting a new service**
+
+When this box is ticked, OpenLP will prompt you to save the service you are
+working on before starting a new service.
+
+**Automatically preview next item in service**
+
+When this box is ticked, the next item in the Service Manager will show in the
+Preview pane.
+
+**Slide loop delay** 
+
+This setting is the time delay in seconds if you want to continuously loop
+images, verses, or lyrics. You can also change this setting in between the
+`Live` windows.
+
+**CCLI Details**
+
+**CCLI number** 
+If you subscribe to CCLI, this box is for your License number. This number is
+also displayed in the Footer box.
+
+**SongSelect username** 
+
+Enter your username for SongSelect.
+
+**SongSelect password**
+
+Enter your password for SongSelect. The username and password entries will let 
+you automatically login to SongSelect web site through OpenLP.
+
+**Display Position**
+
+This setting will default to your computer monitor. If your projector display is different, tick the Override display position and make the changes here to match your projector display. This option also comes in handy when you have the Display if a single screen box ticked. You can make the display smaller so it does not cover your whole screen.
+
+Themes tab
+==========
+
+.. image:: pics/configurethemes.png
+

=== 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-12-12 21:48:57 +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,17 +45,18 @@
 
 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
 
+**Note:** Windows 7 Starter Edition does **NOT** support extending your desktop.
+
 Windows Vista
 ^^^^^^^^^^^^^
 
@@ -66,7 +66,7 @@
 .. image:: pics/vistapersonalize.png
 
 From the :guilabel:`Personalization` window click on :guilabel:`Display
-Settings`. Then enable the montior that represents your projector and make sure
+Settings`. Then enable the monitor that represents your projector and make sure
 you have checked :guilabel:`Extend the desktop onto this monitor`.
 
 .. image:: pics/vistadisplaysettings.png

=== modified file 'documentation/manual/source/index.rst'
--- documentation/manual/source/index.rst	2010-12-01 19:55:05 +0000
+++ documentation/manual/source/index.rst	2010-12-12 21:48:57 +0000
@@ -13,9 +13,13 @@
 
    introduction
    glossary
+   quickstart
    dualmonitors
    mediamanager
    songs
+   bibles
+   themes
+   configure
 
 Indices and tables
 ==================

=== modified file 'documentation/manual/source/mediamanager.rst'
--- documentation/manual/source/mediamanager.rst	2010-11-03 02:07:05 +0000
+++ documentation/manual/source/mediamanager.rst	2010-12-12 21:48:57 +0000
@@ -7,20 +7,21 @@
 `Media Manager` contains all the bibles, songs, presentations, media, and 
 everything else that you will project through OpenLP.
 
-Enabling the Plugins
---------------------
+Enabling OpenLP Features
+------------------------
 
-You may need to enable the plugins that came with OpenLP. As you can see below
-this is what the `Media Manager` looks like with all the plugins enabled.
+You may need to enable some of the features of OpenLP. As you can see below
+this is what the `Media Manager` looks like with all the features enabled.
 
 .. image:: pics/mediamanager.png
 
-To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
-press `F7`. You will then want to click on the plugin to the left that you want
-to enable and select **active** from the drop down box to the right.
+To enable different features navigate to :menuselection:`Settings --> Plugins`
+or press `F7`. You will then want to click on the plugin to the left that you
+want to enable and select **active** from the drop down box to the right.
 
 .. image:: pics/plugins.png
 
 
-Now you should be ready to add content to OpenLP check out the section of this
-guide on the individual plugins.
+Now you should be ready to add content to OpenLP. Please note some items that
+can be enabled are not visible in OpenLP but operate behind the scenes, such
+as the `Remotes Plugin`.

=== 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-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/addsongservice1.png'
Binary files documentation/manual/source/pics/addsongservice1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/addsongservice1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/addsongservice2.png'
Binary files documentation/manual/source/pics/addsongservice2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/addsongservice2.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/authorstopicsbooks.png'
Binary files documentation/manual/source/pics/authorstopicsbooks.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/authorstopicsbooks.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/bibleimport1.png'
Binary files documentation/manual/source/pics/bibleimport1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/bibleimport1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/bibleimport2.png'
Binary files documentation/manual/source/pics/bibleimport2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/bibleimport2.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/configuregeneral.png'
Binary files documentation/manual/source/pics/configuregeneral.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/configuregeneral.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/configurethemes.png'
Binary files documentation/manual/source/pics/configurethemes.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/configurethemes.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/createthemeicon.png'
Binary files documentation/manual/source/pics/createthemeicon.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/createthemeicon.png	2010-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/previewsong1.png'
Binary files documentation/manual/source/pics/previewsong1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/previewsong1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/previewsong2.png'
Binary files documentation/manual/source/pics/previewsong2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/previewsong2.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/sendsonglive1.png'
Binary files documentation/manual/source/pics/sendsonglive1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/sendsonglive1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/sendsonglive2.png'
Binary files documentation/manual/source/pics/sendsonglive2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/sendsonglive2.png	2010-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +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-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themeeditbutton.png'
Binary files documentation/manual/source/pics/themeeditbutton.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themeeditbutton.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themeimportexport.png'
Binary files documentation/manual/source/pics/themeimportexport.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themeimportexport.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/thememanager1.png'
Binary files documentation/manual/source/pics/thememanager1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/thememanager1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard1.png'
Binary files documentation/manual/source/pics/themewizard1.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard1.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard2.png'
Binary files documentation/manual/source/pics/themewizard2.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard2.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard3.png'
Binary files documentation/manual/source/pics/themewizard3.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard3.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard4.png'
Binary files documentation/manual/source/pics/themewizard4.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard4.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard5.png'
Binary files documentation/manual/source/pics/themewizard5.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard5.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard6.png'
Binary files documentation/manual/source/pics/themewizard6.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard6.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard7.png'
Binary files documentation/manual/source/pics/themewizard7.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard7.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard8.png'
Binary files documentation/manual/source/pics/themewizard8.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard8.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizard9.png'
Binary files documentation/manual/source/pics/themewizard9.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizard9.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/pics/themewizardwelcome.png'
Binary files documentation/manual/source/pics/themewizardwelcome.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/themewizardwelcome.png	2010-12-12 21:48:57 +0000 differ
=== added file 'documentation/manual/source/quickstart.rst'
--- documentation/manual/source/quickstart.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/quickstart.rst	2010-12-12 21:48:57 +0000
@@ -0,0 +1,11 @@
+========================
+OpenLP Quick Start Guide
+========================
+
+Thank you for choosing OpenLP. The developers of OpenLP have attempted to make
+OpenLP intuitive and easy to use. This Quick Start Guide will help you to get
+going quickly. 
+
+Bible Importer
+==============
+

=== 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-12-12 21:48:57 +0000
@@ -97,4 +97,310 @@
 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\Databases\Data\Songs.DB
+
+After selecting your EasyWorship database file click :guilabel:`Next` 
+
+.. image:: pics/finishedimport.png
+
+Once the importer is complete 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-independent and operating 
+system-independent 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 clicking 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 
+selecting the song and pressing the delete icon.
+
+.. image:: pics/songs17.png 
+
+Previewing Songs
+================
+
+Previewing a song can be very helpful before sending it live. You can check for
+mistakes in the song, the song order, etc. Please check out the documentation
+for the `Preview Pane` for more details on previewing items. You can preview a
+song two ways.
+
+Highlight the song you would like to preview by clicking on the song title. 
+Then click the :guilabel:`Preview Button`. You should now see your song in the
+`Preview Pane` of OpenLP.
+
+.. image:: pics/previewsong1.png
+
+You may also preview a song by `right clicking` on the song title and selecting
+`Preview Song`.
+
+.. image:: pics/previewsong2.png
+
+Adding Song to Your Service
+===========================
+
+The `Service Manager` is where you organize your worship service using OpenLP.
+It is the most common place for you to send content `live` or to the `Display
+Window` Please see the section of the documentation on the `Service Manager` 
+for more details on managing your service and service files.
+
+You can send a song to the `Service Manager` two ways.
+
+Highlight the song you desire to send live, then click the `Add the Selected
+Song to Service` Button.
+
+.. image:: pics/addsongservice1.png
+
+Or you may right click on the song you wish to add to the service, and then 
+select :guilabel:`Add to Service`
+
+.. image:: pics/addsongservice2.png
+
+Sending Song Directly Live
+==========================
+
+You can also send a song directly `Live` this means to the `Display Window` or
+to your projector. 
+
+To send a song live click on the desired song to send live and then click on
+the :guilabel:`Send the Selected Song Live` Button.
+
+.. image:: pics/sendsonglive1.png
+
+Or, you may send a song live by right clicking on the song you wish to send
+live and select `Show Live`
+
+.. image:: pics/sendsonglive2.png
+
+Editing Authors Topics and Books
+================================
+
+To edit the authors topics and books associated with the song you can do this
+through the editing or adding of new songs, or by selecting the `Maintain the
+List of Authors Topics and Books` Button.
+
+.. image:: pics/authorstopicsbooks.png
+
+You should now see the window to work with Authors, Topics, Songs and 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.
+
+
+
+
+
+
+
 

=== added file 'documentation/manual/source/themes.rst'
--- documentation/manual/source/themes.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/themes.rst	2010-12-12 21:48:57 +0000
@@ -0,0 +1,161 @@
+======
+Themes
+======
+
+
+The `Theme Manager` is were you can set backgrounds, fonts, and colors to the 
+style you desire. >From the theme manager you can create a new theme, Edit a 
+theme, Delete a theme, Import a theme, and Export a theme.
+
+.. image:: /pics/thememanager1.png
+
+Creating New Themes
+===================
+Click the :guilabel:`Create Theme Icon` to Create a new theme   
+
+.. image:: /pics/createthemeicon.png 
+
+This will bring up the `Theme Wizard`
+
+.. image:: /pics/themewizardwelcome.png
+
+Click :guilabel:`Next`. You have 3 choices in the drop down menu for Background
+type: Solid Color, Gradient, or Image.
+
+.. image:: /pics/themewizard1.png 
+
+Solid color, click on the black button next to Color. You will have a choice of choosing among the colors you see or entering your own. 
+
+.. image:: /pics/themewizard2.png
+
+Gradient: choose the two colors, First and Second, you want to fade together and Gradient drop down will let you determine the directions of the fade.
+
+.. image:: /pics/themewizard3.png
+
+Image: Click on the folder to find and select your image. Openlp accepts a 
+variety of image types. 
+
+.. image:: /pics/themewizard4.png
+
+**Note:** If possible, try to use the same size image as your projector is
+displaying.
+
+When finished with your selection for background, click the :guilabel:`Next`
+button. 
+
+This is the area where you will select and define your font characteristics for the Display text.
+
+.. image:: /pics/themewizard5.png
+
+**Font:** Choose the font you would like to use from the drop down.
+
+**Color:** Choose the color of your font.
+
+**Size:** The size of your font determines how many lines are shown per slide.
+As you change the font size, the lines per slide will change.
+
+**Line Spacing:** This setting determines how much space you want between
+lines. This setting will also change the lines per slide. 
+
+**Outline:** If you desire an outline around your font, tick the Outline box,
+choose your color and size of the outline.
+
+**Shadow:** If you desire a shadow around your font, tick the Shadow box, 
+choose your color and size of the shadow.  
+
+**Bold Display:** Tick the box for Bold type
+
+**Italic Display:** Tick the box for Italic
+
+When you are finished selecting your font details click the :guilabel:`Next`
+button.
+
+Footer Area Font Details
+This page determines the Font, Font Color, and size of the font for the footer.
+The footer is where the Title of the song, Author or Authors, Copyright and 
+CCLI License show.
+
+.. image:: /pics/themewizard6.png
+
+When you are finished setting your footer font details, click :guilabel:`Next`.
+
+Text Formatting Details
+This page determines the alignment of the text on your slide and the transition from one slide to the next. 
+
+.. image:: /pics/themewizard7.png
+
+Horizontal Align the text to the Left, Right or Center of the screen.
+
+Vertical Align the text to the Top, Middle or bottom of the screen.
+
+Transistions
+When this box is ticked, switching slides will fade out from one and fade in to
+the next. When the box is not ticked, slide changing will be instant.
+
+When you are finished setting your Text Formatting Details, click :guilabel:`Next`.
+
+Output Area Locations
+On this page you have the ability to position your whole slide or footer to any
+specific area of the screen ie: if you do not want your footer on the bottom
+left, you can make the adjustment here. If you want to move your main area to a
+different position on the screen, you would also do that here.
+
+.. image:: /pics/themewizard8.png
+
+You can also change the Width and the Height of the Main Area of the Footer Area.
+
+When you are finished setting your Output Area Locations, click :guilabel:`Next`.
+
+Save and Preview
+
+.. image:: /pics/themewizard9.png
+
+**Theme Name:** Enter your theme name here.
+
+Preview
+The Preview shows the choices you made when setting up the previous pages. The
+preview also shows all the edit effects possible so you can see what the impact
+is on all possible colors.
+
+If you are satisfied with your selections, click :guilabel:`Finish`. If you 
+want to make a change, use the :guilabel:`Back` button.
+
+Editing Themes
+==============
+Now that you created your theme, and you show it on the projector and there is
+something you don't like, you can easily Edit your theme either by clicking the
+Theme Edit Button:
+
+.. image:: /pics/themeeditbutton.png
+
+Or by right-clicking your theme and selecting the appropriate action.
+
+Deleting Themes
+===============
+
+The Delete Button:
+
+.. image:: /pics/songs17.png
+
+will delete a selected theme. Or by right-clicking your theme and selecting 
+the appropriate action.
+
+Exporting Themes
+================
+If you would like to transfer a theme from one computer to another, click on 
+the theme you want to Export, click the last button in the Theme Manager:
+
+.. image:: /pics/themeimportexport.png
+
+choose the folder you want to put your theme and click the OK button.
+
+Importing Themes
+================
+
+The fourth button in the Theme Manager:
+
+.. image:: /pics/themeimportexport.png
+
+will allow you to Import an Exported theme. Click the Import button, select the
+folder and the theme file, and click OK. Your imported theme will be in the 
+Theme Manager.