r1403

LICENSE

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
+            GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+               Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+            GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+             END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+        How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

MANIFEST.in

@@ -4,13 +4,10 @@ recursive-include openlp *.csv
 recursive-include openlp *.html
 recursive-include openlp *.js
 recursive-include openlp *.css
-recursive-include openlp *.qm
 recursive-include documentation *
-recursive-include resources/forms *
+recursive-include resources *
-recursive-include resources/i18n *
+recursive-include scripts *
-recursive-include resources/images *
-recursive-include scripts *.py
-include resources/*.desktop
 include copyright.txt
 include LICENSE
+include README.txt
 include openlp/.version

README.txt

@@ -0,0 +1,21 @@
+OpenLP 2.0
+==========
+
+You're probably reading this because you've just downloaded the source code for
+OpenLP 2.0. If you are looking for the installer file, please go to the download
+page on the web site::
+
+    http://openlp.org/en/download.html
+
+If you're looking for how to contribute to OpenLP, then please look at the
+contribution page on the web site::
+
+    http://openlp.org/en/documentation/introduction/contributing.html
+
+If you've looked at that page, and are wanting to help develop, test or
+translate OpenLP, have a look at the OpenLP wiki::
+
+    http://wiki.openlp.org/
+
+Thanks for downloading OpenLP 2.0!
+

copyright.txt

@@ -4,11 +4,11 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

documentation/api/source/core/lib.rst

@@ -6,18 +6,18 @@ Object Library
 .. automodule:: openlp.core.lib
    :members:
 
-:mod:`BaseListWithDnD`
-----------------------
-
-.. autoclass:: openlp.core.lib.baselistwithdnd.BaseListWithDnD
-   :members:
-
 :mod:`EventReceiver`
 --------------------
 
 .. autoclass:: openlp.core.lib.eventreceiver.EventReceiver
    :members:
 
+:mod:`ListWidgetWithDnD`
+------------------------
+
+.. autoclass:: openlp.core.lib.listwidgetwithdnd.ListWidgetWithDnD
+   :members:
+
 :mod:`MediaManagerItem`
 -----------------------
 

documentation/api/source/core/theme.rst

@@ -1,8 +1,10 @@
 .. _core-theme:
 
-:mod:`theme` Module
+Theme Function Library
-===================
+======================
 
 .. automodule:: openlp.core.theme
    :members:
 
+.. autoclass:: openlp.core.theme.theme.Theme
+   :members:

documentation/api/source/openlp.rst

@@ -1,7 +0,0 @@
-.. _openlp:
-
-:mod:`openlp` Module
-====================
-
-.. automodule:: openlp
-   :members:

documentation/api/source/plugins/bibles.rst

@@ -18,7 +18,7 @@ Forms
 .. automodule:: openlp.plugins.bibles.forms
    :members:
 
-.. autoclass:: openlp.plugins.bibles.forms.importwizardform.ImportWizardForm
+.. autoclass:: openlp.plugins.bibles.forms.bibleimportform.BibleImportForm
    :members:
 
 Helper Classes & Functions

documentation/api/source/plugins/remotes.rst

@@ -17,3 +17,9 @@ Helper Classes & Functions
 
 .. automodule:: openlp.plugins.remotes.lib
    :members:
+
+.. autoclass:: openlp.plugins.remotes.lib.httpserver.HttpConnection
+   :members:
+
+.. autoclass:: openlp.plugins.remotes.lib.httpserver.HttpResponse
+   :members:

documentation/api/source/plugins/songs.rst

@@ -54,9 +54,6 @@ Helper Classes & Functions
 .. automodule:: openlp.plugins.songs.lib.mediaitem
    :members:
 
-.. autoclass:: openlp.plugins.songs.lib.mediaitem.SongListView
-   :members:
-
 .. automodule:: openlp.plugins.songs.lib.songimport
    :members:
 

documentation/manual/source/conf.py

@@ -48,7 +48,7 @@ copyright = u'2004-2010 Raoul Snyman'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.9.3'
+release = '1.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -92,22 +92,24 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
+#html_theme = 'openlp_qthelp'
 html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
+if html_theme == 'default':
-    'sidebarbgcolor': '#3a60a9',
+    html_theme_options = {
-    'relbarbgcolor': '#203b6f',
+        'sidebarbgcolor': '#3a60a9',
-    'footerbgcolor': '#26437c',
+        'relbarbgcolor': '#203b6f',
-    'headtextcolor': '#203b6f',
+        'footerbgcolor': '#26437c',
-    'linkcolor': '#26437c',
+        'headtextcolor': '#203b6f',
-    'sidebarlinkcolor': '#ceceff'
+        'linkcolor': '#26437c',
-}
+        'sidebarlinkcolor': '#ceceff'
+    }
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = [u'../themes']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

documentation/manual/source/dualmonitors.rst

@@ -4,11 +4,11 @@ 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.
+will vary depending on operating system.
 
-Most modern computers do have the ability for dual monitors. To be certain
+Most modern computers 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.
+monitors will have two of, or a combination of the two, connectors below.
 
 **VGA**
 
@@ -18,8 +18,8 @@ monitors will have two of, or a combination of the two connectors below.
 
 .. image:: pics/dvi.png
 
-A laptop computer setup only varies slightly, generally you will need only one
+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
+of the outputs pictured above since your laptop screen serves as one of the
 monitors. Sometimes with older laptops a key stroke generally involving the
 :kbd:`Fn` key and another key is required to enable the second monitor on
 laptops.
@@ -27,9 +27,10 @@ laptops.
 Some computers also incorporate the use of :abbr:`S-Video (Separate Video)` or
 :abbr:`HDMI (High-Definition Multimedia Interface)` connections.
 
-A typical OpenLP set up consist of your normal single monitor setup, with your
+A typical OpenLP setup consist of your normal single monitor, with your
-projector setup as the second monitor. With the option of extending your
+projector hooked up to your computer as the second monitor. With the option of 
-desktop across the second monitor, or your operating system's equivalent.
+extending your desktop across the second monitor, or your operating system's 
+equivalent.
 
 Microsoft Windows
 -----------------
@@ -46,8 +47,8 @@ press :kbd:`Windows+P`.
 
 The more traditional way is also fairly straight forward. Go to
 :guilabel:`Control Panel` and click on :guilabel:`Display`. This will open up
-the :guilabel:`Display` dialog. You can also bypass this step by right click on
+the :guilabel:`Display` dialog. You may also bypass this step by a right click 
-a blank area on your desktop and selecting :guilabel:`Resolution`.
+on a blank area on your desktop and selecting :guilabel:`Resolution`.
 
 .. image:: pics/winsevendisplay.png
 
@@ -66,7 +67,7 @@ a blank place on the desktop and click :guilabel:`Personalization`.
 .. image:: pics/vistapersonalize.png
 
 From the :guilabel:`Personalization` window click on :guilabel:`Display
-Settings`. Then enable the montior that represents your projector and make sure
+Settings`. Click on the monitor that represents your projector and make sure
 you have checked :guilabel:`Extend the desktop onto this monitor`.
 
 .. image:: pics/vistadisplaysettings.png
@@ -77,7 +78,7 @@ Windows XP
 From :guilabel:`Control Panel` select :guilabel:`Display`, or right click on a
 blank area of the desktop and select :guilabel:`Properties`. From the
 :guilabel:`Display Properties` window click on the :guilabel:`Settings` tab.
-Then click on the monitor that represents your projector and make sure you have
+Click on the monitor that represents your projector and make sure you have
 checked :guilabel:`Extend my Windows desktop onto this monitor`.
 
 .. image:: pics/xpdisplaysettings.png
@@ -87,7 +88,7 @@ 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
+assumes you have properly set up any proprietary drivers if needed. You
 should seek out your distributions documentation if this general guide does not
 work.
 
@@ -123,7 +124,8 @@ Linux Systems Using nVidia Drivers
 
 This guide is for users of the proprietary nVidia driver on Linux Distributions.
 It is assumed that you have properly setup your drivers according to your
-distribution's documentation, and you have a working ``xorg.conf`` file in place.
+distribution's documentation, and you have a working ``xorg.conf`` file in 
+place.
 
 If you wish to make the changes permanent in setting up your system for dual
 monitors it will be necessary to modify your ``xorg.conf`` file. It is always a
@@ -149,15 +151,15 @@ Or, as root::
   root@linux: # nividia-settings
 
 If you do not want to write the changes to your ``xorg.conf`` file simply run
-the nVidia Settings program (``nvidia-settings``) from your desktop's menu,
+the nVidia Settings program (:command:`nvidia-settings`) from your desktop's
-usually in an administration or system menu, or from the terminal as a normal
+menu, usually in an administration or system menu, or from the terminal as a
-user run::
+normal user run::
 
  user@linux:~ $ nvidia-settings
 
-Once you have opened nVidia Settings, click on
+Once you have opened nVidia Settings, click on :guilabel:`X Server Display
-:guilabel:`X Server Display Configuration`. Then select the monitor you are
+Configuration`. Then select the monitor you are wanting to use as your second
-wanting to use as your second monitor and click :guilabel:`Configure`.
+monitor and click :guilabel:`Configure`.
 
 .. image:: pics/nvlinux1.png
 
@@ -166,7 +168,7 @@ After clicking :guilabel:`Configure`, select :guilabel:`TwinView`. Then click
 
 .. image:: pics/twinview.png
 
-Then click :guilabel:`Apply` and if you are happy with the way things look click
+Click :guilabel:`Apply` and if you are happy with the way things look click
 :guilabel:`Keep` to keep your new settings. Don't worry if all goes wrong the
 settings will return back to the previous settings in 15 seconds without any
 action. nVidia Settings should take care of selecting your optimum resolution
@@ -175,6 +177,6 @@ on :guilabel:`Save to X Configuration File`.
 
 .. image:: pics/xorgwrite.png
 
-Then click :guilabel:`Save` and you should be set. You may want to restart X or
+Click :guilabel:`Save` and you should be set. You may want to restart X or
 your machine just to make sure all the settings carry over the next time you log
 in.

documentation/manual/source/glossary.rst

@@ -18,7 +18,7 @@ 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.
+The Media Manager contains a number of tabs the plugins supply to OpenLP.
 Each tab in the Media Manager is called a **Media Item**
 
 .. image:: pics/mediamanager.png
@@ -36,20 +36,20 @@ with them.
 Service File
 ------------
 
-A service file, is the file that is created when you save your work on OpenLP.
+A service file is the file that is created when you save your service in OpenLP.
 The service file consist of **Service Items**
 
 Service Item
 ------------
 
-A service item are the **media items** that are in the **service manager**
+Service items 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 which your media items go live, and you can also save, open, and edit 
+area where your media items go live. You can also save, open, and edit 
-services files.
+services files from here.
 
 .. image:: pics/servicemanager.png
 
@@ -65,6 +65,6 @@ 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.
+styles and backgrounds that you use to personalize your services.
 
 .. image:: pics/thememanager.png

documentation/manual/source/index.rst

@@ -15,12 +15,4 @@ Contents:
    glossary
    dualmonitors
    mediamanager
-   songs
+   songs
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-

documentation/manual/source/songs.rst

@@ -8,26 +8,26 @@ converters provided to get data from other formats into OpenLP.
 Song Importer
 =============
 
-If you are using an earlier version of OpenLP or come from another software 
+If you are using an earlier version of OpenLP or, come from another software 
 package, you may be able to convert your existing database to work in OpenLP
-2.0. To access the Song Importer :menuselection:`File --> Import --> Song`.
+2.0. To access the Song Importer click :menuselection:`File --> Import --> Song`.
-You will then see the Song Importer window, then click :guilabel:`Next`.
+You will see the Song Importer window, then click :guilabel:`Next`.
 
 .. image:: pics/songimporter.png 
 
-After choosing :guilabel:`Next` you can then select from the various types of 
+After choosing :guilabel:`Next` you can select from the various types of 
 software that OpenLP will convert songs from.
 
 .. image:: pics/songimporterchoices.png
 
-Then click on the file folder icon to choose the file of the song database you
+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 the different 
 formats that OpenLP will import.
 
 Importing from OpenLP Version 1
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Converting from OpenLP Version 1 is a pretty simple process. You will first 
+Converting from OpenLP Version 1 is a simple process. First you will 
 need to locate your version 1 database file.
 
 Windows XP::
@@ -38,33 +38,34 @@ Windows Vista / Windows 7::
 
     C:\ProgramData\openlp.org\Data\songs.olp
 
-After clicking :guilabel:`Next` your conversion should be complete. 
+After clicking :guilabel:`Next` your conversion will be complete. 
 
 .. image:: pics/finishedimport.png
 
-Then press :guilabel:`Finish` and you should now be ready to use your OpenLP 
+Press :guilabel:`Finish` and you will now be ready to use your OpenLP 
-version one songs.
+version 1 songs.
 
 Importing from OpenSong
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-Converting from OpenSong you will need to locate your songs database. In the 
+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 should
+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 then need to select the songs from
+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
+On most operating systems, to select all the songs, first select the first song
-in the lest then press shift and select the last song in the list. After this
+in the list, press the shift key, and select the last song in the list. After
-press :guilabel:`Next` and you should see that your import has been successful.
+this press :guilabel:`Next` and you will see that your import has been 
+successful.
 
 .. image:: pics/finishedimport.png
 
-Press :guilabel:`Finish` and you will now be ready to use your songs imported
+Press :guilabel:`Finish` and OpenLP will be ready to use your songs that you
-from OpenSong.
+imported from OpenSong.
 
 Importing from CCLI Song Select
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -79,22 +80,23 @@ Then search for your desired song. For this example we will be adding the song
 
 .. image:: pics/songselectsongsearch.png
 
-For the song you are searching for select `lyrics` This should take you to a 
+For the song you are searching for, select `lyrics` This will take you to a 
-page displaying the lyrics and copyright info for your song.
+page displaying the lyrics and copyright information for your song.
 
 .. image:: pics/songselectlyrics.png
 
-Next, hover over the :guilabel:`Lyrics` menu from the upper right corner. Then
+Next, hover over the :guilabel:`Lyrics` menu from the upper right corner.
-choose either the .txt or .usr file. You will then be asked to chose a download
+Choose either the .txt or .usr file. You will be asked to chose a download
 location if your browser does not automatically select that for you. Select 
 this file from the OpenLP import window and then click :guilabel:`Next` You can
 also select multiple songs for import at once on most operating systems by 
-selecting the first item in the list then holding shift select the last item in
+selecting the first item in the list then holding the shift key and select the
-the list. When finished you should see that your import has completed.
+last item in the list. When finished, you will see that your import has 
+completed.
 
 .. image:: pics/finishedimport.png
 
-Press :guilabel:`Finish` and you will now be ready to use your songs imported
+Press :guilabel:`Finish` and OpenLP will be ready to use your songs imported
 from CCLI SongSelect.
 
 

documentation/manual/themes/openlp_qthelp/layout.html

@@ -0,0 +1,68 @@
+{#
+    openlp_qthelp/layout.html
+    ~~~~~~~~~~~~~~~~~
+
+    Sphinx layout template for the openlp_qthelp theme.
+
+    :copyright: Copyright 2004-2010 Raoul Snyman.
+    :license: GPL
+#}
+{% extends "basic/layout.html" %}
+{% set script_files = script_files + ['_static/theme_extras.js'] %}
+{% set css_files = css_files + ['_static/print.css'] %}
+
+{# do not display relbars #}
+{% block relbar1 %}{% endblock %}
+{% block relbar2 %}{% endblock %}
+
+{% macro nav() %}
+        <p>
+        {%- block openlp_qthelprel1 %}
+        {%- endblock %}
+        {%- if prev %}
+        «&#160;&#160;<a href="{{ prev.link|e }}">{{ prev.title }}</a>
+        &#160;&#160;::&#160;&#160;
+        {%- endif %}
+        <a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a>
+        {%- if next %}
+        &#160;&#160;::&#160;&#160;
+        <a href="{{ next.link|e }}">{{ next.title }}</a>&#160;&#160;»
+        {%- endif %}
+        {%- block openlp_qthelprel2 %}
+        {%- endblock %}
+        </p>
+{% endmacro %}
+
+{% block content %}
+      <!-- div class="header">
+        {%- block openlp_qthelpheader %}
+        {%- if theme_full_logo != "false" %}
+        <a href="{{ pathto('index') }}">
+          <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+        </a>
+        {%- else %}
+        {%- if logo -%}
+          <img class="rightlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+        {%- endif -%}
+        <h1 class="heading"><a href="{{ pathto('index') }}">
+          <span>{{ shorttitle|e }}</span></a></h1>
+        <h2 class="heading"><span>{{ title|striptags|e }}</span></h2>
+        {%- endif %}
+        {%- endblock %}
+      </div -->
+      <div class="topnav">
+      {{ nav() }}
+      </div>
+      <div class="content">
+        {#{%- if display_toc %}
+        <div id="toc">
+          <h3>Table Of Contents</h3>
+          {{ toc }}
+        </div>
+        {%- endif %}#}
+        {% block body %}{% endblock %}
+      </div>
+      <div class="bottomnav">
+      {{ nav() }}
+      </div>
+{% endblock %}

documentation/manual/themes/openlp_qthelp/static/openlp_qthelp.css_t

@@ -0,0 +1,372 @@
+/*
+ * openlp_qthelp.css_t
+ * ~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- openlp_qthelp theme.
+ *
+ * Adapted from http://openlp_qthelp-os.org/docs/Haiku-doc.css.
+ * Original copyright message:
+ *
+ *     Copyright 2008-2009, Haiku. All rights reserved.
+ *     Distributed under the terms of the MIT License.
+ *
+ *     Authors:
+ *              Francois Revol <revol@free.fr>
+ *              Stephan Assmus <superstippi@gmx.de>
+ *              Braden Ewing <brewin@gmail.com>
+ *              Humdinger <humdingerb@gmail.com>
+ *
+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+@import url("basic.css");
+
+html {
+    margin: 0px;
+    padding: 0px;
+    background-color: #fff;
+    background-image: none;
+}
+
+body {
+    line-height: 1.5;
+    margin: auto;
+    padding: 0px;
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+    min-width: 59em;
+    max-width: 70em;
+    color: {{ theme_textcolor }};
+}
+
+div.footer {
+    padding: 8px;
+    font-size: 11px;
+    text-align: center;
+    letter-spacing: 0.5px;
+}
+
+/* link colors and text decoration */
+
+a:link {
+    font-weight: bold;
+    text-decoration: none;
+    color: {{ theme_linkcolor }};
+}
+
+a:visited {
+    font-weight: bold;
+    text-decoration: none;
+    color: {{ theme_visitedlinkcolor }};
+}
+
+a:hover, a:active {
+    text-decoration: underline;
+    color: {{ theme_hoverlinkcolor }};
+}
+
+/* Some headers act as anchors, don't give them a hover effect */
+
+h1 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h2 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h3 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h4 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+a.headerlink {
+    color: #a7ce38;
+    padding-left: 5px;
+}
+
+a.headerlink:hover {
+    color: #a7ce38;
+}
+
+/* basic text elements */
+
+div.content {
+    margin-top: 20px;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 50px;
+    font-size: 0.9em;
+}
+
+/* heading and navigation */
+
+div.header {
+    position: relative;
+    left: 0px;
+    top: 0px;
+    height: 85px;
+    /* background: #eeeeee; */
+    padding: 0 40px;
+}
+div.header h1 {
+    font-size: 1.6em;
+    font-weight: normal;
+    letter-spacing: 1px;
+    color: {{ theme_headingcolor }};
+    border: 0;
+    margin: 0;
+    padding-top: 15px;
+}
+div.header h1 a {
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+}
+div.header h2 {
+    font-size: 1.3em;
+    font-weight: normal;
+    letter-spacing: 1px;
+    text-transform: uppercase;
+    color: #aaa;
+    border: 0;
+    margin-top: -3px;
+    padding: 0;
+}
+
+div.header img.rightlogo {
+    float: right;
+}
+
+
+div.title {
+    font-size: 1.3em;
+    font-weight: bold;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-bottom: 25px;
+}
+div.topnav {
+    /* background: #e0e0e0; */
+}
+div.topnav p {
+    margin-top: 0;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 0px;
+    text-align: right;
+    font-size: 0.8em;
+}
+div.bottomnav {
+    background: #eeeeee;
+}
+div.bottomnav p {
+    margin-right: 40px;
+    text-align: right;
+    font-size: 0.8em;
+}
+
+a.uplink {
+    font-weight: normal;
+}
+
+
+/* contents box */
+
+table.index {
+    margin: 0px 0px 30px 30px;
+    padding: 1px;
+    border-width: 1px;
+    border-style: dotted;
+    border-color: #e0e0e0;
+}
+table.index tr.heading {
+    background-color: #e0e0e0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 1.1em;
+}
+table.index tr.index {
+    background-color: #eeeeee;
+}
+table.index td {
+    padding: 5px 20px;
+}
+
+table.index a:link, table.index a:visited {
+    font-weight: normal;
+    text-decoration: none;
+    color: {{ theme_linkcolor }};
+}
+table.index a:hover, table.index a:active {
+    text-decoration: underline;
+    color: {{ theme_hoverlinkcolor }};
+}
+
+
+/* Haiku User Guide styles and layout */
+
+/* Rounded corner boxes */
+/* Common declarations */
+div.admonition {
+    -webkit-border-radius: 10px;
+    -khtml-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    border-style: dotted;
+    border-width: thin;
+    border-color: #dcdcdc;
+    padding: 10px 15px 10px 15px;
+    margin-bottom: 15px;
+    margin-top: 15px;
+}
+div.note {
+    padding: 10px 15px 10px 80px;
+    background: #e4ffde url(alert_info_32.png) 15px 15px no-repeat;
+    min-height: 42px;
+}
+div.warning {
+    padding: 10px 15px 10px 80px;
+    background: #fffbc6 url(alert_warning_32.png) 15px 15px no-repeat;
+    min-height: 42px;
+}
+div.seealso {
+    background: #e4ffde;
+}
+
+/* More layout and styles */
+h1 {
+    font-size: 1.3em;
+    font-weight: bold;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-top: 30px;
+}
+
+h2 {
+    font-size: 1.2em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-top: 30px;
+}
+
+h3 {
+    font-size: 1.1em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    margin-top: 30px;
+}
+
+h4 {
+    font-size: 1.0em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    margin-top: 30px;
+}
+
+p {
+    text-align: justify;
+}
+
+p.last {
+    margin-bottom: 0;
+}
+
+ol {
+    padding-left: 20px;
+}
+
+ul {
+    padding-left: 5px;
+    margin-top: 3px;
+}
+
+li {
+    line-height: 1.3;
+}
+
+div.content ul > li {
+    -moz-background-clip:border;
+    -moz-background-inline-policy:continuous;
+    -moz-background-origin:padding;
+    background: transparent url(bullet_orange.png) no-repeat scroll left 0.45em;
+    list-style-image: none;
+    list-style-type: none;
+    padding: 0 0 0 1.666em;
+    margin-bottom: 3px;
+}
+
+td {
+    vertical-align: top;
+}
+
+tt {
+    background-color: #e2e2e2;
+    font-size: 1.0em;
+    font-family: monospace;
+}
+
+pre {
+    border-color: #0c3762;
+    border-style: dotted;
+    border-width: thin;
+    margin: 0 0 12px 0;
+    padding: 0.8em;
+    background-color: #f0f0f0;
+}
+
+hr {
+    border-top: 1px solid #ccc;
+    border-bottom: 0;
+    border-right: 0;
+    border-left: 0;
+    margin-bottom: 10px;
+    margin-top: 20px;
+}
+
+/* printer only pretty stuff */
+@media print {
+    .noprint {
+        display: none;
+    }
+    /* for acronyms we want their definitions inlined at print time */
+    acronym[title]:after {
+        font-size: small;
+        content: " (" attr(title) ")";
+        font-style: italic;
+    }
+    /* and not have mozilla dotted underline */
+    acronym {
+        border: none;
+    }
+    div.topnav, div.bottomnav, div.header, table.index {
+        display: none;
+    }
+    div.content {
+        margin: 0px;
+        padding: 0px;
+    }
+    html {
+        background: #FFF;
+    }
+}
+
+.viewcode-back {
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+    margin: -1px -12px;
+    padding: 0 12px;
+}

documentation/manual/themes/openlp_qthelp/theme.conf

@@ -0,0 +1,12 @@
+[theme]
+inherit = basic
+stylesheet = openlp_qthelp.css
+pygments_style = autumn
+
+[options]
+full_logo         = false
+textcolor         = #333333
+headingcolor      = #203b6f
+linkcolor         = #26437c
+visitedlinkcolor  = #26437c
+hoverlinkcolor    = #26437c

openlp.pyw

@@ -7,9 +7,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,7 +24,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
 import os
 import sys
 import logging
@@ -37,6 +36,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Receiver, check_directory_exists
 from openlp.core.resources import qInitResources
 from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
+from openlp.core.ui.firsttimeform import FirstTimeForm
 from openlp.core.ui.exceptionform import ExceptionForm
 from openlp.core.ui import SplashScreen, ScreenList
 from openlp.core.utils import AppLocation, LanguageManager, VersionThread
@@ -150,10 +151,6 @@ class OpenLP(QtGui.QApplication):
             log.info(u'Openlp version %s' % app_version[u'version'])
         return app_version
 
-#    def notify(self, obj, evt):
-#        #TODO needed for presentation exceptions
-#        return QtGui.QApplication.notify(self, obj, evt)
-
     def run(self):
         """
         Run the OpenLP application.
@@ -170,6 +167,13 @@ class OpenLP(QtGui.QApplication):
         self.setOrganizationDomain(u'openlp.org')
         self.setApplicationName(u'OpenLP')
         self.setApplicationVersion(app_version[u'version'])
+        # Decide how many screens we have and their size
+        screens = ScreenList(self.desktop())
+        # First time checks in settings
+        has_run_wizard = QtCore.QSettings().value(
+            u'general/has run wizard', QtCore.QVariant(False)).toBool()
+        if not has_run_wizard:
+            FirstTimeForm(screens).exec_()
         if os.name == u'nt':
             self.setStyleSheet(application_stylesheet)
         show_splash = QtCore.QSettings().value(
@@ -179,21 +183,16 @@ class OpenLP(QtGui.QApplication):
             self.splash.show()
         # make sure Qt really display the splash screen
         self.processEvents()
-        screens = ScreenList()
-        # Decide how many screens we have and their size
-        for screen in xrange(0, self.desktop().numScreens()):
-            size = self.desktop().screenGeometry(screen)
-            screens.add_screen({u'number': screen,
-                u'size': size,
-                u'primary': (self.desktop().primaryScreen() == screen)})
-            log.info(u'Screen %d found with resolution %s', screen, size)
         # start the main app window
-        self.mainWindow = MainWindow(screens, app_version)
+        self.mainWindow = MainWindow(screens, app_version, self.clipboard())
         self.mainWindow.show()
         if show_splash:
             # now kill the splashscreen
             self.splash.finish(self.mainWindow)
         self.mainWindow.repaint()
+        self.processEvents()
+        if not has_run_wizard:
+            self.mainWindow.firstTime()
         update_check = QtCore.QSettings().value(
             u'general/update check', QtCore.QVariant(True)).toBool()
         if update_check:
@@ -272,7 +271,19 @@ def main():
     qInitResources()
     # Now create and actually run the application.
     app = OpenLP(qt_args)
-    #i18n Set Language
+    # Define the settings environment
+    settings = QtCore.QSettings(u'OpenLP', u'OpenLP')
+    # First time checks in settings
+    # Use explicit reference as not inside a QT environment yet
+    if not settings.value(u'general/has run wizard',
+        QtCore.QVariant(False)).toBool():
+        if not FirstTimeLanguageForm().exec_():
+            # if cancel then stop processing
+            sys.exit()
+    if sys.platform == u'darwin':
+        OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
+            + "/qt4_plugins")
+    # i18n Set Language
     language = LanguageManager.get_language()
     appTranslator = LanguageManager.get_translator(language)
     app.installTranslator(appTranslator)

openlp/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,4 +25,4 @@
 ###############################################################################
 """
 The :mod:`openlp` module contains all the project produced OpenLP functionality
-"""
+"""

openlp/core/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,4 +28,4 @@ The :mod:`core` module provides all core application functions
 
 All the core functions of the OpenLP application including the GUI, settings,
 logging and a plugin framework are contained within the openlp.core module.
-"""
+"""

openlp/core/lib/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -106,8 +106,8 @@ def translate(context, text, comment=None,
 
 def get_text_file_string(text_file):
     """
-    Open a file and return its content as unicode string.  If the supplied file
+    Open a file and return its content as unicode string. If the supplied file
-    name is not a file then the function returns False.  If there is an error
+    name is not a file then the function returns False. If there is an error
     loading the file or the content can't be decoded then the function will
     return None.
 
@@ -239,7 +239,8 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
     Resize an image to fit on the current screen.
 
     ``image``
-        The image to resize.
+        The image to resize. It has to be either a ``QImage`` instance or the
+        path to the image.
 
     ``width``
         The new image width.
@@ -247,9 +248,8 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
     ``height``
         The new image height.
 
-     ``background``
+    ``background``
         The background colour defaults to black.
-
     """
     log.debug(u'resize_image - start')
     if isinstance(image, QtGui.QImage):
@@ -319,8 +319,7 @@ def check_directory_exists(dir):
     if not os.path.exists(dir):
         os.makedirs(dir)
 
-from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
+from listwidgetwithdnd import ListWidgetWithDnD
-    BackgroundType, HorizontalType, VerticalType
 from displaytags import DisplayTags
 from spelltextedit import SpellTextEdit
 from eventreceiver import Receiver
@@ -339,4 +338,3 @@ from dockwidget import OpenLPDockWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
-from baselistwithdnd import BaseListWithDnD

openlp/core/lib/db.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -65,7 +65,7 @@ def delete_database(plugin_name, db_file_name=None):
         The name of the plugin to remove the database for
 
     ``db_file_name``
-        The database file name.  Defaults to None resulting in the
+        The database file name. Defaults to None resulting in the
         plugin_name being used.
     """
     db_file_path = None
@@ -86,10 +86,11 @@ class BaseModel(object):
         """
         Creates an instance of a class and populates it, returning the instance
         """
-        me = cls()
+        instance = cls()
         for key in kwargs:
-            me.__setattr__(key, kwargs[key])
+            instance.__setattr__(key, kwargs[key])
-        return me
+        return instance
+
 
 class Manager(object):
     """
@@ -107,7 +108,7 @@ class Manager(object):
             The init_schema function for this database
 
         ``db_file_name``
-            The file name to use for this database.  Defaults to None resulting
+            The file name to use for this database. Defaults to None resulting
             in the plugin_name being used.
         """
         settings = QtCore.QSettings()
@@ -211,11 +212,11 @@ class Manager(object):
             The type of objects to return
 
         ``filter_clause``
-            The filter governing selection of objects to return.  Defaults to
+            The filter governing selection of objects to return. Defaults to
             None.
 
         ``order_by_ref``
-            Any parameters to order the returned objects by.  Defaults to None.
+            Any parameters to order the returned objects by. Defaults to None.
         """
         query = self.session.query(object_class)
         if filter_clause is not None:
@@ -232,7 +233,7 @@ class Manager(object):
             The type of objects to return.
 
         ``filter_clause``
-            The filter governing selection of objects to return.  Defaults to
+            The filter governing selection of objects to return. Defaults to
             None.
         """
         query = self.session.query(object_class)

openlp/core/lib/displaytags.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -60,8 +60,8 @@ class DisplayTags(object):
         DisplayTags.html_expands.append(tag)
 
     @staticmethod
-    def remove_html_tag(id):
+    def remove_html_tag(tag_id):
         """
-        Removes amd individual html_expands list.
+        Removes an individual html_expands tag.
         """
-        DisplayTags.html_expands.pop(id)
+        DisplayTags.html_expands.pop(tag_id)

openlp/core/lib/dockwidget.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/lib/eventreceiver.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/lib/htmlbuilder.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,7 +28,8 @@ import logging
 
 from PyQt4 import QtWebKit
 
-from openlp.core.lib import BackgroundType, BackgroundGradientType
+from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, \
+    VerticalType, HorizontalType
 
 log = logging.getLogger(__name__)
 
@@ -530,18 +531,8 @@ def build_lyrics_format_css(theme, width, height):
         Height of the lyrics block
 
     """
-    if theme.display_horizontal_align == 2:
+    align = HorizontalType.Names[theme.display_horizontal_align]
-        align = u'center'
+    valign = VerticalType.Names[theme.display_vertical_align]
-    elif theme.display_horizontal_align == 1:
-        align = u'right'
-    else:
-        align = u'left'
-    if theme.display_vertical_align == 2:
-        valign = u'bottom'
-    elif theme.display_vertical_align == 1:
-        valign = u'middle'
-    else:
-        valign = u'top'
     if theme.font_main_outline:
         left_margin = int(theme.font_main_outline_size) * 2
     else:
@@ -634,13 +625,7 @@ def build_alert_css(alertTab, width):
     """
     if not alertTab:
         return u''
-    align = u''
+    align = VerticalType.Names[alertTab.location]
-    if alertTab.location == 2:
-        align = u'bottom'
-    elif alertTab.location == 1:
-        align = u'middle'
-    else:
-        align = u'top'
     alert = style % (width, align, alertTab.font_face, alertTab.font_size,
         alertTab.font_color, alertTab.bg_color)
     return alert

openlp/core/lib/imagemanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -61,14 +61,15 @@ class Image(object):
     image = None
     image_bytes = None
 
+
 class ImageManager(QtCore.QObject):
     """
     Image Manager handles the conversion and sizing of images.
-
     """
     log.info(u'Image Manager loaded')
 
     def __init__(self):
+        QtCore.QObject.__init__(self)
         self._cache = {}
         self._thread_running = False
         self._cache_dirty = False
@@ -85,8 +86,7 @@ class ImageManager(QtCore.QObject):
         for key in self._cache.keys():
             image = self._cache[key]
             image.dirty = True
-            image.image = resize_image(image.path,
+            image.image = resize_image(image.path, self.width, self.height)
-                self.width, self.height)
         self._cache_dirty = True
         # only one thread please
         if not self._thread_running:
@@ -128,8 +128,7 @@ class ImageManager(QtCore.QObject):
             image = Image()
             image.name = name
             image.path = path
-            image.image = resize_image(path,
+            image.image = resize_image(path, self.width, self.height)
-                self.width, self.height)
             self._cache[name] = image
         else:
             log.debug(u'Image in cache %s:%s' % (name, path))

openlp/core/lib/listwidgetwithdnd.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,17 +28,17 @@ Extend QListWidget to handle drag and drop functionality
 """
 from PyQt4 import QtCore, QtGui
 
-class BaseListWithDnD(QtGui.QListWidget):
+class ListWidgetWithDnD(QtGui.QListWidget):
     """
     Provide a list widget to store objects and handle drag and drop events
     """
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, name=u''):
         """
         Initialise the list widget
         """
         QtGui.QListWidget.__init__(self, parent)
-        # this must be set by the class which is inheriting
+        self.mimeDataText = name
-        assert(self.PluginName)
+        assert(self.mimeDataText)
 
     def mouseMoveEvent(self, event):
         """
@@ -47,9 +47,10 @@ class BaseListWithDnD(QtGui.QListWidget):
         just tell it what plugin to call
         """
         if event.buttons() != QtCore.Qt.LeftButton:
+            event.ignore()
             return
         drag = QtGui.QDrag(self)
         mimeData = QtCore.QMimeData()
         drag.setMimeData(mimeData)
-        mimeData.setText(self.PluginName)
+        mimeData.setText(self.mimeDataText)
-        drag.start(QtCore.Qt.CopyAction)
+        drag.start(QtCore.Qt.CopyAction)

openlp/core/lib/mediamanageritem.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -33,7 +33,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import context_menu_action, context_menu_separator, \
     SettingsManager, OpenLPToolbar, ServiceItem, StringContent, build_icon, \
-    translate, Receiver
+    translate, Receiver, ListWidgetWithDnD
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
@@ -65,19 +66,15 @@ class MediaManagerItem(QtGui.QWidget):
     When creating a descendant class from this class for your plugin,
     the following member variables should be set.
 
-     ``self.OnNewPrompt``
+     ``self.onNewPrompt``
+
         Defaults to *'Select Image(s)'*.
 
-     ``self.OnNewFileMasks``
+     ``self.onNewFileMasks``
         Defaults to *'Images (*.jpg *jpeg *.gif *.png *.bmp)'*. This
         assumes that the new action is to load a file. If not, you
         need to override the ``OnNew`` method.
 
-     ``self.ListViewWithDnD_class``
-        This must be a **class**, not an object, descended from
-        ``openlp.core.lib.BaseListWithDnD`` that is not used in any
-        other part of OpenLP.
-
      ``self.PreviewFunction``
         This must be a method which returns a QImage to represent the
         item (usually a preview). No scaling is required, that is
@@ -158,7 +155,7 @@ class MediaManagerItem(QtGui.QWidget):
 
         ``icon``
             The icon of the button. This can be an instance of QIcon, or a
-            string cotaining either the absolute path to the image, or an
+            string containing either the absolute path to the image, or an
             internal resource path starting with ':/'.
 
         ``slot``
@@ -202,68 +199,50 @@ class MediaManagerItem(QtGui.QWidget):
         """
         Create buttons for the media item toolbar
         """
+        toolbar_actions = []
         ## Import Button ##
         if self.hasImportIcon:
-            import_string = self.plugin.getString(StringContent.Import)
+            toolbar_actions.append([StringContent.Import,
-            self.addToolbarButton(
+            u':/general/general_import.png', self.onImportClick])
-                import_string[u'title'],
-                import_string[u'tooltip'],
-                u':/general/general_import.png', self.onImportClick)
         ## Load Button ##
         if self.hasFileIcon:
-            load_string = self.plugin.getString(StringContent.Load)
+            toolbar_actions.append([StringContent.Load,
-            self.addToolbarButton(
+                u':/general/general_open.png', self.onFileClick])
-                load_string[u'title'],
-                load_string[u'tooltip'],
-                u':/general/general_open.png', self.onFileClick)
         ## New Button ##
         if self.hasNewIcon:
