forked from openlp/openlp
New Song Works
Speed Up media Item Fix Song definition
This commit is contained in:
parent
4f7310a5a6
commit
fb815b8ca6
@ -266,11 +266,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
self.processLyrics()
|
||||
self.processTitle()
|
||||
self.song.song_book_id = 0
|
||||
# for i in range(0, self.AuthorsListView.count()):
|
||||
# print self.AuthorsListView.item(i)
|
||||
# for i in range(0, self.TopicsListView.count()):
|
||||
# print self.TopicsListView.item(i)
|
||||
|
||||
self.songmanager.save_song(self.song)
|
||||
self.close()
|
||||
|
||||
|
@ -99,6 +99,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
@ -109,6 +110,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
print u'Errow thrown ', sys.exc_info()[1]
|
||||
return False
|
||||
@ -139,6 +141,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
@ -152,6 +155,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
@ -176,6 +180,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
@ -189,6 +194,7 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
@ -213,6 +219,8 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
||||
def delete_book(self, bookid):
|
||||
@ -225,5 +233,6 @@ class SongManager():
|
||||
self.session.commit()
|
||||
return True
|
||||
except:
|
||||
self.session.rollback()
|
||||
log.error(u'Errow thrown %s', sys.exc_info()[1])
|
||||
return False
|
||||
|
@ -215,7 +215,6 @@ class SongMediaItem(MediaManagerItem):
|
||||
id = self.SongListData.getId(index)
|
||||
self.edit_song_form.loadSong(id)
|
||||
self.edit_song_form.exec_()
|
||||
self.onSearchTextButtonClick()
|
||||
|
||||
def onSongDeleteClick(self):
|
||||
indexes = self.SongListView.selectedIndexes()
|
||||
@ -223,7 +222,6 @@ class SongMediaItem(MediaManagerItem):
|
||||
id = self.SongListData.getId(index)
|
||||
self.parent.songmanager.delete_song(id)
|
||||
self.SongListData.deleteRow(index)
|
||||
self.onSearchTextButtonClick()
|
||||
|
||||
def onSongPreviewClick(self):
|
||||
service_item = ServiceItem(self.parent)
|
||||
|
@ -38,7 +38,7 @@ song_books_table = Table('song_books', metadata,
|
||||
|
||||
# Definition of the "songs" table
|
||||
songs_table = Table('songs', metadata,
|
||||
Column('id', types.Integer(), primary_key=True),
|
||||
Column('id', types.Integer, primary_key=True),
|
||||
Column('song_book_id', types.Integer, ForeignKey('song_books.id'), default=0),
|
||||
Column('title', types.Unicode(255), nullable=False),
|
||||
Column('lyrics', types.UnicodeText, nullable=False),
|
||||
|
@ -42,7 +42,6 @@ class TextListData(QtCore.QAbstractListModel):
|
||||
|
||||
def insertRow(self, row, id, title):
|
||||
self.beginInsertRows(QtCore.QModelIndex(),row,row)
|
||||
log.debug("insert row %d:%s for id %d" % (row,title, id))
|
||||
self.items.insert(row, (id, title))
|
||||
self.endInsertRows()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user