From d4e83ae45ac8eba973d78124a37e764e42619244 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 20 May 2011 00:09:42 +0100
Subject: [PATCH 01/20] Remote web add to service

---
 openlp/core/lib/mediamanageritem.py      | 20 ++++++++++----------
 openlp/plugins/remotes/html/index.html   |  2 +-
 openlp/plugins/remotes/html/openlp.js    | 22 +++++++++++++++-------
 openlp/plugins/remotes/lib/httpserver.py | 13 ++++++++++++-
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 2e514935f..a16754452 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -506,18 +506,18 @@ class MediaManagerItem(QtGui.QWidget):
             # multiple service items?
             if self.singleServiceItem or self.remoteTriggered:
                 log.debug(u'%s Add requested', self.plugin.name)
-                serviceItem = self.buildServiceItem(None, True)
-                if serviceItem:
-                    serviceItem.from_plugin = False
-                    self.parent.serviceManager.addServiceItem(serviceItem,
-                        replace=self.remoteTriggered)
+                self.addToService([None], self.remoteTriggered)
             else:
                 items = self.listView.selectedIndexes()
-                for item in items:
-                    serviceItem = self.buildServiceItem(item, True)
-                    if serviceItem:
-                        serviceItem.from_plugin = False
-                        self.parent.serviceManager.addServiceItem(serviceItem)
+                self.addToService(items)
+
+    def addToService(self, items, replace=None):
+        for item in items:
+            serviceItem = self.buildServiceItem(item, True)
+            if serviceItem:
+                serviceItem.from_plugin = False
+                self.parent.serviceManager.addServiceItem(serviceItem,
+                    replace=replace)
 
     def onAddEditClick(self):
         """
diff --git a/openlp/plugins/remotes/html/index.html b/openlp/plugins/remotes/html/index.html
index fd7fb3715..bfb0d5ea4 100644
--- a/openlp/plugins/remotes/html/index.html
+++ b/openlp/plugins/remotes/html/index.html
@@ -109,7 +109,7 @@
       <input type="search" name="search-text" id="search-text" value="" />
     </div>
     <a href="#" id="search-submit" data-role="button">Search</a>
-    <ul data-role="listview" data-inset="true">
+    <ul data-role="listview" data-inset="true" data-split-icon="plus">
   </div>
 </div>
 </body>
diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 4eee047a4..4688fb499 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -219,9 +219,13 @@ window.OpenLP = {
         } 
         else {
             $.each(data.results.items, function (idx, value) {
-              var li = $("<li data-icon=\"false\">").append(
-                $("<a href=\"#\">").attr("value", value[0]).text(value[1]));
-              li.children("a").click(OpenLP.goLive);
+              var li = $("<li>");
+              li.append($("<a href=\"#\">").text(value[1]).click(function () {
+                OpenLP.goLive(value[0]);
+              }));
+              li.append($("<a href=\"#\">").click(function () {
+                OpenLP.addToService(value[0]);
+              }));
               ul.append(li);
             });
         }
@@ -230,17 +234,21 @@ window.OpenLP = {
     );
     return false;
   },
-  goLive: function (event) {
-    var slide = OpenLP.getElement(event);
-    var id = slide.attr("value");
+  goLive: function (id) {
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/live",
       {"data": text})
     $.mobile.changePage("slide-controller");
     return false;
+  },
+  addToService: function (id) {
+    var text = JSON.stringify({"request": {"id": id}});
+    $.getJSON(
+      "/api/" + $("#search-plugin").val() + "/add",
+      {"data": text})
+    return false;
   }
-
 }
 // Service Manager
 $("#service-manager").live("pagebeforeshow", OpenLP.loadService);
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index 351e7f905..d17f924c8 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -253,7 +253,8 @@ class HttpConnection(object):
             (r'^/api/alert$', self.alert),
             (r'^/api/plugin/(search)$', self.pluginInfo),
             (r'^/api/(.*)/search$', self.search),
-            (r'^/api/(.*)/live$', self.go_live)
+            (r'^/api/(.*)/live$', self.go_live),
+            (r'^/api/(.*)/add$', self.add_to_service)
         ]
         QtCore.QObject.connect(self.socket, QtCore.SIGNAL(u'readyRead()'),
             self.ready_read)
@@ -490,6 +491,16 @@ class HttpConnection(object):
         if plugin.status == PluginStatus.Active and plugin.mediaItem:
             plugin.mediaItem.goLive(id)
 
+    def add_to_service(self, type):
+        """
+        Add item of type ``type`` to the end of the service
+        """
+        id = json.loads(self.url_params[u'data'][0])[u'request'][u'id']
+        plugin = self.parent.parent.pluginManager.get_plugin_by_name(type)
+        if plugin.status == PluginStatus.Active and plugin.mediaItem:
+            item_id = plugin.mediaItem.createItemFromId(id)
+            plugin.mediaItem.addToService([item_id])
+
     def send_response(self, response):
         http = u'HTTP/1.1 %s\r\n' % response.code
         for header, value in response.headers.iteritems():

From 3359726be2164e35cf78bbd34beb4538fbe6430f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 20 May 2011 17:14:10 +0200
Subject: [PATCH 02/20] improved media item sorting

---
 openlp/plugins/custom/lib/mediaitem.py |  5 +++++
 openlp/plugins/songs/lib/mediaitem.py  | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 66b1c3675..72db3bfa4 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -25,6 +25,8 @@
 ###############################################################################
 
 import logging
+import locale
+import operator
 
 from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_, func
@@ -135,6 +137,9 @@ class CustomMediaItem(MediaManagerItem):
 
     def loadList(self, list):
         self.listView.clear()
+        # Sort the customs by its title considering language specific
+        # characters.
+        list.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
         for customSlide in list:
             custom_name = QtGui.QListWidgetItem(customSlide.title)
             custom_name.setData(
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 5f961b2f2..19a2924b3 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -26,6 +26,7 @@
 
 import logging
 import locale
+import operator
 
 from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_
@@ -229,7 +230,8 @@ class SongMediaItem(MediaManagerItem):
     def displayResultsSong(self, searchresults):
         log.debug(u'display results Song')
         self.listView.clear()
-        searchresults.sort(cmp=self.collateSongTitles)
+        # Sort the songs by its title considering language specific characters.
+        searchresults.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
         for song in searchresults:
             author_list = [author.display_name for author in song.authors]
             song_title = unicode(song.title)
@@ -472,13 +474,6 @@ class SongMediaItem(MediaManagerItem):
             Receiver.send_message(u'service_item_update',
                 u'%s:%s' % (editId, item._uuid))
 
-    def collateSongTitles(self, song_1, song_2):
-        """
-        Locale aware collation of song titles
-        """
-        return locale.strcoll(unicode(song_1.title.lower()),
-             unicode(song_2.title.lower()))
-
     def search(self, string):
         """
         Search for some songs