-            new_string = self.plugin.getString(StringContent.New)
+            toolbar_actions.append([StringContent.New,
-            self.addToolbarButton(
+                u':/general/general_new.png', self.onNewClick])
-                new_string[u'title'],
-                new_string[u'tooltip'],
-                u':/general/general_new.png', self.onNewClick)
         ## Edit Button ##
         if self.hasEditIcon:
-            edit_string = self.plugin.getString(StringContent.Edit)
+            toolbar_actions.append([StringContent.Edit,
-            self.addToolbarButton(
+                u':/general/general_edit.png', self.onEditClick])
-                edit_string[u'title'],
-                edit_string[u'tooltip'],
-                u':/general/general_edit.png', self.onEditClick)
         ## Delete Button ##
         if self.hasDeleteIcon:
-            delete_string = self.plugin.getString(StringContent.Delete)
+            toolbar_actions.append([StringContent.Delete,
-            self.addToolbarButton(
+                u':/general/general_delete.png', self.onDeleteClick])
-                delete_string[u'title'],
-                delete_string[u'tooltip'],
-                u':/general/general_delete.png', self.onDeleteClick)
-        ## Separator Line ##
-        self.addToolbarSeparator()
         ## Preview ##
-        preview_string = self.plugin.getString(StringContent.Preview)
+        toolbar_actions.append([StringContent.Preview,
-        self.addToolbarButton(
+            u':/general/general_preview.png', self.onPreviewClick])
-            preview_string[u'title'],
-            preview_string[u'tooltip'],
-            u':/general/general_preview.png', self.onPreviewClick)
         ## Live Button ##
-        live_string = self.plugin.getString(StringContent.Live)
+        toolbar_actions.append([StringContent.Live,
-        self.addToolbarButton(
+            u':/general/general_live.png', self.onLiveClick])
-            live_string[u'title'],
-            live_string[u'tooltip'],
-            u':/general/general_live.png', self.onLiveClick)
         ## Add to service Button ##
-        service_string = self.plugin.getString(StringContent.Service)
+        toolbar_actions.append([StringContent.Service,
-        self.addToolbarButton(
+            u':/general/general_add.png', self.onAddClick])
-            service_string[u'title'],
+        for action in toolbar_actions:
-            service_string[u'tooltip'],
+            if action[0] == StringContent.Preview:
-            u':/general/general_add.png', self.onAddClick)
+                self.addToolbarSeparator()
+            self.addToolbarButton(
+                self.plugin.getString(action[0])[u'title'],
+                self.plugin.getString(action[0])[u'tooltip'],
+                action[1], action[2])
 
     def addListViewToToolBar(self):
         """
         Creates the main widget for listing items the media item is tracking
         """
         # Add the List widget
-        self.listView = self.ListViewWithDnD_class(self)
+        self.listView = ListWidgetWithDnD(self, self.plugin.name)
         self.listView.uniformItemSizes = True
         self.listView.setSpacing(1)
         self.listView.setSelectionMode(
@@ -275,7 +254,6 @@ class MediaManagerItem(QtGui.QWidget):
         self.pageLayout.addWidget(self.listView)
         # define and add the context menu
         self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
-        name_string = self.plugin.getString(StringContent.Name)
         if self.hasEditIcon:
             self.listView.addAction(
                 context_menu_action(
@@ -340,9 +318,9 @@ class MediaManagerItem(QtGui.QWidget):
         Add a file to the list widget to make it available for showing
         """
         files = QtGui.QFileDialog.getOpenFileNames(
-            self, self.OnNewPrompt,
+            self, self.onNewPrompt,
             SettingsManager.get_last_dir(self.settingsSection),
-            self.OnNewFileMasks)
+            self.onNewFileMasks)
         log.info(u'New files(s) %s', unicode(files))
         if files:
             Receiver.send_message(u'cursor_busy')
@@ -371,11 +349,11 @@ class MediaManagerItem(QtGui.QWidget):
         Validates whether an image still exists and, if it does, is the
         thumbnail representation of the image up to date.
         """
-        if not os.path.exists(image):
+        if not os.path.exists(unicode(image)):
             return False
         if os.path.exists(thumb):
-            imageDate = os.stat(image).st_mtime
+            imageDate = os.stat(unicode(image)).st_mtime
-            thumbDate = os.stat(thumb).st_mtime
+            thumbDate = os.stat(unicode(thumb)).st_mtime
             # If image has been updated rebuild icon
             if imageDate > thumbDate:
                 self.iconFromFile(image, thumb)
@@ -439,8 +417,7 @@ class MediaManagerItem(QtGui.QWidget):
         item to the preview slide controller.
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self,
+            QtGui.QMessageBox.information(self, UiStrings.NISp,
-                translate('OpenLP.MediaManagerItem', 'No Items Selected'),
                 translate('OpenLP.MediaManagerItem',
                 'You must select one or more items to preview.'))
         else:
@@ -456,8 +433,7 @@ class MediaManagerItem(QtGui.QWidget):
         item to the live slide controller.
         """
         if not self.listView.selectedIndexes():
-            QtGui.QMessageBox.information(self,
+            QtGui.QMessageBox.information(self, UiStrings.NISp,
-                translate('OpenLP.MediaManagerItem', 'No Items Selected'),
                 translate('OpenLP.MediaManagerItem',
                     'You must select one or more items to send live.'))
         else:
@@ -472,8 +448,7 @@ class MediaManagerItem(QtGui.QWidget):
         Add a selected item to the current service
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self,
+            QtGui.QMessageBox.information(self, UiStrings.NISp,
-                translate('OpenLP.MediaManagerItem', 'No Items Selected'),
                 translate('OpenLP.MediaManagerItem',
                     'You must select one or more items.'))
         else:
@@ -499,17 +474,14 @@ class MediaManagerItem(QtGui.QWidget):
         Add a selected item to an existing item in the current service.
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self,
+            QtGui.QMessageBox.information(self, UiStrings.NISp,
-                translate('OpenLP.MediaManagerItem', 'No items selected'),
                 translate('OpenLP.MediaManagerItem',
-                    'You must select one or more items'))
+                    'You must select one or more items.'))
         else:
             log.debug(u'%s Add requested', self.plugin.name)
             serviceItem = self.parent.serviceManager.getServiceItem()
             if not serviceItem:
-                QtGui.QMessageBox.information(self,
+                QtGui.QMessageBox.information(self, UiStrings.NISs,
-                    translate('OpenLP.MediaManagerItem',
-                        'No Service Item Selected'),
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
             elif self.plugin.name.lower() == serviceItem.name.lower():

openlp/core/lib/plugin.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -31,6 +31,7 @@ import logging
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
@@ -44,6 +45,9 @@ class PluginStatus(object):
 
 
 class StringContent(object):
+    """
+    Provide standard strings for objects to use.
+    """
     Name = u'name'
     Import = u'import'
     Load = u'load'
@@ -110,7 +114,8 @@ class Plugin(QtCore.QObject):
     """
     log.info(u'loaded')
 
-    def __init__(self, name, version=None, pluginHelpers=None):
+    def __init__(self, name, pluginHelpers=None, mediaItemClass=None,
+        settingsTabClass=None, version=None):
         """
         This is the constructor for the plugin object. This provides an easy
         way for descendent plugins to populate common data. This method *must*
@@ -118,7 +123,7 @@ class Plugin(QtCore.QObject):
 
             class MyPlugin(Plugin):
                 def __init__(self):
-                    Plugin.__init__(self, u'MyPlugin', u'0.1')
+                    Plugin.__init__(self, u'MyPlugin', version=u'0.1')
 
         ``name``
             Defaults to *None*. The name of the plugin.
@@ -128,15 +133,23 @@ class Plugin(QtCore.QObject):
 
         ``pluginHelpers``
             Defaults to *None*. A list of helper objects.
+
+        ``mediaItemClass``
+            The class name of the plugin's media item.
+
+        ``settingsTabClass``
+            The class name of the plugin's settings tab.
         """
         QtCore.QObject.__init__(self)
         self.name = name
         self.textStrings = {}
         self.setPluginTextStrings()
-        if version:
+        self.nameStrings = self.textStrings[StringContent.Name]
-            self.version = version
+        self.version = version if version else u'1.9.4'
         self.settingsSection = self.name.lower()
         self.icon = None
+        self.mediaItemClass = mediaItemClass
+        self.settingsTabClass = settingsTabClass
         self.weight = 0
         self.status = PluginStatus.Inactive
         # Set up logging
@@ -195,7 +208,9 @@ class Plugin(QtCore.QObject):
         Construct a MediaManagerItem object with all the buttons and things
         you need, and return it for integration into openlp.org.
         """
-        pass
+        if self.mediaItemClass:
+            return self.mediaItemClass(self, self, self.icon)
+        return None
 
     def addImportMenuItem(self, importMenu):
         """
@@ -226,9 +241,13 @@ class Plugin(QtCore.QObject):
 
     def getSettingsTab(self):
         """
-        Create a tab for the settings window.
+        Create a tab for the settings window to display the configurable
+        options for this plugin to the user.
         """
-        pass
+        if self.settingsTabClass:
+            return self.settingsTabClass(self.name,
+                self.getString(StringContent.VisibleName)[u'title'])
+        return None
 
     def addToMenu(self, menubar):
         """
@@ -316,8 +335,39 @@ class Plugin(QtCore.QObject):
         """
         return self.textStrings[name]
 
-    def setPluginTextStrings(self):
+    def setPluginUiTextStrings(self, tooltips):
         """
         Called to define all translatable texts of the plugin
         """
-        pass
+        ## Load Action ##
+        self.__setNameTextString(StringContent.Load,
+            UiStrings.Load, tooltips[u'load'])
+        ## Import Action ##
+        self.__setNameTextString(StringContent.Import,
+            UiStrings.Import, tooltips[u'import'])
+        ## New Action ##
+        self.__setNameTextString(StringContent.New,
+            UiStrings.Add, tooltips[u'new'])
+        ## Edit Action ##
+        self.__setNameTextString(StringContent.Edit,
+            UiStrings.Edit, tooltips[u'edit'])
+        ## Delete Action ##
+        self.__setNameTextString(StringContent.Delete,
+            UiStrings.Delete, tooltips[u'delete'])
+        ## Preview Action ##
+        self.__setNameTextString(StringContent.Preview,
+            UiStrings.Preview, tooltips[u'preview'])
+        ## Send Live Action ##
+        self.__setNameTextString(StringContent.Live,
+            UiStrings.Live, tooltips[u'live'])
+        ## Add to Service Action ##
+        self.__setNameTextString(StringContent.Service,
+            UiStrings.Service, tooltips[u'service'])
+
+    def __setNameTextString(self, name, title, tooltip):
+        """
+        Utility method for creating a plugin's textStrings. This method makes
+        use of the singular name of the plugin object so must only be called
+        after this has been set.
+        """
+        self.textStrings[name] = {u'title': title, u'tooltip': tooltip}

openlp/core/lib/pluginmanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -49,16 +49,13 @@ class PluginManager(object):
         ``plugin_dir``
             The directory to search for plugins.
         """
-        log.info(u'Plugin manager initing')
+        log.info(u'Plugin manager Initialising')
         if not plugin_dir in sys.path:
             log.debug(u'Inserting %s into sys.path', plugin_dir)
             sys.path.insert(0, plugin_dir)
         self.basepath = os.path.abspath(plugin_dir)
         log.debug(u'Base path %s ', self.basepath)
-        self.plugin_helpers = []
         self.plugins = []
-        # this has to happen after the UI is sorted
-        # self.find_plugins(plugin_dir)
         log.info(u'Plugin manager Initialised')
 
     def find_plugins(self, plugin_dir, plugin_helpers):
@@ -73,7 +70,7 @@ class PluginManager(object):
             A list of helper objects to pass to the plugins.
 
         """
-        self.plugin_helpers = plugin_helpers
+        log.info(u'Finding plugins')
         startdepth = len(os.path.abspath(plugin_dir).split(os.sep))
         log.debug(u'finding plugins in %s at depth %d',
             unicode(plugin_dir), startdepth)
@@ -102,11 +99,11 @@ class PluginManager(object):
         plugin_objects = []
         for p in plugin_classes:
             try:
-                plugin = p(self.plugin_helpers)
+                plugin = p(plugin_helpers)
-                log.debug(u'Loaded plugin %s with helpers', unicode(p))
+                log.debug(u'Loaded plugin %s', unicode(p))
                 plugin_objects.append(plugin)
             except TypeError:
-                log.exception(u'loaded plugin %s has no helpers', unicode(p))
+                log.exception(u'Failed to load plugin %s', unicode(p))
         plugins_list = sorted(plugin_objects, self.order_by_weight)
         for plugin in plugins_list:
             if plugin.checkPreConditions():
@@ -203,6 +200,7 @@ class PluginManager(object):
         Loop through all the plugins and give them an opportunity to
         initialise themselves.
         """
+        log.info(u'Initialise Plugins - Started')
         for plugin in self.plugins:
             log.info(u'initialising plugins %s in a %s state'
                 % (plugin.name, plugin.isActive()))
@@ -211,6 +209,7 @@ class PluginManager(object):
                 log.info(u'Initialisation Complete for %s ' % plugin.name)
             if not plugin.isActive():
                 plugin.removeToolboxItem()
+        log.info(u'Initialise Plugins - Finished')
 
     def finalise_plugins(self):
         """
@@ -221,4 +220,4 @@ class PluginManager(object):
         for plugin in self.plugins:
             if plugin.isActive():
                 plugin.finalise()
-                log.info(u'Finalisation Complete for %s ' % plugin.name)
+                log.info(u'Finalisation Complete for %s ' % plugin.name)

openlp/core/lib/renderer.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -144,4 +144,4 @@ class Renderer(object):
             html_text = html_text[:len(html_text)-4]
         formatted.append(html_text)
         log.debug(u'format_slide - End')
-        return formatted
+        return formatted

openlp/core/lib/rendermanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,11 +28,21 @@ import logging
 
 from PyQt4 import QtCore
 
-from openlp.core.lib import Renderer, ThemeLevel, ServiceItem, ImageManager
+from openlp.core.lib import Renderer, ServiceItem, ImageManager
+from openlp.core.lib.theme import ThemeLevel
 from openlp.core.ui import MainDisplay
 
 log = logging.getLogger(__name__)
 
+VERSE = u'The Lord said to {r}Noah{/r}: \n' \
+    'There\'s gonna be a {su}floody{/su}, {sb}floody{/sb}\n' \
+    'The Lord said to {g}Noah{/g}:\n' \
+    'There\'s gonna be a {st}floody{/st}, {it}floody{/it}\n' \
+    'Get those children out of the muddy, muddy \n' \
+    '{r}C{/r}{b}h{/b}{bl}i{/bl}{y}l{/y}{g}d{/g}{pk}' \
+    'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
+FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
+
 class RenderManager(object):
     """
     Class to pull all Renderer interactions into one place. The plugins will
@@ -59,7 +69,6 @@ class RenderManager(object):
         self.image_manager = ImageManager()
         self.display = MainDisplay(self, screens, False)
         self.display.imageManager = self.image_manager
-        self.display.setup()
         self.theme_manager = theme_manager
         self.renderer = Renderer()
         self.calculate_default(self.screens.current[u'size'])
@@ -68,7 +77,6 @@ class RenderManager(object):
         self.theme_level = u''
         self.override_background = None
         self.theme_data = None
-        self.alertTab = None
         self.force_page = False
 
     def update_display(self):
@@ -174,14 +182,13 @@ class RenderManager(object):
         main_rect = None
         footer_rect = None
         if not theme.font_main_override:
-            main_rect = QtCore.QRect(10, 0,
+            main_rect = QtCore.QRect(10, 0, self.width - 20, self.footer_start)
-                            self.width - 20, self.footer_start)
         else:
             main_rect = QtCore.QRect(theme.font_main_x, theme.font_main_y,
                 theme.font_main_width - 1, theme.font_main_height - 1)
         if not theme.font_footer_override:
-            footer_rect = QtCore.QRect(10, self.footer_start,
+            footer_rect = QtCore.QRect(10, self.footer_start, self.width - 20,
-                            self.width - 20, self.height - self.footer_start)
+                self.height - self.footer_start)
         else:
             footer_rect = QtCore.QRect(theme.font_footer_x,
                 theme.font_footer_y, theme.font_footer_width - 1,
@@ -203,28 +210,17 @@ class RenderManager(object):
         self.force_page = force_page
         # set the default image size for previews
         self.calculate_default(self.screens.preview[u'size'])
-        verse = u'The Lord said to {r}Noah{/r}: \n' \
-        'There\'s gonna be a {su}floody{/su}, {sb}floody{/sb}\n' \
-        'The Lord said to {g}Noah{/g}:\n' \
-        'There\'s gonna be a {st}floody{/st}, {it}floody{/it}\n' \
-        'Get those children out of the muddy, muddy \n' \
-        '{r}C{/r}{b}h{/b}{bl}i{/bl}{y}l{/y}{g}d{/g}{pk}' \
-        'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
-        # make big page for theme edit dialog to get line count
-        if self.force_page:
-            verse = verse + verse + verse
-        else:
-            self.image_manager.del_image(theme_data.theme_name)
-        footer = []
-        footer.append(u'Arky Arky (Unknown)' )
-        footer.append(u'Public Domain')
-        footer.append(u'CCLI 123456')
         # build a service item to generate preview
         serviceItem = ServiceItem()
         serviceItem.theme = theme_data
-        serviceItem.add_from_text(u'', verse, footer)
+        if self.force_page:
+            # make big page for theme edit dialog to get line count
+            serviceItem.add_from_text(u'', VERSE + VERSE + VERSE, FOOTER)
+        else:
+            self.image_manager.del_image(theme_data.theme_name)
+            serviceItem.add_from_text(u'', VERSE, FOOTER)
         serviceItem.render_manager = self
-        serviceItem.raw_footer = footer
+        serviceItem.raw_footer = FOOTER
         serviceItem.render(True)
         if not self.force_page:
             self.display.buildHtml(serviceItem)
@@ -259,6 +255,6 @@ class RenderManager(object):
         self.height = screen.height()
         self.screen_ratio = float(self.height) / float(self.width)
         log.debug(u'calculate default %d, %d, %f',
-            self.width, self.height, self.screen_ratio )
+            self.width, self.height, self.screen_ratio)
         # 90% is start of footer
-        self.footer_start = int(self.height * 0.90)
+        self.footer_start = int(self.height * 0.90)

openlp/core/lib/searchedit.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/lib/serviceitem.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,11 +28,13 @@ The :mod:`serviceitem` provides the service item functionality including the
 type and capability of an item.
 """
 
+import datetime
 import logging
 import os
 import uuid
 
 from openlp.core.lib import build_icon, clean_tags, expand_tags
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
@@ -60,6 +62,7 @@ class ItemCapabilities(object):
     AddIfNewItem = 9
     ProvidesOwnDisplay = 10
     AllowsDetailedTitleDisplay = 11
+    AllowsVariableStartTime = 12
 
 
 class ServiceItem(object):
@@ -85,8 +88,8 @@ class ServiceItem(object):
         self.audit = u''
         self.items = []
         self.iconic_representation = None
-        self.raw_footer = None
+        self.raw_footer = []
-        self.foot_text = None
+        self.foot_text = u''
         self.theme = None
         self.service_item_type = None
         self._raw_frames = []
@@ -105,6 +108,8 @@ class ServiceItem(object):
         self.data_string = u''
         self.edit_id = None
         self.xml_version = None
+        self.start_time = 0
+        self.media_length = 0
         self._new_item()
 
     def _new_item(self):
@@ -157,9 +162,7 @@ class ServiceItem(object):
         line_break = True
         if self.is_capable(ItemCapabilities.NoLineBreaks):
             line_break = False
-        theme = None
+        theme = self.theme if self.theme else None
-        if self.theme:
-            theme = self.theme
         self.main, self.footer = \
             self.render_manager.set_override_theme(theme, useOverride)
         self.themedata = self.render_manager.renderer._theme
@@ -180,13 +183,12 @@ class ServiceItem(object):
         else:
             log.error(u'Invalid value renderer :%s' % self.service_item_type)
         self.title = clean_tags(self.title)
-        self.foot_text = None
+        # The footer should never be None, but to be compatible with older
-        if self.raw_footer:
+        # release of OpenLP, we have to correct this to avoid tracebacks.
-            for foot in self.raw_footer:
+        if self.raw_footer is None:
-                if not self.foot_text:
+            self.raw_footer = []
-                    self.foot_text = foot
+        self.foot_text = \
-                else:
+            u'<br>'.join([footer for footer in self.raw_footer if footer])
-                    self.foot_text = u'%s<br>%s' % (self.foot_text, foot)
 
     def add_from_image(self, path, title):
         """
@@ -199,8 +201,7 @@ class ServiceItem(object):
             A title for the slide in the service item.
         """
         self.service_item_type = ServiceItemType.Image
-        self._raw_frames.append(
+        self._raw_frames.append({u'title': title, u'path': path})
-            {u'title': title, u'path': path})
         self.render_manager.image_manager.add_image(title, path)
         self._new_item()
 
@@ -257,7 +258,9 @@ class ServiceItem(object):
             u'capabilities': self.capabilities,
             u'search': self.search_string,
             u'data': self.data_string,
-            u'xml_version': self.xml_version
+            u'xml_version': self.xml_version,
+            u'start_time': self.start_time,
+            u'media_length': self.media_length
         }
         service_data = []
         if self.service_item_type == ServiceItemType.Text:
@@ -301,6 +304,10 @@ class ServiceItem(object):
             self.data_string = header[u'data']
         if u'xml_version' in header:
             self.xml_version = header[u'xml_version']
+        if u'start_time' in header:
+            self.start_time = header[u'start_time']
+        if u'media_length' in header:
+            self.media_length = header[u'media_length']
         if self.service_item_type == ServiceItemType.Text:
             for slide in serviceitem[u'serviceitem'][u'data']:
                 self._raw_frames.append(slide)
@@ -312,7 +319,7 @@ class ServiceItem(object):
             for text_image in serviceitem[u'serviceitem'][u'data']:
                 filename = os.path.join(path, text_image[u'title'])
                 self.add_from_command(
-                    path, text_image[u'title'], text_image[u'image'] )
+                    path, text_image[u'title'], text_image[u'image'])
         self._new_item()
 
     def get_display_title(self):
@@ -420,3 +427,24 @@ class ServiceItem(object):
             return self._raw_frames[row][u'path']
         except IndexError:
             return u''
+
+    def get_media_time(self):
+        """
+        Returns the start and finish time for a media item
+        """
+        start = None
+        end = None
+        if self.start_time != 0:
+            start = UiStrings.StartTimeCode % \
+                unicode(datetime.timedelta(seconds=self.start_time))
+        if self.media_length != 0:
+            end = UiStrings.LengthTime % \
+                unicode(datetime.timedelta(seconds=self.media_length))
+        if not start and not end:
+            return None
+        elif start and not end:
+            return start
+        elif not start and end:
+            return end
+        else:
+            return u'%s : %s' % (start, end)

openlp/core/lib/settingsmanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -64,7 +64,7 @@ class SettingsManager(object):
         Read the last directory used for plugin.
 
         ``section``
-            The section of code calling the method.  This is used in the
+            The section of code calling the method. This is used in the
             settings key.
 
         ``num``
@@ -84,7 +84,7 @@ class SettingsManager(object):
         Save the last directory used for plugin.
 
         ``section``
-            The section of code calling the method.  This is used in the
+            The section of code calling the method. This is used in the
             settings key.
 
         ``directory``
@@ -160,11 +160,11 @@ class SettingsManager(object):
         Get a list of files from the data files path.
 
         ``section``
-            Defaults to *None*.  The section of code getting the files - used
+            Defaults to *None*. The section of code getting the files - used
             to load from a section's data subdirectory.
 
         ``extension``
-            Defaults to *None*.  The extension to search for.
+            Defaults to *None*. The extension to search for.
         """
         path = AppLocation.get_data_path()
         if section:
@@ -178,4 +178,4 @@ class SettingsManager(object):
                 if extension == os.path.splitext(filename)[1]]
         else:
             # no filtering required
-            return files
+            return files

openlp/core/lib/settingstab.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/lib/spelltextedit.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/lib/theme.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -33,7 +33,8 @@ import logging
 from xml.dom.minidom import Document
 from lxml import etree, objectify
 
-from openlp.core.lib import str_to_bool
+from openlp.core.lib import str_to_bool, translate
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
@@ -90,6 +91,7 @@ class ThemeLevel(object):
     Service = 2
     Song = 3
 
+
 class BackgroundType(object):
     """
     Type enumeration for backgrounds.
@@ -122,6 +124,7 @@ class BackgroundType(object):
         elif type_string == u'image':
             return BackgroundType.Image
 
+
 class BackgroundGradientType(object):
     """
     Type enumeration for background gradients.
@@ -164,13 +167,21 @@ class BackgroundGradientType(object):
         elif type_string == u'leftBottom':
             return BackgroundGradientType.LeftBottom
 
+
 class HorizontalType(object):
     """
     Type enumeration for horizontal alignment.
     """
     Left = 0
-    Center = 1
+    Right = 1
-    Right = 2
+    Center = 2
+
+    Names = [u'left', u'right', u'center']
+    TranslatedNames = [
+        translate('OpenLP.ThemeWizard', 'Left'),
+        translate('OpenLP.ThemeWizard', 'Right'),
+        translate('OpenLP.ThemeWizard', 'Center')]
+
 
 class VerticalType(object):
     """
@@ -180,6 +191,10 @@ class VerticalType(object):
     Middle = 1
     Bottom = 2
 
+    Names = [u'top', u'middle', u'bottom']
+    TranslatedNames = [UiStrings.Top, UiStrings.Middle, UiStrings.Bottom]
+
+
 BOOLEAN_LIST = [u'bold', u'italics', u'override', u'outline', u'shadow',
     u'slide_transition']
 
@@ -187,6 +202,7 @@ INTEGER_LIST = [u'size', u'line_adjustment', u'x', u'height', u'y',
     u'width', u'shadow_size', u'outline_size', u'horizontal_align',
     u'vertical_align', u'wrap_style']
 
+
 class ThemeXML(object):
     """
     A class to encapsulate the Theme XML.
@@ -583,8 +599,7 @@ class ThemeXML(object):
                 self.background_end_color,
                 self.background_direction)
         else:
-            filename = \
+            filename = os.path.split(self.background_filename)[1]
-                os.path.split(self.background_filename)[1]
             self.add_background_image(filename)
         self.add_font(self.font_main_name,
             self.font_main_color,

openlp/core/lib/toolbar.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -48,7 +48,7 @@ class OpenLPToolbar(QtGui.QToolBar):
         self.icons = {}
         self.setIconSize(QtCore.QSize(20, 20))
         self.actions = {}
-        log.debug(u'Init done')
+        log.debug(u'Init done for %s' % parent.__class__.__name__)
 
     def addToolbarButton(self, title, icon, tooltip=None, slot=None,
         checkable=False, shortcut=0, alternate=0,
@@ -61,7 +61,7 @@ class OpenLPToolbar(QtGui.QToolBar):
 
         ``icon``
             The icon of the button. This can be an instance of QIcon, or a
-            string cotaining either the absolute path to the image, or an
+            string containing either the absolute path to the image, or an
             internal resource path starting with ':/'.
 
         ``tooltip``

openlp/core/lib/ui.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -34,6 +34,66 @@ from openlp.core.lib import build_icon, Receiver, translate
 
 log = logging.getLogger(__name__)
 
+class UiStrings(object):
+    """
+    Provide standard strings for objects to use.
+    """
+    # These strings should need a good reason to be retranslated elsewhere.
+    # Should some/more/less of these have an & attached?
+    About = translate('OpenLP.Ui', 'About')
+    Add = translate('OpenLP.Ui', '&Add')
+    Advanced = translate('OpenLP.Ui', 'Advanced')
+    AllFiles = translate('OpenLP.Ui', 'All Files')
+    Bottom = translate('OpenLP.Ui', 'Bottom')
+    Browse = translate('OpenLP.Ui', 'Browse...')
+    Cancel = translate('OpenLP.Ui', 'Cancel')
+    CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:')
+    CreateService = translate('OpenLP.Ui', 'Create a new service.')
+    Delete = translate('OpenLP.Ui', '&Delete')
+    Edit = translate('OpenLP.Ui', '&Edit')
+    EmptyField = translate('OpenLP.Ui', 'Empty Field')
+    Error = translate('OpenLP.Ui', 'Error')
+    Export = translate('OpenLP.Ui', 'Export')
+    FontSizePtUnit = translate('OpenLP.Ui', 'pt',
+        'Abbreviated font pointsize unit')
+    Image = translate('OpenLP.Ui', 'Image')
+    Import = translate('OpenLP.Ui', 'Import')
+    LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
+    Live = translate('OpenLP.Ui', 'Live')
+    LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
+    LivePanel = translate('OpenLP.Ui', 'Live Panel')
+    Load = translate('OpenLP.Ui', 'Load')
+    Middle = translate('OpenLP.Ui', 'Middle')
+    New = translate('OpenLP.Ui', 'New')
+    NewService = translate('OpenLP.Ui', 'New Service')
+    NewTheme = translate('OpenLP.Ui', 'New Theme')
+    NFSs = translate('OpenLP.Ui', 'No File Selected', 'Singular')
+    NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
+    NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
+    NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
+    OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
+    OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
+    OpenService = translate('OpenLP.Ui', 'Open Service')
+    Preview = translate('OpenLP.Ui', 'Preview')
+    PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
+    PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
+    ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
+    ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
+    ResetBG = translate('OpenLP.Ui', 'Reset Background')
+    ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background')
+    S = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds')
+    SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
+    Search = translate('OpenLP.Ui', 'Search')
+    SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.')
+    SelectEdit = translate('OpenLP.Ui', 'You must select an item to edit.')
+    SaveService = translate('OpenLP.Ui', 'Save Service')
+    Service = translate('OpenLP.Ui', 'Service')
+    StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
+    Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
+    Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
+    Top = translate('OpenLP.Ui', 'Top')
+    Version = translate('OpenLP.Ui', 'Version')
+
 def add_welcome_page(parent, image):
     """
     Generate an opening welcome page for a wizard using a provided image.
@@ -61,18 +121,25 @@ def add_welcome_page(parent, image):
     parent.welcomeLayout.addStretch()
     parent.addPage(parent.welcomePage)
 
-def create_save_cancel_button_box(parent):
+def create_accept_reject_button_box(parent, okay=False):
     """
-    Creates a standard dialog button box with save and cancel buttons.  The
+    Creates a standard dialog button box with two buttons. The buttons default
-    button box is connected to the parent's ``accept()`` and ``reject()``
+    to save and cancel but the ``okay`` parameter can be used to make the
+    buttons okay and cancel instead.
+    The button box is connected to the parent's ``accept()`` and ``reject()``
     methods to handle the default ``accepted()`` and ``rejected()`` signals.
 
     ``parent``
-        The parent object.  This should be a ``QWidget`` descendant.
+        The parent object. This should be a ``QWidget`` descendant.
+
+    ``okay``
+        If true creates an okay/cancel combination instead of save/cancel.
     """
     button_box = QtGui.QDialogButtonBox(parent)
-    button_box.setStandardButtons(
+    accept_button = QtGui.QDialogButtonBox.Save
-        QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel)
+    if okay:
+        accept_button = QtGui.QDialogButtonBox.Ok
+    button_box.setStandardButtons(accept_button | QtGui.QDialogButtonBox.Cancel)
     button_box.setObjectName(u'%sButtonBox' % parent)
     QtCore.QObject.connect(button_box, QtCore.SIGNAL(u'accepted()'),
         parent.accept)
@@ -98,13 +165,12 @@ def critical_error_message_box(title=None, message=None, parent=None,
     ``question``
         Should this message box question the user.
     """
-    error = translate('OpenLP.Ui', 'Error')
     if question:
-        return QtGui.QMessageBox.critical(parent, error, message,
+        return QtGui.QMessageBox.critical(parent, UiStrings.Error, message,
             QtGui.QMessageBox.StandardButtons(
             QtGui.QMessageBox.Yes | QtGui.QMessageBox.No))
     data = {u'message': message}
-    data[u'title'] = title if title else error
+    data[u'title'] = title if title else UiStrings.Error
     return Receiver.send_message(u'openlp_error_message', data)
 
 def media_item_combo_box(parent, name):
@@ -119,22 +185,22 @@ def media_item_combo_box(parent, name):
 
 def create_delete_push_button(parent, icon=None):
     """
-    Creates a standard push button with a delete label and optional icon.  The
+    Creates a standard push button with a delete label and optional icon. The
     button is connected to the parent's ``onDeleteButtonClicked()`` method to
     handle the ``clicked()`` signal.
 
     ``parent``
-        The parent object.  This should be a ``QWidget`` descendant.
+        The parent object. This should be a ``QWidget`` descendant.
 
     ``icon``
-        An icon to display on the button.  This can be either a ``QIcon``, a
+        An icon to display on the button. This can be either a ``QIcon``, a
         resource path or a file name.
     """
     delete_button = QtGui.QPushButton(parent)
     delete_button.setObjectName(u'deleteButton')
     delete_icon = icon if icon else u':/general/general_delete.png'
     delete_button.setIcon(build_icon(delete_icon))
-    delete_button.setText(translate('OpenLP.Ui', '&Delete'))
+    delete_button.setText(UiStrings.Delete)
     delete_button.setToolTip(
         translate('OpenLP.Ui', 'Delete the selected item.'))
     QtCore.QObject.connect(delete_button,
@@ -144,12 +210,12 @@ def create_delete_push_button(parent, icon=None):
 def create_up_down_push_button_set(parent):
     """
     Creates a standard set of two push buttons, one for up and the other for
-    down, for use with lists.  The buttons use arrow icons and no text and are
+    down, for use with lists. The buttons use arrow icons and no text and are
     connected to the parent's ``onUpButtonClicked()`` and
     ``onDownButtonClicked()`` to handle their respective ``clicked()`` signals.
 
     ``parent``
-        The parent object.  This should be a ``QWidget`` descendant.
+        The parent object. This should be a ``QWidget`` descendant.
     """
     up_button = QtGui.QPushButton(parent)
     up_button.setIcon(build_icon(u':/services/service_up.png'))
@@ -219,3 +285,28 @@ def add_widget_completer(cache, widget):
     completer = QtGui.QCompleter(cache)
     completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
     widget.setCompleter(completer)
+
+def create_valign_combo(form, parent, layout):
+    """
+    Creates a standard label and combo box for asking users to select a
+    vertical alignment.
+
+    ``form``
+        The UI screen that the label and combo will appear on.
+
+    ``parent``
+        The parent object. This should be a ``QWidget`` descendant.
+
+    ``layout``
+        A layout object to add the label and combo widgets to.
+    """
+    verticalLabel = QtGui.QLabel(parent)
+    verticalLabel.setObjectName(u'VerticalLabel')
+    verticalLabel.setText(translate('OpenLP.Ui', '&Vertical Align:'))
+    form.verticalComboBox = QtGui.QComboBox(parent)
+    form.verticalComboBox.setObjectName(u'VerticalComboBox')
+    form.verticalComboBox.addItem(UiStrings.Top)
+    form.verticalComboBox.addItem(UiStrings.Middle)
+    form.verticalComboBox.addItem(UiStrings.Bottom)
+    verticalLabel.setBuddy(form.verticalComboBox)
+    layout.addRow(verticalLabel, form.verticalComboBox)

openlp/core/theme/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,4 +24,4 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from openlp.core.theme.theme import Theme
+from openlp.core.theme.theme import Theme

openlp/core/theme/theme.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -33,11 +33,14 @@ processing version 1 themes in OpenLP version 2.
 from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtGui
 
-DELPHI_COLORS = {u'clRed': 0xFF0000,
+DELPHI_COLORS = {
-                 u'clBlue': 0x0000FF,
+    u'clAqua': 0x00FFFF,    u'clBlack': 0x000000,   u'clBlue': 0x0000FF,
-                 u'clYellow': 0xFFFF00,
+    u'clFuchsia': 0xFF00FF, u'clGray': 0x808080,    u'clGreen': 0x008000,
-                 u'clBlack': 0x000000,
+    u'clLime': 0x00FF00,    u'clMaroon': 0x800000,  u'clNavy': 0x000080,
-                 u'clWhite': 0xFFFFFF}
+    u'clOlive': 0x808000,   u'clPurple': 0x800080,  u'clRed': 0xFF0000,
+    u'clSilver': 0xC0C0C0,  u'clTeal': 0x008080,    u'clWhite': 0xFFFFFF,
+    u'clYellow': 0xFFFF00
+}
 
 BLANK_STYLE_XML = \
 '''<?xml version="1.0" encoding="iso-8859-1"?>
@@ -68,38 +71,45 @@ class Theme(object):
         Theme name
 
     ``BackgroundMode``
-        The behaviour of the background.  Valid modes are:
+        The behaviour of the background. Valid modes are:
-            - 0 - Transparent
+
-            - 1 - Opaque
+            * ``0`` - Transparent
+            * ``1`` - Opaque
 
     ``BackgroundType``
-        The content of the background.  Valid types are:
+        The content of the background. Valid types are:
-            - 0 - solid color
+
-            - 1 - gradient color
+            * ``0`` - solid color
-            - 2 - image
+            * ``1`` - gradient color
+            * ``2`` - image
 
     ``BackgroundParameter1``
-        Extra information about the background.  The contents of this attribute
+        Extra information about the background. The contents of this attribute
         depend on the BackgroundType:
-            - image: image filename
+
-            - gradient: start color
+            * ``image`` - image filename
-            - solid: color
+            * ``gradient`` - start color
+            * ``solid`` - color
 
     ``BackgroundParameter2``
-        Extra information about the background.  The contents of this attribute
+        Extra information about the background. The contents of this attribute
         depend on the BackgroundType:
-            - image: border color
+
-            - gradient: end color
+            * ``image`` - border color
-            - solid: N/A
+            * ``gradient`` - end color
+            * ``solid`` - N/A
 
     ``BackgroundParameter3``
-        Extra information about the background.  The contents of this attribute
+        Extra information about the background. The contents of this attribute
         depend on the BackgroundType:
-            - image: N/A
+
-            - gradient: The direction of the gradient. Valid entries are:
+            * ``image`` - N/A
-                - 0 -> vertical
+            * ``gradient`` - The direction of the gradient. Valid entries are:
-                - 1 -> horizontal
+
-            - solid: N/A
+                * ``0`` - vertical
+                * ``1`` - horizontal
+
+            * ``solid`` - N/A
 
     ``FontName``
         Name of the font to use for the main font.
@@ -115,36 +125,41 @@ class Theme(object):
 
     ``Shadow``
         The shadow type to apply to the main font.
-            - 0 - no shadow
+
-            - non-zero - use shadow
+            * ``0`` - no shadow
+            * non-zero - use shadow
 
     ``ShadowColor``
         Color for the shadow
 
     ``Outline``
         The outline to apply to the main font
-            - 0 - no outline
+
-            - non-zero - use outline
+            * ``0`` - no outline
+            * non-zero - use outline
 
     ``OutlineColor``
         Color for the outline (or None if Outline is 0)
 
     ``HorizontalAlign``
-        The horizontal alignment to apply to text.  Valid alignments are:
+        The horizontal alignment to apply to text. Valid alignments are:
-            - 0 - left align
+
-            - 1 - right align
+            * ``0`` - left align
-            - 2 - centre align
+            * ``1`` - right align
+            * ``2`` - centre align
 
     ``VerticalAlign``
         The vertical alignment to apply to the text. Valid alignments are:
-            - 0 - top align
+
-            - 1 - bottom align
+            * ``0`` - top align
-            - 2 - centre align
+            * ``1`` - bottom align
+            * ``2`` - centre align
 
     ``WrapStyle``
-        The wrap style to apply to the text.  Valid styles are:
+        The wrap style to apply to the text. Valid styles are:
-            - 0 - normal
+
-            - 1 - lyrics
+            * ``0`` - normal
+            * ``1`` - lyrics
     """
     def __init__(self, xml):
         """
@@ -184,7 +199,6 @@ class Theme(object):
             if element.tag != u'Theme':
                 element_text = element.text
                 val = 0
-                # easy!
                 if element_text is None:
                     val = element_text
                 # strings need special handling to sort the colours out

openlp/core/ui/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,7 +28,7 @@ The :mod:`ui` module provides the core user interface for OpenLP
 """
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate, Receiver
+from openlp.core.lib import translate
 
 class HideMode(object):
     """
@@ -51,8 +51,11 @@ class HideMode(object):
     Theme = 2
     Screen = 3
 
+from firsttimeform import FirstTimeForm
+from firsttimelanguageform import FirstTimeLanguageForm
 from themeform import ThemeForm
 from filerenameform import FileRenameForm
+from starttimeform import StartTimeForm
 from maindisplay import MainDisplay
 from servicenoteform import ServiceNoteForm
 from serviceitemeditform import ServiceItemEditForm
@@ -62,10 +65,10 @@ from splashscreen import SplashScreen
 from generaltab import GeneralTab
 from themestab import ThemesTab
 from advancedtab import AdvancedTab
-from displaytagtab import DisplayTagTab
 from aboutform import AboutForm
 from pluginform import PluginForm
 from settingsform import SettingsForm
+from displaytagform import DisplayTagForm
 from shortcutlistform import ShortcutListForm
 from mediadockmanager import MediaDockManager
 from servicemanager import ServiceManager
@@ -73,4 +76,4 @@ from thememanager import ThemeManager
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainDisplay',
     'SlideController', 'ServiceManager', 'ThemeManager', 'MediaDockManager',
-    'ServiceItemEditForm']
+    'ServiceItemEditForm', u'FirstTimeForm']

openlp/core/ui/aboutdialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate
+from openlp.core.lib.ui import UiStrings
 
 class Ui_AboutDialog(object):
     def setupUi(self, aboutDialog):
@@ -86,8 +87,7 @@ class Ui_AboutDialog(object):
         QtCore.QMetaObject.connectSlotsByName(aboutDialog)
 
     def retranslateUi(self, aboutDialog):
-        aboutDialog.setWindowTitle(translate('OpenLP.AboutForm',
+        aboutDialog.setWindowTitle(u'%s OpenLP' % UiStrings.About)
-            'About OpenLP'))
         self.aboutTextEdit.setPlainText(translate('OpenLP.AboutForm',
             'OpenLP <version><revision> - Open Source Lyrics '
             'Projection\n'
@@ -105,40 +105,87 @@ class Ui_AboutDialog(object):
             'consider contributing by using the button below.'
         ))
         self.aboutNotebook.setTabText(
-            self.aboutNotebook.indexOf(self.aboutTab),
+            self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About)
-            translate('OpenLP.AboutForm', 'About'))
+        lead = u'Raoul "superfly" Snyman'
-        self.creditsTextEdit.setPlainText(translate('OpenLP.AboutForm',
+        developers = [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin',
+            u'Michael "cocooncrash" Gorven',
+            u'Andreas "googol" Preikschat', u'Raoul "superfly" Snyman',
+            u'Martin "mijiti" Thompson', u'Jon "Meths" Tibble']
+        contributors = [u'Scott "sguerrieri" Guerrieri',
+            u'Meinert "m2j" Jordan', u'Armin "orangeshirt" K\xf6hler',
+            u'Christian "crichter" Richter', u'Philip "Phill" Ridout',
+            u'Jeffrey "whydoubt" Smith', u'Maikel Stuivenberg',
+            u'Carsten "catini" Tingaard', u'Frode "frodus" Woldsund']
+        testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout',
+            u'John "jseagull1" Cegalis (lead)']
+        packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)',
+            u'Tim "TRB143" Bentley (Fedora)',
+            u'Michael "cocooncrash" Gorven (Ubuntu)',
+            u'Matthias "matthub" Hub (Mac OS X)',
+            u'Raoul "superfly" Snyman (Windows, Ubuntu)']
+        translators = {
+            u'af': [u'Johan "nuvolari" Mynhardt'],
+            u'de': [u'Patrick "madmuffin" Br\xfcckner',
+                u'Meinert "m2j" Jordan',
+                u'Andreas "googol" Preikschat',
+                u'Christian "crichter" Richter'],
+            u'en_GB': [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin'],
+            u'en_ZA': [u'Raoul "superfly" Snyman'],
+            u'et': [u'Mattias "mahfiaz" P\xf5ldaru'],
+            u'fr': [u'Stephan\xe9 "stbrunner" Brunner'],
+            u'hu': [u'Gyuris Gellért'],
+            u'ja': [u'Kunio "Kunio" Nakamaru'],
+            u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'],
+            u'nl': [u'Arjen "typovar" van Voorst'],
+            u'pt_BR': [u'Rafael "rafaellerm" Lerm'],
+            u'ru': [u'Sergey "ratz" Ratz']
+        }
+        documentors = [u'Wesley "wrst" Stout',
+            u'John "jseagull1" Cegalis (lead)']
+        self.creditsTextEdit.setPlainText(unicode(translate('OpenLP.AboutForm',
             'Project Lead\n'
-            '    Raoul "superfly" Snyman\n'
+            '    %s\n'
             '\n'
             'Developers\n'
-            '    Tim "TRB143" Bentley\n'
+            '    %s\n'
-            '    Jonathan "gushie" Corwin\n'
-            '    Michael "cocooncrash" Gorven\n'
-            '    Scott "sguerrieri" Guerrieri\n'
-            '    Raoul "superfly" Snyman\n'
-            '    Martin "mijiti" Thompson\n'
-            '    Jon "Meths" Tibble\n'
             '\n'
             'Contributors\n'
-            '    Meinert "m2j" Jordan\n'
+            '    %s\n'
-            '    Andreas "googol" Preikschat\n'
-            '    Christian "crichter" Richter\n'
-            '    Philip "Phill" Ridout\n'
-            '    Maikel Stuivenberg\n'
-            '    Carsten "catini" Tingaard\n'
-            '    Frode "frodus" Woldsund\n'
             '\n'
             'Testers\n'
-            '    Philip "Phill" Ridout\n'
+            '    %s\n'
-            '    Wesley "wrst" Stout (lead)\n'
             '\n'
             'Packagers\n'
-            '    Thomas "tabthorpe" Abthorpe (FreeBSD)\n'
+            '    %s\n'
-            '    Tim "TRB143" Bentley (Fedora)\n'
+            '\n'
-            '    Michael "cocooncrash" Gorven (Ubuntu)\n'
+            'Translators\n'
-            '    Matthias "matthub" Hub (Mac OS X)\n'
+            '    Afrikaans (af)\n'
-            '    Raoul "superfly" Snyman (Windows, Ubuntu)\n'
+            '        %s\n'
+            '    German (de)\n'
+            '        %s\n'
+            '    English, United Kingdom (en_GB)\n'
+            '        %s\n'
+            '    English, South Africa (en_ZA)\n'
+            '        %s\n'
+            '    Estonian (et)\n'
+            '        %s\n'
+            '    French (fr)\n'
+            '        %s\n'
+            '    Hungarian (hu)\n'
+            '        %s\n'
+            '    Japanese (ja)\n'
+            '        %s\n'
+            '    Norwegian Bokm\xe5l (nb)\n'
+            '        %s\n'
+            '    Dutch (nl)\n'
+            '        %s\n'
+            '    Portuguese, Brazil (pt_BR)\n'
+            '        %s\n'
+            '    Russian (ru)\n'
+            '        %s\n'
+            '\n'
+            'Documentation\n'
+            '    %s\n'
             '\n'
             'Built With\n'
             '    Python: http://www.python.org/\n'
@@ -156,30 +203,42 @@ class Ui_AboutDialog(object):
             '    God our Father, for sending His Son to die\n'
             '    on the cross, setting us free from sin. We\n'
             '    bring this software to you for free because\n'
-            '    He has set us free.'
+            '    He has set us free.')) % (lead, u'\n    '.join(developers),
-        ))
+            u'\n    '.join(contributors), u'\n    '.join(testers),
+            u'\n    '.join(packagers), u'\n        '.join(translators[u'af']),
+            u'\n        '.join(translators[u'de']),
+            u'\n        '.join(translators[u'en_GB']),
+            u'\n        '.join(translators[u'en_ZA']),
+            u'\n        '.join(translators[u'et']),
+            u'\n        '.join(translators[u'fr']),
+            u'\n        '.join(translators[u'hu']),
+            u'\n        '.join(translators[u'ja']),
+            u'\n        '.join(translators[u'nb']),
+            u'\n        '.join(translators[u'nl']),
+            u'\n        '.join(translators[u'pt_BR']),
+            u'\n        '.join(translators[u'ru']),
+            u'\n    '.join(documentors)))
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.creditsTab),
             translate('OpenLP.AboutForm', 'Credits'))
-        self.licenseTextEdit.setPlainText(translate('OpenLP.AboutForm',
+        copyright = translate('OpenLP.AboutForm',
             'Copyright \xa9 2004-2011 Raoul Snyman\n'
             'Portions copyright \xa9 2004-2011 '
-            'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
+            'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,\n'
-            'Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon '
+            'Meinert Jordan, Andreas Preikschat, Christian Richter, Philip\n'
-            'Tibble, Carsten Tinggaard\n'
+            'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten\n'
-            '\n'
+            'Tinggaard, Frode Woldsund')
+        licence = translate('OpenLP.AboutForm',
             'This program is free software; you can redistribute it and/or '
             'modify it under the terms of the GNU General Public License as '
             'published by the Free Software Foundation; version 2 of the '
-            'License.\n'
+            'License.')
-            '\n'
+        disclaimer = translate('OpenLP.AboutForm',
             'This program is distributed in the hope that it will be useful, '
             'but WITHOUT ANY WARRANTY; without even the implied warranty of '
             'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below '
-            'for more details.\n'
+            'for more details.')
-            '\n'
+        gpltext = ('GNU GENERAL PUBLIC LICENSE\n'
-            '\n'
-            'GNU GENERAL PUBLIC LICENSE\n'
             'Version 2, June 1991\n'
             '\n'
             'Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 '
@@ -549,7 +608,9 @@ class Ui_AboutDialog(object):
             'subroutine library, you may consider it more useful to permit '
             'linking proprietary applications with the library. If this is '
             'what you want to do, use the GNU Lesser General Public License '
-            'instead of this License.'))
+            'instead of this License.')
+        self.licenseTextEdit.setPlainText(u'%s\n\n%s\n\n%s\n\n\n%s' %
+            (copyright, licence, disclaimer, gpltext))
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.licenseTab),
             translate('OpenLP.AboutForm', 'License'))

openlp/core/ui/aboutform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -61,4 +61,4 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
         import webbrowser
         url = u'http://www.openlp.org/en/documentation/introduction/' \
             + u'contributing.html'
-        webbrowser.open_new(url)
+        webbrowser.open_new(url)

openlp/core/ui/advancedtab.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,7 +28,9 @@ The :mod:`advancedtab` provides an advanced settings facility.
 """
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab, translate, build_icon
+from openlp.core.lib.ui import UiStrings
+from openlp.core.utils import get_images_filter
 
 class AdvancedTab(SettingsTab):
     """
@@ -40,6 +42,8 @@ class AdvancedTab(SettingsTab):
         Initialise the settings tab
         """
         SettingsTab.__init__(self, u'Advanced')
+        self.default_image = u':/graphics/openlp-splash-screen.png'
+        self.default_color = u'#ffffff'
 
     def setupUi(self):
         """
@@ -80,39 +84,44 @@ class AdvancedTab(SettingsTab):
         self.hideMouseCheckBox.setObjectName(u'hideMouseCheckBox')
         self.hideMouseLayout.addWidget(self.hideMouseCheckBox)
         self.leftLayout.addWidget(self.hideMouseGroupBox)
-#        self.sharedDirGroupBox = QtGui.QGroupBox(self.leftColumn)
-#        self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox')
-#        self.sharedDirLayout = QtGui.QFormLayout(self.sharedDirGroupBox)
-#        self.sharedCheckBox = QtGui.QCheckBox(self.sharedDirGroupBox)
-#        self.sharedCheckBox.setObjectName(u'sharedCheckBox')
-#        self.sharedDirLayout.addRow(self.sharedCheckBox)
-#        self.sharedLabel = QtGui.QLabel(self.sharedDirGroupBox)
-#        self.sharedLabel.setObjectName(u'sharedLabel')
-#        self.sharedSubLayout = QtGui.QHBoxLayout()
-#        self.sharedSubLayout.setObjectName(u'sharedSubLayout')
-#        self.sharedLineEdit = QtGui.QLineEdit(self.sharedDirGroupBox)
-#        self.sharedLineEdit.setObjectName(u'sharedLineEdit')
-#        self.sharedSubLayout.addWidget(self.sharedLineEdit)
-#        self.sharedPushButton = QtGui.QPushButton(self.sharedDirGroupBox)
-#        self.sharedPushButton.setObjectName(u'sharedPushButton')
-#        self.sharedSubLayout.addWidget(self.sharedPushButton)
-#        self.sharedDirLayout.addRow(self.sharedLabel, self.sharedSubLayout)
-#        self.leftLayout.addWidget(self.sharedDirGroupBox)
         self.leftLayout.addStretch()
-#        self.databaseGroupBox = QtGui.QGroupBox(self.rightColumn)
+        self.defaultImageGroupBox = QtGui.QGroupBox(self.rightColumn)
-#        self.databaseGroupBox.setObjectName(u'databaseGroupBox')
+        self.defaultImageGroupBox.setObjectName(u'defaultImageGroupBox')
-#        self.databaseGroupBox.setEnabled(False)
+        self.defaultImageLayout = QtGui.QFormLayout(self.defaultImageGroupBox)
-#        self.databaseLayout = QtGui.QVBoxLayout(self.databaseGroupBox)
+        self.defaultImageLayout.setObjectName(u'defaultImageLayout')
-#        self.rightLayout.addWidget(self.databaseGroupBox)
+        self.defaultColorLabel = QtGui.QLabel(self.defaultImageGroupBox)
+        self.defaultColorLabel.setObjectName(u'defaultColorLabel')
+        self.defaultColorButton = QtGui.QPushButton(self.defaultImageGroupBox)
+        self.defaultColorButton.setObjectName(u'defaultColorButton')
+        self.defaultImageLayout.addRow(self.defaultColorLabel,
+            self.defaultColorButton)
+        self.defaultFileLabel = QtGui.QLabel(self.defaultImageGroupBox)
+        self.defaultFileLabel.setObjectName(u'defaultFileLabel')
+        self.defaultFileEdit = QtGui.QLineEdit(self.defaultImageGroupBox)
+        self.defaultFileEdit.setObjectName(u'defaultFileEdit')
+        self.defaultBrowseButton = QtGui.QToolButton(self.defaultImageGroupBox)
+        self.defaultBrowseButton.setObjectName(u'defaultBrowseButton')
+        self.defaultBrowseButton.setIcon(
+            build_icon(u':/general/general_open.png'))
+        self.defaultFileLayout = QtGui.QHBoxLayout()
+        self.defaultFileLayout.setObjectName(u'defaultFileLayout')
+        self.defaultFileLayout.addWidget(self.defaultFileEdit)
+        self.defaultFileLayout.addWidget(self.defaultBrowseButton)
+        self.defaultImageLayout.addRow(self.defaultFileLabel,
+            self.defaultFileLayout)
+        self.rightLayout.addWidget(self.defaultImageGroupBox)
         self.rightLayout.addStretch()
-#        QtCore.QObject.connect(self.sharedCheckBox,
+
-#            QtCore.SIGNAL(u'stateChanged(int)'), self.onSharedCheckBoxChanged)
+        QtCore.QObject.connect(self.defaultColorButton,
+            QtCore.SIGNAL(u'pressed()'), self.onDefaultColorButtonPressed)
+        QtCore.QObject.connect(self.defaultBrowseButton,
+            QtCore.SIGNAL(u'pressed()'), self.onDefaultBrowseButtonPressed)
 
     def retranslateUi(self):
         """
         Setup the interface translation strings.
         """
-        self.tabTitleVisible = translate('OpenLP.AdvancedTab', 'Advanced')
+        self.tabTitleVisible = UiStrings.Advanced
         self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
         self.recentLabel.setText(
             translate('OpenLP.AdvancedTab',
@@ -128,14 +137,13 @@ class AdvancedTab(SettingsTab):
         self.hideMouseGroupBox.setTitle(translate('OpenLP.AdvancedTab',
             'Mouse Cursor'))
         self.hideMouseCheckBox.setText(translate('OpenLP.AdvancedTab',
-            'Hide the mouse cursor when moved over the display window'))
+            'Hide mouse cursor when over display window'))
-#        self.sharedDirGroupBox.setTitle(
+        self.defaultImageGroupBox.setTitle(translate('OpenLP.AdvancedTab',
-#            translate('AdvancedTab', 'Central Data Store'))
+            'Default Image'))
-#        self.sharedCheckBox.setText(
+        self.defaultColorLabel.setText(translate('OpenLP.AdvancedTab',
-#            translate('AdvancedTab', 'Enable a shared data location'))
+            'Background color:'))
-#        self.sharedLabel.setText(translate('AdvancedTab', 'Store location:'))
+        self.defaultFileLabel.setText(translate('OpenLP.AdvancedTab',
-#        self.sharedPushButton.setText(translate('AdvancedTab', 'Browse...'))
+            'Image file:'))
-#        self.databaseGroupBox.setTitle(translate('AdvancedTab', 'Databases'))
 
     def load(self):
         """
@@ -164,7 +172,14 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(True)).toBool())
         self.hideMouseCheckBox.setChecked(
             settings.value(u'hide mouse', QtCore.QVariant(False)).toBool())
