openlp-core team mailing list archive

[John Cegalis <jseagull1@xxxxxxxxxxx>]

John Cegalis has proposed merging lp:~jseagull1/openlp/documentation into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
  John Cegalis (jseagull1)

For more details, see:
https://code.launchpad.net/~jseagull1/openlp/documentation/+merge/55614

First Run Wizard changed wording around fixed Alert
-- 
https://code.launchpad.net/~jseagull1/openlp/documentation/+merge/55614
Your team OpenLP Core is subscribed to branch lp:openlp.

=== added file 'documentation/manual/source/alert.rst'
--- documentation/manual/source/alert.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/alert.rst	2011-03-30 19:01:06 +0000
@@ -0,0 +1,59 @@
+=====
+Alert
+=====
+
+:menuselection:`Tools --> Alert`
+--------------------------------
+
+You may find it necessary to display an Alert on your screen, ie: car headlights 
+left on, parent needed in nursery, or anything else somebody may need notified 
+about. This is easily accomplished using the Alert, which is accessible from the 
+top Menu under :menuselection:`Tools --> Alert`.
+
+.. image:: pics/alert.png
+
+:guilabel:`Alert text:` Enter the message you want displayed in this box.
+
+:guilabel:`Parameter:` This box is used for words you want to insert into the 
+alert text.
+ 
+You will add the Parameter text into the alert text using “<>” (without 
+quotations). Anywhere in the Alert text that you add these two symbols, <> side 
+by side, will insert any text you have in the parameter box into the Alert 
+message.
+
+Examples of use
+---------------
+ 
+:guilabel:`Alert text:` The owner of the vehicle with license plate number <> 
+your lights are on.
+
+:guilabel:`Parameter:` HNN432
+
+These two settings will display like this:
+
+The owner of the vehicle with the license plate number HNN432 your lights are on.
+
+You could also reverse this example:
+
+:guilabel:`Alert text:` HNN432 <>
+
+:guilabel:`Parameter:` left their lights on.
+
+`Will display like this:` HNN432 left their lights on.
+
+If you use the same alerts on a regular basis, Save your Alert and you will have 
+access to the alert with a click of the mouse. You may also click on New for a 
+new alert or Delete an alert you do not need.
+
+When you are ready to Display your Alert you have two options. Clicking on 
+Display will display the Alert and the Alert Message window will remain open. 
+Clicking Display & Close will display the alert and close the Alert Message 
+window. 
+
+All details of the display, font, color, size and position are adjusted from the 
+top Menu item :menuselection:`Settings --> Configure OpenLP`, Alert tab and the 
+instructions here. :doc:`configure`
+
+**Please note:** Alert Message is a Plugin that needs to be Active in the Plugin 
+List for use. 
\ No newline at end of file

=== modified file 'documentation/manual/source/index.rst'
--- documentation/manual/source/index.rst	2011-03-28 21:54:49 +0000
+++ documentation/manual/source/index.rst	2011-03-30 19:01:06 +0000
@@ -13,10 +13,15 @@
 
    introduction
    glossary
+   wizard
    dualmonitors
    configure
    bibles
    themes
    mediamanager
+<<<<<<< TREE
    songs
    troubleshooting
+=======
+   songs
+   alert>>>>>>> MERGE-SOURCE

