head

manual/source/bibles.rst

@@ -1,3 +1,5 @@
+.. _bibles:
+
 ======
 Bibles
 ======
@@ -5,7 +7,7 @@ Bibles
 Managing Bibles in OpenLP is a relatively simple process. There are also
 converters provided to get data from other formats into OpenLP.
 
-.. _bibles-import:
+.. _import_bibles:
 
 Bible Import Wizard
 ===================
@@ -18,7 +20,7 @@ You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:`
 |importicon| Import Bibles
     Click on the :guilabel:`Import Bibles` icon to start the Bible import wizard.
 
-.. |IMPORTICON| image:: pics/themeimportexport.png
+.. |IMPORTICON| image:: pics/theme_import.png
 
 You will see the Bible Importer window, click :guilabel:`Next`.
 
@@ -39,9 +41,12 @@ copyright notice. Click :guilabel:`Next` to continue.
 
 .. image:: pics/bibleimportdetails1.png
 
-After filling in the copyright details, OpenLP will start to import your Bible.
+After entering the copyright details, OpenLP will start to import your Bible.
 It may take some time to import your Bible so please be patient.
 
+**Note:** You can use one blank space using the space bar in the copyright field 
+to continue without entering anything.
+
 .. image:: pics/bibleimportfinished1.png
 
 When the import has finished click :guilabel:`Finish` and you should be

manual/source/configure.rst

@@ -12,8 +12,8 @@ To configure OpenLP, click on :menuselection:`Settings --> Configure OpenLP...`
 The plugins you have activated will have configure options. If all the plugins
 are activated there will be 10 items down the left side you can configure.
 
-General Tab
-===========
+General
+=======
 
 .. image:: pics/configuregeneral.png
 
@@ -88,8 +88,8 @@ option also comes in handy when you have the "Display if a single screen" box
 selected. You can make the display smaller so it does not cover your whole 
 screen.
 
-Themes Tab
-==========
+Themes
+======
 
 .. image:: pics/configurethemes.png
 
@@ -120,18 +120,19 @@ Choose from one of three options for the default use of your theme.
   With this level selected, all songs and verses will use the theme selected on
   the left in the Global Theme drop down.
 
-Advanced Tab
-============
+Advanced
+========
 
 .. image:: pics/configureadvanced.png
 
+.. _configure_ui:
 
 UI Settings (user interface)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 **Number of recent files to display:**
   Set this number for OpenLP to remember your last files open. These will show 
-  under File.
+  under :menuselection:`File --> Recent Files`.
 
 **Remember active media manager tab on startup:**
   With this box selected OpenLP media manager will open on the same tab that it
@@ -147,8 +148,8 @@ UI Settings (user interface)
   When you open OpenLP, everything will automatically be expanded in the Service
   Manager.
 
-Songs Tab
-=========
+Songs
+=====
 
 .. image:: pics/configuresongs.png
 
@@ -177,8 +178,8 @@ Songs Mode
   checked, the song is available in the service but will not be added to the 
   Media Manager.
 
-Bibles Tab
-==========
+Bibles
+======
 
 .. image:: pics/configurebibles.png
 
@@ -216,9 +217,8 @@ Verse Display
 
 **Note:** Changes do not affect verses already in the service.
 
-
-Presentations Tab
-=================
+Presentations
+=============
 
 .. image:: pics/configurepresentations.png
 
@@ -240,8 +240,20 @@ Advanced
   box on the Presentations toolbar  in Media Manager which gives you the option 
   to select the presentation program you want to use.
 
-Media Tab
-=========
+Images
+======
+
+Provides border where an image is not the correct dimensions for the screen when 
+it is resized.
+
+.. image:: pics/configureimages.png
+
+**Default Color:** 
+  Click on the black button next to Default Color. You have the option of 
+  choosing among the colors you see or entering your own.
+
+Media
+=====
 
 .. image:: pics/configuremedia.png
 
@@ -251,8 +263,8 @@ Media Display
 **Use Phonon for video playback**
   If you are having trouble displaying media, selecting this box could help.
 
-Custom Tab
-==========
+Custom
+======
 
 .. image:: pics/configurecustom.png
 
@@ -266,8 +278,8 @@ Custom Display
 **Note:** If you have an entry in the Credits box of your custom slide, title and
 credits will always be displayed.
 
-Alerts Tab
-==========
+Alerts
+======
 
 .. image:: pics/configurealerts.png
 
@@ -299,8 +311,8 @@ Font
 
 .. _remote_tab:
   
-Remote Tab
-===========
+Remote
+======
 
 OpenLP gives you the ability to control the Service Manager or send an Alert 
 from a remote computer through a web browser. This could be useful for a nursery 

manual/source/configure_shortcuts.rst

@@ -1,3 +1,5 @@
+.. _shortcuts:
+
 ===================
 Customize Shortcuts
 ===================

manual/source/creating_service.rst

@@ -239,8 +239,10 @@ you your three options.
 You can change or add to the keyboard shortcuts here
 :menuselection:`Settings --> Configure Shortcuts`.
 
+.. _new_service:
+
 New, Open and Saving the Service
----------------------------------
+--------------------------------
 
 Three icons at the top of the *Service Manager* will do the following:
 

manual/source/custom_slides.rst

@@ -7,20 +7,18 @@ Adding a new custom slide displays the following dialog:
 
 .. image:: pics/mediamanager_custom_edit.png
 
-**Title**
-    Name of your custom slide.
+**Title:** Name of your custom slide.
 
-**Add**
-    After clicking on Add you will enter your text you want to display in this
-    box. To create multiple slides, click the Split Slide button. When you have
-    finished adding your text, click on the Save button.
+**Add:** After clicking on Add you will enter your text you want to display in 
+  this box. To create multiple slides, click the Split Slide button. When you 
+  have finished adding your text, click on the Save button.
 
-**Theme**
-  Select the theme you want to use for your Custom slide from this drop down box.
+**Theme:** Select the theme you want to use for your Custom slide from this drop 
+  down box.
 
-**Credits**
-  Anything typed in this box will be displayed in the footer information on the
-  display. When you are finished, click the :guilabel:`Save` button.
+**Credits:** Anything typed in this box will be displayed in the footer 
+  information on the   display. When you are finished, click the :guilabel:`Save` 
+  button.
 
 To Edit your slide, click on :guilabel:`Edit` to edit part of it or
 :guilabel:`Edit All` if you need to make multiple changes. Use the Up and Down

manual/source/display_tags.rst

@@ -5,11 +5,11 @@ Formatting Tags
 ===============
 
 OpenLP has the ability to add additional formatting to text in songs and custom
-slides through the use of :ref:`g-formatting-tags`. :ref:`g-formatting-tags` provide 
-a shortcut to use HTML and CSS to format text. 
+slides through the use of :ref:`g-formatting-tags`. :ref:`g-formatting-tags` 
+provide a shortcut to use HTML and CSS to format text. 
 
-:ref:`g-formatting-tags` consist of two parts, a starting and an ending tag, each
-tag consists of brace, tag identifier, brace. 
+:ref:`g-formatting-tags` consist of two parts, a starting and an ending tag, 
+each tag consisting of a brace, tag identifier, brace. 
 
 **Note:** HTML or CSS cannnot be directly entered into OpenLP. They must be
 defined through the use of :ref:`g-formatting-tags`
@@ -21,7 +21,7 @@ Using a Formatting Tag
 is being edited or by using the mouse to select and insert the tags.
 :ref:`g-formatting-tags` can not span across page breaks. If a tag begins with
 text on one side of a page break it cannot stretch across the break. Instead, 
-two sets of tags will need to be used on each side of the break.
+two sets of tags will need to be used, one set on each side of the break.
 
 Adding Formatting Tags Using Text
 ---------------------------------
@@ -52,13 +52,13 @@ followed by selecting the desired formatting.
 Example of Use
 ^^^^^^^^^^^^^^
 
-Select the song or custom slide to edit. Next, highlight the text thaI think t needs
+Select the song or custom slide to edit. Next, highlight the text that you want
 to be formatted.
 
 .. image:: /pics/select_text.png
 
 Right click on the selected text and select :menuselection:`Formatting Tags` 
-followed by selecting the appropriate formatting for the selected text.
+followed by selecting the desired formatting for the selected text.
 
 .. image:: /pics/select_formatting.png
 
@@ -89,20 +89,20 @@ The following tags are included with OpenLP
 Configuring Formatting Tags
 ===========================
 
-To add new :ref:`g-formatting-tags` go to :menuselection:`Settings -> Configure 
+To add new :ref:`g-formatting-tags` go to :menuselection:`Settings --> Configure 
 Formatting Tags`
 
 .. image:: pics/configure_formatting_tags.png
 
 Click the :guilabel:`New` button to add new :ref:`g-formatting-tags`. Enter the 
 description of the :ref:`g-formatting-tags` followed by the tag. The tag must be