+        self.default_color = settings.value(u'default color',
+            QtCore.QVariant(u'#ffffff')).toString()
+        self.defaultFileEdit.setText(settings.value(u'default image',
+            QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
+            .toString())
         settings.endGroup()
+        self.defaultColorButton.setStyleSheet(
+            u'background-color: %s' % self.default_color)
 
     def save(self):
         """
@@ -184,12 +199,24 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
         settings.setValue(u'hide mouse',
             QtCore.QVariant(self.hideMouseCheckBox.isChecked()))
+        settings.setValue(u'default color', self.default_color)
+        settings.setValue(u'default image', self.defaultFileEdit.text())
         settings.endGroup()
 
-#    def onSharedCheckBoxChanged(self, checked):
+    def onDefaultColorButtonPressed(self):
-#        """
+        new_color = QtGui.QColorDialog.getColor(
-#        Enables the widgets to allow a shared data location
+            QtGui.QColor(self.default_color), self)
-#        """
+        if new_color.isValid():
-#        self.sharedLabel.setEnabled(checked)
+            self.default_color = new_color.name()
-#        self.sharedTextEdit.setEnabled(checked)
+            self.defaultColorButton.setStyleSheet(
-#        self.sharedPushButton.setEnabled(checked)
+                u'background-color: %s' % self.default_color)
+
+    def onDefaultBrowseButtonPressed(self):
+        file_filters = u'%s;;%s (*.*) (*)' % (get_images_filter(),
+            UiStrings.AllFiles)
+        filename = QtGui.QFileDialog.getOpenFileName(self,
+            translate('OpenLP.AdvancedTab', 'Open File'), '',
+            file_filters)
+        if filename:
+            self.defaultFileEdit.setText(filename)
+        self.defaultFileEdit.setFocus()

openlp/core/ui/displaytagdialog.py

@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
+
+class Ui_DisplayTagDialog(object):
+
+    def setupUi(self, displayTagDialog):
+        displayTagDialog.setObjectName(u'displayTagDialog')
+        displayTagDialog.resize(725, 548)
+        self.widget = QtGui.QWidget(displayTagDialog)
+        self.widget.setGeometry(QtCore.QRect(10, 10, 701, 521))
+        self.widget.setObjectName(u'widget')
+        self.listdataGridLayout = QtGui.QGridLayout(self.widget)
+        self.listdataGridLayout.setMargin(0)
+        self.listdataGridLayout.setObjectName(u'listdataGridLayout')
+        self.tagTableWidget = QtGui.QTableWidget(self.widget)
+        self.tagTableWidget.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarAlwaysOff)
+        self.tagTableWidget.setEditTriggers(
+            QtGui.QAbstractItemView.NoEditTriggers)
+        self.tagTableWidget.setAlternatingRowColors(True)
+        self.tagTableWidget.setSelectionMode(
+            QtGui.QAbstractItemView.SingleSelection)
+        self.tagTableWidget.setSelectionBehavior(
+            QtGui.QAbstractItemView.SelectRows)
+        self.tagTableWidget.setCornerButtonEnabled(False)
+        self.tagTableWidget.setObjectName(u'tagTableWidget')
+        self.tagTableWidget.setColumnCount(4)
+        self.tagTableWidget.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(0, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(1, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(2, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(3, item)
+        self.listdataGridLayout.addWidget(self.tagTableWidget, 0, 0, 1, 1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(u'horizontalLayout')
+        spacerItem = QtGui.QSpacerItem(40, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.defaultPushButton = QtGui.QPushButton(self.widget)
+        self.defaultPushButton.setObjectName(u'defaultPushButton')
+        self.horizontalLayout.addWidget(self.defaultPushButton)
+        self.deletePushButton = QtGui.QPushButton(self.widget)
+        self.deletePushButton.setObjectName(u'deletePushButton')
+        self.horizontalLayout.addWidget(self.deletePushButton)
+        self.listdataGridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+        self.editGroupBox = QtGui.QGroupBox(self.widget)
+        self.editGroupBox.setObjectName(u'editGroupBox')
+        self.dataGridLayout = QtGui.QGridLayout(self.editGroupBox)
+        self.dataGridLayout.setObjectName(u'dataGridLayout')
+        self.descriptionLabel = QtGui.QLabel(self.editGroupBox)
+        self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.descriptionLabel.setObjectName(u'descriptionLabel')
+        self.dataGridLayout.addWidget(self.descriptionLabel, 0, 0, 1, 1)
+        self.descriptionLineEdit = QtGui.QLineEdit(self.editGroupBox)
+        self.descriptionLineEdit.setObjectName(u'descriptionLineEdit')
+        self.dataGridLayout.addWidget(self.descriptionLineEdit, 0, 1, 2, 1)
+        self.newPushButton = QtGui.QPushButton(self.editGroupBox)
+        self.newPushButton.setObjectName(u'newPushButton')
+        self.dataGridLayout.addWidget(self.newPushButton, 0, 2, 2, 1)
+        self.tagLabel = QtGui.QLabel(self.editGroupBox)
+        self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.tagLabel.setObjectName(u'tagLabel')
+        self.dataGridLayout.addWidget(self.tagLabel, 2, 0, 1, 1)
+        self.tagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+        self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
+        self.tagLineEdit.setMaxLength(5)
+        self.tagLineEdit.setObjectName(u'tagLineEdit')
+        self.dataGridLayout.addWidget(self.tagLineEdit, 2, 1, 1, 1)
+        self.startTagLabel = QtGui.QLabel(self.editGroupBox)
+        self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.startTagLabel.setObjectName(u'startTagLabel')
+        self.dataGridLayout.addWidget(self.startTagLabel, 3, 0, 1, 1)
+        self.startTagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+        self.startTagLineEdit.setObjectName(u'startTagLineEdit')
+        self.dataGridLayout.addWidget(self.startTagLineEdit, 3, 1, 1, 1)
+        self.endTagLabel = QtGui.QLabel(self.editGroupBox)
+        self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.endTagLabel.setObjectName(u'endTagLabel')
+        self.dataGridLayout.addWidget(self.endTagLabel, 4, 0, 1, 1)
+        self.endTagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+        self.endTagLineEdit.setObjectName(u'endTagLineEdit')
+        self.dataGridLayout.addWidget(self.endTagLineEdit, 4, 1, 1, 1)
+        self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
+        self.updatePushButton.setObjectName(u'updatePushButton')
+        self.dataGridLayout.addWidget(self.updatePushButton, 4, 2, 1, 1)
+        self.listdataGridLayout.addWidget(self.editGroupBox, 2, 0, 1, 1)
+        self.buttonBox = create_accept_reject_button_box(displayTagDialog)
+        self.listdataGridLayout.addWidget(self.buttonBox, 3, 0, 1, 1)
+
+        self.retranslateUi(displayTagDialog)
+        QtCore.QMetaObject.connectSlotsByName(displayTagDialog)
+
+    def retranslateUi(self, displayTagDialog):
+        displayTagDialog.setWindowTitle(translate('OpenLP.displayTagDialog',
+            'Configure Display Tags'))
+        self.editGroupBox.setTitle(
+            translate('OpenLP.DisplayTagDialog', 'Edit Selection'))
+        self.updatePushButton.setText(
+            translate('OpenLP.DisplayTagDialog', 'Update'))
+        self.descriptionLabel.setText(
+            translate('OpenLP.DisplayTagDialog', 'Description'))
+        self.tagLabel.setText(translate('OpenLP.DisplayTagDialog', 'Tag'))
+        self.startTagLabel.setText(
+            translate('OpenLP.DisplayTagDialog', 'Start tag'))
+        self.endTagLabel.setText(
+            translate('OpenLP.DisplayTagDialog', 'End tag'))
+        self.deletePushButton.setText(UiStrings.Delete)
+        self.defaultPushButton.setText(
+            translate('OpenLP.DisplayTagDialog', 'Default'))
+        self.newPushButton.setText(UiStrings.New)
+        self.tagTableWidget.horizontalHeaderItem(0).setText(
+            translate('OpenLP.DisplayTagDialog', 'Description'))
+        self.tagTableWidget.horizontalHeaderItem(1).setText(
+            translate('OpenLP.DisplayTagDialog', 'Tag Id'))
+        self.tagTableWidget.horizontalHeaderItem(2).setText(
+            translate('OpenLP.DisplayTagDialog', 'Start HTML'))
+        self.tagTableWidget.horizontalHeaderItem(3).setText(
+            translate('OpenLP.DisplayTagDialog', 'End HTML'))
+        self.tagTableWidget.setColumnWidth(0, 120)
+        self.tagTableWidget.setColumnWidth(1, 40)
+        self.tagTableWidget.setColumnWidth(2, 240)
+        self.tagTableWidget.setColumnWidth(3, 240)

openlp/core/ui/displaytagform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -23,165 +23,31 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-'''
+"""
 The :mod:`DisplayTagTab` provides an Tag Edit facility.  The Base set are
 protected and included each time loaded.  Custom tags can be defined and saved.
 The Custom Tag arrays are saved in a pickle so QSettings works on them.  Base
 Tags cannot be changed.
-
+"""
-'''
 import cPickle
+
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, DisplayTags
+from openlp.core.lib import translate, DisplayTags
 from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.ui.displaytagdialog import Ui_DisplayTagDialog
 
-class DisplayTagTab(SettingsTab):
+class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
-    '''
+    """
     The :class:`DisplayTagTab` manages the settings tab .
-    '''
+    """
-    def __init__(self):
+    def __init__(self, parent):
-        '''
-        Initialise the settings tab
-        '''
-        SettingsTab.__init__(self, u'Display Tags')
-
-    def resizeEvent(self, event=None):
-        pass
-
-    def preLoad(self):
         """
-        Initialise values before the Load takes place
+        Constructor
         """
-        # Create initial copy from master
+        QtGui.QDialog.__init__(self, parent)
-        DisplayTags.reset_html_tags()
+        self.setupUi(self)
-        user_expands = QtCore.QSettings().value(u'displayTags/html_tags',
+        self.preLoad()
-            QtCore.QVariant(u'')).toString()
-        # cPickle only accepts str not unicode strings
-        user_expands_string = str(unicode(user_expands).encode(u'utf8'))
-        if user_expands_string:
-            user_tags = cPickle.loads(user_expands_string)
-            # If we have some user ones added them as well
-            for t in user_tags:
-                DisplayTags.add_html_tag(t)
-        self.selected = -1
-
-    def setupUi(self):
-        '''
-        Configure the UI elements for the tab.
-        '''
-        self.setObjectName(u'DisplayTagTab')
-        self.tabTitleVisible = \
-            translate(u'OpenLP.DisplayTagTab', 'Display Tags')
-        self.displayTagEdit = QtGui.QWidget(self)
-        self.editGroupBox = QtGui.QGroupBox(self.displayTagEdit)
-        self.editGroupBox.setGeometry(QtCore.QRect(10, 220, 650, 181))
-        self.editGroupBox.setObjectName(u'editGroupBox')
-        self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
-        self.updatePushButton.setGeometry(QtCore.QRect(550, 140, 71, 26))
-        self.updatePushButton.setObjectName(u'updatePushButton')
-        self.layoutWidget = QtGui.QWidget(self.editGroupBox)
-        self.layoutWidget.setGeometry(QtCore.QRect(5, 20, 571, 114))
-        self.layoutWidget.setObjectName(u'layoutWidget')
-        self.formLayout = QtGui.QFormLayout(self.layoutWidget)
-        self.formLayout.setObjectName(u'formLayout')
-        self.descriptionLabel = QtGui.QLabel(self.layoutWidget)
-        self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.descriptionLabel.setObjectName(u'descriptionLabel')
-        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-            self.descriptionLabel)
-        self.descriptionLineEdit = QtGui.QLineEdit(self.layoutWidget)
-        self.descriptionLineEdit.setObjectName(u'descriptionLineEdit')
-        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-            self.descriptionLineEdit)
-        self.tagLabel = QtGui.QLabel(self.layoutWidget)
-        self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.tagLabel.setObjectName(u'tagLabel')
-        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.tagLabel)
-        self.tagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-        self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
-        self.tagLineEdit.setMaxLength(5)
-        self.tagLineEdit.setObjectName(u'tagLineEdit')
-        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
-            self.tagLineEdit)
-        self.startTagLabel = QtGui.QLabel(self.layoutWidget)
-        self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.startTagLabel.setObjectName(u'startTagLabel')
-        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
-            self.startTagLabel)
-        self.startTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-        self.startTagLineEdit.setObjectName(u'startTagLineEdit')
-        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
-            self.startTagLineEdit)
-        self.endTagLabel = QtGui.QLabel(self.layoutWidget)
-        self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.endTagLabel.setObjectName(u'endTagLabel')
-        self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
-            self.endTagLabel)
-        self.endTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-        self.endTagLineEdit.setObjectName(u'endTagLineEdit')
-        self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
-            self.endTagLineEdit)
-        self.defaultPushButton = QtGui.QPushButton(self.displayTagEdit)
-        self.defaultPushButton.setGeometry(QtCore.QRect(430, 188, 71, 26))
-        self.defaultPushButton.setObjectName(u'updatePushButton')
-        self.deletePushButton = QtGui.QPushButton(self.displayTagEdit)
-        self.deletePushButton.setGeometry(QtCore.QRect(510, 188, 71, 26))
-        self.deletePushButton.setObjectName(u'deletePushButton')
-        self.newPushButton = QtGui.QPushButton(self.displayTagEdit)
-        self.newPushButton.setGeometry(QtCore.QRect(600, 188, 71, 26))
-        self.newPushButton.setObjectName(u'newPushButton')
-        self.tagTableWidget = QtGui.QTableWidget(self.displayTagEdit)
-        self.tagTableWidget.setGeometry(QtCore.QRect(10, 10, 650, 171))
-        self.tagTableWidget.setHorizontalScrollBarPolicy(
-            QtCore.Qt.ScrollBarAlwaysOff)
-        self.tagTableWidget.setEditTriggers(
-            QtGui.QAbstractItemView.NoEditTriggers)
-        self.tagTableWidget.setAlternatingRowColors(True)
-        self.tagTableWidget.setSelectionMode(
-            QtGui.QAbstractItemView.SingleSelection)
-        self.tagTableWidget.setSelectionBehavior(
-            QtGui.QAbstractItemView.SelectRows)
-        self.tagTableWidget.setCornerButtonEnabled(False)
-        self.tagTableWidget.setObjectName(u'tagTableWidget')
-        self.tagTableWidget.setColumnCount(4)
-        self.tagTableWidget.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.tagTableWidget.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.tagTableWidget.setHorizontalHeaderItem(1, item)
-        item = QtGui.QTableWidgetItem()
-        self.tagTableWidget.setHorizontalHeaderItem(2, item)
-        item = QtGui.QTableWidgetItem()
-        self.tagTableWidget.setHorizontalHeaderItem(3, item)
-        self.editGroupBox.setTitle(
-            translate('OpenLP.DisplayTagTab', 'Edit Selection'))
-        self.updatePushButton.setText(
-            translate('OpenLP.DisplayTagTab', 'Update'))
-        self.descriptionLabel.setText(
-            translate('OpenLP.DisplayTagTab', 'Description'))
-        self.tagLabel.setText(translate('OpenLP.DisplayTagTab', 'Tag'))
-        self.startTagLabel.setText(
-            translate('OpenLP.DisplayTagTab', 'Start tag'))
-        self.endTagLabel.setText(translate('OpenLP.DisplayTagTab', 'End tag'))
-        self.deletePushButton.setText(
-            translate('OpenLP.DisplayTagTab', 'Delete'))
-        self.defaultPushButton.setText(
-            translate('OpenLP.DisplayTagTab', 'Default'))
-        self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New'))
-        self.tagTableWidget.horizontalHeaderItem(0)\
-            .setText(translate('OpenLP.DisplayTagTab', 'Description'))
-        self.tagTableWidget.horizontalHeaderItem(1)\
-            .setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
-        self.tagTableWidget.horizontalHeaderItem(2)\
-            .setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
-        self.tagTableWidget.horizontalHeaderItem(3)\
-            .setText(translate('OpenLP.DisplayTagTab', 'End Html'))
-        QtCore.QMetaObject.connectSlotsByName(self.displayTagEdit)
-        self.tagTableWidget.setColumnWidth(0, 120)
-        self.tagTableWidget.setColumnWidth(1, 40)
-        self.tagTableWidget.setColumnWidth(2, 240)
-        self.tagTableWidget.setColumnWidth(3, 200)
         QtCore.QObject.connect(self.tagTableWidget,
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected)
         QtCore.QObject.connect(self.defaultPushButton,
@@ -193,35 +59,35 @@ class DisplayTagTab(SettingsTab):
         QtCore.QObject.connect(self.deletePushButton,
             QtCore.SIGNAL(u'pressed()'), self.onDeletePushed)
 
-    def load(self):
+    def exec_(self):
         """
         Load Display and set field state.
         """
-        self.newPushButton.setEnabled(True)
+        # Create initial copy from master
-        self.updatePushButton.setEnabled(False)
+        self.preLoad()
-        self.deletePushButton.setEnabled(False)
+        self._resetTable()
-        for linenumber, html in enumerate(DisplayTags.get_html_tags()):
+        self.selected = -1
-            self.tagTableWidget.setRowCount(
+        return QtGui.QDialog.exec_(self)
-                self.tagTableWidget.rowCount() + 1)
-            self.tagTableWidget.setItem(linenumber, 0,
-                QtGui.QTableWidgetItem(html[u'desc']))
-            self.tagTableWidget.setItem(linenumber, 1,
-                QtGui.QTableWidgetItem(self._strip(html[u'start tag'])))
-            self.tagTableWidget.setItem(linenumber, 2,
-                QtGui.QTableWidgetItem(html[u'start html']))
-            self.tagTableWidget.setItem(linenumber, 3,
-                QtGui.QTableWidgetItem(html[u'end html']))
-            self.tagTableWidget.resizeRowsToContents()
-        self.descriptionLineEdit.setText(u'')
-        self.tagLineEdit.setText(u'')
-        self.startTagLineEdit.setText(u'')
-        self.endTagLineEdit.setText(u'')
-        self.descriptionLineEdit.setEnabled(False)
-        self.tagLineEdit.setEnabled(False)
-        self.startTagLineEdit.setEnabled(False)
-        self.endTagLineEdit.setEnabled(False)
 
-    def save(self):
+    def preLoad(self):
+        """
+        Load the Tags from store so can be used in the system or used to
+        update the display. If Cancel was selected this is needed to reset the
+        dsiplay to the correct version.
+        """
+        # Initial Load of the Tags
+        DisplayTags.reset_html_tags()
+        user_expands = QtCore.QSettings().value(u'displayTags/html_tags',
+            QtCore.QVariant(u'')).toString()
+        # cPickle only accepts str not unicode strings
+        user_expands_string = str(unicode(user_expands).encode(u'utf8'))
+        if user_expands_string:
+            user_tags = cPickle.loads(user_expands_string)
+            # If we have some user ones added them as well
+            for t in user_tags:
+                DisplayTags.add_html_tag(t)
+
+    def accept(self):
         """
         Save Custom tags in a pickle .
         """
@@ -236,13 +102,14 @@ class DisplayTagTab(SettingsTab):
         else:
             QtCore.QSettings().setValue(u'displayTags/html_tags',
                 QtCore.QVariant(u''))
+        return QtGui.QDialog.accept(self)
 
-    def cancel(self):
+    def reject(self):
         """
         Reset Custom tags from Settings.
         """
-        self.preLoad()
         self._resetTable()
+        return QtGui.QDialog.reject(self)
 
     def onRowSelected(self):
         """
@@ -289,6 +156,7 @@ class DisplayTagTab(SettingsTab):
         self._resetTable()
         # Highlight new row
         self.tagTableWidget.selectRow(self.tagTableWidget.rowCount() - 1)
+        self.onRowSelected()
 
     def onDefaultPushed(self):
         """
@@ -336,7 +204,29 @@ class DisplayTagTab(SettingsTab):
         """
         self.tagTableWidget.clearContents()
         self.tagTableWidget.setRowCount(0)
-        self.load()
+        self.newPushButton.setEnabled(True)
+        self.updatePushButton.setEnabled(False)
+        self.deletePushButton.setEnabled(False)
+        for linenumber, html in enumerate(DisplayTags.get_html_tags()):
+            self.tagTableWidget.setRowCount(
+                self.tagTableWidget.rowCount() + 1)
+            self.tagTableWidget.setItem(linenumber, 0,
+                QtGui.QTableWidgetItem(html[u'desc']))
+            self.tagTableWidget.setItem(linenumber, 1,
+                QtGui.QTableWidgetItem(self._strip(html[u'start tag'])))
+            self.tagTableWidget.setItem(linenumber, 2,
+                QtGui.QTableWidgetItem(html[u'start html']))
+            self.tagTableWidget.setItem(linenumber, 3,
+                QtGui.QTableWidgetItem(html[u'end html']))
+            self.tagTableWidget.resizeRowsToContents()
+        self.descriptionLineEdit.setText(u'')
+        self.tagLineEdit.setText(u'')
+        self.startTagLineEdit.setText(u'')
+        self.endTagLineEdit.setText(u'')
+        self.descriptionLineEdit.setEnabled(False)
+        self.tagLineEdit.setEnabled(False)
+        self.startTagLineEdit.setEnabled(False)
+        self.endTagLineEdit.setEnabled(False)
 
     def _strip(self, tag):
         """

openlp/core/ui/exceptiondialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/ui/exceptionform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -35,27 +35,28 @@ from PyQt4 import Qt, QtCore, QtGui
 
 try:
     from PyQt4.phonon import Phonon
-    phonon_version = Phonon.phononVersion()
+    PHONON_VERSION = Phonon.phononVersion()
 except ImportError:
-    phonon_version = u'-'
+    PHONON_VERSION = u'-'
 try:
     import chardet
-    chardet_version = chardet.__version__
+    CHARDET_VERSION = chardet.__version__
 except ImportError:
-    chardet_version = u'-'
+    CHARDET_VERSION = u'-'
 try:
     import enchant
-    enchant_version = enchant.__version__
+    ENCHANT_VERSION = enchant.__version__
 except ImportError:
-    enchant_version = u'-'
+    ENCHANT_VERSION = u'-'
 try:
     import sqlite
-    sqlite_version = sqlite.version
+    SQLITE_VERSION = sqlite.version
 except ImportError:
-    sqlite_version = u'-'
+    SQLITE_VERSION = u'-'
 
 from openlp.core.lib import translate, SettingsManager
 from openlp.core.lib.mailto import mailto
+from openlp.core.lib.ui import UiStrings
 
 from exceptiondialog import Ui_ExceptionDialog
 
@@ -84,14 +85,14 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             'Platform: %s\n')) % platform.platform()
         libraries = u'Python: %s\n' % platform.python_version() + \
             u'Qt4: %s\n' % Qt.qVersion() + \
-            u'Phonon: %s\n' % phonon_version + \
+            u'Phonon: %s\n' % PHONON_VERSION + \
             u'PyQt4: %s\n' % Qt.PYQT_VERSION_STR + \
             u'SQLAlchemy: %s\n' % sqlalchemy.__version__ + \
             u'BeautifulSoup: %s\n' % BeautifulSoup.__version__ + \
             u'lxml: %s\n' % etree.__version__ + \
-            u'Chardet: %s\n' % chardet_version + \
+            u'Chardet: %s\n' % CHARDET_VERSION + \
-            u'PyEnchant: %s\n' % enchant_version + \
+            u'PyEnchant: %s\n' % ENCHANT_VERSION + \
-            u'PySQLite: %s\n' % sqlite_version
+            u'PySQLite: %s\n' % SQLITE_VERSION
         if platform.system() == u'Linux':
             if os.environ.get(u'KDE_FULL_SESSION') == u'true':
                 system = system + u'Desktop: KDE SC\n'
@@ -169,15 +170,14 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             self.__buttonState(False)
         self.descriptionWordCount.setText(
             unicode(translate('OpenLP.ExceptionDialog',
-            'Description characters to enter : %s')) % count )
+            'Description characters to enter : %s')) % count)
 
     def onAttachFileButtonPressed(self):
         files = QtGui.QFileDialog.getOpenFileName(
             self,translate('ImagePlugin.ExceptionDialog',
             'Select Attachment'),
             SettingsManager.get_last_dir(u'exceptions'),
-            u'%s (*.*) (*)' %
+            u'%s (*.*) (*)' % UiStrings.AllFiles)
-            unicode(translate('ImagePlugin.MediaItem', 'All Files')))
         log.info(u'New files(s) %s', unicode(files))
         if files:
             self.fileAttachment = unicode(files)

openlp/core/ui/filerenamedialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,30 +27,28 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
+from openlp.core.lib.ui import create_accept_reject_button_box
 
 class Ui_FileRenameDialog(object):
-    def setupUi(self, FileRenameDialog):
+    def setupUi(self, fileRenameDialog):
-        FileRenameDialog.setObjectName(u'FileRenameDialog')
+        fileRenameDialog.setObjectName(u'fileRenameDialog')
-        FileRenameDialog.resize(300, 10)
+        fileRenameDialog.resize(300, 10)
-        self.dialogLayout = QtGui.QGridLayout(FileRenameDialog)
+        self.dialogLayout = QtGui.QGridLayout(fileRenameDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
-        self.fileNameLabel = QtGui.QLabel(FileRenameDialog)
+        self.fileNameLabel = QtGui.QLabel(fileRenameDialog)
         self.fileNameLabel.setObjectName(u'fileNameLabel')
         self.dialogLayout.addWidget(self.fileNameLabel, 0, 0)
-        self.fileNameEdit = QtGui.QLineEdit(FileRenameDialog)
+        self.fileNameEdit = QtGui.QLineEdit(fileRenameDialog)
         self.fileNameEdit.setValidator(QtGui.QRegExpValidator(
             QtCore.QRegExp(r'[^/\\?*|<>\[\]":<>+%]+'), self))
         self.fileNameEdit.setObjectName(u'fileNameEdit')
         self.dialogLayout.addWidget(self.fileNameEdit, 0, 1)
-        self.buttonBox = QtGui.QDialogButtonBox(FileRenameDialog)
+        self.buttonBox = create_accept_reject_button_box(fileRenameDialog, True)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName(u'buttonBox')
         self.dialogLayout.addWidget(self.buttonBox, 1, 0, 1, 2)
-        self.retranslateUi(FileRenameDialog)
+        self.retranslateUi(fileRenameDialog)
         self.setMaximumHeight(self.sizeHint().height())
-        QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
+        QtCore.QMetaObject.connectSlotsByName(fileRenameDialog)
 
-    def retranslateUi(self, FileRenameDialog):
+    def retranslateUi(self, fileRenameDialog):
         self.fileNameLabel.setText(translate('OpenLP.FileRenameForm',
             'New File Name:'))

openlp/core/ui/filerenameform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,7 +24,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from filerenamedialog import Ui_FileRenameDialog
 
@@ -37,10 +37,6 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
     def __init__(self, parent):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
-            self.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
-            self.reject)
 
     def exec_(self, copy=False):
         """
@@ -51,5 +47,5 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
                 'File Copy'))
         else:
             self.setWindowTitle(translate('OpenLP.FileRenameForm',
-            'File Rename'))
+                'File Rename'))
         return QtGui.QDialog.exec_(self)

openlp/core/ui/firsttimeform.py

@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import io
+import logging
+import os
+import urllib
+from tempfile import gettempdir
+from ConfigParser import SafeConfigParser
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate, PluginStatus, Receiver, build_icon
+from openlp.core.utils import get_web_page, AppLocation
+from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
+
+log = logging.getLogger(__name__)
+
+class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
+    """
+    This is the Theme Import Wizard, which allows easy creation and editing of
+    OpenLP themes.
+    """
+    log.info(u'ThemeWizardForm loaded')
+
+    def __init__(self, screens, parent=None):
+        QtGui.QWizard.__init__(self, parent)
+        self.setupUi(self)
+        # check to see if we have web access
+        self.web = u'http://openlp.org/files/frw/'
+        self.config = SafeConfigParser()
+        self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
+        if self.webAccess:
+            files = self.webAccess.read()
+            self.config.readfp(io.BytesIO(files))
+        self.displayComboBox.addItems(screens.get_screen_list())
+        self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
+            'Downloading %s...'))
+        QtCore.QObject.connect(self,
+            QtCore.SIGNAL(u'currentIdChanged(int)'),
+            self.onCurrentIdChanged)
+
+    def exec_(self, edit=False):
+        """
+        Run the wizard.
+        """
+        self.setDefaults()
+        return QtGui.QWizard.exec_(self)
+
+    def setDefaults(self):
+        """
+        Set up display at start of theme edit.
+        """
+        self.restart()
+        # Sort out internet access for downloads
+        if self.webAccess:
+            songs = self.config.get(u'songs', u'languages')
+            songs = songs.split(u',')
+            for song in songs:
+                title = unicode(self.config.get(
+                    u'songs_%s' % song, u'title'), u'utf8')
+                filename = unicode(self.config.get(
+                    u'songs_%s' % song, u'filename'), u'utf8')
+                item = QtGui.QListWidgetItem(title, self.songsListWidget)
+                item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
+                item.setCheckState(QtCore.Qt.Unchecked)
+                item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+            bible_languages = self.config.get(u'bibles', u'languages')
+            bible_languages = bible_languages.split(u',')
+            for lang in bible_languages:
+                language = unicode(self.config.get(
+                    u'bibles_%s' % lang, u'title'), u'utf8')
+                langItem = QtGui.QTreeWidgetItem(
+                    self.biblesTreeWidget, QtCore.QStringList(language))
+                bibles = self.config.get(u'bibles_%s' % lang, u'translations')
+                bibles = bibles.split(u',')
+                for bible in bibles:
+                    title = unicode(self.config.get(
+                        u'bible_%s' % bible, u'title'), u'utf8')
+                    filename = unicode(self.config.get(
+                        u'bible_%s' % bible, u'filename'))
+                    item = QtGui.QTreeWidgetItem(
+                        langItem, QtCore.QStringList(title))
+                    item.setData(0, QtCore.Qt.UserRole,
+                        QtCore.QVariant(filename))
+                    item.setCheckState(0, QtCore.Qt.Unchecked)
+                    item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+            self.biblesTreeWidget.expandAll()
+            themes = self.config.get(u'themes', u'files')
+            themes = themes.split(u',')
+            if not os.path.exists(os.path.join(gettempdir(), u'openlp')):
+                os.makedirs(os.path.join(gettempdir(), u'openlp'))
+            for theme in themes:
+                title = self.config.get(u'theme_%s' % theme, u'title')
+                filename = self.config.get(u'theme_%s' % theme, u'filename')
+                screenshot = self.config.get(u'theme_%s' % theme, u'screenshot')
+                urllib.urlretrieve(u'%s/%s' % (self.web, screenshot),
+                    os.path.join(gettempdir(), u'openlp', screenshot))
+                item = QtGui.QListWidgetItem(title, self.themesListWidget)
+                item.setData(QtCore.Qt.UserRole,
+                    QtCore.QVariant(filename))
+                item.setIcon(build_icon(
+                    os.path.join(gettempdir(), u'openlp', screenshot)))
+                item.setCheckState(QtCore.Qt.Unchecked)
+                item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+
+    def nextId(self):
+        """
+        Determine the next page in the Wizard to go to.
+        """
+        if self.currentId() == FirstTimePage.Plugins:
+            if not self.webAccess:
+                return FirstTimePage.NoInternet
+            else:
+                return FirstTimePage.Songs
+        elif self.currentId() == FirstTimePage.Progress:
+            return -1
+        else:
+            return self.currentId() + 1
+
+    def onCurrentIdChanged(self, pageId):
+        """
+        Detects Page changes and updates as approprate.
+        """
+        if pageId == FirstTimePage.NoInternet:
+            self.finishButton.setVisible(True)
+            self.finishButton.setEnabled(True)
+            self.nextButton.setVisible(False)
+        elif pageId == FirstTimePage.Defaults:
+            self.themeComboBox.clear()
+            for iter in xrange(self.themesListWidget.count()):
+                item = self.themesListWidget.item(iter)
+                if item.checkState() == QtCore.Qt.Checked:
+                    self.themeComboBox.addItem(item.text())
+        elif pageId == FirstTimePage.Progress:
+            self._preWizard()
+            self._performWizard()
+            self._postWizard()
+
+    def _getFileSize(self, url):
+        site = urllib.urlopen(url)
+        meta = site.info()
+        return int(meta.getheaders("Content-Length")[0])
+
+    def _downloadProgress(self, count, block_size, total_size):
+        increment = (count * block_size) - self.previous_size
+        self._incrementProgressBar(None, increment)
+        self.previous_size = count * block_size
+
+    def _incrementProgressBar(self, status_text, increment=1):
+        """
+        Update the wizard progress page.
+
+        ``status_text``
+            Current status information to display.
+
+        ``increment``
+            The value to increment the progress bar by.
+        """
+        if status_text:
+            self.progressLabel.setText(status_text)
+        if increment > 0:
+            self.progressBar.setValue(self.progressBar.value() + increment)
+        Receiver.send_message(u'openlp_process_events')
+
+    def _preWizard(self):
+        """
+        Prepare the UI for the process.
+        """
+        # We start on 2 for plugins status setting plus a "finished" point.
+        max_progress = 2
+        # Loop through the songs list and increase for each selected item
+        for i in xrange(self.songsListWidget.count()):
+            item = self.songsListWidget.item(i)
+            if item.checkState() == QtCore.Qt.Checked:
+                filename = item.data(QtCore.Qt.UserRole).toString()
+                size = self._getFileSize(u'%s%s' % (self.web, filename))
+                max_progress += size
+        # Loop through the Bibles list and increase for each selected item
+        iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
+        while iterator.value():
+            item = iterator.value()
+            if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
+                filename = item.data(0, QtCore.Qt.UserRole).toString()
+                size = self._getFileSize(u'%s%s' % (self.web, filename))
+                max_progress += size
+            iterator += 1
+        # Loop through the themes list and increase for each selected item
+        for i in xrange(self.themesListWidget.count()):
+            item = self.themesListWidget.item(i)
+            if item.checkState() == QtCore.Qt.Checked:
+                filename = item.data(QtCore.Qt.UserRole).toString()
+                size = self._getFileSize(u'%s%s' % (self.web, filename))
+                max_progress += size
+        self.finishButton.setVisible(False)
+        self.progressBar.setValue(0)
+        self.progressBar.setMinimum(0)
+        self.progressBar.setMaximum(max_progress)
+
+    def _postWizard(self):
+        """
+        Clean up the UI after the process has finished.
+        """
+        self.progressBar.setValue(self.progressBar.maximum())
+        self.finishButton.setVisible(True)
+        self.finishButton.setEnabled(True)
+        self.cancelButton.setVisible(False)
+        self.nextButton.setVisible(False)
+        self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'Download complete. Click the finish button to start OpenLP.'))
+        Receiver.send_message(u'openlp_process_events')
+
+    def _performWizard(self):
+        """
+        Run the tasks in the wizard.
+        """
+        # Set plugin states
+        self._incrementProgressBar(translate('OpenLP.FirstTimeWizard',
+            'Enabling selected plugins...'))
+        self._setPluginStatus(self.songsCheckBox, u'songs/status')
+        self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
+        self._setPluginStatus(self.presentationCheckBox,
+            u'presentations/status')
+        self._setPluginStatus(self.imageCheckBox, u'images/status')
+        self._setPluginStatus(self.mediaCheckBox, u'media/status')
+        self._setPluginStatus(self.remoteCheckBox, u'remotes/status')
+        self._setPluginStatus(self.customCheckBox, u'custom/status')
+        self._setPluginStatus(self.songUsageCheckBox, u'songusage/status')
+        self._setPluginStatus(self.alertCheckBox, u'alerts/status')
+        # Build directories for downloads
+        songs_destination = os.path.join(unicode(gettempdir()), u'openlp')
+        bibles_destination = AppLocation.get_section_data_path(u'bibles')
+        themes_destination = AppLocation.get_section_data_path(u'themes')
+        # Download songs
+        for i in xrange(self.songsListWidget.count()):
+            item = self.songsListWidget.item(i)
+            if item.checkState() == QtCore.Qt.Checked:
+                filename = item.data(QtCore.Qt.UserRole).toString()
+                self._incrementProgressBar(self.downloading % filename, 0)
+                self.previous_size = 0
+                destination = os.path.join(songs_destination, unicode(filename))
+                urllib.urlretrieve(u'%s%s' % (self.web, filename), destination,
+                    self._downloadProgress)
+        # Download Bibles
+        bibles_iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
+        while bibles_iterator.value():
+            item = bibles_iterator.value()
+            if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
+                bible = unicode(item.data(0, QtCore.Qt.UserRole).toString())
+                self._incrementProgressBar(self.downloading % bible, 0)
+                self.previous_size = 0
+                urllib.urlretrieve(u'%s%s' % (self.web, bible),
+                    os.path.join(bibles_destination, bible),
+                    self._downloadProgress)
+            bibles_iterator += 1
+        # Download themes
+        for i in xrange(self.themesListWidget.count()):
+            item = self.themesListWidget.item(i)
+            if item.checkState() == QtCore.Qt.Checked:
+                theme = unicode(item.data(QtCore.Qt.UserRole).toString())
+                self._incrementProgressBar(self.downloading % theme, 0)
+                self.previous_size = 0
+                urllib.urlretrieve(u'%s%s' % (self.web, theme),
+                    os.path.join(themes_destination, theme),
+                    self._downloadProgress)
+        # Set Default Display
+        if self.displayComboBox.currentIndex() != -1:
+            QtCore.QSettings().setValue(u'General/monitor',
+                QtCore.QVariant(self.displayComboBox.currentIndex()))
+        # Set Global Theme
+        if self.themeComboBox.currentIndex() != -1:
+            QtCore.QSettings().setValue(u'themes/global theme',
+                QtCore.QVariant(self.themeComboBox.currentText()))
+        QtCore.QSettings().setValue(u'general/has run wizard',
+            QtCore.QVariant(True))
+
+    def _setPluginStatus(self, field, tag):
+        status = PluginStatus.Active if field.checkState() \
+            == QtCore.Qt.Checked else PluginStatus.Inactive
+        QtCore.QSettings().setValue(tag, QtCore.QVariant(status))

