From 17ec820b791b0e7f37d2710a81be96b5a54b4812 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Mon, 19 Apr 2010 19:43:20 +0100 Subject: [PATCH] Import and typo fixes --- openlp/core/ui/mainwindow.py | 2 +- openlp/plugins/alerts/forms/alertstab.py | 1 - openlp/plugins/songs/lib/sofimport.py | 7 ++----- openlp/plugins/songs/lib/songimport.py | 4 +++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index e0e8465f5..469bc6d69 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -671,7 +671,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): def serviceChanged(self, reset=False, serviceName=None): """ - Hook to change the main window title when the service chmainwindow.pyanges + Hook to change the main window title when the service changes ``reset`` Shows if the service has been cleared or saved diff --git a/openlp/plugins/alerts/forms/alertstab.py b/openlp/plugins/alerts/forms/alertstab.py index d15865a6d..b8efe9bdb 100644 --- a/openlp/plugins/alerts/forms/alertstab.py +++ b/openlp/plugins/alerts/forms/alertstab.py @@ -26,7 +26,6 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import SettingsTab, str_to_bool -from openlp.plugins.alerts.lib.models import AlertItem class AlertsTab(SettingsTab): """ diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py index 48139931b..9d95cf6b5 100644 --- a/openlp/plugins/songs/lib/sofimport.py +++ b/openlp/plugins/songs/lib/sofimport.py @@ -29,22 +29,19 @@ # http://www.oooforum.org/forum/viewtopic.phtml?t=14409 # http://wiki.services.openoffice.org/wiki/Python -import re import os -import time -from PyQt4 import QtCore +import re + from songimport import SongImport from oooimport import OooImport if os.name == u'nt': - from win32com.client import Dispatch BOLD = 150.0 ITALIC = 2 PAGE_BEFORE = 4 PAGE_AFTER = 5 PAGE_BOTH = 6 else: - import uno from com.sun.star.awt.FontWeight import BOLD from com.sun.star.awt.FontSlant import ITALIC from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index cb780f987..5fe362842 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -24,7 +24,9 @@ ############################################################################### import string -from PyQt4 import QtGui, QtCore + +from PyQt4 import QtGui + from openlp.core.lib import SongXMLBuilder from openlp.plugins.songs.lib.models import Song, Author, Topic, Book