From 5a7aa2fb9fde71785dfbee7641f9c7a1ad6b2b70 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 20 May 2011 17:18:57 +0200
Subject: [PATCH 03/20] do not override list

---
 openlp/plugins/custom/lib/mediaitem.py        | 10 +++++-----
 openlp/plugins/presentations/lib/mediaitem.py | 10 ++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 72db3bfa4..f22771eff 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -135,15 +135,15 @@ class CustomMediaItem(MediaManagerItem):
             self.onPreviewClick()
         self.onRemoteEditClear()
 
-    def loadList(self, list):
+    def loadList(self, custom_slides):
         self.listView.clear()
         # Sort the customs by its title considering language specific
         # characters.
-        list.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
-        for customSlide in list:
-            custom_name = QtGui.QListWidgetItem(customSlide.title)
+        custom_slides.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
+        for custom_slide in custom_slides:
+            custom_name = QtGui.QListWidgetItem(custom_slide.title)
             custom_name.setData(
-                QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id))
+                QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id))
             self.listView.addItem(custom_name)
 
     def onNewClick(self):
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 7660c9099..5cc6f1fe1 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -149,20 +149,18 @@ class PresentationMediaItem(MediaManagerItem):
         else:
             self.presentationWidget.hide()
 
-    def loadList(self, list, initialLoad=False):
+    def loadList(self, files, initialLoad=False):
         """
         Add presentations into the media manager
         This is called both on initial load of the plugin to populate with
         existing files, and when the user adds new files via the media manager
         """
         currlist = self.getFileList()
-        titles = []
-        for file in currlist:
-            titles.append(os.path.split(file)[1])
+        titles = [os.path.split(file)[1] for file in currlist]
         Receiver.send_message(u'cursor_busy')
         if not initialLoad:
-            self.parent.formparent.displayProgressBar(len(list))
-        for file in list:
+            self.parent.formparent.displayProgressBar(len(files))
+        for file in files:
             if not initialLoad:
                 self.parent.formparent.incrementProgressBar()
             if currlist.count(file) > 0:

From f753070f53bebc8f85d877ad666f4db0be9ca9c6 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 20 May 2011 19:06:38 +0200
Subject: [PATCH 04/20] fix for windows

---
 openlp/plugins/custom/lib/mediaitem.py | 3 ++-
 openlp/plugins/songs/lib/mediaitem.py  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index f22771eff..064a558ba 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -139,7 +139,8 @@ class CustomMediaItem(MediaManagerItem):
         self.listView.clear()
         # Sort the customs by its title considering language specific
         # characters.
-        custom_slides.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
+        custom_slides.sort(
+            cmp=locale.strcoll, key=operator.attrgetter('title').lower())
         for custom_slide in custom_slides:
             custom_name = QtGui.QListWidgetItem(custom_slide.title)
             custom_name.setData(
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 19a2924b3..eb65fa775 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -231,7 +231,8 @@ class SongMediaItem(MediaManagerItem):
         log.debug(u'display results Song')
         self.listView.clear()
         # Sort the songs by its title considering language specific characters.
-        searchresults.sort(cmp=locale.strcoll, key=operator.attrgetter('title'))
+        searchresults.sort(
+            cmp=locale.strcoll, key=operator.attrgetter('title').lower())
         for song in searchresults:
             author_list = [author.display_name for author in song.authors]
             song_title = unicode(song.title)

From bbbf0d3435d90fa524aab711035853b344b6f0f6 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 20 May 2011 23:30:20 +0100
Subject: [PATCH 05/20] Go live/add to service via list

---
 openlp/core/ui/servicemanager.py       |  2 +-
 openlp/plugins/remotes/html/index.html |  2 +-
 openlp/plugins/remotes/html/openlp.js  | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 358877cc7..94cf621ab 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -757,7 +757,7 @@ class ServiceManager(QtGui.QWidget):
         """
         Called by a signal to select a specific item.
         """
-        self.setItem(int(message[0]))
+        self.setItem(int(message))
 
     def setItem(self, index):
         """
diff --git a/openlp/plugins/remotes/html/index.html b/openlp/plugins/remotes/html/index.html
index bfb0d5ea4..fd7fb3715 100644
--- a/openlp/plugins/remotes/html/index.html
+++ b/openlp/plugins/remotes/html/index.html
@@ -109,7 +109,7 @@
       <input type="search" name="search-text" id="search-text" value="" />
     </div>
     <a href="#" id="search-submit" data-role="button">Search</a>
-    <ul data-role="listview" data-inset="true" data-split-icon="plus">
+    <ul data-role="listview" data-inset="true">
   </div>
 </div>
 </body>
diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 4688fb499..c75a0cf90 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -219,22 +219,23 @@ window.OpenLP = {
         } 
         else {
             $.each(data.results.items, function (idx, value) {
-              var li = $("<li>");
-              li.append($("<a href=\"#\">").text(value[1]).click(function () {
-                OpenLP.goLive(value[0]);
-              }));
-              li.append($("<a href=\"#\">").click(function () {
-                OpenLP.addToService(value[0]);
-              }));
+              var li = $("<li><ul>").text(value[1]);
+              li.append($("<ul><li><a id=\"go-live\" href=\"#\">Go Live</a></li>" +
+              "<li><a id =\"add-service\" href=\"#\">Add To Service</a></li></ul>"));
+              li.find("a").attr("value", value[0]);
               ul.append(li);
             });
+            ul.find("#go-live").click(OpenLP.goLive);
+            ul.find("#add-service").click(OpenLP.addToService);
         }
         ul.listview("refresh");
       }
     );
     return false;
   },
-  goLive: function (id) {
+  goLive: function (event) {
+    var item = OpenLP.getElement(event);
+    var id = item.attr("value");
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/live",
@@ -242,11 +243,14 @@ window.OpenLP = {
     $.mobile.changePage("slide-controller");
     return false;
   },
-  addToService: function (id) {
+  addToService: function (event) {
+    var item = OpenLP.getElement(event);
+    var id = item.attr("value");
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/add",
       {"data": text})
+    history.back();
     return false;
   }
 }

From 732f5321dd14028880233065d80bdad2582f8d4d Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 20 May 2011 23:32:46 +0100
Subject: [PATCH 06/20] indent

---
 openlp/plugins/remotes/html/openlp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index c75a0cf90..a0812ef8a 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -221,7 +221,7 @@ window.OpenLP = {
             $.each(data.results.items, function (idx, value) {
               var li = $("<li><ul>").text(value[1]);
               li.append($("<ul><li><a id=\"go-live\" href=\"#\">Go Live</a></li>" +
-              "<li><a id =\"add-service\" href=\"#\">Add To Service</a></li></ul>"));
+                "<li><a id =\"add-service\" href=\"#\">Add To Service</a></li></ul>"));
               li.find("a").attr("value", value[0]);
               ul.append(li);
             });

From 218ee2db2b4ab1651509ae535f024d51c34f9811 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 21 May 2011 10:14:30 +0100
Subject: [PATCH 07/20] tweak the jquery

---
 openlp/plugins/remotes/html/openlp.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index a0812ef8a..37ee73d9f 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -219,14 +219,12 @@ window.OpenLP = {
         } 
         else {
             $.each(data.results.items, function (idx, value) {
-              var li = $("<li><ul>").text(value[1]);
-              li.append($("<ul><li><a id=\"go-live\" href=\"#\">Go Live</a></li>" +
-                "<li><a id =\"add-service\" href=\"#\">Add To Service</a></li></ul>"));
-              li.find("a").attr("value", value[0]);
-              ul.append(li);
+              var item = $("<li>").text(value[1]);
+              var golive = $("<a href=\"#\">Go Live</a>").attr("value", value[0]).click(OpenLP.goLive);
+              var additem = $("<a href=\"#\">Add To Service</a>").attr("value", value[0]).click(OpenLP.addToService);
+              item.append($("<ul>").append($("<li>").append(golive)).append($("<li>").append(additem)));
+              ul.append(item);
             });
-            ul.find("#go-live").click(OpenLP.goLive);
-            ul.find("#add-service").click(OpenLP.addToService);
         }
         ul.listview("refresh");
       }

From 031525b0e65ce084afccc039315f300a22e46e48 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 21 May 2011 18:43:37 +0100
Subject: [PATCH 08/20] Lose the [None] and fix jquery issue

---
 openlp/core/lib/mediamanageritem.py      | 18 +++++++++---------
 openlp/plugins/remotes/html/openlp.js    |  7 +++++--
 openlp/plugins/remotes/lib/httpserver.py |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index a16754452..ff05fd5a7 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -506,18 +506,18 @@ class MediaManagerItem(QtGui.QWidget):
             # multiple service items?
             if self.singleServiceItem or self.remoteTriggered:
                 log.debug(u'%s Add requested', self.plugin.name)
-                self.addToService([None], self.remoteTriggered)
+                self.addToService(replace=self.remoteTriggered)
             else:
                 items = self.listView.selectedIndexes()
-                self.addToService(items)
+                for item in items:
+                    self.addToService(item)
 
-    def addToService(self, items, replace=None):
-        for item in items:
-            serviceItem = self.buildServiceItem(item, True)
-            if serviceItem:
-                serviceItem.from_plugin = False
-                self.parent.serviceManager.addServiceItem(serviceItem,
-                    replace=replace)
+    def addToService(self, item=None, replace=None):
+        serviceItem = self.buildServiceItem(item, True)
+        if serviceItem:
+            serviceItem.from_plugin = False
+            self.parent.serviceManager.addServiceItem(serviceItem,
+                replace=replace)
 
     def onAddEditClick(self):
         """
diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 37ee73d9f..09312876c 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -247,8 +247,11 @@ window.OpenLP = {
     var text = JSON.stringify({"request": {"id": id}});
     $.getJSON(
       "/api/" + $("#search-plugin").val() + "/add",
-      {"data": text})
-    history.back();
+      {"data": text},
+      function () {
+        history.back();
+      }
+    );
     return false;
   }
 }
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index d17f924c8..3436a153c 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -499,7 +499,7 @@ class HttpConnection(object):
         plugin = self.parent.parent.pluginManager.get_plugin_by_name(type)
         if plugin.status == PluginStatus.Active and plugin.mediaItem:
             item_id = plugin.mediaItem.createItemFromId(id)
