r1963

documentation/openlp.1

@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
+.TH OPENLP "1" "May 2012" "OpenLP 1.9.9" "User Commands"
+.SH NAME
+OpenLP \- Church worship presentation software
+.SH SYNOPSIS
+.B openlp
+[\fIoptions\fR] [\fIqt-options\fR]
+.SH OPTIONS
+.TP
+\fB\-\-version\fR
+show program's version number and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-e\fR, \fB\-\-no\-error\-form\fR
+Disable the error notification form.
+.TP
+\fB\-l\fR LEVEL, \fB\-\-log\-level\fR=\fILEVEL\fR
+Set logging to LEVEL level. Valid values are "debug",
+"info", "warning".
+.TP
+\fB\-p\fR, \fB\-\-portable\fR
+Specify if this should be run as a portable app, off a
+USB flash drive (not implemented).
+.TP
+\fB\-d\fR, \fB\-\-dev\-version\fR
+Ignore the version file and pull the version directly
+from Bazaar
+.TP
+\fB\-s\fR STYLE, \fB\-\-style\fR=\fISTYLE\fR
+Set the Qt4 style (passed directly to Qt4).
+.TP
+\fB\-\-testing\fR
+Run by testing framework
+.SH "SEE ALSO"
+The full documentation for
+.B OpenLP
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B OpenLP
+programs are properly installed at your site, the command
+.IP
+.B info OpenLP
+.PP
+should give you access to the complete manual.

openlp/core/lib/formattingtags.py

@@ -47,7 +47,6 @@ class FormattingTags(object):
         Provide access to the html_expands list.
         """
         # Load user defined tags otherwise user defined tags are not present.
-        FormattingTags.load_tags()
         return FormattingTags.html_expands
 
     @staticmethod

openlp/core/lib/mediamanageritem.py

@@ -373,12 +373,12 @@ class MediaManagerItem(QtGui.QWidget):
         Process a list for files either from the File Dialog or from Drag and
         Drop
 
-         ``files``
-         The files to be loaded
+        ``files``
+            The files to be loaded.
         """
         names = []
         fullList = []
-        for count in range(0, self.listView.count()):
+        for count in range(self.listView.count()):
             names.append(unicode(self.listView.item(count).text()))
             fullList.append(unicode(self.listView.item(count).
                 data(QtCore.Qt.UserRole).toString()))

openlp/core/lib/renderer.py

@@ -131,7 +131,6 @@ class Renderer(object):
 
         ``override_levels``
             Used to force the theme data passed in to be used.
-
         """
         log.debug(u'set override theme to %s', override_theme)
         theme_level = self.theme_level
@@ -500,12 +499,15 @@ class Renderer(object):
         raw_tags.sort(key=lambda tag: tag[0])
         html_tags.sort(key=lambda tag: tag[0])
         # Create a list with closing tags for the raw_text.
-        end_tags = [tag[2] for tag in raw_tags]
+        end_tags = []
+        start_tags = []
+        for tag in raw_tags:
+            start_tags.append(tag[1])
+            end_tags.append(tag[2])
         end_tags.reverse()
         # Remove the indexes.
-        raw_tags = [tag[1] for tag in raw_tags]
         html_tags = [tag[1] for tag in html_tags]
-        return raw_text + u''.join(end_tags),  u''.join(raw_tags), \
+        return raw_text + u''.join(end_tags),  u''.join(start_tags), \
             u''.join(html_tags)
 
     def _binary_chop(self, formatted, previous_html, previous_raw, html_list,

openlp/core/lib/serviceitem.py

@@ -195,8 +195,7 @@ class ServiceItem(object):
         # avoid tracebacks.
         if self.raw_footer is None:
             self.raw_footer = []
-        self.foot_text = \
-            u'<br>'.join([footer for footer in self.raw_footer if footer])
+        self.foot_text = u'<br>'.join(filter(None, self.raw_footer))
 
     def add_from_image(self, path, title, background=None):
         """

openlp/core/theme/theme.py

@@ -209,7 +209,7 @@ class Theme(object):
                             val = int(element_text[1:], 16)
                         except ValueError: # nope
                             pass
-                    elif DELPHI_COLORS.has_key(element_text):
+                    elif element_text in DELPHI_COLORS:
                         val = DELPHI_COLORS[element_text]
                         delphi_color_change = True
                     else:

openlp/core/ui/formattingtagform.py

@@ -164,12 +164,13 @@ class FormattingTagForm(QtGui.QDialog, Ui_FormattingTagDialog):
         """
         Reset List for loading.
         """
+        FormattingTags.load_tags()
         self.tagTableWidget.clearContents()
         self.tagTableWidget.setRowCount(0)
         self.newPushButton.setEnabled(True)
         self.savePushButton.setEnabled(False)
         self.deletePushButton.setEnabled(False)
-        for linenumber, html in enumerate(FormattingTags.html_expands):
+        for linenumber, html in enumerate(FormattingTags.get_html_tags()):
             self.tagTableWidget.setRowCount(self.tagTableWidget.rowCount() + 1)
             self.tagTableWidget.setItem(linenumber, 0,
                 QtGui.QTableWidgetItem(html[u'desc']))

openlp/core/ui/mainwindow.py

@@ -730,7 +730,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         if self.liveController.display.isVisible():
             self.liveController.display.setFocus()
         self.activateWindow()
-        if len(self.arguments):
+        if self.arguments:
             args = []
             for a in self.arguments:
                 args.extend([a])

openlp/core/ui/media/__init__.py

@@ -69,12 +69,13 @@ class MediaInfo(object):
 def get_media_players():
     """
     This method extract the configured media players and overridden player from
-    the settings
+    the settings.
 
     ``players_list``
-        this is a python list with all active media players
+       A list with all active media players.
+
     ``overridden_player``
-        here an special media player is choosen for all media actions
+        Here an special media player is chosen for all media actions.
     """
     log.debug(u'get_media_players')
     players = unicode(QtCore.QSettings().value(u'media/players').toString())
@@ -92,15 +93,17 @@ def get_media_players():
     players_list = players.replace(u'[', u'').replace(u']', u'').split(u',')
     return players_list, overridden_player
 
+
 def set_media_players(players_list, overridden_player=u'auto'):
     """
     This method saves the configured media players and overridden player to the
     settings
 
     ``players_list``
-        this is a python list with all active media players
+        A list with all active media players.
+
     ``overridden_player``
-        here an special media player is choosen for all media actions
+        Here an special media player is chosen for all media actions.
     """
     log.debug(u'set_media_players')
     players = u','.join(players_list)

openlp/core/ui/media/mediacontroller.py

@@ -84,10 +84,7 @@ class MediaController(object):
     def set_active_players(self):
         savedPlayers = get_media_players()[0]
         for player in self.mediaPlayers.keys():
-            if player in savedPlayers:
-                self.mediaPlayers[player].isActive = True
-            else:
-                self.mediaPlayers[player].isActive = False
+            self.mediaPlayers[player].isActive = player in savedPlayers
 
     def register_controllers(self, controller):
         """
@@ -106,8 +103,8 @@ class MediaController(object):
             AppLocation.get_directory(AppLocation.AppDir),
             u'core', u'ui', u'media')
         for filename in os.listdir(controller_dir):
-            if filename.endswith(u'player.py') and \
-                not filename == 'media_player.py':
+            if filename.endswith(u'player.py') and not \
+                filename == 'media_player.py':
                 path = os.path.join(controller_dir, filename)
                 if os.path.isfile(path):
                     modulename = u'openlp.core.ui.media.' + \
@@ -122,38 +119,36 @@ class MediaController(object):
         for controller_class in controller_classes:
             controller = controller_class(self)
             self.register_controllers(controller)
-        if self.mediaPlayers:
-            savedPlayers, overriddenPlayer = get_media_players()
-            invalidMediaPlayers = [mediaPlayer for mediaPlayer in savedPlayers \
-                if not mediaPlayer in self.mediaPlayers or \
-                not self.mediaPlayers[mediaPlayer].check_available()]
-            if len(invalidMediaPlayers) > 0:
-                for invalidPlayer in invalidMediaPlayers:
-                    savedPlayers.remove(invalidPlayer)
-                set_media_players(savedPlayers, overriddenPlayer)
-            self.set_active_players()
-            return True
-        else:
+        if not self.mediaPlayers:
             return False
+        savedPlayers, overriddenPlayer = get_media_players()
+        invalidMediaPlayers = [mediaPlayer for mediaPlayer in savedPlayers
+            if not mediaPlayer in self.mediaPlayers or not
+            self.mediaPlayers[mediaPlayer].check_available()]
+        if invalidMediaPlayers:
+            for invalidPlayer in invalidMediaPlayers:
+                savedPlayers.remove(invalidPlayer)
+            set_media_players(savedPlayers, overriddenPlayer)
+        self.set_active_players()
+        return True
 
     def video_state(self):
         """
         Check if there is a running media Player and do updating stuff (e.g.
         update the UI)
         """
-        if len(self.curDisplayMediaPlayer.keys()) == 0:
+        if not self.curDisplayMediaPlayer.keys():
             self.timer.stop()
         else:
             for display in self.curDisplayMediaPlayer.keys():
                 self.curDisplayMediaPlayer[display].resize(display)
                 self.curDisplayMediaPlayer[display].update_ui(display)
-                if self.curDisplayMediaPlayer[display] \
-                    .state == MediaState.Playing:
+                if self.curDisplayMediaPlayer[display].state == \
+                    MediaState.Playing:
                     return
         # no players are active anymore
         for display in self.curDisplayMediaPlayer.keys():
-            if self.curDisplayMediaPlayer[display] \
-                .state != MediaState.Paused:
+            if self.curDisplayMediaPlayer[display].state != MediaState.Paused:
                 display.controller.seekSlider.setSliderPosition(0)
         self.timer.stop()
 
@@ -333,8 +328,7 @@ class MediaController(object):
                 'Unsupported File')))
             return False
         # dont care about actual theme, set a black background
-        if controller.isLive and ( \
-            controller.media_info.is_background == False):
+        if controller.isLive and not controller.media_info.is_background:
             display.frame.evaluateJavaScript(u'show_video( \
             "setBackBoard", null, null, null,"visible");')
         # now start playing
@@ -395,7 +389,7 @@ class MediaController(object):
         """
         Responds to the request to play a loaded video
 
-         ``msg``
+        ``msg``
             First element is the controller which should be used
         """
         log.debug(u'video_play')
@@ -497,15 +491,15 @@ class MediaController(object):
             First element is the boolean for Live indication
         """
         isLive = msg[1]
-        if isLive:
-            controller = self.parent.liveController
-            for display in self.curDisplayMediaPlayer.keys():
-                if display.controller == controller:
-                    if self.curDisplayMediaPlayer[display] \
-                        .state == MediaState.Playing:
-                        self.curDisplayMediaPlayer[display].pause(display)
-                        self.curDisplayMediaPlayer[display] \
-                            .set_visible(display, False)
+        if not isLive:
+            return
+        controller = self.parent.liveController
+        for display in self.curDisplayMediaPlayer.keys():
+            if display.controller != controller or  \
+                self.curDisplayMediaPlayer[display].state != MediaState.Playing:
+                continue
+            self.curDisplayMediaPlayer[display].pause(display)
+            self.curDisplayMediaPlayer[display].set_visible(display, False)
 
     def video_blank(self, msg):
         """
@@ -517,16 +511,16 @@ class MediaController(object):
         """
         isLive = msg[1]
         hide_mode = msg[2]
-        if isLive:
-            Receiver.send_message(u'live_display_hide', hide_mode)
-            controller = self.parent.liveController
-            for display in self.curDisplayMediaPlayer.keys():
-                if display.controller == controller:
-                    if self.curDisplayMediaPlayer[display] \
-                        .state == MediaState.Playing:
-                        self.curDisplayMediaPlayer[display].pause(display)
-                        self.curDisplayMediaPlayer[display] \
-                            .set_visible(display, False)
+        if not isLive:
+            return
+        Receiver.send_message(u'live_display_hide', hide_mode)
+        controller = self.parent.liveController
+        for display in self.curDisplayMediaPlayer.keys():
+            if display.controller != controller or \
+                self.curDisplayMediaPlayer[display].state != MediaState.Playing:
+                continue
+            self.curDisplayMediaPlayer[display].pause(display)
+            self.curDisplayMediaPlayer[display].set_visible(display, False)
 
     def video_unblank(self, msg):
         """
@@ -538,19 +532,18 @@ class MediaController(object):
         """
         Receiver.send_message(u'live_display_show')
         isLive = msg[1]
-        if isLive:
-            controller = self.parent.liveController
-            for display in self.curDisplayMediaPlayer.keys():
-                if display.controller == controller:
-                    if self.curDisplayMediaPlayer[display] \
-                        .state == MediaState.Paused:
-                        if self.curDisplayMediaPlayer[display].play(display):
-                            self.curDisplayMediaPlayer[display] \
-                                .set_visible(display, True)
-                                    # Start Timer for ui updates
-                            if not self.timer.isActive():
-                                self.timer.start()
-
+        if not isLive:
+            return
+        controller = self.parent.liveController
+        for display in self.curDisplayMediaPlayer.keys():
+            if display.controller != controller or \
+                self.curDisplayMediaPlayer[display].state != MediaState.Paused:
+                continue
+            if self.curDisplayMediaPlayer[display].play(display):
+                self.curDisplayMediaPlayer[display].set_visible(display, True)
+                # Start Timer for ui updates
+                if not self.timer.isActive():
+                    self.timer.start()
 
     def get_audio_extensions_list(self):
         audio_list = []
@@ -565,9 +558,8 @@ class MediaController(object):
         video_list = []
         for player in self.mediaPlayers.values():
             if player.isActive:
-                for item in player.video_extensions_list:
-                    if not item in video_list:
-                        video_list.append(item)
+                video_list.extend([item for item in player.video_extensions_list
+                    if item not in video_list])
         return video_list
 
     def finalise(self):

openlp/core/ui/media/vlc.py

@@ -2,25 +2,26 @@
 
 # Python ctypes bindings for VLC
 #
-# Copyright (C) 2009-2010 the VideoLAN team
+# Copyright (C) 2009-2012 the VideoLAN team
 # $Id: $
 #
 # Authors: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
 #          Jean Brouwers <MrJean1 at gmail.com>
+#          Geoff Salmon <geoff.salmon at gmail.com>
 #
-# 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; either version 2 of the License, or
-# (at your option) any later version.
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
 #
-# 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.
+# This library 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
+# Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
 
 """This module provides bindings for the LibVLC public API, see
 U{http://wiki.videolan.org/LibVLC}.
@@ -47,7 +48,7 @@ import sys
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Tue Jan 17 12:20:48 2012"
+build_date  = "Fri Apr 27 16:47:21 2012"
 
 # Internal guard to prevent internal classes to be directly
 # instanciated.
@@ -126,7 +127,7 @@ class VLCException(Exception):
 try:
     _Ints = (int, long)
 except NameError:  # no long in Python 3+
-    _Ints = int
+    _Ints =  int
 _Seqs = (list, tuple)
 
 # Default instance. It is used to instanciate classes directly in the
@@ -904,6 +905,11 @@ class Instance(_Ctype):
     def media_new(self, mrl, *options):
         """Create a new Media instance.
 
