raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fix bits

Browse Source
This commit is contained in:
Tim Bentley 2018-12-21 15:33:46 +00:00
parent 0f538250b9
commit 7be849681a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/widgets/views.py
View File

@ -193,8 +193,8 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
if self.service_item.is_capable(ItemCapabilities.HasThumbnails): if self.service_item.is_capable(ItemCapabilities.HasThumbnails):
image = self.image_manager.get_image(frame['image'], ImageSource.CommandPlugins) image = self.image_manager.get_image(frame['image'], ImageSource.CommandPlugins)
pixmap = QtGui.QPixmap.fromImage(image) pixmap = QtGui.QPixmap.fromImage(image)
else: # else:
pixmap = frame['image'].pixmap(80, 80) # pixmap = frame['image'].pixmap(80, 80)
else: else:
image = self.image_manager.get_image(frame['path'], ImageSource.ImagePlugin) image = self.image_manager.get_image(frame['path'], ImageSource.ImagePlugin)
pixmap = QtGui.QPixmap.fromImage(image) pixmap = QtGui.QPixmap.fromImage(image)

1
tests/functional/openlp_core/ui/test_slidecontroller.py
View File

@ -679,6 +679,7 @@ class TestSlideController(TestCase):
slide_controller.is_live = False slide_controller.is_live = False
slide_controller.preview_widget = MagicMock() slide_controller.preview_widget = MagicMock()
slide_controller.preview_display = MagicMock() slide_controller.preview_display = MagicMock()
slide_controller.slide_preview = MagicMock()
slide_controller.enable_tool_bar = MagicMock() slide_controller.enable_tool_bar = MagicMock()
slide_controller.on_media_start = MagicMock() slide_controller.on_media_start = MagicMock()
slide_controller.slide_selected = MagicMock() slide_controller.slide_selected = MagicMock()

4
tests/interfaces/openlp_core/ui/test_mainwindow.py
View File

@ -47,16 +47,12 @@ class TestMainWindow(TestCase, TestMixin):
Registry().set_flag('no_web_server', True) Registry().set_flag('no_web_server', True)
# Mock classes and methods used by mainwindow. # Mock classes and methods used by mainwindow.
with patch('openlp.core.ui.mainwindow.SettingsForm'), \ with patch('openlp.core.ui.mainwindow.SettingsForm'), \
patch('openlp.core.ui.mainwindow.ImageManager'), \
patch('openlp.core.ui.mainwindow.LiveController'), \
patch('openlp.core.ui.mainwindow.PreviewController'), \
patch('openlp.core.ui.mainwindow.OpenLPDockWidget'), \ patch('openlp.core.ui.mainwindow.OpenLPDockWidget'), \
patch('openlp.core.ui.mainwindow.QtWidgets.QToolBox'), \ patch('openlp.core.ui.mainwindow.QtWidgets.QToolBox'), \
patch('openlp.core.ui.mainwindow.QtWidgets.QMainWindow.addDockWidget'), \ patch('openlp.core.ui.mainwindow.QtWidgets.QMainWindow.addDockWidget'), \
patch('openlp.core.ui.mainwindow.ServiceManager'), \ patch('openlp.core.ui.mainwindow.ServiceManager'), \
patch('openlp.core.ui.mainwindow.ThemeManager'), \ patch('openlp.core.ui.mainwindow.ThemeManager'), \
patch('openlp.core.ui.mainwindow.ProjectorManager'), \ patch('openlp.core.ui.mainwindow.ProjectorManager'), \
patch('openlp.core.ui.mainwindow.Renderer'), \
patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \ patch('openlp.core.ui.mainwindow.websockets.WebSocketServer'), \
patch('openlp.core.ui.mainwindow.server.HttpServer'): patch('openlp.core.ui.mainwindow.server.HttpServer'):
self.main_window = MainWindow() self.main_window = MainWindow()