openlp/core/ui/firsttimelanguagedialog.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import create_accept_reject_button_box
+
+class Ui_FirstTimeLanguageDialog(object):
+    def setupUi(self, languageDialog):
+        languageDialog.setObjectName(u'languageDialog')
+        languageDialog.resize(300, 50)
+        self.dialogLayout = QtGui.QVBoxLayout(languageDialog)
+        self.dialogLayout.setContentsMargins(8, 8, 8, 8)
+        self.dialogLayout.setSpacing(8)
+        self.dialogLayout.setObjectName(u'dialogLayout')
+        self.infoLabel = QtGui.QLabel(languageDialog)
+        self.infoLabel.setObjectName(u'infoLabel')
+        self.dialogLayout.addWidget(self.infoLabel)
+        self.languageLayout = QtGui.QHBoxLayout()
+        self.languageLayout.setObjectName(u'languageLayout')
+        self.languageLabel = QtGui.QLabel(languageDialog)
+        self.languageLabel.setObjectName(u'languageLabel')
+        self.languageLayout.addWidget(self.languageLabel)
+        self.languageComboBox = QtGui.QComboBox(languageDialog)
+        self.languageComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToContents)
+        self.languageComboBox.setObjectName("languageComboBox")
+        self.languageLayout.addWidget(self.languageComboBox)
+        self.dialogLayout.addLayout(self.languageLayout)
+        self.buttonBox = create_accept_reject_button_box(languageDialog, True)
+        self.dialogLayout.addWidget(self.buttonBox)
+
+        self.retranslateUi(languageDialog)
+        self.setMaximumHeight(self.sizeHint().height())
+        QtCore.QMetaObject.connectSlotsByName(languageDialog)
+
+    def retranslateUi(self, languageDialog):
+        self.setWindowTitle(translate('OpenLP.FirstTimeLanguageForm',
+                'Select Translation'))
+        self.infoLabel.setText(translate('OpenLP.FirstTimeLanguageForm',
+            'Choose the translation you\'d like to use in OpenLP.'))
+        self.languageLabel.setText(translate('OpenLP.FirstTimeLanguageForm',
+            'Translation:'))

openlp/core/ui/firsttimelanguageform.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtGui
+
+from openlp.core.utils import LanguageManager
+from firsttimelanguagedialog import Ui_FirstTimeLanguageDialog
+
+class FirstTimeLanguageForm(QtGui.QDialog, Ui_FirstTimeLanguageDialog):
+    """
+    The exception dialog
+    """
+    def __init__(self, parent=None):
+        QtGui.QDialog.__init__(self, parent)
+        self.setupUi(self)
+        self.qmList = LanguageManager.get_qm_list()
+        self.languageComboBox.addItem(u'Autodetect')
+        for key in sorted(self.qmList.keys()):
+            self.languageComboBox.addItem(key)
+
+    def exec_(self):
+        """
+        Run the Dialog with correct heading.
+        """
+        return QtGui.QDialog.exec_(self)
+
+    def accept(self):
+        # It's the first row so must be Automatic
+        if self.languageComboBox.currentIndex() == 0:
+            LanguageManager.auto_language = True
+            LanguageManager.set_language(False, False)
+        else:
+            LanguageManager.auto_language = False
+            action = QtGui.QAction(None)
+            action.setObjectName(unicode(self.languageComboBox.currentText()))
+            LanguageManager.set_language(action, False)
+        return QtGui.QDialog.accept(self)
+
+    def reject(self):
+        LanguageManager.auto_language = True
+        LanguageManager.set_language(False, False)
+        return QtGui.QDialog.reject(self)

openlp/core/ui/firsttimewizard.py

@@ -0,0 +1,261 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import add_welcome_page
+
+class FirstTimePage(object):
+    Welcome = 0
+    Plugins = 1
+    NoInternet = 2
+    Songs = 3
+    Bibles = 4
+    Themes = 5
+    Defaults = 6
+    Progress = 7
+
+
+class Ui_FirstTimeWizard(object):
+    def setupUi(self, FirstTimeWizard):
+        FirstTimeWizard.setObjectName(u'FirstTimeWizard')
+        FirstTimeWizard.resize(550, 386)
+        FirstTimeWizard.setModal(True)
+        FirstTimeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
+        FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages|
+            QtGui.QWizard.NoBackButtonOnStartPage |
+            QtGui.QWizard.NoBackButtonOnLastPage)
+        self.finishButton = self.button(QtGui.QWizard.FinishButton)
+        self.cancelButton = self.button(QtGui.QWizard.CancelButton)
+        self.nextButton = self.button(QtGui.QWizard.NextButton)
+        self.backButton = self.button(QtGui.QWizard.BackButton)
+        add_welcome_page(FirstTimeWizard, u':/wizards/wizard_firsttime.bmp')
+        # The plugins page
+        self.pluginPage = QtGui.QWizardPage()
+        self.pluginPage.setObjectName(u'pluginPage')
+        self.pluginLayout = QtGui.QVBoxLayout(self.pluginPage)
+        self.pluginLayout.setContentsMargins(40, 15, 40, 0)
+        self.pluginLayout.setObjectName(u'pluginLayout')
+        self.songsCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.songsCheckBox.setChecked(True)
+        self.songsCheckBox.setObjectName(u'songsCheckBox')
+        self.pluginLayout.addWidget(self.songsCheckBox)
+        self.customCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.customCheckBox.setChecked(True)
+        self.customCheckBox.setObjectName(u'customCheckBox')
+        self.pluginLayout.addWidget(self.customCheckBox)
+        self.bibleCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.bibleCheckBox.setChecked(True)
+        self.bibleCheckBox.setObjectName(u'bibleCheckBox')
+        self.pluginLayout.addWidget(self.bibleCheckBox)
+        self.imageCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.imageCheckBox.setChecked(True)
+        self.imageCheckBox.setObjectName(u'imageCheckBox')
+        self.pluginLayout.addWidget(self.imageCheckBox)
+        self.presentationCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.presentationCheckBox.setChecked(True)
+        self.presentationCheckBox.setObjectName(u'presentationCheckBox')
+        self.pluginLayout.addWidget(self.presentationCheckBox)
+        self.mediaCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.mediaCheckBox.setChecked(True)
+        self.mediaCheckBox.setObjectName(u'mediaCheckBox')
+        self.pluginLayout.addWidget(self.mediaCheckBox)
+        self.remoteCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.remoteCheckBox.setObjectName(u'remoteCheckBox')
+        self.pluginLayout.addWidget(self.remoteCheckBox)
+        self.songUsageCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.songUsageCheckBox.setChecked(True)
+        self.songUsageCheckBox.setObjectName(u'songUsageCheckBox')
+        self.pluginLayout.addWidget(self.songUsageCheckBox)
+        self.alertCheckBox = QtGui.QCheckBox(self.pluginPage)
+        self.alertCheckBox.setChecked(True)
+        self.alertCheckBox.setObjectName(u'alertCheckBox')
+        self.pluginLayout.addWidget(self.alertCheckBox)
+        FirstTimeWizard.setPage(FirstTimePage.Plugins, self.pluginPage)
+        # The "you don't have an internet connection" page.
+        self.noInternetPage = QtGui.QWizardPage()
+        self.noInternetPage.setObjectName(u'noInternetPage')
+        self.noInternetLayout = QtGui.QVBoxLayout(self.noInternetPage)
+        self.noInternetLayout.setContentsMargins(50, 30, 50, 40)
+        self.noInternetLayout.setObjectName(u'noInternetLayout')
+        self.noInternetLabel = QtGui.QLabel(self.noInternetPage)
+        self.noInternetLabel.setWordWrap(True)
+        self.noInternetLabel.setObjectName(u'noInternetLabel')
+        self.noInternetLayout.addWidget(self.noInternetLabel)
+        FirstTimeWizard.setPage(FirstTimePage.NoInternet, self.noInternetPage)
+        # The song samples page
+        self.songsPage = QtGui.QWizardPage()
+        self.songsPage.setObjectName(u'songsPage')
+        self.songsLayout = QtGui.QVBoxLayout(self.songsPage)
+        self.songsLayout.setContentsMargins(50, 20, 50, 20)
+        self.songsLayout.setObjectName(u'songsLayout')
+        self.songsListWidget = QtGui.QListWidget(self.songsPage)
+        self.songsListWidget.setAlternatingRowColors(True)
+        self.songsListWidget.setObjectName(u'songsListWidget')
+        self.songsLayout.addWidget(self.songsListWidget)
+        FirstTimeWizard.setPage(FirstTimePage.Songs, self.songsPage)
+        # The Bible samples page
+        self.biblesPage = QtGui.QWizardPage()
+        self.biblesPage.setObjectName(u'biblesPage')
+        self.biblesLayout = QtGui.QVBoxLayout(self.biblesPage)
+        self.biblesLayout.setContentsMargins(50, 20, 50, 20)
+        self.biblesLayout.setObjectName(u'biblesLayout')
+        self.biblesTreeWidget = QtGui.QTreeWidget(self.biblesPage)
+        self.biblesTreeWidget.setAlternatingRowColors(True)
+        self.biblesTreeWidget.header().setVisible(False)
+        self.biblesTreeWidget.setObjectName(u'biblesTreeWidget')
+        self.biblesLayout.addWidget(self.biblesTreeWidget)
+        FirstTimeWizard.setPage(FirstTimePage.Bibles, self.biblesPage)
+        # The theme samples page
+        self.themesPage = QtGui.QWizardPage()
+        self.themesPage.setObjectName(u'themesPage')
+        self.themesLayout = QtGui.QVBoxLayout(self.themesPage)
+        self.themesLayout.setContentsMargins(20, 50, 20, 60)
+        self.themesLayout.setObjectName(u'themesLayout')
+        self.themesListWidget = QtGui.QListWidget(self.themesPage)
+        self.themesListWidget.setViewMode(QtGui.QListView.IconMode)
+        self.themesListWidget.setMovement(QtGui.QListView.Static)
+        self.themesListWidget.setFlow(QtGui.QListView.LeftToRight)
+        self.themesListWidget.setSpacing(4)
+        self.themesListWidget.setUniformItemSizes(True)
+        self.themesListWidget.setIconSize(QtCore.QSize(133, 100))
+        self.themesListWidget.setWrapping(False)
+        self.themesListWidget.setObjectName(u'themesListWidget')
+        self.themesLayout.addWidget(self.themesListWidget)
+        FirstTimeWizard.setPage(FirstTimePage.Themes, self.themesPage)
+        # the default settings page
+        self.defaultsPage = QtGui.QWizardPage()
+        self.defaultsPage.setObjectName(u'defaultsPage')
+        self.defaultsLayout = QtGui.QFormLayout(self.defaultsPage)
+        self.defaultsLayout.setContentsMargins(50, 20, 50, 20)
+        self.defaultsLayout.setObjectName(u'defaultsLayout')
+        self.displayLabel = QtGui.QLabel(self.defaultsPage)
+        self.displayLabel.setObjectName(u'displayLabel')
+        self.displayComboBox = QtGui.QComboBox(self.defaultsPage)
+        self.displayComboBox.setEditable(False)
+        self.displayComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.displayComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToContents)
+        self.displayComboBox.setObjectName(u'displayComboBox')
+        self.defaultsLayout.addRow(self.displayLabel, self.displayComboBox)
+        self.themeLabel = QtGui.QLabel(self.defaultsPage)
+        self.themeLabel.setObjectName(u'themeLabel')
+        self.themeComboBox = QtGui.QComboBox(self.defaultsPage)
+        self.themeComboBox.setEditable(False)
+        self.themeComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.themeComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToContents)
+        self.themeComboBox.setObjectName(u'themeComboBox')
+        self.defaultsLayout.addRow(self.themeLabel, self.themeComboBox)
+        FirstTimeWizard.setPage(FirstTimePage.Defaults, self.defaultsPage)
+        # Progress page
+        self.progressPage = QtGui.QWizardPage()
+        self.progressPage.setObjectName(u'progressPage')
+        self.progressLayout = QtGui.QVBoxLayout(self.progressPage)
+        self.progressLayout.setMargin(48)
+        self.progressLayout.setObjectName(u'progressLayout')
+        self.progressLabel = QtGui.QLabel(self.progressPage)
+        self.progressLabel.setObjectName(u'progressLabel')
+        self.progressLayout.addWidget(self.progressLabel)
+        self.progressBar = QtGui.QProgressBar(self.progressPage)
+        self.progressBar.setObjectName(u'progressBar')
+        self.progressLayout.addWidget(self.progressBar)
+        FirstTimeWizard.setPage(FirstTimePage.Progress, self.progressPage)
+
+        self.retranslateUi(FirstTimeWizard)
+        QtCore.QMetaObject.connectSlotsByName(FirstTimeWizard)
+
+    def retranslateUi(self, FirstTimeWizard):
+        FirstTimeWizard.setWindowTitle(translate(
+            'OpenLP.FirstTimeWizard', 'First Time Wizard'))
+        self.titleLabel.setText(
+            u'<span style="font-size:14pt; font-weight:600;">%s</span>' % \
+            translate('OpenLP.FirstTimeWizard',
+            'Welcome to the First Time Wizard'))
+        self.informationLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'This wizard will help you to configure OpenLP for initial use.'
+            ' Click the next button below to start the process of selection '
+            'your initial options. '))
+        self.pluginPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Activate required Plugins'))
+        self.pluginPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Select the Plugins you wish to use. '))
+        self.songsCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))
+        self.customCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Custom Text'))
+        self.bibleCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Bible'))
+        self.imageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Images'))
+        self.presentationCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Presentations'))
+        self.mediaCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Media (Audio and Video)'))
+        self.remoteCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Allow remote access'))
+        self.songUsageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Monitor Song Usage'))
+        self.alertCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+            'Allow Alerts'))
+        self.noInternetPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'No Internet Connection'))
+        self.noInternetPage.setSubTitle(translate(
+            'OpenLP.FirstTimeWizard',
+            'Unable to detect an Internet connection.'))
+        self.noInternetLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'No Internet connection was found. The First Time Wizard needs an '
+            'Internet connection in order to be able to download sample '
+            'songs, Bibles and themes.\n\nTo re-run the First Time Wizard and '
+            'import this sample data at a later stage, press the cancel '
+            'button now, check your Internet connection, and restart OpenLP.'
+            '\n\nTo cancel the First Time Wizard completely, press the finish '
+            'button now.'))
+        self.songsPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Sample Songs'))
+        self.songsPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Select and download public domain songs.'))
+        self.biblesPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Sample Bibles'))
+        self.biblesPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Select and download free Bibles.'))
+        self.themesPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Sample Themes'))
+        self.themesPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Select and download sample themes.'))
+        self.defaultsPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Default Settings'))
+        self.defaultsPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Set up default settings to be used by OpenLP.'))
+        self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
+            'Setting Up And Importing'))
+        self.progressPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+            'Please wait while OpenLP is set up and your data is imported.'))
+        self.displayLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'Default output display:'))
+        self.themeLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'Select default theme:'))
+        self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'Starting configuration process...'))

openlp/core/ui/generaltab.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,30 +28,10 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, Receiver, translate
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
-class ValidEdit(QtGui.QLineEdit):
-    """
-    Only allow numeric characters to be edited
-    """
-    def __init__(self, parent):
-        """
-        Set up Override and Validator
-        """
-        QtGui.QLineEdit.__init__(self, parent)
-        self.setValidator(QtGui.QIntValidator(0, 9999, self))
-
-    def validText(self):
-        """
-        Only return Integers.  Space is 0
-        """
-        if self.text().isEmpty():
-            return QtCore.QString(u'0')
-        else:
-            return self.text()
-
-
 class GeneralTab(SettingsTab):
     """
     GeneralTab is the general settings tab in the settings dialog.
@@ -163,30 +143,6 @@ class GeneralTab(SettingsTab):
         self.displayGroupBox.setObjectName(u'displayGroupBox')
         self.displayLayout = QtGui.QGridLayout(self.displayGroupBox)
         self.displayLayout.setObjectName(u'displayLayout')
-        self.currentXLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentXLabel.setObjectName(u'currentXLabel')
-        self.displayLayout.addWidget(self.currentXLabel, 0, 0)
-        self.currentXValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentXValueLabel.setObjectName(u'currentXValueLabel')
-        self.displayLayout.addWidget(self.currentXValueLabel, 1, 0)
-        self.currentYLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentYLabel.setObjectName(u'currentYLabel')
-        self.displayLayout.addWidget(self.currentYLabel, 0, 1)
-        self.currentYValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentYValueLabel.setObjectName(u'currentYValueLabel')
-        self.displayLayout.addWidget(self.currentYValueLabel, 1, 1)
-        self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthLabel.setObjectName(u'currentWidthLabel')
-        self.displayLayout.addWidget(self.currentWidthLabel, 0, 2)
-        self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
-        self.displayLayout.addWidget(self.currentWidthValueLabel, 1, 2)
-        self.currentHeightLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentHeightLabel.setObjectName(u'currentHeightLabel')
-        self.displayLayout.addWidget(self.currentHeightLabel, 0, 3)
-        self.currentHeightValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentHeightValueLabel.setObjectName(u'Height')
-        self.displayLayout.addWidget(self.currentHeightValueLabel, 1, 3)
         self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
         self.overrideCheckBox.setObjectName(u'overrideCheckBox')
         self.displayLayout.addWidget(self.overrideCheckBox, 2, 0, 1, 4)
@@ -195,26 +151,30 @@ class GeneralTab(SettingsTab):
         self.customXLabel = QtGui.QLabel(self.displayGroupBox)
         self.customXLabel.setObjectName(u'customXLabel')
         self.displayLayout.addWidget(self.customXLabel, 3, 0)
-        self.customXValueEdit = ValidEdit(self.displayGroupBox)
+        self.customXValueEdit = QtGui.QSpinBox(self.displayGroupBox)
         self.customXValueEdit.setObjectName(u'customXValueEdit')
+        self.customXValueEdit.setMaximum(9999)
         self.displayLayout.addWidget(self.customXValueEdit, 4, 0)
         self.customYLabel = QtGui.QLabel(self.displayGroupBox)
         self.customYLabel.setObjectName(u'customYLabel')
         self.displayLayout.addWidget(self.customYLabel, 3, 1)
-        self.customYValueEdit = ValidEdit(self.displayGroupBox)
+        self.customYValueEdit = QtGui.QSpinBox(self.displayGroupBox)
         self.customYValueEdit.setObjectName(u'customYValueEdit')
+        self.customYValueEdit.setMaximum(9999)
         self.displayLayout.addWidget(self.customYValueEdit, 4, 1)
         self.customWidthLabel = QtGui.QLabel(self.displayGroupBox)
         self.customWidthLabel.setObjectName(u'customWidthLabel')
         self.displayLayout.addWidget(self.customWidthLabel, 3, 2)
-        self.customWidthValueEdit = ValidEdit(self.displayGroupBox)
+        self.customWidthValueEdit = QtGui.QSpinBox(self.displayGroupBox)
         self.customWidthValueEdit.setObjectName(u'customWidthValueEdit')
+        self.customWidthValueEdit.setMaximum(9999)
         self.displayLayout.addWidget(self.customWidthValueEdit, 4, 2)
         self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
         self.customHeightLabel.setObjectName(u'customHeightLabel')
         self.displayLayout.addWidget(self.customHeightLabel, 3, 3)
-        self.customHeightValueEdit = ValidEdit(self.displayGroupBox)
+        self.customHeightValueEdit = QtGui.QSpinBox(self.displayGroupBox)
         self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
+        self.customHeightValueEdit.setMaximum(9999)
         self.displayLayout.addWidget(self.customHeightValueEdit, 4, 3)
         self.rightLayout.addWidget(self.displayGroupBox)
         self.rightLayout.addStretch()
@@ -222,17 +182,22 @@ class GeneralTab(SettingsTab):
         QtCore.QObject.connect(self.overrideCheckBox,
             QtCore.SIGNAL(u'toggled(bool)'), self.onOverrideCheckBoxToggled)
         QtCore.QObject.connect(self.customHeightValueEdit,
-            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayPositionChanged)
-            self.onDisplayPositionChanged)
         QtCore.QObject.connect(self.customWidthValueEdit,
-            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayPositionChanged)
-            self.onDisplayPositionChanged)
         QtCore.QObject.connect(self.customYValueEdit,
-            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayPositionChanged)
-            self.onDisplayPositionChanged)
         QtCore.QObject.connect(self.customXValueEdit,
-            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayPositionChanged)
-            self.onDisplayPositionChanged)
+        # Reload the tab, as the screen resolution/count may have changed.
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'config_screen_changed'), self.load)
+        # Remove for now
+        self.usernameLabel.setVisible(False)
+        self.usernameEdit.setVisible(False)
+        self.passwordLabel.setVisible(False)
+        self.passwordEdit.setVisible(False)
+
 
     def retranslateUi(self):
         """
