Head r811 and trivialities

openlp/core/ui/slidecontroller.py

@@ -674,10 +674,10 @@ class SlideController(QtGui.QWidget):
         self.themeButton.setChecked(False)
         if checked:
             Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
-            self.blankPlugin(True)
+            self.hidePlugin(True)
         else:
             Receiver.send_message(u'maindisplay_show')
-            self.blankPlugin(False)
+            self.hidePlugin(False)
 
     def blankPlugin(self, blank):
         """
@@ -693,6 +693,20 @@ class SlideController(QtGui.QWidget):
                     % self.serviceItem.name.lower(),
                     [self.serviceItem, self.isLive])
 
+    def hidePlugin(self, hide):
+        """
+        Blank the display screen.
+        """
+        if self.serviceItem is not None:
+            if hide:
+                Receiver.send_message(u'%s_hide'
+                    % self.serviceItem.name.lower(),
+                    [self.serviceItem, self.isLive])
+            else:
+                Receiver.send_message(u'%s_unblank'
+                    % self.serviceItem.name.lower(),
+                    [self.serviceItem, self.isLive])
+
     def onSlideSelected(self):
         """
         Generate the preview when you click on a slide.

openlp/plugins/images/lib/mediaitem.py

@@ -143,7 +143,7 @@ class ImageMediaItem(MediaManagerItem):
     def generateSlideData(self, service_item, item=None):
         items = self.ListView.selectedIndexes()
         if items:
-            service_item.title = self.trUtf8('Image(s)')
+            service_item.title = unicode(self.trUtf8('Image(s)'))
             service_item.add_capability(ItemCapabilities.AllowsMaintain)
             service_item.add_capability(ItemCapabilities.AllowsPreview)
             service_item.add_capability(ItemCapabilities.AllowsLoop)

openlp/plugins/presentations/lib/messagelistener.py

@@ -160,6 +160,16 @@ class Controller(object):
             return
         self.doc.blank_screen()
 
+    def stop(self):
+        log.debug(u'Live = %s, stop' % self.isLive)
+        if not self.isLive:
+            return
+        if not self.doc.is_loaded():
+            return
+        if not self.doc.is_active():
+            return
+        self.doc.stop_presentation()
+
     def unblank(self):
         log.debug(u'Live = %s, unblank' % self.isLive)
         if not self.isLive:
@@ -190,6 +200,8 @@ class MessageListener(object):
             QtCore.SIGNAL(u'presentations_start'), self.startup)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'presentations_stop'), self.shutdown)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'presentations_hide'), self.hide)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'presentations_first'), self.first)
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -279,6 +291,11 @@ class MessageListener(object):
         else:
             self.previewHandler.shutdown()
 
+    def hide(self, message):
+        isLive, item = self.decode_message(message)
+        if isLive:
+            self.liveHandler.stop()
+
     def blank(self, message):
         isLive, item = self.decode_message(message)
         if isLive:

openlp/plugins/remotes/html/index.html

@@ -63,7 +63,7 @@ function response(eventname, req){
                     html += ' style="font-weight: bold"';
                 html += '>';
                 html += '<td>' + data[row]['tag'] + '</td>';
-                html += '<td>' + data[row]['text'].replace(/\\n/g, '<br>');
+                html += '<td>' + data[row]['text'].replace(/\n/g, '<br>');
                 html += '</td></tr>';
             }
             html += '</table>';
@@ -105,10 +105,12 @@ send_event("remotes_poll_request");
     <hr>
     <input type='button' value='Order of service' 
         onclick='send_event("servicemanager_list_request");'>
+    <i>(Click service item to go live.)</i>
     <div id='service'></div>
     <hr>
     <input type='button' value='Current item' 
         onclick='send_event("slidecontroller_live_text_request");'>
+    <i>(Click verse to display.)</i>
     <div id='currentitem'></div>
     <hr>
     <a href="http://www.openlp.org/">OpenLP website</a>

openlp/plugins/remotes/lib/httpserver.py

@@ -152,44 +152,60 @@ class HttpConnection(object):
             log.debug(u'received: ' + data)
             words = data.split(u' ')
             html = None
+            mimetype = None
             if words[0] == u'GET':
                 url = urlparse.urlparse(words[1])
                 params = self.load_params(url.query)
                 folders = url.path.split(u'/')
                 if folders[1] == u'':
-                    html = self.serve_file(u'')
+                    mimetype, html = self.serve_file(u'')
                 elif folders[1] == u'files':
-                    html = self.serve_file(folders[2])
+                    mimetype, html = self.serve_file(os.sep.join(folders[2:]))
                 elif folders[1] == u'send':
                     html = self.process_event(folders[2], params)
                 elif folders[1] == u'request':
                     if self.process_request(folders[2], params):
                         return
             if html:
-                html = self.get_200_ok() + html + u'\n'
+                if mimetype:
+                    self.send_200_ok(mimetype)
+                else:
+                    self.send_200_ok()
+                self.socket.write(html)
             else:
-                html = self.get_404_not_found()
+                self.send_404_not_found()
-            self.socket.write(html)
             self.close()
 
     def serve_file(self, filename):
         """
-        Send a file to the socket. For now, just .html files
+        Send a file to the socket. For now, just a subset of file types
         and must be top level inside the html folder. 
         If subfolders requested return 404, easier for security for the present.
 
         Ultimately for i18n, this could first look for xx/file.html before
         falling back to file.html... where xx is the language, e.g. 'en'
         """
-        log.debug(u'serve file request %s' % filename)
+        log.debug(u'serve file request %s' % filename)        
         if not filename:
             filename = u'index.html'
-        if os.path.basename(filename) != filename:
+        path = os.path.normpath(os.path.join(self.parent.html_dir, filename))
+        if not path.startswith(self.parent.html_dir):
             return None
         (fileroot, ext) = os.path.splitext(filename)
-        if ext != u'.html':
+        if ext == u'.html':
-            return None
+            mimetype = u'text/html'
-        path = os.path.join(self.parent.html_dir, filename)
+        elif ext == u'.css':
+            mimetype = u'text/css'
+        elif ext == u'.js':
+            mimetype = u'application/x-javascript'
+        elif ext == u'.jpg':
+            mimetype = u'image/jpeg'
+        elif ext == u'.gif':
+            mimetype = u'image/gif'
+        elif ext == u'.png':
+            mimetype = u'image/png'
+        else:
+            return (None, None)
         try:
             f = open(path, u'rb')
         except:
@@ -198,12 +214,13 @@ class HttpConnection(object):
         log.debug(u'Opened %s' % path)
         html = f.read()
         f.close()
-        return html
+        return (mimetype, html)
-                               
+
     def load_params(self, query):
         """
         Decode the query string parameters sent from the browser
         """
+        log.debug(u'loading params %s' % query)
         params = urlparse.parse_qs(query)
         if not params:
             return None
@@ -216,6 +233,7 @@ class HttpConnection(object):
         Currently lets anything through. Later we should restrict and perform
         basic parameter checking, otherwise rogue clients could crash openlp
         """
+        log.debug(u'Processing event %s' % event)
         if params:
             Receiver.send_message(event, params)    
         else:                  
@@ -233,6 +251,7 @@ class HttpConnection(object):
         is just waiting for slide change/song change activity. This can wait
         longer (one minute)
         """
+        log.debug(u'Processing request %s' % event)
         if not event.endswith(u'_request'):
             return False
         self.event = event
@@ -258,36 +277,36 @@ class HttpConnection(object):
         The recipient of a _request signal has sent data. Convert this to 
         json and return it to client
         """
+        log.debug(u'Processing response for %s' % self.event)
         if not self.socket:
             return
         self.timer.stop()
         html = json.dumps(data)
-        html = self.get_200_ok() + html + u'\n'
+        self.send_200_ok()
         self.socket.write(html)
         self.close()
 
-    def get_200_ok(self):
+    def send_200_ok(self, mimetype='text/html; charset="utf-8"'):
         """
         Successful request. Send OK headers. Assume html for now. 
         """
-        return u'HTTP/1.1 200 OK\r\n' + \
+        self.socket.write(u'HTTP/1.1 200 OK\r\n' + \
-            u'Content-Type: text/html; charset="utf-8"\r\n' + \
+            u'Content-Type: %s\r\n\r\n' % mimetype)
-            u'\r\n'
 
-    def get_404_not_found(self):
+    def send_404_not_found(self):
         """
         Invalid url. Say so
         """
-        return u'HTTP/1.1 404 Not Found\r\n'+ \
+        self.socket.write(u'HTTP/1.1 404 Not Found\r\n'+ \
             u'Content-Type: text/html; charset="utf-8"\r\n' + \
-            u'\r\n'
+            u'\r\n')
 
-    def get_408_timeout(self):
+    def send_408_timeout(self):
         """
         A _request hasn't returned anything in the timeout period. 
         Return timeout
         """
-        return u'HTTP/1.1 408 Request Timeout\r\n'
+        self.socket.write(u'HTTP/1.1 408 Request Timeout\r\n')
             
     def timeout(self):
         """
@@ -295,8 +314,7 @@ class HttpConnection(object):
         """
         if not self.socket:
             return
-        html = self.get_408_timeout()
+        self.send_408_timeout()
-        self.socket.write(html)
         self.close()
                 
     def disconnected(self):
@@ -316,4 +334,3 @@ class HttpConnection(object):
         self.socket.close()
         self.socket = None
         self.parent.close_connection(self)
-