← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~wesleystout/openlp/documentation into lp:openlp

 

Wesley Stout has proposed merging lp:~wesleystout/openlp/documentation into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
  Raoul Snyman (raoul-snyman)


Added the Glossary
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/38485
Your team OpenLP Core is subscribed to branch lp:openlp.
=== added file 'documentation/source/manual/dualmonitors.rst'
--- documentation/source/manual/dualmonitors.rst	1970-01-01 00:00:00 +0000
+++ documentation/source/manual/dualmonitors.rst	2010-10-15 01:32:41 +0000
@@ -0,0 +1,127 @@
+==================
+Dual Monitor Setup
+==================
+
+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.
+
+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
+monitors will have two of, or a combination of the two connectors below.
+
+**VGA**
+
+.. image:: /pics/vga.png
+
+**DVI**
+
+.. image:: /pics/dvi.png
+
+A laptop computer setup only varies 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 FN
+key and another key is required to enable the second monitor on laptops.
+
+Some computers also incorporate the use of S-Video or HDMI connections.
+
+A typical OpenLP set up 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.
+
+Microsoft Windows
+-----------------
+
+Dual monitor setup is similar among all the currently supported Windows
+releases (XP, Vista, Windows 7), but does vary slightly from one release to the
+next.
+
+Windows 7
+^^^^^^^^^
+
+Windows 7 has using  a projector in mind. Simply connect your projector and 
+press the **Windows key and tap P**.
+
+The more traditional way is also fairly straight forward. Go to the control 
+panel and click on display. This will open up the Display options. You can 
+also bypass this step by right click on a blank area on your desktop and 
+selecting **resolution**.
+
+.. image:: /pics/winsevendisplay.png
+
+Then click on the Screen Resolution from the left pane.
+
+.. image:: /pics/winsevenresolution.png
+
+Then enable your projector and ensure your desktop is extended.
+
+Windows Vista
+^^^^^^^^^^^^^
+
+From the control panel click on personalize, or right click a blank place on
+the desktop and click personalization. 
+
+.. image:: /pics/vistapersonalize.png
+
+From the **Personalization** window click on Display Settings.
+
+.. image:: /pics/vistadisplaysettings.png
+
+Then enable the montior that represents your projector an make sure your
+you have checked Extend the desktop.
+
+Windows XP
+^^^^^^^^^^
+
+From the control panel select Display, or right click on a blank area of the 
+desktop and select properties. From the properties window click on the settings
+tab.
+
+.. image:: /pics/xpdisplaysettings.png
+
+Then enable the monitor that represents your projector an make sure your
+you have checked Extend the desktop.
+
+Linux
+-----
+
+Due to the vast varieties of hardware, distributions, desktops, and drivers
+this is not an exhaustive guide to dual monitor setup on Linux. This guide
+assumes that you have properly set up any proprietary drivers if needed. You
+should seek out your distributions documentation if this general guide does not
+work.
+
+GNOME 
+^^^^^
+
+This guide is for users of the GNOME desktop who do not use proprietary drivers.
+From most distros go to System --> Preferences --> Display Settings (Monitors)
+
+.. image:: /pics/gnome.png
+
+Setup your projector with the correct resolution and make sure you do **not**
+have mirrored desktop enabled (same image on all monitors).
+
+KDE
+^^^
+
+This guide is for users of the KDE desktop who do not use proprietary drivers.
+From most distros click the Kick Off menu and navigate to **system settings**
+
+.. image:: /pics/kdesystemsettings.png
+
+Click on the display and monitor icon.
+
+.. image:: /pics/kdedisplay.png
+
+From here you will need to set up your projector with the appropriate
+resolution, and position. OpenLP works best projecting to the monitor on the
+right.
+
+
+
+
+
+
+
+