+        If mrl contains a colon (:), it will be treated as a
+        URL. Else, it will be considered as a local path. If you need
+        more control, directly use media_new_location/media_new_path
+        methods.
+
         Options can be specified as supplementary string parameters, e.g.
 
         C{m = i.media_new('foo.avi', 'sub-filter=marq{marquee=Hello}', 'vout-filter=invert')}
@@ -914,7 +920,12 @@ class Instance(_Ctype):
 
         @param options: optional media option=value strings
         """
-        m = libvlc_media_new_location(self, mrl)
+        if ':' in mrl:
+            # Assume it is a URL
+            m = libvlc_media_new_location(self, mrl)
+        else:
+            # Else it should be a local path.
+            m = libvlc_media_new_path(self, mrl)
         for o in options:
             libvlc_media_add_option(m, o)
         m._instance = self
@@ -1511,7 +1522,7 @@ class Media(_Ctype):
 
     def save_meta(self):
         '''Save the meta previously set.
-        @return: true if the write operation was successfull.
+        @return: true if the write operation was successful.
         '''
         return libvlc_media_save_meta(self)
 
@@ -2230,7 +2241,7 @@ class MediaPlayer(_Ctype):
         @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32").
         @param rate: sample rate (expressed in Hz).
         @param channels: channels count.
-        @version: LibVLC 1.2.0 or later.
+        @version: LibVLC 2.0.0 or later.
         '''
         return libvlc_audio_set_format(self, format, rate, channels)
 
@@ -2378,7 +2389,7 @@ class MediaPlayer(_Ctype):
     def navigate(self, navigate):
         '''Navigate through DVD Menu.
         @param navigate: the Navigation mode.
-        @version: libVLC 1.2.0 or later.
+        @version: libVLC 2.0.0 or later.
         '''
         return libvlc_media_player_navigate(self, navigate)
 
@@ -2489,7 +2500,7 @@ class MediaPlayer(_Ctype):
         '''Get the current subtitle delay. Positive values means subtitles are being
         displayed later, negative values earlier.
         @return: time (in microseconds) the display of subtitles is being delayed.
-        @version: LibVLC 1.2.0 or later.
+        @version: LibVLC 2.0.0 or later.
         '''
         return libvlc_video_get_spu_delay(self)
 
@@ -2500,7 +2511,7 @@ class MediaPlayer(_Ctype):
         The subtitle delay will be reset to zero each time the media changes.
         @param i_delay: time (in microseconds) the display of subtitles should be delayed.
         @return: 0 on success, -1 on error.
-        @version: LibVLC 1.2.0 or later.
+        @version: LibVLC 2.0.0 or later.
         '''
         return libvlc_video_set_spu_delay(self, i_delay)
 
@@ -3247,7 +3258,7 @@ def libvlc_media_set_meta(p_md, e_meta, psz_value):
 def libvlc_media_save_meta(p_md):
     '''Save the meta previously set.
     @param p_md: the media desriptor.
-    @return: true if the write operation was successfull.
+    @return: true if the write operation was successful.
     '''
     f = _Cfunctions.get('libvlc_media_save_meta', None) or \
         _Cfunction('libvlc_media_save_meta', ((1,),), None,
@@ -4084,7 +4095,7 @@ def libvlc_audio_set_format(mp, format, rate, channels):
     @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32").
     @param rate: sample rate (expressed in Hz).
     @param channels: channels count.
-    @version: LibVLC 1.2.0 or later.
+    @version: LibVLC 2.0.0 or later.
     '''
     f = _Cfunctions.get('libvlc_audio_set_format', None) or \
         _Cfunction('libvlc_audio_set_format', ((1,), (1,), (1,), (1,),), None,
@@ -4328,7 +4339,7 @@ def libvlc_media_player_navigate(p_mi, navigate):
     '''Navigate through DVD Menu.
     @param p_mi: the Media Player.
     @param navigate: the Navigation mode.
-    @version: libVLC 1.2.0 or later.
+    @version: libVLC 2.0.0 or later.
     '''
     f = _Cfunctions.get('libvlc_media_player_navigate', None) or \
         _Cfunction('libvlc_media_player_navigate', ((1,), (1,),), None,
@@ -4554,7 +4565,7 @@ def libvlc_video_get_spu_delay(p_mi):
     displayed later, negative values earlier.
     @param p_mi: media player.
     @return: time (in microseconds) the display of subtitles is being delayed.
-    @version: LibVLC 1.2.0 or later.
+    @version: LibVLC 2.0.0 or later.
     '''
     f = _Cfunctions.get('libvlc_video_get_spu_delay', None) or \
         _Cfunction('libvlc_video_get_spu_delay', ((1,),), None,
@@ -4569,7 +4580,7 @@ def libvlc_video_set_spu_delay(p_mi, i_delay):
     @param p_mi: media player.
     @param i_delay: time (in microseconds) the display of subtitles should be delayed.
     @return: 0 on success, -1 on error.
-    @version: LibVLC 1.2.0 or later.
+    @version: LibVLC 2.0.0 or later.
     '''
     f = _Cfunctions.get('libvlc_video_set_spu_delay', None) or \
         _Cfunction('libvlc_video_set_spu_delay', ((1,), (1,),), None,

openlp/core/ui/media/vlcplayer.py

@@ -25,30 +25,42 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import logging
-import sys, os
 from datetime import datetime
-try:
-    import vlc
-    vlc_available = bool(vlc.get_default_instance())
-except (ImportError, NameError):
-    vlc_available = False
-except OSError, e:
-    if sys.platform.startswith('win'):
-        if isinstance(e, WindowsError) and e.winerror == 126:
-            vlc_available = False
-        else:
-            raise
-    else:
-        raise
+from distutils.version import LooseVersion
+import logging
+import os
+import sys
 
 from PyQt4 import QtCore, QtGui
+
 from openlp.core.lib import Receiver
 from openlp.core.lib.mediaplayer import MediaPlayer
 from openlp.core.ui.media import MediaState
 
 log = logging.getLogger(__name__)
 
+VLC_AVAILABLE = False
+try:
+    import vlc
+    VLC_AVAILABLE = bool(vlc.get_default_instance())
+except (ImportError, NameError):
+    pass
+except OSError, e:
+    if sys.platform.startswith('win'):
+        if not isinstance(e, WindowsError) and e.winerror != 126:
+            raise
+    else:
+        raise
+
+if VLC_AVAILABLE:
+    try:
+        version = vlc.libvlc_get_version()
+    except:
+        version = u'0.0.0'
+    if LooseVersion(version) < LooseVersion('1.1.0'):
+        VLC_AVAILABLE = False
+        log.debug(u'VLC could not be loaded: %s' % version)
+
 AUDIO_EXT = [
       u'*.mp3'
     , u'*.wav'
@@ -128,7 +140,7 @@ class VlcPlayer(MediaPlayer):
         self.hasOwnWidget = True
 
     def check_available(self):
-        return vlc_available
+        return VLC_AVAILABLE
 
     def load(self, display):
         log.debug(u'load vid in Vlc Controller')

openlp/core/ui/mediadockmanager.py

@@ -64,7 +64,7 @@ class MediaDockManager(object):
         visible_title = media_item.plugin.getString(StringContent.VisibleName)
         log.debug(u'Inserting %s dock' % visible_title[u'title'])
         match = False
-        for dock_index in range(0, self.media_dock.count()):
+        for dock_index in range(self.media_dock.count()):
             if self.media_dock.widget(dock_index).settingsSection == \
                 media_item.plugin.name:
                 match = True
@@ -81,7 +81,7 @@ class MediaDockManager(object):
         """
         visible_title = media_item.plugin.getString(StringContent.VisibleName)
         log.debug(u'remove %s dock' % visible_title[u'title'])
-        for dock_index in range(0, self.media_dock.count()):
+        for dock_index in range(self.media_dock.count()):
             if self.media_dock.widget(dock_index):
                 if self.media_dock.widget(dock_index).settingsSection == \
                     media_item.plugin.name:

openlp/core/ui/screen.py

@@ -106,13 +106,13 @@ class ScreenList(object):
         """
         # Do not log at start up.
         if changed_screen != -1:
-            log.info(u'screen_count_changed %d' % self.desktop.numScreens())
+            log.info(u'screen_count_changed %d' % self.desktop.screenCount())
         # Remove unplugged screens.
         for screen in copy.deepcopy(self.screen_list):
-            if screen[u'number'] == self.desktop.numScreens():
+            if screen[u'number'] == self.desktop.screenCount():
                 self.remove_screen(screen[u'number'])
         # Add new screens.
-        for number in xrange(0, self.desktop.numScreens()):
+        for number in xrange(self.desktop.screenCount()):
             if not self.screen_exists(number):
                 self.add_screen({
                     u'number': number,

openlp/core/ui/servicemanager.py

@@ -483,7 +483,7 @@ class ServiceManager(QtGui.QWidget):
             service_item = item[u'service_item'].get_service_repr()
             # Get all the audio files, and ready them for embedding in the
             # service file.
-            if len(service_item[u'header'][u'background_audio']) > 0:
+            if service_item[u'header'][u'background_audio']:
                 for i, filename in \
                     enumerate(service_item[u'header'][u'background_audio']):
                     new_file = os.path.join(u'audio',
@@ -822,7 +822,7 @@ class ServiceManager(QtGui.QWidget):
         """
         Called by the SlideController to select the next service item.
         """
-        if len(self.serviceManagerList.selectedItems()) == 0:
+        if not self.serviceManagerList.selectedItems():
             return
         selected = self.serviceManagerList.selectedItems()[0]
         lookFor = 0
@@ -840,7 +840,7 @@ class ServiceManager(QtGui.QWidget):
         """
         Called by the SlideController to select the previous service item.
         """
-        if len(self.serviceManagerList.selectedItems()) == 0:
+        if not self.serviceManagerList.selectedItems():
             return
         selected = self.serviceManagerList.selectedItems()[0]
         prevItem = None

openlp/core/ui/settingsform.py

@@ -92,7 +92,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         """
         Process the form saving the settings
         """
-        for tabIndex in range(0, self.stackedLayout.count()):
+        for tabIndex in range(self.stackedLayout.count()):
             self.stackedLayout.widget(tabIndex).save()
         # Must go after all settings are save
         Receiver.send_message(u'config_updated')
@@ -102,7 +102,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         """
         Process the form saving the settings
         """
-        for tabIndex in range(0, self.stackedLayout.count()):
+        for tabIndex in range(self.stackedLayout.count()):
             self.stackedLayout.widget(tabIndex).cancel()
         return QtGui.QDialog.reject(self)
 

openlp/core/ui/shortcutlistform.py

@@ -151,7 +151,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             if action is None:
                 continue
             shortcuts = self._actionShortcuts(action)
-            if len(shortcuts) == 0:
+            if not shortcuts:
                 item.setText(1, u'')
                 item.setText(2, u'')
             elif len(shortcuts) == 1:
@@ -195,7 +195,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         shortcuts = self._actionShortcuts(action)
         new_shortcuts = []
-        if len(shortcuts) != 0:
+        if shortcuts:
             new_shortcuts.append(shortcuts[0])
         new_shortcuts.append(
             QtGui.QKeySequence(self.alternatePushButton.text()))
@@ -241,7 +241,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.primaryPushButton.setChecked(False)
             self.alternatePushButton.setChecked(False)
         else:
-            if len(action.defaultShortcuts) != 0:
+            if action.defaultShortcuts:
                 primary_label_text = action.defaultShortcuts[0].toString()
                 if len(action.defaultShortcuts) == 2:
                     alternate_label_text = action.defaultShortcuts[1].toString()
@@ -313,7 +313,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.refreshShortcutList()
         primary_button_text = u''
         alternate_button_text = u''
-        if len(temp_shortcuts) != 0:
+        if temp_shortcuts:
             primary_button_text = temp_shortcuts[0].toString()
         if len(temp_shortcuts) == 2:
             alternate_button_text = temp_shortcuts[1].toString()
@@ -363,7 +363,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         shortcuts = self._actionShortcuts(action)
         new_shortcuts = []
-        if len(action.defaultShortcuts) != 0:
+        if action.defaultShortcuts:
             new_shortcuts.append(action.defaultShortcuts[0])
             # We have to check if the primary default shortcut is available. But
             # we only have to check, if the action has a default primary
@@ -391,7 +391,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         shortcuts = self._actionShortcuts(action)
         new_shortcuts = []
-        if len(shortcuts) != 0:
+        if shortcuts:
             new_shortcuts.append(shortcuts[0])
         if len(action.defaultShortcuts) == 2:
             new_shortcuts.append(action.defaultShortcuts[1])

openlp/core/ui/slidecontroller.py

@@ -373,7 +373,7 @@ class SlideController(Controller):
                 u'text': translate('OpenLP.SlideController', 'Go to "Ending"')},
                 {u'key': u'O', u'configurable': True,
                 u'text': translate('OpenLP.SlideController', 'Go to "Other"')}]
-            shortcuts += [{u'key': unicode(number)} for number in range(0, 10)]
+            shortcuts += [{u'key': unicode(number)} for number in range(10)]
             self.previewListWidget.addActions([create_action(self,
                 u'shortcutAction_%s' % s[u'key'], text=s.get(u'text'),
                 shortcuts=[QtGui.QKeySequence(s[u'key'])],
@@ -555,7 +555,7 @@ class SlideController(Controller):
         Process the service item request queue.  The key presses can arrive
         faster than the processing so implement a FIFO queue.
         """
-        if len(self.keypress_queue):
+        if self.keypress_queue:
             while len(self.keypress_queue) and not self.keypress_loop:
                 self.keypress_loop = True
                 keypressCommand = self.keypress_queue.popleft()
@@ -694,7 +694,7 @@ class SlideController(Controller):
         if item.is_text():
             if QtCore.QSettings().value(
                 self.parent().songsSettingsSection + u'/display songbar',
-                QtCore.QVariant(True)).toBool() and len(self.slideList) > 0:
+                QtCore.QVariant(True)).toBool() and self.slideList:
                 self.songMenu.show()
         if item.is_capable(ItemCapabilities.CanLoop) and \
             len(item.get_frames()) > 1:

openlp/core/ui/thememanager.py

@@ -444,7 +444,7 @@ class ThemeManager(QtGui.QWidget):
             self.firstTime()
             files = SettingsManager.get_files(self.settingsSection, u'.png')
             # No themes have been found so create one
-            if len(files) == 0:
+            if not files:
                 theme = ThemeXML()
                 theme.theme_name = UiStrings().Default
                 self._writeTheme(theme, None, None)

openlp/core/utils/__init__.py

@@ -230,7 +230,7 @@ def get_application_version():
             if code != 0:
                 raise Exception(u'Error running bzr tags')
             lines = output.splitlines()
-            if len(lines) == 0:
+            if not lines:
                 tag = u'0.0.0'
                 revision = u'0'
             else:

openlp/core/utils/actions.py

@@ -90,7 +90,7 @@ class CategoryActionList(object):
 
     def append(self, name):
         weight = 0
-        if len(self.actions) > 0:
+        if self.actions:
             weight = self.actions[-1][0] + 1
         self.add(name, weight)
 
@@ -156,7 +156,7 @@ class CategoryList(object):
 
     def append(self, name, actions=None):
         weight = 0
-        if len(self.categories) > 0:
+        if self.categories:
             weight = self.categories[-1].weight + 1
         if actions:
             self.add(name, weight, actions)

openlp/plugins/alerts/forms/alertform.py

@@ -101,7 +101,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         self.alertTextEdit.setText(u'')
 
     def onNewClick(self):
-        if len(self.alertTextEdit.text()) == 0:
+        if not self.alertTextEdit.text():
             QtGui.QMessageBox.information(self,
                 translate('AlertsPlugin.AlertForm', 'New Alert'),
                 translate('AlertsPlugin.AlertForm', 'You haven\'t specified '

openlp/plugins/bibles/bibleplugin.py

@@ -62,7 +62,7 @@ class BiblePlugin(Plugin):
         #    unicode(UiStrings().Export))
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
-        if len(self.manager.old_bible_databases):
+        if self.manager.old_bible_databases:
             self.toolsUpgradeItem.setVisible(True)
 
     def finalise(self):
@@ -83,7 +83,7 @@ class BiblePlugin(Plugin):
         """
         Perform tasks on application startup
         """
-        if len(self.manager.old_bible_databases):
+        if self.manager.old_bible_databases:
             if QtGui.QMessageBox.information(self.formParent,
                 translate('OpenLP', 'Information'), translate('OpenLP',
                 'Bible format has changed.\nYou have to upgrade your '

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -426,8 +426,7 @@ class BibleUpgradeForm(OpenLPWizard):
                 if meta[u'key'] == u'download_source':
                     web_bible = True
                     self.includeWebBible = True
-                if meta.has_key(u'proxy_server'):
-                    proxy_server = meta[u'proxy_server']
+                proxy_server = meta.get(u'proxy_server')
             if web_bible:
                 if meta_data[u'download_source'].lower() == u'crosswalk':
                     handler = CWExtract(proxy_server)
@@ -572,7 +571,7 @@ class BibleUpgradeForm(OpenLPWizard):
                             int(verse[u'verse']), unicode(verse[u'text']))
                         Receiver.send_message(u'openlp_process_events')
                     self.newbibles[number].session.commit()
-            if self.success.has_key(number) and not self.success[number]:
+            if not self.success.get(number, True):
                 self.incrementProgressBar(unicode(translate(
                     'BiblesPlugin.UpgradeWizardForm',
                     'Upgrading Bible %s of %s: "%s"\nFailed')) %
@@ -586,7 +585,7 @@ class BibleUpgradeForm(OpenLPWizard):
                     'Upgrading Bible %s of %s: "%s"\n'
                     'Complete')) %
                     (number + 1, max_bibles, name))
-            if self.newbibles.has_key(number):
+            if number in self.newbibles:
                 self.newbibles[number].session.close()
         # Close the last bible's connection if possible.
         if old_bible is not None:
@@ -599,7 +598,7 @@ class BibleUpgradeForm(OpenLPWizard):
         successful_import = 0
         failed_import = 0
         for number, filename in enumerate(self.files):
-            if self.success.has_key(number) and self.success[number]:
+            if self.success.get(number):
                 successful_import += 1
             elif self.checkBox[number].checkState() == QtCore.Qt.Checked:
                 failed_import += 1

openlp/plugins/bibles/lib/__init__.py

@@ -236,7 +236,7 @@ def get_reference_separator(separator_type):
     ``separator_type``
         The role and format of the separator.
     """
-    if len(REFERENCE_SEPARATORS) == 0:
+    if not REFERENCE_SEPARATORS:
         update_reference_separators()
     return REFERENCE_SEPARATORS[separator_type]
 
@@ -247,7 +247,7 @@ def get_reference_match(match_type):
     ``match_type``
         The type of match is ``range_separator``, ``range`` or ``full``.
     """
-    if len(REFERENCE_MATCHES) == 0:
+    if not REFERENCE_MATCHES:
         update_reference_separators()
     return REFERENCE_MATCHES[match_type]
 

openlp/plugins/bibles/lib/http.py

@@ -106,7 +106,7 @@ class BGExtract(object):
         verse_list = {}
         # Cater for inconsistent mark up in the first verse of a chapter.
         first_verse = verses.find(u'versenum')
-        if first_verse and len(first_verse.contents):
+        if first_verse and first_verse.contents:
             verse_list[1] = unicode(first_verse.contents[0])
         for verse in verses(u'sup', u'versenum'):
             raw_verse_num = verse.next

openlp/plugins/bibles/lib/mediaitem.py

@@ -392,7 +392,7 @@ class BibleMediaItem(MediaManagerItem):
         if bible in bibles:
             find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
             self.initialiseAdvancedBible(unicode(bible))
-        elif len(bibles):
+        elif bibles:
             self.initialiseAdvancedBible(bibles[0])
         bible = QtCore.QSettings().value(
             self.settingsSection + u'/quick bible', QtCore.QVariant(
@@ -408,7 +408,7 @@ class BibleMediaItem(MediaManagerItem):
             self.plugin.appStartup()
         self.updateAutoCompleter()
 
-    def initialiseAdvancedBible(self, bible):
+    def initialiseAdvancedBible(self, bible, last_book_id=None):
         """
         This initialises the given bible, which means that its book names and
         their chapter numbers is added to the combo boxes on the
@@ -417,8 +417,12 @@ class BibleMediaItem(MediaManagerItem):
 
         ``bible``
             The bible to initialise (unicode).
+        
+        ``last_book_id``
+            The "book reference id" of the book which is choosen at the moment.
+            (int)
         """
-        log.debug(u'initialiseAdvancedBible %s', bible)
+        log.debug(u'initialiseAdvancedBible %s, %s', bible, last_book_id)
         book_data = self.plugin.manager.get_books(bible)
         secondbible = unicode(self.advancedSecondComboBox.currentText())
         if secondbible != u'':
@@ -432,6 +436,7 @@ class BibleMediaItem(MediaManagerItem):
             book_data = book_data_temp
         self.advancedBookComboBox.clear()
         first = True
+        initialise_chapter_verse = False
         language_selection = self.plugin.manager.get_language_selection(bible)
         book_names = BibleStrings().BookNames
         for book in book_data:
@@ -451,8 +456,19 @@ class BibleMediaItem(MediaManagerItem):
                 row, QtCore.QVariant(book[u'book_reference_id']))
             if first:
                 first = False
-                self.initialiseChapterVerse(bible, book[u'name'],
-                    book[u'book_reference_id'])
+                first_book = book
+                initialise_chapter_verse = True
+            if last_book_id and last_book_id == int(book[u'book_reference_id']):
+                index = self.advancedBookComboBox.findData(
+                    QtCore.QVariant(book[u'book_reference_id']))
+                if index == -1:
+                    # Not Found.
+                    index = 0
+                self.advancedBookComboBox.setCurrentIndex(index)
+                initialise_chapter_verse = False
+        if initialise_chapter_verse:
+            self.initialiseChapterVerse(bible, first_book[u'name'],
+                first_book[u'book_reference_id'])
 
     def initialiseChapterVerse(self, bible, book, book_ref_id):
         log.debug(u'initialiseChapterVerse %s, %s, %s', bible, book,
@@ -597,11 +613,15 @@ class BibleMediaItem(MediaManagerItem):
         QtCore.QSettings().setValue(self.settingsSection + u'/advanced bible',
             QtCore.QVariant(self.advancedVersionComboBox.currentText()))
         self.initialiseAdvancedBible(
-            unicode(self.advancedVersionComboBox.currentText()))
+            unicode(self.advancedVersionComboBox.currentText()),
+            self.advancedBookComboBox.itemData(
+                int(self.advancedBookComboBox.currentIndex())))
 
     def onAdvancedSecondComboBox(self):
         self.initialiseAdvancedBible(
-            unicode(self.advancedVersionComboBox.currentText()))
+            unicode(self.advancedVersionComboBox.currentText()),
+            self.advancedBookComboBox.itemData(
+                int(self.advancedBookComboBox.currentIndex())))
 
     def onAdvancedBookComboBox(self):
         item = int(self.advancedBookComboBox.currentIndex())
@@ -878,7 +898,7 @@ class BibleMediaItem(MediaManagerItem):
             items = item
         else:
             items = self.listView.selectedItems()
-        if len(items) == 0:
+        if not items:
             return False
         bible_text = u''
         old_item = None
@@ -949,7 +969,7 @@ class BibleMediaItem(MediaManagerItem):
         # Service Item: Title
         service_item.title = create_separated_list(raw_title)
         # Service Item: Theme
-        if len(self.settings.bible_theme) == 0:
+        if not self.settings.bible_theme:
             service_item.theme = None
         else:
             service_item.theme = self.settings.bible_theme

openlp/plugins/custom/forms/editcustomform.py

@@ -127,7 +127,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         sxml.new_document()
         sxml.add_lyrics_to_song()
         count = 1
-        for i in range(0, self.slideListView.count()):
+        for i in range(self.slideListView.count()):
             sxml.add_verse_to_lyrics(u'custom', unicode(count),
                 unicode(self.slideListView.item(i).text()))
             count += 1
@@ -170,7 +170,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         Edits all slides.
         """
         slide_list = u''
-        for row in range(0, self.slideListView.count()):
+        for row in range(self.slideListView.count()):
             item = self.slideListView.item(row)
             slide_list += item.text()
             if row != self.slideListView.count() - 1:
@@ -206,7 +206,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             old_row = self.slideListView.currentRow()
             # Create a list with all (old/unedited) slides.
             old_slides = [self.slideListView.item(row).text() for row in \
-                range(0, self.slideListView.count())]
+                range(self.slideListView.count())]
             self.slideListView.clear()
             old_slides.pop(old_row)
             # Insert all slides to make the old_slides list complete.
@@ -254,7 +254,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         Checks whether a custom is valid or not.
         """
         # We must have a title.
-        if len(self.titleEdit.displayText()) == 0:
+        if not self.titleEdit.displayText():
             self.titleEdit.setFocus()
             critical_error_message_box(
                 message=translate('CustomPlugin.EditCustomForm',

openlp/plugins/custom/lib/mediaitem.py

@@ -258,7 +258,7 @@ class CustomMediaItem(MediaManagerItem):
         search_length = 2
         if len(text) > search_length:
             self.onSearchTextButtonClicked()
-        elif len(text) == 0:
+        elif not text:
             self.onClearTextButtonClick()
 
     def onClearTextButtonClick(self):

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -152,7 +152,7 @@ class PowerpointDocument(PresentationDocument):
         log.debug(u'create_thumbnails')
         if self.check_thumbnails():
             return
-        for num in range(0, self.presentation.Slides.Count):
+        for num in range(self.presentation.Slides.Count):
             self.presentation.Slides(num + 1).Export(os.path.join(
                 self.get_thumbnail_folder(), 'slide%d.png' % (num + 1)),
                 'png', 320, 240)

openlp/plugins/songs/forms/editsongform.py

@@ -336,7 +336,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         Tag the Song List rows based on the verse list
         """
         row_label = []
-        for row in range(0, self.verseListWidget.rowCount()):
+        for row in range(self.verseListWidget.rowCount()):
             item = self.verseListWidget.item(row, 0)
             verse_def = unicode(item.data(QtCore.Qt.UserRole).toString())
             verse_tag = VerseType.translated_tag(verse_def[0])
@@ -494,7 +494,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 if len(tempText.split(u'\n')) != len(after_text.split(u'\n')):
                     tempList = {}
                     tempId = {}
-                    for row in range(0, self.verseListWidget.rowCount()):
+                    for row in range(self.verseListWidget.rowCount()):
                         tempList[row] = self.verseListWidget.item(row, 0)\
                             .text()
                         tempId[row] = self.verseListWidget.item(row, 0)\
@@ -511,7 +511,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     def onVerseEditAllButtonClicked(self):
         verse_list = u''
         if self.verseListWidget.rowCount() > 0:
-            for row in range(0, self.verseListWidget.rowCount()):
+            for row in range(self.verseListWidget.rowCount()):
                 item = self.verseListWidget.item(row, 0)
                 field = unicode(item.data(QtCore.Qt.UserRole).toString())
                 verse_tag = VerseType.translated_name(field[0])
@@ -579,7 +579,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         verses = []
         verse_names = []
         order = self.__extractVerseOrder(text)
-        for index in range(0, self.verseListWidget.rowCount()):
+        for index in range(self.verseListWidget.rowCount()):
             verse = self.verseListWidget.item(index, 0)
             verse = unicode(verse.data(QtCore.Qt.UserRole).toString())
             if verse not in verse_names:
@@ -620,7 +620,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         verse_names = []
         order_names = unicode(verse_order).split()
         order = self.__extractVerseOrder(verse_order)
-        for index in range(0, verse_count):
+        for index in range(verse_count):
             verse = self.verseListWidget.item(index, 0)
             verse = unicode(verse.data(QtCore.Qt.UserRole).toString())
             if verse not in verse_names:
@@ -920,7 +920,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         try:
             sxml = SongXML()
             multiple = []
-            for i in range(0, self.verseListWidget.rowCount()):
+            for i in range(self.verseListWidget.rowCount()):
                 item = self.verseListWidget.item(i, 0)
                 verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
                 verse_tag = verseId[0]

openlp/plugins/songs/forms/editverseform.py

@@ -191,13 +191,13 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         else:
             log.debug(unicode(self.getVerse()[0]).split(u'\n'))
             value = unicode(self.getVerse()[0]).split(u'\n')[1]
-            if len(value) == 0:
+            if not value:
                 lines = unicode(self.getVerse()[0]).split(u'\n')
                 index = 2
-                while index < len(lines) and len(value) == 0:
+                while index < len(lines) and not value:
                     value = lines[index]
                     index += 1
-        if len(value) == 0:
+        if not value:
             critical_error_message_box(
                 message=translate('SongsPlugin.EditSongForm',
                 'You need to type some text in to the verse.'))

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -108,7 +108,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         item_id = self._getCurrentItemId(list_widget)
         if item_id != -1:
             item = self.manager.get_object(item_class, item_id)
-            if item and len(item.songs) == 0:
+            if item and not item.songs:
                 if critical_error_message_box(dlg_title, del_text, self,
                     True) == QtGui.QMessageBox.Yes:
                     self.manager.delete_object(item_class, item.id)
@@ -191,7 +191,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         ``edit``
             If we edit an item, this should be *True*.
         """
-        if len(objects) > 0:
+        if objects:
             # If we edit an existing object, we need to make sure that we do
             # not return False when nothing has changed.
             if edit:

openlp/plugins/songs/lib/__init__.py

@@ -316,7 +316,7 @@ def clean_song(manager, song):
                 verse_type,
                 verse[0][u'label'],
                 verse[1],
-                verse[0][u'lang'] if verse[0].has_key(u'lang') else None
+                verse[0].get(u'lang')
             )
             compare_order.append((u'%s%s' % (verse_type, verse[0][u'label'])
                 ).upper())

openlp/plugins/songs/lib/cclifileimport.py

@@ -185,7 +185,7 @@ class CCLIFileImport(SongImport):
         check_first_verse_line = False
         field_list = song_fields.split(u'/t')
         words_list = song_words.split(u'/t')
-        for counter in range(0, len(field_list)):
+        for counter in range(len(field_list)):
             if field_list[counter].startswith(u'Ver'):
                 verse_type = VerseType.Tags[VerseType.Verse]
             elif field_list[counter].startswith(u'Ch'):
@@ -211,7 +211,7 @@ class CCLIFileImport(SongImport):
                 elif verse_lines[0].startswith(u'('):
                     verse_type = VerseType.Tags[VerseType.Other]
                     verse_text = verse_lines[1]
-            if len(verse_text) > 0:
+            if verse_text:
                 self.addVerse(verse_text, verse_type)
             check_first_verse_line = False
         # Handle multiple authors

openlp/plugins/songs/lib/easyslidesimport.py

@@ -162,15 +162,12 @@ class EasySlidesImport(SongImport):
         separatorlines = 0
         for line in lines:
             line = line.strip()
-            if len(line) == 0:
+            if not line:
                 continue
             elif line[1:7] == u'region':
                 # this is region separator, probably [region 2]
                 region = self._extractRegion(line)
-                if regionlines.has_key(region):
-                    regionlines[region] = regionlines[region] + 1
-                else:
-                    regionlines[region] = 1
+                regionlines[region] = 1 + regionlines.get(region, 0)
             elif line[0] == u'[':
                 separatorlines = separatorlines + 1
         # if the song has separators
@@ -206,7 +203,7 @@ class EasySlidesImport(SongImport):
 
         for line in lines:
             line = line.strip()
-            if len(line) == 0:
+            if not line:
                 if separators:
                     # separators are used, so empty line means slide break
                     # inside verse
@@ -215,15 +212,11 @@ class EasySlidesImport(SongImport):
                 else:
                     # separators are not used, so empty line starts a new verse
                     vt = u'V'
-                    if verses[reg].has_key(vt):
-                        vn = len(verses[reg][vt].keys())+1
-                    else:
-                        vn = u'1'
+                    vn = len(verses[reg].get(vt, {})) + 1
                     inst = 1
             elif line[0:7] == u'[region':
                 reg = self._extractRegion(line)
-                if not verses.has_key(reg):
-                    verses[reg] = {}
+                verses.setdefault(reg, {})
                 if not regionsInVerses:
                     vt = u'V'
                     vn = u'1'
@@ -238,28 +231,19 @@ class EasySlidesImport(SongImport):
                 if match:
                     marker = match.group(1).strip()
                     vn = match.group(2)
-                if len(marker) == 0:
-                    vt = u'V'
-                elif MarkTypes.has_key(marker):
-                    vt = MarkTypes[marker]
-                else:
-                    vt = u'O'
+                vt = MarkTypes.get(marker, u'O') if marker else u'V'
                 if regionsInVerses:
                     region = defaultregion
                 inst = 1
                 if self._listHas(verses, [reg, vt, vn, inst]):
-                    inst = len(verses[reg][vt][vn])+1
+                    inst = len(verses[reg][vt][vn]) + 1
             else:
                 if not [reg, vt, vn, inst] in our_verse_order:
                     our_verse_order.append([reg, vt, vn, inst])
-                if not verses[reg].has_key(vt):
-                    verses[reg][vt] = {}
-                if not verses[reg][vt].has_key(vn):
-                    verses[reg][vt][vn] = {}
-                if not verses[reg][vt][vn].has_key(inst):
-                    verses[reg][vt][vn][inst] = []
-                words = self.tidyText(line)
-                verses[reg][vt][vn][inst].append(words)
+                verses[reg].setdefault(vt, {})
+                verses[reg][vt].setdefault(vn, {})
+                verses[reg][vt][vn].setdefault(inst, [])
+                verses[reg][vt][vn][inst].append(self.tidyText(line))
         # done parsing
 
         versetags = []
@@ -286,11 +270,11 @@ class EasySlidesImport(SongImport):
         try:
             order = unicode(song.Sequence).strip().split(u',')
             for tag in order:
-                if len(tag) == 0:
+                if not tag:
                     continue
                 elif tag[0].isdigit():
                     tag = u'V' + tag
-                elif SeqTypes.has_key(tag.lower()):
+                elif tag.lower() in SeqTypes:
                     tag = SeqTypes[tag.lower()]
                 else:
                     continue
@@ -307,9 +291,7 @@ class EasySlidesImport(SongImport):
 
     def _listHas(self, lst, subitems):
         for subitem in subitems:
-            if isinstance(lst, dict) and lst.has_key(subitem):
-                lst = lst[subitem]
-            elif isinstance(lst, list) and subitem in lst:
+            if subitem in lst:
                 lst = lst[subitem]
             else:
                 return False

openlp/plugins/songs/lib/ewimport.py

@@ -62,15 +62,15 @@ def strip_rtf(blob, encoding):
         if control:
             # for delimiters, set control to False
             if c == '{':
-                if len(control_word) > 0:
+                if control_word:
                     depth += 1
                 control = False
             elif c == '}':
-                if len(control_word) > 0:
+                if control_word:
                     depth -= 1
                 control = False
             elif c == '\\':
-                new_control = (len(control_word) > 0)
+                new_control = bool(control_word)
                 control = False
             elif c.isspace():
                 control = False
@@ -79,7 +79,7 @@ def strip_rtf(blob, encoding):
                 if len(control_word) == 3 and control_word[0] == '\'':
                     control = False
             if not control:
-                if len(control_word) == 0:
+                if not control_word:
                     if c == '{' or c == '}' or c == '\\':
                         clear_text.append(c)
                 else:
@@ -360,7 +360,7 @@ class EasyWorshipSongImport(SongImport):
         field_desc = self.fieldDescs[field_desc_index]
         # Return None in case of 'blank' entries
         if isinstance(field, str):
-            if len(field.rstrip('\0')) == 0:
+            if not field.rstrip('\0'):
                 return None
         elif field == 0:
             return None

openlp/plugins/songs/lib/mediaitem.py

@@ -295,9 +295,8 @@ class SongMediaItem(MediaManagerItem):
         log.debug(u'display results Book')
         self.listView.clear()
         for book in searchresults:
-            songs = sorted(book.songs, key=lambda song: int(
-                re.sub(r'[^0-9]', u' ', song.song_number).partition(' ')[0])
-                if len(re.sub(r'[^\w]', ' ', song.song_number)) else 0)
+            songs = sorted(book.songs, key=lambda song:
+                int(re.match(r'[0-9]+', u'0' + song.song_number).group()))
             for song in songs:
                 # Do not display temporary songs
                 if song.temporary:
@@ -331,7 +330,7 @@ class SongMediaItem(MediaManagerItem):
                 search_length = 3
             if len(text) > search_length:
                 self.onSearchTextButtonClicked()
-            elif len(text) == 0:
+            elif not text:
                 self.onClearTextButtonClick()
 
     def onImportClick(self):
@@ -491,7 +490,7 @@ class SongMediaItem(MediaManagerItem):
             else:
                 # Loop through the verse list and expand the song accordingly.
                 for order in song.verse_order.lower().split():
-                    if len(order) == 0:
+                    if not order:
                         break
                     for verse in verseList:
                         if verse[0][u'type'][0].lower() == order[0] and \
@@ -530,7 +529,7 @@ class SongMediaItem(MediaManagerItem):
             u'authors': u', '.join(author_list)}
         service_item.xml_version = self.openLyrics.song_to_xml(song)
         # Add the audio file to the service item.
-        if len(song.media_files) > 0:
+        if song.media_files:
             service_item.add_capability(ItemCapabilities.HasBackgroundAudio)
             service_item.background_audio = \
                 [m.file_name for m in song.media_files]
@@ -575,12 +574,12 @@ class SongMediaItem(MediaManagerItem):
                     editId = song.id
                     break
                 # If there's any backing tracks, copy them over.
-                if len(item.background_audio) > 0:
+                if item.background_audio:
                     self._updateBackgroundAudio(song, item)
         if add_song and self.addSongFromService:
             song = self.openLyrics.xml_to_song(item.xml_version)
             # If there's any backing tracks, copy them over.
-            if len(item.background_audio) > 0:
+            if item.background_audio:
                 self._updateBackgroundAudio(song, item)
             editId = song.id
             self.onSearchTextButtonClicked()
@@ -588,7 +587,7 @@ class SongMediaItem(MediaManagerItem):
             # Make sure we temporary import formatting tags.
             song = self.openLyrics.xml_to_song(item.xml_version, True)
             # If there's any backing tracks, copy them over.
-            if len(item.background_audio) > 0:
+            if item.background_audio:
                 self._updateBackgroundAudio(song, item)
             editId = song.id
             temporary = True

openlp/plugins/songs/lib/olp1import.py

@@ -122,8 +122,7 @@ class OpenLP1SongImport(SongImport):
                 cursor.execute(
                     u'SELECT settingsid FROM songs WHERE songid = %s' % song_id)
                 theme_id = cursor.fetchone()[0]
-                if themes.has_key(theme_id):
-                    self.themeName = themes[theme_id]
+                self.themeName = themes.get(theme_id, u'')
             verses = lyrics.split(u'\n\n')
             for verse in verses:
                 if verse.strip():
@@ -191,7 +190,7 @@ class OpenLP1SongImport(SongImport):
         # Detect charset by songs.
         cursor.execute(u'SELECT name FROM sqlite_master '
             u'WHERE type = \'table\' AND name = \'tracks\'')
-        if len(cursor.fetchall()) > 0:
+        if cursor.fetchall():
             cursor.execute(u'SELECT fulltrackname FROM tracks')
             tracks = cursor.fetchall()
             for track in tracks:

openlp/plugins/songs/lib/opensongimport.py

@@ -174,7 +174,7 @@ class OpenSongImport(SongImport):
             if semicolon >= 0:
                 this_line = this_line[:semicolon]
             this_line = this_line.strip()
-            if not len(this_line):
+            if not this_line:
                 continue
             # skip guitar chords and page and column breaks
             if this_line.startswith(u'.') or this_line.startswith(u'---') \
@@ -197,15 +197,12 @@ class OpenSongImport(SongImport):
                     # the verse tag
                     verse_tag = content
                     verse_num = u'1'
-                if len(verse_tag) == 0:
-                    verse_index = 0
-                else:
-                    verse_index = VerseType.from_loose_input(verse_tag)
+                verse_index = VerseType.from_loose_input(verse_tag) \
+                    if verse_tag else 0
                 verse_tag = VerseType.Tags[verse_index]
                 inst = 1
                 if [verse_tag, verse_num, inst] in our_verse_order \
-                    and verses.has_key(verse_tag) \
-                    and verses[verse_tag].has_key(verse_num):
+                    and verse_num in verses.get(verse_tag, {}):
                     inst = len(verses[verse_tag][verse_num]) + 1
                 continue
             # number at start of line.. it's verse number
@@ -213,11 +210,9 @@ class OpenSongImport(SongImport):
                 verse_num = this_line[0]
                 this_line = this_line[1:].strip()
                 our_verse_order.append([verse_tag, verse_num, inst])
-            if not verses.has_key(verse_tag):
-                verses[verse_tag] = {}
-            if not verses[verse_tag].has_key(verse_num):
-                verses[verse_tag][verse_num] = {}
-            if not verses[verse_tag][verse_num].has_key(inst):
+            verses.setdefault(verse_tag, {})
+            verses[verse_tag].setdefault(verse_num, {})
+            if inst not in verses[verse_tag][verse_num]:
                 verses[verse_tag][verse_num][inst] = []
                 our_verse_order.append([verse_tag, verse_num, inst])
             # Tidy text and remove the ____s from extended words
@@ -252,15 +247,14 @@ class OpenSongImport(SongImport):
                 if match is not None:
                     verse_tag = match.group(1)
                     verse_num = match.group(2)
-                    if not len(verse_tag):
+                    if not verse_tag:
                         verse_tag = VerseType.Tags[VerseType.Verse]
                 else:
                     # Assume it's no.1 if there are no digits
                     verse_tag = verse_def
                     verse_num = u'1'
                 verse_def = u'%s%s' % (verse_tag, verse_num)
-                if verses.has_key(verse_tag) and \
-                    verses[verse_tag].has_key(verse_num):
+                if verse_num in verses.get(verse_tag, {}):
                     self.verseOrderList.append(verse_def)
                 else:
                     log.info(u'Got order %s but not in verse tags, dropping'

openlp/plugins/songs/lib/songimport.py

@@ -61,9 +61,9 @@ class SongImport(QtCore.QObject):
         """
         self.manager = manager
         QtCore.QObject.__init__(self)
-        if kwargs.has_key(u'filename'):
+        if u'filename' in kwargs:
             self.importSource = kwargs[u'filename']
-        elif kwargs.has_key(u'filenames'):
+        elif u'filenames' in kwargs:
             self.importSource = kwargs[u'filenames']
         else:
             raise KeyError(u'Keyword arguments "filename[s]" not supplied.')
@@ -273,7 +273,7 @@ class SongImport(QtCore.QObject):
         Author not checked here, if no author then "Author unknown" is
         automatically added
         """
-        if not self.title or not len(self.verses):
+        if not self.title or not self.verses:
             return False
         else:
             return True
@@ -314,13 +314,10 @@ class SongImport(QtCore.QObject):
                 verse_def = new_verse_def
             sxml.add_verse_to_lyrics(verse_tag, verse_def[1:], verse_text, lang)
         song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
-        if not len(self.verseOrderList) and \
-            self.verseOrderListGeneratedUseful:
+        if not self.verseOrderList and self.verseOrderListGeneratedUseful:
             self.verseOrderList = self.verseOrderListGenerated
-        for i, current_verse_def in enumerate(self.verseOrderList):
-            if verses_changed_to_other.has_key(current_verse_def):
-                self.verseOrderList[i] = \
-                    verses_changed_to_other[current_verse_def]
+        self.verseOrderList = map(lambda v: verses_changed_to_other.get(v, v),
+            self.verseOrderList)
         song.verse_order = u' '.join(self.verseOrderList)
         song.copyright = self.copyright
         song.comments = self.comments

openlp/plugins/songs/lib/songshowplusimport.py

@@ -204,7 +204,7 @@ class SongShowPlusImport(SongImport):
         elif verse_type == "pre-chorus":
             verse_tag = VerseType.Tags[VerseType.PreChorus]
         else:
-            if not self.otherList.has_key(verse_name):
+            if verse_name not in self.otherList:
                 if ignore_unique:
                     return None
                 self.otherCount = self.otherCount + 1

openlp/plugins/songs/lib/xml.py

@@ -611,7 +611,7 @@ class OpenLyrics(object):
             text += u'{%s}' % element.get(u'name')
             # Some formattings may have only start tag.
             # Handle this case if element has no children and contains no text.
-            if len(element) == 0 and not element.text:
+            if not element and not element.text:
                 use_endtag = False
         # Append text from element.
         if element.text:

openlp/plugins/songs/songsplugin.py

@@ -239,7 +239,7 @@ class SongsPlugin(Plugin):
         for sfile in os.listdir(db_dir):
             if sfile.startswith(u'songs_') and sfile.endswith(u'.sqlite'):
                 song_dbs.append(os.path.join(db_dir, sfile))
-        if len(song_dbs) == 0:
+        if not song_dbs:
             return
         progress = QtGui.QProgressDialog(self.formParent)
         progress.setWindowModality(QtCore.Qt.WindowModal)

resources/osx/Info.plist.master

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeExtension</key>
-                        <array>
-                                <string>osz</string>
-                        </array>
-                        <key>CFBundleTypeIconFiles</key>
-                        <array>
-                                <string>openlp-logo-with-text.icns</string>
-                        </array>
-                        <key>CFBundleTypeName</key>
-                        <string>OpenLP Service</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>LSHandlerRank</key>
-                        <string>Owner</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>org.openlp.osz</string>
-                        </array>
-                </dict>
-                <dict>
-                        <key>CFBundleTypeExtension</key>
-                        <array>
-                                <string>otz</string>
-                        </array>
-                        <key>CFBundleTypeIconFiles</key>
-                        <array>
-                                <string>openlp-logo-with-text.icns</string>
-                        </array>
-                        <key>CFBundleTypeName</key>
-                        <string>OpenLP Theme</string>
-                        <key>CFBundleTypeRole</key>
-                        <string>Viewer</string>
-                        <key>LSHandlerRank</key>
-                        <string>Owner</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>org.openlp.otz</string>
-                        </array>
-                </dict>
-        </array>
-
-        <key>UTExportedTypeDeclarations</key>
-        <array>
-                <dict>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.openlp.osz</string>
-                        <key>UTTypeDescription</key>
-                        <string>OpenLP Service</string>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                                <string>public.content</string>
-                        </array>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>osz</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>application/x-openlp-service</string>
-                                </array>
-                        </dict>
-                </dict>
-                <dict>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.openlp.otz</string>
-                        <key>UTTypeDescription</key>
-                        <string>OpenLP Theme</string>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                                <string>public.content</string>
-                        </array>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>otz</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>application/x-openlp-theme</string>
-                                </array>
-                        </dict>
-                </dict>
-        </array>
-
-<key>CFBundleIdentifier</key>
-<string>org.openlp</string>
-<key>CFBundleShortVersionString</key>
-<string>%(openlp_version)s</string>
-<key>CFBundleVersion</key>
-<string>%(openlp_version)s</string>
-<key>CFBundleInfoDictionaryVersion</key>
-<string>6.0</string>
-<key>CFBundleDisplayName</key>
-<string>%(openlp_appname)s</string>
-<key>CFBundleIconFile</key>
-<string>openlp-logo-with-text.icns</string>
-<key>CFBundleExecutable</key>
-<string>MacOS/openlp</string>
-<key>CFBundleName</key>
-<string>%(openlp_appname)s</string>
-<key>CFBundleGetInfoString</key>
-<string>%(openlp_appname)s %(openlp_version)s</string>
-<key>LSHasLocalizedDisplayName</key>
-<false/>
-<key>NSAppleScriptEnabled</key>
-<false/>
-<key>CFBundlePackageType</key>
-<string>APPL</string>
-<key>LSBackgroundOnly</key>
-<false/>
-</dict>
-</plist>

resources/osx/Makefile

@@ -1,28 +0,0 @@
-all:
-	python build.py -c openlp.cfg
-
-view:
-	python build.py -c openlp.cfg --package-view --compress-view
-
-package:
-
-	python build.py -c openlp.cfg --package --package-view
-
-bundle:
-
-	python build.py -c openlp.cfg --compress --compress-view
-
-clean:
-	# remove old configuration files
-	rm -f openlp.spec
-	rm -f Info.plist
-	rm -f .version
-
-	# remove old build artifacts
-	rm -rf build
-	rm -rf dist
-	rm -rf Macopenlp.app
-	rm -rf OpenLP.app
-	rm -f warnopenlp.txt
-	rm -f *dmg
-        

resources/osx/applescript-adjustview-10-5.master

@@ -1,74 +0,0 @@
-on saveImageWithItselfAsIcon(icon_image_file)
-	-- save icon_image_file with itself as icon
-	set icon_image_file_string to icon_image_file as string
-	tell application "Image Events"
-		launch
-		set icon_image to open file icon_image_file_string
-		save icon_image with icon
-		close icon_image
-	end tell
-end saveImageWithItselfAsIcon
-
-on copyIconOfTo(aFileOrFolderWithIcon, aFileOrFolder)
-	tell application "Finder" to set f to aFileOrFolderWithIcon as alias
-	-- grab the file's icon
-	my CopyOrPaste(f, "c")
-	-- now the icon is in the clipboard
-	tell application "Finder" to set c to aFileOrFolder as alias
-	my CopyOrPaste(result, "v")
-end copyIconOfTo
-
-on CopyOrPaste(i, cv)
-	tell application "Finder"
-		activate
-    open information window of i
-	end tell
-	tell application "System Events" to tell process "Finder" to tell window 1
-		keystroke tab -- select icon button
-		keystroke (cv & "w") using command down (* (copy or paste) + close window *)
-	end tell -- window 1 then process Finder then System Events
-end CopyOrPaste
-
-on run
-	set icon_image_file to POSIX file "%s" as alias
-	set dmg_file to POSIX file "/Volumes/%s" as alias
-
-	my saveImageWithItselfAsIcon(icon_image_file)
-	-- wait for virus scanner
-	delay 2
-	my copyIconOfTo(icon_image_file, dmg_file)
-
-	tell application "Finder"
-		tell disk "%s"
-			open
-			set current view of container window to icon view
-			set toolbar visible of container window to false
-			set statusbar visible of container window to false
-			set the bounds of container window to {400, 100, 1100, 500}
-			set theViewOptions to the icon view options of container window
-			set arrangement of theViewOptions to not arranged
-			set icon size of theViewOptions to 128
-			set background picture of theViewOptions to file ".background:installer-background.png"
-                        if not exists file "Applications" then
-			    make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-                        end if
-			delay 5
-			set position of item "%s" of container window to {160, 200}
-			set position of item ".Trashes" of container window to {100, 500}
-			set position of item ".installer-background.png" of container window to {200, 500}
-			set position of item ".DS_Store" of container window to {400, 500}
-			set position of item "Applications" of container window to {550, 200}
-			set position of item ".VolumeIcon.icns" of container window to {500, 500}
-			set position of item ".fseventsd" of container window to {300, 500}
-			if exists POSIX file ".SymAVx86QSFile" then
-				set position of item ".SymAVx86QSFile" of container window to {600, 500}
-			end if
-			open
-			close
-			update without registering applications
-			-- wait until the virus scan completes
-			delay 5
-			-- eject
-		end tell
-	end tell
-end run

resources/osx/applescript-adjustview-10-6.master

@@ -1,77 +0,0 @@
-on saveImageWithItselfAsIcon(icon_image_file)
-	-- save icon_image_file with itself as icon
-	set icon_image_file_string to icon_image_file as string
-	tell application "Image Events"
-		launch
-		set icon_image to open file icon_image_file_string
-		save icon_image with icon
-		close icon_image
-	end tell
-end saveImageWithItselfAsIcon
-
-on copyIconOfTo(aFileOrFolderWithIcon, aFileOrFolder)
-	tell application "Finder" to set f to aFileOrFolderWithIcon as alias
-	-- grab the file's icon
-	my CopyOrPaste(f, "c")
-	-- now the icon is in the clipboard
-	tell application "Finder" to set c to aFileOrFolder as alias
-	my CopyOrPaste(result, "v")
-end copyIconOfTo
-
-on CopyOrPaste(i, cv)
-	tell application "Finder"
-		activate
-    set infoWindow to open information window of i
-    set infoWindowName to name of infoWindow
-	end tell
-	tell application "System Events" to tell process "Finder" to tell window infoWindowName
-		keystroke tab -- select icon button
-		keystroke (cv & "w") using command down (* (copy or paste) + close window *)
-	end tell -- window 1 then process Finder then System Events
-end CopyOrPaste
-
-on run
-	set icon_image_file to POSIX file "%s" as alias
-	set dmg_file to POSIX file "/Volumes/%s" as alias
-
-	my saveImageWithItselfAsIcon(icon_image_file)
-	-- wait for virus scanner
-	delay 2
-	my copyIconOfTo(icon_image_file, dmg_file)
-
-	tell application "Finder"
-		tell disk "%s"
-			open
-			set current view of container window to icon view
-			set toolbar visible of container window to false
-			set statusbar visible of container window to false
-			set the bounds of container window to {400, 100, 1100, 500}
-			set theViewOptions to the icon view options of container window
-			set arrangement of theViewOptions to not arranged
-			set icon size of theViewOptions to 128
-			set background picture of theViewOptions to file ".background:installer-background.png"
-                        if not exists file "Applications" then
-			    make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-                        end if
-			delay 1
-			set position of item "%s" of container window to {160, 200}
-			set position of item ".Trashes" of container window to {100, 500}
-			set position of item ".background" of container window to {200, 500}
-			set position of item ".DS_Store" of container window to {400, 500}
-			set position of item "Applications" of container window to {550, 200}
-                        if exists file ".VolumeIcon.icns" then
-			    set position of item ".VolumeIcon.icns" of container window to {500, 500}
-                        end if
-			set position of item ".fseventsd" of container window to {300, 500}
-			if exists POSIX file ".SymAVx86QSFile" then
-				set position of item ".SymAVx86QSFile" of container window to {600, 500}
-			end if
-			open
-			close
-			update without registering applications
-			-- wait until the virus scan completes
-			delay 5
-			-- eject
-		end tell
-	end tell
-end run

resources/osx/applescript-seticon-10-5.master

@@ -1,40 +0,0 @@
-on saveImageWithItselfAsIcon(icon_image_file)
-        -- save icon_image_file with itself as icon
-        set icon_image_file_string to icon_image_file as string
-        tell application "Image Events"
-                launch
-                set icon_image to open file icon_image_file_string
-                save icon_image with icon
-                close icon_image
-        end tell
-end saveImageWithItselfAsIcon
-
-on copyIconOfTo(aFileOrFolderWithIcon, aFileOrFolder)
-        tell application "Finder" to set f to aFileOrFolderWithIcon as alias
-        -- grab the file's icon
-        my CopyOrPaste(f, "c")
-        -- now the icon is in the clipboard
-        tell application "Finder" to set c to aFileOrFolder as alias
-        my CopyOrPaste(result, "v")
-end copyIconOfTo
-
-on CopyOrPaste(i, cv)
-        tell application "Finder"
-                activate
-                open information window of i
-        end tell
-        tell application "System Events" to tell process "Finder" to tell window 1
-                keystroke tab -- select icon button
-                keystroke (cv & "w") using command down (* (copy or paste) + close window *)
-        end tell -- window 1 then process Finder then System Events
-end CopyOrPaste
-
-on run
-        set icon_image_file to POSIX file "%s" as alias
-        set dmg_file to POSIX file "%s" as alias
-
-        my saveImageWithItselfAsIcon(icon_image_file)
-        -- wait for virus scanner
-        delay 2
-        my copyIconOfTo(icon_image_file, dmg_file)
-end run

resources/osx/applescript-seticon-10-6.master

@@ -1,41 +0,0 @@
-on saveImageWithItselfAsIcon(icon_image_file)
-        -- save icon_image_file with itself as icon
-        set icon_image_file_string to icon_image_file as string
-        tell application "Image Events"
-                launch
-                set icon_image to open file icon_image_file_string
-                save icon_image with icon
-                close icon_image
-        end tell
-end saveImageWithItselfAsIcon
-
-on copyIconOfTo(aFileOrFolderWithIcon, aFileOrFolder)
-        tell application "Finder" to set f to aFileOrFolderWithIcon as alias
-        -- grab the file's icon
-        my CopyOrPaste(f, "c")
-        -- now the icon is in the clipboard
-        tell application "Finder" to set c to aFileOrFolder as alias
-        my CopyOrPaste(result, "v")
-end copyIconOfTo
-
-on CopyOrPaste(i, cv)
-        tell application "Finder"
-                activate
-                set infoWindow to open information window of i
-                set infoWindowName to name of infoWindow
-        end tell
-        tell application "System Events" to tell process "Finder" to tell window infoWindowName
-                keystroke tab -- select icon button
-                keystroke (cv & "w") using command down (* (copy or paste) + close window *)
-        end tell -- window 1 then process Finder then System Events
-end CopyOrPaste
-
-on run
-        set icon_image_file to POSIX file "%s" as alias
-        set dmg_file to POSIX file "%s" as alias
-
-        my saveImageWithItselfAsIcon(icon_image_file)
-        -- wait for virus scanner
-        delay 2
-        my copyIconOfTo(icon_image_file, dmg_file)
-end run

resources/osx/build.py

@@ -1,426 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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                          #
-###############################################################################
-
-"""
-Mac OS X Build Script
----------------------
-
-This script is used to build the OS X binary and the accompanying installer.
-For this script to work out of the box, it depends on a number of things:
-
-Python 2.6/2.7
-    This build script only works with Python 2.6/2.7
-
-PyQt4
-    You should already have this installed, OpenLP doesn't work without it.
-    The version the script expects is the packaged one available from River
-    Bank Computing.
-
-PyInstaller
-    PyInstaller should be a checkout of revision 1355 of trunk, and in a
-    directory  which is configured in the openlp.cfg. The revision is very
-    important as there is just included a fix for builds on OS X.
-
-    To install PyInstaller, first checkout trunk from Subversion. The
-    easiest way is to do a
-
-        svn co http://svn.pyinstaller.org/trunk
-
-    Then you need to copy the two hook-*.py files from the "pyinstaller"
-    subdirectory in OpenLP's "resources" directory into PyInstaller's
-    "hooks" directory.
-
-openlp.cfg
-    The configuration file contains settings of the version string to include
-    in the bundle as well as directory and file settings for different
-    purposes (e.g. PyInstaller location or installer background image)
-
-To start the build process do a
-
-   make
-
-inside the resources/osx directory. The result should be a {openlp_dmgname}.dmg
-file in the same directory. If something went wrong - this sometimes happen
-with the graphical commands in the Apple script - do a
-
-   make clean
-
-and start the build process again. If you want to execute only parts of the
-build process you can specify different make targets
-
-    make view -- runs the Apple scripts to set the icons
-    make package -- creates the dmg file and copies the application files
-    make bundle -- compresses the dmg file and sets the dmg file icon
-"""
-
-import os
-import ConfigParser
-import logging
-import optparse
-import sys
-import glob
-import platform
-import re
-import subprocess as subp
-
-from shutil import copy
-
-# set the script name
-script_name = "build"
-
-
-def build_application(settings, app_name_lower, app_dir):
-    logging.info('[%s] now building the app with pyinstaller at "%s"...',
-        script_name, settings['pyinstaller_basedir'])
-    result = os.system('arch -i386 %s %s/pyinstaller.py openlp.spec' \
-              % ( sys.executable,
-                settings['pyinstaller_basedir']) )
-    if (result != 0):
-        logging.error('[%s] The pyinstaller build reported an error, cannot \
-            continue!', script_name)
-        sys.exit(1)
-
-
-    dist_folder = os.getcwd() + '/dist/' + app_name_lower
-
-    logging.info('[%s] copying the new plugins...', script_name)
-    result = os.system('cp -R %(openlp_directory)s/openlp/plugins \
-        %(application_directory)s/Contents/MacOS' \
-        % { 'openlp_directory' : settings['openlp_basedir'],
-            'application_directory' : app_dir })
-    if (result != 0):
-        logging.error('[%s] could not copy plugins, dmg creation failed!',
-            script_name)
-        sys.exit(1)
-
-    logging.info('[%s] removing the presentations plugin...', script_name)
-    result = os.system('rm -rf \
-        %(application_directory)s/Contents/MacOS/plugins/presentations' \
-        % { 'application_directory' : app_dir })
-    if (result != 0):
-        logging.error('[%s] could not remove presentations plugins, dmg \
-            creation failed!', script_name)
-        sys.exit(1)
-
-    logging.info('[%s] copying the icons to the resource directory...',
-        script_name)
-    result = os.system('cp %(icon_file)s \
-        %(application_directory)s/Contents/Resources' \
-        % { 'icon_file' : settings['openlp_icon_file'],
-            'application_directory' : app_dir })
-    if (result != 0):
-        logging.error('[%s] could not copy the icon, dmg creation failed!',
-            script_name)
-        sys.exit(1)
-
-    logging.info('[%s] copying the version file...', script_name)
-    result = os.system('CpMac %s/.version %s/Contents/MacOS' % (os.getcwd(),
-        app_dir))
-    if (result != 0):
-        logging.error('[%s] could not copy the version file, dmg creation \
-            failed!', script_name)
-        sys.exit(1)
-
-    logging.info('[%s] copying the new Info.plist...', script_name)
-    result = os.system('cp %(target_directory)s/Info.plist \
-        %(application_directory)s/Contents' \
-        % { 'target_directory' : os.getcwd(),
-            'application_directory' : app_dir })
-    if (result != 0):
-        logging.error('[%s] could not copy the info file, dmg creation \
-            failed!', script_name)
-        sys.exit(1)
-
-    logging.info('[%s] copying the translations...', script_name)
-    os.makedirs(app_dir + '/Contents/MacOS/i18n')
-    for ts_file in glob.glob(os.path.join(settings['openlp_basedir']
-        + '/resources/i18n/', '*ts')):
-        result = os.system('lconvert -i %(ts_file)s \
-            -o %(target_directory)s/Contents/MacOS/i18n/%(base)s.qm' \
-            % { 'ts_file' : ts_file, 'target_directory' : app_dir,
-            'base': os.path.splitext(os.path.basename(ts_file))[0] })
-        if (result != 0):
-            logging.error('[%s] could not copy the translations, dmg \
-                creation failed!', script_name)
-            sys.exit(1)
-
-    # Backported from windows build script.
-    logging.info('[%s] copying the media player...', script_name)
-    os.makedirs(os.path.join(app_dir, 'Contents/MacOS/core/ui/media'))
-    source = os.path.join(settings['openlp_basedir'], u'openlp', u'core', u'ui', u'media')
-    dest = os.path.join(app_dir, u'Contents/MacOS/core/ui/media')
-    for root, dirs, files in os.walk(source):
-        for filename in files:
-            print filename
-            if not filename.endswith(u'.pyc'):
-                dest_path = os.path.join(dest, root[len(source)+1:])
-                if not os.path.exists(dest_path):
-                    os.makedirs(dest_path)
-                copy(os.path.join(root, filename),
-                    os.path.join(dest_path, filename))
-
-
-def create_dmg(settings):
-    logging.info('[%s] creating the dmg...', script_name)
-    dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg'
-    result = os.system('hdiutil create %(dmg_file)s~ -ov -megabytes \
-        %(vol_size)s -fs HFS+ -volname %(vol_name)s' \
-        % { 'dmg_file' : dmg_file,
-            'vol_size' : '250',
-            'vol_name' : settings['openlp_appname'] })
-    if (result != 0):
-        logging.error('[%s] could not create dmg file!', script_name)
-        sys.exit(1)
-
-    logging.info('[%s] mounting the dmg file...', script_name)
-    output = subp.Popen(["hdiutil", "attach", dmg_file + "~.dmg"],
-        stdout=subp.PIPE).communicate()[0]
-    logging.debug(output)
-
-    p = re.compile('Apple_HFS\s+(.+?)\s*$')
-    result = p.search(output, re.M)
-    volume_basedir = ''
-    if result:
-        volume_basedir = result.group(1)
-    else:
-        logging.error('could not mount dmg file, cannot continue!')
-        sys.exit(1)
-
-    logging.info('[%s] copying the app (from %s) to the dmg (at %s)...',
-        script_name, app_dir, volume_basedir)
-    result = os.system('CpMac -r %s %s' \
-             % ( app_dir, volume_basedir ))
-    if (result != 0):
-        logging.error('[%s] could not copy application, dmg creation failed!',
-            script_name)
-        sys.exit(1)
-
-    logging.info('[%s] copying the background image...', script_name)
-    os.mkdir(volume_basedir + '/.background')
-    result = os.system('CpMac %s %s'
-        % (settings['installer_backgroundimage_file'],
-           volume_basedir + '/.background/installer-background.png'))
-    if (result != 0):
-        logging.error('[%s] could not copy the background image, dmg creation\
-            failed!', script_name)
-        sys.exit(1)
-
-    return (volume_basedir, dmg_file)
-
-def unmount_dmg(settings, volume_basedir):
-    logging.info('[%s] unmounting the dmg...', script_name)
-    result = os.system('hdiutil detach %s' % volume_basedir)
-    if (result != 0):
-        logging.error('[%s] could not unmount the dmg file, dmg creation \
-            failed!', script_name)
-        sys.exit(1)
-
-def compress_view(settings, seticon_scriptname, dmg_file):
-    logging.info('[%s] setting icon of the dmg file...', script_name)
-    try:
-        f = open(seticon_scriptname)
-        p = subp.Popen(["osascript"], stdin=subp.PIPE)
-        p.communicate(f.read() % ((os.getcwd() + '/' +
-            settings['openlp_dmg_icon_file']), dmg_file))
-        f.close()
-        result = p.returncode
-        if (result != 0):
-            logging.error('[%s] could not set the icon to the dmg file, \
-                dmg creation failed!', script_name)
-            sys.exit(1)
-    except IOError, e:
-        logging.error('[%s] could not adjust the view (%s), dmg creation \
-            failed!', script_name, e)
-        sys.exit(1)
-    except OSError, e:
-        logging.error('[%s] could not set the icon to the dmg file(%s), \
-            dmg creation failed!', script_name, e)
-        sys.exit(1)
-
-def adjust_package_view(settings, adjustview_scriptname):
-    logging.info('[%s] making adjustments to the view...', script_name)
-    try:
-        f = open(adjustview_scriptname)
-        p = subp.Popen(["osascript"], stdin=subp.PIPE)
-        p.communicate(f.read() % ((os.getcwd() + '/' + \
-            settings['openlp_dmg_icon_file']),
-            settings['openlp_appname'],
-            settings['openlp_appname'],
-            settings['openlp_appname']))
-        f.close()
-        result = p.returncode
-        if (result != 0):
-            logging.error('[%s] could not adjust the view, dmg creation \
-                failed!', script_name)
-            sys.exit(1)
-    except IOError, e:
-        logging.error('[%s] could not adjust the view (%s), dmg creation \
-            failed!', script_name, e)
-        sys.exit(1)
-    except OSError, e:
-        logging.error('[%s] could not adjust the view (%s), dmg creation \
-            failed!', script_name, e)
-        sys.exit(1)
-
-def compress_dmg(settings):
-    logging.info('[%s] compress the dmg file...', script_name)
-    result = os.system('hdiutil convert %s~.dmg -format UDZO \
-        -imagekey zlib-level=9 -o %s' \
-        % (dmg_file, dmg_file))
-    if (result != 0):
-        logging.error('[%s] could not compress the dmg file, dmg creation \
-            failed!', script_name)
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-
-    # set default actions
-    do_build = True
-    do_compress_view = True
-    do_package_view = True
-    do_create_dmg = True
-    do_compress_dmg = True
-
-    parser = optparse.OptionParser()
-    parser.add_option('-c', '--config', dest='config', help='config file',
-        metavar='CONFIG')
-    parser.add_option('-v', '--package-view', dest='package_view',
-        help='triggers view adjustment scripts for package',
-        metavar='PACKAGEVIEWONLY', action='store_true', default=False)
-    parser.add_option('-y', '--compress-view', dest='compress_view',
-       help='triggers view adjustment scripts for dmg',
-       metavar='COMPRESSVIEWONLY', action='store_true', default=False)
-    parser.add_option('-p', '--package', dest='package',
-        help='package application folder to dmg', metavar='PACKAGE',
-        action='store_true', default=False)
-    parser.add_option('-z', '--compress', dest='compress',
-        help='compresses the existing dmg', metavar='COMPRESS',
-        action='store_true', default=False)
-    parser.add_option('-b', '--basedir', dest='basedir',
-        help='volume basedir like /Volumes/OpenLP', metavar='BASEDIR',
-        default='/Volumes/OpenLP')
-
-    (options, args) = parser.parse_args()
-
-    # if an option is set, false all
-    if (options.package_view is True or options.compress_view is True
-        or options.package is True or options.compress is True):
-        do_build = False
-        do_package_view = options.package_view
-        do_compress_view = options.compress_view
-        do_create_dmg = options.package
-        do_compress_dmg = options.compress
-
-    if not options.config:
-        parser.error('option --config|-c is required')
-
-    logHandler = logging.StreamHandler()
-    logHandler.setFormatter(logging.Formatter(
-        '%(asctime)s %(levelname)-8s %(message)s',
-        '%a, %d %b %Y %H:%M:%S'))
-    logging.getLogger().addHandler(logHandler)
-    logging.getLogger().setLevel(logging.DEBUG)
-
-    config = ConfigParser.RawConfigParser()
-    config.readfp(open(options.config, 'r'))
-
-    if not config.has_section('openlp'):
-        logging.error('[%s] config file "%s" lacks an [openlp] section',
-                      script_name, options.config)
-        sys.exit(1)
-
-    if not sys.platform == "darwin":
-        logging.error('[%s] this script only works on Macintosh OS X systems,'
-            + 'not on %s', script_name, sys.platform)
-        sys.exit(1)
-
-    version = platform.mac_ver()[0]
-    # we only need the differenciation between leopard and snow leopard
-    if version.startswith("10.6") or version.startswith("10.7"):
-        SNOWLEOPARD = True
-        logging.info('[%s] using snow leopard scripts (version = %s)',
-            script_name, version)
-        adjustview_scriptname = "applescript-adjustview-10-6.master"
-        seticon_scriptname = "applescript-seticon-10-6.master"
-    else:
-        SNOWLEOPARD = False
-        logging.info('[%s] using leopard scripts (version = %s)', script_name,
-            version)
-        adjustview_scriptname = "applescript-adjustview-10-5.master"
-        seticon_scriptname = "applescript-seticon-10-5.master"
-
-    if not os.path.isfile(adjustview_scriptname) \
-        or not os.path.isfile(seticon_scriptname):
-        logging.error('[%s] could not find apple scripts for given OS X '
-            + 'version %s', script_name, version)
-        sys.exit(1)
-
-    settings = dict()
-    for k in config.options('openlp'):
-        settings[k] = config.get('openlp', k)
-
-    # prepare the configuration files
-    os.system('python expander.py --config %(config_file)s \
-        --template openlp.spec.master \
-        --expandto %(target_directory)s/openlp.spec' \
-        % { 'config_file' : options.config, 'target_directory' : os.getcwd() })
-    os.system('python expander.py --config %(config_file)s \
-        --template Info.plist.master \
-        --expandto %(target_directory)s/Info.plist' \
-        % { 'config_file' : options.config, 'target_directory' : os.getcwd() })
-    os.system('python get_version.py > .version')
-
-    # prepare variables
-    app_name_lower = settings['openlp_appname'].lower()
-    app_dir = os.getcwd() + '/' + settings['openlp_appname'] + '.app'
-
-    # if the view option is set, skip the building steps
-    if (do_build is True):
-        build_application(settings, app_name_lower, app_dir)
-
-    if (do_create_dmg is True):
-        (volume_basedir, dmg_file) = create_dmg(settings)
-    else:
-        # setting base dir
-        volume_basedir = options.basedir
-        dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg'
-
-    if (do_package_view is True):
-        adjust_package_view(settings, adjustview_scriptname)
-
-    if (do_create_dmg is True):
-        unmount_dmg(settings, volume_basedir)
-
-    if (do_compress_dmg is True):
-        compress_dmg(settings)
-
-    if (do_compress_view is True):
-        compress_view(settings, seticon_scriptname, dmg_file)
-
-    if (do_compress_dmg is True):
-        logging.info('[%s] finished creating dmg file, resulting file is "%s"',
-            script_name, dmg_file)

resources/osx/expander.py

@@ -1,227 +0,0 @@
-#!/usr/bin/python
-# -*- 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, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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                          #
-###############################################################################
-
-# TODOs:
-# - defaults for non-supplied expansions:
-#   template contains
-
-import ConfigParser
-import logging
-import optparse
-import os
-import re
-import sys
-
-# variable expansion:
-# - %(dog)s --- normal python expansion
-# - %(dog%)s --- no python expansion, leave as is (stripping the trailing %)
-# - %(dog:cat) --- if there is an expansion for dog, dog will be used;
-#                  otherwise if cat exists cat will be used
-# - %(dog=cat) --- if there is an expansion for dog, dog will be used;
-#                  otherwise "cat" will be used
-# re_conf = re.compile(r'(?<!%)%\((?P<key>[^\(]+?)\)s')
-re_conf = re.compile(r'(?P<verbatim>%?)%\((?P<key>[^+=:&\)]+?)'
-    + '(?:(?P<kind>[+=:&])(?P<default>[^\)]+))?\)(?P<type>s|d)')
-
-def expand_variable(match, expansions, errors):
-    key = match.group('key')
-    kind = match.group('kind')
-    default = match.group('default')
-    typ = match.group('type')
-    verbatim = match.group('verbatim')
-
-    if verbatim:
-        return match.group(0)[1:]
-
-    # literal default
-    if kind == '=':
-        if key in expansions:
-            return expansions[key]
-        return default
-
-    # variable default
-    if kind == ':' and default in expansions:
-        return expansions[default]
-
-    if kind == '+' and default in expansions:
-        if key in expansions:
-            key = expansions[key]
-        if typ == 's':
-            return '%s%s' % (key, expansions[default])
-        if typ == 'd':
-            try:
-                return str(int(key) + int(expansions[default]))
-            except:
-                pass
-
-    if kind == '&' and default in expansions:
-        if typ == 's':
-            return '%s%s' % (key, expansions[default])
-        if typ == 'd':
-            try:
-                return str(int(key) + int(expansions[default]))
-            except:
-                pass
-
-    if key in expansions:
-        return expansions[key]
-
-    if not match.group(0) in errors:
-        errors.append(match.group(0))
-
-    return None
-
-options = None
-
-if __name__ == '__main__':
-
-    # get config file
-    parser = optparse.OptionParser()
-    parser.add_option('-c', '--config', dest='config',
-        help='config file', metavar='CONFIG')
-    parser.add_option('-t', '--template', dest='template',
-        help='template file', metavar='TEMPLATE')
-    parser.add_option('-x', '--expandto', dest='expanded',
-        help='expanded file', metavar='EXPANDED')
-    parser.add_option('-e', '--echo', dest='echo',
-        help='echo variable', metavar='ECHOVAR')
-
-    (options, args) = parser.parse_args()
-
-    if not options.config:
-        parser.error('option --config|-c is required')
-    if not os.path.exists(options.config):
-        parser.error('config file "%s" does not exist' % options.config)
-    if not options.echo:
-        if not options.template:
-            parser.error('option --template|-t is required')
-        if not os.path.exists(options.template):
-            parser.error('template file "%s" does not exist' \
-                % options.template)
-        if not options.expanded:
-            parser.error('option --expandto|-e is required')
-
-    logHandler = logging.StreamHandler()
-    logHandler.setFormatter(logging.Formatter('%(asctime)s %(levelname)-8s '
-        + ' %(message)s', '%a, %d %b %Y %H:%M:%S'))
-    logging.getLogger().addHandler(logHandler)
-    logging.getLogger().setLevel(logging.DEBUG)
-
-    config = ConfigParser.RawConfigParser()
-    config.readfp(open(options.config, 'r'))
-
-    if not config.has_section('openlp'):
-        logging.error('[expander] %s: config file "%s" lacks an [openlp] '
-            + 'section', options.template, options.config)
-
-    expansions = dict()
-    for k in config.options('openlp'):
-        expansions[k] = config.get('openlp', k)
-
-    # commandline overrides?
-    for override in args:
-        if not '=' in override:
-            continue
-
-        (k, v) = override.split('=', 2)
-        expansions[k] = v
-
-    if options.echo:
-        if options.echo in expansions:
-            print expansions[options.echo]
-            sys.exit(0)
-        else:
-            sys.exit(1)
-
-    # closure to capture expansions and errors variable
-    errors = []
-    expanded = []
-
-    try:
-        # try to expand the template
-        line = 0
-        faulty = False
-
-        template = open(options.template, 'r')
-        raw = template.readlines()
-        template.close()
-
-        def _expand(m):
-            return expand_variable(m, expansions = expansions, errors = errors)
-
-        for l in raw:
-            line += 1
-            exp = re_conf.sub(_expand, l)
-            if errors:
-                for key in errors:
-                    logging.error('[expander] %s: line %d: could not expand '
-                        + 'key "%s"', options.template, line, key)
-                faulty = True
-                errors = []
-            else:
-                expanded.append(exp)
-
-        if faulty:
-            sys.exit(1)
-
-        # successfully expanded template, now backup potentially existing
-        # target file
-        targetFile = options.expanded % expansions
-        if os.path.exists(targetFile):
-            if os.path.exists('%s~' % targetFile):
-                os.unlink('%s~' % targetFile)
-            os.rename(options.expanded, '%s~' % targetFile)
-            logging.info('[expander] %s: backed up existing target file "%s" '
-                 + 'to "%s"', options.template, targetFile,
-                 '%s~' % options.expanded)
-
-        # make sure that target directory exists
-        targetDir = os.path.dirname(targetFile)
-        if not os.path.exists(targetDir):
-            os.makedirs(targetDir)
-
-        # write target file
-        try:
-            target = open(targetFile, 'w')
-            for exp in expanded:
-                target.write(exp)
-            target.close()
-        except Exception, e:
-            logging.error('[expander] %s: could not expand to "%s"',
-                options.template, options.expaned, e)
-
-        # copy over file access mode from template
-        mode = os.stat(options.template)
-        os.chmod(options.expanded, mode.st_mode)
-
-        logging.info('[expander] expanded "%s" to "%s"',
-                     options.template, options.expanded)
-
-    except:
-        pass
-

resources/osx/get_version.py

@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-# -*- 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, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 sys
-import os
-from bzrlib.branch import Branch
-
-def get_version(path):
-    b = Branch.open_containing(path)[0]
-    b.lock_read()
-    result = '0.0.0'
-    try:
-        # Get the branch's latest revision number.
-        revno = b.revno()
-        # Convert said revision number into a bzr revision id.
-        revision_id = b.dotted_revno_to_revision_id((revno,))
-        # Get a dict of tags, with the revision id as the key.
-        tags = b.tags.get_reverse_tag_dict()
-        # Check if the latest
-        if revision_id in tags:
-            result = tags[revision_id][0]
-        else:
-            result = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno)
-    finally:
-        b.unlock()
-        return result
-
-def get_path():
-    if len(sys.argv) > 1:
-        return os.path.abspath(sys.argv[1])
-    else:
-        return os.path.abspath('.')
-
-if __name__ == u'__main__':
-    path = get_path()
-    print get_version(path)
-

resources/osx/openlp.cfg.sample

@@ -1,10 +0,0 @@
-[openlp]
-openlp_appname = OpenLP
-openlp_dmgname = OpenLP-1.9.6-bzrXXXX
-openlp_version = XXXX
-openlp_basedir = /Users/openlp/repo/trunk
-openlp_icon_file = openlp-logo-with-text.icns
-openlp_dmg_icon_file = openlp-logo-420x420.png
-installer_backgroundimage_file = installation-background.png
-pyinstaller_basedir = /Users/openlp/pyinstaller/trunk
-qt_menu_basedir = /Library/Frameworks/QtGui.framework/Versions/4/Resources/qt_menu.nib

resources/osx/openlp.spec.master

@@ -1,24 +0,0 @@
-# -*- mode: python -*-
-a = Analysis([os.path.join(HOMEPATH,'support/_mountzlib.py'), os.path.join(CONFIGDIR,'support/useUnicode.py'), '%(openlp_basedir)s/openlp.pyw'],
-             pathex=['%(pyinstaller_basedir)s'], hookspath=['%(openlp_basedir)s/resources/pyinstaller'])
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=1,
-          name=os.path.join('build/pyi.darwin/openlp', 'openlp'),
-          debug=False,
-          strip=False,
-          upx=True,
-          console=1 )
-coll = COLLECT( exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name=os.path.join('dist', 'openlp'))
-import sys
-if sys.platform.startswith("darwin"):
-    app = BUNDLE(coll,
-                 name='%(openlp_appname)s.app',
-                 version='%(openlp_version)s')

