openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #20112
[Merge] lp:~googol/openlp/random-regression-bugs into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/random-regression-bugs into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~googol/openlp/random-regression-bugs/+merge/156061
- fixed regression in bible manager
- fixed wrong Registry usage
- fixed method/argument renames
- fixed custom regression + added test for it
- fixed FTW regression
- fixed more regression bugs
--
https://code.launchpad.net/~googol/openlp/random-regression-bugs/+merge/156061
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2013-03-10 20:19:42 +0000
+++ openlp/core/ui/maindisplay.py 2013-03-28 20:12:25 +0000
@@ -175,7 +175,7 @@
We need to rebuild the CSS on the live display.
"""
for plugin in self.plugin_manager.plugins:
- plugin.refreshCss(self.frame)
+ plugin.refresh_css(self.frame)
def retranslateUi(self):
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2013-03-19 17:53:51 +0000
+++ openlp/core/ui/mainwindow.py 2013-03-28 20:12:25 +0000
@@ -328,7 +328,7 @@
# Order things differently in OS X so that Preferences menu item in the
# app menu is correct (this gets picked up automatically by Qt).
if sys.platform == u'darwin':
- add_actions(self.settings_menu, (self.settingsPluginListItem, self.settings_language_menu.menuAction(),
+ add_actions(self.settings_menu, (self.settingsPluginListItem, self.settings_language_menu.menuAction(),
None, self.settings_configure_item, self.settings_shortcuts_item, self.formatting_tag_item))
else:
add_actions(self.settings_menu, (self.settingsPluginListItem, self.settings_language_menu.menuAction(),
@@ -342,7 +342,7 @@
self.about_item))
else:
add_actions(self.help_menu, (self.on_line_help_item, None, self.web_site_item, self.about_item))
- add_actions(self.menuBar, (self.file_menu.menuAction(), self.view_menu.menuAction(),
+ add_actions(self.menuBar, (self.file_menu.menuAction(), self.view_menu.menuAction(),
self.tools_menu.menuAction(), self.settings_menu.menuAction(), self.help_menu.menuAction()))
# Initialise the translation
self.retranslateUi(main_window)
@@ -386,7 +386,7 @@
self.file_save_item.setStatusTip(translate('OpenLP.MainWindow', 'Save the current service to disk.'))
self.file_save_as_item.setText(translate('OpenLP.MainWindow', 'Save &As...'))
self.file_save_as_item.setToolTip(translate('OpenLP.MainWindow', 'Save Service As'))
- self.file_save_as_item.setStatusTip(translate('OpenLP.MainWindow',
+ self.file_save_as_item.setStatusTip(translate('OpenLP.MainWindow',
'Save the current service under a new name.'))
self.print_service_order_item.setText(UiStrings().PrintService)
self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.'))
@@ -449,7 +449,7 @@
self.tools_first_time_wizard.setStatusTip(translate('OpenLP.MainWindow',
'Re-run the First Time Wizard, importing songs, Bibles and themes.'))
self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images'))
- self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
+ self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
'Update the preview images for all themes.'))
self.mode_default_Item.setText(translate('OpenLP.MainWindow', '&Default'))
self.mode_default_Item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.'))
@@ -651,7 +651,7 @@
for plugin in self.plugin_manager.plugins:
self.activePlugin = plugin
oldStatus = self.activePlugin.status
- self.activePlugin.setStatus()
+ self.activePlugin.set_status()
if oldStatus != self.activePlugin.status:
if self.activePlugin.status == PluginStatus.Active:
self.activePlugin.toggle_status(PluginStatus.Active)
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2013-03-17 09:21:18 +0000
+++ openlp/core/ui/themestab.py 2013-03-28 20:12:25 +0000
@@ -184,7 +184,7 @@
"""
self.global_theme = self.default_combo_box.currentText()
self.renderer.set_global_theme()
- self._previewGlobalTheme()
+ self._preview_global_theme()
def update_theme_list(self, theme_list):
"""
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2013-03-19 19:43:22 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2013-03-28 20:12:25 +0000
@@ -225,7 +225,7 @@
``frame``
The Web frame holding the page.
"""
- align = VerticalType.Names[self.settingsTab.location]
+ align = VerticalType.Names[self.settings_tab.location]
frame.evaluateJavaScript(u'update_css("%s", "%s", "%s", "%s", "%s")' %
- (align, self.settingsTab.font_face, self.settingsTab.font_size,
- self.settingsTab.font_color, self.settingsTab.background_color))
+ (align, self.settings_tab.font_face, self.settings_tab.font_size,
+ self.settings_tab.font_color, self.settings_tab.background_color))
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2013-03-17 10:23:15 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2013-03-28 20:12:25 +0000
@@ -206,7 +206,7 @@
self.layout_style = self.layout_style_combo_box.currentIndex()
def on_language_selection_combo_box_changed(self):
- self.language_selection = self.language_selectioncombo_box.currentIndex()
+ self.language_selection = self.language_selection_combo_box.currentIndex()
def on_new_chapters_check_box_changed(self, check_state):
self.show_new_chapters = False
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2013-03-23 06:46:41 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2013-03-28 20:12:25 +0000
@@ -516,13 +516,13 @@
def onQuickStyleComboBoxChanged(self):
self.settings.layout_style = self.quickStyleComboBox.currentIndex()
self.advancedStyleComboBox.setCurrentIndex(self.settings.layout_style)
- self.settings.layoutStyleComboBox.setCurrentIndex(self.settings.layout_style)
+ self.settings.layout_style_combo_box.setCurrentIndex(self.settings.layout_style)
Settings().setValue(self.settings_section + u'/verse layout style', self.settings.layout_style)
def onAdvancedStyleComboBoxChanged(self):
self.settings.layout_style = self.advancedStyleComboBox.currentIndex()
self.quickStyleComboBox.setCurrentIndex(self.settings.layout_style)
- self.settings.layoutStyleComboBox.setCurrentIndex(self.settings.layout_style)
+ self.settings.layout_style_combo_box.setCurrentIndex(self.settings.layout_style)
Settings().setValue(self.settings_section + u'/verse layout style', self.settings.layout_style)
def onAdvancedVersionComboBox(self):
=== modified file 'openlp/plugins/custom/forms/__init__.py'
--- openlp/plugins/custom/forms/__init__.py 2013-01-05 22:17:30 +0000
+++ openlp/plugins/custom/forms/__init__.py 2013-03-28 20:12:25 +0000
@@ -26,6 +26,3 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-
-from editcustomform import EditCustomForm
-from editcustomslideform import EditCustomSlideForm
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2013-03-20 18:35:28 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2013-03-28 20:12:25 +0000
@@ -35,8 +35,8 @@
from openlp.core.lib.ui import critical_error_message_box, find_and_set_in_combo_box
from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
from openlp.plugins.custom.lib.db import CustomSlide
+from editcustomslideform import EditCustomSlideForm
from editcustomdialog import Ui_CustomEditDialog
-from editcustomslideform import EditCustomSlideForm
log = logging.getLogger(__name__)
@@ -91,8 +91,8 @@
self.slide_list_view.clear()
if id == 0:
self.custom_slide = CustomSlide()
- self.title_edit.set_text(u'')
- self.credit_edit.set_text(u'')
+ self.title_edit.setText(u'')
+ self.credit_edit.setText(u'')
self.theme_combo_box.setCurrentIndex(0)
else:
self.custom_slide = self.manager.get_object(CustomSlide, id)
@@ -158,7 +158,7 @@
"""
Add a new blank slide.
"""
- self.edit_slide_form.set_text(u'')
+ self.edit_slide_form.setText(u'')
if self.edit_slide_form.exec_():
self.slide_list_view.addItems(self.edit_slide_form.get_text())
@@ -166,7 +166,7 @@
"""
Edit the currently selected slide.
"""
- self.edit_slide_form.set_text(self.slide_list_view.currentItem().text())
+ self.edit_slide_form.setText(self.slide_list_view.currentItem().text())
if self.edit_slide_form.exec_():
self.update_slide_list(self.edit_slide_form.get_text())
@@ -180,7 +180,7 @@
slide_text += item.text()
if row != self.slide_list_view.count() - 1:
slide_text += u'\n[===]\n'
- self.edit_slide_form.set_text(slide_text)
+ self.edit_slide_form.setText(slide_text)
if self.edit_slide_form.exec_():
self.update_slide_list(self.edit_slide_form.get_text(), True)
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2013-03-23 06:46:41 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2013-03-28 20:12:25 +0000
@@ -34,7 +34,7 @@
from openlp.core.lib import Registry, MediaManagerItem, ItemCapabilities, ServiceItemContext, Settings, PluginStatus,\
UiStrings, check_item_selected, translate
-from openlp.plugins.custom.forms import EditCustomForm
+from openlp.plugins.custom.forms.editcustomform import EditCustomForm
from openlp.plugins.custom.lib import CustomXMLParser, CustomXMLBuilder
from openlp.plugins.custom.lib.db import CustomSlide
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2013-03-19 20:05:13 +0000
+++ openlp/plugins/media/mediaplugin.py 2013-03-28 20:12:25 +0000
@@ -127,6 +127,7 @@
Plugin.app_startup(self)
settings = Settings()
settings.beginGroup(self.settings_section)
+ # FIXME: Probably broken due to Settings rewrite.
if settings.contains(u'use phonon'):
log.info(u'Found old Phonon setting')
players = self.media_controller.mediaPlayers.keys()
@@ -139,7 +140,7 @@
new_players.insert(0, u'phonon')
self.media_controller.mediaPlayers[u'phonon'].is_active = True
settings.setValue(u'players', u','.join(new_players))
- self.settingsTab.load()
+ self.settings_tab.load()
settings.remove(u'use phonon')
settings.endGroup()
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2013-03-16 20:52:59 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2013-03-28 20:12:25 +0000
@@ -150,7 +150,7 @@
Settings().setValue(self.settings_section + u'/ip address', self.address_edit.text())
Settings().setValue(self.settings_section + u'/twelve hour', self.twelve_hour)
if changed:
- Registry().register_function(u'remotes_config_updated')
+ Registry().execute(u'remotes_config_updated')
def onTwelveHourCheckBoxChanged(self, check_state):
self.twelve_hour = False
=== added directory 'tests/interfaces/openlp_plugins_custom_forms'
=== added file 'tests/interfaces/openlp_plugins_custom_forms/__init__.py'
=== added file 'tests/interfaces/openlp_plugins_custom_forms/test_customform.py'
--- tests/interfaces/openlp_plugins_custom_forms/test_customform.py 1970-01-01 00:00:00 +0000
+++ tests/interfaces/openlp_plugins_custom_forms/test_customform.py 2013-03-28 20:12:25 +0000
@@ -0,0 +1,53 @@
+"""
+Module to the custom edit form.
+"""
+from unittest import TestCase
+from mock import MagicMock, patch
+
+from PyQt4 import QtGui
+
+from openlp.core.lib import Registry
+# Import needed due to import problems.
+from openlp.plugins.custom.lib.mediaitem import CustomMediaItem
+from openlp.plugins.custom.forms.editcustomform import EditCustomForm
+
+
+class TestCustomFrom(TestCase):
+ """
+ Test the EditCustomForm.
+ """
+ def setUp(self):
+ """
+ Create the UI
+ """
+ Registry.create()
+ self.app = QtGui.QApplication([])
+ self.main_window = QtGui.QMainWindow()
+ Registry().register(u'main_window', self.main_window)
+ media_item = MagicMock()
+ manager = MagicMock()
+ self.form = EditCustomForm(media_item, self.main_window, manager)
+
+ def tearDown(self):
+ """
+ Delete all the C++ objects at the end so that we don't have a segfault
+ """
+ del self.form
+ del self.main_window
+ del self.app
+
+ def load_custom_test(self):
+ """
+ Test the EditCustomForm defaults are correct
+ """
+ # GIVEN: A mocked QDialog.exec_() method
+ with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
+ # WHEN: Show the dialog.
+ self.form.exec_()
+ # Create a new custom item.
+ self.form.load_custom(0)
+
+ #THEN: The line edits should not contain any text.
+ self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
+ self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
+
Follow ups
