Fix a problem introduced per ongeluk.

This commit is contained in:
Raoul Snyman 2010-03-15 21:23:07 +02:00
commit 223393e38b
5 changed files with 39 additions and 33 deletions

View File

@ -168,8 +168,7 @@ class MainDisplay(DisplayWidget):
self.screen[u'size'].height(), self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied) QtGui.QImage.Format_ARGB32_Premultiplied)
painter.begin(self.blankFrame) painter.begin(self.blankFrame)
#TODO make black when testing finished painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
painter.fillRect(self.blankFrame.rect(), QtCore.Qt.red)
#build a blank transparent image #build a blank transparent image
self.transparent = QtGui.QPixmap(self.screen[u'size'].width(), self.transparent = QtGui.QPixmap(self.screen[u'size'].width(),
self.screen[u'size'].height()) self.screen[u'size'].height())

View File

@ -419,7 +419,7 @@ class Ui_MainWindow(object):
self.LanguageEnglishItem.setText(self.trUtf8('English')) self.LanguageEnglishItem.setText(self.trUtf8('English'))
self.LanguageEnglishItem.setStatusTip( self.LanguageEnglishItem.setStatusTip(
self.trUtf8('Set the interface language to English')) self.trUtf8('Set the interface language to English'))
self.ToolsAddToolItem.setText(self.trUtf8('&Add Tool...')) self.ToolsAddToolItem.setText(self.trUtf8('Add &Tool...'))
self.ToolsAddToolItem.setStatusTip( self.ToolsAddToolItem.setStatusTip(
self.trUtf8('Add an application to the list of tools')) self.trUtf8('Add an application to the list of tools'))
self.action_Preview_Panel.setText(self.trUtf8('&Preview Pane')) self.action_Preview_Panel.setText(self.trUtf8('&Preview Pane'))

View File

@ -477,7 +477,8 @@ class ServiceManager(QtGui.QWidget):
log.debug(u'onSaveService') log.debug(u'onSaveService')
if not quick or self.isNew: if not quick or self.isNew:
filename = QtGui.QFileDialog.getSaveFileName(self, filename = QtGui.QFileDialog.getSaveFileName(self,
u'Save Service', self.config.get_last_dir()) self.trUtf8(u'Save Service'), self.config.get_last_dir(),
self.trUtf8(u'OpenLP Service Files (*.osz)'))
else: else:
filename = self.config.get_last_dir() filename = self.config.get_last_dir()
if filename: if filename:
@ -741,12 +742,7 @@ class ServiceManager(QtGui.QWidget):
if item is None: if item is None:
endpos = len(self.serviceItems) endpos = len(self.serviceItems)
else: else:
parentitem = item.parent() endpos = self._getParentItemData(item) - 1
if parentitem is None:
endpos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
else:
endpos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]
endpos -= 1
if endpos < startpos: if endpos < startpos:
newpos = endpos newpos = endpos
else: else:
@ -759,11 +755,7 @@ class ServiceManager(QtGui.QWidget):
if item == None: if item == None:
self.droppos = len(self.serviceItems) self.droppos = len(self.serviceItems)
else: else:
parentitem = item.parent() self.droppos = self._getParentItemData(item)
if parentitem is None:
self.droppos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
else:
self.droppos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]
Receiver.send_message(u'%s_add_service_item' % plugin) Receiver.send_message(u'%s_add_service_item' % plugin)
def updateThemeList(self, theme_list): def updateThemeList(self, theme_list):
@ -798,3 +790,10 @@ class ServiceManager(QtGui.QWidget):
item, count = self.findServiceItem() item, count = self.findServiceItem()
self.serviceItems[item][u'service_item'].theme = theme self.serviceItems[item][u'service_item'].theme = theme
self.regenerateServiceItems() self.regenerateServiceItems()
def _getParentItemData(self, item):
parentitem = item.parent()
if parentitem is None:
return item.data(0, QtCore.Qt.UserRole).toInt()[0]
else:
return parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]