resources/windows/LICENSE.txt

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       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
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-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
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-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
-
-  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
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-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
-
-	    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
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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; either version 2 of the License, or
-    (at your option) any later version.
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a 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.

resources/windows/OpenLP-2.0.iss

@@ -1,184 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define AppName "OpenLP"
-#define AppVerName "OpenLP 2.0"
-#define AppPublisher "OpenLP Developers"
-#define AppURL "http://openlp.org/"
-#define AppExeName "OpenLP.exe"
-
-#define FileHandle FileOpen("..\..\dist\OpenLP\.version")
-#define FileLine FileRead(FileHandle)
-#define RealVersion FileLine
-#expr FileClose(FileHandle)
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
-AppName={#AppName}
-AppVerName={#AppVerName}
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#AppURL}
-AppUpdatesURL={#AppURL}
-DefaultDirName={pf}\{#AppName}
-DefaultGroupName={#AppVerName}
-AllowNoIcons=true
-LicenseFile=LICENSE.txt
-OutputDir=..\..\dist
-OutputBaseFilename=OpenLP-{#RealVersion}-setup
-Compression=lzma/Max
-SolidCompression=true
-SetupIconFile=OpenLP.ico
-WizardImageFile=WizImageBig.bmp
-WizardSmallImageFile=WizImageSmall.bmp
-ChangesAssociations=true
-
-[Languages]
-Name: english; MessagesFile: compiler:Default.isl
-Name: basque; MessagesFile: compiler:Languages\Basque.isl
-Name: brazilianportuguese; MessagesFile: compiler:Languages\BrazilianPortuguese.isl
-Name: catalan; MessagesFile: compiler:Languages\Catalan.isl
-Name: czech; MessagesFile: compiler:Languages\Czech.isl
-Name: danish; MessagesFile: compiler:Languages\Danish.isl
-Name: dutch; MessagesFile: compiler:Languages\Dutch.isl
-Name: finnish; MessagesFile: compiler:Languages\Finnish.isl
-Name: french; MessagesFile: compiler:Languages\French.isl
-Name: german; MessagesFile: compiler:Languages\German.isl
-Name: hebrew; MessagesFile: compiler:Languages\Hebrew.isl
-Name: hungarian; MessagesFile: compiler:Languages\Hungarian.isl
-Name: italian; MessagesFile: compiler:Languages\Italian.isl
-Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
-Name: norwegian; MessagesFile: compiler:Languages\Norwegian.isl
-Name: polish; MessagesFile: compiler:Languages\Polish.isl
-Name: portuguese; MessagesFile: compiler:Languages\Portuguese.isl
-Name: russian; MessagesFile: compiler:Languages\Russian.isl
-Name: slovak; MessagesFile: compiler:Languages\Slovak.isl
-Name: slovenian; MessagesFile: compiler:Languages\Slovenian.isl
-Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
-
-[Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0, 6.1
-
-[Files]
-Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
-; DLL used to check if the target program is running at install time
-Source: psvince.dll; flags: dontcopy
-; psvince is installed in {app} folder, so it will be loaded at
-; uninstall time to check if the target program is running
-Source: psvince.dll; DestDir: {app}
-
-[Icons]
-Name: {group}\{#AppName}; Filename: {app}\{#AppExeName}
-Name: {group}\{#AppName} (Debug); Filename: {app}\{#AppExeName}; Parameters: -l debug
-Name: {group}\{#AppName} Help; Filename: {app}\{#AppName}.chm; Check: FileExists(ExpandConstant('{app}\{#AppName}.chm'))
-Name: {group}\{cm:ProgramOnTheWeb,{#AppName}}; Filename: {#AppURL}
-Name: {group}\{cm:UninstallProgram,{#AppName}}; Filename: {uninstallexe}
-Name: {commondesktop}\{#AppName}; Filename: {app}\{#AppExeName}; Tasks: desktopicon
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {app}\{#AppExeName}; Tasks: quicklaunchicon
-
-[Run]
-Filename: {app}\{#AppExeName}; Description: {cm:LaunchProgram,{#AppName}}; Flags: nowait postinstall skipifsilent
-
-[Registry]
-Root: HKCR; Subkey: .osz; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
-Root: HKCR; Subkey: OpenLP; ValueType: string; ValueName: ; ValueData: OpenLP Service; Flags: uninsdeletekey
-Root: HKCR; Subkey: OpenLP\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\OpenLP.exe,0
-Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1"""
-
-[UninstallDelete]
-; Remove support directory created when program is run:
-Type: filesandordirs; Name: {app}\support
-; Remove program directory if empty:
-Name: {app}; Type: dirifempty
-
-[Code]
-// Function to call psvince.dll at install time
-function IsModuleLoadedInstall(modulename: AnsiString ):  Boolean;
-external 'IsModuleLoaded@files:psvince.dll stdcall setuponly';
-
-// Function to call psvince.dll at uninstall time
-function IsModuleLoadedUninstall(modulename: AnsiString ):  Boolean;
-external 'IsModuleLoaded@{app}\psvince.dll stdcall uninstallonly' ;
-
-function GetUninstallString(): String;
-var
-  sUnInstPath: String;
-  sUnInstallString: String;
-begin
-  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
-  sUnInstallString := '';
-  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
-    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
-  Result := sUnInstallString;
-end;
-
-function IsUpgrade(): Boolean;
-begin
-  Result := (GetUninstallString() <> '');
-end;
-
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
-function UnInstallOldVersion(): Integer;
-var
-  sUnInstallString: String;
-  iResultCode: Integer;
-begin
-  Result := 0;
-  sUnInstallString := GetUninstallString();
-  if sUnInstallString <> '' then
-  begin
-    sUnInstallString := RemoveQuotes(sUnInstallString);
-    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
-      Result := 3
-    else
-      Result := 2;
-  end
-  else
-    Result := 1;
-end;
-
-function InitializeSetup(): Boolean;
-begin
-  Result := true;
-  while IsModuleLoadedInstall( 'OpenLP.exe' ) and Result do
-  begin
-    if MsgBox( 'Openlp is currently running, please close it to continue the install.',
-      mbError, MB_OKCANCEL ) =  IDCANCEL then
-	begin
-	  Result := false;
-	end;
-  end;
-end;
-
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  if (CurStep=ssInstall) then
-  begin
-    if (IsUpgrade()) then
-    begin
-      UnInstallOldVersion();
-    end;
-  end;
-end;
-
-function InitializeUninstall(): Boolean;
-begin
-  Result := true;
-  while IsModuleLoadedUninstall( 'OpenLP.exe' ) and Result do
-  begin
-    if MsgBox( 'Openlp is currently running, please close it to continue the uninstall.',
-      mbError, MB_OKCANCEL ) =  IDCANCEL then
-	begin
-	  Result := false;
-	end;
-  end;
-// Unload psvince.dll, otherwise it is not deleted
-  UnloadDLL(ExpandConstant('{app}\psvince.dll'));
-end;

resources/windows/openlp.conf

@@ -1,26 +0,0 @@
-[bibles]
-status = 1
-
-[media]
-status = 1
-
-[alerts]
-status = 1
-
-[presentations]
-status = 1
-
-[custom]
-status = 1
-
-[remotes]
-status = 0
-
-[images]
-status = 1
-
-[songusage]
-status = 1
-
-[songs]
-status = 1

scripts/windows-builder.py

@@ -1,407 +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, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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                          #
-###############################################################################
-
-"""
-Windows Build Script
---------------------
-
-This script is used to build the Windows binary and the accompanying installer.
-For this script to work out of the box, it depends on a number of things:
-
-Python 2.6/2.7
-
-PyQt4
-    You should already have this installed, OpenLP doesn't work without it. The
-    version the script expects is the packaged one available from River Bank
-    Computing.
-
-PyEnchant
-    This script expects the precompiled, installable version of PyEnchant to be
-    installed. You can find this on the PyEnchant site.
-
-Inno Setup 5
-    Inno Setup should be installed into "C:\%PROGRAMFILES%\Inno Setup 5"
-
-Sphinx
-    This is used to build the documentation.  The documentation trunk must be at
-    the same directory level as Openlp trunk and named "documentation".
-
-HTML Help Workshop
-    This is used to create the help file.
-
-PyInstaller
-    PyInstaller should be a checkout of revision 1470 of trunk, and in a
-    directory called, "pyinstaller" on the same level as OpenLP's Bazaar shared
-    repository directory. The revision is very important as there is currently
-    a major regression in HEAD.
-
-    To install PyInstaller, first checkout trunk from Subversion. The easiest
-    way is to install TortoiseSVN and then checkout the following URL to a
-    directory called "pyinstaller"::
-
-        http://svn.pyinstaller.org/trunk
-
-Bazaar
-    You need the command line "bzr" client installed.
-
-OpenLP
-    A checkout of the latest code, in a branch directory, which is in a Bazaar
-    shared repository directory. This means your code should be in a directory
-    structure like this: "openlp\branch-name".
-
-Visual C++ 2008 Express Edition
-    This is to build pptviewlib.dll, the library for controlling the
-    PowerPointViewer.
-
-windows-builder.py
-    This script, of course. It should be in the "scripts" directory of OpenLP.
-
-psvince.dll
-    This dll is used during the actual install of OpenLP to check if OpenLP is
-    running on the users machine prior to the setup.  If OpenLP is running,
-    the install will fail.  The dll can be obtained from here:
-        
-        http://www.vincenzo.net/isxkb/index.php?title=PSVince)
-    
-    The dll is presently included in .\\resources\\windows
-
-Mako
-    Mako Templates for Python.  This package is required for building the
-    remote plugin.  It can be installed by going to your
-    python_directory\scripts\.. and running "easy_install Mako".  If you do not
-    have easy_install, the Mako package can be obtained here:
-        
-        http://www.makotemplates.org/download.html
-         
-Sqlalchemy Migrate
-    Required for the data-bases used in OpenLP.  The package can be
-    obtained here:
-    
-        http://code.google.com/p/sqlalchemy-migrate/
-    
-"""
-
-import os
-import sys
-from shutil import copy, rmtree
-from subprocess import Popen, PIPE
-from ConfigParser import SafeConfigParser as ConfigParser
-
-# Executable paths
-python_exe = sys.executable
-innosetup_exe = os.path.join(os.getenv(u'PROGRAMFILES'), 'Inno Setup 5',
-    u'ISCC.exe')
-sphinx_exe = os.path.join(os.path.split(python_exe)[0], u'Scripts',
-    u'sphinx-build.exe')
-hhc_exe = os.path.join(os.getenv(u'PROGRAMFILES'), 'HTML Help Workshop',
-    u'hhc.exe')
-vcbuild_exe = os.path.join(os.getenv(u'PROGRAMFILES'),
-    u'Microsoft Visual Studio 9.0', u'VC', u'vcpackages', u'vcbuild.exe')
-
-# Base paths
-script_path = os.path.split(os.path.abspath(__file__))[0]
-branch_path = os.path.abspath(os.path.join(script_path, u'..'))
-doc_branch_path = os.path.abspath(os.path.join(script_path, u'..',
-    u'..', u'documentation'))
-site_packages = os.path.join(os.path.split(python_exe)[0], u'Lib',
-    u'site-packages')
-
-# Files and executables
-pyi_build = os.path.abspath(os.path.join(branch_path, u'..', u'..',
-    u'pyinstaller', u'pyinstaller.py'))
-openlp_main_script = os.path.abspath(os.path.join(branch_path, 'openlp.pyw'))
-if os.path.exists(os.path.join(site_packages, u'PyQt4', u'bin')):
-    # Older versions of the PyQt4 Windows installer put their binaries in the
-    # "bin" directory
-    lrelease_exe = os.path.join(site_packages, u'PyQt4', u'bin', u'lrelease.exe')
-else:
-    # Newer versions of the PyQt4 Windows installer put their binaries in the
-    # base directory of the installation
-    lrelease_exe = os.path.join(site_packages, u'PyQt4', u'lrelease.exe')
-i18n_utils = os.path.join(script_path, u'translation_utils.py')
-win32_icon = os.path.join(branch_path, u'resources', u'images', 'OpenLP.ico')
-
-# Paths
-source_path = os.path.join(branch_path, u'openlp')
-manual_path = os.path.join(doc_branch_path, u'manual')
-manual_build_path = os.path.join(manual_path, u'build')
-helpfile_path = os.path.join(manual_build_path, u'htmlhelp')
-i18n_path = os.path.join(branch_path, u'resources', u'i18n')
-winres_path = os.path.join(branch_path, u'resources', u'windows')
-build_path = os.path.join(branch_path, u'build')
-dist_path = os.path.join(branch_path, u'dist', u'OpenLP')
-pptviewlib_path = os.path.join(source_path, u'plugins', u'presentations',
-    u'lib', u'pptviewlib')
-hooks_path = os.path.join(branch_path , u'resources', u'pyinstaller')
-
-# Transifex details -- will be read in from the file.
-transifex_filename = os.path.abspath(os.path.join(branch_path, '..',
-    'transifex.conf'))
-
-def update_code():
-    os.chdir(branch_path)
-    print u'Reverting any changes to the code...'
-    bzr = Popen((u'bzr', u'revert'), stdout=PIPE)
-    output, error = bzr.communicate()
-    code = bzr.wait()
-    if code != 0:
-       print output
-       raise Exception(u'Error reverting the code')
-    print u'Updating the code...'
-    bzr = Popen((u'bzr', u'update'), stdout=PIPE)
-    output, error = bzr.communicate()
-    code = bzr.wait()
-    if code != 0:
-       print output
-       raise Exception(u'Error updating the code')
-
-def run_pyinstaller():
-    print u'Running PyInstaller...'
-    os.chdir(branch_path)
-    pyinstaller = Popen((python_exe, pyi_build,
-        u'--noconfirm',
-        u'--windowed',
-        u'--noupx',
-        u'--additional-hooks-dir', hooks_path,
-        u'--log-level=ERROR',
-        u'-o', branch_path,
-        u'-i', win32_icon,
-        u'-p', branch_path,
-        u'-n', 'OpenLP',
-        openlp_main_script),
-        stdout=PIPE)
-    output, error = pyinstaller.communicate()
-    code = pyinstaller.wait()
-    if code != 0:
-        print output
-        raise Exception(u'Error running PyInstaller')
-
-def write_version_file():
-    print u'Writing version file...'
-    os.chdir(branch_path)
-    bzr = Popen((u'bzr', u'tags', u'--sort', u'time'), stdout=PIPE)
-    output, error = bzr.communicate()
-    code = bzr.wait()
-    if code != 0:
-        raise Exception(u'Error running bzr tags')
-    lines = output.splitlines()
-    if len(lines) == 0:
-        tag = u'0.0.0'
-        revision = u'0'
-    else:
-        tag, revision = lines[-1].split()
-    bzr = Popen((u'bzr', u'log', u'--line', u'-r', u'-1'), stdout=PIPE)
-    output, error = bzr.communicate()
-    code = bzr.wait()
-    if code != 0:
-        raise Exception(u'Error running bzr log')
-    outputAscii = unicode(output, errors='ignore')
-    latest = outputAscii.split(u':')[0]
-    versionstring = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
-    f = open(os.path.join(dist_path, u'.version'), u'w')
-    f.write(versionstring)
-    f.close()
-
-def copy_plugins():
-    print u'Copying plugins...'
-    source = os.path.join(source_path, u'plugins')
-    dest = os.path.join(dist_path, u'plugins')
-    for root, dirs, files in os.walk(source):
-        for filename in files:
-            if not filename.endswith(u'.pyc'):
-                dest_path = os.path.join(dest, root[len(source)+1:])
-                if not os.path.exists(dest_path):
-                    os.makedirs(dest_path)
-                copy(os.path.join(root, filename),
-                    os.path.join(dest_path, filename))
-
-def copy_media_player():
-    print u'Copying media player...'
-    source = os.path.join(source_path, u'core', u'ui', u'media')
-    dest = os.path.join(dist_path, u'core', u'ui', u'media')
-    for root, dirs, files in os.walk(source):
-        for filename in files:
-            if not filename.endswith(u'.pyc'):
-                dest_path = os.path.join(dest, root[len(source)+1:])
-                if not os.path.exists(dest_path):
-                    os.makedirs(dest_path)
-                copy(os.path.join(root, filename),
-                    os.path.join(dest_path, filename))
-
-def copy_windows_files():
-    print u'Copying extra files for Windows...'
-    copy(os.path.join(winres_path, u'OpenLP.ico'),
-        os.path.join(dist_path, u'OpenLP.ico'))
-    copy(os.path.join(winres_path, u'LICENSE.txt'),
-        os.path.join(dist_path, u'LICENSE.txt'))
-    copy(os.path.join(winres_path, u'psvince.dll'),
-        os.path.join(dist_path, u'psvince.dll'))
-    if os.path.isfile(os.path.join(helpfile_path, u'OpenLP.chm')):
-        print u'        Windows help file found'
-        copy(os.path.join(helpfile_path, u'OpenLP.chm'),
-            os.path.join(dist_path, u'OpenLP.chm'))
-    else:
-        print u'  WARNING ---- Windows help file not found ---- WARNING'
-
-def update_translations():
-    print u'Updating translations...'
-    if not os.path.exists(transifex_filename):
-        raise Exception(u'Could not find Transifex credentials file: %s' \
-            % transifex_filename)
-    config = ConfigParser()
-    config.read(transifex_filename)
-    if not config.has_section('transifex'):
-        raise Exception(u'No section named "transifex" found.')
-    if not config.has_option('transifex', 'username'):
-        raise Exception(u'No option named "username" found.')
-    if not config.has_option('transifex', 'password'):
-        raise Exception(u'No option named "password" found.')
-    username = config.get('transifex', 'username')
-    password = config.get('transifex', 'password')
-    os.chdir(script_path)
-    translation_utils = Popen([python_exe, i18n_utils, u'-qdpu', '-U',
-        username, '-P', password])
-    code = translation_utils.wait()
-    if code != 0:
-        raise Exception(u'Error running translation_utils.py')
-
-def compile_translations():
-    print u'Compiling translations...'
-    files = os.listdir(i18n_path)
-    if not os.path.exists(os.path.join(dist_path, u'i18n')):
-        os.makedirs(os.path.join(dist_path, u'i18n'))
-    for file in files:
-        if file.endswith(u'.ts'):
-            source_path = os.path.join(i18n_path, file)
-            dest_path = os.path.join(dist_path, u'i18n',
-                file.replace(u'.ts', u'.qm'))
-            lconvert = Popen((lrelease_exe, u'-compress', u'-silent',
-                source_path, u'-qm', dest_path))
-            code = lconvert.wait()
-            if code != 0:
-                raise Exception('Error running lconvert on %s' % source_path)
-    print u'Copying qm files...'
-    source = os.path.join(site_packages, u'PyQt4', u'translations')
-    files = os.listdir(source)
-    for filename in files:
-        if filename.startswith(u'qt_') and filename.endswith(u'.qm') and \
-            len(filename) == 8:
-            copy(os.path.join(source, filename),
-                os.path.join(dist_path, u'i18n', filename))
-
-def run_sphinx():
-    print u'Deleting previous manual build...', manual_build_path
-    if os.path.exists(manual_build_path):
-        rmtree(manual_build_path)
-    print u'Running Sphinx...'
-    os.chdir(manual_path)
-    sphinx = Popen((sphinx_exe, u'-b', u'htmlhelp', u'-d', u'build/doctrees',
-        u'source', u'build/htmlhelp'), stdout=PIPE)
-    output, error = sphinx.communicate()
-    code = sphinx.wait()
-    if code != 0:
-        print output
-        raise Exception(u'Error running Sphinx')
-
-def run_htmlhelp():
-    print u'Running HTML Help Workshop...'
-    os.chdir(os.path.join(manual_build_path, u'htmlhelp'))
-    hhc = Popen((hhc_exe, u'OpenLP.chm'), stdout=PIPE)
-    output, error = hhc.communicate()
-    code = hhc.wait()
-    if code != 1:
-        print u'Exit code:', code
-        print output
-        raise Exception(u'Error running HTML Help Workshop')
-
-def run_innosetup():
-    print u'Running Inno Setup...'
-    os.chdir(winres_path)
-    innosetup = Popen((innosetup_exe,
-        os.path.join(winres_path, u'OpenLP-2.0.iss'), u'/q'))
-    code = innosetup.wait()
-    if code != 0:
-        raise Exception(u'Error running Inno Setup')
-
-def build_pptviewlib():
-    print u'Building PPTVIEWLIB.DLL...'
-    vcbuild = Popen((vcbuild_exe, u'/rebuild',
-        os.path.join(pptviewlib_path, u'pptviewlib.vcproj'), u'Release|Win32'))
-    code = vcbuild.wait()
-    if code != 0:
-        raise Exception(u'Error building pptviewlib.dll')
-    copy(os.path.join(pptviewlib_path, u'Release', u'pptviewlib.dll'),
-        pptviewlib_path)
-
-def main():
-    skip_update = False
-    import sys
-    for arg in sys.argv:
-        if arg == u'-v' or arg == u'--verbose':
-            print "OpenLP main script: ......", openlp_main_script
-            print "Script path: .............", script_path
-            print "Branch path: .............", branch_path
-            print "Source path: .............", source_path
-            print "\"dist\" path: .............", dist_path
-            print "PyInstaller: .............", pyi_build
-            print "Documentation branch path:", doc_branch_path
-            print "Help file build path: ....", helpfile_path
-            print "Inno Setup path: .........", innosetup_exe
-            print "Windows resources: .......", winres_path
-            print "VCBuild path: ............", vcbuild_exe
-            print "PPTVIEWLIB path: .........", pptviewlib_path
-            print ""
-        elif arg == u'--skip-update':
-            skip_update = True
-        elif arg == u'/?' or arg == u'-h' or arg == u'--help':
-            print u'Command options:'
-            print u' -v --verbose : More verbose output'
-            print u' --skip-update : Do not update or revert current branch'
-            exit()
-    if not skip_update:
-        update_code()
-    build_pptviewlib()
-    run_pyinstaller()
-    write_version_file()
-    copy_plugins()
-    copy_media_player()
-    if os.path.exists(manual_path):
-        run_sphinx()
-        run_htmlhelp()
-    else:
-        print u' '
-        print u'  WARNING ---- Documentation Trunk not found ---- WARNING'
-        print u'  --- Windows Help file will not be included in build ---'
-        print u' '
-    copy_windows_files()
-    update_translations()
-    compile_translations()
-    run_innosetup()
-    print "Done."
-
-if __name__ == u'__main__':
-    main()