From 0b1621923ad4607da7b59336ede2586de11b1ec8 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 9 Jun 2010 18:09:32 +0100 Subject: [PATCH 1/6] PEP8 type checking and cleanups --- openlp/core/lib/mediamanageritem.py | 5 ++-- openlp/core/lib/renderer.py | 36 ++++++++++++++-------------- openlp/core/lib/xmlrootclass.py | 7 ++---- openlp/core/theme/theme.py | 5 +--- openlp/core/ui/amendthemeform.py | 6 ++--- openlp/core/ui/maindisplay.py | 4 ++-- openlp/core/ui/servicemanager.py | 4 ++-- openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/thememanager.py | 2 +- openlp/core/utils/languagemanager.py | 13 +++++----- openlp/plugins/bibles/lib/common.py | 6 ++--- openlp/plugins/bibles/lib/http.py | 2 +- openlp/plugins/songs/lib/songxml.py | 6 ++--- scripts/translation_utils.py | 23 +++++++++--------- 14 files changed, 58 insertions(+), 63 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 8bfefceb0..9a6b30a91 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -24,7 +24,6 @@ ############################################################################### import logging -import types import os from PyQt4 import QtCore, QtGui @@ -98,9 +97,9 @@ class MediaManagerItem(QtGui.QWidget): QtGui.QWidget.__init__(self) self.parent = parent self.settingsSection = title.lower() - if type(icon) is QtGui.QIcon: + if isinstance(icon, QtGui.QIcon): self.icon = icon - elif type(icon) is types.StringType: + elif isinstance(icon, basestring): self.icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off) else: diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 55700ebac..142b3741d 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -145,7 +145,7 @@ class Renderer(object): return split_text def pre_render_text(self, text): - metrics = QtGui.QFontMetrics(self.mainFont) + metrics = QtGui.QFontMetrics(self.main_font) #work out line width line_width = self._rect.width() #number of lines on a page - adjust for rounding up. @@ -248,7 +248,7 @@ class Renderer(object): self.frame = QtGui.QImage(self.bg_frame) if self._theme.display_slideTransition: self.frame_opaque = QtGui.QImage(self.bg_frame) - x, y = self._correctAlignment(self._rect, bbox) + x, y = self._correct_alignment(self._rect, bbox) bbox = self._render_lines_unaligned(lines, False, (x, y), True) if footer_lines: bbox = self._render_lines_unaligned(footer_lines, True, @@ -304,15 +304,15 @@ class Renderer(object): gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor)) painter.setBrush(QtGui.QBrush(gradient)) - rectPath = QtGui.QPainterPath() + rect_path = QtGui.QPainterPath() max_x = self.frame.width() max_y = self.frame.height() - rectPath.moveTo(0, 0) - rectPath.lineTo(0, max_y) - rectPath.lineTo(max_x, max_y) - rectPath.lineTo(max_x, 0) - rectPath.closeSubpath() - painter.drawPath(rectPath) + rect_path.moveTo(0, 0) + rect_path.lineTo(0, max_y) + rect_path.lineTo(max_x, max_y) + rect_path.lineTo(max_x, 0) + rect_path.closeSubpath() + painter.drawPath(rect_path) elif self._theme.background_type == u'image': # image painter.fillRect(self.frame.rect(), QtCore.Qt.black) @@ -321,7 +321,7 @@ class Renderer(object): painter.end() log.debug(u'render background End') - def _correctAlignment(self, rect, bbox): + def _correct_alignment(self, rect, bbox): """ Corrects the vertical alignment of text. @@ -493,19 +493,19 @@ class Renderer(object): if self._theme.font_footer_weight == u'Bold': footer_weight = 75 #TODO Add myfont.setPixelSize((screen_height / 100) * font_size) - self.footerFont = QtGui.QFont(self._theme.font_footer_name, + self.footer_font = QtGui.QFont(self._theme.font_footer_name, self._theme.font_footer_proportion, # size footer_weight, # weight self._theme.font_footer_italics) # italic - self.footerFont.setPixelSize(self._theme.font_footer_proportion) + self.footer_font.setPixelSize(self._theme.font_footer_proportion) main_weight = 50 if self._theme.font_main_weight == u'Bold': main_weight = 75 - self.mainFont = QtGui.QFont(self._theme.font_main_name, + self.main_font = QtGui.QFont(self._theme.font_main_name, self._theme.font_main_proportion, # size main_weight, # weight self._theme.font_main_italics)# italic - self.mainFont.setPixelSize(self._theme.font_main_proportion) + self.main_font.setPixelSize(self._theme.font_main_proportion) def _get_extent_and_render(self, line, footer, tlcorner=(0, 0), draw=False, color=None, outline_size=0): @@ -530,10 +530,10 @@ class Renderer(object): Defaults to *None*. The colour to draw with. """ # setup defaults - if footer : - font = self.footerFont + if footer: + font = self.footer_font else: - font = self.mainFont + font = self.main_font metrics = QtGui.QFontMetrics(font) w = metrics.width(line) if footer: @@ -576,7 +576,7 @@ class Renderer(object): self.painter2.drawText(x, rowpos, line) return (w, h) - def snoop_Image(self, image, image2=None): + def snoop_image(self, image, image2=None): """ Debugging method to allow images to be viewed. diff --git a/openlp/core/lib/xmlrootclass.py b/openlp/core/lib/xmlrootclass.py index 9b58a6f03..b2b37aaf1 100644 --- a/openlp/core/lib/xmlrootclass.py +++ b/openlp/core/lib/xmlrootclass.py @@ -25,7 +25,6 @@ import os import sys -from types import StringType, NoneType, UnicodeType from xml.etree.ElementTree import ElementTree, XML @@ -56,11 +55,9 @@ class XmlRootClass(object): for element in xml_iter: if element.tag != root_tag: text = element.text - if type(text) is NoneType: + if text is None: val = text - elif type(text) is UnicodeType : - val = text - elif type(text) is StringType: + elif isinstance(text, basestring): # Strings need special handling to sort the colours out if text[0] == u'$': # This might be a hex number, let's try to convert it. diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py index f63ee4c26..3232abc4e 100644 --- a/openlp/core/theme/theme.py +++ b/openlp/core/theme/theme.py @@ -23,8 +23,6 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -import types - from xml.etree.ElementTree import ElementTree, XML from PyQt4 import QtGui @@ -121,8 +119,7 @@ class Theme(object): if element_text is None: val = element_text # strings need special handling to sort the colours out - if type(element_text) is types.StringType or \ - type(element_text) is types.UnicodeType: + if isinstance(element_text, basestring): if element_text[0] == u'$': # might be a hex number try: val = int(element_text[1:], 16) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 1ae9caa79..a2db71ff3 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -408,7 +408,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): def setBackground(self, background, gradient): if background == 0: # Solid self.theme.background_type = u'solid' - if self.theme.background_color is None : + if self.theme.background_color is None: self.theme.background_color = u'#000000' self.ImageLineEdit.setText(u'') elif background == 1: # Gradient @@ -419,9 +419,9 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.theme.background_direction = u'vertical' else: self.theme.background_direction = u'circular' - if self.theme.background_startColor is None : + if self.theme.background_startColor is None: self.theme.background_startColor = u'#000000' - if self.theme.background_endColor is None : + if self.theme.background_endColor is None: self.theme.background_endColor = u'#ff0000' self.ImageLineEdit.setText(u'') else: diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index b0278428a..5e8db4934 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -74,7 +74,7 @@ class DisplayWidget(QtGui.QWidget): QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'} def keyPressEvent(self, event): - if type(event) == QtGui.QKeyEvent: + if isinstance(event, QtGui.QKeyEvent): #here accept the event and do something if event.key() == QtCore.Qt.Key_Up: Receiver.send_message(u'slidecontroller_live_previous') @@ -375,7 +375,7 @@ class VideoDisplay(Phonon.VideoWidget): self.setVisible(False) def keyPressEvent(self, event): - if type(event) == QtGui.QKeyEvent: + if isinstance(event, QtGui.QKeyEvent): #here accept the event and do something if event.key() == QtCore.Qt.Key_Escape: self.onMediaStop() diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index a794a1c21..baf26fde8 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -44,7 +44,7 @@ class ServiceManagerList(QtGui.QTreeWidget): self.parent = parent def keyPressEvent(self, event): - if type(event) == QtGui.QKeyEvent: + if isinstance(event, QtGui.QKeyEvent): #here accept the event and do something if event.key() == QtCore.Qt.Key_Enter: self.parent.makeLive() @@ -918,7 +918,7 @@ class ServiceManager(QtGui.QWidget): else: #we are not over anything so drop replace = False - if item == None: + if item is None: self.droppos = len(self.serviceItems) else: #we are over somthing so lets investigate diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 3a96279f5..fc77166e5 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -70,7 +70,7 @@ class SlideList(QtGui.QTableWidget): QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'} def keyPressEvent(self, event): - if type(event) == QtGui.QKeyEvent: + if isinstance(event, QtGui.QKeyEvent): #here accept the event and do something if event.key() == QtCore.Qt.Key_Up: self.parent.onSlideSelectedPrevious() diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index f1d5ece34..85cf0f069 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -438,7 +438,7 @@ class ThemeManager(QtGui.QWidget): return newtheme.extract_xml() def saveTheme(self, name, theme_xml, theme_pretty_xml, image_from, - image_to) : + image_to): """ Called by thememaintenance Dialog to save the theme and to trigger the reload of the theme list diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index 06d00c40f..6d99801d0 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -27,6 +27,7 @@ import logging import os from PyQt4 import QtCore, QtGui + from openlp.core.utils import AppLocation from openlp.core.lib import translate @@ -41,7 +42,7 @@ class LanguageManager(object): @staticmethod def get_translator(language): - if LanguageManager.AutoLanguage : + if LanguageManager.AutoLanguage: language = QtCore.QLocale.system().name() lang_Path = AppLocation.get_directory(AppLocation.AppDir) lang_Path = os.path.join(lang_Path, u'resources', u'i18n') @@ -81,7 +82,7 @@ class LanguageManager(object): def set_language(action): actionName = u'%s' % action.objectName() qmList = LanguageManager.get_qm_list() - if LanguageManager.AutoLanguage : + if LanguageManager.AutoLanguage: language = u'[%s]' % qmList[actionName] else: language = u'%s' % qmList[actionName] @@ -89,9 +90,9 @@ class LanguageManager(object): u'general/language', QtCore.QVariant(language)) log.info(u'Language file: \'%s\' written to conf file' % language) QtGui.QMessageBox.information(None, - translate(u'LanguageManager', u'Language'), - translate(u'LanguageManager', - u'After restart new Language settings will be used.')) + translate(u'LanguageManager', u'Language'), + translate(u'LanguageManager', + u'After restart new Language settings will be used.')) @staticmethod def init_qm_list(): @@ -106,7 +107,7 @@ class LanguageManager(object): @staticmethod def get_qm_list(): - if LanguageManager.__qmList__ == None: + if LanguageManager.__qmList__ is None: LanguageManager.init_qm_list() return LanguageManager.__qmList__ diff --git a/openlp/plugins/bibles/lib/common.py b/openlp/plugins/bibles/lib/common.py index 8313354c2..30777b3a2 100644 --- a/openlp/plugins/bibles/lib/common.py +++ b/openlp/plugins/bibles/lib/common.py @@ -242,7 +242,7 @@ class BibleCommon(object): text = text.replace(u''', u'\'') # Remove some other tags start_tag = text.find(u'<') - while start_tag > -1 : + while start_tag > -1: end_tag = text.find(u'>', start_tag) text = text[:start_tag] + text[end_tag + 1:] start_tag = text.find(u'<') @@ -260,10 +260,10 @@ def unescape(text): """ def fixup(markup): text = markup.group(0) - if text[:2] == u'&#': + if text.startswith(u'&#'): # character reference try: - if text[:3] == u'&#x': + if text.startswith(u'&#x'): return unichr(int(text[3:-1], 16)) else: return unichr(int(text[2:-1])) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index eb86ec4ae..223d428af 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -184,7 +184,7 @@ class BGExtract(BibleCommon): log.debug(u'init %s', proxyurl) self.proxyurl = proxyurl - def get_bible_chapter(self, version, bookname, chapter) : + def get_bible_chapter(self, version, bookname, chapter): """ Access and decode bibles via the BibleGateway website diff --git a/openlp/plugins/songs/lib/songxml.py b/openlp/plugins/songs/lib/songxml.py index 336fc080e..2f13e5f60 100644 --- a/openlp/plugins/songs/lib/songxml.py +++ b/openlp/plugins/songs/lib/songxml.py @@ -27,7 +27,7 @@ import logging import sys import os -from types import StringType, ListType +from types import ListType sys.path.append(os.path.abspath(u'./../../../..')) @@ -417,9 +417,9 @@ class Song(object): def _list_to_string(self, strOrList): """Force a possibly list into a string""" - if type(strOrList) == StringType: + if isinstance(strOrList, basestring): lst = self._split_to_list(strOrList) - elif type(strOrList) == ListType: + elif isinstance(strOrList, ListType): lst = strOrList elif strOrList is None: lst = [] diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index 8162b82b3..ee5baead9 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -31,8 +31,9 @@ ############################################################################### import os -from optparse import OptionParser import urllib + +from optparse import OptionParser from PyQt4 import QtCore ignore_pathes = [u"./scripts", u"./openlp/core/test"] @@ -62,16 +63,16 @@ def main(): # Set up command line options. usage = u'Usage: %prog [options]' parser = OptionParser(usage=usage) - parser.add_option("-d", "--download-ts", action="store_true", dest="download", - help="Load languages from Pootle Server") + parser.add_option("-d", "--download-ts", action="store_true", + dest="download", help="Load languages from Pootle Server") parser.add_option("-p", "--prepare", action="store_true", dest="prepare", - help="preparation (generate pro file)") + help="preparation (generate pro file)") parser.add_option("-u", "--update", action="store_true", dest="update", - help="update translation files") + help="update translation files") parser.add_option("-g", "--generate", action="store_true", dest="generate", - help="generate qm files") + help="generate qm files") parser.add_option("-a", "--all", action="store_true", dest="all", - help="proceed all options") + help="proceed all options") (options, args) = parser.parse_args() if options.download: @@ -90,7 +91,8 @@ def main(): def downloadTranslations(): print "download()" for language in translations: - filename = os.path.join(u'..',u'resources', u'i18n', u"openlp_%s.ts" % language) + filename = os.path.join(u'..', u'resources', u'i18n', + u"openlp_%s.ts" % language) print filename page = urllib.urlopen(u"%s%s.ts" % (translation_path, language)) content = page.read().decode("utf8") @@ -115,13 +117,13 @@ def preparation(): for search in ignore_pathes: if path.startswith(search): cond = True - if cond == True: + if cond: continue cond = False for search in ignore_files: if search == file: cond = True - if cond == True: + if cond: continue if file.endswith(u'.py'): @@ -142,7 +144,6 @@ def preparation(): write_file(os.path.join(start_dir, u'openlp.pro'), stringlist) print u'done.' - def update(): print "update()" updateProcess = QtCore.QProcess() From e40cdf792f9064f954a796a7c5bc794c8ab6649f Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 10 Jun 2010 00:28:02 +0100 Subject: [PATCH 2/6] Fix theme export breakage and lack of feedback --- openlp/core/ui/thememanager.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 85cf0f069..1e4baa72a 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -243,13 +243,20 @@ class ThemeManager(QtGui.QWidget): try: zip = zipfile.ZipFile(themePath, u'w') source = os.path.join(self.path, theme) - for files in os.walk(source)[2]: - for name in files: - zip.write( - os.path.join(source, name), + for files in os.walk(source): + for name in files[2]: + zip.write(os.path.join(source, name), os.path.join(theme, name)) + QtGui.QMessageBox.information(self, + translate(u'ThemeManager', u'Theme Exported'), + translate(u'ThemeManager', + u'Your theme has been successfully exported.')) except (IOError, OSError): log.exception(u'Export Theme Failed') + QtGui.QMessageBox.information(self, + translate(u'ThemeManager', u'Theme Export Failed'), + translate(u'ThemeManager', + u'Your theme could not be exported due to an error.')) finally: if zip: zip.close() From 1cfcdadbd108b5ef69db30f5720eeeaa97737cd5 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 10 Jun 2010 01:03:38 +0100 Subject: [PATCH 3/6] thememanager tweaks --- openlp/core/ui/thememanager.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 1e4baa72a..f52beade4 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -197,12 +197,12 @@ class ThemeManager(QtGui.QWidget): u'Theme %s is use in %s plugin' % (theme, plugin.name))) return - if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme: - QtGui.QMessageBox.critical( - self, translate(u'ThemeManager',u'Error'), + if unicode(self.parent.ServiceManagerContents.ThemeComboBox \ + .currentText()) == theme: + QtGui.QMessageBox.critical(self, + translate(u'ThemeManager', u'Error'), translate(u'ThemeManager', - u'Theme %s is use by Service Manager' % theme), - QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) + u'Theme %s is use by Service Manager' % theme)) return self.themelist.remove(theme) th = theme + u'.png' @@ -228,8 +228,7 @@ class ThemeManager(QtGui.QWidget): if item is None: QtGui.QMessageBox.critical(self, translate(u'ThemeManager', u'Error'), - translate(u'ThemeManager', u'You have not selected a theme.'), - QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) + translate(u'ThemeManager', u'You have not selected a theme.')) return theme = unicode(item.data(QtCore.Qt.UserRole).toString()) path = QtGui.QFileDialog.getExistingDirectory(self, @@ -245,7 +244,8 @@ class ThemeManager(QtGui.QWidget): source = os.path.join(self.path, theme) for files in os.walk(source): for name in files[2]: - zip.write(os.path.join(source, name), + zip.write( + os.path.join(source, name), os.path.join(theme, name)) QtGui.QMessageBox.information(self, translate(u'ThemeManager', u'Theme Exported'), @@ -253,7 +253,7 @@ class ThemeManager(QtGui.QWidget): u'Your theme has been successfully exported.')) except (IOError, OSError): log.exception(u'Export Theme Failed') - QtGui.QMessageBox.information(self, + QtGui.QMessageBox.critical(self, translate(u'ThemeManager', u'Theme Export Failed'), translate(u'ThemeManager', u'Your theme could not be exported due to an error.')) From 31c3be39e4e4b078ffd8ef6c7ea26a4060ee4cb7 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 10 Jun 2010 14:18:08 +0100 Subject: [PATCH 4/6] Remove old song import/export forms --- openlp/plugins/songs/forms/__init__.py | 6 - .../plugins/songs/forms/openlpexportdialog.py | 326 ---------- .../plugins/songs/forms/openlpexportform.py | 34 - .../plugins/songs/forms/openlpimportdialog.py | 327 ---------- .../plugins/songs/forms/openlpimportform.py | 33 - .../songs/forms/opensongexportdialog.py | 324 --------- .../plugins/songs/forms/opensongexportform.py | 33 - .../songs/forms/opensongimportdialog.py | 115 ---- .../plugins/songs/forms/opensongimportform.py | 33 - resources/forms/openlpexportform.ui | 613 ------------------ resources/forms/openlpimportform.ui | 613 ------------------ resources/forms/opensongexportform.ui | 613 ------------------ resources/forms/opensongimportform.ui | 172 ----- 13 files changed, 3242 deletions(-) delete mode 100644 openlp/plugins/songs/forms/openlpexportdialog.py delete mode 100644 openlp/plugins/songs/forms/openlpexportform.py delete mode 100644 openlp/plugins/songs/forms/openlpimportdialog.py delete mode 100644 openlp/plugins/songs/forms/openlpimportform.py delete mode 100644 openlp/plugins/songs/forms/opensongexportdialog.py delete mode 100644 openlp/plugins/songs/forms/opensongexportform.py delete mode 100644 openlp/plugins/songs/forms/opensongimportdialog.py delete mode 100644 openlp/plugins/songs/forms/opensongimportform.py delete mode 100644 resources/forms/openlpexportform.ui delete mode 100644 resources/forms/openlpimportform.ui delete mode 100644 resources/forms/opensongexportform.ui delete mode 100644 resources/forms/opensongimportform.ui diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py index a336db465..6c6d4161d 100644 --- a/openlp/plugins/songs/forms/__init__.py +++ b/openlp/plugins/songs/forms/__init__.py @@ -81,10 +81,4 @@ from songbookform import SongBookForm from editverseform import EditVerseForm from editsongform import EditSongForm from songmaintenanceform import SongMaintenanceForm - -#from openlpexportform import OpenLPExportForm -#from openlpimportform import OpenLPImportForm -#from opensongexportform import OpenSongExportForm -#from opensongimportform import OpenSongImportForm - from songimportform import ImportWizardForm diff --git a/openlp/plugins/songs/forms/openlpexportdialog.py b/openlp/plugins/songs/forms/openlpexportdialog.py deleted file mode 100644 index bf8d06349..000000000 --- a/openlp/plugins/songs/forms/openlpexportdialog.py +++ /dev/null @@ -1,326 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate - -class Ui_OpenLPExportDialog(object): - def setupUi(self, OpenLPExportDialog): - OpenLPExportDialog.setObjectName(u'OpenLPExportDialog') - OpenLPExportDialog.resize(473, 459) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenLPExportDialog.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPExportDialog) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(OpenLPExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileWidget.setSizePolicy(sizePolicy) - self.ExportFileWidget.setObjectName(u'ExportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) - self.ExportFileLabel.setObjectName(u'ExportFileLabel') - self.horizontalLayout.addWidget(self.ExportFileLabel) - self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) - self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') - self.horizontalLayout.addWidget(self.ExportFileLineEdit) - self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/general/general_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ExportFileSelectPushButton.setIcon(icon1) - self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenLPExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileSongListWidget.setSizePolicy(sizePolicy) - self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) - self.ExportListLabel.setObjectName(u'ExportListLabel') - self.verticalLayout.addWidget(self.ExportListLabel) - self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) - self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ExportListTable.setShowGrid(False) - self.ExportListTable.setWordWrap(False) - self.ExportListTable.setCornerButtonEnabled(False) - self.ExportListTable.setObjectName(u'ExportListTable') - self.ExportListTable.setColumnCount(2) - self.ExportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ExportListTable) - self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) - self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ExportSelectAllPushButton.setIcon(icon2) - self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ExportSelectAllWidget) - self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) - self.exportFilterWidget.setSizePolicy(sizePolicy) - self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.exportFilterWidget.setObjectName(u'exportFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) - self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) - self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) - self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') - self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) - self.verticalLayout.addWidget(self.exportFilterWidget) - self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenLPExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenLPExportDialog) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ExportPushButton.setObjectName(u'ExportPushButton') - self.horizontalLayout_7.addWidget(self.ExportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi(OpenLPExportDialog) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPExportDialog.close) - QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog) - - def retranslateUi(self, OpenLPExportDialog): - OpenLPExportDialog.setWindowTitle( - translate(u'SongsPlugin.OpenLPExportForm', - u'openlp.org Song Exporter')) - self.ExportFileLabel.setText( - translate(u'SongsPlugin.OpenLPExportForm', - u'Select openlp.org export filename:')) - self.ExportListLabel.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Author')) - self.ExportSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Select All')) - self.ExportFilterComboBox.setItemText(0, - translate(u'SongsPlugin.OpenLPExportForm', u'Lyrics')) - self.ExportFilterComboBox.setItemText(1, - translate(u'SongsPlugin.OpenLPExportForm', u'Title')) - self.ExportFilterComboBox.setItemText(2, - translate(u'SongsPlugin.OpenLPExportForm', u'Author')) - self.SelectedListLabel.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Author')) - self.SelectedSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle( - translate(u'SongsPlugin.OpenLPExportForm', u'Progress:')) - self.ProgressLabel.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Ready to export')) - self.ExportPushButton.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Export')) - self.ClosePushButton.setText( - translate(u'SongsPlugin.OpenLPExportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/openlpexportform.py b/openlp/plugins/songs/forms/openlpexportform.py deleted file mode 100644 index f0f98ad05..000000000 --- a/openlp/plugins/songs/forms/openlpexportform.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtGui - -from openlp.plugins.songs.forms.openlpexportdialog import Ui_OpenLPExportDialog - -class OpenLPExportForm(QtGui.QDialog, Ui_OpenLPExportDialog): - - def __init__(self, parent=None): - QtGui.QDialog.__init__(self, parent) - self.setupUi(self) diff --git a/openlp/plugins/songs/forms/openlpimportdialog.py b/openlp/plugins/songs/forms/openlpimportdialog.py deleted file mode 100644 index 87366d442..000000000 --- a/openlp/plugins/songs/forms/openlpimportdialog.py +++ /dev/null @@ -1,327 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate - -class Ui_OpenLPImportDialog(object): - def setupUi(self, OpenLPImportDialog): - OpenLPImportDialog.setObjectName(u'OpenLPImportDialog') - OpenLPImportDialog.resize(473, 459) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenLPImportDialog.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPImportDialog) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ImportFileWidget = QtGui.QWidget(OpenLPImportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileWidget.setSizePolicy(sizePolicy) - self.ImportFileWidget.setObjectName(u'ImportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) - self.ImportFileLabel.setObjectName(u'ImportFileLabel') - self.horizontalLayout.addWidget(self.ImportFileLabel) - self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) - self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') - self.horizontalLayout.addWidget(self.ImportFileLineEdit) - self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ImportFileSelectPushButton.setIcon(icon1) - self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ImportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenLPImportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ImportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileSongListWidget.setSizePolicy(sizePolicy) - self.ImportFileSongListWidget.setObjectName(u'ImportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ImportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ImportListLabel = QtGui.QLabel(self.ImportFileSongListWidget) - self.ImportListLabel.setObjectName(u'ImportListLabel') - self.verticalLayout.addWidget(self.ImportListLabel) - self.ImportListTable = QtGui.QTableWidget(self.ImportFileSongListWidget) - self.ImportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ImportListTable.setShowGrid(False) - self.ImportListTable.setWordWrap(False) - self.ImportListTable.setCornerButtonEnabled(False) - self.ImportListTable.setObjectName(u'ImportListTable') - self.ImportListTable.setColumnCount(2) - self.ImportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ImportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ImportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ImportListTable) - self.ImportSelectAllWidget = QtGui.QWidget(self.ImportFileSongListWidget) - self.ImportSelectAllWidget.setObjectName(u'ImportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ImportSelectAllPushButton = QtGui.QPushButton(self.ImportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ImportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(u':/imports/import_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ImportSelectAllPushButton.setIcon(icon2) - self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ImportSelectAllWidget) - self.importFilterWidget = QtGui.QWidget(self.ImportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.importFilterWidget.sizePolicy().hasHeightForWidth()) - self.importFilterWidget.setSizePolicy(sizePolicy) - self.importFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.importFilterWidget.setObjectName(u'importFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.importFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ImportFilterComboBox = QtGui.QComboBox(self.importFilterWidget) - self.ImportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ImportFilterComboBox.setObjectName(u'ImportFilterComboBox') - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ImportFilterComboBox) - self.importFilterLineEdit = QtGui.QLineEdit(self.importFilterWidget) - self.importFilterLineEdit.setObjectName(u'importFilterLineEdit') - self.horizontalLayout_3.addWidget(self.importFilterLineEdit) - self.verticalLayout.addWidget(self.importFilterWidget) - self.horizontalLayout_6.addWidget(self.ImportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(u':/imports/import_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(u':/imports/import_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenLPImportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenLPImportDialog) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ImportPushButton.setObjectName(u'ImportPushButton') - self.horizontalLayout_7.addWidget(self.ImportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi(OpenLPImportDialog) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPImportDialog.close) - QtCore.QObject.connect(self.ImportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ImportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog) - - def retranslateUi(self, OpenLPImportDialog): - OpenLPImportDialog.setWindowTitle( - translate(u'SongsPlugin.OpenLPImportForm', - u'openlp.org Song Importer')) - self.ImportFileLabel.setText( - translate(u'SongsPlugin.OpenLPImportForm', - u'Select openlp.org songfile to import:')) - self.ImportListLabel.setText( - translate(u'SongsPlugin.OpenLPImportForm', - u'Import File Song List')) - self.ImportListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Song Title')) - self.ImportListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Author')) - self.ImportSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Select All')) - self.ImportFilterComboBox.setItemText(0, - translate(u'SongsPlugin.OpenLPImportForm', u'Lyrics')) - self.ImportFilterComboBox.setItemText(1, - translate(u'SongsPlugin.OpenLPImportForm', u'Title')) - self.ImportFilterComboBox.setItemText(2, - translate(u'SongsPlugin.OpenLPImportForm', u'Author')) - self.SelectedListLabel.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Song Import List')) - self.SelectedListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Author')) - self.SelectedSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle( - translate(u'SongsPlugin.OpenLPImportForm', u'Progress:')) - self.ProgressLabel.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Ready to import')) - self.ImportPushButton.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Import')) - self.ClosePushButton.setText( - translate(u'SongsPlugin.OpenLPImportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/openlpimportform.py b/openlp/plugins/songs/forms/openlpimportform.py deleted file mode 100644 index e30d13466..000000000 --- a/openlp/plugins/songs/forms/openlpimportform.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtGui -from openlp.plugins.songs.forms.openlpimportdialog import Ui_OpenLPImportDialog - -class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog): - - def __init__(self, parent=None): - QtGui.QDialog.__init__(self, parent) - self.setupUi(self) diff --git a/openlp/plugins/songs/forms/opensongexportdialog.py b/openlp/plugins/songs/forms/opensongexportdialog.py deleted file mode 100644 index 8e92879f0..000000000 --- a/openlp/plugins/songs/forms/opensongexportdialog.py +++ /dev/null @@ -1,324 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate - -class Ui_OpenSongExportDialog(object): - def setupUi(self, OpenSongExportDialog): - OpenSongExportDialog.setObjectName(u'OpenSongExportDialog') - OpenSongExportDialog.resize(473, 459) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenSongExportDialog.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(OpenSongExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileWidget.setSizePolicy(sizePolicy) - self.ExportFileWidget.setObjectName(u'ExportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) - self.ExportFileLabel.setObjectName(u'ExportFileLabel') - self.horizontalLayout.addWidget(self.ExportFileLabel) - self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) - self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') - self.horizontalLayout.addWidget(self.ExportFileLineEdit) - self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ExportFileSelectPushButton.setIcon(icon1) - self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(OpenSongExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileSongListWidget.setSizePolicy(sizePolicy) - self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) - self.ExportListLabel.setObjectName(u'ExportListLabel') - self.verticalLayout.addWidget(self.ExportListLabel) - self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) - self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ExportListTable.setShowGrid(False) - self.ExportListTable.setWordWrap(False) - self.ExportListTable.setCornerButtonEnabled(False) - self.ExportListTable.setObjectName(u'ExportListTable') - self.ExportListTable.setColumnCount(2) - self.ExportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ExportListTable) - self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) - self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ExportSelectAllPushButton.setIcon(icon2) - self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ExportSelectAllWidget) - self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) - self.exportFilterWidget.setSizePolicy(sizePolicy) - self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.exportFilterWidget.setObjectName(u'exportFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) - self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) - self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) - self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') - self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) - self.verticalLayout.addWidget(self.exportFilterWidget) - self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenSongExportDialog) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ExportPushButton.setObjectName(u'ExportPushButton') - self.horizontalLayout_7.addWidget(self.ExportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi(OpenSongExportDialog) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close) - QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog) - - def retranslateUi(self, OpenSongExportDialog): - OpenSongExportDialog.setWindowTitle( - translate(u'SongsPlugin.OpenSongExportForm', u'OpenSong Song Exporter')) - self.ExportFileLabel.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Select OpenSong song folder:')) - self.ExportListLabel.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Author')) - self.ExportSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Select All')) - self.ExportFilterComboBox.setItemText(0, - translate(u'SongsPlugin.OpenSongExportForm', u'Lyrics')) - self.ExportFilterComboBox.setItemText(1, - translate(u'SongsPlugin.OpenSongExportForm', u'Title')) - self.ExportFilterComboBox.setItemText(2, - translate(u'SongsPlugin.OpenSongExportForm', u'Author')) - self.SelectedListLabel.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Author')) - self.SelectedSelectAllPushButton.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle( - translate(u'SongsPlugin.OpenSongExportForm', u'Progress:')) - self.ProgressLabel.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Ready to export')) - self.ExportPushButton.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Export')) - self.ClosePushButton.setText( - translate(u'SongsPlugin.OpenSongExportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/opensongexportform.py b/openlp/plugins/songs/forms/opensongexportform.py deleted file mode 100644 index 75a732bd5..000000000 --- a/openlp/plugins/songs/forms/opensongexportform.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtGui -from openlp.plugins.songs.forms.opensongexportdialog import Ui_OpenSongExportDialog - -class OpenSongExportForm(QtGui.QDialog, Ui_OpenSongExportDialog): - - def __init__(self, parent=None): - QtGui.QDialog.__init__(self, parent) - self.setupUi(self) diff --git a/openlp/plugins/songs/forms/opensongimportdialog.py b/openlp/plugins/songs/forms/opensongimportdialog.py deleted file mode 100644 index 46b135eae..000000000 --- a/openlp/plugins/songs/forms/opensongimportdialog.py +++ /dev/null @@ -1,115 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate - -class Ui_OpenSongImportDialog(object): - def setupUi(self, OpenSongImportDialog): - OpenSongImportDialog.setObjectName(u'OpenSongImportDialog') - OpenSongImportDialog.resize(481, 172) - icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - OpenSongImportDialog.setWindowIcon(icon) - self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(8) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ImportFileWidget = QtGui.QWidget(OpenSongImportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileWidget.setSizePolicy(sizePolicy) - self.ImportFileWidget.setObjectName(u'ImportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) - self.horizontalLayout.setSpacing(6) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) - self.ImportFileLabel.setObjectName(u'ImportFileLabel') - self.horizontalLayout.addWidget(self.ImportFileLabel) - self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) - self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') - self.horizontalLayout.addWidget(self.ImportFileLineEdit) - self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ImportFileSelectPushButton.setIcon(icon1) - self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) - self.verticalLayout.addWidget(self.ImportFileWidget) - self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(6) - self.verticalLayout_4.setContentsMargins(6, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(OpenSongImportDialog) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem) - self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ImportPushButton.setObjectName(u'ImportPushButton') - self.horizontalLayout_7.addWidget(self.ImportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout.addWidget(self.ButtonBarWidget) - - self.retranslateUi(OpenSongImportDialog) - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close) - QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog) - - def retranslateUi(self, OpenSongImportDialog): - OpenSongImportDialog.setWindowTitle( - translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Song Importer')) - self.ImportFileLabel.setText( - translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Folder:')) - self.ProgressGroupBox.setTitle( - translate(u'SongsPlugin.OpenSongImportForm', u'Progress:')) - self.ProgressLabel.setText( - translate(u'SongsPlugin.OpenSongImportForm', u'Ready to import')) - self.ImportPushButton.setText( - translate(u'SongsPlugin.OpenSongImportForm', u'Import')) - self.ClosePushButton.setText( - translate(u'SongsPlugin.OpenSongImportForm', u'Close')) diff --git a/openlp/plugins/songs/forms/opensongimportform.py b/openlp/plugins/songs/forms/opensongimportform.py deleted file mode 100644 index 6161e4d61..000000000 --- a/openlp/plugins/songs/forms/opensongimportform.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# 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 # -############################################################################### - -from PyQt4 import QtGui -from openlp.plugins.songs.forms.opensongimportdialog import Ui_OpenSongImportDialog - -class OpenSongImportForm(QtGui.QDialog, Ui_OpenSongImportDialog): - - def __init__(self, parent=None): - QtGui.QDialog.__init__(self, parent) - self.setupUi(self) diff --git a/resources/forms/openlpexportform.ui b/resources/forms/openlpexportform.ui deleted file mode 100644 index 2ccb86a0d..000000000 --- a/resources/forms/openlpexportform.ui +++ /dev/null @@ -1,613 +0,0 @@ - - - OpenLPExportDialog - - - - 0 - 0 - 473 - 459 - - - - openlp.org Song Exporter - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 8 - - - - - - 0 - 0 - - - - - 3 - - - 0 - - - - - Select openlp.org export filename: - - - - - - - - - - - - - - :/exports/export_load.png:/exports/export_load.png - - - - - - - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Raised - - - - 8 - - - 8 - - - - - - 0 - 0 - - - - - 6 - - - 0 - - - - - Full Song List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/exports/export_selectall.png:/exports/export_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 89 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - - - - - - 70 - 0 - - - - - Lyrics - - - - - Title - - - - - Author - - - - - - - - - - - - exportFilterWidget - ExportListTable - ExportListLabel - ExportSelectAllWidget - - - - - - - 0 - 0 - - - - - 0 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 25 - 25 - - - - - - - - :/exports/export_move_to_list.png:/exports/export_move_to_list.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - Song Export List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/exports/export_selectall.png:/exports/export_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 92 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - - 0 - 0 - - - - - 140 - 0 - - - - Remove Selected - - - - :/exports/export_remove.png:/exports/export_remove.png - - - - - - - Qt::Horizontal - - - - 49 - 20 - - - - - - - - - - - - ExportFileSongListWidget - SelectedFileListWidget - AddSelectedWidget - - - - - - - 0 - 0 - - - - Progress: - - - - 8 - - - 8 - - - 0 - - - 8 - - - 8 - - - - - Ready to export - - - - - - - 24 - - - - - - - - - - - 8 - - - 0 - - - - - Qt::Horizontal - - - - 288 - 20 - - - - - - - - Export - - - - - - - Close - - - - - - - - - - - - - - ClosePushButton - clicked() - OpenLPExportDialog - close() - - - 436 - 436 - - - 462 - 455 - - - - - ExportSelectAllPushButton - clicked() - ExportListTable - selectAll() - - - 75 - 281 - - - 88 - 176 - - - - - SelectedSelectAllPushButton - clicked() - SelectedListTable - selectAll() - - - 311 - 277 - - - 339 - 190 - - - - - SelectedRemoveSelectedButton - clicked() - SelectedListTable - clear() - - - 379 - 308 - - - 389 - 188 - - - - - diff --git a/resources/forms/openlpimportform.ui b/resources/forms/openlpimportform.ui deleted file mode 100644 index 5d21b141c..000000000 --- a/resources/forms/openlpimportform.ui +++ /dev/null @@ -1,613 +0,0 @@ - - - OpenLPImportDialog - - - - 0 - 0 - 473 - 459 - - - - openlp.org Song Importer - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 8 - - - - - - 0 - 0 - - - - - 3 - - - 0 - - - - - Select openlp.org songfile to import: - - - - - - - - - - - - - - :/imports/import_load.png:/imports/import_load.png - - - - - - - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Raised - - - - 8 - - - 8 - - - - - - 0 - 0 - - - - - 6 - - - 0 - - - - - Import File Song List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/imports/import_selectall.png:/imports/import_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 89 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - - - - - - 70 - 0 - - - - - Lyrics - - - - - Title - - - - - Author - - - - - - - - - - - - ImportListTable - ImportListLabel - importFilterWidget - ImportSelectAllWidget - - - - - - - 0 - 0 - - - - - 0 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 25 - 25 - - - - - - - - :/imports/import_move_to_list.png:/imports/import_move_to_list.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - Song Import List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/imports/import_selectall.png:/imports/import_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 92 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - - 0 - 0 - - - - - 140 - 0 - - - - Remove Selected - - - - :/imports/import_remove.png:/imports/import_remove.png - - - - - - - Qt::Horizontal - - - - 49 - 20 - - - - - - - - - - - - ImportFileSongListWidget - SelectedFileListWidget - AddSelectedWidget - - - - - - - 0 - 0 - - - - Progress: - - - - 8 - - - 8 - - - 0 - - - 8 - - - 8 - - - - - Ready to import - - - - - - - 24 - - - - - - - - - - - 8 - - - 0 - - - - - Qt::Horizontal - - - - 288 - 20 - - - - - - - - Import - - - - - - - Close - - - - - - - - - - - - - - ClosePushButton - clicked() - OpenLPImportDialog - close() - - - 436 - 436 - - - 462 - 455 - - - - - ImportSelectAllPushButton - clicked() - ImportListTable - selectAll() - - - 75 - 281 - - - 88 - 176 - - - - - SelectedSelectAllPushButton - clicked() - SelectedListTable - selectAll() - - - 311 - 277 - - - 339 - 190 - - - - - SelectedRemoveSelectedButton - clicked() - SelectedListTable - clear() - - - 379 - 308 - - - 389 - 188 - - - - - diff --git a/resources/forms/opensongexportform.ui b/resources/forms/opensongexportform.ui deleted file mode 100644 index 54f6bd9cd..000000000 --- a/resources/forms/opensongexportform.ui +++ /dev/null @@ -1,613 +0,0 @@ - - - OpenSongExportDialog - - - - 0 - 0 - 473 - 459 - - - - OpenSong Song Exporter - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 8 - - - - - - 0 - 0 - - - - - 3 - - - 0 - - - - - Select OpenSong song folder: - - - - - - - - - - - - - - :/exports/export_load.png:/exports/export_load.png - - - - - - - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Raised - - - - 8 - - - 8 - - - - - - 0 - 0 - - - - - 6 - - - 0 - - - - - Full Song List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/exports/export_selectall.png:/exports/export_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 89 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - - - - - - 70 - 0 - - - - - Lyrics - - - - - Title - - - - - Author - - - - - - - - - - - - exportFilterWidget - ExportListTable - ExportListLabel - ExportSelectAllWidget - - - - - - - 0 - 0 - - - - - 0 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 25 - 25 - - - - - - - - :/exports/export_move_to_list.png:/exports/export_move_to_list.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - Song Export List - - - - - - - QAbstractItemView::MultiSelection - - - false - - - false - - - false - - - - Song Title - - - - - Author - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Select All - - - - :/exports/export_selectall.png:/exports/export_selectall.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 92 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - - - - 0 - 0 - - - - - 140 - 0 - - - - Remove Selected - - - - :/exports/export_remove.png:/exports/export_remove.png - - - - - - - Qt::Horizontal - - - - 49 - 20 - - - - - - - - - - - - ExportFileSongListWidget - SelectedFileListWidget - AddSelectedWidget - - - - - - - 0 - 0 - - - - Progress: - - - - 8 - - - 8 - - - 0 - - - 8 - - - 8 - - - - - Ready to export - - - - - - - 24 - - - - - - - - - - - 8 - - - 0 - - - - - Qt::Horizontal - - - - 288 - 20 - - - - - - - - Export - - - - - - - Close - - - - - - - - - - - - - - ClosePushButton - clicked() - OpenSongExportDialog - close() - - - 436 - 436 - - - 462 - 455 - - - - - ExportSelectAllPushButton - clicked() - ExportListTable - selectAll() - - - 75 - 281 - - - 88 - 176 - - - - - SelectedSelectAllPushButton - clicked() - SelectedListTable - selectAll() - - - 311 - 277 - - - 339 - 190 - - - - - SelectedRemoveSelectedButton - clicked() - SelectedListTable - clear() - - - 379 - 308 - - - 389 - 188 - - - - - diff --git a/resources/forms/opensongimportform.ui b/resources/forms/opensongimportform.ui deleted file mode 100644 index 5e8a20fd6..000000000 --- a/resources/forms/opensongimportform.ui +++ /dev/null @@ -1,172 +0,0 @@ - - - OpenSongImportDialog - - - - 0 - 0 - 481 - 172 - - - - OpenSong Song Importer - - - - :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 6 - - - 8 - - - - - - 0 - 0 - - - - - 6 - - - 0 - - - - - OpenSong Folder: - - - - - - - - - - - - - - :/imports/import_load.png:/imports/import_load.png - - - - - - - - - - - 0 - 0 - - - - Progress: - - - - 6 - - - 6 - - - 0 - - - 8 - - - 8 - - - - - Ready to import - - - - - - - 24 - - - - - - - - - - - 8 - - - 0 - - - - - Qt::Horizontal - - - - 288 - 20 - - - - - - - - Import - - - - - - - Close - - - - - - - - - - - - - - ClosePushButton - clicked() - OpenSongImportDialog - close() - - - 424 - 132 - - - 288 - -25 - - - - - From 78a6d20bb35f204faf4c34354d7a7421284d93ba Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 10 Jun 2010 14:20:43 +0100 Subject: [PATCH 5/6] Fix theme migration method parameters --- openlp/core/ui/thememanager.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index f52beade4..41c2a9360 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -366,8 +366,7 @@ class ThemeManager(QtGui.QWidget): if os.path.splitext(file)[1].lower() in [u'.xml']: if self.checkVersion1(xml_data): # upgrade theme xml - filexml = self.migrateVersion122(filename, - fullpath, xml_data) + filexml = self.migrateVersion122(xml_data) else: filexml = xml_data outfile = open(fullpath, u'w') @@ -399,13 +398,12 @@ class ThemeManager(QtGui.QWidget): else: return True - def migrateVersion122(self, filename, fullpath, xml_data): + def migrateVersion122(self, xml_data): """ Called by convert the xml data from version 1 format to the current format. New fields are defaulted but the new theme is useable """ - log.debug(u'migrateVersion122 %s %s', filename, fullpath) theme = Theme(xml_data) newtheme = ThemeXML() newtheme.new_document(theme.Name) From 5868a37018e5a1c094637a33e2a7a066364f82bc Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 10 Jun 2010 14:28:41 +0100 Subject: [PATCH 6/6] Small refactorings --- openlp/plugins/bibles/lib/csvbible.py | 7 ------- openlp/plugins/bibles/lib/db.py | 7 +++++++ openlp/plugins/bibles/lib/opensong.py | 7 ------- openlp/plugins/bibles/lib/osis.py | 7 ------- .../presentations/lib/impresscontroller.py | 15 --------------- .../presentations/lib/powerpointcontroller.py | 14 -------------- .../presentations/lib/presentationcontroller.py | 7 ++++++- 7 files changed, 13 insertions(+), 51 deletions(-) diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index faaccf303..3cfe9dea5 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -56,13 +56,6 @@ class CSVBible(BibleDB): QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import) - def stop_import(self): - """ - Stops the import of the Bible. - """ - log.debug('Stopping import!') - self.stop_import_flag = True - def do_import(self): #Populate the Tables success = True diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index 02b0a82aa..47d9ffdd2 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -92,6 +92,13 @@ class BibleDB(QtCore.QObject): if u'file' in kwargs: self.get_name() + def stop_import(self): + """ + Stops the import of the Bible. + """ + log.debug('Stopping import') + self.stop_import_flag = True + def get_name(self): """ Returns the version name of the Bible. diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index abc06431c..b2df50257 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -51,13 +51,6 @@ class OpenSongBible(BibleDB): QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import) - def stop_import(self): - """ - Stops the import of the Bible. - """ - log.debug('Stopping import!') - self.stop_import_flag = True - def do_import(self): """ Loads a Bible from file. diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index c6779c132..b4a2a2aa1 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -86,13 +86,6 @@ class OSISBible(BibleDB): QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import) - def stop_import(self): - """ - Stops the import of the Bible. - """ - log.debug('Stopping import!') - self.stop_import_flag = True - def do_import(self): """ Loads a Bible from file. diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index c1de03b2b..6c360355c 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -370,21 +370,6 @@ class ImpressDocument(PresentationDocument): """ self.control.gotoPreviousSlide() - def get_slide_preview_file(self, slide_no): - """ - Returns an image path containing a preview for the - requested slide - - ``slide_no`` - The slide an image is required for, starting at 1 - """ - path = os.path.join(self.thumbnailpath, - self.controller.thumbnailprefix + unicode(slide_no) + u'.png') - if os.path.isfile(path): - return path - else: - return None - def get_slide_text(self, slide_no): """ Returns the text on the slide diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 34cc6376e..760869f7a 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -269,20 +269,6 @@ class PowerpointDocument(PresentationDocument): """ self.presentation.SlideShowWindow.View.Previous() - def get_slide_preview_file(self, slide_no): - """ - Returns an image path containing a preview for the requested slide - - ``slide_no`` - The slide an image is required for, starting at 1 - """ - path = os.path.join(self.thumbnailpath, - self.controller.thumbnailprefix + unicode(slide_no) + u'.png') - if os.path.isfile(path): - return path - else: - return None - def get_slide_text(self, slide_no): """ Returns the text on the slide diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index 706e70ae6..501776a19 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -357,7 +357,12 @@ class PresentationDocument(object): ``slide_no`` The slide an image is required for, starting at 1 """ - return None + path = os.path.join(self.thumbnailpath, + self.controller.thumbnailprefix + unicode(slide_no) + u'.png') + if os.path.isfile(path): + return path + else: + return None def poll_slidenumber(self, is_live): """