forked from openlp/openlp
Fixups
This commit is contained in:
parent
c491a19be8
commit
fc61d7fe55
@ -561,8 +561,6 @@ class Renderer(object):
|
|||||||
``image2``
|
``image2``
|
||||||
Defaults to *None*. Another image to save to disk.
|
Defaults to *None*. Another image to save to disk.
|
||||||
"""
|
"""
|
||||||
im = image.toImage()
|
image.save(u'renderer.png', u'png')
|
||||||
im.save(u'renderer.png', u'png')
|
|
||||||
if image2 is not None:
|
if image2 is not None:
|
||||||
im = image2.toImage()
|
image2.save(u'renderer2.png', u'png')
|
||||||
im.save(u'renderer2.png', u'png')
|
|
||||||
|
@ -438,7 +438,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.mainDisplay = MainDisplay(self, screens)
|
self.mainDisplay = MainDisplay(self, screens)
|
||||||
self.alertForm = AlertForm(self)
|
self.alertForm = AlertForm(self)
|
||||||
self.aboutForm = AboutForm(self)
|
self.aboutForm = AboutForm(self)
|
||||||
self.settingsForm = SettingsForm(self.screenList, self)
|
self.settingsForm = SettingsForm(self.screenList, self, self)
|
||||||
# Set up the path with plugins
|
# Set up the path with plugins
|
||||||
pluginpath = os.path.split(os.path.abspath(__file__))[0]
|
pluginpath = os.path.split(os.path.abspath(__file__))[0]
|
||||||
pluginpath = os.path.abspath(
|
pluginpath = os.path.abspath(
|
||||||
|
@ -35,7 +35,7 @@ log = logging.getLogger(u'SettingsForm')
|
|||||||
class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
|
class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
|
||||||
|
|
||||||
def __init__(self, screen_list, mainWindow, parent=None):
|
def __init__(self, screen_list, mainWindow, parent=None):
|
||||||
QtGui.QDialog.__init__(self, None)
|
QtGui.QDialog.__init__(self, parent)
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
# General tab
|
# General tab
|
||||||
self.GeneralTab = GeneralTab(screen_list)
|
self.GeneralTab = GeneralTab(screen_list)
|
||||||
|
@ -290,8 +290,8 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
xml = newtheme.extract_xml()
|
xml = newtheme.extract_xml()
|
||||||
theme = ThemeXML()
|
theme = ThemeXML()
|
||||||
theme.parse(xml)
|
theme.parse(xml)
|
||||||
theme.extend_image_filename(self.path)
|
|
||||||
self.cleanTheme(theme)
|
self.cleanTheme(theme)
|
||||||
|
theme.extend_image_filename(self.path)
|
||||||
return theme
|
return theme
|
||||||
|
|
||||||
def checkThemesExists(self, dir):
|
def checkThemesExists(self, dir):
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from auditdetaildialog import Ui_AuditDetailDialog
|
from auditdetaildialog import Ui_AuditDetailDialog
|
||||||
from openlp.core.lib import translate
|
|
||||||
#from openlp.plugins.audit.lib.models import CustomSlide
|
|
||||||
|
|
||||||
class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog):
|
class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user