View File

@ -64,17 +64,17 @@ class BibleDB(QtCore.QObject):
QtCore.QObject.__init__(self) QtCore.QObject.__init__(self)
if u'path' not in kwargs: if u'path' not in kwargs:
raise KeyError(u'Missing keyword argument "path".') raise KeyError(u'Missing keyword argument "path".')
if u'name' not in kwargs:
raise KeyError(u'Missing keyword argument "name".')
if u'config' not in kwargs: if u'config' not in kwargs:
raise KeyError(u'Missing keyword argument "config".') raise KeyError(u'Missing keyword argument "config".')
if u'name' not in kwargs:
raise KeyError(u'Missing keyword argument "name".')
self.stop_import_flag = False self.stop_import_flag = False
self.name = kwargs[u'name']
self.filename = self.clean_filename(kwargs[u'name'])
self.config = kwargs[u'config'] self.config = kwargs[u'config']
self.name = kwargs[u'name']
#self.filename = self.clean_filename(kwargs[u'name'])
self.db_file = os.path.join(kwargs[u'path'], self.db_file = os.path.join(kwargs[u'path'],
u'%s.sqlite' % self.filename) u'%s.sqlite' % self.name)
log.debug(u'Load bible %s on path %s', self.filename, self.db_file) log.debug(u'Load bible %s on path %s', self.name, self.db_file)
db_type = self.config.get_config(u'db type', u'sqlite') db_type = self.config.get_config(u'db type', u'sqlite')
db_url = u'' db_url = u''
if db_type == u'sqlite': if db_type == u'sqlite':

View File

@ -65,6 +65,12 @@ class BibleMediaItem(MediaManagerItem):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles) QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles)
def _decodeQtObject(self, listobj, key):
obj = listobj[QtCore.QString(key)]
if isinstance(obj, QtCore.QVariant):
obj = obj.toPyObject()
return unicode(obj)
def initPluginNameVisible(self): def initPluginNameVisible(self):
self.PluginNameVisible = self.trUtf8('Bible') self.PluginNameVisible = self.trUtf8('Bible')
@ -452,15 +458,17 @@ class BibleMediaItem(MediaManagerItem):
# Let's loop through the main lot, and assemble our verses # Let's loop through the main lot, and assemble our verses
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.ListView.item(item.row())
reference = bitem.data(QtCore.Qt.UserRole).toPyObject() reference = bitem.data(QtCore.Qt.UserRole)
bible = unicode(reference[QtCore.QString('bible')].toPyObject()) if isinstance(reference, QtCore.QVariant):
book = unicode(reference[QtCore.QString('book')].toPyObject()) reference = reference.toPyObject()
chapter = unicode(reference[QtCore.QString('chapter')].toPyObject()) bible = self._decodeQtObject(reference, 'bible')
verse = unicode(reference[QtCore.QString('verse')].toPyObject()) book = self._decodeQtObject(reference, 'book')
text = unicode(reference[QtCore.QString('text')].toPyObject()) chapter = self._decodeQtObject(reference, 'chapter')
version = unicode(reference[QtCore.QString('version')].toPyObject()) verse = self._decodeQtObject(reference, 'verse')
copyright = unicode(reference[QtCore.QString('copyright')].toPyObject()) text = self._decodeQtObject(reference, 'text')
permission = unicode(reference[QtCore.QString('permission')].toPyObject()) version = self._decodeQtObject(reference, 'version')
copyright = self._decodeQtObject(reference, 'copyright')
permission = self._decodeQtObject(reference, 'permission')
if self.parent.settings_tab.display_style == 1: if self.parent.settings_tab.display_style == 1:
verse_text = self.formatVerse(old_chapter, chapter, verse, u'(u', u')') verse_text = self.formatVerse(old_chapter, chapter, verse, u'(u', u')')
elif self.parent.settings_tab.display_style == 2: elif self.parent.settings_tab.display_style == 2: