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

More code cleanups

This commit is contained in:
Tim Bentley 2009-05-16 17:38:03 +01:00
parent df51cd18d4
commit 2969c3641d
10 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/event.py
View File

@ -54,6 +54,3 @@ class Event(object):
def __init__(self, event_type=EventType.Default, payload=None):
self.event_type = event_type
self.payload = payload
def get_type(self):
return self.event_type

2
openlp/core/lib/eventmanager.py
View File

@ -40,7 +40,7 @@ class EventManager(object):
self.endpoints.append(plugin)
def post_event(self, event):
log.debug(u'post event called for event %s', event.get_type)
log.debug(u'post event called for event %s', event.event_type)
for point in self.endpoints:
point.handle_event(event)

27
openlp/core/lib/renderer.py
View File

@ -127,6 +127,7 @@ class Renderer:
verses_text = []
for v in verses:
verses_text.append(u'\n'.join(v).lstrip()) # remove first \n
print verses_text
return verses_text
def render_screen(self, screennum):
@ -399,17 +400,25 @@ class Renderer:
# now draw the text, and any outlines/shadows
if self._theme.display_shadow:
self._get_extent_and_render(line, footer,tlcorner=(x+self._shadow_offset,y+self._shadow_offset),
draw=True, color = t.display_shadow_color)
draw=True, color = self._theme.display_shadow_color)
if self._theme.display_outline:
self._get_extent_and_render(line, footer,(x+self._outline_offset,y), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x, y+self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x, y-self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x+self._outline_offset,y), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x, y+self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x, y-self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y), draw=True,
color = self._theme.display_outline_color)
if self._outline_offset > 1:
self._get_extent_and_render(line, footer,(x+self._outline_offset,y+self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y+self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x+self._outline_offset,y-self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y-self._outline_offset), draw=True, color = t.display_outline_color)
self._get_extent_and_render(line, footer,(x+self._outline_offset,y+self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y+self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x+self._outline_offset,y-self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,(x-self._outline_offset,y-self._outline_offset), draw=True,
color = self._theme.display_outline_color)
self._get_extent_and_render(line, footer,tlcorner=(x, y), draw=True)
# log.debug(u'Line %2d: Render '%s' at (%d, %d) wh=(%d,%d)' % ( linenum, line, x, y,w,h)

11
openlp/core/lib/rendermanager.py
View File

@ -96,21 +96,22 @@ class RenderManager:
def generate_preview(self, themedata):
log.debug(u'generate preview')
self.calculate_default(QtCore.QSize(800,600))
self.calculate_default(QtCore.QSize(800, 600))
self.renderer.set_theme(themedata)
self.build_text_rectangle(themedata)
self.renderer.set_frame_dest(self.width, self.height, True)
lines=[]
lines = []
lines.append(u'Amazing Grace!')
lines.append(u'How sweet the sound')
lines.append(u'To save a wretch like me;')
lines.append(u'I once was lost but now am found,')
lines.append(u'Was blind, but now I see.')
lines1=[]
lines1 = []
lines1.append(u'Amazing Grace (John Newton)' )
lines1.append(u'CCLI xxx (c)Openlp.org')
lines1.append(u'Public Domain')
lines1.append(u'CCLI xxx')
return self.renderer.render_lines(lines, lines1)
@ -131,7 +132,7 @@ class RenderManager:
self.width = screen.width()
self.height = screen.height()
log.debug(u'calculate default %d,%d' , self.width, self.height)
self.footer_start = int(self.height*0.95) # 95% is start of footer
self.footer_start = int(self.height*0.90) # 90% is start of footer
def snoop_Image(self, image, image2=None):
"""

22
openlp/core/ui/mainwindow.py
View File

@ -90,15 +90,19 @@ class MainWindow(object):
# Once all components are initialised load the Themes
log.info(u'Load Themes and Managers')
self.PreviewController.serviceManager = self.ServiceManagerContents
self.LiveController.serviceManager = self.ServiceManagerContents
self.ThemeManagerContents.eventManager = self.EventManager
self.ThemeManagerContents.renderManager = self.RenderManager
self.ServiceManagerContents.renderManager = self.RenderManager
self.ServiceManagerContents.eventManager = self.EventManager
self.ServiceManagerContents.liveController = self.LiveController
self.ServiceManagerContents.previewController = self.PreviewController
self.ThemeManagerContents.serviceManager = self.ServiceManagerContents
self.PreviewController.ServiceManager = self.ServiceManagerContents
self.LiveController.ServiceManager = self.ServiceManagerContents
self.ThemeManagerContents.EventManager = self.EventManager
self.ThemeManagerContents.RenderManager = self.RenderManager
self.ThemeManagerContents.ServiceManager = self.ServiceManagerContents
#self.ThemeManagerContents.ThemesTab = self.ServiceManagerContents.ThemesTab
self.ServiceManagerContents.RenderManager = self.RenderManager
self.ServiceManagerContents.EventManager = self.EventManager
self.ServiceManagerContents.LiveController = self.LiveController
self.ServiceManagerContents.PreviewController = self.PreviewController
self.ThemeManagerContents.loadThemes()
# Initialise SlideControllers

14
openlp/core/ui/servicemanager.py
View File

@ -136,13 +136,13 @@ class ServiceManager(QtGui.QWidget):
pass
def onSaveService(self):
Pass
pass
def onLoadService(self):
Pass
pass
def onThemeComboBoxSelected(self, currentIndex):
self.renderManager.default_theme = self.ThemeComboBox.currentText()
self.RenderManager.default_theme = self.ThemeComboBox.currentText()
def addServiceItem(self, item):
self.serviceItems.append({u'data': item, u'order': len(self.serviceItems)+1})
@ -162,11 +162,11 @@ class ServiceManager(QtGui.QWidget):
def makePreview(self):
item, count = self.findServiceItem()
self.previewController.addServiceManagerItem(self.serviceItems[item][u'data'], count)
self.PreviewController.addServiceManagerItem(self.serviceItems[item][u'data'], count)
def makeLive(self):
item, count = self.findServiceItem()
self.liveController.addServiceManagerItem(self.serviceItems[item][u'data'], count)
self.LiveController.addServiceManagerItem(self.serviceItems[item][u'data'], count)
def findServiceItem(self):
items = self.ServiceManagerList.selectedItems()
@ -197,7 +197,7 @@ class ServiceManager(QtGui.QWidget):
link=event.mimeData()
if link.hasText():
plugin = event.mimeData().text()
self.eventManager.post_event(Event(EventType.LoadServiceItem, plugin))
self.EventManager.post_event(Event(EventType.LoadServiceItem, plugin))
def oos_as_text(self):
text=[]
@ -226,5 +226,5 @@ class ServiceManager(QtGui.QWidget):
self.ThemeComboBox.clear()
for theme in theme_list:
self.ThemeComboBox.addItem(theme)
self.renderManager.default_theme = self.ThemeComboBox.currentText()
self.RenderManager.default_theme = self.ThemeComboBox.currentText()

7
openlp/core/ui/thememanager.py
View File

@ -222,8 +222,9 @@ class ThemeManager(QWidget):
for name in files:
if name.endswith(u'.png'):
self.themeData.addRow(os.path.join(self.path, name))
self.eventManager.post_event(Event(EventType.ThemeListChanged))
self.serviceManager.updateThemeList(self.getThemes())
self.EventManager.post_event(Event(EventType.ThemeListChanged))
self.ServiceManager.updateThemeList(self.getThemes())
#self.themeTab.updateThemeList(self.getThemes())
def getThemes(self):
return self.themeData.getList()
@ -358,6 +359,6 @@ class ThemeManager(QWidget):
def generateImage(self, themedata):
log.debug(u'generateImage %s ', themedata)
frame = self.renderManager.generate_preview(themedata)
frame = self.RenderManager.generate_preview(themedata)
return frame

8
openlp/core/ui/themestab.py
View File

@ -105,3 +105,11 @@ class ThemesTab(SettingsTab):
self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from the service , overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.'))
self.GlobalLevelRadioButton.setText(translate(u'ThemesTab', u'Global level'))
self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated wither either the service or the songs.'))
def updateThemeList(self, theme_list):
"""
Called from ThemeManager when the Themes have changed
"""
self.DefaultComboBox.clear()
for theme in theme_list:
self.DefaultComboBox.addItem(theme)

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -93,7 +93,7 @@ class MediaMediaItem(MediaManagerItem):
translate('MediaMediaItem',u'&Add to Service'), self.onMediaAddClick))
def initialise(self):
list = self.parent.config.load_list(u'Medias')
list = self.parent.config.load_list(u'Media')
self.loadMediaList(list)
def onMediaNewClick(self):

4
openlp/plugins/songs/songsplugin.py
View File

@ -105,10 +105,6 @@ class SongsPlugin(Plugin):
QtCore.QObject.connect(self.ExportOpenlp1Item, QtCore.SIGNAL("triggered()"), self.onExportOpenlp1ItemClicked)
QtCore.QObject.connect(self.ExportOpenSongItem, QtCore.SIGNAL("triggered()"), self.onExportOpenSongItemClicked)
def get_settings_tab(self):
self.SongsTab = SongsTab()
return self.SongsTab
def initialise(self):
pass