openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/projector-bugfix-1387223-1386913 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1386913 in OpenLP: "Remove "Discard" option when selecting source input"
  https://bugs.launchpad.net/openlp/+bug/1386913
  Bug #1387223 in OpenLP: "openlp/core/ui/projector missing __init__.py"
  https://bugs.launchpad.net/openlp/+bug/1387223

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/projector-bugfix-1387223-1386913/+merge/240018

Missing openlp/core/ui/projector/__init__.py causes issues on Mac and Windows after install (bug 1387223).
Remove "Reset" and "Discard" options from source input dialog when not in edit mode (bug 1386913).

lp:~alisonken1/openlp/projector-2.1-merge (revision 2533)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/723/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/666/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/610/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/550/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/159/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/364/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/238/

-- 
https://code.launchpad.net/~alisonken1/openlp/projector-bugfix-1387223-1386913/+merge/240018
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/projector-bugfix-1387223-1386913 into lp:openlp.

=== added file 'openlp/core/ui/projector/__init__.py'
--- openlp/core/ui/projector/__init__.py	1970-01-01 00:00:00 +0000
+++ openlp/core/ui/projector/__init__.py	2014-10-29 15:20:31 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2014 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder,               #
+# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble,             #
+# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+    :mod: `openlp.core.ui.projector` module
+
+    Provides the functions for projector interface
+"""
+ 
\ No newline at end of file

=== modified file 'openlp/core/ui/projector/sourceselectform.py'
--- openlp/core/ui/projector/sourceselectform.py	2014-10-23 21:00:06 +0000
+++ openlp/core/ui/projector/sourceselectform.py	2014-10-29 15:20:31 +0000
@@ -261,6 +261,7 @@
             self.tabwidget.setTabPosition(QTabWidget.West)
         self.layout.addWidget(self.tabwidget)
         self.setLayout(self.layout)
+        self.button_box = None
 
     def exec_(self, projector):
         """
@@ -276,6 +277,10 @@
         keys = list(self.source_group.keys())
         keys.sort()
         if self.edit:
+            self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
+                                               QtGui.QDialogButtonBox.Discard |
+                                               QtGui.QDialogButtonBox.Ok |
+                                               QtGui.QDialogButtonBox.Cancel)
             for key in keys:
                 (tab, button_count, buttonchecked) = Build_Tab(group=self.button_group,
                                                                source_key={key: self.source_group[key]},
@@ -287,6 +292,8 @@
                 if buttonchecked:
                     self.tabwidget.setCurrentIndex(thistab)
         else:
+            self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Ok |
+                                               QtGui.QDialogButtonBox.Cancel)
             for key in keys:
                 (tab, button_count, buttonchecked) = Build_Tab(group=self.button_group,
                                                                source_key={key: self.source_group[key]},
@@ -297,10 +304,6 @@
                 thistab = self.tabwidget.addTab(tab, PJLINK_DEFAULT_SOURCES[key])
                 if buttonchecked:
                     self.tabwidget.setCurrentIndex(thistab)
-        self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
-                                           QtGui.QDialogButtonBox.Discard |
-                                           QtGui.QDialogButtonBox.Ok |
-                                           QtGui.QDialogButtonBox.Cancel)
         self.button_box.clicked.connect(self.button_clicked)
         self.layout.addWidget(self.button_box)
         set_button_tooltip(self.button_box)
@@ -407,6 +410,10 @@
         key_count = len(keys)
         button_list = []
         if self.edit:
+            self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
+                                               QtGui.QDialogButtonBox.Discard |
+                                               QtGui.QDialogButtonBox.Ok |
+                                               QtGui.QDialogButtonBox.Cancel)
             for key in keys:
                 item = QLineEdit()
                 item.setObjectName('source_key_%s' % key)
@@ -419,6 +426,8 @@
                 self.layout.addRow(PJLINK_DEFAULT_CODES[key], item)
                 self.button_group.append(item)
         else:
+            self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Ok |
+                                               QtGui.QDialogButtonBox.Cancel)
             for key in keys:
                 source_text = self.projectordb.get_source_by_code(code=key, projector_id=self.projector.db_item.id)
                 text = self.source_text[key] if source_text is None else source_text.text
@@ -427,10 +436,6 @@
                 self.layout.addWidget(button)
                 self.button_group.addButton(button, int(key))
                 button_list.append(key)
-        self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
-                                           QtGui.QDialogButtonBox.Discard |
-                                           QtGui.QDialogButtonBox.Ok |
-                                           QtGui.QDialogButtonBox.Cancel)
         self.button_box.clicked.connect(self.button_clicked)
         self.layout.addWidget(self.button_box)
         self.setMinimumHeight(key_count*25)