From b77b0d18d7d1924fb7998b3d0a04ee04402e452c Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Wed, 25 Jan 2012 22:04:36 +0000 Subject: [PATCH 1/6] 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 ' + 'download 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)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@FbJnXCwN~L;9P%M*fX2AYC?K$1RLg{)ajEt}{J0|xJ^264Z%05b z{b{N->Wrzi++`p*Nytheme_new.png theme_edit.png + + android_app_qr.png + From 7dc0e7d70209720727bec3e5200fab2b63cbd81b Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Thu, 26 Jan 2012 17:37:48 +0000 Subject: [PATCH 2/6] Added coppyright header back to resource file. Also, think line endings were an issue, which I hope I've sorted From 41fce8c2871c073d2a594719ab56344c0c31306b Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Thu, 26 Jan 2012 21:40:36 +0000 Subject: [PATCH 3/6] OpenLP specificbits added to resource files From 1290348ee53075104272e2fa6a9b7fd0bdaac275 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sun, 29 Jan 2012 14:38:45 +0000 Subject: [PATCH 4/6] Changed QR URI to the one suggested by Meinert --- resources/images/android_app_qr.png | Bin 558 -> 2440 bytes resources/images/openlp-2.qrc | 22 ---------------------- 2 files changed, 22 deletions(-) diff --git a/resources/images/android_app_qr.png b/resources/images/android_app_qr.png index 66e40df132c0700f05458e7e5ece6f92f0e25b88..859800bbee74ab8c788307e275ae8595a16abb48 100644 GIT binary patch literal 2440 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 diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index dc444d445..be72d2474 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -1,26 +1,4 @@ - - song_search_all.png - song_search_author.png - song_search_lyrics.png - song_search_title.png - topic_edit.png - author_add.png - author_delete.png - book_add.png - song_maintenance.png - topic_add.png - book_delete.png - book_edit.png - author_edit.png - topic_delete.png - book_maintenance.png - author_maintenance.png - topic_maintenance.png - song_author_edit.png - song_topic_edit.png - song_book_edit.png - bibles_search_text.png bibles_search_reference.png From 6a8b06695ce885cd4a5b5b8f0b56e26bb3422816 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sun, 29 Jan 2012 21:22:20 +0000 Subject: [PATCH 5/6] Started again. Everything should be there now. --- resources/images/openlp-2.qrc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index be72d2474..dc444d445 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -1,4 +1,26 @@ + + song_search_all.png + song_search_author.png + song_search_lyrics.png + song_search_title.png + topic_edit.png + author_add.png + author_delete.png + book_add.png + song_maintenance.png + topic_add.png + book_delete.png + book_edit.png + author_edit.png + topic_delete.png + book_maintenance.png + author_maintenance.png + topic_maintenance.png + song_author_edit.png + song_topic_edit.png + song_book_edit.png + bibles_search_text.png bibles_search_reference.png From addc049c5ba4ebdb47316698f8deff7ba0d0b79f Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Mon, 30 Jan 2012 17:44:37 +0000 Subject: [PATCH 6/6] Set word wrap on qrDescriptionLabel so that it doesn't cause the groupbox to resize. --- openlp/plugins/remotes/lib/remotetab.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 35fbe64cf..70005226c 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -94,6 +94,7 @@ class RemoteTab(SettingsTab): self.qrDescriptionLabel = QtGui.QLabel(self.androidAppGroupBox) self.qrDescriptionLabel.setObjectName(u'qrDescriptionLabel') self.qrDescriptionLabel.setOpenExternalLinks(True) + self.qrDescriptionLabel.setWordWrap(True) self.qrLayout.addWidget(self.qrDescriptionLabel) self.leftLayout.addStretch() self.rightLayout.addStretch()