@@ -263,12 +228,10 @@ class GeneralTab(SettingsTab):
             'Automatically preview next item in service'))
         self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
             'Slide loop delay:'))
-        self.timeoutSpinBox.setSuffix(
+        self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
-            translate('OpenLP.GeneralTab', ' sec'))
         self.ccliGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'CCLI Details'))
-        self.numberLabel.setText(
+        self.numberLabel.setText(UiStrings.CCLINumberLabel)
-            translate('OpenLP.GeneralTab', 'CCLI number:'))
         self.usernameLabel.setText(
             translate('OpenLP.GeneralTab', 'SongSelect username:'))
         self.passwordLabel.setText(
@@ -276,22 +239,11 @@ class GeneralTab(SettingsTab):
         # Moved from display tab
         self.displayGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Display Position'))
-        self.currentXLabel.setText(translate('OpenLP.GeneralTab', 'X'))
-        self.currentXValueLabel.setText(u'0')
-        self.currentYLabel.setText(translate('OpenLP.GeneralTab', 'Y'))
-        self.currentYValueLabel.setText(u'0')
-        self.currentHeightLabel.setText(
-            translate('OpenLP.GeneralTab', 'Height'))
-        self.currentHeightValueLabel.setText(u'0')
-        self.currentWidthLabel.setText(
-            translate('OpenLP.GeneralTab', 'Width'))
-        self.currentWidthValueLabel.setText(u'0')
         self.overrideCheckBox.setText(translate('OpenLP.GeneralTab',
             'Override display position'))
         self.customXLabel.setText(translate('OpenLP.GeneralTab', 'X'))
         self.customYLabel.setText(translate('OpenLP.GeneralTab', 'Y'))
-        self.customHeightLabel.setText(
+        self.customHeightLabel.setText(translate('OpenLP.GeneralTab', 'Height'))
-            translate('OpenLP.GeneralTab', 'Height'))
         self.customWidthLabel.setText(translate('OpenLP.GeneralTab', 'Width'))
 
     def load(self):
@@ -300,13 +252,8 @@ class GeneralTab(SettingsTab):
         """
         settings = QtCore.QSettings()
         settings.beginGroup(self.settingsSection)
-        for screen in self.screens.screen_list:
+        self.monitorComboBox.clear()
-            screen_name = u'%s %d' % (translate('OpenLP.GeneralTab', 'Screen'),
+        self.monitorComboBox.addItems(self.screens.get_screen_list())
-                screen[u'number'] + 1)
-            if screen[u'primary']:
-                screen_name = u'%s (%s)' % (screen_name,
-                    translate('OpenLP.GeneralTab', 'primary'))
-            self.monitorComboBox.addItem(screen_name)
         self.numberEdit.setText(unicode(settings.value(
             u'ccli number', QtCore.QVariant(u'')).toString()))
         self.usernameEdit.setText(unicode(settings.value(
@@ -329,26 +276,16 @@ class GeneralTab(SettingsTab):
             QtCore.QVariant(False)).toBool())
         self.timeoutSpinBox.setValue(settings.value(u'loop delay',
            QtCore.QVariant(5)).toInt()[0])
-        self.currentXValueLabel.setText(
-            unicode(self.screens.current[u'size'].x()))
-        self.currentYValueLabel.setText(
-            unicode(self.screens.current[u'size'].y()))
-        self.currentHeightValueLabel.setText(
-            unicode(self.screens.current[u'size'].height()))
-        self.currentWidthValueLabel.setText(
-            unicode(self.screens.current[u'size'].width()))
         self.overrideCheckBox.setChecked(settings.value(u'override position',
             QtCore.QVariant(False)).toBool())
-        self.customXValueEdit.setText(settings.value(u'x position',
+        self.customXValueEdit.setValue(settings.value(u'x position',
-            QtCore.QVariant(self.screens.current[u'size'].x())).toString())
+            QtCore.QVariant(self.screens.current[u'size'].x())).toInt()[0])
-        self.customYValueEdit.setText(settings.value(u'y position',
+        self.customYValueEdit.setValue(settings.value(u'y position',
-            QtCore.QVariant(self.screens.current[u'size'].y())).toString())
+            QtCore.QVariant(self.screens.current[u'size'].y())).toInt()[0])
-        self.customHeightValueEdit.setText(
+        self.customHeightValueEdit.setValue(settings.value(u'height',
-            settings.value(u'height', QtCore.QVariant(
+            QtCore.QVariant(self.screens.current[u'size'].height())).toInt()[0])
-            self.screens.current[u'size'].height())).toString())
+        self.customWidthValueEdit.setValue(settings.value(u'width',
-        self.customWidthValueEdit.setText(
+            QtCore.QVariant(self.screens.current[u'size'].width())).toInt()[0])
-            settings.value(u'width', QtCore.QVariant(
-            self.screens.current[u'size'].width())).toString())
         settings.endGroup()
         self.customXValueEdit.setEnabled(self.overrideCheckBox.isChecked())
         self.customYValueEdit.setEnabled(self.overrideCheckBox.isChecked())
@@ -386,13 +323,13 @@ class GeneralTab(SettingsTab):
         settings.setValue(u'songselect password',
             QtCore.QVariant(self.passwordEdit.displayText()))
         settings.setValue(u'x position',
-            QtCore.QVariant(self.customXValueEdit.text()))
+            QtCore.QVariant(self.customXValueEdit.value()))
         settings.setValue(u'y position',
-            QtCore.QVariant(self.customYValueEdit.text()))
+            QtCore.QVariant(self.customYValueEdit.value()))
         settings.setValue(u'height',
-            QtCore.QVariant(self.customHeightValueEdit.text()))
+            QtCore.QVariant(self.customHeightValueEdit.value()))
         settings.setValue(u'width',
-            QtCore.QVariant(self.customWidthValueEdit.text()))
+            QtCore.QVariant(self.customWidthValueEdit.value()))
         settings.setValue(u'override position',
             QtCore.QVariant(self.overrideCheckBox.isChecked()))
         settings.endGroup()
@@ -416,10 +353,10 @@ class GeneralTab(SettingsTab):
         # Reset screens after initial definition
         if self.overrideChanged:
             self.screens.override[u'size'] = QtCore.QRect(
-                int(self.customXValueEdit.validText()),
+                self.customXValueEdit.value(),
-                int(self.customYValueEdit.validText()),
+                self.customYValueEdit.value(),
-                int(self.customWidthValueEdit.validText()),
+                self.customWidthValueEdit.value(),
-                int(self.customHeightValueEdit.validText()))
+                self.customHeightValueEdit.value())
         if self.overrideCheckBox.isChecked():
             self.screens.set_override_display()
         else:

openlp/core/ui/maindisplay.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -67,12 +67,13 @@ class MainDisplay(DisplayWidget):
         self.isLive = live
         self.alertTab = None
         self.hideMode = None
+        self.videoHide = False
         self.override = {}
         mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
         self.setWindowIcon(mainIcon)
         self.retranslateUi()
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
             QtCore.Qt.WindowStaysOnTopHint)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
@@ -90,8 +91,8 @@ class MainDisplay(DisplayWidget):
         """
         Set up and build the output screen
         """
-        log.debug(u'Setup live = %s for monitor %s ' % (self.isLive,
+        log.debug(u'Start setup for monitor %s (live = %s)' %
-            self.screens.monitor_number))
+            (self.screens.monitor_number, self.isLive))
         self.usePhonon = QtCore.QSettings().value(
             u'media/use phonon', QtCore.QVariant(True)).toBool()
         self.phononActive = False
@@ -102,10 +103,21 @@ class MainDisplay(DisplayWidget):
         self.videoWidget.setVisible(False)
         self.videoWidget.setGeometry(QtCore.QRect(0, 0,
             self.screen[u'size'].width(), self.screen[u'size'].height()))
+        log.debug(u'Setup Phonon for monitor %s' % self.screens.monitor_number)
         self.mediaObject = Phonon.MediaObject(self)
         self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject)
         Phonon.createPath(self.mediaObject, self.videoWidget)
         Phonon.createPath(self.mediaObject, self.audio)
+        QtCore.QObject.connect(self.mediaObject,
+            QtCore.SIGNAL(u'stateChanged(Phonon::State, Phonon::State)'),
+            self.videoStart)
+        QtCore.QObject.connect(self.mediaObject,
+            QtCore.SIGNAL(u'finished()'),
+            self.videoFinished)
+        QtCore.QObject.connect(self.mediaObject,
+            QtCore.SIGNAL(u'tick(qint64)'),
+            self.videoTick)
+        log.debug(u'Setup webView for monitor %s' % self.screens.monitor_number)
         self.webView = QtWebKit.QWebView(self)
         self.webView.setGeometry(0, 0,
             self.screen[u'size'].width(), self.screen[u'size'].height())
@@ -129,30 +141,40 @@ class MainDisplay(DisplayWidget):
             painter_image.begin(self.black)
             painter_image.fillRect(self.black.rect(), QtCore.Qt.black)
             # Build the initial frame.
-            initialFrame = QtGui.QImage(
+            image_file = QtCore.QSettings().value(u'advanced/default image',
+                QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
+                .toString()
+            background_color = QtGui.QColor(QtCore.QSettings().value(
+                u'advanced/default color',
+                QtCore.QVariant(u'#ffffff')).toString())
+            if not background_color.isValid():
+                background_color = QtCore.Qt.white
+            splash_image = QtGui.QImage(image_file)
+            self.initialFrame = QtGui.QImage(
                 self.screens.current[u'size'].width(),
                 self.screens.current[u'size'].height(),
                 QtGui.QImage.Format_ARGB32_Premultiplied)
-            splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
             painter_image = QtGui.QPainter()
-            painter_image.begin(initialFrame)
+            painter_image.begin(self.initialFrame)
-            painter_image.fillRect(initialFrame.rect(), QtCore.Qt.white)
+            painter_image.fillRect(self.initialFrame.rect(), background_color)
             painter_image.drawImage(
                 (self.screens.current[u'size'].width() -
                 splash_image.width()) / 2,
                 (self.screens.current[u'size'].height()
                 - splash_image.height()) / 2, splash_image)
             serviceItem = ServiceItem()
-            serviceItem.bg_image_bytes = image_to_byte(initialFrame)
+            serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
             self.webView.setHtml(build_html(serviceItem, self.screen,
-                self.parent.alertTab, self.isLive, None))
+                self.alertTab, self.isLive, None))
-            self.initialFrame = True
+            self.__hideMouse()
             # To display or not to display?
             if not self.screen[u'primary']:
                 self.show()
                 self.primary = False
             else:
                 self.primary = True
+        log.debug(
+            u'Finished setup for monitor %s' % self.screens.monitor_number)
 
     def text(self, slide):
         """
@@ -165,6 +187,7 @@ class MainDisplay(DisplayWidget):
         # Wait for the webview to update before displaying text.
         while not self.webLoaded:
             Receiver.send_message(u'openlp_process_events')
+        self.setGeometry(self.screen[u'size'])
         self.frame.evaluateJavaScript(u'show_text("%s")' % \
             slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
         return self.preview()
@@ -192,12 +215,18 @@ class MainDisplay(DisplayWidget):
             else:
                 shrinkItem = self
             if text:
-                shrinkItem.resize(self.width(), int(height.toString()))
+                alert_height = int(height.toString())
+                shrinkItem.resize(self.width(), alert_height)
                 shrinkItem.setVisible(True)
+                if self.alertTab.location == 1:
+                    shrinkItem.move(self.screen[u'size'].left(),
+                    (self.screen[u'size'].height() - alert_height) / 2)
+                elif self.alertTab.location == 2:
+                    shrinkItem.move(self.screen[u'size'].left(),
+                        self.screen[u'size'].height() - alert_height)
             else:
                 shrinkItem.setVisible(False)
-                shrinkItem.resize(self.screen[u'size'].width(),
+                self.setGeometry(self.screen[u'size'])
-                    self.screen[u'size'].height())
 
     def directImage(self, name, path):
         """
@@ -221,22 +250,21 @@ class MainDisplay(DisplayWidget):
         image = self.imageManager.get_image_bytes(name)
         self.resetVideo()
         self.displayImage(image)
-        # show screen
-        if self.isLive:
-            self.setVisible(True)
         return self.preview()
 
     def displayImage(self, image):
         """
         Display an image, as is.
         """
+        self.setGeometry(self.screen[u'size'])
         if image:
             js = u'show_image("data:image/png;base64,%s");' % image
         else:
             js = u'show_image("");'
         self.frame.evaluateJavaScript(js)
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def resetImage(self):
         """
@@ -248,9 +276,11 @@ class MainDisplay(DisplayWidget):
             self.displayImage(self.serviceItem.bg_image_bytes)
         else:
             self.displayImage(None)
+        # clear the cache
         self.override = {}
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def resetVideo(self):
         """
@@ -267,7 +297,8 @@ class MainDisplay(DisplayWidget):
             self.frame.evaluateJavaScript(u'show_video("close");')
         self.override = {}
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def videoPlay(self):
         """
@@ -307,7 +338,7 @@ class MainDisplay(DisplayWidget):
         Changes the volume of a running video
         """
         log.debug(u'videoVolume %d' % volume)
-        vol = float(volume)/float(10)
+        vol = float(volume) / float(10)
         if self.phononActive:
             self.audio.setVolume(vol)
         else:
@@ -320,28 +351,58 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'video')
         self.webLoaded = True
+        self.setGeometry(self.screen[u'size'])
         # We are running a background theme
         self.override[u'theme'] = u''
         self.override[u'video'] = True
-        vol = float(volume)/float(10)
+        vol = float(volume) / float(10)
         if isBackground or not self.usePhonon:
             js = u'show_video("init", "%s", %s, true); show_video("play");' % \
-                (videoPath.replace(u'\\', u'\\\\'), \
+                (videoPath.replace(u'\\', u'\\\\'), str(vol))
-                str(vol))
             self.frame.evaluateJavaScript(js)
         else:
             self.phononActive = True
             self.mediaObject.stop()
             self.mediaObject.clearQueue()
             self.mediaObject.setCurrentSource(Phonon.MediaSource(videoPath))
+            # Need the timer to trigger set the trigger to 200ms
+            # Value taken from web documentation.
+            if self.serviceItem.start_time != 0:
+                self.mediaObject.setTickInterval(200)
             self.mediaObject.play()
             self.webView.setVisible(False)
             self.videoWidget.setVisible(True)
             self.audio.setVolume(vol)
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
         return self.preview()
 
+    def videoStart(self, newState, oldState):
+        """
+        Start the video at a predetermined point.
+        """
+        if newState == Phonon.PlayingState:
+            # set start time in milliseconds
+            self.mediaObject.seek(self.serviceItem.start_time * 1000)
+
+    def videoFinished(self):
+        """
+        Blank the Video when it has finished so the final frame is not left
+        hanging
+        """
+        self.videoStop()
+        self.hideDisplay(HideMode.Blank)
+        self.phononActive = False
+        self.videoHide = True
+
+    def videoTick(self, tick):
+        """
+        Triggered on video tick every 200 milli seconds
+        Will be used to manage stop time later
+        """
+        pass
+
     def isWebLoaded(self):
         """
         Called by webView event to show display is fully loaded
@@ -370,9 +431,17 @@ class MainDisplay(DisplayWidget):
             Receiver.send_message(u'openlp_process_events')
         # if was hidden keep it hidden
         if self.isLive:
-            self.setVisible(True)
             if self.hideMode:
                 self.hideDisplay(self.hideMode)
+            else:
+                # Single screen active
+                if self.screens.monitor_number == 0:
+                    # Only make visible if setting enabled
+                    if QtCore.QSettings().value(u'general/display on monitor',
+                        QtCore.QVariant(True)).toBool():
+                        self.setVisible(True)
+                else:
+                    self.setVisible(True)
         preview = QtGui.QImage(self.screen[u'size'].width(),
             self.screen[u'size'].height(),
             QtGui.QImage.Format_ARGB32_Premultiplied)
@@ -389,7 +458,7 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'buildHtml')
         self.webLoaded = False
-        self.initialFrame = False
+        self.initialFrame = None
         self.serviceItem = serviceItem
         background = None
         # We have an image override so keep the image till the theme changes
@@ -398,17 +467,18 @@ class MainDisplay(DisplayWidget):
             if u'video' in self.override:
                 Receiver.send_message(u'video_background_replaced')
                 self.override = {}
-            elif self.override[u'theme'] != \
+            # We have a different theme.
-                serviceItem.themedata.theme_name:
+            elif self.override[u'theme'] != serviceItem.themedata.theme_name:
                 Receiver.send_message(u'live_theme_changed')
                 self.override = {}
             else:
+                # replace the background
                 background = self.imageManager. \
                     get_image_bytes(self.override[u'image'])
         if self.serviceItem.themedata.background_filename:
             self.serviceItem.bg_image_bytes = self.imageManager. \
                 get_image_bytes(self.serviceItem.themedata.theme_name)
-        html = build_html(self.serviceItem, self.screen, self.parent.alertTab,
+        html = build_html(self.serviceItem, self.screen, self.alertTab,
             self.isLive, background)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)
@@ -418,15 +488,11 @@ class MainDisplay(DisplayWidget):
         # if was hidden keep it hidden
         if self.hideMode and self.isLive:
             self.hideDisplay(self.hideMode)
-        # Hide mouse cursor when moved over display if enabled in settings
+        # display hidden for video end we have a new item so must be shown
-        settings = QtCore.QSettings()
+        if self.videoHide and self.isLive:
-        if settings.value(u'advanced/hide mouse',
+            self.videoHide = False
-            QtCore.QVariant(False)).toBool():
+            self.showDisplay()
-            self.setCursor(QtCore.Qt.BlankCursor)
+        self.__hideMouse()
-            self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
-        else:
-            self.setCursor(QtCore.Qt.ArrowCursor)
-            self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
 
     def footer(self, text):
         """
@@ -474,7 +540,18 @@ class MainDisplay(DisplayWidget):
             self.videoPlay()
         self.hideMode = None
         # Trigger actions when display is active again
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
+
+    def __hideMouse(self):
+        # Hide mouse cursor when moved over display if enabled in settings
+        if QtCore.QSettings().value(u'advanced/hide mouse',
+            QtCore.QVariant(False)).toBool():
+            self.setCursor(QtCore.Qt.BlankCursor)
+            self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
+        else:
+            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
 
 
 class AudioPlayer(QtCore.QObject):
@@ -490,9 +567,6 @@ class AudioPlayer(QtCore.QObject):
 
         ``parent``
             The parent widget.
-
-        ``screens``
-            The list of screens.
         """
         log.debug(u'AudioPlayer Initialisation started')
         QtCore.QObject.__init__(self, parent)

openlp/core/ui/mainwindow.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,15 +25,18 @@
 ###############################################################################
 
 import logging
+import os
+from tempfile import gettempdir
 
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \
     SettingsManager, PluginManager, Receiver, translate
-from openlp.core.lib.ui import base_action, checkable_action, icon_action
+from openlp.core.lib.ui import UiStrings, base_action, checkable_action, \
+    icon_action
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
-    ShortcutListForm
+    ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     ActionList
 
@@ -72,15 +75,15 @@ class Ui_MainWindow(object):
         # Set up the main container, which contains all the other form widgets.
         self.MainContent = QtGui.QWidget(mainWindow)
         self.MainContent.setObjectName(u'MainContent')
-        self.MainContentLayout = QtGui.QHBoxLayout(self.MainContent)
+        self.mainContentLayout = QtGui.QHBoxLayout(self.MainContent)
-        self.MainContentLayout.setSpacing(0)
+        self.mainContentLayout.setSpacing(0)
-        self.MainContentLayout.setMargin(0)
+        self.mainContentLayout.setMargin(0)
-        self.MainContentLayout.setObjectName(u'MainContentLayout')
+        self.mainContentLayout.setObjectName(u'mainContentLayout')
         mainWindow.setCentralWidget(self.MainContent)
-        self.ControlSplitter = QtGui.QSplitter(self.MainContent)
+        self.controlSplitter = QtGui.QSplitter(self.MainContent)
-        self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
+        self.controlSplitter.setOrientation(QtCore.Qt.Horizontal)
-        self.ControlSplitter.setObjectName(u'ControlSplitter')
+        self.controlSplitter.setObjectName(u'controlSplitter')
-        self.MainContentLayout.addWidget(self.ControlSplitter)
+        self.mainContentLayout.addWidget(self.controlSplitter)
         # Create slide controllers
         self.previewController = SlideController(self, self.settingsmanager,
             self.screens)
@@ -102,9 +105,9 @@ class Ui_MainWindow(object):
         self.FileExportMenu = QtGui.QMenu(self.FileMenu)
         self.FileExportMenu.setObjectName(u'FileExportMenu')
         # View Menu
-        self.ViewMenu = QtGui.QMenu(self.MenuBar)
+        self.viewMenu = QtGui.QMenu(self.MenuBar)
-        self.ViewMenu.setObjectName(u'ViewMenu')
+        self.viewMenu.setObjectName(u'viewMenu')
-        self.ViewModeMenu = QtGui.QMenu(self.ViewMenu)
+        self.ViewModeMenu = QtGui.QMenu(self.viewMenu)
         self.ViewModeMenu.setObjectName(u'ViewModeMenu')
         # Tools Menu
         self.ToolsMenu = QtGui.QMenu(self.MenuBar)
@@ -125,38 +128,38 @@ class Ui_MainWindow(object):
         self.DefaultThemeLabel.setObjectName(u'DefaultThemeLabel')
         self.StatusBar.addPermanentWidget(self.DefaultThemeLabel)
         # Create the MediaManager
-        self.MediaManagerDock = OpenLPDockWidget(mainWindow,
+        self.mediaManagerDock = OpenLPDockWidget(mainWindow,
-            u'MediaManagerDock', u':/system/system_mediamanager.png')
+            u'mediaManagerDock', u':/system/system_mediamanager.png')
-        self.MediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
+        self.mediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
-        self.MediaManagerDock.setMinimumWidth(
+        self.mediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         # Create the media toolbox
-        self.MediaToolBox = QtGui.QToolBox(self.MediaManagerDock)
+        self.MediaToolBox = QtGui.QToolBox(self.mediaManagerDock)
         self.MediaToolBox.setObjectName(u'MediaToolBox')
-        self.MediaManagerDock.setWidget(self.MediaToolBox)
+        self.mediaManagerDock.setWidget(self.MediaToolBox)
         mainWindow.addDockWidget(QtCore.Qt.LeftDockWidgetArea,
-            self.MediaManagerDock)
+            self.mediaManagerDock)
         # Create the service manager
-        self.ServiceManagerDock = OpenLPDockWidget(mainWindow,
+        self.serviceManagerDock = OpenLPDockWidget(mainWindow,
-            u'ServiceManagerDock', u':/system/system_servicemanager.png')
+            u'serviceManagerDock', u':/system/system_servicemanager.png')
-        self.ServiceManagerDock.setMinimumWidth(
+        self.serviceManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_right)
         self.ServiceManagerContents = ServiceManager(mainWindow,
-            self.ServiceManagerDock)
+            self.serviceManagerDock)
-        self.ServiceManagerDock.setWidget(self.ServiceManagerContents)
+        self.serviceManagerDock.setWidget(self.ServiceManagerContents)
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
-            self.ServiceManagerDock)
+            self.serviceManagerDock)
         # Create the theme manager
-        self.ThemeManagerDock = OpenLPDockWidget(mainWindow,
+        self.themeManagerDock = OpenLPDockWidget(mainWindow,
-            u'ThemeManagerDock', u':/system/system_thememanager.png')
+            u'themeManagerDock', u':/system/system_thememanager.png')
-        self.ThemeManagerDock.setMinimumWidth(
+        self.themeManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_right)
-        self.ThemeManagerContents = ThemeManager(mainWindow,
+        self.themeManagerContents = ThemeManager(mainWindow,
-            self.ThemeManagerDock)
+            self.themeManagerDock)
-        self.ThemeManagerContents.setObjectName(u'ThemeManagerContents')
+        self.themeManagerContents.setObjectName(u'themeManagerContents')
-        self.ThemeManagerDock.setWidget(self.ThemeManagerContents)
+        self.themeManagerDock.setWidget(self.themeManagerContents)
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
-            self.ThemeManagerDock)
+            self.themeManagerDock)
         # Create the menu items
         self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
             u':/general/general_new.png')
@@ -186,14 +189,14 @@ class Ui_MainWindow(object):
         mainWindow.actionList.add_action(self.ExportLanguageItem, u'Export')
         self.ViewMediaManagerItem = icon_action(mainWindow,
             u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
-            self.MediaManagerDock.isVisible())
+            self.mediaManagerDock.isVisible())
         self.ViewThemeManagerItem = icon_action(mainWindow,
             u'ViewThemeManagerItem', u':/system/system_thememanager.png',
-            self.ThemeManagerDock.isVisible())
+            self.themeManagerDock.isVisible())
         mainWindow.actionList.add_action(self.ViewMediaManagerItem, u'View')
         self.ViewServiceManagerItem = icon_action(mainWindow,
             u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
-            self.ServiceManagerDock.isVisible())
+            self.serviceManagerDock.isVisible())
         mainWindow.actionList.add_action(self.ViewServiceManagerItem, u'View')
         self.ViewPreviewPanel = checkable_action(mainWindow,
             u'ViewPreviewPanel', previewVisible)
@@ -205,7 +208,7 @@ class Ui_MainWindow(object):
         mainWindow.actionList.add_action(self.ModeDefaultItem, u'View Mode')
         self.ModeSetupItem = checkable_action(mainWindow, u'ModeLiveItem')
         mainWindow.actionList.add_action(self.ModeSetupItem, u'View Mode')
-        self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem')
+        self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem', True)
         mainWindow.actionList.add_action(self.ModeLiveItem, u'View Mode')
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
@@ -215,29 +218,32 @@ class Ui_MainWindow(object):
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
             u':/tools/tools_add.png')
         mainWindow.actionList.add_action(self.ToolsAddToolItem, u'Tools')
-        self.SettingsPluginListItem = icon_action(mainWindow,
+        self.ToolsOpenDataFolder = icon_action(mainWindow,
-            u'SettingsPluginListItem', u':/system/settings_plugin_list.png')
+            u'ToolsOpenDataFolder', u':/general/general_open.png')
-        mainWindow.actionList.add_action(self.SettingsPluginListItem,
+        mainWindow.actionList.add_action(self.ToolsOpenDataFolder, u'Tools')
+        self.settingsPluginListItem = icon_action(mainWindow,
+            u'settingsPluginListItem', u':/system/settings_plugin_list.png')
+        mainWindow.actionList.add_action(self.settingsPluginListItem,
             u'Settings')
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
-            u'AutoLanguageItem')
+            u'AutoLanguageItem', LanguageManager.auto_language)
         mainWindow.actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
         self.LanguageGroup.setObjectName(u'LanguageGroup')
-        self.AutoLanguageItem.setChecked(LanguageManager.auto_language)
+        add_actions(self.LanguageGroup, [self.AutoLanguageItem])
-        self.LanguageGroup.setDisabled(LanguageManager.auto_language)
         qmList = LanguageManager.get_qm_list()
         savedLanguage = LanguageManager.get_language()
         for key in sorted(qmList.keys()):
-            languageItem = checkable_action(mainWindow, key)
+            languageItem = checkable_action(
-            if qmList[key] == savedLanguage:
+                mainWindow, key, qmList[key] == savedLanguage)
-                languageItem.setChecked(True)
             add_actions(self.LanguageGroup, [languageItem])
         self.SettingsShortcutsItem = icon_action(mainWindow,
-            u'SettingsShortcutsItem', 
+            u'SettingsShortcutsItem',
             u':/system/system_configure_shortcuts.png')