-            plugin.mediaItem.addToService([item_id])
+            plugin.mediaItem.addToService(item_id)
 
     def send_response(self, response):
         http = u'HTTP/1.1 %s\r\n' % response.code

From 0c365e2a5900ee40320eaf2a81fbffdd46daa7f1 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 21 May 2011 23:16:28 +0100
Subject: [PATCH 09/20] Windows command line

---
 openlp.pyw                       | 10 ++++++----
 openlp/core/ui/mainwindow.py     |  6 +-----
 resources/windows/OpenLP-2.0.iss |  9 +++++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index 76d334bae..a97dc6e2e 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -77,7 +77,6 @@ class OpenLP(QtGui.QApplication):
     The core application class. This class inherits from Qt's QApplication
     class in order to provide the core of the application.
     """
-
     def exec_(self):
         """
         Override exec method to allow the shared memory to be released on exit
@@ -85,10 +84,13 @@ class OpenLP(QtGui.QApplication):
         QtGui.QApplication.exec_()
         self.sharedMemory.detach()
 
-    def run(self):
+    def run(self, args):
         """
         Run the OpenLP application.
         """
+        # On Windows, the args passed into the constructor are
+        # ignored. Not very handy, so set the ones we want to use.
+        self.args = args
         # provide a listener for widgets to reqest a screen update.
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
@@ -115,7 +117,7 @@ class OpenLP(QtGui.QApplication):
         # make sure Qt really display the splash screen
         self.processEvents()
         # start the main app window
