openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/b1 into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol-hush)
Related bugs:
  Bug #763066 in OpenLP: "Alert has to be saved, before it can be send live"
  https://bugs.launchpad.net/openlp/+bug/763066

For more details, see:
https://code.launchpad.net/~trb143/openlp/b1/+merge/58032

Allow alerts to be triggered even if the data has not been saved first.
-- 
https://code.launchpad.net/~trb143/openlp/b1/+merge/58032
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py	2011-03-24 19:04:02 +0000
+++ openlp/plugins/alerts/forms/alertform.py	2011-04-17 12:59:25 +0000
@@ -61,6 +61,12 @@
         QtCore.QObject.connect(self.alertListWidget,
             QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
 
+    def exec_(self):
+        self.displayButton.setEnabled(False)
+        self.displayCloseButton.setEnabled(False)
+        self.alertTextEdit.setText(u'')
+        return QtGui.QDialog.exec_(self)
+
     def loadList(self):
         """
         Loads the list with alerts.
@@ -125,6 +131,12 @@
         # Only enable the button, if we are editing an item.
         if self.item_id:
             self.saveButton.setEnabled(True)
+        if self.alertTextEdit.text():
+            self.displayButton.setEnabled(True)
+            self.displayCloseButton.setEnabled(True)
+        else:
+            self.displayButton.setEnabled(False)
+            self.displayCloseButton.setEnabled(False)
 
     def onDoubleClick(self):
         """