+        self.DisplayTagItem = icon_action(mainWindow,
+            u'DisplayTagItem', u':/system/tag_editor.png')
         self.SettingsConfigureItem = icon_action(mainWindow,
             u'SettingsConfigureItem', u':/system/system_settings.png')
         mainWindow.actionList.add_action(self.SettingsShortcutsItem,
@@ -252,8 +258,8 @@ class Ui_MainWindow(object):
         self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
         self.HelpOnlineHelpItem.setEnabled(False)
         mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help')
-        self.HelpWebSiteItem = base_action(mainWindow, u'HelpWebSiteItem')
+        self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem')
-        mainWindow.actionList.add_action(self.HelpWebSiteItem, u'Help')
+        mainWindow.actionList.add_action(self.helpWebSiteItem, u'Help')
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
         add_actions(self.FileExportMenu,
@@ -264,22 +270,24 @@ class Ui_MainWindow(object):
             self.FileExportMenu.menuAction(), self.FileExitItem)
         add_actions(self.ViewModeMenu, (self.ModeDefaultItem,
             self.ModeSetupItem, self.ModeLiveItem))
-        add_actions(self.ViewMenu, (self.ViewModeMenu.menuAction(),
+        add_actions(self.viewMenu, (self.ViewModeMenu.menuAction(),
             None, self.ViewMediaManagerItem, self.ViewServiceManagerItem,
             self.ViewThemeManagerItem, None, self.ViewPreviewPanel,
             self.ViewLivePanel))
         # i18n add Language Actions
         add_actions(self.SettingsLanguageMenu, (self.AutoLanguageItem, None))
         add_actions(self.SettingsLanguageMenu, self.LanguageGroup.actions())
-        add_actions(self.SettingsMenu, (self.SettingsPluginListItem,
+        add_actions(self.SettingsMenu, (self.settingsPluginListItem,
             self.SettingsLanguageMenu.menuAction(), None,
-            self.SettingsShortcutsItem, self.SettingsConfigureItem))
+            self.DisplayTagItem, self.SettingsShortcutsItem,
+            self.SettingsConfigureItem))
         add_actions(self.ToolsMenu, (self.ToolsAddToolItem, None))
+        add_actions(self.ToolsMenu, (self.ToolsOpenDataFolder, None))
         add_actions(self.HelpMenu, (self.HelpDocumentationItem,
-            self.HelpOnlineHelpItem, None, self.HelpWebSiteItem,
+            self.HelpOnlineHelpItem, None, self.helpWebSiteItem,
             self.HelpAboutItem))
         add_actions(self.MenuBar, (self.FileMenu.menuAction(),
-            self.ViewMenu.menuAction(), self.ToolsMenu.menuAction(),
+            self.viewMenu.menuAction(), self.ToolsMenu.menuAction(),
             self.SettingsMenu.menuAction(), self.HelpMenu.menuAction()))
         # Initialise the translation
         self.retranslateUi(mainWindow)
@@ -290,44 +298,47 @@ class Ui_MainWindow(object):
         QtCore.QObject.connect(self.FileExitItem,
             QtCore.SIGNAL(u'triggered()'), mainWindow.close)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
+        # Hide the entry, as it does not have any functionality yet.
+        self.ToolsAddToolItem.setVisible(False)
+        self.ImportLanguageItem.setVisible(False)
+        self.ExportLanguageItem.setVisible(False)
+        self.SettingsShortcutsItem.setVisible(False)
+        self.HelpDocumentationItem.setVisible(False)
+        self.HelpOnlineHelpItem.setVisible(False)
 
     def retranslateUi(self, mainWindow):
         """
         Set up the translation system
         """
-        mainWindow.mainTitle = translate('OpenLP.MainWindow', 'OpenLP 2.0')
+        mainWindow.mainTitle = UiStrings.OLPV2
         mainWindow.setWindowTitle(mainWindow.mainTitle)
         self.FileMenu.setTitle(translate('OpenLP.MainWindow', '&File'))
         self.FileImportMenu.setTitle(translate('OpenLP.MainWindow', '&Import'))
         self.FileExportMenu.setTitle(translate('OpenLP.MainWindow', '&Export'))
-        self.ViewMenu.setTitle(translate('OpenLP.MainWindow', '&View'))
+        self.viewMenu.setTitle(translate('OpenLP.MainWindow', '&View'))
         self.ViewModeMenu.setTitle(translate('OpenLP.MainWindow', 'M&ode'))
         self.ToolsMenu.setTitle(translate('OpenLP.MainWindow', '&Tools'))
         self.SettingsMenu.setTitle(translate('OpenLP.MainWindow', '&Settings'))
         self.SettingsLanguageMenu.setTitle(translate('OpenLP.MainWindow',
             '&Language'))
         self.HelpMenu.setTitle(translate('OpenLP.MainWindow', '&Help'))
-        self.MediaManagerDock.setWindowTitle(
+        self.mediaManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Media Manager'))
-        self.ServiceManagerDock.setWindowTitle(
+        self.serviceManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Service Manager'))
-        self.ThemeManagerDock.setWindowTitle(
+        self.themeManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Theme Manager'))
         self.FileNewItem.setText(translate('OpenLP.MainWindow', '&New'))
-        self.FileNewItem.setToolTip(
+        self.FileNewItem.setToolTip(UiStrings.NewService)
-            translate('OpenLP.MainWindow', 'New Service'))
+        self.FileNewItem.setStatusTip(UiStrings.CreateService)
-        self.FileNewItem.setStatusTip(
-            translate('OpenLP.MainWindow', 'Create a new service.'))
         self.FileNewItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+N'))
         self.FileOpenItem.setText(translate('OpenLP.MainWindow', '&Open'))
-        self.FileOpenItem.setToolTip(
+        self.FileOpenItem.setToolTip(UiStrings.OpenService)
-            translate('OpenLP.MainWindow', 'Open Service'))
         self.FileOpenItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Open an existing service.'))
         self.FileOpenItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+O'))
         self.FileSaveItem.setText(translate('OpenLP.MainWindow', '&Save'))
-        self.FileSaveItem.setToolTip(
+        self.FileSaveItem.setToolTip(UiStrings.SaveService)
-            translate('OpenLP.MainWindow', 'Save Service'))
         self.FileSaveItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Save the current service to disk.'))
         self.FileSaveItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+S'))
@@ -339,8 +350,7 @@ class Ui_MainWindow(object):
             'Save the current service under a new name.'))
         self.FileSaveAsItem.setShortcut(
             translate('OpenLP.MainWindow', 'Ctrl+Shift+S'))
-        self.printServiceOrderItem.setText(
+        self.printServiceOrderItem.setText(UiStrings.PrintServiceOrder)
-            translate('OpenLP.MainWindow', 'Print Service Order'))
         self.printServiceOrderItem.setStatusTip(translate('OpenLP.MainWindow',
             'Print the current Service Order.'))
         self.printServiceOrderItem.setShortcut(
@@ -361,6 +371,8 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', '&Language'))
         self.SettingsShortcutsItem.setText(
             translate('OpenLP.MainWindow', 'Configure &Shortcuts...'))
+        self.DisplayTagItem.setText(
+            translate('OpenLP.MainWindow', '&Configure Display Tags'))
         self.SettingsConfigureItem.setText(
             translate('OpenLP.MainWindow', '&Configure OpenLP...'))
         self.ViewMediaManagerItem.setText(
@@ -403,11 +415,11 @@ class Ui_MainWindow(object):
             'Toggle the visibility of the live panel.'))
         self.ViewLivePanel.setShortcut(
             translate('OpenLP.MainWindow', 'F12'))
-        self.SettingsPluginListItem.setText(translate('OpenLP.MainWindow',
+        self.settingsPluginListItem.setText(translate('OpenLP.MainWindow',
             '&Plugin List'))
-        self.SettingsPluginListItem.setStatusTip(
+        self.settingsPluginListItem.setStatusTip(
             translate('OpenLP.MainWindow', 'List the Plugins'))
-        self.SettingsPluginListItem.setShortcut(
+        self.settingsPluginListItem.setShortcut(
             translate('OpenLP.MainWindow', 'Alt+F7'))
         self.HelpDocumentationItem.setText(
             translate('OpenLP.MainWindow', '&User Guide'))
@@ -418,20 +430,24 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Ctrl+F1'))
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
-        self.HelpWebSiteItem.setText(
+        self.helpWebSiteItem.setText(
             translate('OpenLP.MainWindow', '&Web Site'))
-        self.AutoLanguageItem.setText(
-            translate('OpenLP.MainWindow', '&Auto Detect'))
-        self.AutoLanguageItem.setStatusTip(translate('OpenLP.MainWindow',
-            'Use the system language, if available.'))
         for item in self.LanguageGroup.actions():
             item.setText(item.objectName())
             item.setStatusTip(unicode(translate('OpenLP.MainWindow',
                 'Set the interface language to %s')) % item.objectName())
+        self.AutoLanguageItem.setText(
+            translate('OpenLP.MainWindow', '&Autodetect'))
+        self.AutoLanguageItem.setStatusTip(translate('OpenLP.MainWindow',
+            'Use the system language, if available.'))
         self.ToolsAddToolItem.setText(
             translate('OpenLP.MainWindow', 'Add &Tool...'))
         self.ToolsAddToolItem.setStatusTip(translate('OpenLP.MainWindow',
             'Add an application to the list of tools.'))
+        self.ToolsOpenDataFolder.setText(
+            translate('OpenLP.MainWindow', 'Open &Data Folder...'))
+        self.ToolsOpenDataFolder.setStatusTip(translate('OpenLP.MainWindow',
+            'Open the folder where songs, bibles and other data resides.'))
         self.ModeDefaultItem.setText(
             translate('OpenLP.MainWindow', '&Default'))
         self.ModeDefaultItem.setStatusTip(translate('OpenLP.MainWindow',
@@ -452,15 +468,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
 
     actionList = ActionList()
 
-    def __init__(self, screens, applicationVersion):
+    def __init__(self, screens, applicationVersion, clipboard):
         """
         This constructor sets up the interface, the various managers, and the
         plugins.
         """
         QtGui.QMainWindow.__init__(self)
         self.screens = screens
-        self.actionList = ActionList()
         self.applicationVersion = applicationVersion
+        self.clipboard = clipboard
         # Set up settings sections for the main application
         # (not for use by plugins)
         self.uiSettingsSection = u'user interface'
@@ -468,9 +484,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.serviceSettingsSection = u'servicemanager'
         self.songsSettingsSection = u'songs'
         self.serviceNotSaved = False
+        self.actionList = ActionList()
         self.settingsmanager = SettingsManager(screens)
         self.aboutForm = AboutForm(self, applicationVersion)
         self.settingsForm = SettingsForm(self.screens, self, self)
+        self.displayTagForm = DisplayTagForm(self)
         self.shortcutForm = ShortcutListForm(self)
         self.recentFiles = QtCore.QStringList()
         # Set up the path with plugins
@@ -487,10 +505,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # Set up signals and slots
         QtCore.QObject.connect(self.ImportThemeItem,
             QtCore.SIGNAL(u'triggered()'),
-            self.ThemeManagerContents.onImportTheme)
+            self.themeManagerContents.onImportTheme)
         QtCore.QObject.connect(self.ExportThemeItem,
             QtCore.SIGNAL(u'triggered()'),
-            self.ThemeManagerContents.onExportTheme)
+            self.themeManagerContents.onExportTheme)
         QtCore.QObject.connect(self.ViewMediaManagerItem,
             QtCore.SIGNAL(u'triggered(bool)'), self.toggleMediaManager)
         QtCore.QObject.connect(self.ViewServiceManagerItem,
@@ -501,21 +519,25 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'toggled(bool)'), self.setPreviewPanelVisibility)
         QtCore.QObject.connect(self.ViewLivePanel,
             QtCore.SIGNAL(u'toggled(bool)'), self.setLivePanelVisibility)
-        QtCore.QObject.connect(self.MediaManagerDock,
+        QtCore.QObject.connect(self.mediaManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewMediaManagerItem.setChecked)
-        QtCore.QObject.connect(self.ServiceManagerDock,
+        QtCore.QObject.connect(self.serviceManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewServiceManagerItem.setChecked)
-        QtCore.QObject.connect(self.ThemeManagerDock,
+        QtCore.QObject.connect(self.themeManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewThemeManagerItem.setChecked)
-        QtCore.QObject.connect(self.HelpWebSiteItem,
+        QtCore.QObject.connect(self.helpWebSiteItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
         QtCore.QObject.connect(self.HelpAboutItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked)
-        QtCore.QObject.connect(self.SettingsPluginListItem,
+        QtCore.QObject.connect(self.ToolsOpenDataFolder,
+            QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
+        QtCore.QObject.connect(self.settingsPluginListItem,
             QtCore.SIGNAL(u'triggered()'), self.onPluginItemClicked)
+        QtCore.QObject.connect(self.DisplayTagItem,
+            QtCore.SIGNAL(u'triggered()'), self.onDisplayTagItemClicked)
         QtCore.QObject.connect(self.SettingsConfigureItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsConfigureItemClicked)
         QtCore.QObject.connect(self.SettingsShortcutsItem,
@@ -535,8 +557,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'triggered()'),
             self.ServiceManagerContents.printServiceOrder)
         # i18n set signals for languages
-        QtCore.QObject.connect(self.AutoLanguageItem,
-            QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
             QtCore.SIGNAL(u'triggered()'), self.onModeDefaultItemClicked)
@@ -567,7 +587,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         # RenderManager needs to call ThemeManager and
         # ThemeManager needs to call RenderManager
         self.renderManager = RenderManager(
-            self.ThemeManagerContents, self.screens)
+            self.themeManagerContents, self.screens)
         # Define the media Dock Manager
         self.mediaDockManager = MediaDockManager(self.MediaToolBox)
         log.info(u'Load Plugins')
@@ -601,7 +621,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.pluginManager.initialise_plugins()
         # Once all components are initialised load the Themes
         log.info(u'Load Themes')
-        self.ThemeManagerContents.loadThemes()
+        self.themeManagerContents.loadThemes()
         log.info(u'Load data from Settings')
         if QtCore.QSettings().value(u'advanced/save current plugin',
             QtCore.QVariant(False)).toBool():
@@ -635,8 +655,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         Show the main form, as well as the display form
         """
         QtGui.QWidget.show(self)
-        self.liveController.display.setup()
-        self.previewController.display.setup()
         if self.liveController.display.isVisible():
             self.liveController.display.setFocus()
         self.activateWindow()
@@ -655,6 +673,20 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.setViewMode(False, True, False, False, True)
             self.ModeLiveItem.setChecked(True)
 
+    def firstTime(self):
+        # Import themes if first time
+        Receiver.send_message(u'openlp_process_events')
+        self.themeManagerContents.firstTime()
+        for plugin in self.pluginManager.plugins:
+            if hasattr(plugin, u'firstTime'):
+                Receiver.send_message(u'openlp_process_events')
+                plugin.firstTime()
+        Receiver.send_message(u'openlp_process_events')
+        temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
+        for filename in os.listdir(temp_dir):
+            os.remove(os.path.join(temp_dir, filename))
+        os.removedirs(temp_dir)
+
     def blankCheck(self):
         """
         Check and display message if screen blank on setup.
@@ -702,6 +734,19 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.pluginForm.load()
         self.pluginForm.exec_()
 
+    def onToolsOpenDataFolderClicked(self):
+        """
+        Open data folder
+        """
+        path = AppLocation.get_data_path()
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl("file:///" + path))
+
+    def onDisplayTagItemClicked(self):
+        """
+        Show the Settings dialog
+        """
+        self.displayTagForm.exec_()
+
     def onSettingsConfigureItemClicked(self):
         """
         Show the Settings dialog
@@ -748,9 +793,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             settings = QtCore.QSettings()
             settings.setValue(u'%s/view mode' % self.generalSettingsSection,
                 mode)
-        self.MediaManagerDock.setVisible(media)
+        self.mediaManagerDock.setVisible(media)
-        self.ServiceManagerDock.setVisible(service)
+        self.serviceManagerDock.setVisible(service)
-        self.ThemeManagerDock.setVisible(theme)
+        self.themeManagerDock.setVisible(theme)
         self.setPreviewPanelVisibility(preview)
         self.setLivePanelVisibility(live)
 
@@ -867,16 +912,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 theme)
 
     def toggleMediaManager(self, visible):
-        if self.MediaManagerDock.isVisible() != visible:
+        if self.mediaManagerDock.isVisible() != visible:
-            self.MediaManagerDock.setVisible(visible)
+            self.mediaManagerDock.setVisible(visible)
 
     def toggleServiceManager(self, visible):
-        if self.ServiceManagerDock.isVisible() != visible:
+        if self.serviceManagerDock.isVisible() != visible:
-            self.ServiceManagerDock.setVisible(visible)
+            self.serviceManagerDock.setVisible(visible)
 
     def toggleThemeManager(self, visible):
-        if self.ThemeManagerDock.isVisible() != visible:
+        if self.themeManagerDock.isVisible() != visible:
-            self.ThemeManagerDock.setVisible(visible)
+            self.themeManagerDock.setVisible(visible)
 
     def setPreviewPanelVisibility(self, visible):
         """

openlp/core/ui/mediadockmanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -85,4 +85,4 @@ class MediaDockManager(object):
                 if self.media_dock.widget(dock_index).settingsSection == \
                     media_item.plugin.name.lower():
                     self.media_dock.widget(dock_index).hide()
-                    self.media_dock.removeItem(dock_index)
+                    self.media_dock.removeItem(dock_index)

openlp/core/ui/plugindialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,7 +25,9 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+
 from openlp.core.lib import translate
+from openlp.core.lib.ui import UiStrings
 
 class Ui_PluginViewDialog(object):
     def setupUi(self, pluginViewDialog):
@@ -76,10 +78,8 @@ class Ui_PluginViewDialog(object):
             translate('OpenLP.PluginForm', 'Plugin List'))
         self.pluginInfoGroupBox.setTitle(
             translate('OpenLP.PluginForm', 'Plugin Details'))
-        self.versionLabel.setText(
+        self.versionLabel.setText(u'%s:' % UiStrings.Version)
-            translate('OpenLP.PluginForm', 'Version:'))
+        self.aboutLabel.setText(u'%s:' % UiStrings.About)
-        self.aboutLabel.setText(
-            translate('OpenLP.PluginForm', 'About:'))
         self.statusLabel.setText(
             translate('OpenLP.PluginForm', 'Status:'))
         self.statusComboBox.setItemText(0,

openlp/core/ui/pluginform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -28,13 +28,15 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import PluginStatus, StringContent, translate
+from openlp.core.lib import PluginStatus, Receiver, translate
 from plugindialog import Ui_PluginViewDialog
 
 log = logging.getLogger(__name__)
 
 class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
-
+    """
+    The plugin form provides user control over the plugins OpenLP uses.
+    """
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.parent = parent
@@ -78,15 +80,14 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
                 # PluginStatus.Inactive
                 status_text = unicode(
                     translate('OpenLP.PluginForm', '%s (Inactive)'))
-            name_string = plugin.getString(StringContent.Name)
+            item.setText(status_text % plugin.nameStrings[u'singular'])
-            item.setText(status_text % name_string[u'singular'])
             # If the plugin has an icon, set it!
             if plugin.icon:
                 item.setIcon(plugin.icon)
             self.pluginListWidget.addItem(item)
             pluginListWidth = max(pluginListWidth, self.fontMetrics().width(
                 unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
-                name_string[u'singular']))
+                plugin.nameStrings[u'singular']))
         self.pluginListWidget.setFixedWidth(pluginListWidth +
             self.pluginListWidget.iconSize().width() + 48)
 
@@ -116,8 +117,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
             self.pluginListWidget.currentItem().text().split(u' ')[0]
         self.activePlugin = None
         for plugin in self.parent.pluginManager.plugins:
-            name_string = plugin.getString(StringContent.Name)
+            if plugin.nameStrings[u'singular'] == plugin_name_singular:
-            if name_string[u'singular'] == plugin_name_singular:
                 self.activePlugin = plugin
                 break
         if self.activePlugin:
@@ -129,7 +129,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         if self.programaticChange:
             return
         if status == 0:
+            Receiver.send_message(u'cursor_busy')
             self.activePlugin.toggleStatus(PluginStatus.Active)
+            Receiver.send_message(u'cursor_normal')
         else:
             self.activePlugin.toggleStatus(PluginStatus.Inactive)
         status_text = unicode(
@@ -143,6 +145,5 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         elif self.activePlugin.status == PluginStatus.Disabled:
             status_text = unicode(
                 translate('OpenLP.PluginForm', '%s (Disabled)'))
-        name_string = self.activePlugin.getString(StringContent.Name)
         self.pluginListWidget.currentItem().setText(
-            status_text % name_string[u'singular'])
+            status_text % self.activePlugin.nameStrings[u'singular'])

openlp/core/ui/printservicedialog.py

@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import build_icon, translate, SpellTextEdit
+from openlp.core.lib.ui import UiStrings
+
+class ZoomSize(object):
+    """
+    Type enumeration for Combo Box sizes
+    """
+    Page = 0
+    Width = 1
+    OneHundred = 2
+    SeventyFive = 3
+    Fifty = 4
+    TwentyFive = 5
+
+    Sizes = [
+        translate('OpenLP.PrintServiceDialog', 'Fit Page'),
+        translate('OpenLP.PrintServiceDialog', 'Fit Width'),
+        u'100%', u'75%', u'50%', u'25%']
+
+
+class Ui_PrintServiceDialog(object):
+    def setupUi(self, printServiceDialog):
+        printServiceDialog.setObjectName(u'printServiceDialog')
+        printServiceDialog.resize(664, 594)
+        self.mainLayout = QtGui.QVBoxLayout(printServiceDialog)
+        self.mainLayout.setSpacing(0)
+        self.mainLayout.setMargin(0)
+        self.mainLayout.setObjectName(u'mainLayout')
+        self.toolbar = QtGui.QToolBar(printServiceDialog)
+        self.toolbar.setIconSize(QtCore.QSize(22, 22))
+        self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+        self.printButton = self.toolbar.addAction(
+            build_icon(u':/general/general_print.png'), 'Print')
+        self.optionsButton = QtGui.QToolButton(self.toolbar)
+        self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
+            'Options'))
+        self.optionsButton.setToolButtonStyle(
+            QtCore.Qt.ToolButtonTextBesideIcon)
+        self.optionsButton.setIcon(QtGui.QIcon(
+            build_icon(u':/system/system_configure.png')))
+        self.optionsButton.setCheckable(True)
+        self.toolbar.addWidget(self.optionsButton)
+        self.closeButton = self.toolbar.addAction(
+            build_icon(u':/system/system_close.png'),
+            translate('OpenLP.PrintServiceForm', 'Close'))
+        self.toolbar.addSeparator()
+        self.plainCopy = self.toolbar.addAction(
+            build_icon(u':/system/system_edit_copy.png'),
+            translate('OpenLP.PrintServiceForm', 'Copy'))
+        self.htmlCopy = self.toolbar.addAction(
+            build_icon(u':/system/system_edit_copy.png'),
+            translate('OpenLP.PrintServiceForm', 'Copy as HTML'))
+        self.toolbar.addSeparator()
+        self.zoomInButton = QtGui.QToolButton(self.toolbar)
+        self.zoomInButton.setIcon(QtGui.QIcon(
+            build_icon(u':/general/general_zoom_in.png')))
+        self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom In'))
+        self.zoomInButton.setObjectName(u'zoomInButton')
+        self.zoomInButton.setIconSize(QtCore.QSize(22, 22))
+        self.toolbar.addWidget(self.zoomInButton)
+        self.zoomOutButton = QtGui.QToolButton(self.toolbar)
+        self.zoomOutButton.setIcon(QtGui.QIcon(
+            build_icon(u':/general/general_zoom_out.png')))
+        self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom Out'))
+        self.zoomOutButton.setObjectName(u'zoomOutButton')
+        self.zoomOutButton.setIconSize(QtCore.QSize(22, 22))
+        self.toolbar.addWidget(self.zoomOutButton)
+        self.zoomOriginalButton = QtGui.QToolButton(self.toolbar)
+        self.zoomOriginalButton.setIcon(QtGui.QIcon(
+            build_icon(u':/general/general_zoom_original.png')))
+        self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom Original'))
+        self.zoomOriginalButton.setObjectName(u'zoomOriginalButton')
+        self.zoomOriginalButton.setIconSize(QtCore.QSize(22, 22))
+        self.toolbar.addWidget(self.zoomOriginalButton)
+        self.zoomComboBox = QtGui.QComboBox(printServiceDialog)
+        self.zoomComboBox.setObjectName(u'zoomComboBox')
+        self.toolbar.addWidget(self.zoomComboBox)
+        self.mainLayout.addWidget(self.toolbar)
+        self.previewWidget = QtGui.QPrintPreviewWidget(printServiceDialog)
+        self.mainLayout.addWidget(self.previewWidget)
+        self.optionsWidget = QtGui.QWidget(printServiceDialog)
+        self.optionsWidget.hide()
+        self.optionsWidget.resize(400, 300)
+        self.optionsWidget.setAutoFillBackground(True)
+        self.optionsLayout = QtGui.QVBoxLayout(self.optionsWidget)
+        self.optionsLayout.setContentsMargins(8, 8, 8, 8)
+        self.titleLabel = QtGui.QLabel(self.optionsWidget)
+        self.titleLabel.setObjectName(u'titleLabel')
+        self.titleLabel.setText(u'Title:')
+        self.optionsLayout.addWidget(self.titleLabel)
+        self.titleLineEdit = QtGui.QLineEdit(self.optionsWidget)
+        self.titleLineEdit.setObjectName(u'titleLineEdit')
+        self.optionsLayout.addWidget(self.titleLineEdit)
+        self.footerLabel = QtGui.QLabel(self.optionsWidget)
+        self.footerLabel.setObjectName(u'footerLabel')
+        self.footerLabel.setText(u'Custom Footer Text:')
+        self.optionsLayout.addWidget(self.footerLabel)
+        self.footerTextEdit = SpellTextEdit(self.optionsWidget)
+        self.footerTextEdit.setObjectName(u'footerTextEdit')
+        self.optionsLayout.addWidget(self.footerTextEdit)
+        self.optionsGroupBox = QtGui.QGroupBox(
+            translate('OpenLP.PrintServiceForm','Other Options'))
+        self.groupLayout = QtGui.QVBoxLayout()
+        self.slideTextCheckBox = QtGui.QCheckBox()
+        self.groupLayout.addWidget(self.slideTextCheckBox)
+        self.notesCheckBox = QtGui.QCheckBox()
+        self.groupLayout.addWidget(self.notesCheckBox)
+        self.metaDataCheckBox = QtGui.QCheckBox()
+        self.groupLayout.addWidget(self.metaDataCheckBox)
+        self.groupLayout.addStretch(1)
+        self.optionsGroupBox.setLayout(self.groupLayout)
+        self.optionsLayout.addWidget(self.optionsGroupBox)
+
+        self.retranslateUi(printServiceDialog)
+        QtCore.QMetaObject.connectSlotsByName(printServiceDialog)
+        QtCore.QObject.connect(self.optionsButton,
+            QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions)
+
+    def retranslateUi(self, printServiceDialog):
+        printServiceDialog.setWindowTitle(UiStrings.PrintServiceOrder)
+        self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
+            'Include slide text if available'))
+        self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm',
+            'Include service item notes'))
+        self.metaDataCheckBox.setText(translate('OpenLP.PrintServiceForm',
+            'Include play length of media items'))
+        self.titleLineEdit.setText(translate('OpenLP.PrintServiceForm',
+            'Service Order Sheet'))
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Page])
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Width])
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred])
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.SeventyFive])
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Fifty])
+        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.TwentyFive])

openlp/core/ui/printserviceform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,57 +24,69 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 import datetime
-import mutagen
-import os
 
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.ui.printserviceorderdialog import Ui_PrintServiceOrderDialog
+from openlp.core.lib.ui import UiStrings
+from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize
+
+class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
 
-class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
     def __init__(self, parent, serviceManager):
         """
         Constructor
         """
         QtGui.QDialog.__init__(self, parent)
+        self.parent = parent
         self.serviceManager = serviceManager
         self.printer = QtGui.QPrinter()
         self.printDialog = QtGui.QPrintDialog(self.printer, self)
         self.document = QtGui.QTextDocument()
+        self.zoom = 0
         self.setupUi(self)
         # Load the settings for the dialog.
         settings = QtCore.QSettings()
         settings.beginGroup(u'advanced')
-        self.printSlideTextCheckBox.setChecked(settings.value(
+        self.slideTextCheckBox.setChecked(settings.value(
             u'print slide text', QtCore.QVariant(False)).toBool())
-        self.printMetaDataCheckBox.setChecked(settings.value(
+        self.metaDataCheckBox.setChecked(settings.value(
             u'print file meta data', QtCore.QVariant(False)).toBool())
-        self.printNotesCheckBox.setChecked(settings.value(
+        self.notesCheckBox.setChecked(settings.value(
             u'print notes', QtCore.QVariant(False)).toBool())
+        self.zoomComboBox.setCurrentIndex(settings.value(
+            u'display size', QtCore.QVariant(0)).toInt()[0])
         settings.endGroup()
         # Signals
         QtCore.QObject.connect(self.printButton,
-            QtCore.SIGNAL(u'clicked()'), self.printServiceOrder)
+            QtCore.SIGNAL(u'triggered()'), self.printServiceOrder)
+        QtCore.QObject.connect(self.closeButton,
+            QtCore.SIGNAL(u'triggered()'), self.accept)
         QtCore.QObject.connect(self.zoomOutButton,
             QtCore.SIGNAL(u'clicked()'), self.zoomOut)
         QtCore.QObject.connect(self.zoomInButton,
             QtCore.SIGNAL(u'clicked()'), self.zoomIn)
+        QtCore.QObject.connect(self.zoomOriginalButton,
+            QtCore.SIGNAL(u'clicked()'), self.zoomOriginal)
         QtCore.QObject.connect(self.previewWidget,
             QtCore.SIGNAL(u'paintRequested(QPrinter *)'), self.paintRequested)
-        QtCore.QObject.connect(self.serviceTitleLineEdit,
+        QtCore.QObject.connect(self.zoomComboBox,
-            QtCore.SIGNAL(u'textChanged(const QString)'),
+            QtCore.SIGNAL(u'currentIndexChanged(int)'), self.displaySizeChanged)
-            self.updatePreviewText)
+        QtCore.QObject.connect(self.plainCopy,
-        QtCore.QObject.connect(self.printSlideTextCheckBox,
+            QtCore.SIGNAL(u'triggered()'), self.copyText)
-            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+        QtCore.QObject.connect(self.htmlCopy,
-        QtCore.QObject.connect(self.printNotesCheckBox,
+            QtCore.SIGNAL(u'triggered()'), self.copyHtmlText)
-            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+        self.updatePreviewText()
-        QtCore.QObject.connect(self.printMetaDataCheckBox,
+
-            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+    def toggleOptions(self, checked):
-        QtCore.QObject.connect(self.customNoteEdit,
+        self.optionsWidget.setVisible(checked)
-            QtCore.SIGNAL(u'textChanged()'), self.updatePreviewText)
+        if checked:
-        QtCore.QObject.connect(self.cancelButton,
+            left = self.optionsButton.pos().x()
-            QtCore.SIGNAL(u'clicked()'), self.reject)
+            top = self.toolbar.height()
+            self.optionsWidget.move(left, top)
+            self.titleLineEdit.setFocus()
+        else:
+            self.saveOptions()
         self.updatePreviewText()
 
     def updatePreviewText(self):
@@ -82,19 +94,28 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
         Creates the html text and updates the html of *self.document*.
         """
         text = u''
-        if self.serviceTitleLineEdit.text():
+        if self.titleLineEdit.text():
-            text += u'<h2>%s</h2>' % unicode(self.serviceTitleLineEdit.text())
+            text += u'<h2>%s</h2>' % unicode(self.titleLineEdit.text())
         for item in self.serviceManager.serviceItems:
             item = item[u'service_item']
             # Add the title of the service item.
-            text += u'<h4><img src="%s" /> %s</h4>' % (item.icon,
+            text += u'<h3><img src="%s" /> %s</h3>' % (item.icon,
                 item.get_display_title())
             # Add slide text of the service item.
-            if self.printSlideTextCheckBox.isChecked():
+            if self.slideTextCheckBox.isChecked():
                 if item.is_text():
                     # Add the text of the service item.
+                    verse = None
                     for slide in item.get_frames():
-                        text += u'<p>' + slide[u'text'] + u'</p>'
+                        if not verse:
+                            text += u'<p>' + slide[u'html']
+                            verse = slide[u'verseTag']
+                        elif verse != slide[u'verseTag']:
+                            text += u'<\p><p>' + slide[u'html']
+                            verse = slide[u'verseTag']
+                        else:
+                            text += u'<br/>' + slide[u'html']
+                    text += u'</p>'
                 elif item.is_image():
                     # Add the image names of the service item.
                     text += u'<ol>'
@@ -106,26 +127,19 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
                     # add footer
                     text += u'<p>%s</p>' % item.foot_text
             # Add service items' notes.
-            if self.printNotesCheckBox.isChecked():
+            if self.notesCheckBox.isChecked():
                 if item.notes:
-                    text += u'<p><b>%s</b></p>%s' % (translate(
+                    text += u'<p><strong>%s</strong></p>%s' % (translate(
                         'OpenLP.ServiceManager', 'Notes:'),
                         item.notes.replace(u'\n', u'<br />'))
             # Add play length of media files.
-            if item.is_media() and self.printMetaDataCheckBox.isChecked():
+            if item.is_media() and self.metaDataCheckBox.isChecked():
-                path = os.path.join(item.get_frames()[0][u'path'],
+                text += u'<p><strong>%s</strong> %s</p>' % (translate(
-                    item.get_frames()[0][u'title'])
+                    'OpenLP.ServiceManager', u'Playing time:'),
-                if not os.path.isfile(path):
+                    unicode(datetime.timedelta(seconds=item.media_length)))
-                    continue
+        if self.footerTextEdit.toPlainText():
-                file = mutagen.File(path)
-                if file is not None:
-                    length = int(file.info.length)
-                    text += u'<p><b>%s</b> %s</p>' % (translate(
-                        'OpenLP.ServiceManager', u'Playing time:'),
-                        unicode(datetime.timedelta(seconds=length)))
-        if self.customNoteEdit.toPlainText():
             text += u'<h4>%s</h4>%s' % (translate('OpenLP.ServiceManager',
-                u'Custom Service Notes:'), self.customNoteEdit.toPlainText())
+                u'Custom Service Notes:'), self.footerTextEdit.toPlainText())
         self.document.setHtml(text)
         self.previewWidget.updatePreview()
 
@@ -138,6 +152,43 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
         """
         self.document.print_(printer)
 
+    def displaySizeChanged(self, display):
+        """
+        The Zoom Combo box has changed so set up the size.
+        """
+        if display == ZoomSize.Page:
+            self.previewWidget.fitInView()
+        elif display == ZoomSize.Width:
+            self.previewWidget.fitToWidth()
+        elif display == ZoomSize.OneHundred:
+            self.previewWidget.fitToWidth()
+            self.previewWidget.zoomIn(1)
+        elif display == ZoomSize.SeventyFive:
+            self.previewWidget.fitToWidth()
+            self.previewWidget.zoomIn(0.75)
+        elif display == ZoomSize.Fifty:
+            self.previewWidget.fitToWidth()
+            self.previewWidget.zoomIn(0.5)
+        elif display == ZoomSize.TwentyFive:
+            self.previewWidget.fitToWidth()
+            self.previewWidget.zoomIn(0.25)
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'advanced')
+        settings.setValue(u'display size', QtCore.QVariant(display))
+        settings.endGroup()
+
+    def copyText(self):
+        """
+        Copies the display text to the clipboard as plain text
+        """
+        self.parent.clipboard.setText(self.document.toPlainText())
+
+    def copyHtmlText(self):
+        """
+        Copies the display text to the clipboard as Html
+        """
+        self.parent.clipboard.setText(self.document.toHtml())
+
     def printServiceOrder(self):
         """
         Called, when the *printButton* is clicked. Opens the *printDialog*.
@@ -146,21 +197,38 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
             return
         # Print the document.
         self.document.print_(self.printer)
-        self.accept()
 
     def zoomIn(self):
         """
         Called when *zoomInButton* is clicked.
         """
         self.previewWidget.zoomIn()
+        self.zoom -= 0.1
 
     def zoomOut(self):
         """
         Called when *zoomOutButton* is clicked.
         """
         self.previewWidget.zoomOut()
+        self.zoom += 0.1
 
-    def accept(self):
+    def zoomOriginal(self):
+        """
+        Called when *zoomOutButton* is clicked.
+        """
+        self.previewWidget.zoomIn(1 + self.zoom)
+        self.zoom = 0
+
+    def updateTextFormat(self, value):
+        """
+        Called when html copy check box is selected.
+        """
+        if value == QtCore.Qt.Checked:
+            self.copyTextButton.setText(UiStrings.CopyToHtml)
+        else:
+            self.copyTextButton.setText(UiStrings.CopyToText)
+
+    def saveOptions(self):
         """
         Save the settings and close the dialog.
         """
@@ -168,17 +236,9 @@ class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
         settings = QtCore.QSettings()
         settings.beginGroup(u'advanced')
         settings.setValue(u'print slide text',
-            QtCore.QVariant(self.printSlideTextCheckBox.isChecked()))
+            QtCore.QVariant(self.slideTextCheckBox.isChecked()))
         settings.setValue(u'print file meta data',
-            QtCore.QVariant(self.printMetaDataCheckBox.isChecked()))
+            QtCore.QVariant(self.metaDataCheckBox.isChecked()))
         settings.setValue(u'print notes',
-            QtCore.QVariant(self.printNotesCheckBox.isChecked()))
+            QtCore.QVariant(self.notesCheckBox.isChecked()))
         settings.endGroup()
-        # Close the dialog.
-        return QtGui.QDialog.accept(self)
-
-    def reject(self):
-        """
-        Close the dialog, do not print the service and do not save the settings.
-        """
-        return QtGui.QDialog.reject(self)

openlp/core/ui/printserviceorderdialog.py

@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
-# Carsten Tinggaard, Frode Woldsund                                           #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-
-from openlp.core.lib import build_icon, translate, SpellTextEdit
-
-class Ui_PrintServiceOrderDialog(object):
-    def setupUi(self, printServiceOrderDialog):
-        printServiceOrderDialog.setObjectName(u'printServiceOrderDialog')
-        self.dialogLayout = QtGui.QGridLayout(printServiceOrderDialog)
-        self.dialogLayout.setObjectName(u'dialogLayout')
-        self.perviewLayout = QtGui.QVBoxLayout()
-        self.perviewLayout.setObjectName(u'perviewLayout')
-        self.previewLabel = QtGui.QLabel(printServiceOrderDialog)
-        self.previewLabel.setSizePolicy(
-            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-        self.previewLabel.setObjectName(u'previewLabel')
-        self.perviewLayout.addWidget(self.previewLabel)
-        self.previewWidget = QtGui.QPrintPreviewWidget(
-            self.printer, self, QtCore.Qt.Widget)
-        self.previewWidget.setEnabled(True)
-        self.previewWidget.setSizePolicy(
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Expanding)
-        self.previewWidget.setObjectName(u'previewWidget')
-        # Give the previewWidget a fixed size, to prevent resizing when clicking
-        # the zoom buttons.
-        self.previewWidget.setFixedWidth(350)
-        self.perviewLayout.addWidget(self.previewWidget)
-        self.dialogLayout.addLayout(self.perviewLayout, 0, 0, 1, 1)
-        self.settingsLayout = QtGui.QVBoxLayout()
-        self.settingsLayout.setObjectName(u'settingsLayout')
-        self.serviceTitleLayout = QtGui.QGridLayout()
-        self.serviceTitleLayout.setObjectName(u'serviceTitleLayout')
-        self.serviceTitleLineEdit = QtGui.QLineEdit(printServiceOrderDialog)
-        self.serviceTitleLineEdit.setSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
-        self.serviceTitleLineEdit.setObjectName(u'serviceTitleLineEdit')
-        self.serviceTitleLayout.addWidget(self.serviceTitleLineEdit, 1, 1, 1, 1)
-        self.serviceTitleLabel = QtGui.QLabel(printServiceOrderDialog)
-        self.serviceTitleLabel.setSizePolicy(
-            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-        self.serviceTitleLabel.setObjectName(u'serviceTitleLabel')
-        self.serviceTitleLayout.addWidget(self.serviceTitleLabel, 1, 0, 1, 1)
-        self.settingsLayout.addLayout(self.serviceTitleLayout)
-        self.printSlideTextCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
-        self.printSlideTextCheckBox.setObjectName(u'printSlideTextCheckBox')
-        self.settingsLayout.addWidget(self.printSlideTextCheckBox)
-        self.printNotesCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
-        self.printNotesCheckBox.setObjectName(u'printNotesCheckBox')
-        self.settingsLayout.addWidget(self.printNotesCheckBox)
-        self.printMetaDataCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
-        self.printMetaDataCheckBox.setObjectName(u'printMetaDataCheckBox')
-        self.settingsLayout.addWidget(self.printMetaDataCheckBox)
-        spacerItem = QtGui.QSpacerItem(20, 40,
-            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.settingsLayout.addItem(spacerItem)
-        self.customNotesLabel = QtGui.QLabel(self)
-        self.customNotesLabel.setObjectName(u'customNotesLabel')
-        self.settingsLayout.addWidget(self.customNotesLabel)
-        self.customNoteEdit = SpellTextEdit(self)
-        self.customNoteEdit.setObjectName(u'customNoteEdit')
-        self.settingsLayout.addWidget(self.customNoteEdit)
-        self.dialogLayout.addLayout(self.settingsLayout, 0, 3, 1, 1)
-        self.buttonLayout = QtGui.QHBoxLayout()
-        self.buttonLayout.setObjectName(u'buttonLayout')
-        spacerItem = QtGui.QSpacerItem(40, 20,
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.buttonLayout.addItem(spacerItem)
-        self.cancelButton = QtGui.QPushButton(printServiceOrderDialog)
-        self.cancelButton.setObjectName(u'cancelButton')
-        self.buttonLayout.addWidget(self.cancelButton)
-        self.printButton = QtGui.QPushButton(printServiceOrderDialog)
-        self.printButton.setObjectName(u'printButton')
-        self.buttonLayout.addWidget(self.printButton)
-        self.dialogLayout.addLayout(self.buttonLayout, 1, 3, 1, 1)
-        self.zoomButtonLayout = QtGui.QHBoxLayout()
-        self.zoomButtonLayout.setObjectName(u'zoomButtonLayout')
-        spacerItem = QtGui.QSpacerItem(40, 20,
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.zoomButtonLayout.addItem(spacerItem)
-        self.zoomOutButton = QtGui.QToolButton(printServiceOrderDialog)
-        self.zoomOutButton.setIcon(
-            build_icon(u':/general/general_zoom_out.png'))
-        self.zoomOutButton.setObjectName(u'zoomOutButton')
-        self.zoomButtonLayout.addWidget(self.zoomOutButton)
-        self.zoomInButton = QtGui.QToolButton(printServiceOrderDialog)
-        self.zoomInButton.setIcon(build_icon(u':/general/general_zoom_in.png'))
-        self.zoomInButton.setObjectName(u'zoomInButton')
-        self.zoomButtonLayout.addWidget(self.zoomInButton)
-        self.dialogLayout.addLayout(self.zoomButtonLayout, 1, 0, 1, 1)
-        self.retranslateUi(printServiceOrderDialog)
-        QtCore.QMetaObject.connectSlotsByName(printServiceOrderDialog)
-
-    def retranslateUi(self, printServiceOrderDialog):
-        printServiceOrderDialog.setWindowTitle(
-            translate('OpenLP.PrintServiceOrderForm', 'Print Service Order'))
-        self.previewLabel.setText(
-            translate('OpenLP.ServiceManager', '<b>Preview:</b>'))
-        self.printSlideTextCheckBox.setText(translate(
-            'OpenLP.PrintServiceOrderForm', 'Include slide text if available'))
-        self.printNotesCheckBox.setText(translate(
-            'OpenLP.PrintServiceOrderForm', 'Include service item notes'))
-        self.printMetaDataCheckBox.setText(
-            translate('OpenLP.PrintServiceOrderForm',
-            'Include play length of media items'))
-        self.serviceTitleLabel.setText(translate(
-            'OpenLP.PrintServiceOrderForm', 'Title:'))
-        self.serviceTitleLineEdit.setText(translate('OpenLP.ServiceManager',
-            'Service Order Sheet'))
-        self.printButton.setText(translate('OpenLP.ServiceManager', 'Print'))
-        self.cancelButton.setText(translate('OpenLP.ServiceManager', 'Cancel'))
-        self.customNotesLabel.setText(
-            translate('OpenLP.ServiceManager', '<b>Custom Service Notes:</b>'))

openlp/core/ui/screen.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,11 +25,15 @@
 ###############################################################################
 """
 The :mod:`screen` module provides management functionality for a machines'
-displays
+displays.
 """
 import logging
 import copy
 
+from PyQt4 import QtCore
+
+from openlp.core.lib import Receiver, translate
+
 log = logging.getLogger(__name__)
 
 class ScreenList(object):
@@ -38,7 +42,14 @@ class ScreenList(object):
     """
     log.info(u'Screen loaded')
 
-    def __init__(self):
+    def __init__(self, desktop):
+        """
+        Initialise the screen list.
+
+        ``desktop``
+            A ``QDesktopWidget`` object.
+        """
+        self.desktop = desktop
         self.preview = None
         self.current = None
         self.override = None
@@ -48,19 +59,120 @@ class ScreenList(object):
         self.current_display = 0
         # save config display number
         self.monitor_number = 0
+        self.screen_count_changed()
+        QtCore.QObject.connect(desktop,
+            QtCore.SIGNAL(u'resized(int)'), self.screen_resolution_changed)
+        QtCore.QObject.connect(desktop,
+            QtCore.SIGNAL(u'screenCountChanged(int)'),
+            self.screen_count_changed)
+
+    def screen_resolution_changed(self, number):
+        """
+        Called when the resolution of a screen has changed.
+
+        ``number``
+            The number of the screen, which size has changed.
+        """
+        log.info(u'screenResolutionChanged %d' % number)
+        for screen in self.screen_list:
+            if number == screen[u'number']:
+                newScreen = {
+                    u'number': number,
+                    u'size': self.desktop.screenGeometry(number),
+                    u'primary': self.desktop.primaryScreen() == number
+                }
+                self.remove_screen(number)
+                self.add_screen(newScreen)
+                # The screen's default size is used, that is why we have to
+                # update the override screen.
+                if screen == self.override:
+                    self.override = copy.deepcopy(newScreen)
+                    self.set_override_display()
+                Receiver.send_message(u'config_screen_changed')
+                break
+
+    def screen_count_changed(self, changed_screen=-1):
+        """
+        Called when a screen has been added or removed.
+
+        ``changed_screen``
+            The screen's number which has been (un)plugged.
+        """
+        # Remove unplugged screens.
+        for screen in copy.deepcopy(self.screen_list):
+            if screen[u'number'] == self.desktop.numScreens():
+                self.remove_screen(screen[u'number'])
+        # Add new screens.
+        for number in xrange(0, self.desktop.numScreens()):
+            if not self.screen_exists(number):
+                self.add_screen({
+                    u'number': number,
+                    u'size': self.desktop.screenGeometry(number),
+                    u'primary': (self.desktop.primaryScreen() == number)
+                })
+        # We do not want to send this message, when the method is called the
+        # first time.
+        if changed_screen != -1:
+            # Reload setting tabs to apply possible changes.
+            Receiver.send_message(u'config_screen_changed')
+
+    def get_screen_list(self):
+        """
+        Returns a list with the screens. This should only be used to display
+        available screens to the user::
+
+            [u'Screen 1 (primary)', u'Screen 2']
+        """
+        screen_list = []
+        for screen in self.screen_list:
+            screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'),
+                screen[u'number'] + 1)
+            if screen[u'primary']:
+                screen_name = u'%s (%s)' % (screen_name,
+                    translate('OpenLP.ScreenList', 'primary'))
+            screen_list.append(screen_name)
+        return screen_list
 
     def add_screen(self, screen):
         """
-        Add a screen to the list of known screens
+        Add a screen to the list of known screens.
+
+        ``screen``
+            A dict with the screen properties::
+
+                {
+                    u'primary': True,
+                    u'number': 0,
+                    u'size': PyQt4.QtCore.QRect(0, 0, 1024, 768)
+                }
         """
+        log.info(u'Screen %d found with resolution %s',
+            screen[u'number'], screen[u'size'])
         if screen[u'primary']:
             self.current = screen
         self.screen_list.append(screen)
         self.display_count += 1
 
+    def remove_screen(self, number):
+        """
+        Remove a screen from the list of known screens.
+
+        ``number``
+            The screen number (int).
+        """
+        log.info(u'remove_screen %d' % number)
+        for screen in self.screen_list:
+            if screen[u'number'] == number:
+                self.screen_list.remove(screen)
+                self.display_count -= 1
+                break
+
     def screen_exists(self, number):
         """
-        Confirms a screen is known
+        Confirms a screen is known.
+
+        ``number``
+            The screen number (int).
         """
         for screen in self.screen_list:
             if screen[u'number'] == number:
@@ -69,9 +181,12 @@ class ScreenList(object):
 
     def set_current_display(self, number):
         """
-        Set up the current screen dimensions
+        Set up the current screen dimensions.
+
+        ``number``
+            The screen number (int).
         """
-        log.debug(u'set_current_display %s', number, )
+        log.debug(u'set_current_display %s', number)
         if number + 1 > self.display_count:
             self.current = self.screen_list[0]
             self.override = copy.deepcopy(self.current)
@@ -86,8 +201,8 @@ class ScreenList(object):
 
     def set_override_display(self):
         """
-        replace the current size with the override values
+        Replace the current size with the override values, as the user wants to
-        user wants to have their own screen attributes
+        have their own screen attributes.
         """
         log.debug(u'set_override_display')
         self.current = copy.deepcopy(self.override)
@@ -95,8 +210,8 @@ class ScreenList(object):
 
     def reset_current_display(self):
         """
-        replace the current values with the correct values
+        Replace the current values with the correct values, as the user wants to
-        user wants to use the correct screen attributes
+        use the correct screen attributes.
         """
         log.debug(u'reset_current_display')
-        self.set_current_display(self.current_display)
+        self.set_current_display(self.current_display)

openlp/core/ui/serviceitemeditdialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import create_save_cancel_button_box, \
+from openlp.core.lib.ui import create_accept_reject_button_box, \
     create_delete_push_button, create_up_down_push_button_set
 
 class Ui_ServiceItemEditDialog(object):
@@ -50,7 +50,7 @@ class Ui_ServiceItemEditDialog(object):
         self.buttonLayout.addWidget(self.downButton)
         self.dialogLayout.addLayout(self.buttonLayout, 0, 1)
         self.dialogLayout.addWidget(
-            create_save_cancel_button_box(serviceItemEditDialog), 1, 0, 1, 2)
+            create_accept_reject_button_box(serviceItemEditDialog), 1, 0, 1, 2)
         self.retranslateUi(serviceItemEditDialog)
         QtCore.QMetaObject.connectSlotsByName(serviceItemEditDialog)
 

openlp/core/ui/serviceitemeditform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -110,11 +110,12 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         temp = self.itemList[row]
         self.itemList.remove(self.itemList[row])
         if direction == u'up':
-            self.itemList.insert(row - 1, temp)
+            row -= 1
         else:
-            self.itemList.insert(row + 1, temp)
+            row += 1
+        self.itemList.insert(row, temp)
         self.loadData()
-        self.listWidget.setCurrentRow(row + 1)
+        self.listWidget.setCurrentRow(row)
 
     def onCurrentRowChanged(self, row):
         """

openlp/core/ui/servicemanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -33,11 +33,11 @@ log = logging.getLogger(__name__)
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
-    Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
+    Receiver, build_icon, ItemCapabilities, SettingsManager, translate
-    ThemeLevel
+from openlp.core.lib.theme import ThemeLevel
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
-from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
+from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
-from openlp.core.ui.printserviceorderform import PrintServiceOrderForm
+from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
 
@@ -49,6 +49,19 @@ class ServiceManagerList(QtGui.QTreeWidget):
         QtGui.QTreeWidget.__init__(self, parent)
         self.mainwindow = mainwindow
 
+    def keyPressEvent(self, event):
+        if isinstance(event, QtGui.QKeyEvent):
+            # here accept the event and do something
+            if event.key() == QtCore.Qt.Key_Up:
+                self.mainwindow.onMoveSelectionUp()
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_Down:
+                self.mainwindow.onMoveSelectionDown()
+                event.accept()
+            event.ignore()
+        else:
+            event.ignore()
+
     def mouseMoveEvent(self, event):
         """
         Drag and drop event does not care what data is selected
@@ -88,6 +101,7 @@ class ServiceManager(QtGui.QWidget):
         self._fileName = u''
         self.serviceNoteForm = ServiceNoteForm(self.mainwindow)
         self.serviceItemEditForm = ServiceItemEditForm(self.mainwindow)
+        self.startTimeForm = StartTimeForm(self.mainwindow)
         # start with the layout
         self.layout = QtGui.QVBoxLayout(self)
         self.layout.setSpacing(0)
@@ -95,23 +109,18 @@ class ServiceManager(QtGui.QWidget):
         # Create the top toolbar
         self.toolbar = OpenLPToolbar(self)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ServiceManager', 'New Service'),
+            UiStrings.NewService, u':/general/general_new.png',
-            u':/general/general_new.png',
+            UiStrings.CreateService, self.onNewServiceClicked)
-            translate('OpenLP.ServiceManager', 'Create a new service'),
-            self.onNewServiceClicked)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ServiceManager', 'Open Service'),
+            UiStrings.OpenService, u':/general/general_open.png',
-            u':/general/general_open.png',
             translate('OpenLP.ServiceManager', 'Load an existing service'),
             self.onLoadServiceClicked)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ServiceManager', 'Save Service'),
+            UiStrings.SaveService, u':/general/general_save.png',
-            u':/general/general_save.png',
             translate('OpenLP.ServiceManager', 'Save this service'),
             self.saveFile)
         self.toolbar.addSeparator()
-        self.themeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
+        self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings.Theme, self)
-            'Theme:'), self)
         self.themeLabel.setMargin(3)
         self.themeLabel.setObjectName(u'themeLabel')
         self.toolbar.addToolbarWidget(u'ThemeLabel', self.themeLabel)