-        self.mainWindow = MainWindow(self.clipboard(), self.arguments())
+        self.mainWindow = MainWindow(self.clipboard(), self.args)
         self.mainWindow.show()
         if show_splash:
             # now kill the splashscreen
@@ -250,7 +252,7 @@ def main():
         log.debug(u'Could not find default_translator.')
     if not options.no_error_form:
         sys.excepthook = app.hookException
-    sys.exit(app.run())
+    sys.exit(app.run(qt_args))
 
 if __name__ == u'__main__':
     """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 09e2ec9e7..6fec3a40b 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -615,11 +615,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         if self.liveController.display.isVisible():
             self.liveController.display.setFocus()
         self.activateWindow()
-        # On Windows, arguments contains the entire commandline
-        # So args[0]=='python' args[1]=='openlp.pyw'
-        # Therefore this approach is not going to work
-        # Bypass for now.
-        if len(self.arguments) and os.name != u'nt':
+        if len(self.arguments):
             args = []
             for a in self.arguments:
                 args.extend([a])
diff --git a/resources/windows/OpenLP-2.0.iss b/resources/windows/OpenLP-2.0.iss
index 9f193b0e8..adeb4ef7c 100644
--- a/resources/windows/OpenLP-2.0.iss
+++ b/resources/windows/OpenLP-2.0.iss
@@ -16,7 +16,7 @@
 ; 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}
+AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
 AppName={#AppName}
 AppVerName={#AppVerName}
 AppPublisher={#AppPublisher}
@@ -29,11 +29,12 @@ AllowNoIcons=true
 LicenseFile=LICENSE.txt
 OutputDir=..\..\dist
 OutputBaseFilename=OpenLP-{#RealVersion}-setup
-Compression=lzma
+Compression=lzma/Max
 SolidCompression=true
 SetupIconFile=OpenLP.ico
 WizardImageFile=WizImageBig.bmp
 WizardSmallImageFile=WizImageSmall.bmp
+ChangesAssociations=true
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -79,6 +80,10 @@ Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filenam
 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"""
 
 [Code]
 function GetUninstallString(): String;

From a1e20921e22e2ba1ba1e288d4b8e10d2dd9f2206 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 21 May 2011 23:21:34 +0100
Subject: [PATCH 10/20] blankline

---
 openlp.pyw | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openlp.pyw b/openlp.pyw
index a97dc6e2e..5ecfbe5f5 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -77,6 +77,7 @@ class OpenLP(QtGui.QApplication):
     The core application class. This class inherits from Qt's QApplication
     class in order to provide the core of the application.
     """
+
     def exec_(self):
         """
         Override exec method to allow the shared memory to be released on exit

From 594caf0a193a1e3e4ed80c856363b28681bda1c4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 12:34:42 +0200
Subject: [PATCH 11/20] fix for windows