-unique. Tags do not need to put the in braces {} here, only when using the tag.
+unique. You do not need to put the in braces {} here, only when using the tag.
 Finally, enter in the HTML or CSS for the tag and click :guilabel:`Save` to
 complete adding new :ref:`g-formatting-tags`.
 
 To delete :ref:`g-formatting-tags` that you have entered click on the
 :ref:`g-formatting-tags` from the list and click :guilabel:`Delete`.
 
-**Note** if a tag is deleted that is in use in a song or custom slide the slide
+**Note:** if a tag is deleted that is in use in a song or custom slide the slide
 will display the tags {} without any formatting.  The deleted tags will need to
 be manually deleted from the songs or custom slides.

manual/source/export_songs.rst

@@ -0,0 +1,46 @@
+.. _export_songs:
+
+Exporting Songs
+===============
+
+OpenLP has the ability to export your songs in the OpenLyrics worship song 
+format. This is convenient for transferring your songs to another computer or 
+for backup purposes.
+
+Song export is accessible through :menuselection:`File --> Export --> Song` and
+once clicked the following dialog box will appear.
+
+.. image:: pics/export_song_welcome.png
+
+Click :guilabel:`Next` to continue or :guilabel:`Cancel` if you change your mind.
+
+.. image:: pics/export_song_select.png
+
+You can select the songs you want to export by clicking on each song you want to 
+export. 
+
+**Search:** Searches for a song title or keyword in a title. 
+
+**Uncheck All:** If you are not sure of your selections click :guilabel:`Uncheck All` 
+and start over.
+
+**Check All:** Click :guilabel:`Check All` selects all of the songs for export. 
+
+When you are finished with your selection click :guilabel:`Next`.
+
+.. image:: pics/export_song_directory.png
+
+**Select Directory** Select the directory where you want the songs to be saved. 
+The list of songs to be exported are shown below. 
+
+**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.
+

