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)


fixed some errors added a few different formats to the documentation for songs importing
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42011
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.

=== modified file 'documentation/manual/source/index.rst'
--- documentation/manual/source/index.rst	2010-10-15 20:09:57 +0000
+++ documentation/manual/source/index.rst	2010-11-27 15:07:56 +0000
@@ -14,6 +14,8 @@
    introduction
    glossary
    dualmonitors
+   mediamanager
+   songs
 
 Indices and tables
 ==================

=== added file 'documentation/manual/source/mediamanager.rst'
--- documentation/manual/source/mediamanager.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/mediamanager.rst	2010-11-27 15:07:56 +0000
@@ -0,0 +1,26 @@
+=============
+Media Manager
+=============
+
+Once you get your system set up for OpenLP you will be ready to add content to
+your setup. This will all happen through the **Media Manager**. The
+`Media Manager` contains all the bibles, songs, presentations, media, and 
+everything else that you will project through OpenLP.
+
+Enabling the Plugins
+--------------------
+
+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.
+
+.. 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.
+
+.. 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.

=== added file 'documentation/manual/source/pics/finishedimport.png'
Binary files documentation/manual/source/pics/finishedimport.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/finishedimport.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/plugins.png'
Binary files documentation/manual/source/pics/plugins.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/plugins.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/selectsongs.png'
Binary files documentation/manual/source/pics/selectsongs.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/selectsongs.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/songimporter.png'
Binary files documentation/manual/source/pics/songimporter.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songimporter.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/songimporterchoices.png'
Binary files documentation/manual/source/pics/songimporterchoices.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songimporterchoices.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/songselectlyrics.png'
Binary files documentation/manual/source/pics/songselectlyrics.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songselectlyrics.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/pics/songselectsongsearch.png'
Binary files documentation/manual/source/pics/songselectsongsearch.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/songselectsongsearch.png	2010-11-27 15:07:56 +0000 differ
=== modified file 'documentation/manual/source/pics/vistadisplaysettings.png' (properties changed: +x to -x)
=== modified file 'documentation/manual/source/pics/vistapersonalize.png' (properties changed: +x to -x)
=== modified file 'documentation/manual/source/pics/winsevendisplay.png' (properties changed: +x to -x)
=== modified file 'documentation/manual/source/pics/winsevenresolution.png' (properties changed: +x to -x)
=== modified file 'documentation/manual/source/pics/xpdisplaysettings.png'
Binary files documentation/manual/source/pics/xpdisplaysettings.png	2010-10-19 18:54:43 +0000 and documentation/manual/source/pics/xpdisplaysettings.png	2010-11-27 15:07:56 +0000 differ
=== added file 'documentation/manual/source/songs.rst'
--- documentation/manual/source/songs.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/songs.rst	2010-11-27 15:07:56 +0000
@@ -0,0 +1,100 @@
+=====
+Songs 
+=====
+
+Managing your songs in OpenLP is a relatively simple process. There are also 
+converters provided to get data from other formats into OpenLP.
+
+Song 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 Song Importer :menuselection:`File --> Import --> Song`.
+You will then see the Song Importer window, then click :guilabel:`Next`.
+
+.. image:: pics/songimporter.png 
+
+After choosing :guilabel:`Next` you can then select from the various types of 
+software that OpenLP will convert songs from.
+
+.. image:: pics/songimporterchoices.png
+
+Then 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 the different 
+formats that OpenLP will import.
+
+Importing from OpenLP Version 1
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Converting from OpenLP Version 1 is a pretty simple process. You will first 
+need to locate your version 1 database file.
+
+Windows XP::
+
+    C:\Documents and Settings\All Users\Application Data\openlp.org\Data\songs.olp
+
+Windows Vista / Windows 7::
+
+    C:\ProgramData\openlp.org\Data\songs.olp
+
+After clicking :guilabel:`Next` your conversion should be complete. 
+
+.. image:: pics/finishedimport.png
+
+Then press :guilabel:`Finish` and you should now be ready to use your OpenLP 
+version one songs.
+
+Importing from OpenSong
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Converting from OpenSong you will need to locate your songs database. In the 
+later versions of OpenSong you are asked to define the location of this. The 
+songs will be located in a folder named :guilabel:`Songs`. This folder should
+contain files with all your songs in them without a file extension. (file.xxx).
+When you have located this folder you will then 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 lest then press shift and select the last song in the list. After this
+press :guilabel:`Next` and you should see that your import has been successful.
+
+.. image:: pics/finishedimport.png
+
+Press :guilabel:`Finish` and you will now be ready to use your songs imported
+from OpenSong.
+
+Importing from CCLI Song Select
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To import from CCLI Song Select you must be a CCLI Subscriber and also a 
+subscriber of the Song Select service. For info on that go to: 
+http://www.ccli.com 
+
+The first step for importing from CCLI Song Select is to log into your account.
+Then search for your desired song. For this example we will be adding the song
+"Amazing Grace". 
+
+.. image:: pics/songselectsongsearch.png
+
+For the song you are searching for select `lyrics` This should take you to a 
+page displaying the lyrics and copyright info for your song.
+
+.. image:: pics/songselectlyrics.png
+
+Next, hover over the :guilabel:`Lyrics` menu from the upper right corner. Then
+choose either the .txt or .usr file. You will then be asked to chose a download
+location if your browser does not automatically select that for you. Select 
+this file 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
+
+Press :guilabel:`Finish` and you will now be ready to use your songs imported
+from CCLI SongSelect.
+
+