---
 openlp/plugins/custom/lib/mediaitem.py | 2 +-
 openlp/plugins/songs/lib/mediaitem.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 064a558ba..e56200ee7 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -140,7 +140,7 @@ class CustomMediaItem(MediaManagerItem):
         # Sort the customs by its title considering language specific
         # characters.
         custom_slides.sort(
-            cmp=locale.strcoll, key=operator.attrgetter('title').lower())
+            cmp=locale.strcoll, key=lambda custom: custom.title.lower())
         for custom_slide in custom_slides:
             custom_name = QtGui.QListWidgetItem(custom_slide.title)
             custom_name.setData(
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index eb65fa775..cbdb20462 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -232,7 +232,7 @@ class SongMediaItem(MediaManagerItem):
         self.listView.clear()
         # Sort the songs by its title considering language specific characters.
         searchresults.sort(
-            cmp=locale.strcoll, key=operator.attrgetter('title').lower())
+            cmp=locale.strcoll, key=lambda song: song.title.lower())
         for song in searchresults:
             author_list = [author.display_name for author in song.authors]
             song_title = unicode(song.title)

From 73293c2985daeead5ac3e5ec61d3709d1fd019d8 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 13:14:05 +0200
Subject: [PATCH 12/20] removed imports

---
 openlp/plugins/custom/lib/mediaitem.py | 1 -
 openlp/plugins/songs/lib/mediaitem.py  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index e56200ee7..d19f462d7 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -26,7 +26,6 @@
 
 import logging
 import locale
-import operator
 
 from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_, func
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index cbdb20462..0dabeb766 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -26,7 +26,6 @@
 
 import logging
 import locale
-import operator
 
 from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_

From ce5c354e06c587df7c0b04ab68ff2dddf0bf2a66 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 13:49:14 +0200
Subject: [PATCH 13/20] fix for head

---
 openlp/plugins/custom/lib/mediaitem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 054a75424..e137d69e3 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -146,7 +146,7 @@ class CustomMediaItem(MediaManagerItem):
                 QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id))
             self.listView.addItem(custom_name)
             # Auto-select the item if name has been set
-            if customSlide.title == self.autoSelectItem :
+            if custom_slide.title == self.autoSelectItem:
                 self.listView.setCurrentItem(custom_name)
 
     def onNewClick(self):

From 7fbef0d7d77589d8da98cc10fe6a9562857ed55a Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Mon, 23 May 2011 11:41:22 -0400
Subject: [PATCH 14/20] added:   resources/windows/psvince.dll modified:  
 resources/windows/OpenLP-2.0.iss   scripts/windows-builder.py

---
 resources/windows/OpenLP-2.0.iss |  17 +++++++++++++++++
 resources/windows/psvince.dll    | Bin 0 -> 36864 bytes
 scripts/windows-builder.py       |   2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 resources/windows/psvince.dll

diff --git a/resources/windows/OpenLP-2.0.iss b/resources/windows/OpenLP-2.0.iss
index adeb4ef7c..9d2e6bfaa 100644
--- a/resources/windows/OpenLP-2.0.iss
+++ b/resources/windows/OpenLP-2.0.iss
@@ -65,6 +65,7 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription
 
 [Files]
 Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: psvince.dll; Flags: dontcopy
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -86,6 +87,9 @@ Root: HKCR; Subkey: "OpenLP\DefaultIcon"; ValueType: string; ValueName: ""; Valu
 Root: HKCR; Subkey: "OpenLP\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\OpenLP.exe"" ""%1"""
 
 [Code]
+function IsModuleLoaded(modulename: String ):  Boolean;
+external 'IsModuleLoaded@files:psvince.dll stdcall';
+
 function GetUninstallString(): String;
 var
   sUnInstPath: String;
@@ -126,6 +130,19 @@ begin
     Result := 1;
 end;
 
