forked from openlp/openlp
Head763
This commit is contained in:
commit
161f7e88bb
@ -27,9 +27,9 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
|
||||||
from sqlalchemy import *
|
from sqlalchemy import *
|
||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
|
from sqlalchemy.orm import scoped_session, sessionmaker, mapper
|
||||||
|
|
||||||
from openlp.core.lib import PluginConfig
|
from openlp.core.lib import PluginConfig
|
||||||
from openlp.plugins.bibles.lib.models import *
|
from openlp.plugins.bibles.lib.models import *
|
||||||
@ -223,4 +223,3 @@ class MigrateBibles():
|
|||||||
conn.commit()
|
conn.commit()
|
||||||
conn.execute(u'vacuum;')
|
conn.execute(u'vacuum;')
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
|
@ -147,8 +147,8 @@ class ImpressController(PresentationController):
|
|||||||
Called at system exit to clean up any running presentations
|
Called at system exit to clean up any running presentations
|
||||||
"""
|
"""
|
||||||
log.debug(u'Kill OpenOffice')
|
log.debug(u'Kill OpenOffice')
|
||||||
for doc in self.docs:
|
while self.docs:
|
||||||
doc.close_presentation()
|
self.docs[0].close_presentation()
|
||||||
if os.name != u'nt':
|
if os.name != u'nt':
|
||||||
desktop = self.get_uno_desktop()
|
desktop = self.get_uno_desktop()
|
||||||
else:
|
else:
|
||||||
|
@ -143,7 +143,7 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
for cidx in self.controllers:
|
for cidx in self.controllers:
|
||||||
doc = self.controllers[cidx].add_doc(filepath)
|
doc = self.controllers[cidx].add_doc(filepath)
|
||||||
doc.presentation_deleted()
|
doc.presentation_deleted()
|
||||||
self.controllers[cidx].remove_doc(doc)
|
doc.close_presentation()
|
||||||
|
|
||||||
def generateSlideData(self, service_item):
|
def generateSlideData(self, service_item):
|
||||||
items = self.ListView.selectedIndexes()
|
items = self.ListView.selectedIndexes()
|
||||||
@ -171,7 +171,7 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
service_item.add_from_command(path, name, img)
|
service_item.add_from_command(path, name, img)
|
||||||
i = i + 1
|
i = i + 1
|
||||||
img = doc.get_slide_preview_file(i)
|
img = doc.get_slide_preview_file(i)
|
||||||
controller.remove_doc(doc)
|
doc.close_presentation()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def findControllerByType(self, filename):
|
def findControllerByType(self, filename):
|
||||||
|
@ -81,8 +81,9 @@ class PowerpointController(PresentationController):
|
|||||||
"""
|
"""
|
||||||
Called at system exit to clean up any running presentations
|
Called at system exit to clean up any running presentations
|
||||||
"""
|
"""
|
||||||
for doc in self.docs:
|
log.debug(u'Kill powerpoint')
|
||||||
doc.close_presentation()
|
while self.docs:
|
||||||
|
self.docs[0].close_presentation()
|
||||||
if self.process is None:
|
if self.process is None:
|
||||||
return
|
return
|
||||||
if self.process.Presentations.Count > 0:
|
if self.process.Presentations.Count > 0:
|
||||||
@ -149,12 +150,12 @@ class PowerpointDocument(PresentationDocument):
|
|||||||
Triggerent by new object being added to SlideController orOpenLP
|
Triggerent by new object being added to SlideController orOpenLP
|
||||||
being shut down
|
being shut down
|
||||||
"""
|
"""
|
||||||
if self.presentation is None:
|
log.debug(u'ClosePresentation')
|
||||||
return
|
if self.presentation:
|
||||||
try:
|
try:
|
||||||
self.presentation.Close()
|
self.presentation.Close()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
self.presentation = None
|
self.presentation = None
|
||||||
self.controller.remove_doc(self)
|
self.controller.remove_doc(self)
|
||||||
|
|
||||||
|
@ -88,9 +88,9 @@ class PptviewController(PresentationController):
|
|||||||
"""
|
"""
|
||||||
Called at system exit to clean up any running presentations
|
Called at system exit to clean up any running presentations
|
||||||
"""
|
"""
|
||||||
log.debug(u'Kill')
|
log.debug(u'Kill pptviewer')
|
||||||
for doc in self.docs:
|
while self.docs:
|
||||||
doc.close_presentation()
|
self.docs[0].close_presentation()
|
||||||
|
|
||||||
def add_doc(self, name):
|
def add_doc(self, name):
|
||||||
log.debug(u'Add Doc PPTView')
|
log.debug(u'Add Doc PPTView')
|
||||||
@ -137,6 +137,7 @@ class PptviewDocument(PresentationDocument):
|
|||||||
Triggerent by new object being added to SlideController orOpenLP
|
Triggerent by new object being added to SlideController orOpenLP
|
||||||
being shut down
|
being shut down
|
||||||
"""
|
"""
|
||||||
|
log.debug(u'ClosePresentation')
|
||||||
self.controller.process.ClosePPT(self.pptid)
|
self.controller.process.ClosePPT(self.pptid)
|
||||||
self.pptid = -1
|
self.pptid = -1
|
||||||
self.controller.remove_doc(self)
|
self.controller.remove_doc(self)
|
||||||
|
@ -498,7 +498,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
sxml = SongXMLBuilder()
|
sxml = SongXMLBuilder()
|
||||||
sxml.new_document()
|
sxml.new_document()
|
||||||
sxml.add_lyrics_to_song()
|
sxml.add_lyrics_to_song()
|
||||||
count = 1
|
|
||||||
text = u' '
|
text = u' '
|
||||||
for i in range (0, self.VerseListWidget.count()):
|
for i in range (0, self.VerseListWidget.count()):
|
||||||
item = self.VerseListWidget.item(i)
|
item = self.VerseListWidget.item(i)
|
||||||
@ -506,7 +505,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
bits = verseId.split(u':')
|
bits = verseId.split(u':')
|
||||||
sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
|
sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
|
||||||
text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
|
text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
|
||||||
count += 1
|
|
||||||
text = text.replace(u'\'', u'')
|
text = text.replace(u'\'', u'')
|
||||||
text = text.replace(u',', u'')
|
text = text.replace(u',', u'')
|
||||||
text = text.replace(u';', u'')
|
text = text.replace(u';', u'')
|
||||||
|
@ -282,7 +282,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
raw_footer = []
|
raw_footer = []
|
||||||
author_list = u''
|
author_list = u''
|
||||||
author_audit = []
|
author_audit = []
|
||||||
ccl = u''
|
ccli = u''
|
||||||
if self.remoteTriggered is None:
|
if self.remoteTriggered is None:
|
||||||
item = self.ListView.currentItem()
|
item = self.ListView.currentItem()
|
||||||
if item is None:
|
if item is None:
|
||||||
|
@ -206,7 +206,6 @@ def import_bible():
|
|||||||
rows = old_cursor.fetchall()
|
rows = old_cursor.fetchall()
|
||||||
if debug or verbose:
|
if debug or verbose:
|
||||||
print 'done.'
|
print 'done.'
|
||||||
song_map = {}
|
|
||||||
for row in rows:
|
for row in rows:
|
||||||
book_id = int(row[1])
|
book_id = int(row[1])
|
||||||
chapter = int(row[2])
|
chapter = int(row[2])
|
||||||
|
Loading…
Reference in New Issue
Block a user