openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #32158
[Merge] lp:~phill-ridout/openlp/qr into lp:openlp
Phill has proposed merging lp:~phill-ridout/openlp/qr into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/qr/+merge/331625
Removed one qr code from the remotes tab and made the other point to the openlp website mobile downloads so that:
* Remote tab is less cluttered
* Future proof updates, these only need to be made on the website, meaning that older versions of openlp will not break
* Offer android users the option to use f-store (rather than automatically being sent to the play store)
--------------------------------
lp:~phill-ridout/openlp/qr (revision 2770)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2231/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2134/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/2016/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1381/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1208/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/338/
[FAILURE] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/175/
Stopping after failure
--
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/qr into lp:openlp.
=== modified file 'openlp/core/api/tab.py'
--- openlp/core/api/tab.py 2017-09-29 18:53:04 +0000
+++ openlp/core/api/tab.py 2017-10-01 07:44:54 +0000
@@ -129,36 +129,21 @@
self.master_version_value.setObjectName('master_version_value')
self.update_site_layout.addRow(self.master_version_label, self.master_version_value)
self.left_layout.addWidget(self.update_site_group_box)
- self.android_app_group_box = QtWidgets.QGroupBox(self.right_column)
- self.android_app_group_box.setObjectName('android_app_group_box')
- self.right_layout.addWidget(self.android_app_group_box)
- self.android_qr_layout = QtWidgets.QVBoxLayout(self.android_app_group_box)
- self.android_qr_layout.setObjectName('android_qr_layout')
- self.android_qr_code_label = QtWidgets.QLabel(self.android_app_group_box)
- self.android_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/android_app_qr.png'))
- self.android_qr_code_label.setAlignment(QtCore.Qt.AlignCenter)
- self.android_qr_code_label.setObjectName('android_qr_code_label')
- self.android_qr_layout.addWidget(self.android_qr_code_label)
- self.android_qr_description_label = QtWidgets.QLabel(self.android_app_group_box)
- self.android_qr_description_label.setObjectName('android_qr_description_label')
- self.android_qr_description_label.setOpenExternalLinks(True)
- self.android_qr_description_label.setWordWrap(True)
- self.android_qr_layout.addWidget(self.android_qr_description_label)
- self.ios_app_group_box = QtWidgets.QGroupBox(self.right_column)
- self.ios_app_group_box.setObjectName('ios_app_group_box')
- self.right_layout.addWidget(self.ios_app_group_box)
- self.ios_qr_layout = QtWidgets.QVBoxLayout(self.ios_app_group_box)
- self.ios_qr_layout.setObjectName('ios_qr_layout')
- self.ios_qr_code_label = QtWidgets.QLabel(self.ios_app_group_box)
- self.ios_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/ios_app_qr.png'))
- self.ios_qr_code_label.setAlignment(QtCore.Qt.AlignCenter)
- self.ios_qr_code_label.setObjectName('ios_qr_code_label')
- self.ios_qr_layout.addWidget(self.ios_qr_code_label)
- self.ios_qr_description_label = QtWidgets.QLabel(self.ios_app_group_box)
- self.ios_qr_description_label.setObjectName('ios_qr_description_label')
- self.ios_qr_description_label.setOpenExternalLinks(True)
- self.ios_qr_description_label.setWordWrap(True)
- self.ios_qr_layout.addWidget(self.ios_qr_description_label)
+ self.app_group_box = QtWidgets.QGroupBox(self.right_column)
+ self.app_group_box.setObjectName('app_group_box')
+ self.right_layout.addWidget(self.app_group_box)
+ self.app_qr_layout = QtWidgets.QVBoxLayout(self.app_group_box)
+ self.app_qr_layout.setObjectName('app_qr_layout')
+ self.app_qr_code_label = QtWidgets.QLabel(self.app_group_box)
+ self.app_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/app_qr.svg'))
+ self.app_qr_code_label.setAlignment(QtCore.Qt.AlignCenter)
+ self.app_qr_code_label.setObjectName('app_qr_code_label')
+ self.app_qr_layout.addWidget(self.app_qr_code_label)
+ self.app_qr_description_label = QtWidgets.QLabel(self.app_group_box)
+ self.app_qr_description_label.setObjectName('app_qr_description_label')
+ self.app_qr_description_label.setOpenExternalLinks(True)
+ self.app_qr_description_label.setWordWrap(True)
+ self.app_qr_layout.addWidget(self.app_qr_description_label)
self.left_layout.addStretch()
self.right_layout.addStretch()
self.twelve_hour_check_box.stateChanged.connect(self.on_twelve_hour_check_box_changed)
@@ -195,16 +180,11 @@
self.twelve_hour_check_box.setText(translate('RemotePlugin.RemoteTab', 'Display stage time in 12h format'))
self.thumbnails_check_box.setText(translate('RemotePlugin.RemoteTab',
'Show thumbnails of non-text slides in remote and stage view.'))
- self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
- self.android_qr_description_label.setText(
- translate('RemotePlugin.RemoteTab',
- 'Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google '
- 'Play.').format(qr='https://play.google.com/store/apps/details?id=org.openlp.android2'))
- self.ios_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'iOS App'))
- self.ios_qr_description_label.setText(
- translate('RemotePlugin.RemoteTab',
- 'Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App '
- 'Store.').format(qr='https://itunes.apple.com/app/id1096218725'))
+ self.app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Remote App'))
+ self.app_qr_description_label.setText(
+ translate('RemotePlugin.RemoteTab',
+ 'Scan the QR code or click <a href="{qr}">download</a> to download an app for your mobile device'
+ ).format(qr='https://openlp.org/#mobile-app-downloads'))
self.user_login_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'User Authentication'))
self.aa = UiStrings()
self.update_site_group_box.setTitle(UiStrings().WebDownloadText)
=== removed file 'resources/images/android_app_qr.png'
Binary files resources/images/android_app_qr.png 2015-10-03 11:59:41 +0000 and resources/images/android_app_qr.png 1970-01-01 00:00:00 +0000 differ
=== added file 'resources/images/app_qr.svg'
--- resources/images/app_qr.svg 1970-01-01 00:00:00 +0000
+++ resources/images/app_qr.svg 2017-10-01 07:44:54 +0000
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" baseProfile="full" width="296" height="296" viewBox="0 0 296 296"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+<desc></desc>
+<rect width="296" height="296" fill="#ffffff" cx="0" cy="0" />
+<defs>
+<rect id="p" width="8" height="8" />
+</defs>
+<g fill="#000000">
+<use x="32" y="32" xlink:href="#p" />
+<use x="32" y="40" xlink:href="#p" />
+<use x="32" y="48" xlink:href="#p" />
+<use x="32" y="56" xlink:href="#p" />
+<use x="32" y="64" xlink:href="#p" />
+<use x="32" y="72" xlink:href="#p" />
+<use x="32" y="80" xlink:href="#p" />
+<use x="32" y="96" xlink:href="#p" />
+<use x="32" y="104" xlink:href="#p" />
+<use x="32" y="120" xlink:href="#p" />
+<use x="32" y="128" xlink:href="#p" />
+<use x="32" y="168" xlink:href="#p" />
+<use x="32" y="184" xlink:href="#p" />
+<use x="32" y="192" xlink:href="#p" />
+<use x="32" y="208" xlink:href="#p" />
+<use x="32" y="216" xlink:href="#p" />
+<use x="32" y="224" xlink:href="#p" />
+<use x="32" y="232" xlink:href="#p" />
+<use x="32" y="240" xlink:href="#p" />
+<use x="32" y="248" xlink:href="#p" />
+<use x="32" y="256" xlink:href="#p" />
+<use x="40" y="32" xlink:href="#p" />
+<use x="40" y="80" xlink:href="#p" />
+<use x="40" y="96" xlink:href="#p" />
+<use x="40" y="104" xlink:href="#p" />
+<use x="40" y="120" xlink:href="#p" />
+<use x="40" y="136" xlink:href="#p" />
+<use x="40" y="152" xlink:href="#p" />
+<use x="40" y="160" xlink:href="#p" />
+<use x="40" y="176" xlink:href="#p" />
+<use x="40" y="184" xlink:href="#p" />
+<use x="40" y="208" xlink:href="#p" />
+<use x="40" y="256" xlink:href="#p" />
+<use x="48" y="32" xlink:href="#p" />
+<use x="48" y="48" xlink:href="#p" />
+<use x="48" y="56" xlink:href="#p" />
+<use x="48" y="64" xlink:href="#p" />
+<use x="48" y="80" xlink:href="#p" />
+<use x="48" y="96" xlink:href="#p" />
+<use x="48" y="104" xlink:href="#p" />
+<use x="48" y="112" xlink:href="#p" />
+<use x="48" y="120" xlink:href="#p" />
+<use x="48" y="128" xlink:href="#p" />
+<use x="48" y="136" xlink:href="#p" />
+<use x="48" y="152" xlink:href="#p" />
+<use x="48" y="160" xlink:href="#p" />
+<use x="48" y="184" xlink:href="#p" />
+<use x="48" y="192" xlink:href="#p" />
+<use x="48" y="208" xlink:href="#p" />
+<use x="48" y="224" xlink:href="#p" />
+<use x="48" y="232" xlink:href="#p" />
+<use x="48" y="240" xlink:href="#p" />
+<use x="48" y="256" xlink:href="#p" />
+<use x="56" y="32" xlink:href="#p" />
+<use x="56" y="48" xlink:href="#p" />
+<use x="56" y="56" xlink:href="#p" />
+<use x="56" y="64" xlink:href="#p" />
+<use x="56" y="80" xlink:href="#p" />
+<use x="56" y="96" xlink:href="#p" />
+<use x="56" y="112" xlink:href="#p" />
+<use x="56" y="128" xlink:href="#p" />
+<use x="56" y="136" xlink:href="#p" />
+<use x="56" y="176" xlink:href="#p" />
+<use x="56" y="192" xlink:href="#p" />
+<use x="56" y="208" xlink:href="#p" />
+<use x="56" y="224" xlink:href="#p" />
+<use x="56" y="232" xlink:href="#p" />
+<use x="56" y="240" xlink:href="#p" />
+<use x="56" y="256" xlink:href="#p" />
+<use x="64" y="32" xlink:href="#p" />
+<use x="64" y="48" xlink:href="#p" />
+<use x="64" y="56" xlink:href="#p" />
+<use x="64" y="64" xlink:href="#p" />
+<use x="64" y="80" xlink:href="#p" />
+<use x="64" y="120" xlink:href="#p" />
+<use x="64" y="128" xlink:href="#p" />
+<use x="64" y="136" xlink:href="#p" />
+<use x="64" y="152" xlink:href="#p" />
+<use x="64" y="168" xlink:href="#p" />
+<use x="64" y="176" xlink:href="#p" />
+<use x="64" y="208" xlink:href="#p" />
+<use x="64" y="224" xlink:href="#p" />
+<use x="64" y="232" xlink:href="#p" />
+<use x="64" y="240" xlink:href="#p" />
+<use x="64" y="256" xlink:href="#p" />
+<use x="72" y="32" xlink:href="#p" />
+<use x="72" y="80" xlink:href="#p" />
+<use x="72" y="120" xlink:href="#p" />
+<use x="72" y="136" xlink:href="#p" />
+<use x="72" y="160" xlink:href="#p" />
+<use x="72" y="176" xlink:href="#p" />
+<use x="72" y="208" xlink:href="#p" />
+<use x="72" y="256" xlink:href="#p" />
+<use x="80" y="32" xlink:href="#p" />
+<use x="80" y="40" xlink:href="#p" />
+<use x="80" y="48" xlink:href="#p" />
+<use x="80" y="56" xlink:href="#p" />
+<use x="80" y="64" xlink:href="#p" />
+<use x="80" y="72" xlink:href="#p" />
+<use x="80" y="80" xlink:href="#p" />
+<use x="80" y="96" xlink:href="#p" />
+<use x="80" y="112" xlink:href="#p" />
+<use x="80" y="128" xlink:href="#p" />
+<use x="80" y="144" xlink:href="#p" />
+<use x="80" y="160" xlink:href="#p" />
+<use x="80" y="176" xlink:href="#p" />
+<use x="80" y="192" xlink:href="#p" />
+<use x="80" y="208" xlink:href="#p" />
+<use x="80" y="216" xlink:href="#p" />
+<use x="80" y="224" xlink:href="#p" />
+<use x="80" y="232" xlink:href="#p" />
+<use x="80" y="240" xlink:href="#p" />
+<use x="80" y="248" xlink:href="#p" />
+<use x="80" y="256" xlink:href="#p" />
+<use x="88" y="112" xlink:href="#p" />
+<use x="88" y="120" xlink:href="#p" />
+<use x="88" y="160" xlink:href="#p" />
+<use x="88" y="168" xlink:href="#p" />
+<use x="88" y="192" xlink:href="#p" />
+<use x="96" y="32" xlink:href="#p" />
+<use x="96" y="48" xlink:href="#p" />
+<use x="96" y="56" xlink:href="#p" />
+<use x="96" y="64" xlink:href="#p" />
+<use x="96" y="80" xlink:href="#p" />
+<use x="96" y="96" xlink:href="#p" />
+<use x="96" y="112" xlink:href="#p" />
+<use x="96" y="120" xlink:href="#p" />
+<use x="96" y="136" xlink:href="#p" />
+<use x="96" y="152" xlink:href="#p" />
+<use x="96" y="168" xlink:href="#p" />
+<use x="96" y="176" xlink:href="#p" />
+<use x="96" y="200" xlink:href="#p" />
+<use x="96" y="232" xlink:href="#p" />
+<use x="96" y="240" xlink:href="#p" />
+<use x="96" y="248" xlink:href="#p" />
+<use x="96" y="256" xlink:href="#p" />
+<use x="104" y="40" xlink:href="#p" />
+<use x="104" y="48" xlink:href="#p" />
+<use x="104" y="56" xlink:href="#p" />
+<use x="104" y="112" xlink:href="#p" />
+<use x="104" y="120" xlink:href="#p" />
+<use x="104" y="128" xlink:href="#p" />
+<use x="104" y="168" xlink:href="#p" />
+<use x="104" y="176" xlink:href="#p" />
+<use x="104" y="192" xlink:href="#p" />
+<use x="104" y="200" xlink:href="#p" />
+<use x="104" y="208" xlink:href="#p" />
+<use x="104" y="216" xlink:href="#p" />
+<use x="104" y="224" xlink:href="#p" />
+<use x="104" y="232" xlink:href="#p" />
+<use x="104" y="240" xlink:href="#p" />
+<use x="104" y="248" xlink:href="#p" />
+<use x="104" y="256" xlink:href="#p" />
+<use x="112" y="32" xlink:href="#p" />
+<use x="112" y="40" xlink:href="#p" />
+<use x="112" y="48" xlink:href="#p" />
+<use x="112" y="56" xlink:href="#p" />
+<use x="112" y="72" xlink:href="#p" />
+<use x="112" y="80" xlink:href="#p" />
+<use x="112" y="88" xlink:href="#p" />
+<use x="112" y="96" xlink:href="#p" />
+<use x="112" y="104" xlink:href="#p" />
+<use x="112" y="112" xlink:href="#p" />
+<use x="112" y="120" xlink:href="#p" />
+<use x="112" y="128" xlink:href="#p" />
+<use x="112" y="200" xlink:href="#p" />
+<use x="112" y="208" xlink:href="#p" />
+<use x="112" y="216" xlink:href="#p" />
+<use x="112" y="232" xlink:href="#p" />
+<use x="112" y="240" xlink:href="#p" />
+<use x="120" y="40" xlink:href="#p" />
+<use x="120" y="64" xlink:href="#p" />
+<use x="120" y="72" xlink:href="#p" />
+<use x="120" y="96" xlink:href="#p" />
+<use x="120" y="112" xlink:href="#p" />
+<use x="120" y="136" xlink:href="#p" />
+<use x="120" y="144" xlink:href="#p" />
+<use x="120" y="152" xlink:href="#p" />
+<use x="120" y="184" xlink:href="#p" />
+<use x="120" y="216" xlink:href="#p" />
+<use x="120" y="224" xlink:href="#p" />
+<use x="120" y="232" xlink:href="#p" />
+<use x="120" y="256" xlink:href="#p" />
+<use x="128" y="32" xlink:href="#p" />
+<use x="128" y="40" xlink:href="#p" />
+<use x="128" y="56" xlink:href="#p" />
+<use x="128" y="64" xlink:href="#p" />
+<use x="128" y="80" xlink:href="#p" />
+<use x="128" y="88" xlink:href="#p" />
+<use x="128" y="96" xlink:href="#p" />
+<use x="128" y="104" xlink:href="#p" />
+<use x="128" y="112" xlink:href="#p" />
+<use x="128" y="128" xlink:href="#p" />
+<use x="128" y="136" xlink:href="#p" />
+<use x="128" y="160" xlink:href="#p" />
+<use x="128" y="216" xlink:href="#p" />
+<use x="128" y="240" xlink:href="#p" />
+<use x="128" y="248" xlink:href="#p" />
+<use x="136" y="32" xlink:href="#p" />
+<use x="136" y="40" xlink:href="#p" />
+<use x="136" y="48" xlink:href="#p" />
+<use x="136" y="56" xlink:href="#p" />
+<use x="136" y="72" xlink:href="#p" />
+<use x="136" y="120" xlink:href="#p" />
+<use x="136" y="128" xlink:href="#p" />
+<use x="136" y="176" xlink:href="#p" />
+<use x="136" y="184" xlink:href="#p" />
+<use x="136" y="192" xlink:href="#p" />
+<use x="136" y="216" xlink:href="#p" />
+<use x="136" y="232" xlink:href="#p" />
+<use x="136" y="248" xlink:href="#p" />
+<use x="144" y="48" xlink:href="#p" />
+<use x="144" y="56" xlink:href="#p" />
+<use x="144" y="64" xlink:href="#p" />
+<use x="144" y="80" xlink:href="#p" />
+<use x="144" y="96" xlink:href="#p" />
+<use x="144" y="128" xlink:href="#p" />
+<use x="144" y="152" xlink:href="#p" />
+<use x="144" y="160" xlink:href="#p" />
+<use x="144" y="176" xlink:href="#p" />
+<use x="144" y="184" xlink:href="#p" />
+<use x="144" y="192" xlink:href="#p" />
+<use x="144" y="208" xlink:href="#p" />
+<use x="144" y="216" xlink:href="#p" />
+<use x="144" y="240" xlink:href="#p" />
+<use x="152" y="64" xlink:href="#p" />
+<use x="152" y="88" xlink:href="#p" />
+<use x="152" y="96" xlink:href="#p" />
+<use x="152" y="120" xlink:href="#p" />
+<use x="152" y="128" xlink:href="#p" />
+<use x="152" y="136" xlink:href="#p" />
+<use x="152" y="160" xlink:href="#p" />
+<use x="152" y="168" xlink:href="#p" />
+<use x="152" y="176" xlink:href="#p" />
+<use x="152" y="232" xlink:href="#p" />
+<use x="152" y="248" xlink:href="#p" />
+<use x="160" y="32" xlink:href="#p" />
+<use x="160" y="64" xlink:href="#p" />
+<use x="160" y="72" xlink:href="#p" />
+<use x="160" y="80" xlink:href="#p" />
+<use x="160" y="88" xlink:href="#p" />
+<use x="160" y="96" xlink:href="#p" />
+<use x="160" y="104" xlink:href="#p" />
+<use x="160" y="112" xlink:href="#p" />
+<use x="160" y="128" xlink:href="#p" />
+<use x="160" y="136" xlink:href="#p" />
+<use x="160" y="152" xlink:href="#p" />
+<use x="160" y="184" xlink:href="#p" />
+<use x="160" y="192" xlink:href="#p" />
+<use x="160" y="200" xlink:href="#p" />
+<use x="160" y="208" xlink:href="#p" />
+<use x="160" y="240" xlink:href="#p" />
+<use x="160" y="256" xlink:href="#p" />
+<use x="168" y="56" xlink:href="#p" />
+<use x="168" y="88" xlink:href="#p" />
+<use x="168" y="96" xlink:href="#p" />
+<use x="168" y="104" xlink:href="#p" />
+<use x="168" y="112" xlink:href="#p" />
+<use x="168" y="128" xlink:href="#p" />
+<use x="168" y="136" xlink:href="#p" />
+<use x="168" y="168" xlink:href="#p" />
+<use x="168" y="184" xlink:href="#p" />
+<use x="168" y="192" xlink:href="#p" />
+<use x="168" y="208" xlink:href="#p" />
+<use x="168" y="224" xlink:href="#p" />
+<use x="168" y="232" xlink:href="#p" />
+<use x="176" y="32" xlink:href="#p" />
+<use x="176" y="80" xlink:href="#p" />
+<use x="176" y="88" xlink:href="#p" />
+<use x="176" y="96" xlink:href="#p" />
+<use x="176" y="104" xlink:href="#p" />
+<use x="176" y="112" xlink:href="#p" />
+<use x="176" y="144" xlink:href="#p" />
+<use x="176" y="184" xlink:href="#p" />
+<use x="176" y="192" xlink:href="#p" />
+<use x="176" y="200" xlink:href="#p" />
+<use x="176" y="216" xlink:href="#p" />
+<use x="176" y="232" xlink:href="#p" />
+<use x="176" y="248" xlink:href="#p" />
+<use x="176" y="256" xlink:href="#p" />
+<use x="184" y="32" xlink:href="#p" />
+<use x="184" y="56" xlink:href="#p" />
+<use x="184" y="64" xlink:href="#p" />
+<use x="184" y="72" xlink:href="#p" />
+<use x="184" y="104" xlink:href="#p" />
+<use x="184" y="136" xlink:href="#p" />
+<use x="184" y="144" xlink:href="#p" />
+<use x="184" y="152" xlink:href="#p" />
+<use x="184" y="160" xlink:href="#p" />
+<use x="184" y="184" xlink:href="#p" />
+<use x="184" y="192" xlink:href="#p" />
+<use x="184" y="208" xlink:href="#p" />
+<use x="184" y="240" xlink:href="#p" />
+<use x="184" y="248" xlink:href="#p" />
+<use x="184" y="256" xlink:href="#p" />
+<use x="192" y="32" xlink:href="#p" />
+<use x="192" y="48" xlink:href="#p" />
+<use x="192" y="72" xlink:href="#p" />
+<use x="192" y="80" xlink:href="#p" />
+<use x="192" y="104" xlink:href="#p" />
+<use x="192" y="136" xlink:href="#p" />
+<use x="192" y="144" xlink:href="#p" />
+<use x="192" y="152" xlink:href="#p" />
+<use x="192" y="160" xlink:href="#p" />
+<use x="192" y="176" xlink:href="#p" />
+<use x="192" y="192" xlink:href="#p" />
+<use x="192" y="200" xlink:href="#p" />
+<use x="192" y="208" xlink:href="#p" />
+<use x="192" y="216" xlink:href="#p" />
+<use x="192" y="224" xlink:href="#p" />
+<use x="192" y="248" xlink:href="#p" />
+<use x="192" y="256" xlink:href="#p" />
+<use x="200" y="96" xlink:href="#p" />
+<use x="200" y="104" xlink:href="#p" />
+<use x="200" y="112" xlink:href="#p" />
+<use x="200" y="136" xlink:href="#p" />
+<use x="200" y="152" xlink:href="#p" />
+<use x="200" y="192" xlink:href="#p" />
+<use x="200" y="224" xlink:href="#p" />
+<use x="200" y="232" xlink:href="#p" />
+<use x="200" y="256" xlink:href="#p" />
+<use x="208" y="32" xlink:href="#p" />
+<use x="208" y="40" xlink:href="#p" />
+<use x="208" y="48" xlink:href="#p" />
+<use x="208" y="56" xlink:href="#p" />
+<use x="208" y="64" xlink:href="#p" />
+<use x="208" y="72" xlink:href="#p" />
+<use x="208" y="80" xlink:href="#p" />
+<use x="208" y="104" xlink:href="#p" />
+<use x="208" y="112" xlink:href="#p" />
+<use x="208" y="120" xlink:href="#p" />
+<use x="208" y="136" xlink:href="#p" />
+<use x="208" y="144" xlink:href="#p" />
+<use x="208" y="176" xlink:href="#p" />
+<use x="208" y="184" xlink:href="#p" />
+<use x="208" y="192" xlink:href="#p" />
+<use x="208" y="208" xlink:href="#p" />
+<use x="208" y="224" xlink:href="#p" />
+<use x="208" y="248" xlink:href="#p" />
+<use x="208" y="256" xlink:href="#p" />
+<use x="216" y="32" xlink:href="#p" />
+<use x="216" y="80" xlink:href="#p" />
+<use x="216" y="104" xlink:href="#p" />
+<use x="216" y="112" xlink:href="#p" />
+<use x="216" y="120" xlink:href="#p" />
+<use x="216" y="144" xlink:href="#p" />
+<use x="216" y="152" xlink:href="#p" />
+<use x="216" y="160" xlink:href="#p" />
+<use x="216" y="168" xlink:href="#p" />
+<use x="216" y="184" xlink:href="#p" />
+<use x="216" y="192" xlink:href="#p" />
+<use x="216" y="224" xlink:href="#p" />
+<use x="216" y="240" xlink:href="#p" />
+<use x="216" y="248" xlink:href="#p" />
+<use x="224" y="32" xlink:href="#p" />
+<use x="224" y="48" xlink:href="#p" />
+<use x="224" y="56" xlink:href="#p" />
+<use x="224" y="64" xlink:href="#p" />
+<use x="224" y="80" xlink:href="#p" />
+<use x="224" y="96" xlink:href="#p" />
+<use x="224" y="104" xlink:href="#p" />
+<use x="224" y="112" xlink:href="#p" />
+<use x="224" y="120" xlink:href="#p" />
+<use x="224" y="152" xlink:href="#p" />
+<use x="224" y="160" xlink:href="#p" />
+<use x="224" y="176" xlink:href="#p" />
+<use x="224" y="192" xlink:href="#p" />
+<use x="224" y="200" xlink:href="#p" />
+<use x="224" y="208" xlink:href="#p" />
+<use x="224" y="216" xlink:href="#p" />
+<use x="224" y="224" xlink:href="#p" />
+<use x="224" y="232" xlink:href="#p" />
+<use x="224" y="256" xlink:href="#p" />
+<use x="232" y="32" xlink:href="#p" />
+<use x="232" y="48" xlink:href="#p" />
+<use x="232" y="56" xlink:href="#p" />
+<use x="232" y="64" xlink:href="#p" />
+<use x="232" y="80" xlink:href="#p" />
+<use x="232" y="96" xlink:href="#p" />
+<use x="232" y="128" xlink:href="#p" />
+<use x="232" y="160" xlink:href="#p" />
+<use x="232" y="168" xlink:href="#p" />
+<use x="232" y="192" xlink:href="#p" />
+<use x="232" y="200" xlink:href="#p" />
+<use x="232" y="208" xlink:href="#p" />
+<use x="232" y="216" xlink:href="#p" />
+<use x="232" y="232" xlink:href="#p" />
+<use x="232" y="248" xlink:href="#p" />
+<use x="240" y="32" xlink:href="#p" />
+<use x="240" y="48" xlink:href="#p" />
+<use x="240" y="56" xlink:href="#p" />
+<use x="240" y="64" xlink:href="#p" />
+<use x="240" y="80" xlink:href="#p" />
+<use x="240" y="96" xlink:href="#p" />
+<use x="240" y="112" xlink:href="#p" />
+<use x="240" y="128" xlink:href="#p" />
+<use x="240" y="136" xlink:href="#p" />
+<use x="240" y="144" xlink:href="#p" />
+<use x="240" y="168" xlink:href="#p" />
+<use x="240" y="176" xlink:href="#p" />
+<use x="240" y="184" xlink:href="#p" />
+<use x="240" y="192" xlink:href="#p" />
+<use x="240" y="200" xlink:href="#p" />
+<use x="240" y="224" xlink:href="#p" />
+<use x="240" y="240" xlink:href="#p" />
+<use x="248" y="32" xlink:href="#p" />
+<use x="248" y="80" xlink:href="#p" />
+<use x="248" y="112" xlink:href="#p" />
+<use x="248" y="136" xlink:href="#p" />
+<use x="248" y="144" xlink:href="#p" />
+<use x="248" y="152" xlink:href="#p" />
+<use x="248" y="160" xlink:href="#p" />
+<use x="248" y="168" xlink:href="#p" />
+<use x="248" y="200" xlink:href="#p" />
+<use x="248" y="208" xlink:href="#p" />
+<use x="248" y="224" xlink:href="#p" />
+<use x="248" y="248" xlink:href="#p" />
+<use x="248" y="256" xlink:href="#p" />
+<use x="256" y="32" xlink:href="#p" />
+<use x="256" y="40" xlink:href="#p" />
+<use x="256" y="48" xlink:href="#p" />
+<use x="256" y="56" xlink:href="#p" />
+<use x="256" y="64" xlink:href="#p" />
+<use x="256" y="72" xlink:href="#p" />
+<use x="256" y="80" xlink:href="#p" />
+<use x="256" y="96" xlink:href="#p" />
+<use x="256" y="104" xlink:href="#p" />
+<use x="256" y="120" xlink:href="#p" />
+<use x="256" y="136" xlink:href="#p" />
+<use x="256" y="144" xlink:href="#p" />
+<use x="256" y="200" xlink:href="#p" />
+<use x="256" y="216" xlink:href="#p" />
+<use x="256" y="224" xlink:href="#p" />
+<use x="256" y="232" xlink:href="#p" />
+<use x="256" y="240" xlink:href="#p" />
+</g>
+</svg>
\ No newline at end of file
=== removed file 'resources/images/ios_app_qr.png'
Binary files resources/images/ios_app_qr.png 2016-04-18 05:35:21 +0000 and resources/images/ios_app_qr.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'resources/images/openlp-2.qrc'
--- resources/images/openlp-2.qrc 2017-04-02 20:28:55 +0000
+++ resources/images/openlp-2.qrc 2017-10-01 07:44:54 +0000
@@ -183,7 +183,6 @@
<file>projector_warmup.png</file>
</qresource>
<qresource prefix="remotes">
- <file>android_app_qr.png</file>
- <file>ios_app_qr.png</file>
- </qresource>
-</RCC>
+ <file>app_qr.svg</file>
+ </qresource>
+</RCC>
\ No newline at end of file
Follow ups