openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/remotes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/remotes/+merge/102150

Add tag to allow the Android client to see if a service list has changed since it's last poll.  
Value does not matter just that it has changed.
-- 
https://code.launchpad.net/~trb143/openlp/remotes/+merge/102150
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/remotes into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2012-04-03 17:59:34 +0000
+++ openlp/core/ui/servicemanager.py	2012-04-16 17:52:21 +0000
@@ -105,6 +105,7 @@
         self.suffixes = []
         self.dropPosition = 0
         self.expandTabs = False
+        self.serviceId = 0
         # is a new service and has not been saved
         self._modified = False
         self._fileName = u''
@@ -331,6 +332,8 @@
         Setter for property "modified". Sets whether or not the current service
         has been modified.
         """
+        if modified:
+            self.serviceId += 1
         self._modified = modified
         serviceFile = self.shortFileName() or translate(
             'OpenLP.ServiceManager', 'Untitled Service')
@@ -439,6 +442,7 @@
         self.serviceManagerList.clear()
         self.serviceItems = []
         self.setFileName(u'')
+        self.serviceId += 1
         self.setModified(False)
         QtCore.QSettings(). \
             setValue(u'servicemanager/last file',QtCore.QVariant(u''))

=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py	2012-03-18 09:31:41 +0000
+++ openlp/plugins/remotes/lib/httpserver.py	2012-04-16 17:52:21 +0000
@@ -396,6 +396,7 @@
         Poll OpenLP to determine the current slide number and item name.
         """
         result = {
+            u'service': self.parent.plugin.serviceManager.serviceId or 0,
             u'slide': self.parent.current_slide or 0,
             u'item': self.parent.current_item._uuid \
                 if self.parent.current_item else u'',