From ce55fd1d57b61be6e36aac7e8374a0b141ee5f12 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 20 Apr 2014 21:16:08 +0100
Subject: [PATCH] fixes

---
 openlp/core/ui/pluginform.py            |  1 -
 openlp/plugins/remotes/lib/remotetab.py |  2 +-
 openlp/plugins/remotes/remoteplugin.py  | 20 ++++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 91b98b97a..78bdee4a5 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -30,7 +30,6 @@
 The actual plugin view form
 """
 import logging
-import os
 
 from PyQt4 import QtGui
 
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index 42d46c581..4db25cfc2 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -310,5 +310,5 @@ class RemoteTab(SettingsTab):
             painter = QtGui.QPainter(icon)
             painter.drawImage(20, 0, overlay)
             painter.end()
-        self.remote_server_icon.setIcon(build_icon(icon))
+        self.remote_server_icon.setPixmap(QtGui.QPixmap.fromImage(icon))
         self.remote_server_icon.show()
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 2538991da..582192df4 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -68,12 +68,20 @@ class RemotesPlugin(Plugin):
         log.debug('initialise')
         super(RemotesPlugin, self).initialise()
         self.server = OpenLPServer()
-        self.remote_server_icon = QtGui.QToolButton(self.main_window.status_bar)
-        self.remote_server_icon.setCheckable(False)
-        self.remote_server_icon.setAutoRaise(True)
-        self.remote_server_icon.setObjectName('remote_server_icon')
-        self.main_window.status_bar.insertPermanentWidget(2, self.remote_server_icon)
-        self.settings_tab.remote_server_icon = self.remote_server_icon
+        if not hasattr(self, 'remote_server_icon'):
+            self.remote_server_icon = QtGui.QLabel(self.main_window.status_bar)
+            size_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+            size_policy.setHorizontalStretch(0)
+            size_policy.setVerticalStretch(0)
+            size_policy.setHeightForWidth(self.remote_server_icon.sizePolicy().hasHeightForWidth())
+            self.remote_server_icon.setSizePolicy(size_policy)
+            self.remote_server_icon.setFrameShadow(QtGui.QFrame.Plain)
+            self.remote_server_icon.setLineWidth(1)
+            self.remote_server_icon.setScaledContents(True)
+            self.remote_server_icon.setFixedSize(20, 20)
+            self.remote_server_icon.setObjectName('remote_server_icon')
+            self.main_window.status_bar.insertPermanentWidget(2, self.remote_server_icon)
+            self.settings_tab.remote_server_icon = self.remote_server_icon
         self.settings_tab.generate_icon()
 
     def finalise(self):