manual/source/index.rst

@@ -20,6 +20,7 @@ Reference Manual
    :maxdepth: 2
 
    wizard
+   menu_items
    configure
    dualmonitors
    mediamanager
@@ -32,6 +33,7 @@ Reference Manual
    songs
    bibles
    custom_slides
+   export_songs
    song_usage
    alert
    glossary
@@ -43,4 +45,4 @@ Questions and Troubleshooting
    :maxdepth: 2
 
    faq
-   troubleshooting
+   troubleshooting

manual/source/mediamanager.rst

@@ -92,7 +92,7 @@ Toolbar
 
 |buttons_import| **Import Bible**
     Import Bibles from a number of formats. This is discussed in detail on the
-    :ref:`bibles-import` page.
+    :ref:`import_bibles` page.
 
 |buttons_preview| **Preview verses**
     Send the selected verses to the :ref:`g-preview-slide-controller`.

manual/source/menu_items.rst

@@ -0,0 +1,161 @@
+.. _menu_items:
+
+Menu Items
+==========
+
+The following are the menu items that are listed across the top of OpenLP.
+There is a brief description or link for their intended purpose.
+
+File
+----
+
+|buttons_new| **New:** Creates a new service. :ref:`new_service`
+
+|buttons_open| **Open:** Load an existing service. :ref:`new_service`
+
+|buttons_save| **Save:** Saves your existing loaded service.
+
+**Save As:** Saves your newly created service.
+
+**Recent Files:** Displays your last files opened configurable here. :ref:`configure_ui`
+
+  **Clear List:** Clears your recent files list.
+
+**Import:** This provides the items you can import.
+
+  **Settings:** Import your configurable settings from another computer.
+
+  **Theme:** Import a theme that has been previously exported. :ref:`import_themes`
+
+  **Song:** Import your songs previously exported. :ref:`import_songs`
+
+  **Bible:** Import Bibles from another program, the internet or a previously 
+  exported Bible from OpenLP. :ref:`import_bibles`
+
+**Export:** Provides the items you can export.
+
+  **Settings:** Export your configurable settings to a file to import to another
+  computer.
+
+  **Theme:** Export your theme. :ref:`export_themes`
+
+  **Song:** Export your songs. :ref:`export_songs`
+
+**Print Service:** Gives you the ability to print your service. :ref:`print_service`
+
+|buttons_exit| **Exit:** Closes OpenLP. If there is an open service that has not 
+  been saved you will be prompted to do so.
+
+View
+----
+
+**Mode:** These three settings are optimized for setup and live display.
+
+  **Default:** Displays all of the panels of OpenLP. 
+
+  **Setup:** Displays Preview, :ref:`media-manager` and :ref:`creating_service`.
+
+  **Live:** Displays the live panel and :ref:`creating_service`
+
+Clicking on any of the next items will hide or show its respective panel.
+
+|button_mediamanager| **Media Manager:** Hide or show :ref:`media-manager`.
+
+|button_servicemanager| **Service Manager:** Hide or show :ref:`creating_service`.
+
+|theme_new| **Theme Manager:** Hide or show :ref:`themes`.
+
+**Preview Panel:** Hide or show the preview panel.
+
+**Live Panel:** Hide or show the live panel.
+
+**Lock Panels:** Using this lock will keep all your panel settings the way they 
+  are when clicked, whether hidden or showing. Click this again to unlock the 
+  panels.
+
+Tools
+-----
+
+|buttons_open| **Open Data Folder:** You can access your OpenLP data here. 
+  Your Bibles, songs, themes and other items are stored here. 
+  
+**Note:** It is possible to delete a Bible, theme or another resource you need. 
+If anything is deleted in this folder it is not recoverable through OpenLP.
+
+|button_rerun| **Re-run First Time Wizard:** This will bring up the dialog box 
+  to run the first time wizard again. :ref:`wizard`
+
+**Update Theme Images:** Changing screen resolution can have an affect on theme
+  images. Use this to correct the images. 
+
+|plugin_songs| **Re-index Songs:** This rebuilds the internal song indexes to 
+  make them work following code corrections. You would generally use this after 
+  a software upgrade.
+
+**Song Usage Tracking:** Configure your song usage tracking. :ref:`song_usage`
+
+  **Toggle Tracking:** Provides the means to turn song usage tracking on or off. 
+  There will be a visible check mark if song usage tracking is on.
+
+  **Extract Tracking Data:** Brings up a dialog box to extract song usage data.
+
+  **Delete Tracking Data:** Brings up a dialog box to delete song usage data.
+
+|plugin_alerts| **Alert:** Configure an alert. :ref:`alerts`
+
+Settings
+--------
+
+|plugin_list| **Plugin List:** Provides the configurable settings to control 
+  your plugin's. :ref:`plugin_list` 
+
+**Language:** You can choose another language here or leave it on Autodetect.
+
+|button_tag| **Configure Formatting Tags:** Provides the configurable settings 
+  for formatting tags. :ref:`formatting-tags`
+
+|button_settings| **Configure Shortcuts:** Provides the configurable settings 
+  for shortcuts. :ref:`shortcuts`
+
+|button_configure| **Configure OpenLP:** Provides the configurable   settings 
+  for OpenLP. :ref:`configure`
+
+Help
+----
+
+**Online Help:** This is a direct link to OpenLP's operating manual.
+
+**Web Site:** This is a direct link to OpenLP's web site.
+
+**About:** Provides information, credits and license for OpenLP.
+
+
+.. These are all the image templates that are used in this page.
+
+.. |BUTTONS_NEW| image:: pics/buttons_new.png
+
+.. |BUTTONS_OPEN| image:: pics/buttons_open.png
+
+.. |BUTTONS_SAVE| image:: pics/service_save.png
+
+.. |BUTTONS_EXIT| image:: pics/buttons_exit.png
+
+.. |THEME_NEW| image:: pics/theme_new.png
+
+.. |BUTTON_RERUN| image:: pics/button_rerun.png
+
+.. |PLUGIN_ALERTS| image:: pics/plugin_alerts.png
+
+.. |PLUGIN_SONGS| image:: pics/plugin_songs.png
+
+.. |PLUGIN_LIST| image:: pics/plugin_list.png
+
+.. |BUTTON_CONFIGURE| image:: pics/button_configure.png
+
+.. |BUTTON_SETTINGS| image:: pics/configure_shortcuts_config.png
+
+.. |BUTTON_TAG| image:: pics/button_tag.png
+
+.. |BUTTON_MEDIAMANAGER| image:: pics/button_mediamanager.png
+
+.. |BUTTON_SERVICEMANAGER| image:: pics/button_servicemanager.png