@@ -201,13 +210,13 @@ class ServiceManager(QtGui.QWidget):
             u':/services/service_expand_all.png',
             translate('OpenLP.ServiceManager',
             'Expand all the service items.'),
-            self.onExpandAll)
+            self.onExpandAll, shortcut=QtCore.Qt.Key_Plus)
         self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
             u':/services/service_collapse_all.png',
             translate('OpenLP.ServiceManager',
             'Collapse all the service items.'),
-            self.onCollapseAll)
+            self.onCollapseAll, shortcut=QtCore.Qt.Key_Minus)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Go Live'),
@@ -270,16 +279,19 @@ class ServiceManager(QtGui.QWidget):
         self.notesAction = self.menu.addAction(
             translate('OpenLP.ServiceManager', '&Notes'))
         self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
+        self.timeAction = self.menu.addAction(
+            translate('OpenLP.ServiceManager', '&Start Time'))
+        self.timeAction.setIcon(build_icon(u':/media/media_time.png'))
         self.deleteAction = self.menu.addAction(
             translate('OpenLP.ServiceManager', '&Delete From Service'))
         self.deleteAction.setIcon(build_icon(u':/general/general_delete.png'))
         self.sep1 = self.menu.addAction(u'')
         self.sep1.setSeparator(True)
         self.previewAction = self.menu.addAction(
-            translate('OpenLP.ServiceManager', '&Preview Verse'))
+            translate('OpenLP.ServiceManager', 'Show &Preview'))
         self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
         self.liveAction = self.menu.addAction(
-            translate('OpenLP.ServiceManager', '&Live Verse'))
+            translate('OpenLP.ServiceManager', 'Show &Live'))
         self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
         self.sep2 = self.menu.addAction(u'')
         self.sep2.setSeparator(True)
@@ -294,7 +306,9 @@ class ServiceManager(QtGui.QWidget):
             self.serviceManagerList.moveTop,
             self.serviceManagerList.moveBottom,
             self.serviceManagerList.up,
-            self.serviceManagerList.down
+            self.serviceManagerList.down,
+            self.serviceManagerList.expand,
+            self.serviceManagerList.collapse
             ])
         self.configUpdated()
 
@@ -307,6 +321,9 @@ class ServiceManager(QtGui.QWidget):
         actionList.add_action(self.serviceManagerList.makeLive, u'Service')
         actionList.add_action(self.serviceManagerList.up, u'Service')
         actionList.add_action(self.serviceManagerList.down, u'Service')
+        actionList.add_action(self.serviceManagerList.expand, u'Service')
+        actionList.add_action(self.serviceManagerList.collapse, u'Service')
+
 
     def setModified(self, modified=True):
         """
@@ -416,56 +433,84 @@ class ServiceManager(QtGui.QWidget):
         """
         if not self.fileName():
             return self.saveFileAs()
-        else:
+        path_file_name = unicode(self.fileName())
-            fileName = self.fileName()
+        (path, file_name) = os.path.split(path_file_name)
-            log.debug(u'ServiceManager.saveFile - %s' % fileName)
+        (basename, extension) = os.path.splitext(file_name)
-            SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
+        service_file_name = basename + '.osd'
-                split_filename(fileName)[0])
+        log.debug(u'ServiceManager.saveFile - %s' % path_file_name)
-            service = []
+        SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
-            serviceFileName = fileName.replace(u'.osz', u'.osd')
+            path)
-            zip = None
+        service = []
-            file = None
+        write_list = []
-            try:
+        total_size = 0
-                write_list = []
+        for item in self.serviceItems:
-                zip = zipfile.ZipFile(unicode(fileName), 'w')
+            service.append({u'serviceitem':
-                for item in self.serviceItems:
+                item[u'service_item'].get_service_repr()})
-                    service.append({u'serviceitem': \
+            if not item[u'service_item'].uses_file():
-                        item[u'service_item'].get_service_repr()})
+                continue
-                    if item[u'service_item'].uses_file():
+            for frame in item[u'service_item'].get_frames():
-                        for frame in item[u'service_item'].get_frames():
+                if item[u'service_item'].is_image():
-                            if item[u'service_item'].is_image():
+                    path_from = frame[u'path']
-                                path_from = frame[u'path']
+                else:
-                            else:
+                    path_from = os.path.join(frame[u'path'], frame[u'title'])
-                                path_from = unicode(os.path.join(
+                # Only write a file once
-                                    frame[u'path'],
+                if path_from in write_list:
-                                    frame[u'title']))
+                    continue
-                            # On write a file once
+                file_size = os.path.getsize(path_from)
-                            if not path_from in write_list:
+                size_limit = 52428800 # 50MiB
-                                write_list.append(path_from)
+                #if file_size > size_limit:
-                                zip.write(path_from.encode(u'utf-8'))
+                #    # File exeeds size_limit bytes, ask user
-                file = open(serviceFileName, u'wb')
+                #    message = unicode(translate('OpenLP.ServiceManager',
-                cPickle.dump(service, file)
+                #        'Do you want to include \n%.1f MB file "%s"\n'
-                file.close()
+                #        'into the service file?\nThis may take some time.\n\n'
-                zip.write(serviceFileName.encode(u'utf-8'))
+                #        'Please note that you need to\ntake care of that file'
-            except IOError:
+                #        ' yourself,\nif you leave it out.')) % \
-                log.exception(u'Failed to save service to disk')
+                #        (file_size/1048576, os.path.split(path_from)[1])
-            finally:
+                #    ans = QtGui.QMessageBox.question(self.mainwindow,
-                if file:
+                #        translate('OpenLP.ServiceManager', 'Including Large '
-                    file.close()
+                #        'File'), message, QtGui.QMessageBox.StandardButtons(
-                if zip:
+                #        QtGui.QMessageBox.Ok|QtGui.QMessageBox.Cancel),
-                    zip.close()
+                #        QtGui.QMessageBox.Ok)
-            delete_file(serviceFileName)
+                #    if ans == QtGui.QMessageBox.Cancel:
-            self.mainwindow.addRecentFile(fileName)
+                #        continue
-            self.setModified(False)
+                write_list.append(path_from)
+                total_size += file_size
+        log.debug(u'ServiceManager.saveFile - ZIP contents size is %i bytes' %
+            total_size)
+        service_content = cPickle.dumps(service)
+        # Usual Zip file cannot exceed 2GiB, file with Zip64 cannot be
+        # extracted using unzip in UNIX.
+        allow_zip_64 = (total_size > 2147483648 + len(service_content))
+        log.debug(u'ServiceManager.saveFile - allowZip64 is %s' %
+            allow_zip_64)
+        zip = None
+        try:
+            zip = zipfile.ZipFile(path_file_name, 'w', zipfile.ZIP_STORED,
+                allow_zip_64)
+            # First we add service contents.
+            # We save ALL filenames into ZIP using UTF-8.
+            zip.writestr(service_file_name.encode(u'utf-8'),
+                service_content)
+            # Finally add all the listed media files.
+            for path_from in write_list:
+                zip.write(path_from, path_from.encode(u'utf-8'))
+        except IOError:
+            log.exception(u'Failed to save service to disk')
+            return False
+        finally:
+            if zip:
+                zip.close()
+        self.mainwindow.addRecentFile(path_file_name)
+        self.setModified(False)
         return True
 
     def saveFileAs(self):
         """
-        Get a file name and then call :function:`ServiceManager.saveFile` to
+        Get a file name and then call :func:`ServiceManager.saveFile` to
         save the file.
         """
         fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.mainwindow,
-            translate('OpenLP.ServiceManager', 'Save Service'),
+            UiStrings.SaveService,
             SettingsManager.get_last_dir(
             self.mainwindow.serviceSettingsSection),
             translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)')))
@@ -563,6 +608,7 @@ class ServiceManager(QtGui.QWidget):
         self.editAction.setVisible(False)
         self.maintainAction.setVisible(False)
         self.notesAction.setVisible(False)
+        self.timeAction.setVisible(False)
         if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit)\
             and serviceItem[u'service_item'].edit_id:
             self.editAction.setVisible(True)
@@ -571,6 +617,9 @@ class ServiceManager(QtGui.QWidget):
             self.maintainAction.setVisible(True)
         if item.parent() is None:
             self.notesAction.setVisible(True)
+        if serviceItem[u'service_item']\
+            .is_capable(ItemCapabilities.AllowsVariableStartTime):
+            self.timeAction.setVisible(True)
         self.themeMenu.menuAction().setVisible(False)
         if serviceItem[u'service_item'].is_text():
             self.themeMenu.menuAction().setVisible(True)
@@ -583,6 +632,8 @@ class ServiceManager(QtGui.QWidget):
             self.onDeleteFromService()
         if action == self.notesAction:
             self.onServiceItemNoteForm()
+        if action == self.timeAction:
+            self.onStartTimeForm()
         if action == self.previewAction:
             self.makePreview()
         if action == self.liveAction:
@@ -597,6 +648,16 @@ class ServiceManager(QtGui.QWidget):
                 self.serviceNoteForm.textEdit.toPlainText()
             self.repaintServiceList(item, -1)
 
+    def onStartTimeForm(self):
+        item = self.findServiceItem()[0]
+        self.startTimeForm.item = self.serviceItems[item]
+        if self.startTimeForm.exec_():
+            self.serviceItems[item][u'service_item'].start_time = \
+                self.startTimeForm.hourSpinBox.value() * 3600 + \
+                self.startTimeForm.minuteSpinBox.value() * 60 + \
+                self.startTimeForm.secondSpinBox.value()
+            self.repaintServiceList(item, -1)
+
     def onServiceItemEditForm(self):
         item = self.findServiceItem()[0]
         self.serviceItemEditForm.setServiceItem(
@@ -843,6 +904,11 @@ class ServiceManager(QtGui.QWidget):
                 text = frame[u'title'].replace(u'\n', u' ')
                 child.setText(0, text[:40])
                 child.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(count))
+                if item[u'service_item'] \
+                    .is_capable(ItemCapabilities.AllowsVariableStartTime):
+                    tip = item[u'service_item'].get_media_time()
+                    if tip:
+                        child.setToolTip(0, tip)
                 if serviceItem == itemcount:
                     if item[u'expanded'] and serviceItemChild == count:
                         self.serviceManagerList.setCurrentItem(child)
@@ -923,6 +989,7 @@ class ServiceManager(QtGui.QWidget):
         for item in self.serviceItems:
             if item[u'service_item']._uuid == uuid:
                 item[u'service_item'].edit_id = editId
+        self.setModified(True)
 
     def replaceServiceItem(self, newItem):
         """
@@ -1041,8 +1108,8 @@ class ServiceManager(QtGui.QWidget):
         if self.serviceItems[item][u'service_item']\
             .is_capable(ItemCapabilities.AllowsEdit):
             Receiver.send_message(u'%s_edit' %
-                self.serviceItems[item][u'service_item'].name.lower(), u'L:%s' %
+                self.serviceItems[item][u'service_item'].name.lower(),
-                self.serviceItems[item][u'service_item'].edit_id )
+                u'L:%s' % self.serviceItems[item][u'service_item'].edit_id)
 
     def findServiceItem(self):
         """
@@ -1103,13 +1170,14 @@ class ServiceManager(QtGui.QWidget):
                 self.serviceItems.remove(serviceItem)
                 self.serviceItems.insert(endpos, serviceItem)
                 self.repaintServiceList(endpos, child)
+                self.setModified(True)
             else:
                 # we are not over anything so drop
                 replace = False
                 if item is None:
                     self.dropPosition = len(self.serviceItems)
                 else:
-                    # we are over somthing so lets investigate
+                    # we are over something so lets investigate
                     pos = self._getParentItemData(item) - 1
                     serviceItem = self.serviceItems[pos]
                     if (plugin == serviceItem[u'service_item'].name and
@@ -1187,5 +1255,5 @@ class ServiceManager(QtGui.QWidget):
         """
         Print a Service Order Sheet.
         """
-        settingDialog = PrintServiceOrderForm(self.mainwindow, self)
+        settingDialog = PrintServiceForm(self.mainwindow, self)
-        settingDialog.exec_()
+        settingDialog.exec_()

openlp/core/ui/servicenoteform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import create_save_cancel_button_box
+from openlp.core.lib.ui import create_accept_reject_button_box
 
 class ServiceNoteForm(QtGui.QDialog):
     """
@@ -48,9 +48,9 @@ class ServiceNoteForm(QtGui.QDialog):
         self.textEdit = QtGui.QTextEdit(self)
         self.textEdit.setObjectName(u'textEdit')
         self.dialogLayout.addWidget(self.textEdit)
-        self.dialogLayout.addWidget(create_save_cancel_button_box(self))
+        self.dialogLayout.addWidget(create_accept_reject_button_box(self))
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def retranslateUi(self):
         self.setWindowTitle(
-            translate('OpenLP.ServiceNoteForm', 'Service Item Notes')) 
+            translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))

openlp/core/ui/settingsdialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, build_icon
+from openlp.core.lib.ui import create_accept_reject_button_box
 
 class Ui_SettingsDialog(object):
     def setupUi(self, settingsDialog):
@@ -35,21 +36,13 @@ class Ui_SettingsDialog(object):
         settingsDialog.setWindowIcon(
             build_icon(u':/system/system_settings.png'))
         self.settingsLayout = QtGui.QVBoxLayout(settingsDialog)
-        margins = self.settingsLayout.contentsMargins()
         self.settingsLayout.setObjectName(u'settingsLayout')
         self.settingsTabWidget = QtGui.QTabWidget(settingsDialog)
         self.settingsTabWidget.setObjectName(u'settingsTabWidget')
         self.settingsLayout.addWidget(self.settingsTabWidget)
-        self.buttonBox = QtGui.QDialogButtonBox(settingsDialog)
+        self.buttonBox = create_accept_reject_button_box(settingsDialog, True)
-        self.buttonBox.setStandardButtons(
-            QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName(u'buttonBox')
         self.settingsLayout.addWidget(self.buttonBox)
         self.retranslateUi(settingsDialog)
-        QtCore.QObject.connect(self.buttonBox,
-            QtCore.SIGNAL(u'accepted()'), settingsDialog.accept)
-        QtCore.QObject.connect(self.buttonBox,
-            QtCore.SIGNAL(u'rejected()'), settingsDialog.reject)
         QtCore.QMetaObject.connectSlotsByName(settingsDialog)
 
     def retranslateUi(self, settingsDialog):

openlp/core/ui/settingsform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -31,7 +31,7 @@ import logging
 from PyQt4 import QtGui
 
 from openlp.core.lib import Receiver
-from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab, DisplayTagTab
+from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
 from settingsdialog import Ui_SettingsDialog
 
 log = logging.getLogger(__name__)
@@ -47,17 +47,14 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
-        self.generalTab = GeneralTab(screens)
+        generalTab = GeneralTab(screens)
-        self.addTab(u'General', self.generalTab)
+        self.addTab(u'General', generalTab)
         # Themes tab
-        self.themesTab = ThemesTab(mainWindow)
+        themesTab = ThemesTab(mainWindow)
-        self.addTab(u'Themes', self.themesTab)
+        self.addTab(u'Themes', themesTab)
         # Advanced tab
-        self.advancedTab = AdvancedTab()
+        advancedTab = AdvancedTab()
-        self.addTab(u'Advanced', self.advancedTab)
+        self.addTab(u'Advanced', advancedTab)
-        # Edit Display Tags tab
-        self.displayTagTab = DisplayTagTab()
-        self.addTab(u'Display Tags', self.displayTagTab)
 
     def addTab(self, name, tab):
         """
@@ -71,9 +68,9 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
-        # 15 : There are 4 tables currently and locations starts at -10
+        # 14 : There are 3 tables currently and locations starts at -10
         self.settingsTabWidget.insertTab(
-            location + 15, tab, tab.tabTitleVisible)
+            location + 14, tab, tab.tabTitleVisible)
 
     def removeTab(self, tab):
         """

openlp/core/ui/shortcutlistdialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -36,7 +36,7 @@ class Ui_ShortcutListDialog(object):
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
         self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setObjectName(u'treeWidget')
-        self.treeWidget.setColumnCount(2)
+        self.treeWidget.setColumnCount(3)
         self.dialogLayout.addWidget(self.treeWidget)
         self.defaultButton = QtGui.QRadioButton(shortcutListDialog)
         self.defaultButton.setChecked(True)
@@ -78,7 +78,8 @@ class Ui_ShortcutListDialog(object):
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
-            translate('OpenLP.ShortcutListDialog', 'Shortcut')])
+            translate('OpenLP.ShortcutListDialog', 'Shortcut'),
+            translate('OpenLP.ShortcutListDialog', 'Alternate')])
         self.defaultButton.setText(
             translate('OpenLP.ShortcutListDialog', 'Default: %s'))
         self.customButton.setText(

openlp/core/ui/shortcutlistform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -95,8 +95,14 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
-                shortcutText = action.shortcut().toString()
+                if (len(action.shortcuts()) == 2):
-                actionItem = QtGui.QTreeWidgetItem([actionText, shortcutText])
+                    shortcutText = action.shortcuts()[0].toString()
+                    alternateText = action.shortcuts()[1].toString()
+                else:
+                    shortcutText = action.shortcut().toString()
+                    alternateText = u''
+                actionItem = QtGui.QTreeWidgetItem(
+                    [actionText, shortcutText, alternateText])
                 actionItem.setIcon(0, action.icon())
                 item.addChild(actionItem)
             item.setExpanded(True)

openlp/core/ui/slidecontroller.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -32,7 +32,7 @@ from PyQt4.phonon import Phonon
 
 from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
-from openlp.core.lib.ui import shortcut_action
+from openlp.core.lib.ui import icon_action, UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
 
 log = logging.getLogger(__name__)
@@ -78,7 +78,7 @@ class SlideController(QtGui.QWidget):
         self.selectedRow = 0
         self.serviceItem = None
         self.alertTab = None
-        self.panel = QtGui.QWidget(parent.ControlSplitter)
+        self.panel = QtGui.QWidget(parent.controlSplitter)
         self.slideList = {}
         # Layout for holding panel
         self.panelLayout = QtGui.QVBoxLayout(self.panel)
@@ -87,12 +87,11 @@ class SlideController(QtGui.QWidget):
         # Type label for the top of the slide controller
         self.typeLabel = QtGui.QLabel(self.panel)
         if self.isLive:
-            self.typeLabel.setText(translate('OpenLP.SlideController', 'Live'))
+            self.typeLabel.setText(UiStrings.Live)
             self.split = 1
             self.typePrefix = u'live'
         else:
-            self.typeLabel.setText(translate('OpenLP.SlideController',
+            self.typeLabel.setText(UiStrings.Preview)
-                'Preview'))
             self.split = 0
             self.typePrefix = u'preview'
         self.typeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
@@ -115,8 +114,7 @@ class SlideController(QtGui.QWidget):
         self.previewListWidget = SlideList(self)
         self.previewListWidget.setColumnCount(1)
         self.previewListWidget.horizontalHeader().setVisible(False)
-        self.previewListWidget.setColumnWidth(
+        self.previewListWidget.setColumnWidth(0, self.controller.width())
-            0, self.controller.width())
         self.previewListWidget.isLive = self.isLive
         self.previewListWidget.setObjectName(u'PreviewListWidget')
         self.previewListWidget.setSelectionBehavior(1)
@@ -147,42 +145,38 @@ class SlideController(QtGui.QWidget):
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
             self.onSlideSelectedNext)
+        self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
-            self.toolbar.addToolbarSeparator(u'Close Separator')
             self.hideMenu = QtGui.QToolButton(self.toolbar)
             self.hideMenu.setText(translate('OpenLP.SlideController', 'Hide'))
             self.hideMenu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
             self.toolbar.addToolbarWidget(u'Hide Menu', self.hideMenu)
             self.hideMenu.setMenu(QtGui.QMenu(
                 translate('OpenLP.SlideController', 'Hide'), self.toolbar))
-            self.blankScreen = QtGui.QAction(QtGui.QIcon(
+            self.blankScreen = icon_action(self.hideMenu, u'Blank Screen',
-                u':/slides/slide_blank.png'),
+                u':/slides/slide_blank.png', False)
-                translate('OpenLP.SlideController',
+            self.blankScreen.setText(
-                    'Blank Screen'), self.hideMenu)
+                translate('OpenLP.SlideController', 'Blank Screen'))
-            self.blankScreen.setCheckable(True)
+            self.themeScreen = icon_action(self.hideMenu, u'Blank Theme',
-            self.themeScreen = QtGui.QAction(QtGui.QIcon(
+                u':/slides/slide_theme.png', False)
-                u':/slides/slide_theme.png'),
+            self.themeScreen.setText(
-                translate('OpenLP.SlideController',
+                translate('OpenLP.SlideController', 'Blank to Theme'))
-                    'Blank to Theme'), self.hideMenu)
+            self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
-            self.themeScreen.setCheckable(True)
+                u':/slides/slide_desktop.png', False)
+            self.desktopScreen.setText(
+                translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)
             self.hideMenu.menu().addAction(self.blankScreen)
             self.hideMenu.menu().addAction(self.themeScreen)
-            if self.screens.display_count > 1:
+            self.hideMenu.menu().addAction(self.desktopScreen)
-                self.desktopScreen = QtGui.QAction(QtGui.QIcon(
-                    u':/slides/slide_desktop.png'),
-                    translate('OpenLP.SlideController',
-                    'Show Desktop'), self.hideMenu)
-                self.hideMenu.menu().addAction(self.desktopScreen)
-                self.desktopScreen.setCheckable(True)
-                QtCore.QObject.connect(self.desktopScreen,
-                    QtCore.SIGNAL(u'triggered(bool)'), self.onHideDisplay)
             self.toolbar.addToolbarSeparator(u'Loop Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Start Loop', u':/media/media_time.png',
                 translate('OpenLP.SlideController', 'Start continuous loop'),
                 self.onStartLoop)
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Stop Loop', u':/media/media_stop.png',
                 translate('OpenLP.SlideController', 'Stop continuous loop'),
                 self.onStopLoop)
@@ -190,18 +184,18 @@ class SlideController(QtGui.QWidget):
             self.delaySpinBox.setMinimum(1)
             self.delaySpinBox.setMaximum(180)
             self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox)
-            self.delaySpinBox.setSuffix(translate('OpenLP.SlideController',
+            self.delaySpinBox.setSuffix(UiStrings.S)
-                's'))
             self.delaySpinBox.setToolTip(translate('OpenLP.SlideController',
                 'Delay between slides in seconds'))
         else:
-            self.toolbar.addToolbarSeparator(u'Close Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Go Live', u':/general/general_live.png',
                 translate('OpenLP.SlideController', 'Move to live'),
                 self.onGoLive)
             self.toolbar.addToolbarSeparator(u'Close Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Edit Song', u':/general/general_edit.png',
                 translate('OpenLP.SlideController',
                 'Edit and reload song preview'),
@@ -224,8 +218,7 @@ class SlideController(QtGui.QWidget):
         if self.isLive:
             # Build the Song Toolbar
             self.songMenu = QtGui.QToolButton(self.toolbar)
-            self.songMenu.setText(translate('OpenLP.SlideController',
+            self.songMenu.setText(translate('OpenLP.SlideController', 'Go To'))
-                'Go To'))
             self.songMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
             self.toolbar.addToolbarWidget(u'Song Menu', self.songMenu)
             self.songMenu.setMenu(QtGui.QMenu(
@@ -301,6 +294,8 @@ class SlideController(QtGui.QWidget):
                 QtCore.SIGNAL(u'triggered(bool)'), self.onBlankDisplay)
             QtCore.QObject.connect(self.themeScreen,
                 QtCore.SIGNAL(u'triggered(bool)'), self.onThemeDisplay)
+            QtCore.QObject.connect(self.desktopScreen,
+                QtCore.SIGNAL(u'triggered(bool)'), self.onHideDisplay)
             QtCore.QObject.connect(self.volumeSlider,
                 QtCore.SIGNAL(u'sliderReleased()'), self.mediaVolume)
             QtCore.QObject.connect(Receiver.get_receiver(),
@@ -377,7 +372,7 @@ class SlideController(QtGui.QWidget):
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
         self.previousItem.setShortcutContext(
             QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.nextItem, u'Live')
+        actionList.add_action(self.previousItem, u'Live')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         actionList.add_action(self.nextItem, u'Live')
@@ -455,7 +450,7 @@ class SlideController(QtGui.QWidget):
                 self.previewListWidget.resizeRowsToContents()
             else:
                 # Sort out image heights.
-                width = self.parent.ControlSplitter.sizes()[self.split]
+                width = self.parent.controlSplitter.sizes()[self.split]
                 for framenumber in range(len(self.serviceItem.get_frames())):
                     self.previewListWidget.setRowHeight(
                         framenumber, width / self.ratio)
@@ -467,6 +462,9 @@ class SlideController(QtGui.QWidget):
         self.onSlideSelected()
 
     def receiveSpinDelay(self, value):
+        """
+        Adjusts the value of the ``delaySpinBox`` to the given one.
+        """
         self.delaySpinBox.setValue(int(value))
 
     def enableToolBar(self, item):
@@ -584,7 +582,7 @@ class SlideController(QtGui.QWidget):
         Receiver.send_message(u'%s_start' % serviceItem.name.lower(),
             [serviceItem, self.isLive, blanked, slideno])
         self.slideList = {}
-        width = self.parent.ControlSplitter.sizes()[self.split]
+        width = self.parent.controlSplitter.sizes()[self.split]
         self.serviceItem = serviceItem
         self.previewListWidget.clear()
         self.previewListWidget.setRowCount(0)
@@ -600,14 +598,15 @@ class SlideController(QtGui.QWidget):
             slideHeight = 0
             if self.serviceItem.is_text():
                 if frame[u'verseTag']:
-                    bits = frame[u'verseTag'].split(u':')
+                    # These tags are already translated.
-                    tag = u'%s\n%s' % (bits[0][0], bits[1][0:] )
+                    verse_def = frame[u'verseTag']
-                    tag1 = u'%s%s' % (bits[0][0], bits[1][0:] )
+                    verse_def = u'%s%s' % (verse_def[0].upper(), verse_def[1:])
-                    row = tag
+                    two_line_def = u'%s\n%s' % (verse_def[0], verse_def[1:])
+                    row = two_line_def
                     if self.isLive:
-                        if tag1 not in self.slideList:
+                        if verse_def not in self.slideList:
-                            self.slideList[tag1] = framenumber
+                            self.slideList[verse_def] = framenumber
-                            self.songMenu.menu().addAction(tag1,
+                            self.songMenu.menu().addAction(verse_def,
                                 self.onSongBarHandler)
                 else:
                     row += 1
@@ -621,6 +620,11 @@ class SlideController(QtGui.QWidget):
                         self.parent.renderManager.width,
                         self.parent.renderManager.height)
                 else:
+                    # If current slide set background to image
+                    if framenumber == slideno:
+                        self.serviceItem.bg_image_bytes = \
+                            self.parent.renderManager.image_manager. \
+                            get_image_bytes(frame[u'title'])
                     image = self.parent.renderManager.image_manager. \
                         get_image(frame[u'title'])
                 label.setPixmap(QtGui.QPixmap.fromImage(image))
@@ -744,8 +748,7 @@ class SlideController(QtGui.QWidget):
         self.hideMenu.setDefaultAction(self.blankScreen)
         self.blankScreen.setChecked(checked)
         self.themeScreen.setChecked(False)
-        if self.screens.display_count > 1:
+        self.desktopScreen.setChecked(False)
-            self.desktopScreen.setChecked(False)
         if checked:
             Receiver.send_message(u'maindisplay_hide', HideMode.Blank)
             QtCore.QSettings().setValue(
@@ -766,8 +769,7 @@ class SlideController(QtGui.QWidget):
         self.hideMenu.setDefaultAction(self.themeScreen)
         self.blankScreen.setChecked(False)
         self.themeScreen.setChecked(checked)
-        if self.screens.display_count > 1:
+        self.desktopScreen.setChecked(False)
-            self.desktopScreen.setChecked(False)
         if checked:
             Receiver.send_message(u'maindisplay_hide', HideMode.Theme)
             QtCore.QSettings().setValue(
@@ -788,9 +790,6 @@ class SlideController(QtGui.QWidget):
         self.hideMenu.setDefaultAction(self.desktopScreen)
         self.blankScreen.setChecked(False)
         self.themeScreen.setChecked(False)
-        # On valid if more than 1 display
-        if self.screens.display_count <= 1:
-            return
         self.desktopScreen.setChecked(checked)
         if checked:
             Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
@@ -854,6 +853,8 @@ class SlideController(QtGui.QWidget):
                     frame = self.display.text(toDisplay)
                 else:
                     frame = self.display.image(toDisplay)
+                    # reset the store used to display first image
+                    self.serviceItem.bg_image_bytes = None
                 self.slidePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
             self.selectedRow = row
         Receiver.send_message(u'slidecontroller_%s_changed' % self.typePrefix,
@@ -874,7 +875,8 @@ class SlideController(QtGui.QWidget):
         using *Blank to Theme*.
         """
         log.debug(u'updatePreview %s ' % self.screens.current[u'primary'])
