← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/documentation into lp:openlp

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/documentation into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Updated the image plugin page.
Fixed up Wesley's images.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/documentation/+merge/38551
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/documentation into lp:openlp.
=== modified file 'documentation/source/manual/dualmonitors.rst'
--- documentation/source/manual/dualmonitors.rst	2010-10-15 01:15:55 +0000
+++ documentation/source/manual/dualmonitors.rst	2010-10-15 15:28:50 +0000
@@ -12,11 +12,11 @@
 
 **VGA**
 
-.. image:: /pics/vga.png
+.. image:: pics/vga.png
 
 **DVI**
 
-.. image:: /pics/dvi.png
+.. 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 
@@ -47,11 +47,11 @@
 also bypass this step by right click on a blank area on your desktop and 
 selecting **resolution**.
 
-.. image:: /pics/winsevendisplay.png
+.. image:: pics/winsevendisplay.png
 
 Then click on the Screen Resolution from the left pane.
 
-.. image:: /pics/winsevenresolution.png
+.. image:: pics/winsevenresolution.png
 
 Then enable your projector and ensure your desktop is extended.
 
@@ -61,11 +61,11 @@
 From the control panel click on personalize, or right click a blank place on
 the desktop and click personalization. 
 
-.. image:: /pics/vistapersonalize.png
+.. image:: pics/vistapersonalize.png
 
 From the **Personalization** window click on Display Settings.
 
-.. image:: /pics/vistadisplaysettings.png
+.. image:: pics/vistadisplaysettings.png
 
 Then enable the montior that represents your projector an make sure your
 you have checked Extend the desktop.
@@ -77,7 +77,7 @@
 desktop and select properties. From the properties window click on the settings
 tab.
 
-.. image:: /pics/xpdisplaysettings.png
+.. image:: pics/xpdisplaysettings.png
 
 Then enable the monitor that represents your projector an make sure your
 you have checked Extend the desktop.
@@ -97,7 +97,7 @@
 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
+.. 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).
@@ -108,11 +108,11 @@
 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
+.. image:: pics/kdesystemsettings.png
 
 Click on the display and monitor icon.
 
-.. image:: /pics/kdedisplay.png
+.. 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

=== modified file 'documentation/source/manual/glossary.rst'
--- documentation/source/manual/glossary.rst	2010-10-15 01:15:55 +0000
+++ documentation/source/manual/glossary.rst	2010-10-15 15:28:50 +0000
@@ -11,7 +11,7 @@
 
 The Main Window is what you will see when you first open OpenLP
 
-.. image:: /pics/mainwindow.png
+.. image:: pics/mainwindow.png
 
 The Main Window contains all the tools and plugins that make OpenLP function
 
@@ -21,7 +21,7 @@
 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
+.. image:: pics/mediamanager.png
 
 From the Media Manager you can send Media Items to the Preview or Live screens.
 
@@ -31,7 +31,7 @@
 The preview pane is a section to preview your media items before you go live 
 with them.
 
-.. image:: /pics/preview.png
+.. image:: pics/preview.png
 
 Service File
 ------------
@@ -51,7 +51,7 @@
 area from wich your media items go live, and you can also save, open, and edit 
 services files.
 
-.. image:: /pics/servicemanager.png
+.. image:: pics/servicemanager.png
 
 Slide Controller
 ----------------
@@ -59,7 +59,7 @@
 The Slide Controller controls which slide from a **Service Item** is currently
 being displayed, and moving between the various slides.
 
-.. image:: /pics/slidecontroller.png
+.. image:: pics/slidecontroller.png
 
 Theme Manager
 -------------
@@ -67,4 +67,4 @@
 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
+.. image:: pics/thememanager.png

=== modified file 'documentation/source/plugins/images.rst'
--- documentation/source/plugins/images.rst	2010-10-11 20:47:00 +0000
+++ documentation/source/plugins/images.rst	2010-10-15 15:28:50 +0000
@@ -3,6 +3,17 @@
 Images Plugin
 =============
 
-.. automodule:: openlp.plugins.images
-   :members:
-
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.images.imageplugin.ImagePlugin
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.images.lib
+   :members:
+
+.. automodule:: openlp.plugins.images.lib.mediaitem
+   :members:


Follow ups