From 70d9287a800727e18b94e063ade6c7cde0385f9c Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sun, 1 Oct 2017 07:57:11 +0100 Subject: [PATCH 1/2] Prehead commit --- openlp/core/api/tab.py | 58 +++++++++------------------- resources/images/android_app_qr.png | Bin 766 -> 0 bytes resources/images/ios_app_qr.png | Bin 758 -> 0 bytes resources/images/openlp-2.qrc | 7 ++-- 4 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 resources/images/android_app_qr.png delete mode 100644 resources/images/ios_app_qr.png diff --git a/openlp/core/api/tab.py b/openlp/core/api/tab.py index 3ec8c4515..4cdf7077c 100644 --- a/openlp/core/api/tab.py +++ b/openlp/core/api/tab.py @@ -129,36 +129,21 @@ class ApiTab(SettingsTab): 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 @@ class ApiTab(SettingsTab): 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( + 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 download 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 download to install the iOS app from the App ' - 'Store.').format(qr='https://itunes.apple.com/app/id1096218725')) + 'Scan the QR code or click download 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) diff --git a/resources/images/android_app_qr.png b/resources/images/android_app_qr.png deleted file mode 100644 index e7cd3fe920322c764c14d6056151129ba81ee443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmeAS@N?(olHy`uVBq!ia0vp^XF-?)NHEx4U%eGbF(rAsyD+Rj!Ma>30Es0lN{@%Z- z`ZlM+$u^l~e|M;`ee$0&H&)rX=PiG3ytI@_#)Sor&1}3-#iM!BOS$MU0 zIMAR4FSBl$Ufy_l?OmP_l}(~`(m)G!JkM_qbGvHikps};2Th7*a9BrFaU7{a3 z`GSRA|lq#xc037KsH#{N)9UO}iYGGRt_C;MX<3c1(H>68gT{;rjNR zr}Ac}&btL?TYxN>lY4dV*4X#o&dt7ZF6|WC)tMJ~M1bbK`<(gGq#|?WB~k6OD}Oz> zd|^T5M6N5bwojSVar%_lE;&vkk> z?O{6SYAe5`3mu&=tEE0knUw0a;Fabq-HkyfSwVVDbi?Pp>-|01c~<#xvDrI8LgqPp zMStGhzh#@%R>o6#c`HFderI{6dfBt6OQ+@p|6LGSe&gZ-N8{<&o}If;5>@)+^ez51 z(az1!mY#cdX}3v`b?|p*_qngYz8AX`_1V&KF;8Uh+w)szd1eE{H}c|^G_O^?q1#Tp z{cgEvI_Fo1g^r(tL?iCGWroet?F+o63XB)tS-VZw-h5};Nq%vm8 zOZZCa+|LQ&n&$6PQ{VJYD@<);T3K0RW*ET=oC} diff --git a/resources/images/ios_app_qr.png b/resources/images/ios_app_qr.png deleted file mode 100644 index c7244fc3354c14593021de5e0f296797f734e94f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 758 zcmeAS@N?(olHy`uVBq!ia0vp^XF-?)NHEx4U%eGbaTa()7Bet#3xhBt!>l+Rixd5;ZvTmy>@{{KJyD#^@IXY!O+5;MMK zth6Z8_p!AJ3XyvJ!}0O?MmAn4lZ*=s9Gjtxm;L)E@64zx_t|eT|F601)81|KbuR(s zix+0j%!<+QS5Yc2Jnyk@@0Xm3ZER=TLlX8qaohPXUfu0cm0M=YtM+aapm92xQRcZ- zf}1|Ba~H1?=Z;bZnechSva8C^m|olkGUHb`TrciX+1sV^f7jE8O1wZvY+Yvh_4%T< zIVW$Q7EP|}|Bwf=boR1b@fJ6wqO&=<73LWiY;2NDY|b8gG%G)2O%(;4AYO2Mn78jtPb@Xc9n{GEV@0OI>E&?ih=6v(ko`Rahuy;3H*Z22K zdFQcYp`-IK5zzDXU{Yl+fYIb7k{sZ5QEI}a=eD0ZtSbpqP%TpyUPi#qhY77$0U!GaY zYg%2lD{RTVj@MzmE>gh2-es5T<9j`d^;K+(lJKU>y3hVHf$Uj6$2VkUcvi|L(|sH5 z@89_+l$mki!j>yHm+b!$wLH;Ry5x3Y7|={!-{0?e!$h)IvdoveAKK{D{A^v}>;E4u z&bm#ly1M+pE2DmJpsdO)oh5RXCI4N1*89nSJ%25{xWIAq;!N$xOFz4Q&iw0PbLU*z zY*4s7*4i*}lk3i$-M$_d_xJ$=rTLkeZ@16=dzZIwRa^4LxHJP8pE((~j-9)`+Q)V3 zoLHZfW4_x!9@Y|g?Y%!U*l*qQ2+z|N(m-V@T!woprojector_warmup.png - android_app_qr.png - ios_app_qr.png - - + app_qr.svg + + \ No newline at end of file From 40edbf3a626e73fbf5a73a11a4b5a69cfe6056a0 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sun, 1 Oct 2017 08:21:32 +0100 Subject: [PATCH 2/2] Add new qrcode --- resources/images/app_qr.svg | 446 ++++++++++++++++++++++++++++++++++++ 1 file changed, 446 insertions(+) create mode 100644 resources/images/app_qr.svg diff --git a/resources/images/app_qr.svg b/resources/images/app_qr.svg new file mode 100644 index 000000000..f384070b1 --- /dev/null +++ b/resources/images/app_qr.svg @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file