manual/source/plugin_list.rst

@@ -38,7 +38,7 @@ For a brief description of what each plugin does, please see below.
     The presentation plugin provides the ability to show presentations using a 
     number of different programs. The choice of available presentation programs
     is available to the user in a drop down box.
-    **Note** Presentation plugin is disabled on MAC.
+    **Note:** Presentation plugin is disabled on MAC.
 
 |images| **Image Plugin**
     The image plugin provides displaying of images. One of the distinguishing

manual/source/print_service.rst

@@ -1,3 +1,5 @@
+.. _print_service:
+
 =============
 Print Service 
 =============

manual/source/songs.rst

@@ -1,3 +1,5 @@
+.. _songs:
+
 =====
 Songs 
 =====
@@ -5,6 +7,8 @@ Songs
 Managing your songs in OpenLP is a relatively simple process. There are also 
 converters provided to get data from other formats into OpenLP.
 
+.. _import_songs:
+
 Song Importer
 =============
 
@@ -51,7 +55,7 @@ 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 will
-contain files with all your songs in them, without a file extension. (file.xxx).
+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.
 
@@ -71,8 +75,8 @@ 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 more info check out the `CCLI website.
-<http://www.ccli.com>`_ 
+subscriber of the Song Select service. For more information check out the 
+`CCLI website. <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
@@ -108,10 +112,10 @@ assign a Theme, or edit Copyright Info & Comments, you will do this through the
 `Song Editor`. 
 
 **Edit:** To edit an existing song you can either click on a song in the 
-`Media Manager` and then click the button to :guilabel:`Edit the selected song` 
-or right click a song from either the `Media Manager` or additionally from the 
-`Service Manager` and click :guilabel:`Edit item`. If you are adding a new song 
-click :guilabel:`Add a new Song` in the `Media Manager`.
+:ref:`media-manager` and then click the button to :guilabel:`Edit the selected song` 
+or right click a song from either the :ref:`media-manager` or additionally from 
+the :ref:`creating_service` and click :guilabel:`Edit item`. If you are adding a 
+new song click :guilabel:`Add a new Song` in the :ref:`media-manager`.
 
 .. image:: pics/song_edit_lyrics.png
 
@@ -171,14 +175,15 @@ and the format tags will be entered with your lyrics. These tags are not visible
 when displayed. To remove the format, delete the tag on each end of the word or 
 sentence. 
 
-**Edit:** To edit an existing verse, click on the verse you wish to *Edit* then click on 
-:guilabel:`Edit`, make your changes and click :guilabel:`Save`. 
+**Edit:** To edit an existing verse, click on the verse you wish to *Edit* then 
+click on :guilabel:`Edit`, make your changes and click :guilabel:`Save`. 
 
 **Edit All:** To edit the whole song at once, click on :guilabel:`Edit All`.
  
 **Delete:** To delete a verse, click on the verse you want to delete and it will
 highlight, click on the :guilabel:`Delete` button and it will be deleted.
-**Warning:**, once you click the :guilabel:`Delete` button, you will not be
+
+**Warning:** Once you click the :guilabel:`Delete` button, you will not be
 asked again, it will be deleted immediately.
 
 .. image:: pics/song_edit_verse_type.png
@@ -202,8 +207,8 @@ have an author entered. You can add a blank space for the author name.
 **Authors:** Click the drop down arrow to view all authors or start typing a name
 in the box and a list will appear. If the authors name has not been added, type
 the authors name in the box and click :guilabel:`Add to Song`. The authors name
-will appear below and will also be added to your database. If you accidentally add
-the wrong author you can click on the authors name and click :guilabel:`Remove`.
+will appear below and will also be added to your database. If you accidentally 
+add the wrong author you can click on the authors name and click :guilabel:`Remove`.
 
 :guilabel:`Manage Authors, Topics, Song Books`: Clicking this button will bring 
 up your complete list of authors.
@@ -240,8 +245,10 @@ new theme by clicking the :guilabel:`New Theme` button.
 you would like to use the © symbol click :guilabel:`©` button. This information
 is displayed in the footer.
 
-**CCLI number:** Enter the CCLI number in this box. Note: this is the CCLI number
-of the song, not your contract number. This number is not displayed in the footer
+**CCLI number:** Enter the CCLI number in this box. 
+
+**Note:** this is the CCLI number of the song, not your contract number. This 
+number is not displayed in the footer.
 
 **Comments:** You can add comments in this box. This information is not 
 displayed in the footer.

manual/source/themes.rst

@@ -28,8 +28,9 @@ own.
 
 .. image:: /pics/theme_manager_selectcolor.png
 
-**Gradient:** Choose the two colors, First and Second, you want to fade together 
-and the Gradient drop down will let you determine the directions of the fade.
+**Gradient:** Choose the two colors, *Starting* and *Ending* that you want to 
+fade together and the Gradient drop down will let you determine the directions 
+of the fade.
 
 .. image:: /pics/theme_manager_gradient.png
 
@@ -122,7 +123,7 @@ display in a different position on the screen.
 
 .. image:: /pics/theme_manager_outputlocation.png
 
-You can also change the Width and the Height of the Main Area of the Footer Area.
+You can also change the Width and the Height of the Main Area and the Footer Area.
 
 When you are finished setting your Output Area Locations, click :guilabel:`Next`.
 
@@ -157,6 +158,8 @@ select :guilabel:`Delete`.
 **Note:** Deleting the currently selected global theme or the 
 default theme is not possible.
 
+.. _export_themes:
+
 Exporting Themes
 ================
 
@@ -164,6 +167,8 @@ If you would like to transfer a theme from one computer to another, click on
 the theme you want to export, click |theme_export| and choose the folder you 
 want to save your theme in and click :guilabel:`OK`.
 
+.. _import_themes:
+
 Importing Themes
 ================
 

manual/source/troubleshooting.rst

@@ -178,7 +178,7 @@ Due to copyright restrictions OpenLP cannot download an entire Bible. It can
 only download the section you search for. If you do not have an internet
 connection where you intend to use OpenLP you will need another scripture
 source. For more information about acquiring Bibles please see the section on
-the :ref:`bibles-import`.
+the :ref:`import_bibles`.
 
 OpenLP is using a large amount of RAM when showing a presentation
 -----------------------------------------------------------------