From b77b0d18d7d1924fb7998b3d0a04ee04402e452c Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Wed, 25 Jan 2012 22:04:36 +0000
Subject: [PATCH] Added QR Code and link to download android app to settings
 tab

---
 openlp/plugins/remotes/lib/remotetab.py |  20 ++++++++++++++++++++
 resources/images/android_app_qr.png     | Bin 0 -> 558 bytes
 resources/images/openlp-2.qrc           |   3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 resources/images/android_app_qr.png

diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index a1276800a..35fbe64cf 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -81,6 +81,20 @@ class RemoteTab(SettingsTab):
         self.stageUrl.setOpenExternalLinks(True)
         self.serverSettingsLayout.addRow(self.stageUrlLabel, self.stageUrl)
         self.leftLayout.addWidget(self.serverSettingsGroupBox)
+        self.androidAppGroupBox = QtGui.QGroupBox(self.rightColumn)
+        self.androidAppGroupBox.setObjectName(u'androidAppGroupBox')
+        self.rightLayout.addWidget(self.androidAppGroupBox)
+        self.qrLayout = QtGui.QVBoxLayout(self.androidAppGroupBox)
+        self.qrLayout.setObjectName(u'qrLayout')
+        self.qrCodeLabel = QtGui.QLabel(self.androidAppGroupBox)
+        self.qrCodeLabel.setPixmap(QtGui.QPixmap(u':/remotes/android_app_qr.png'))
+        self.qrCodeLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.qrCodeLabel.setObjectName(u'qrCodeLabel')
+        self.qrLayout.addWidget(self.qrCodeLabel)
+        self.qrDescriptionLabel = QtGui.QLabel(self.androidAppGroupBox)
+        self.qrDescriptionLabel.setObjectName(u'qrDescriptionLabel')
+        self.qrDescriptionLabel.setOpenExternalLinks(True)
+        self.qrLayout.addWidget(self.qrDescriptionLabel)
         self.leftLayout.addStretch()
         self.rightLayout.addStretch()
         QtCore.QObject.connect(self.twelveHourCheckBox,
@@ -101,6 +115,12 @@ class RemoteTab(SettingsTab):
         self.twelveHourCheckBox.setText(
             translate('RemotePlugin.RemoteTab',
             'Display stage time in 12h format'))
+        self.androidAppGroupBox.setTitle(
+            translate('RemotePlugin.RemoteTab', 'Android App'))
+        self.qrDescriptionLabel.setText(translate('RemotePlugin.RemoteTab',
+            'Scan the QR code or click <a '
+            'href="https://market.android.com/details?id=org.openlp.android">'
+            'download</a> to install the Android app from the Market.'))
 
     def setUrls(self):
         ipAddress = u'localhost'
diff --git a/resources/images/android_app_qr.png b/resources/images/android_app_qr.png
new file mode 100644
index 0000000000000000000000000000000000000000..66e40df132c0700f05458e7e5ece6f92f0e25b88
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq003kF003kG0{{R3N-PH#00001b5ch_0Itp)
z=>Px#22e~?MgRZ*00010!qa{L000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS}
z6#xXJ+2Ydx00FK^L_t(I%Z=2rYQr!P0MHW}w1j%~V9+nbo3+HhQs@sDx*9C-YVZ#P
z@+;O7Z_Y0WJY-GrB0=y~ayleVt5n+?j`Q954&dL9quFjE&AC97E5(rIlFE^hj=a#E
zr7l2o)qg!pbS@Fb<h8Obl#m$li$EwueKq2i{cmx!!)No6oPR3%TL5GzE6KIF_2OQv
z%icCcNj0%uSn*6|dU+pXYnQLS7vyu=)|vuZ6&B086sHl+S?)7D2w(?AQGvF~#|7l$
znoUU!nshBb=c=jpsC)bhE4IhHZTB1qs<5ETwsbn6UdH&Sn5nKTX%buGXA}@)cAyO%
zO+Tkk630lENpfaO=R-m~q3fs4)vy+j{!&B-ZhD_DsBX90MAuQH&mI!Dy{g-hvZHVr
zR#J05wKdhk&o(3=>JnXCwN~L;9P%M*fX2AYC?K$1RLg{)ajEt}{J0|xJ^264Z%05b
z{b{N->Wrzi++`p*Ny<czVfo82wOTX7{C0#iXKz(4eLrtE<WcD)ff~c`m4uSf9^K4O
wPjZ*xT4}cl%cch8FJDn`fK1$~z0<$nH?9Oh^fp(5<NyEw07*qoM6N<$g7CNXUH||9

literal 0
HcmV?d00001

diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index c12b67002..dc444d445 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -149,4 +149,7 @@
     <file>theme_new.png</file>
     <file>theme_edit.png</file>
   </qresource>
+  <qresource prefix="remotes">
+    <file>android_app_qr.png</file>
+  </qresource>
 </RCC>