From 62c5908d8555caa213ea15046aae007837db7be4 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jun 2013 11:09:54 +0200 Subject: [PATCH 1/3] python3 division in slidecontroller --- openlp/core/ui/pluginform.py | 2 +- openlp/core/ui/slidecontroller.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 954203d26..dd497bd68 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -31,7 +31,7 @@ The actual plugin view form """ import logging -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui from openlp.core.lib import PluginStatus, Registry, translate from plugindialog import Ui_PluginViewDialog diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index c9bb8b02c..427bb5cf1 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -29,6 +29,7 @@ """ The :mod:`slidecontroller` module contains the most important part of OpenLP - the slide controller """ +from __future__ import division import os import logging import copy @@ -93,7 +94,7 @@ class SlideController(DisplayController): Registry().register_function(u'bootstrap_post_set_up', self.screen_size_changed) self.screens = ScreenList() try: - self.ratio = float(self.screens.current[u'size'].width()) / float(self.screens.current[u'size'].height()) + self.ratio = self.screens.current[u'size'].width() / self.screens.current[u'size'].height() except ZeroDivisionError: self.ratio = 1 self.loop_list = [ @@ -524,7 +525,7 @@ class SlideController(DisplayController): self.display.audio_player.connectSlot(QtCore.SIGNAL(u'tick(qint64)'), self.on_audio_time_remaining) # The SlidePreview's ratio. try: - self.ratio = float(self.screens.current[u'size'].width()) / float(self.screens.current[u'size'].height()) + self.ratio = self.screens.current[u'size'].width() / self.screens.current[u'size'].height() except ZeroDivisionError: self.ratio = 1 self.media_controller.setup_display(self.display, False) @@ -553,7 +554,7 @@ class SlideController(DisplayController): splitters is moved or when the screen size is changed. Note, that this method is (also) called frequently from the mainwindow *paintEvent*. """ - if self.ratio < float(self.preview_frame.width()) / float(self.preview_frame.height()): + if self.ratio < self.preview_frame.width() / self.preview_frame.height(): # We have to take the height as limit. max_height = self.preview_frame.height() - self.grid.margin() * 2 self.slide_preview.setFixedSize(QtCore.QSize(max_height * self.ratio, max_height)) @@ -723,7 +724,7 @@ class SlideController(DisplayController): def _process_item(self, service_item, slideno): """ - Loads a ServiceItem into the system from ServiceManager + Loads a ServiceItem into the system from ServiceManager Display the slide number passed """ log.debug(u'processManagerItem live = %s' % self.is_live) From 1e11f4d821430c78a37da112bd4b5b5b17afbe84 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jun 2013 11:12:49 +0200 Subject: [PATCH 2/3] true division --- openlp/core/ui/listpreviewwidget.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/listpreviewwidget.py b/openlp/core/ui/listpreviewwidget.py index ca04c9688..e15b83fbd 100644 --- a/openlp/core/ui/listpreviewwidget.py +++ b/openlp/core/ui/listpreviewwidget.py @@ -76,7 +76,7 @@ class ListPreviewWidget(QtGui.QTableWidget): else: # Sort out image heights. for framenumber in range(len(self.service_item.get_frames())): - height = self.viewport().width() / self.screen_ratio + height = self.viewport().width() // self.screen_ratio self.setRowHeight(framenumber, height) def screen_size_changed(self, screen_ratio): @@ -101,7 +101,7 @@ class ListPreviewWidget(QtGui.QTableWidget): for framenumber, frame in enumerate(self.service_item.get_frames()): self.setRowCount(self.slide_count() + 1) item = QtGui.QTableWidgetItem() - slideHeight = 0 + slide_height = 0 if self.service_item.is_text(): if frame[u'verseTag']: # These tags are already translated. @@ -125,12 +125,12 @@ class ListPreviewWidget(QtGui.QTableWidget): image = self.image_manager.get_image(frame[u'path'], ImageSource.ImagePlugin) label.setPixmap(QtGui.QPixmap.fromImage(image)) self.setCellWidget(framenumber, 0, label) - slideHeight = width / self.screen_ratio + slide_height = width // self.screen_ratio row += 1 text.append(unicode(row)) self.setItem(framenumber, 0, item) - if slideHeight: - self.setRowHeight(framenumber, slideHeight) + if slide_height: + self.setRowHeight(framenumber, slide_height) self.setVerticalHeaderLabels(text) if self.service_item.is_text(): self.resizeRowsToContents() From 658b6f89dae34f024a865b7ab94e3f6928d1c0f0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jun 2013 21:32:04 +0200 Subject: [PATCH 3/3] import --- openlp/core/ui/listpreviewwidget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/listpreviewwidget.py b/openlp/core/ui/listpreviewwidget.py index e15b83fbd..ae6d0bed8 100644 --- a/openlp/core/ui/listpreviewwidget.py +++ b/openlp/core/ui/listpreviewwidget.py @@ -30,7 +30,7 @@ The :mod:`listpreviewwidget` is a widget that lists the slides in the slide controller. It is based on a QTableWidget but represents its contents in list form. """ - +from __future__ import division from PyQt4 import QtCore, QtGui from openlp.core.lib import ImageSource, Registry, ServiceItem