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/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/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/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/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/songs.rst b/manual/source/songs.rst index 43ed645..ef8e7c7 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 EasyWorships 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 in the same place see a +notification 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