=== added file 'documentation/manual/source/pics/001-first-time-language.png'
Binary files documentation/manual/source/pics/001-first-time-language.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/001-first-time-language.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/002-first-time-wizard-welcome.png'
Binary files documentation/manual/source/pics/002-first-time-wizard-welcome.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/002-first-time-wizard-welcome.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/003-first-time-wizard-plugins.png'
Binary files documentation/manual/source/pics/003-first-time-wizard-plugins.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/003-first-time-wizard-plugins.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/004-first-time-wizard-songs.png'
Binary files documentation/manual/source/pics/004-first-time-wizard-songs.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/004-first-time-wizard-songs.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/005-first-time-wizard-bibles.png'
Binary files documentation/manual/source/pics/005-first-time-wizard-bibles.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/005-first-time-wizard-bibles.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/006-first-time-wizard-themes.png'
Binary files documentation/manual/source/pics/006-first-time-wizard-themes.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/006-first-time-wizard-themes.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/007-first-time-wizard-settings.png'
Binary files documentation/manual/source/pics/007-first-time-wizard-settings.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/007-first-time-wizard-settings.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/009-first-time-wizard-progress.png'
Binary files documentation/manual/source/pics/009-first-time-wizard-progress.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/009-first-time-wizard-progress.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/010-first-time-wizard-finished.png'
Binary files documentation/manual/source/pics/010-first-time-wizard-finished.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/010-first-time-wizard-finished.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/011-first-time-wizard-song-import.png'
Binary files documentation/manual/source/pics/011-first-time-wizard-song-import.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/011-first-time-wizard-song-import.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/012-openlp-main-window.png'
Binary files documentation/manual/source/pics/012-openlp-main-window.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/012-openlp-main-window.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/pics/alert.png'
Binary files documentation/manual/source/pics/alert.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/alert.png	2011-03-30 19:01:06 +0000 differ
=== added file 'documentation/manual/source/wizard.rst'
--- documentation/manual/source/wizard.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/wizard.rst	2011-03-30 19:01:06 +0000
@@ -0,0 +1,102 @@
+================
+First Run Wizard
+================
+
+When using OpenLP for the first time, the **First Run Wizard** will help you 
+with setting up your installation. This wizard is not intended to be a 
+comprehensive setup but will help you with the basics.
+
+Select Translation
+------------------
+
+.. image:: pics/001-first-time-language.png
+
+You can choose the translation you want to use or let OpenLP 
+automatically select it based on your operating system locale. Click 
+:guilabel:`OK` to continue.
+
+The "Welcome to the First Time Wizard" dialog box will appear next. Click 
+:guilabel:`Next`.
+
+.. image:: pics/002-first-time-wizard-welcome.png
+
+Activate required Plugins
+-------------------------
+
+.. image:: pics/003-first-time-wizard-plugins.png
+
+OpenLP has several plugins to choose from. By default, all plugins are enabled, 
+except the *Remote Access* plugin. For more information on these plugins, please 
+read the :doc:`mediamanager` section in the manual. If you are not sure of which 
+plugins to enable or disable, leave the selection as-is. You can easily activate 
+or deactivate plugins later, when OpenLP is running, by going to 
+:menuselection:`Settings --> Plugin List`. Click :guilabel:`Next` to continue.
+
+Sample Songs
+------------
+
+.. image:: pics/004-first-time-wizard-songs.png
+
+OpenLP provides some sample songs in a few languages for downloading and 
+importing into your new song database. This is convenient for new users who do 
+not have any songs yet. If you already have songs in your database, OpenLP will 
+simply add these sample songs to your database, leaving your existing songs 
+intact. Once you are happy with which songs you'd like, click :guilabel:`Next`.
+
+Sample Bibles
+-------------
+
+.. image:: pics/005-first-time-wizard-bibles.png
+
+There are also a number of free Bibles that you can download and install. Using 
+the check box next to each Bible, select each Bible that you would like 
+installed. If you do not wish to install any Bibles, simply leave them all 
+unchecked. Once you are happy with your selection, click :guilabel:`Next` to 
+continue.
+
+Sample Themes
+-------------
+
+.. image:: pics/006-first-time-wizard-themes.png
+
+Some sample themes are also available for download and installation into OpenLP. 
+As with the Bibles, simply check the check box next to each theme to select it. 
+If you are a new user, these themes can help you understand how themes work. If 
+you are happy with your selected themes, click :guilabel:`Next` to continue.
+
+Default Settings
+----------------
+
+.. image:: pics/007-first-time-wizard-settings.png
+
+Default Display Monitor
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Screen 2. If you are installing OpenLP but are not connected to a second output 
+at the time, you can set this up later by going to 
+:menuselection:`Settings --> Configure OpenLP`.
+
+Default Theme
+^^^^^^^^^^^^^
+
+If you have selected one or more themes on the themes page of the wizard, you 
+can select which theme you'd like to be the default theme.
+
+If you are happy with the selections you have made, click :guilabel:`Next` to 
+continue to the next page.
+
+.. image:: pics/009-first-time-wizard-progress.png
+
+Making progress.
+
+.. image:: pics/010-first-time-wizard-finished.png
+
+On the last page of the wizard, OpenLP will download the sample songs, Bibles 
+and themes, and set up OpenLP for you. Click :guilabel:`Finish` and OpenLP will 
+start.
+
+.. image:: pics/011-first-time-wizard-song-import.png
+
+The main window.
+
+.. image:: pics/012-openlp-main-window.png