-        if not self.screens.current[u'primary']:
+        if not self.screens.current[u'primary'] and self.serviceItem and \
+            self.serviceItem.is_capable(ItemCapabilities.ProvidesOwnDisplay):
             # Grab now, but try again in a couple of seconds if slide change
             # is slow
             QtCore.QTimer.singleShot(0.5, self.grabMainDisplay)
@@ -1092,15 +1094,15 @@ class SlideController(QtGui.QWidget):
         Used by command items which provide their own displays to reset the
         screen hide attributes
         """
+        blank = None
         if self.blankScreen.isChecked:
-            self.blankScreen.setChecked(False)
+            blank = self.blankScreen
-            self.hideMenu.setDefaultAction(self.blankScreen)
+        if self.themeScreen.isChecked:
+            blank = self.themeScreen
+        if self.desktopScreen.isChecked:
+            blank = self.desktopScreen
+        if blank:
+            blank.setChecked(False)
+            self.hideMenu.setDefaultAction(blank)
             QtCore.QSettings().remove(
                 self.parent.generalSettingsSection + u'/screen blank')
-        if self.themeScreen.isChecked:
-            self.themeScreen.setChecked(False)
-            self.hideMenu.setDefaultAction(self.themeScreen)
-        if self.screens.display_count > 1:
-            if self.desktopScreen.isChecked:
-                self.desktopScreen.setChecked(False)
-                self.hideMenu.setDefaultAction(self.desktopScreen)

openlp/core/ui/splashscreen.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/ui/starttimedialog.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
+
+class Ui_StartTimeDialog(object):
+    def setupUi(self, StartTimeDialog):
+        StartTimeDialog.setObjectName(u'StartTimeDialog')
+        StartTimeDialog.resize(300, 10)
+        self.dialogLayout = QtGui.QGridLayout(StartTimeDialog)
+        self.dialogLayout.setObjectName(u'dialogLayout')
+        self.hourLabel = QtGui.QLabel(StartTimeDialog)
+        self.hourLabel.setObjectName("hourLabel")
+        self.dialogLayout.addWidget(self.hourLabel, 0, 0, 1, 1)
+        self.hourSpinBox = QtGui.QSpinBox(StartTimeDialog)
+        self.hourSpinBox.setObjectName("hourSpinBox")
+        self.dialogLayout.addWidget(self.hourSpinBox, 0, 1, 1, 1)
+        self.minuteLabel = QtGui.QLabel(StartTimeDialog)
+        self.minuteLabel.setObjectName("minuteLabel")
+        self.dialogLayout.addWidget(self.minuteLabel, 1, 0, 1, 1)
+        self.minuteSpinBox = QtGui.QSpinBox(StartTimeDialog)
+        self.minuteSpinBox.setObjectName("minuteSpinBox")
+        self.dialogLayout.addWidget(self.minuteSpinBox, 1, 1, 1, 1)
+        self.secondLabel = QtGui.QLabel(StartTimeDialog)
+        self.secondLabel.setObjectName("secondLabel")
+        self.dialogLayout.addWidget(self.secondLabel, 2, 0, 1, 1)
+        self.secondSpinBox = QtGui.QSpinBox(StartTimeDialog)
+        self.secondSpinBox.setObjectName("secondSpinBox")
+        self.dialogLayout.addWidget(self.secondSpinBox, 2, 1, 1, 1)
+        self.buttonBox = create_accept_reject_button_box(StartTimeDialog, True)
+        self.dialogLayout.addWidget(self.buttonBox, 4, 0, 1, 2)
+        self.retranslateUi(StartTimeDialog)
+        self.setMaximumHeight(self.sizeHint().height())
+        QtCore.QMetaObject.connectSlotsByName(StartTimeDialog)
+
+    def retranslateUi(self, StartTimeDialog):
+        self.setWindowTitle(translate('OpenLP.StartTimeForm',
+            'Item Start Time'))
+        self.hourLabel.setText(translate('OpenLP.StartTimeForm', 'Hours:'))
+        self.hourSpinBox.setSuffix(translate('OpenLP.StartTimeForm', 'h'))
+        self.minuteSpinBox.setSuffix(translate('OpenLP.StartTimeForm', 'm'))
+        self.secondSpinBox.setSuffix(UiStrings.S)
+        self.minuteLabel.setText(translate('OpenLP.StartTimeForm', 'Minutes:'))
+        self.secondLabel.setText(translate('OpenLP.StartTimeForm', 'Seconds:'))

openlp/core/ui/starttimeform.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtGui
+
+from starttimedialog import Ui_StartTimeDialog
+
+class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
+    """
+    The exception dialog
+    """
+    def __init__(self, parent):
+        QtGui.QDialog.__init__(self, parent)
+        self.setupUi(self)
+
+    def exec_(self):
+        """
+        Run the Dialog with correct heading.
+        """
+        seconds = self.item[u'service_item'].start_time
+        hours = seconds / 3600
+        seconds -= 3600 * hours
+        minutes = seconds / 60
+        seconds -= 60 * minutes
+        self.hourSpinBox.setValue(hours)
+        self.minuteSpinBox.setValue(minutes)
+        self.secondSpinBox.setValue(seconds)
+        return QtGui.QDialog.exec_(self)
+

openlp/core/ui/themeform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -29,9 +29,9 @@ import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, BackgroundType, BackgroundGradientType, \
+from openlp.core.lib import Receiver, translate
-    Receiver
+from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.utils import get_images_filter
 from themewizard import Ui_ThemeWizard
 
@@ -204,7 +204,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         # Do not trigger on start up
         if self.currentPage != self.welcomePage:
             self.updateTheme()
-            frame = self.thememanager.generateImage(self.theme, True)
+            self.thememanager.generateImage(self.theme, True)
 
     def updateLinesText(self, lines):
         """
@@ -301,7 +301,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
                 'Edit Theme - %s')) % self.theme.theme_name)
             self.next()
         else:
-            self.setWindowTitle(translate('OpenLP.ThemeWizard', 'New Theme'))
+            self.setWindowTitle(UiStrings.NewTheme)
         return QtGui.QWizard.exec_(self)
 
     def initializePage(self, id):
@@ -483,8 +483,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Background Image button pushed.
         """
         images_filter = get_images_filter()
-        images_filter = '%s;;%s (*.*) (*)' % (images_filter,
+        images_filter = u'%s;;%s (*.*) (*)' % (
-            translate('OpenLP.ThemeForm', 'All Files'))
+            images_filter, UiStrings.AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.ThemeForm', 'Select Image'), u'',
             images_filter)

openlp/core/ui/thememanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -32,10 +32,12 @@ import logging
 from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import OpenLPToolbar, ThemeXML, get_text_file_string, \
+from openlp.core.lib import OpenLPToolbar, get_text_file_string, build_icon, \
-    build_icon, Receiver, SettingsManager, translate, check_item_selected, \
+    Receiver, SettingsManager, translate, check_item_selected, \
-    BackgroundType, BackgroundGradientType, check_directory_exists
+    check_directory_exists
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, \
+    BackgroundGradientType
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.theme import Theme
 from openlp.core.ui import FileRenameForm, ThemeForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
@@ -61,8 +63,7 @@ class ThemeManager(QtGui.QWidget):
         self.layout.setMargin(0)
         self.layout.setObjectName(u'layout')
         self.toolbar = OpenLPToolbar(self)
-        self.toolbar.addToolbarButton(
+        self.toolbar.addToolbarButton(UiStrings.NewTheme,
-            translate('OpenLP.ThemeManager', 'New Theme'),
             u':/themes/theme_new.png',
             translate('OpenLP.ThemeManager', 'Create a new theme.'),
             self.onAddTheme)
@@ -144,6 +145,20 @@ class ThemeManager(QtGui.QWidget):
         # Last little bits of setting up
         self.configUpdated()
 
+    def firstTime(self):
+        """
+        Import new themes downloaded by the first time wizard
+        """
+        Receiver.send_message(u'cursor_busy')
+        encoding = get_filesystem_encoding()
+        files = SettingsManager.get_files(self.settingsSection, u'.otz')
+        for file in files:
+            file = os.path.join(self.path, file).encode(encoding)
+            self.unzipTheme(file, self.path)
+            delete_file(file)
+        self.loadThemes()
+        Receiver.send_message(u'cursor_normal')
+
     def configUpdated(self, firstTime=False):
         """
         Triggered when Config dialog is updated.
@@ -265,7 +280,7 @@ class ThemeManager(QtGui.QWidget):
             oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
             self.fileRenameForm.fileNameEdit.setText(oldThemeName)
             if self.fileRenameForm.exec_():
-                newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
+                newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
                 if self.checkIfThemeExists(newThemeName):
                     oldThemeData = self.getThemeData(oldThemeName)
                     self.cloneThemeData(oldThemeData, newThemeName)
@@ -283,7 +298,7 @@ class ThemeManager(QtGui.QWidget):
         oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
         self.fileRenameForm.fileNameEdit.setText(oldThemeName)
         if self.fileRenameForm.exec_(True):
-            newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
+            newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
             if self.checkIfThemeExists(newThemeName):
                 themeData = self.getThemeData(oldThemeName)
                 self.cloneThemeData(themeData, newThemeName)
@@ -313,7 +328,6 @@ class ThemeManager(QtGui.QWidget):
             translate('OpenLP.ThemeManager',
             'You must select a theme to edit.')):
             item = self.themeListWidget.currentItem()
-            themeName = unicode(item.text())
             theme = self.getThemeData(
                 unicode(item.data(QtCore.Qt.UserRole).toString()))
             if theme.background_type == u'image':
@@ -334,9 +348,8 @@ class ThemeManager(QtGui.QWidget):
             row = self.themeListWidget.row(item)
             self.themeListWidget.takeItem(row)
             self.deleteTheme(theme)
-            # As we do not reload the themes, push out the change
+            # As we do not reload the themes, push out the change. Reload the
-            # Reaload the list as the internal lists and events need
+            # list as the internal lists and events need to be triggered.
-            # to be triggered
             self._pushThemes()
 
     def deleteTheme(self, theme):
@@ -371,6 +384,7 @@ class ThemeManager(QtGui.QWidget):
             'Save Theme - (%s)')) % theme,
             SettingsManager.get_last_dir(self.settingsSection, 1))
         path = unicode(path)
+        Receiver.send_message(u'cursor_busy')
         if path:
             SettingsManager.set_last_dir(self.settingsSection, path, 1)
             themePath = os.path.join(path, theme + u'.otz')
@@ -396,25 +410,28 @@ class ThemeManager(QtGui.QWidget):
             finally:
                 if zip:
                     zip.close()
+        Receiver.send_message(u'cursor_normal')
 
     def onImportTheme(self):
         """
         Opens a file dialog to select the theme file(s) to import before
-        attempting to extract OpenLP themes from those files.  This process
+        attempting to extract OpenLP themes from those files. This process
         will load both OpenLP version 1 and version 2 themes.
         """
         files = QtGui.QFileDialog.getOpenFileNames(self,
             translate('OpenLP.ThemeManager', 'Select Theme Import File'),
             SettingsManager.get_last_dir(self.settingsSection),
-            translate('OpenLP.ThemeManager', 'Theme v1 (*.theme);;'
+            unicode(translate('OpenLP.ThemeManager',
-            'Theme v2 (*.otz);;All Files (*.*)'))
+            'OpenLP Themes (*.theme *.otz)')))
         log.info(u'New Themes %s', unicode(files))
+        Receiver.send_message(u'cursor_busy')
         if files:
             for file in files:
                 SettingsManager.set_last_dir(
                     self.settingsSection, unicode(file))
                 self.unzipTheme(file, self.path)
         self.loadThemes()
+        Receiver.send_message(u'cursor_normal')
 
     def loadThemes(self):
         """
@@ -530,6 +547,18 @@ class ThemeManager(QtGui.QWidget):
                         else:
                             outfile = open(fullpath, u'wb')
                             outfile.write(zip.read(file))
+        except (IOError, NameError):
+            critical_error_message_box(
+                translate('OpenLP.ThemeManager', 'Validation Error'),
+                translate('OpenLP.ThemeManager', 'File is not a valid theme.'))
+            log.exception(u'Importing theme from zip failed %s' % filename)
+        finally:
+            # Close the files, to be able to continue creating the theme.
+            if zip:
+                zip.close()
+            if outfile:
+                outfile.close()
+            # As all files are closed, we can create the Theme.
             if filexml:
                 theme = self._createThemeFromXml(filexml, self.path)
                 self.generateAndSaveImage(dir, themename, theme)
@@ -540,17 +569,6 @@ class ThemeManager(QtGui.QWidget):
                     'File is not a valid theme.'))
                 log.exception(u'Theme file does not contain XML data %s' %
                     filename)
-        except (IOError, NameError):
-            critical_error_message_box(
-                translate('OpenLP.ThemeManager', 'Validation Error'),
-                translate('OpenLP.ThemeManager',
-                'File is not a valid theme.'))
-            log.exception(u'Importing theme from zip failed %s' % filename)
-        finally:
-            if zip:
-                zip.close()
-            if outfile:
-                outfile.close()
 
     def checkIfThemeExists(self, themeName):
         """
@@ -763,11 +781,11 @@ class ThemeManager(QtGui.QWidget):
             newtheme.font_main_outline = True
             newtheme.font_main_outline_color = \
                 unicode(theme.OutlineColor.name())
-        vAlignCorrection = 0
+        vAlignCorrection = VerticalType.Top
         if theme.VerticalAlign == 2:
-            vAlignCorrection = 1
+            vAlignCorrection = VerticalType.Middle
         elif theme.VerticalAlign == 1:
-            vAlignCorrection = 2
+            vAlignCorrection = VerticalType.Bottom
         newtheme.display_horizontal_align = theme.HorizontalAlign
         newtheme.display_vertical_align = vAlignCorrection
         return newtheme.extract_xml()

openlp/core/ui/themestab.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -26,7 +26,9 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, Receiver, ThemeLevel, translate
+from openlp.core.lib import SettingsTab, Receiver, translate
+from openlp.core.lib.theme import ThemeLevel
+from openlp.core.lib.ui import UiStrings
 
 class ThemesTab(SettingsTab):
     """
@@ -98,7 +100,7 @@ class ThemesTab(SettingsTab):
             QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList)
 
     def retranslateUi(self):
-        self.tabTitleVisible = translate('OpenLP.ThemesTab', 'Themes')
+        self.tabTitleVisible = UiStrings.Themes
         self.GlobalGroupBox.setTitle(
             translate('OpenLP.ThemesTab', 'Global Theme'))
         self.LevelGroupBox.setTitle(
@@ -198,7 +200,7 @@ class ThemesTab(SettingsTab):
         """
         Utility method to update the global theme preview image.
         """
-        image = self.parent.ThemeManagerContents.getPreviewImage(
+        image = self.parent.themeManagerContents.getPreviewImage(
             self.global_theme)
         preview = QtGui.QPixmap(unicode(image))
         if not preview.isNull():

openlp/core/ui/themewizard.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,7 +27,9 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, build_icon
-from openlp.core.lib.ui import add_welcome_page
+from openlp.core.lib.theme import HorizontalType, BackgroundType, \
+    BackgroundGradientType
+from openlp.core.lib.ui import UiStrings, add_welcome_page, create_valign_combo
 
 class Ui_ThemeWizard(object):
     def setupUi(self, themeWizard):
@@ -242,12 +244,8 @@ class Ui_ThemeWizard(object):
         self.horizontalComboBox.setObjectName(u'HorizontalComboBox')
         self.alignmentLayout.addRow(self.horizontalLabel,
             self.horizontalComboBox)
-        self.verticalLabel = QtGui.QLabel(self.alignmentPage)
+        create_valign_combo(themeWizard, self.alignmentPage,
-        self.verticalLabel.setObjectName(u'VerticalLabel')
+            self.alignmentLayout)
-        self.verticalComboBox = QtGui.QComboBox(self.alignmentPage)
-        self.verticalComboBox.addItems([u'', u'', u''])
-        self.verticalComboBox.setObjectName(u'VerticalComboBox')
-        self.alignmentLayout.addRow(self.verticalLabel, self.verticalComboBox)
         self.transitionsLabel = QtGui.QLabel(self.alignmentPage)
         self.transitionsLabel.setObjectName(u'TransitionsLabel')
         self.transitionsCheckBox = QtGui.QCheckBox(self.alignmentPage)
@@ -421,12 +419,12 @@ class Ui_ThemeWizard(object):
                 'according to the parameters below.'))
         self.backgroundLabel.setText(
             translate('OpenLP.ThemeWizard', 'Background type:'))
-        self.backgroundComboBox.setItemText(0,
+        self.backgroundComboBox.setItemText(BackgroundType.Solid,
             translate('OpenLP.ThemeWizard', 'Solid Color'))
-        self.backgroundComboBox.setItemText(1,
+        self.backgroundComboBox.setItemText(BackgroundType.Gradient,
             translate('OpenLP.ThemeWizard', 'Gradient'))
-        self.backgroundComboBox.setItemText(2,
+        self.backgroundComboBox.setItemText(
-            translate('OpenLP.ThemeWizard', 'Image'))
+            BackgroundType.Image, UiStrings.Image)
         self.colorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.gradientStartLabel.setText(
             translate(u'OpenLP.ThemeWizard', 'Starting color:'))
@@ -434,39 +432,37 @@ class Ui_ThemeWizard(object):
             translate(u'OpenLP.ThemeWizard', 'Ending color:'))
         self.gradientTypeLabel.setText(
             translate('OpenLP.ThemeWizard', 'Gradient:'))
-        self.gradientComboBox.setItemText(0,
+        self.gradientComboBox.setItemText(BackgroundGradientType.Horizontal,
             translate('OpenLP.ThemeWizard', 'Horizontal'))
-        self.gradientComboBox.setItemText(1,
+        self.gradientComboBox.setItemText(BackgroundGradientType.Vertical,
             translate('OpenLP.ThemeWizard', 'Vertical'))
-        self.gradientComboBox.setItemText(2,
+        self.gradientComboBox.setItemText(BackgroundGradientType.Circular,
             translate('OpenLP.ThemeWizard', 'Circular'))
-        self.gradientComboBox.setItemText(3,
+        self.gradientComboBox.setItemText(BackgroundGradientType.LeftTop,
             translate('OpenLP.ThemeWizard', 'Top Left - Bottom Right'))
-        self.gradientComboBox.setItemText(4,
+        self.gradientComboBox.setItemText(BackgroundGradientType.LeftBottom,
             translate('OpenLP.ThemeWizard', 'Bottom Left - Top Right'))
-        self.imageLabel.setText(translate('OpenLP.ThemeWizard', 'Image:'))
+        self.imageLabel.setText(u'%s:' % UiStrings.Image)
         self.mainAreaPage.setTitle(
             translate('OpenLP.ThemeWizard', 'Main Area Font Details'))
         self.mainAreaPage.setSubTitle(
             translate('OpenLP.ThemeWizard', 'Define the font and display '
                 'characteristics for the Display text'))
-        self.mainFontLabel.setText(
+        self.mainFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
-            translate('OpenLP.ThemeWizard', 'Font:'))
         self.mainColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.mainSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.mainSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
+        self.mainSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
         self.lineSpacingLabel.setText(
             translate('OpenLP.ThemeWizard', 'Line Spacing:'))
-        self.lineSpacingSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
+        self.lineSpacingSpinBox.setSuffix(UiStrings.FontSizePtUnit)
         self.outlineCheckBox.setText(
             translate('OpenLP.ThemeWizard', '&Outline:'))
         self.outlineSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.outlineSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
+        self.outlineSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
         self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
         self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.shadowSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
+        self.shadowSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
-        self.mainBoldCheckBox.setText(
+        self.mainBoldCheckBox.setText(translate('OpenLP.ThemeWizard', 'Bold'))
-            translate('OpenLP.ThemeWizard', 'Bold'))
         self.mainItalicsCheckBox.setText(
             translate('OpenLP.ThemeWizard', 'Italic'))
         self.footerAreaPage.setTitle(
@@ -477,7 +473,7 @@ class Ui_ThemeWizard(object):
         self.footerFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
         self.footerColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.footerSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.footerSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
+        self.footerSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
         self.alignmentPage.setTitle(
             translate('OpenLP.ThemeWizard', 'Text Formatting Details'))
         self.alignmentPage.setSubTitle(
@@ -485,20 +481,12 @@ class Ui_ThemeWizard(object):
                 'formatting information to be defined'))
         self.horizontalLabel.setText(
             translate('OpenLP.ThemeWizard', 'Horizontal Align:'))
-        self.horizontalComboBox.setItemText(0,
+        self.horizontalComboBox.setItemText(HorizontalType.Left,
             translate('OpenLP.ThemeWizard', 'Left'))
-        self.horizontalComboBox.setItemText(1,
+        self.horizontalComboBox.setItemText(HorizontalType.Right,
             translate('OpenLP.ThemeWizard', 'Right'))
-        self.horizontalComboBox.setItemText(2,
+        self.horizontalComboBox.setItemText(HorizontalType.Center,
             translate('OpenLP.ThemeWizard', 'Center'))
-        self.verticalLabel.setText(
-            translate('OpenLP.ThemeWizard', 'Vertical Align:'))
-        self.verticalComboBox.setItemText(0,
-            translate('OpenLP.ThemeWizard', 'Top'))
-        self.verticalComboBox.setItemText(1,
-            translate('OpenLP.ThemeWizard', 'Middle'))
-        self.verticalComboBox.setItemText(2,
-            translate('OpenLP.ThemeWizard', 'Bottom'))
         self.transitionsLabel.setText(
             translate('OpenLP.ThemeWizard', 'Transitions:'))
         self.areaPositionPage.setTitle(

openlp/core/ui/wizard.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -27,14 +27,55 @@
 The :mod:``wizard`` module provides generic wizard tools for OpenLP.
 """
 import logging
+import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon, Receiver
+from openlp.core.lib import build_icon, Receiver, SettingsManager, translate
-from openlp.core.lib.ui import add_welcome_page
+from openlp.core.lib.ui import UiStrings, add_welcome_page
 
 log = logging.getLogger(__name__)
 
+class WizardStrings(object):
+    """
+    Provide standard strings for wizards to use.
+    """
+    # Applications/Formats we import from or export to. These get used in
+    # multiple places but do not need translating unless you find evidence of
+    # the writers translating their own product name.
+    CCLI = u'CCLI/SongSelect'
+    CSV = u'CSV'
+    EW = u'EasyWorship'
+    ES = u'EasiSlides'
+    FP = u'Foilpresenter'
+    OL = u'OpenLyrics'
+    OS = u'OpenSong'
+    OSIS = u'OSIS'
+    SB = u'SongBeamer'
+    SoF = u'Songs of Fellowship'
+    SSP = u'SongShow Plus'
+    WoW = u'Words of Worship'
+    # These strings should need a good reason to be retranslated elsewhere.
+    FinishedImport = translate('OpenLP.Ui', 'Finished import.')
+    FormatLabel = translate('OpenLP.Ui', 'Format:')
+    HeaderStyle = u'<span style="font-size:14pt; font-weight:600;">%s</span>'
+    Importing = translate('OpenLP.Ui', 'Importing')
+    ImportingType = unicode(translate('OpenLP.Ui', 'Importing "%s"...'))
+    ImportSelect = translate('OpenLP.Ui', 'Select Import Source')
+    ImportSelectLong = unicode(translate('OpenLP.Ui',
+        'Select the import format and the location to import from.'))
+    NoSqlite = translate('OpenLP.Ui', 'The openlp.org 1.x importer has been '
+        'disabled due to a missing Python module. If you want to use this '
+        'importer, you will need to install the "python-sqlite" '
+        'module.')
+    OpenTypeFile = unicode(translate('OpenLP.Ui', 'Open %s File'))
+    PercentSymbolFormat = unicode(translate('OpenLP.Ui', '%p%'))
+    Ready = translate('OpenLP.Ui', 'Ready.')
+    StartingImport = translate('OpenLP.Ui', 'Starting import...')
+    YouSpecifyFile = unicode(translate('OpenLP.Ui', 'You need to specify at '
+        'least one %s file to import from.', 'A file type e.g. OpenSong'))
+
+
 class OpenLPWizard(QtGui.QWizard):
     """
     Generic OpenLP wizard to provide generic functionality and a unified look
@@ -42,6 +83,7 @@ class OpenLPWizard(QtGui.QWizard):
     """
     def __init__(self, parent, plugin, name, image):
         QtGui.QWizard.__init__(self, parent)
+        self.plugin = plugin
         self.setObjectName(name)
         self.openIcon = build_icon(u':/general/general_open.png')
         self.deleteIcon = build_icon(u':/general/general_delete.png')
@@ -49,7 +91,6 @@ class OpenLPWizard(QtGui.QWizard):
         self.cancelButton = self.button(QtGui.QWizard.CancelButton)
         self.setupUi(image)
         self.registerFields()
-        self.plugin = plugin
         self.customInit()
         self.customSignals()
         QtCore.QObject.connect(self, QtCore.SIGNAL(u'currentIdChanged(int)'),
@@ -70,6 +111,12 @@ class OpenLPWizard(QtGui.QWizard):
         self.retranslateUi()
         QtCore.QMetaObject.connectSlotsByName(self)
 
+    def registerFields(self):
+        """
+        Hook method for wizards to register any fields they need.
+        """
+        pass
+
     def addProgressPage(self):
         """
         Add the progress page for the wizard. This page informs the user how
@@ -146,3 +193,30 @@ class OpenLPWizard(QtGui.QWizard):
         self.finishButton.setVisible(True)
         self.cancelButton.setVisible(False)
         Receiver.send_message(u'openlp_process_events')
+
+    def getFileName(self, title, editbox, filters=u''):
+        """
+        Opens a QFileDialog and saves the filename to the given editbox.
+
+        ``title``
+            The title of the dialog (unicode).
+
+        ``editbox``
+            A editbox (QLineEdit).
+
+        ``filters``
+            The file extension filters. It should contain the file description
+            as well as the file extension. For example::
+
+                u'OpenLP 2.0 Databases (*.sqlite)'
+        """
+        if filters:
+            filters += u';;'
+        filters += u'%s (*)' % UiStrings.AllFiles
+        filename = QtGui.QFileDialog.getOpenFileName(self, title,
+            os.path.dirname(SettingsManager.get_last_dir(
+            self.plugin.settingsSection, 1)), filters)
+        if filename:
+            editbox.setText(filename)
+            SettingsManager.set_last_dir(self.plugin.settingsSection,
+                filename, 1)

openlp/core/utils/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,7 +24,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-The :mod:`utils` module provides the utility libraries for OpenLP
+The :mod:`openlp.core.utils` module provides the utility libraries for OpenLP.
 """
 import logging
 import os
@@ -35,6 +35,7 @@ import urllib2
 from datetime import datetime
 
 from PyQt4 import QtGui, QtCore
+
 if sys.platform != u'win32' and sys.platform != u'darwin':
     try:
         from xdg import BaseDirectory
@@ -134,7 +135,7 @@ class AppLocation(object):
         elif dir_type == AppLocation.LanguageDir:
             app_path = _get_frozen_path(
                 os.path.abspath(os.path.split(sys.argv[0])[0]),
-                os.path.split(openlp.__file__)[0])
+                _get_os_dir_path(dir_type))
             return os.path.join(app_path, u'i18n')
         else:
             return _get_os_dir_path(dir_type)
@@ -164,24 +165,40 @@ def _get_os_dir_path(dir_type):
     """
     Return a path based on which OS and environment we are running in.
     """
+    encoding = sys.getfilesystemencoding()
     if sys.platform == u'win32':
-        return os.path.join(os.getenv(u'APPDATA'), u'openlp')
+        if dir_type == AppLocation.DataDir:
+            return os.path.join(unicode(os.getenv(u'APPDATA'), encoding),
+                u'openlp', u'data')
+        elif dir_type == AppLocation.LanguageDir:
+            return os.path.split(openlp.__file__)[0]
+        return os.path.join(unicode(os.getenv(u'APPDATA'), encoding),
+            u'openlp')
     elif sys.platform == u'darwin':
         if dir_type == AppLocation.DataDir:
-            return os.path.join(os.getenv(u'HOME'), u'Library',
+            return os.path.join(unicode(os.getenv(u'HOME'), encoding),
-                u'Application Support', u'openlp', u'Data')
+                u'Library', u'Application Support', u'openlp', u'Data')
-        return os.path.join(os.getenv(u'HOME'), u'Library',
+        elif dir_type == AppLocation.LanguageDir:
-            u'Application Support', u'openlp')
+            return os.path.split(openlp.__file__)[0]
+        return os.path.join(unicode(os.getenv(u'HOME'), encoding),
+            u'Library', u'Application Support', u'openlp')
     else:
+        if dir_type == AppLocation.LanguageDir:
+            return os.path.join(u'/usr', u'share', u'openlp')
         if XDG_BASE_AVAILABLE:
             if dir_type == AppLocation.ConfigDir:
-                return os.path.join(BaseDirectory.xdg_config_home, u'openlp')
+                return os.path.join(unicode(BaseDirectory.xdg_config_home,
+                    encoding), u'openlp')
             elif dir_type == AppLocation.DataDir:
-                return os.path.join(BaseDirectory.xdg_data_home, u'openlp')
+                return os.path.join(
+                    unicode(BaseDirectory.xdg_data_home, encoding), u'openlp')
             elif dir_type == AppLocation.CacheDir:
-                return os.path.join(BaseDirectory.xdg_cache_home, u'openlp')
+                return os.path.join(unicode(BaseDirectory.xdg_cache_home,
-        else:
+                    encoding), u'openlp')
-            return os.path.join(os.getenv(u'HOME'), u'.openlp')
+        if dir_type == AppLocation.DataDir:
+            return os.path.join(unicode(os.getenv(u'HOME'), encoding),
+                u'.openlp', u'data')
+        return os.path.join(unicode(os.getenv(u'HOME'), encoding), u'.openlp')
 
 def _get_frozen_path(frozen_option, non_frozen_option):
     """
@@ -189,8 +206,7 @@ def _get_frozen_path(frozen_option, non_frozen_option):
     """
     if hasattr(sys, u'frozen') and sys.frozen == 1:
         return frozen_option
-    else:
+    return non_frozen_option
-        return non_frozen_option
 
 def check_latest_version(current_version):
     """
@@ -233,7 +249,7 @@ def add_actions(target, actions):
         The menu or toolbar to add actions to.
 
     ``actions``
-        The actions to be added.  An action consisting of the keyword 'None'
+        The actions to be added. An action consisting of the keyword 'None'
         will result in a separator being inserted into the target.
     """
     for action in actions:
@@ -309,7 +325,7 @@ def get_web_page(url, header=None, update_openlp=False):
         Tells OpenLP to update itself if the page is successfully downloaded.
         Defaults to False.
     """
-    # TODO: Add proxy usage.  Get proxy info from OpenLP settings, add to a
+    # TODO: Add proxy usage. Get proxy info from OpenLP settings, add to a
     # proxy_handler, build into an opener and install the opener into urllib2.
     # http://docs.python.org/library/urllib2.html
     if not url:
@@ -328,6 +344,7 @@ def get_web_page(url, header=None, update_openlp=False):
         return None
     if update_openlp:
         Receiver.send_message(u'openlp_process_events')
+    log.debug(page)
     return page
 
 def file_is_unicode(filename):
@@ -373,13 +390,13 @@ def get_uno_command():
     """
     Returns the UNO command to launch an openoffice.org instance.
     """
+    COMMAND = u'soffice'
+    OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard'
     if UNO_CONNECTION_TYPE == u'pipe':
-        return u'openoffice.org -nologo -norestore -minimized -invisible ' \
+        CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
-            + u'-nofirststartwizard -accept=pipe,name=openlp_pipe;urp;'
     else:
-        return u'openoffice.org -nologo -norestore -minimized ' \
+        CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"'
-            + u'-invisible -nofirststartwizard ' \
+    return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)
-            + u'-accept=socket,host=localhost,port=2002;urp;'
 
 def get_uno_instance(resolver):
     """

openlp/core/utils/actions.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/utils/languagemanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -63,6 +63,8 @@ class LanguageManager(object):
         """
         Find all available language files in this OpenLP install
         """
+        log.debug(u'Translation files: %s', AppLocation.get_directory(
+            AppLocation.LanguageDir))
         trans_dir = QtCore.QDir(AppLocation.get_directory(
             AppLocation.LanguageDir))
         file_names = trans_dir.entryList(QtCore.QStringList(u'*.qm'),
@@ -100,27 +102,37 @@ class LanguageManager(object):
         return language
 
     @staticmethod
-    def set_language(action):
+    def set_language(action, message=True):
         """
         Set the language to translate OpenLP into
 
         ``action``
             The language menu option
+
+        ``message``
+            Display the message option
         """
         language = u'en'
         if action:
-            action_name = u'%s' % action.objectName()
+            action_name = unicode(action.objectName())
-            qm_list = LanguageManager.get_qm_list()
+            if action_name == u'AutoLanguageItem':
-            language = u'%s' % qm_list[action_name]
+                LanguageManager.auto_language = True
+            else:
+                LanguageManager.auto_language = False
+                qm_list = LanguageManager.get_qm_list()
+                language = unicode(qm_list[action_name])
         if LanguageManager.auto_language:
             language = u'[%s]' % language
-        QtCore.QSettings().setValue(
+        # This needs to be here for the setValue to work
+        settings = QtCore.QSettings(u'OpenLP', u'OpenLP')
+        settings.setValue(
             u'general/language', QtCore.QVariant(language))
         log.info(u'Language file: \'%s\' written to conf file' % language)
-        QtGui.QMessageBox.information(None,
+        if message:
-            translate('OpenLP.LanguageManager', 'Language'),
+            QtGui.QMessageBox.information(None,
-            translate('OpenLP.LanguageManager',
+                translate('OpenLP.LanguageManager', 'Language'),
-                'Please restart OpenLP to use your new language setting.'))
+                translate('OpenLP.LanguageManager',
+                    'Please restart OpenLP to use your new language setting.'))
 
     @staticmethod
     def init_qm_list():

openlp/plugins/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,4 +25,4 @@
 ###############################################################################
 """
 The :mod:`plugins` module provides all the project produced plugins
-"""
+"""

openlp/plugins/alerts/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -26,4 +26,4 @@
 """
 The :mod:`alerts` module provides the Alerts plugin for producing impromptu
 on-screen announcements during a service.
-"""
+"""

openlp/plugins/alerts/alertsplugin.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -40,21 +40,14 @@ class AlertsPlugin(Plugin):
     log.info(u'Alerts Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Alerts', u'1.9.4', plugin_helpers)
+        Plugin.__init__(self, u'Alerts', plugin_helpers,
+            settingsTabClass=AlertsTab)
         self.weight = -3
         self.icon = build_icon(u':/plugins/plugin_alerts.png')
         self.alertsmanager = AlertsManager(self)
         self.manager = Manager(u'alerts', init_schema)
-        self.visible_name = self.getString(StringContent.VisibleName)
         self.alertForm = AlertForm(self)
 
-    def getSettingsTab(self):
-        """
-        Return the settings tab for the Alerts plugin
-        """
-        self.alertsTab = AlertsTab(self, self.visible_name[u'title'])
-        return self.alertsTab
-
     def addToolsMenuItem(self, tools_menu):
         """
         Give the alerts plugin the opportunity to add items to the
@@ -81,7 +74,7 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
-        self.liveController.alertTab = self.alertsTab
+        self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
         """

openlp/plugins/alerts/forms/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -24,4 +24,4 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from alertform import AlertForm
+from alertform import AlertForm

openlp/plugins/alerts/forms/alertdialog.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/plugins/alerts/forms/alertform.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -163,7 +163,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         # We found '<>' in the alert text, but the ParameterEdit field is empty.
         if text.find(u'<>') != -1 and not self.parameterEdit.text() and \
             QtGui.QMessageBox.question(self,
-            translate('AlertPlugin.AlertForm', 'No Parameter found'),
+            translate('AlertPlugin.AlertForm', 'No Parameter Found'),
             translate('AlertPlugin.AlertForm', 'You have not entered a '
             'parameter to be replaced.\nDo you want to continue anyway?'),
             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
@@ -174,9 +174,9 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         # in the alert text.
         elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
             QtGui.QMessageBox.question(self,
-            translate('AlertPlugin.AlertForm', 'No Placeholder found'),
+            translate('AlertPlugin.AlertForm', 'No Placeholder Found'),
             translate('AlertPlugin.AlertForm', 'The alert text does not'
-            ' contain \'<>\'.\nDo want to continue anyway?'),
+            ' contain \'<>\'.\nDo you want to continue anyway?'),
             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
             QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
             self.parameterEdit.setFocus()

openlp/plugins/alerts/lib/__init__.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -25,4 +25,4 @@
 ###############################################################################
 
 from alertsmanager import AlertsManager
-from alertstab import AlertsTab
+from alertstab import AlertsTab

openlp/plugins/alerts/lib/alertsmanager.py

@@ -6,9 +6,9 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2011 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat,  #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon  #
-# Carsten Tinggaard, Frode Woldsund                                           #
+# Tibble, Carsten Tinggaard, Frode Woldsund                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
@@ -84,7 +84,7 @@ class AlertsManager(QtCore.QObject):
         if len(self.alertList) == 0:
             return
         text = self.alertList.pop(0)
-        alertTab = self.parent.alertsTab
+        alertTab = self.parent.settings_tab
         self.parent.liveController.display.alert(text)
         # Check to see if we have a timer running.
         if self.timer_id == 0:
@@ -103,4 +103,4 @@ class AlertsManager(QtCore.QObject):
             self.parent.liveController.display.alert(u'')
         self.killTimer(self.timer_id)
         self.timer_id = 0
-        self.generateAlert()
+        self.generateAlert()