=== added file 'documentation/source/manual/glossary.rst'
--- documentation/source/manual/glossary.rst	1970-01-01 00:00:00 +0000
+++ documentation/source/manual/glossary.rst	2010-10-15 01:32:41 +0000
@@ -0,0 +1,70 @@
+========
+Glossary
+========
+
+The developers of OpenLP have strived to make it a straightforward and easy to
+use application. However, it is good to be familiar with a few terms that will 
+be used throughout this documentation, and when seeking support.
+
+Main Window
+-----------
+
+The Main Window is what you will see when you first open OpenLP
+
+.. image:: /pics/mainwindow.png
+
+The Main Window contains all the tools and plugins that make OpenLP function
+
+Media Manager
+-------------
+
+The Media Manager contains a number of tabs that plugins supply to OpenLP.
+Each tab in the Media Manager is called a **Media Item**
+
+.. image:: /pics/mediamanager.png
+
+From the Media Manager you can send Media Items to the Preview or Live screens.
+
+Preview 
+-------
+
+The preview pane is a section to preview your media items before you go live 
+with them.
+
+.. image:: /pics/preview.png
+
+Service File
+------------
+
+A service file, is the file that is created when you save your work on OpenLP.
+The service file consist of **Service Items**
+
+Service Item
+------------
+
+A service item are the **media items** that are in the **service manager**
+
+Service Manger
+--------------
+
+The service manager contains the media items in your service file. This is the 
+area from wich your media items go live, and you can also save, open, and edit 
+services files.
+
+.. image:: /pics/servicemanager.png
+
+Slide Controller
+----------------
+
+The Slide Controller controls which slide from a **Service Item** is currently
+being displayed, and moving between the various slides.
+
+.. image:: /pics/slidecontroller.png
+
+Theme Manager
+-------------
+
+The theme manager is where themes are created and edited. Themes are the text
+styles backgrounds that you use to personalize your services.
+
+.. image:: /pics/thememanager.png

=== modified file 'documentation/source/manual/index.rst'
--- documentation/source/manual/index.rst	2010-10-09 19:43:22 +0000
+++ documentation/source/manual/index.rst	2010-10-15 01:32:41 +0000
@@ -12,6 +12,8 @@
    :maxdepth: 2
 
    introduction
+   glossary
+   dualmonitors
 
 Indices and tables
 ==================

=== added directory 'documentation/source/manual/pics'
=== added file 'documentation/source/manual/pics/dvi.png'
Binary files documentation/source/manual/pics/dvi.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/dvi.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/gnome.png'
Binary files documentation/source/manual/pics/gnome.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/gnome.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/kdedisplay.png'
Binary files documentation/source/manual/pics/kdedisplay.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/kdedisplay.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/kdesystemsettings.png'
Binary files documentation/source/manual/pics/kdesystemsettings.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/kdesystemsettings.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/mainwindow.png'
Binary files documentation/source/manual/pics/mainwindow.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/mainwindow.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/mediamanager.png'
Binary files documentation/source/manual/pics/mediamanager.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/mediamanager.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/preview.png'
Binary files documentation/source/manual/pics/preview.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/preview.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/servicemanager.png'
Binary files documentation/source/manual/pics/servicemanager.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/servicemanager.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/slidecontroller.png'
Binary files documentation/source/manual/pics/slidecontroller.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/slidecontroller.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/thememanager.png'
Binary files documentation/source/manual/pics/thememanager.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/thememanager.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/vga.png'
Binary files documentation/source/manual/pics/vga.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/vga.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/vistadisplaysettings.png'
Binary files documentation/source/manual/pics/vistadisplaysettings.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/vistadisplaysettings.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/vistapersonalize.png'
Binary files documentation/source/manual/pics/vistapersonalize.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/vistapersonalize.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/winsevendisplay.png'
Binary files documentation/source/manual/pics/winsevendisplay.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/winsevendisplay.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/winsevenresolution.png'
Binary files documentation/source/manual/pics/winsevenresolution.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/winsevenresolution.png	2010-10-15 01:32:41 +0000 differ
=== added file 'documentation/source/manual/pics/xpdisplaysettings.png'
Binary files documentation/source/manual/pics/xpdisplaysettings.png	1970-01-01 00:00:00 +0000 and documentation/source/manual/pics/xpdisplaysettings.png	2010-10-15 01:32:41 +0000 differ

Follow ups