Status: | Merged |
---|---|
Merged at revision: | 2775 |
Proposed branch: | lp:~phill-ridout/openlp/qr |
Merge into: | lp:openlp |
Diff against target: |
549 lines (+469/-44) 3 files modified
openlp/core/api/tab.py (+20/-40) resources/images/app_qr.svg (+446/-0) resources/images/openlp-2.qrc (+3/-4) |
To merge this branch: | bzr merge lp:~phill-ridout/openlp/qr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+331625@code.launchpad.net |
Commit message
Description of the change
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:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/
Stopping after failure
Tim Bentley (trb143) : | # |
Tomas Groth (tomasgroth) : | # |
Preview Diff
1 | === modified file 'openlp/core/api/tab.py' |
2 | --- openlp/core/api/tab.py 2017-09-29 18:53:04 +0000 |
3 | +++ openlp/core/api/tab.py 2017-10-01 07:44:54 +0000 |
4 | @@ -129,36 +129,21 @@ |
5 | self.master_version_value.setObjectName('master_version_value') |
6 | self.update_site_layout.addRow(self.master_version_label, self.master_version_value) |
7 | self.left_layout.addWidget(self.update_site_group_box) |
8 | - self.android_app_group_box = QtWidgets.QGroupBox(self.right_column) |
9 | - self.android_app_group_box.setObjectName('android_app_group_box') |
10 | - self.right_layout.addWidget(self.android_app_group_box) |
11 | - self.android_qr_layout = QtWidgets.QVBoxLayout(self.android_app_group_box) |
12 | - self.android_qr_layout.setObjectName('android_qr_layout') |
13 | - self.android_qr_code_label = QtWidgets.QLabel(self.android_app_group_box) |
14 | - self.android_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/android_app_qr.png')) |
15 | - self.android_qr_code_label.setAlignment(QtCore.Qt.AlignCenter) |
16 | - self.android_qr_code_label.setObjectName('android_qr_code_label') |
17 | - self.android_qr_layout.addWidget(self.android_qr_code_label) |
18 | - self.android_qr_description_label = QtWidgets.QLabel(self.android_app_group_box) |
19 | - self.android_qr_description_label.setObjectName('android_qr_description_label') |
20 | - self.android_qr_description_label.setOpenExternalLinks(True) |
21 | - self.android_qr_description_label.setWordWrap(True) |
22 | - self.android_qr_layout.addWidget(self.android_qr_description_label) |
23 | - self.ios_app_group_box = QtWidgets.QGroupBox(self.right_column) |
24 | - self.ios_app_group_box.setObjectName('ios_app_group_box') |
25 | - self.right_layout.addWidget(self.ios_app_group_box) |
26 | - self.ios_qr_layout = QtWidgets.QVBoxLayout(self.ios_app_group_box) |
27 | - self.ios_qr_layout.setObjectName('ios_qr_layout') |
28 | - self.ios_qr_code_label = QtWidgets.QLabel(self.ios_app_group_box) |
29 | - self.ios_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/ios_app_qr.png')) |
30 | - self.ios_qr_code_label.setAlignment(QtCore.Qt.AlignCenter) |
31 | - self.ios_qr_code_label.setObjectName('ios_qr_code_label') |
32 | - self.ios_qr_layout.addWidget(self.ios_qr_code_label) |
33 | - self.ios_qr_description_label = QtWidgets.QLabel(self.ios_app_group_box) |
34 | - self.ios_qr_description_label.setObjectName('ios_qr_description_label') |
35 | - self.ios_qr_description_label.setOpenExternalLinks(True) |
36 | - self.ios_qr_description_label.setWordWrap(True) |
37 | - self.ios_qr_layout.addWidget(self.ios_qr_description_label) |
38 | + self.app_group_box = QtWidgets.QGroupBox(self.right_column) |
39 | + self.app_group_box.setObjectName('app_group_box') |
40 | + self.right_layout.addWidget(self.app_group_box) |
41 | + self.app_qr_layout = QtWidgets.QVBoxLayout(self.app_group_box) |
42 | + self.app_qr_layout.setObjectName('app_qr_layout') |
43 | + self.app_qr_code_label = QtWidgets.QLabel(self.app_group_box) |
44 | + self.app_qr_code_label.setPixmap(QtGui.QPixmap(':/remotes/app_qr.svg')) |
45 | + self.app_qr_code_label.setAlignment(QtCore.Qt.AlignCenter) |
46 | + self.app_qr_code_label.setObjectName('app_qr_code_label') |
47 | + self.app_qr_layout.addWidget(self.app_qr_code_label) |
48 | + self.app_qr_description_label = QtWidgets.QLabel(self.app_group_box) |
49 | + self.app_qr_description_label.setObjectName('app_qr_description_label') |
50 | + self.app_qr_description_label.setOpenExternalLinks(True) |
51 | + self.app_qr_description_label.setWordWrap(True) |
52 | + self.app_qr_layout.addWidget(self.app_qr_description_label) |
53 | self.left_layout.addStretch() |
54 | self.right_layout.addStretch() |
55 | self.twelve_hour_check_box.stateChanged.connect(self.on_twelve_hour_check_box_changed) |
56 | @@ -195,16 +180,11 @@ |
57 | self.twelve_hour_check_box.setText(translate('RemotePlugin.RemoteTab', 'Display stage time in 12h format')) |
58 | self.thumbnails_check_box.setText(translate('RemotePlugin.RemoteTab', |
59 | 'Show thumbnails of non-text slides in remote and stage view.')) |
60 | - self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App')) |
61 | - self.android_qr_description_label.setText( |
62 | - translate('RemotePlugin.RemoteTab', |
63 | - 'Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google ' |
64 | - 'Play.').format(qr='https://play.google.com/store/apps/details?id=org.openlp.android2')) |
65 | - self.ios_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'iOS App')) |
66 | - self.ios_qr_description_label.setText( |
67 | - translate('RemotePlugin.RemoteTab', |
68 | - 'Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App ' |
69 | - 'Store.').format(qr='https://itunes.apple.com/app/id1096218725')) |
70 | + self.app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Remote App')) |
71 | + self.app_qr_description_label.setText( |
72 | + translate('RemotePlugin.RemoteTab', |
73 | + 'Scan the QR code or click <a href="{qr}">download</a> to download an app for your mobile device' |
74 | + ).format(qr='https://openlp.org/#mobile-app-downloads')) |
75 | self.user_login_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'User Authentication')) |
76 | self.aa = UiStrings() |
77 | self.update_site_group_box.setTitle(UiStrings().WebDownloadText) |
78 | |
79 | === removed file 'resources/images/android_app_qr.png' |
80 | 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 |
81 | === added file 'resources/images/app_qr.svg' |
82 | --- resources/images/app_qr.svg 1970-01-01 00:00:00 +0000 |
83 | +++ resources/images/app_qr.svg 2017-10-01 07:44:54 +0000 |
84 | @@ -0,0 +1,446 @@ |
85 | +<?xml version="1.0" encoding="utf-8"?> |
86 | +<svg version="1.1" baseProfile="full" width="296" height="296" viewBox="0 0 296 296" |
87 | + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"> |
88 | +<desc></desc> |
89 | +<rect width="296" height="296" fill="#ffffff" cx="0" cy="0" /> |
90 | +<defs> |
91 | +<rect id="p" width="8" height="8" /> |
92 | +</defs> |
93 | +<g fill="#000000"> |
94 | +<use x="32" y="32" xlink:href="#p" /> |
95 | +<use x="32" y="40" xlink:href="#p" /> |
96 | +<use x="32" y="48" xlink:href="#p" /> |
97 | +<use x="32" y="56" xlink:href="#p" /> |
98 | +<use x="32" y="64" xlink:href="#p" /> |
99 | +<use x="32" y="72" xlink:href="#p" /> |
100 | +<use x="32" y="80" xlink:href="#p" /> |
101 | +<use x="32" y="96" xlink:href="#p" /> |
102 | +<use x="32" y="104" xlink:href="#p" /> |
103 | +<use x="32" y="120" xlink:href="#p" /> |
104 | +<use x="32" y="128" xlink:href="#p" /> |
105 | +<use x="32" y="168" xlink:href="#p" /> |
106 | +<use x="32" y="184" xlink:href="#p" /> |
107 | +<use x="32" y="192" xlink:href="#p" /> |
108 | +<use x="32" y="208" xlink:href="#p" /> |
109 | +<use x="32" y="216" xlink:href="#p" /> |
110 | +<use x="32" y="224" xlink:href="#p" /> |
111 | +<use x="32" y="232" xlink:href="#p" /> |
112 | +<use x="32" y="240" xlink:href="#p" /> |
113 | +<use x="32" y="248" xlink:href="#p" /> |
114 | +<use x="32" y="256" xlink:href="#p" /> |
115 | +<use x="40" y="32" xlink:href="#p" /> |
116 | +<use x="40" y="80" xlink:href="#p" /> |
117 | +<use x="40" y="96" xlink:href="#p" /> |
118 | +<use x="40" y="104" xlink:href="#p" /> |
119 | +<use x="40" y="120" xlink:href="#p" /> |
120 | +<use x="40" y="136" xlink:href="#p" /> |
121 | +<use x="40" y="152" xlink:href="#p" /> |
122 | +<use x="40" y="160" xlink:href="#p" /> |
123 | +<use x="40" y="176" xlink:href="#p" /> |
124 | +<use x="40" y="184" xlink:href="#p" /> |
125 | +<use x="40" y="208" xlink:href="#p" /> |
126 | +<use x="40" y="256" xlink:href="#p" /> |
127 | +<use x="48" y="32" xlink:href="#p" /> |
128 | +<use x="48" y="48" xlink:href="#p" /> |
129 | +<use x="48" y="56" xlink:href="#p" /> |
130 | +<use x="48" y="64" xlink:href="#p" /> |
131 | +<use x="48" y="80" xlink:href="#p" /> |
132 | +<use x="48" y="96" xlink:href="#p" /> |
133 | +<use x="48" y="104" xlink:href="#p" /> |
134 | +<use x="48" y="112" xlink:href="#p" /> |
135 | +<use x="48" y="120" xlink:href="#p" /> |
136 | +<use x="48" y="128" xlink:href="#p" /> |
137 | +<use x="48" y="136" xlink:href="#p" /> |
138 | +<use x="48" y="152" xlink:href="#p" /> |
139 | +<use x="48" y="160" xlink:href="#p" /> |
140 | +<use x="48" y="184" xlink:href="#p" /> |
141 | +<use x="48" y="192" xlink:href="#p" /> |
142 | +<use x="48" y="208" xlink:href="#p" /> |
143 | +<use x="48" y="224" xlink:href="#p" /> |
144 | +<use x="48" y="232" xlink:href="#p" /> |
145 | +<use x="48" y="240" xlink:href="#p" /> |
146 | +<use x="48" y="256" xlink:href="#p" /> |
147 | +<use x="56" y="32" xlink:href="#p" /> |
148 | +<use x="56" y="48" xlink:href="#p" /> |
149 | +<use x="56" y="56" xlink:href="#p" /> |
150 | +<use x="56" y="64" xlink:href="#p" /> |
151 | +<use x="56" y="80" xlink:href="#p" /> |
152 | +<use x="56" y="96" xlink:href="#p" /> |
153 | +<use x="56" y="112" xlink:href="#p" /> |
154 | +<use x="56" y="128" xlink:href="#p" /> |
155 | +<use x="56" y="136" xlink:href="#p" /> |
156 | +<use x="56" y="176" xlink:href="#p" /> |
157 | +<use x="56" y="192" xlink:href="#p" /> |
158 | +<use x="56" y="208" xlink:href="#p" /> |
159 | +<use x="56" y="224" xlink:href="#p" /> |
160 | +<use x="56" y="232" xlink:href="#p" /> |
161 | +<use x="56" y="240" xlink:href="#p" /> |
162 | +<use x="56" y="256" xlink:href="#p" /> |
163 | +<use x="64" y="32" xlink:href="#p" /> |
164 | +<use x="64" y="48" xlink:href="#p" /> |
165 | +<use x="64" y="56" xlink:href="#p" /> |
166 | +<use x="64" y="64" xlink:href="#p" /> |
167 | +<use x="64" y="80" xlink:href="#p" /> |
168 | +<use x="64" y="120" xlink:href="#p" /> |
169 | +<use x="64" y="128" xlink:href="#p" /> |
170 | +<use x="64" y="136" xlink:href="#p" /> |
171 | +<use x="64" y="152" xlink:href="#p" /> |
172 | +<use x="64" y="168" xlink:href="#p" /> |
173 | +<use x="64" y="176" xlink:href="#p" /> |
174 | +<use x="64" y="208" xlink:href="#p" /> |
175 | +<use x="64" y="224" xlink:href="#p" /> |
176 | +<use x="64" y="232" xlink:href="#p" /> |
177 | +<use x="64" y="240" xlink:href="#p" /> |
178 | +<use x="64" y="256" xlink:href="#p" /> |
179 | +<use x="72" y="32" xlink:href="#p" /> |
180 | +<use x="72" y="80" xlink:href="#p" /> |
181 | +<use x="72" y="120" xlink:href="#p" /> |
182 | +<use x="72" y="136" xlink:href="#p" /> |
183 | +<use x="72" y="160" xlink:href="#p" /> |
184 | +<use x="72" y="176" xlink:href="#p" /> |
185 | +<use x="72" y="208" xlink:href="#p" /> |
186 | +<use x="72" y="256" xlink:href="#p" /> |
187 | +<use x="80" y="32" xlink:href="#p" /> |
188 | +<use x="80" y="40" xlink:href="#p" /> |
189 | +<use x="80" y="48" xlink:href="#p" /> |
190 | +<use x="80" y="56" xlink:href="#p" /> |
191 | +<use x="80" y="64" xlink:href="#p" /> |
192 | +<use x="80" y="72" xlink:href="#p" /> |
193 | +<use x="80" y="80" xlink:href="#p" /> |
194 | +<use x="80" y="96" xlink:href="#p" /> |
195 | +<use x="80" y="112" xlink:href="#p" /> |
196 | +<use x="80" y="128" xlink:href="#p" /> |
197 | +<use x="80" y="144" xlink:href="#p" /> |
198 | +<use x="80" y="160" xlink:href="#p" /> |
199 | +<use x="80" y="176" xlink:href="#p" /> |
200 | +<use x="80" y="192" xlink:href="#p" /> |
201 | +<use x="80" y="208" xlink:href="#p" /> |
202 | +<use x="80" y="216" xlink:href="#p" /> |
203 | +<use x="80" y="224" xlink:href="#p" /> |
204 | +<use x="80" y="232" xlink:href="#p" /> |
205 | +<use x="80" y="240" xlink:href="#p" /> |
206 | +<use x="80" y="248" xlink:href="#p" /> |
207 | +<use x="80" y="256" xlink:href="#p" /> |
208 | +<use x="88" y="112" xlink:href="#p" /> |
209 | +<use x="88" y="120" xlink:href="#p" /> |
210 | +<use x="88" y="160" xlink:href="#p" /> |
211 | +<use x="88" y="168" xlink:href="#p" /> |
212 | +<use x="88" y="192" xlink:href="#p" /> |
213 | +<use x="96" y="32" xlink:href="#p" /> |
214 | +<use x="96" y="48" xlink:href="#p" /> |
215 | +<use x="96" y="56" xlink:href="#p" /> |
216 | +<use x="96" y="64" xlink:href="#p" /> |
217 | +<use x="96" y="80" xlink:href="#p" /> |
218 | +<use x="96" y="96" xlink:href="#p" /> |
219 | +<use x="96" y="112" xlink:href="#p" /> |
220 | +<use x="96" y="120" xlink:href="#p" /> |
221 | +<use x="96" y="136" xlink:href="#p" /> |
222 | +<use x="96" y="152" xlink:href="#p" /> |
223 | +<use x="96" y="168" xlink:href="#p" /> |
224 | +<use x="96" y="176" xlink:href="#p" /> |
225 | +<use x="96" y="200" xlink:href="#p" /> |
226 | +<use x="96" y="232" xlink:href="#p" /> |
227 | +<use x="96" y="240" xlink:href="#p" /> |
228 | +<use x="96" y="248" xlink:href="#p" /> |
229 | +<use x="96" y="256" xlink:href="#p" /> |
230 | +<use x="104" y="40" xlink:href="#p" /> |
231 | +<use x="104" y="48" xlink:href="#p" /> |
232 | +<use x="104" y="56" xlink:href="#p" /> |
233 | +<use x="104" y="112" xlink:href="#p" /> |
234 | +<use x="104" y="120" xlink:href="#p" /> |
235 | +<use x="104" y="128" xlink:href="#p" /> |
236 | +<use x="104" y="168" xlink:href="#p" /> |
237 | +<use x="104" y="176" xlink:href="#p" /> |
238 | +<use x="104" y="192" xlink:href="#p" /> |
239 | +<use x="104" y="200" xlink:href="#p" /> |
240 | +<use x="104" y="208" xlink:href="#p" /> |
241 | +<use x="104" y="216" xlink:href="#p" /> |
242 | +<use x="104" y="224" xlink:href="#p" /> |
243 | +<use x="104" y="232" xlink:href="#p" /> |
244 | +<use x="104" y="240" xlink:href="#p" /> |
245 | +<use x="104" y="248" xlink:href="#p" /> |
246 | +<use x="104" y="256" xlink:href="#p" /> |
247 | +<use x="112" y="32" xlink:href="#p" /> |
248 | +<use x="112" y="40" xlink:href="#p" /> |
249 | +<use x="112" y="48" xlink:href="#p" /> |
250 | +<use x="112" y="56" xlink:href="#p" /> |
251 | +<use x="112" y="72" xlink:href="#p" /> |
252 | +<use x="112" y="80" xlink:href="#p" /> |
253 | +<use x="112" y="88" xlink:href="#p" /> |
254 | +<use x="112" y="96" xlink:href="#p" /> |
255 | +<use x="112" y="104" xlink:href="#p" /> |
256 | +<use x="112" y="112" xlink:href="#p" /> |
257 | +<use x="112" y="120" xlink:href="#p" /> |
258 | +<use x="112" y="128" xlink:href="#p" /> |
259 | +<use x="112" y="200" xlink:href="#p" /> |
260 | +<use x="112" y="208" xlink:href="#p" /> |
261 | +<use x="112" y="216" xlink:href="#p" /> |
262 | +<use x="112" y="232" xlink:href="#p" /> |
263 | +<use x="112" y="240" xlink:href="#p" /> |
264 | +<use x="120" y="40" xlink:href="#p" /> |
265 | +<use x="120" y="64" xlink:href="#p" /> |
266 | +<use x="120" y="72" xlink:href="#p" /> |
267 | +<use x="120" y="96" xlink:href="#p" /> |
268 | +<use x="120" y="112" xlink:href="#p" /> |
269 | +<use x="120" y="136" xlink:href="#p" /> |
270 | +<use x="120" y="144" xlink:href="#p" /> |
271 | +<use x="120" y="152" xlink:href="#p" /> |
272 | +<use x="120" y="184" xlink:href="#p" /> |
273 | +<use x="120" y="216" xlink:href="#p" /> |
274 | +<use x="120" y="224" xlink:href="#p" /> |
275 | +<use x="120" y="232" xlink:href="#p" /> |
276 | +<use x="120" y="256" xlink:href="#p" /> |
277 | +<use x="128" y="32" xlink:href="#p" /> |
278 | +<use x="128" y="40" xlink:href="#p" /> |
279 | +<use x="128" y="56" xlink:href="#p" /> |
280 | +<use x="128" y="64" xlink:href="#p" /> |
281 | +<use x="128" y="80" xlink:href="#p" /> |
282 | +<use x="128" y="88" xlink:href="#p" /> |
283 | +<use x="128" y="96" xlink:href="#p" /> |
284 | +<use x="128" y="104" xlink:href="#p" /> |
285 | +<use x="128" y="112" xlink:href="#p" /> |
286 | +<use x="128" y="128" xlink:href="#p" /> |
287 | +<use x="128" y="136" xlink:href="#p" /> |
288 | +<use x="128" y="160" xlink:href="#p" /> |
289 | +<use x="128" y="216" xlink:href="#p" /> |
290 | +<use x="128" y="240" xlink:href="#p" /> |
291 | +<use x="128" y="248" xlink:href="#p" /> |
292 | +<use x="136" y="32" xlink:href="#p" /> |
293 | +<use x="136" y="40" xlink:href="#p" /> |
294 | +<use x="136" y="48" xlink:href="#p" /> |
295 | +<use x="136" y="56" xlink:href="#p" /> |
296 | +<use x="136" y="72" xlink:href="#p" /> |
297 | +<use x="136" y="120" xlink:href="#p" /> |
298 | +<use x="136" y="128" xlink:href="#p" /> |
299 | +<use x="136" y="176" xlink:href="#p" /> |
300 | +<use x="136" y="184" xlink:href="#p" /> |
301 | +<use x="136" y="192" xlink:href="#p" /> |
302 | +<use x="136" y="216" xlink:href="#p" /> |
303 | +<use x="136" y="232" xlink:href="#p" /> |
304 | +<use x="136" y="248" xlink:href="#p" /> |
305 | +<use x="144" y="48" xlink:href="#p" /> |
306 | +<use x="144" y="56" xlink:href="#p" /> |
307 | +<use x="144" y="64" xlink:href="#p" /> |
308 | +<use x="144" y="80" xlink:href="#p" /> |
309 | +<use x="144" y="96" xlink:href="#p" /> |
310 | +<use x="144" y="128" xlink:href="#p" /> |
311 | +<use x="144" y="152" xlink:href="#p" /> |
312 | +<use x="144" y="160" xlink:href="#p" /> |
313 | +<use x="144" y="176" xlink:href="#p" /> |
314 | +<use x="144" y="184" xlink:href="#p" /> |
315 | +<use x="144" y="192" xlink:href="#p" /> |
316 | +<use x="144" y="208" xlink:href="#p" /> |
317 | +<use x="144" y="216" xlink:href="#p" /> |
318 | +<use x="144" y="240" xlink:href="#p" /> |
319 | +<use x="152" y="64" xlink:href="#p" /> |
320 | +<use x="152" y="88" xlink:href="#p" /> |
321 | +<use x="152" y="96" xlink:href="#p" /> |
322 | +<use x="152" y="120" xlink:href="#p" /> |
323 | +<use x="152" y="128" xlink:href="#p" /> |
324 | +<use x="152" y="136" xlink:href="#p" /> |
325 | +<use x="152" y="160" xlink:href="#p" /> |
326 | +<use x="152" y="168" xlink:href="#p" /> |
327 | +<use x="152" y="176" xlink:href="#p" /> |
328 | +<use x="152" y="232" xlink:href="#p" /> |
329 | +<use x="152" y="248" xlink:href="#p" /> |
330 | +<use x="160" y="32" xlink:href="#p" /> |
331 | +<use x="160" y="64" xlink:href="#p" /> |
332 | +<use x="160" y="72" xlink:href="#p" /> |
333 | +<use x="160" y="80" xlink:href="#p" /> |
334 | +<use x="160" y="88" xlink:href="#p" /> |
335 | +<use x="160" y="96" xlink:href="#p" /> |
336 | +<use x="160" y="104" xlink:href="#p" /> |
337 | +<use x="160" y="112" xlink:href="#p" /> |
338 | +<use x="160" y="128" xlink:href="#p" /> |
339 | +<use x="160" y="136" xlink:href="#p" /> |
340 | +<use x="160" y="152" xlink:href="#p" /> |
341 | +<use x="160" y="184" xlink:href="#p" /> |
342 | +<use x="160" y="192" xlink:href="#p" /> |
343 | +<use x="160" y="200" xlink:href="#p" /> |
344 | +<use x="160" y="208" xlink:href="#p" /> |
345 | +<use x="160" y="240" xlink:href="#p" /> |
346 | +<use x="160" y="256" xlink:href="#p" /> |
347 | +<use x="168" y="56" xlink:href="#p" /> |
348 | +<use x="168" y="88" xlink:href="#p" /> |
349 | +<use x="168" y="96" xlink:href="#p" /> |
350 | +<use x="168" y="104" xlink:href="#p" /> |
351 | +<use x="168" y="112" xlink:href="#p" /> |
352 | +<use x="168" y="128" xlink:href="#p" /> |
353 | +<use x="168" y="136" xlink:href="#p" /> |
354 | +<use x="168" y="168" xlink:href="#p" /> |
355 | +<use x="168" y="184" xlink:href="#p" /> |
356 | +<use x="168" y="192" xlink:href="#p" /> |
357 | +<use x="168" y="208" xlink:href="#p" /> |
358 | +<use x="168" y="224" xlink:href="#p" /> |
359 | +<use x="168" y="232" xlink:href="#p" /> |
360 | +<use x="176" y="32" xlink:href="#p" /> |
361 | +<use x="176" y="80" xlink:href="#p" /> |
362 | +<use x="176" y="88" xlink:href="#p" /> |
363 | +<use x="176" y="96" xlink:href="#p" /> |
364 | +<use x="176" y="104" xlink:href="#p" /> |
365 | +<use x="176" y="112" xlink:href="#p" /> |
366 | +<use x="176" y="144" xlink:href="#p" /> |
367 | +<use x="176" y="184" xlink:href="#p" /> |
368 | +<use x="176" y="192" xlink:href="#p" /> |
369 | +<use x="176" y="200" xlink:href="#p" /> |
370 | +<use x="176" y="216" xlink:href="#p" /> |
371 | +<use x="176" y="232" xlink:href="#p" /> |
372 | +<use x="176" y="248" xlink:href="#p" /> |
373 | +<use x="176" y="256" xlink:href="#p" /> |
374 | +<use x="184" y="32" xlink:href="#p" /> |
375 | +<use x="184" y="56" xlink:href="#p" /> |
376 | +<use x="184" y="64" xlink:href="#p" /> |
377 | +<use x="184" y="72" xlink:href="#p" /> |
378 | +<use x="184" y="104" xlink:href="#p" /> |
379 | +<use x="184" y="136" xlink:href="#p" /> |
380 | +<use x="184" y="144" xlink:href="#p" /> |
381 | +<use x="184" y="152" xlink:href="#p" /> |
382 | +<use x="184" y="160" xlink:href="#p" /> |
383 | +<use x="184" y="184" xlink:href="#p" /> |
384 | +<use x="184" y="192" xlink:href="#p" /> |
385 | +<use x="184" y="208" xlink:href="#p" /> |
386 | +<use x="184" y="240" xlink:href="#p" /> |
387 | +<use x="184" y="248" xlink:href="#p" /> |
388 | +<use x="184" y="256" xlink:href="#p" /> |
389 | +<use x="192" y="32" xlink:href="#p" /> |
390 | +<use x="192" y="48" xlink:href="#p" /> |
391 | +<use x="192" y="72" xlink:href="#p" /> |
392 | +<use x="192" y="80" xlink:href="#p" /> |
393 | +<use x="192" y="104" xlink:href="#p" /> |
394 | +<use x="192" y="136" xlink:href="#p" /> |
395 | +<use x="192" y="144" xlink:href="#p" /> |
396 | +<use x="192" y="152" xlink:href="#p" /> |
397 | +<use x="192" y="160" xlink:href="#p" /> |
398 | +<use x="192" y="176" xlink:href="#p" /> |
399 | +<use x="192" y="192" xlink:href="#p" /> |
400 | +<use x="192" y="200" xlink:href="#p" /> |
401 | +<use x="192" y="208" xlink:href="#p" /> |
402 | +<use x="192" y="216" xlink:href="#p" /> |
403 | +<use x="192" y="224" xlink:href="#p" /> |
404 | +<use x="192" y="248" xlink:href="#p" /> |
405 | +<use x="192" y="256" xlink:href="#p" /> |
406 | +<use x="200" y="96" xlink:href="#p" /> |
407 | +<use x="200" y="104" xlink:href="#p" /> |
408 | +<use x="200" y="112" xlink:href="#p" /> |
409 | +<use x="200" y="136" xlink:href="#p" /> |
410 | +<use x="200" y="152" xlink:href="#p" /> |
411 | +<use x="200" y="192" xlink:href="#p" /> |
412 | +<use x="200" y="224" xlink:href="#p" /> |
413 | +<use x="200" y="232" xlink:href="#p" /> |
414 | +<use x="200" y="256" xlink:href="#p" /> |
415 | +<use x="208" y="32" xlink:href="#p" /> |
416 | +<use x="208" y="40" xlink:href="#p" /> |
417 | +<use x="208" y="48" xlink:href="#p" /> |
418 | +<use x="208" y="56" xlink:href="#p" /> |
419 | +<use x="208" y="64" xlink:href="#p" /> |
420 | +<use x="208" y="72" xlink:href="#p" /> |
421 | +<use x="208" y="80" xlink:href="#p" /> |
422 | +<use x="208" y="104" xlink:href="#p" /> |
423 | +<use x="208" y="112" xlink:href="#p" /> |
424 | +<use x="208" y="120" xlink:href="#p" /> |
425 | +<use x="208" y="136" xlink:href="#p" /> |
426 | +<use x="208" y="144" xlink:href="#p" /> |
427 | +<use x="208" y="176" xlink:href="#p" /> |
428 | +<use x="208" y="184" xlink:href="#p" /> |
429 | +<use x="208" y="192" xlink:href="#p" /> |
430 | +<use x="208" y="208" xlink:href="#p" /> |
431 | +<use x="208" y="224" xlink:href="#p" /> |
432 | +<use x="208" y="248" xlink:href="#p" /> |
433 | +<use x="208" y="256" xlink:href="#p" /> |
434 | +<use x="216" y="32" xlink:href="#p" /> |
435 | +<use x="216" y="80" xlink:href="#p" /> |
436 | +<use x="216" y="104" xlink:href="#p" /> |
437 | +<use x="216" y="112" xlink:href="#p" /> |
438 | +<use x="216" y="120" xlink:href="#p" /> |
439 | +<use x="216" y="144" xlink:href="#p" /> |
440 | +<use x="216" y="152" xlink:href="#p" /> |
441 | +<use x="216" y="160" xlink:href="#p" /> |
442 | +<use x="216" y="168" xlink:href="#p" /> |
443 | +<use x="216" y="184" xlink:href="#p" /> |
444 | +<use x="216" y="192" xlink:href="#p" /> |
445 | +<use x="216" y="224" xlink:href="#p" /> |
446 | +<use x="216" y="240" xlink:href="#p" /> |
447 | +<use x="216" y="248" xlink:href="#p" /> |
448 | +<use x="224" y="32" xlink:href="#p" /> |
449 | +<use x="224" y="48" xlink:href="#p" /> |
450 | +<use x="224" y="56" xlink:href="#p" /> |
451 | +<use x="224" y="64" xlink:href="#p" /> |
452 | +<use x="224" y="80" xlink:href="#p" /> |
453 | +<use x="224" y="96" xlink:href="#p" /> |
454 | +<use x="224" y="104" xlink:href="#p" /> |
455 | +<use x="224" y="112" xlink:href="#p" /> |
456 | +<use x="224" y="120" xlink:href="#p" /> |
457 | +<use x="224" y="152" xlink:href="#p" /> |
458 | +<use x="224" y="160" xlink:href="#p" /> |
459 | +<use x="224" y="176" xlink:href="#p" /> |
460 | +<use x="224" y="192" xlink:href="#p" /> |
461 | +<use x="224" y="200" xlink:href="#p" /> |
462 | +<use x="224" y="208" xlink:href="#p" /> |
463 | +<use x="224" y="216" xlink:href="#p" /> |
464 | +<use x="224" y="224" xlink:href="#p" /> |
465 | +<use x="224" y="232" xlink:href="#p" /> |
466 | +<use x="224" y="256" xlink:href="#p" /> |
467 | +<use x="232" y="32" xlink:href="#p" /> |
468 | +<use x="232" y="48" xlink:href="#p" /> |
469 | +<use x="232" y="56" xlink:href="#p" /> |
470 | +<use x="232" y="64" xlink:href="#p" /> |
471 | +<use x="232" y="80" xlink:href="#p" /> |
472 | +<use x="232" y="96" xlink:href="#p" /> |
473 | +<use x="232" y="128" xlink:href="#p" /> |
474 | +<use x="232" y="160" xlink:href="#p" /> |
475 | +<use x="232" y="168" xlink:href="#p" /> |
476 | +<use x="232" y="192" xlink:href="#p" /> |
477 | +<use x="232" y="200" xlink:href="#p" /> |
478 | +<use x="232" y="208" xlink:href="#p" /> |
479 | +<use x="232" y="216" xlink:href="#p" /> |
480 | +<use x="232" y="232" xlink:href="#p" /> |
481 | +<use x="232" y="248" xlink:href="#p" /> |
482 | +<use x="240" y="32" xlink:href="#p" /> |
483 | +<use x="240" y="48" xlink:href="#p" /> |
484 | +<use x="240" y="56" xlink:href="#p" /> |
485 | +<use x="240" y="64" xlink:href="#p" /> |
486 | +<use x="240" y="80" xlink:href="#p" /> |
487 | +<use x="240" y="96" xlink:href="#p" /> |
488 | +<use x="240" y="112" xlink:href="#p" /> |
489 | +<use x="240" y="128" xlink:href="#p" /> |
490 | +<use x="240" y="136" xlink:href="#p" /> |
491 | +<use x="240" y="144" xlink:href="#p" /> |
492 | +<use x="240" y="168" xlink:href="#p" /> |
493 | +<use x="240" y="176" xlink:href="#p" /> |
494 | +<use x="240" y="184" xlink:href="#p" /> |
495 | +<use x="240" y="192" xlink:href="#p" /> |
496 | +<use x="240" y="200" xlink:href="#p" /> |
497 | +<use x="240" y="224" xlink:href="#p" /> |
498 | +<use x="240" y="240" xlink:href="#p" /> |
499 | +<use x="248" y="32" xlink:href="#p" /> |
500 | +<use x="248" y="80" xlink:href="#p" /> |
501 | +<use x="248" y="112" xlink:href="#p" /> |
502 | +<use x="248" y="136" xlink:href="#p" /> |
503 | +<use x="248" y="144" xlink:href="#p" /> |
504 | +<use x="248" y="152" xlink:href="#p" /> |
505 | +<use x="248" y="160" xlink:href="#p" /> |
506 | +<use x="248" y="168" xlink:href="#p" /> |
507 | +<use x="248" y="200" xlink:href="#p" /> |
508 | +<use x="248" y="208" xlink:href="#p" /> |
509 | +<use x="248" y="224" xlink:href="#p" /> |
510 | +<use x="248" y="248" xlink:href="#p" /> |
511 | +<use x="248" y="256" xlink:href="#p" /> |
512 | +<use x="256" y="32" xlink:href="#p" /> |
513 | +<use x="256" y="40" xlink:href="#p" /> |
514 | +<use x="256" y="48" xlink:href="#p" /> |
515 | +<use x="256" y="56" xlink:href="#p" /> |
516 | +<use x="256" y="64" xlink:href="#p" /> |
517 | +<use x="256" y="72" xlink:href="#p" /> |
518 | +<use x="256" y="80" xlink:href="#p" /> |
519 | +<use x="256" y="96" xlink:href="#p" /> |
520 | +<use x="256" y="104" xlink:href="#p" /> |
521 | +<use x="256" y="120" xlink:href="#p" /> |
522 | +<use x="256" y="136" xlink:href="#p" /> |
523 | +<use x="256" y="144" xlink:href="#p" /> |
524 | +<use x="256" y="200" xlink:href="#p" /> |
525 | +<use x="256" y="216" xlink:href="#p" /> |
526 | +<use x="256" y="224" xlink:href="#p" /> |
527 | +<use x="256" y="232" xlink:href="#p" /> |
528 | +<use x="256" y="240" xlink:href="#p" /> |
529 | +</g> |
530 | +</svg> |
531 | \ No newline at end of file |
532 | |
533 | === removed file 'resources/images/ios_app_qr.png' |
534 | 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 |
535 | === modified file 'resources/images/openlp-2.qrc' |
536 | --- resources/images/openlp-2.qrc 2017-04-02 20:28:55 +0000 |
537 | +++ resources/images/openlp-2.qrc 2017-10-01 07:44:54 +0000 |
538 | @@ -183,7 +183,6 @@ |
539 | <file>projector_warmup.png</file> |
540 | </qresource> |
541 | <qresource prefix="remotes"> |
542 | - <file>android_app_qr.png</file> |
543 | - <file>ios_app_qr.png</file> |
544 | - </qresource> |
545 | -</RCC> |
546 | + <file>app_qr.svg</file> |
547 | + </qresource> |
548 | +</RCC> |
549 | \ No newline at end of file |