← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~alisonken1/openlp/projector_source_edit_fix into lp:openlp

 

Ken Roberts has proposed merging lp:~alisonken1/openlp/projector_source_edit_fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/projector_source_edit_fix/+merge/246804

Fix invalid call to QMessageBox() when user wants to delete user-defined source text.

lp:~alisonken1/openlp/projector_source_edit_fix (revision 2479)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/874/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/806/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/752/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/663/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/262/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/411/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/282/

May affect translators.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/projector_source_edit_fix into lp:openlp.
=== modified file 'openlp/core/ui/projector/sourceselectform.py'
--- openlp/core/ui/projector/sourceselectform.py	2014-12-31 10:58:13 +0000
+++ openlp/core/ui/projector/sourceselectform.py	2015-01-17 02:45:56 +0000
@@ -339,8 +339,7 @@
         msg = QtGui.QMessageBox()
         msg.setText(translate('OpenLP.SourceSelectForm', 'Delete entries for this projector'))
         msg.setInformativeText(translate('OpenLP.SourceSelectForm',
-                                         'Are you sure you want to delete ALL user-defined '),
-                               translate('OpenLP.SourceSelectForm',
+                                         'Are you sure you want to delete ALL user-defined '
                                          'source input text for this projector?'))
         msg.setStandardButtons(msg.Cancel | msg.Ok)
         msg.setDefaultButton(msg.Cancel)


Follow ups