+function InitializeSetup(): Boolean;
+begin
+  Result := true;
+  while IsModuleLoaded( '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
diff --git a/resources/windows/psvince.dll b/resources/windows/psvince.dll
new file mode 100644
index 0000000000000000000000000000000000000000..e910509d0dfff5e99e12dbdd1a56bf3b5aadd5ff
GIT binary patch
literal 36864
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

literal 0
HcmV?d00001

diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py
index 8f2dc0171..26394f189 100644
--- a/scripts/windows-builder.py
+++ b/scripts/windows-builder.py
@@ -225,6 +225,8 @@ def copy_windows_files():
         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'),

From ffd017799f7574e66562a4828c1003555169a77e Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 19:28:52 +0200
Subject: [PATCH 15/20] new 'word by word' algorithm

---
 openlp/core/lib/renderer.py | 68 +++++++++++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index bba85d176..f06fba539 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -231,7 +231,11 @@ class Renderer(object):
                     pages.extend(new_pages)
             # Bibles
             elif item.is_capable(ItemCapabilities.AllowsWordSplit):
+                import time
+                import datetime
+                start = time.time()
                 pages = self._paginate_slide_words(text, line_break)
+                print unicode(datetime.timedelta(seconds=time.time() - start))
         return pages
 
     def _calculate_default(self, screen):
@@ -367,7 +371,7 @@ class Renderer(object):
 
         """
         log.debug(u'_paginate_slide_words - Start')
-        line_end = u''
+        line_end = u' '
         if line_break:
             line_end = u'<br>'
         formatted = []
@@ -375,6 +379,7 @@ class Renderer(object):
         previous_raw = u''
         lines = text.split(u'\n')
         for line in lines:
+            line = line.strip()
             styled_line = expand_tags(line)
             html = self.page_shell + previous_html + styled_line + HTML_END
             self.web.setHtml(html)
@@ -402,24 +407,59 @@ class Renderer(object):
                             previous_html = styled_line + line_end
                             previous_raw = line + line_end
                             continue
-                words = self._words_split(line)
-                for word in words:
-                    styled_word = expand_tags(word)
-                    html = self.page_shell + previous_html + styled_word + \
-                        HTML_END
+                # Figure out how many words of the line will fit on screen.
+                # Instead of just looping of the list of words we follow a
+                # certain tactic, namely we try if the half of line fits. If it
+                # does we try if the half of the other half and the first half
+                # (75%) will still fit. In the case that the first half does not
+                # fit, we try if 25% will fit.
+                raw_words = self._words_split(line)
+                html_words = [expand_tags(word) for word in raw_words]
+                smallest_index = 0
+                highest_index = len(html_words) - 1
+                index = int(highest_index / 2)
+                while True:
+                    html = self.page_shell + previous_html + \
+                        u''.join(html_words[:index + 1]).strip() + HTML_END
                     self.web.setHtml(html)
-                    # Text too long so go to next page
                     if self.web_frame.contentsSize().height() > \
                         self.page_height:
-                        while previous_raw.endswith(u'<br>'):
-                            previous_raw = previous_raw[:-4]
-                        formatted.append(previous_raw)
+                        # We know that it does not fit, so change/calculate the
+                        # new index and highest_index accordingly.
+                        highest_index = index
+                        index = int(index - (index - smallest_index) / 2)
+                    else:
+                        smallest_index = index
+                        index = int(index + (highest_index - index) / 2)
+                    # We found the number of words which will fit
+                    if smallest_index == index or highest_index == index:
+                        formatted.append(previous_raw.rstrip(u'<br>') +
+                            u''.join(raw_words[:index + 1]))
                         previous_html = u''
                         previous_raw = u''
-                    previous_html += styled_word
-                    previous_raw += word
-                previous_html += line_end
-                previous_raw += line_end
+                    else:
+                        continue
+                    # Check if the rest of the line fits on the slide. If it
+                    # does we do not have to do the much more intensive "word by
+                    # word" checking.
+                    html = self.page_shell + \
+                        u''.join(html_words[index + 1:]).strip() + HTML_END
+                    self.web.setHtml(html)
+                    if self.web_frame.contentsSize().height() <= \
+                        self.page_height:
+                        previous_html = \
+                            u''.join(html_words[index + 1:]).strip() + line_end
+                        previous_raw = \
+                            u''.join(raw_words[index + 1:]).strip() + line_end
+                        break
+                    else:
+                        # The other words do not fit, thus reset the indexes,
+                        # create a new list and continue with "word by word".
+                        raw_words = raw_words[index + 1:]
+                        html_words = html_words[index + 1:]
+                        smallest_index = 0
+                        highest_index = len(html_words) - 1
+                        index = int(highest_index / 2)
             else:
                 previous_html += styled_line + line_end
                 previous_raw += line + line_end

From 86023454916178161633cf51ef1655a5fc032dad Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 20:23:45 +0200
Subject: [PATCH 16/20] removed print

---
 openlp/core/lib/renderer.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index f06fba539..ea6c3b4ce 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -231,11 +231,7 @@ class Renderer(object):
                     pages.extend(new_pages)
             # Bibles
             elif item.is_capable(ItemCapabilities.AllowsWordSplit):
-                import time
-                import datetime
-                start = time.time()
                 pages = self._paginate_slide_words(text, line_break)
-                print unicode(datetime.timedelta(seconds=time.time() - start))
         return pages
 
     def _calculate_default(self, screen):

From 5b7dc621123e5860bbdb11d3e87cf5e5092182dd Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 23 May 2011 20:41:49 +0200
Subject: [PATCH 17/20] comments

---
 openlp/core/lib/renderer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index f413bd778..6b20f7670 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -335,7 +335,7 @@ class Renderer(object):
             styled_text += styled_line
             html = self.page_shell + styled_text + HTML_END
             self.web.setHtml(html)
-            # Text too long so go to next page
+            # Text too long so go to next page.
             if self.web_frame.contentsSize().height() > self.page_height:
                 if force_page and line_count > 0:
                     Receiver.send_message(u'theme_line_count', line_count)
@@ -378,7 +378,7 @@ class Renderer(object):
             styled_line = expand_tags(line)
             html = self.page_shell + previous_html + styled_line + HTML_END
             self.web.setHtml(html)
-            # Text too long so go to next page
+            # Text too long so go to next page.
             if self.web_frame.contentsSize().height() > self.page_height:
                 # Check if there was a verse before the current one and append
                 # it, when it fits on the page.
@@ -426,7 +426,7 @@ class Renderer(object):
                     else:
                         smallest_index = index
                         index = int(index + (highest_index - index) / 2)
-                    # We found the number of words which will fit
+                    # We found the number of words which will fit.
                     if smallest_index == index or highest_index == index:
                         formatted.append(previous_raw.rstrip(u'<br>') +
                             u''.join(raw_words[:index + 1]))

From 5473d3c817febdad4e622c7d63df61efbff00623 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 24 May 2011 07:23:28 +0200
Subject: [PATCH 18/20] added windows comment

---
 openlp/plugins/custom/lib/mediaitem.py | 2 +-
 openlp/plugins/songs/lib/mediaitem.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index e137d69e3..85e6e51f2 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -137,7 +137,7 @@ class CustomMediaItem(MediaManagerItem):
     def loadList(self, custom_slides):
         self.listView.clear()
         # Sort the customs by its title considering language specific
-        # characters.
+        # characters. lower() is needed for windows!
         custom_slides.sort(
             cmp=locale.strcoll, key=lambda custom: custom.title.lower())
         for custom_slide in custom_slides:
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 45827da0b..23632ca58 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -230,6 +230,7 @@ class SongMediaItem(MediaManagerItem):
         log.debug(u'display results Song')
         self.listView.clear()
         # Sort the songs by its title considering language specific characters.
+        # lower() is needed for windows!
         searchresults.sort(
             cmp=locale.strcoll, key=lambda song: song.title.lower())
         for song in searchresults:

From 2377a5f5ff915f19b08fd0f5a144d6f324bf25cd Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 24 May 2011 09:02:13 +0200
Subject: [PATCH 19/20] fix for Esther 8:7

---
 openlp/core/lib/renderer.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 6b20f7670..cb65dc057 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -402,12 +402,8 @@ class Renderer(object):
                             previous_html = styled_line + line_end
                             previous_raw = line + line_end
                             continue
-                # Figure out how many words of the line will fit on screen.
-                # Instead of just looping of the list of words we follow a
-                # certain tactic, namely we try if the half of line fits. If it
-                # does we try if the half of the other half and the first half
-                # (75%) will still fit. In the case that the first half does not
-                # fit, we try if 25% will fit.
+                # Figure out how many words of the line will fit on screen by
+                # using the algorithm known as "binary chop".
                 raw_words = self._words_split(line)
                 html_words = [expand_tags(word) for word in raw_words]
                 smallest_index = 0
@@ -428,6 +424,7 @@ class Renderer(object):
                         index = int(index + (highest_index - index) / 2)
                     # We found the number of words which will fit.
                     if smallest_index == index or highest_index == index:
+                        index = smallest_index
                         formatted.append(previous_raw.rstrip(u'<br>') +
                             u''.join(raw_words[:index + 1]))
                         previous_html = u''

From ca6e172f5accf4113f2a2b4757797b4f07b23d4d Mon Sep 17 00:00:00 2001
From: Stevan Pettit <smpettit@casinternet.net>
Date: Tue, 24 May 2011 08:57:58 -0400
Subject: [PATCH 20/20] modified:   scripts/windows-builder.py

---
 scripts/windows-builder.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py
index 26394f189..750f14916 100644
--- a/scripts/windows-builder.py
+++ b/scripts/windows-builder.py
@@ -95,6 +95,12 @@ Visual C++ 2008 Express Edition
 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)
+
 """
 
 import os