OpenLP

Merge lp:~meths/openlp/trivialfixes into lp:openlp

  1. trivialfixes
  2. Merge into trunk
Proposed by Jon Tibble
Status: Merged
Merged at revision: not available
Proposed branch: lp:~meths/openlp/trivialfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~meths/openlp/trivialfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+12146@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jon Tibble (meths) wrote :

Fix issues with song editor

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~meths/openlp/trivialfixes updated
562. By Jon Tibble

Song editor fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/songs/forms/editsongform.py'
2--- openlp/plugins/songs/forms/editsongform.py 2009-09-12 17:31:03 +0000
3+++ openlp/plugins/songs/forms/editsongform.py 2009-09-21 02:42:59 +0000
4@@ -45,6 +45,7 @@
5 Constructor
6 """
7 QtGui.QDialog.__init__(self, parent)
8+ self.parent = parent
9 self.setupUi(self)
10 # Connecting signals and slots
11 QtCore.QObject.connect(self.AuthorAddButton,
12@@ -52,13 +53,15 @@
13 QtCore.QObject.connect(self.AuthorRemoveButton,
14 QtCore.SIGNAL(u'clicked()'), self.onAuthorRemoveButtonClicked)
15 QtCore.QObject.connect(self.AuthorsListView,
16- QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onAuthorsListViewPressed)
17+ QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
18+ self.onAuthorsListViewPressed)
19 QtCore.QObject.connect(self.TopicAddButton,
20 QtCore.SIGNAL(u'clicked()'), self.onTopicAddButtonClicked)
21 QtCore.QObject.connect(self.TopicRemoveButton,
22 QtCore.SIGNAL(u'clicked()'), self.onTopicRemoveButtonClicked)
23 QtCore.QObject.connect(self.TopicsListView,
24- QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onTopicListViewPressed)
25+ QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
26+ self.onTopicListViewPressed)
27 QtCore.QObject.connect(self.CopyrightInsertButton,
28 QtCore.SIGNAL(u'clicked()'), self.onCopyrightInsertButtonTriggered)
29 QtCore.QObject.connect(self.VerseAddButton,
30@@ -70,11 +73,15 @@
31 QtCore.QObject.connect(self.VerseDeleteButton,
32 QtCore.SIGNAL(u'clicked()'), self.onVerseDeleteButtonClicked)
33 QtCore.QObject.connect(self.VerseListWidget,
34- QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onVerseListViewPressed)
35+ QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
36+ self.onVerseListViewPressed)
37 QtCore.QObject.connect(self.SongbookCombo,
38 QtCore.SIGNAL(u'activated(int)'), self.onSongBookComboChanged)
39 QtCore.QObject.connect(self.ThemeSelectionComboItem,
40 QtCore.SIGNAL(u'activated(int)'), self.onThemeComboChanged)
41+ QtCore.QObject.connect(self.ThemeAddButton,
42+ QtCore.SIGNAL(u'clicked()'),
43+ self.parent.parent.render_manager.theme_manager.onAddTheme)
44 QtCore.QObject.connect(self.MaintenanceButton,
45 QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
46 QtCore.QObject.connect(self.TitleEditItem,
47@@ -89,7 +96,6 @@
48 QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus)
49 # Create other objects and forms
50 self.songmanager = songmanager
51- self.parent = parent
52 self.verse_form = EditVerseForm()
53 self.initialise()
54 self.AuthorsListView.setSortingEnabled(False)
55@@ -110,7 +116,8 @@
56 for author in authors:
57 row = self.AuthorsSelectionComboItem.count()
58 self.AuthorsSelectionComboItem.addItem(author.display_name)
59- self.AuthorsSelectionComboItem.setItemData(row, QtCore.QVariant(author.id))
60+ self.AuthorsSelectionComboItem.setItemData(
61+ row, QtCore.QVariant(author.id))
62
63 def loadTopics(self):
64 topics = self.songmanager.get_topics()
65@@ -165,13 +172,15 @@
66 title = self.song.search_title.split(u'@')
67 if self.song.song_book_id != 0:
68 book_name = self.songmanager.get_book(self.song.song_book_id)
69- id = self.SongbookCombo.findText(unicode(book_name.name), QtCore.Qt.MatchExactly)
70+ id = self.SongbookCombo.findText(
71+ unicode(book_name.name), QtCore.Qt.MatchExactly)
72 if id == -1:
73 # Not Found
74 id = 0
75 self.SongbookCombo.setCurrentIndex(id)
76 if self.song.theme_name is not None and len(self.song.theme_name) > 0:
77- id = self.ThemeSelectionComboItem.findText(unicode(self.song.theme_name), QtCore.Qt.MatchExactly)
78+ id = self.ThemeSelectionComboItem.findText(
79+ unicode(self.song.theme_name), QtCore.Qt.MatchExactly)
80 if id == -1:
81 # Not Found
82 id = 0
83@@ -272,7 +281,8 @@
84 self.song.song_book_id = 0
85 else:
86 item = int(self.SongbookCombo.currentIndex())
87- self.song.song_book_id = (self.SongbookCombo.itemData(item)).toInt()[0]
88+ self.song.song_book_id = \
89+ (self.SongbookCombo.itemData(item)).toInt()[0]
90
91 def onThemeComboChanged(self, item):
92 if item == 0:
93@@ -337,7 +347,8 @@
94
95 def _validate_song(self):
96 """
97- Check the validity of the form. Only display the 'save' if the data can be saved.
98+ Check the validity of the form. Only display the 'save' if the data
99+ can be saved.
100 """
101 log.debug(u'Validate Song')
102 # Lets be nice and assume the data is correct.
103@@ -345,26 +356,32 @@
104 message = u''
105 if len(self.TitleEditItem.displayText()) == 0:
106 valid = False
107- ##self.TitleEditItem.setStyleSheet(u'background-color: red; color: white')
108+ #self.TitleEditItem.setStyleSheet(
109+ # u'background-color: red; color: white')
110 self.SongTabWidget.setCurrentIndex(0)
111 self.TitleEditItem.setFocus()
112- return False, translate(u'SongFormDialog', u'You need to enter a song title.')
113+ return False, translate(
114+ u'SongFormDialog', u'You need to enter a song title.')
115 #else:
116 #self.TitleEditItem.setStyleSheet(u'')
117 if self.VerseListWidget.count() == 0:
118 valid = False
119- #self.VerseListWidget.setStyleSheet(u'background-color: red; color: white')
120+ #self.VerseListWidget.setStyleSheet(
121+ # u'background-color: red; color: white')
122 self.SongTabWidget.setCurrentIndex(0)
123 self.VerseListWidget.setFocus()
124- return False, translate(u'SongFormDialog', u'You need to enter some verses.')
125+ return False, translate(
126+ u'SongFormDialog', u'You need to enter some verses.')
127 #else:
128 #self.VerseListWidget.setStyleSheet(u'')
129 if self.AuthorsListView.count() == 0:
130 valid = False
131- #self.AuthorsListView.setStyleSheet(u'background-color: red; color: white')
132+ #self.AuthorsListView.setStyleSheet(
133+ # u'background-color: red; color: white')
134 self.SongTabWidget.setCurrentIndex(2)
135 self.AuthorsListView.setFocus()
136- return False, translate(u'SongFormDialog', u'You need to provide at least one author.')
137+ return False, translate(
138+ u'SongFormDialog', u'You need to provide at least one author.')
139 #else:
140 #self.AuthorsListView.setStyleSheet(u'')
141 return valid, message
142@@ -406,7 +423,8 @@
143 return
144 self.song.title = unicode(self.TitleEditItem.displayText())
145 self.song.copyright = unicode(self.CopyrightEditItem.displayText())
146- self.song.search_title = unicode(self.TitleEditItem.displayText()) + u'@'+ unicode(self.AlternativeEdit.displayText())
147+ self.song.search_title = unicode(self.TitleEditItem.displayText()) + \
148+ u'@'+ unicode(self.AlternativeEdit.displayText())
149 self.song.comments = unicode(self.CommentsEdit.toPlainText())
150 self.song.ccli_number = unicode(self.CCLNumberEdit.displayText())
151 self.processLyrics()
152
153=== modified file 'openlp/plugins/songs/lib/models.py'
154--- openlp/plugins/songs/lib/models.py 2009-09-08 19:58:05 +0000
155+++ openlp/plugins/songs/lib/models.py 2009-09-21 00:47:10 +0000
156@@ -32,7 +32,7 @@
157 def init_models(url):
158 engine = create_engine(url)
159 metadata.bind = engine
160- session = scoped_session(sessionmaker(autoflush=True,
161+ session = scoped_session(sessionmaker(autoflush=False,
162 autocommit=False, bind=engine))
163 mapper(Author, authors_table)
164 mapper(Book, song_books_table)