Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~trb143/openlp/servicing |
Merge into: | lp:openlp |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~trb143/openlp/servicing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Review via email: mp+7119@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'openlp/core/lib/serviceitem.py' | |||
2 | --- openlp/core/lib/serviceitem.py 2009-06-04 16:14:10 +0000 | |||
3 | +++ openlp/core/lib/serviceitem.py 2009-06-05 19:00:57 +0000 | |||
4 | @@ -48,6 +48,7 @@ | |||
5 | 48 | self.raw_footer = None | 48 | self.raw_footer = None |
6 | 49 | self.theme = None | 49 | self.theme = None |
7 | 50 | log.debug(u'Service item created for %s ', self.shortname) | 50 | log.debug(u'Service item created for %s ', self.shortname) |
8 | 51 | self.service_frames = [] | ||
9 | 51 | 52 | ||
10 | 52 | def addIcon(self, icon): | 53 | def addIcon(self, icon): |
11 | 53 | self.iconic_representation = buildIcon(icon) | 54 | self.iconic_representation = buildIcon(icon) |
12 | @@ -62,23 +63,35 @@ | |||
13 | 62 | else: | 63 | else: |
14 | 63 | self.plugin.render_manager.set_override_theme(self.theme) | 64 | self.plugin.render_manager.set_override_theme(self.theme) |
15 | 64 | log.debug(u'Formatting slides') | 65 | log.debug(u'Formatting slides') |
19 | 65 | if len(self.frames) == 0 and len(self.raw_slides) > 0 : | 66 | if self.service_item_type == u'text': |
20 | 66 | for slide in self.raw_slides: | 67 | for slide in self.service_frames: |
21 | 67 | formated = self.plugin.render_manager.format_slide(slide) | 68 | formated = self.plugin.render_manager.format_slide(slide[u'raw_slide']) |
22 | 68 | for format in formated: | 69 | for format in formated: |
23 | 69 | frame = self.plugin.render_manager.generate_slide(format, self.raw_footer) | 70 | frame = self.plugin.render_manager.generate_slide(format, self.raw_footer) |
25 | 70 | self.frames.append({u'title': format, u'image': frame}) | 71 | self.frames.append({u'title': slide[u'title'], u'image': frame}) |
26 | 72 | elif self.service_item_type == u'command': | ||
27 | 73 | self.frames = self.service_frames | ||
28 | 74 | self.service_frames = [] | ||
29 | 75 | elif self.service_item_type == u'image': | ||
30 | 76 | self.frames = self.service_frames | ||
31 | 77 | self.service_frames = [] | ||
32 | 71 | else: | 78 | else: |
43 | 72 | if len(self.command_files) > 0: | 79 | assert(0 , u'Invalid value rendere :%s' % self.service_item_type) |
44 | 73 | pass | 80 | |
45 | 74 | 81 | def add_from_image(self, frame_title, image): | |
46 | 75 | 82 | self.service_item_type = u'image' | |
47 | 76 | def get_parent_node(self): | 83 | self.service_frames.append({u'title': frame_title, u'image': image}) |
48 | 77 | """ | 84 | |
49 | 78 | This method returns a parent node to be inserted into the Service | 85 | def add_from_text(self, frame_title, raw_slide): |
50 | 79 | Manager. At the moment this has to be a QAbstractListModel based class | 86 | self.service_item_type = u'text' |
51 | 80 | """ | 87 | frame_title = frame_title.split(u'\n')[0] |
52 | 81 | pass | 88 | self.service_frames.append({u'title': frame_title, u'raw_slide': raw_slide}) |
53 | 89 | |||
54 | 90 | def add_from_command(self, frame_title, command): | ||
55 | 91 | self.service_item_type = u'command' | ||
56 | 92 | self.service_frames.append({u'title': frame_title, u'command': command}) | ||
57 | 93 | |||
58 | 94 | |||
59 | 82 | 95 | ||
60 | 83 | def get_oos_repr(self): | 96 | def get_oos_repr(self): |
61 | 84 | """ | 97 | """ |
62 | 85 | 98 | ||
63 | === modified file 'openlp/core/ui/servicemanager.py' | |||
64 | --- openlp/core/ui/servicemanager.py 2009-06-04 16:14:10 +0000 | |||
65 | +++ openlp/core/ui/servicemanager.py 2009-06-05 19:00:57 +0000 | |||
66 | @@ -140,8 +140,8 @@ | |||
67 | 140 | count = 0 | 140 | count = 0 |
68 | 141 | for frame in item.frames: | 141 | for frame in item.frames: |
69 | 142 | treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) | 142 | treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) |
72 | 143 | text = frame[u'title'][0] | 143 | text = frame[u'title'] |
73 | 144 | treewidgetitem1.setText(0,text[:30]) | 144 | treewidgetitem1.setText(0,text[:40]) |
74 | 145 | treewidgetitem1.setData(0, QtCore.Qt.UserRole,QtCore.QVariant(count)) | 145 | treewidgetitem1.setData(0, QtCore.Qt.UserRole,QtCore.QVariant(count)) |
75 | 146 | count = count + 1 | 146 | count = count + 1 |
76 | 147 | 147 | ||
77 | 148 | 148 | ||
78 | === modified file 'openlp/core/ui/slidecontroller.py' | |||
79 | --- openlp/core/ui/slidecontroller.py 2009-06-04 19:00:41 +0000 | |||
80 | +++ openlp/core/ui/slidecontroller.py 2009-06-05 19:00:57 +0000 | |||
81 | @@ -291,7 +291,7 @@ | |||
82 | 291 | """ | 291 | """ |
83 | 292 | Loads a ServiceItem. | 292 | Loads a ServiceItem. |
84 | 293 | """ | 293 | """ |
86 | 294 | log.debug(u'addServiceItem') | 294 | log.debug(u'add Service Item') |
87 | 295 | self.serviceitem = serviceitem | 295 | self.serviceitem = serviceitem |
88 | 296 | self.serviceitem.render() | 296 | self.serviceitem.render() |
89 | 297 | self.PreviewListData.clear() | 297 | self.PreviewListData.clear() |
90 | @@ -309,7 +309,13 @@ | |||
91 | 309 | """ | 309 | """ |
92 | 310 | Loads a ServiceManagerItem. | 310 | Loads a ServiceManagerItem. |
93 | 311 | """ | 311 | """ |
95 | 312 | self.addServiceItem(serviceitem) | 312 | log.debug(u'add Service Manager Item') |
96 | 313 | self.PreviewListData.clear() | ||
97 | 314 | self.serviceitem = serviceitem | ||
98 | 315 | framenumber = 0 | ||
99 | 316 | for frame in self.serviceitem.frames: | ||
100 | 317 | self.PreviewListData.addRow(frame[u'image'], framenumber) | ||
101 | 318 | framenumber += 1 | ||
102 | 313 | row = self.PreviewListData.createIndex(slideno, 0) | 319 | row = self.PreviewListData.createIndex(slideno, 0) |
103 | 314 | if row.isValid(): | 320 | if row.isValid(): |
104 | 315 | self.PreviewListView.selectionModel().setCurrentIndex(row, | 321 | self.PreviewListView.selectionModel().setCurrentIndex(row, |
105 | 316 | 322 | ||
106 | === modified file 'openlp/plugins/bibles/lib/mediaitem.py' | |||
107 | --- openlp/plugins/bibles/lib/mediaitem.py 2009-06-05 05:00:26 +0000 | |||
108 | +++ openlp/plugins/bibles/lib/mediaitem.py 2009-06-05 19:00:57 +0000 | |||
109 | @@ -397,7 +397,8 @@ | |||
110 | 397 | else: | 397 | else: |
111 | 398 | service_item.theme = self.parent.bibles_tab.bible_theme | 398 | service_item.theme = self.parent.bibles_tab.bible_theme |
112 | 399 | raw_slides.append(bible_text) | 399 | raw_slides.append(bible_text) |
114 | 400 | service_item.raw_slides = raw_slides | 400 | for slide in raw_slides: |
115 | 401 | service_item.add_from_text(slide[:30], slide) | ||
116 | 401 | service_item.raw_footer = raw_footer | 402 | service_item.raw_footer = raw_footer |
117 | 402 | 403 | ||
118 | 403 | def formatVerse(self, old_chapter, chapter, verse, opening, closing): | 404 | def formatVerse(self, old_chapter, chapter, verse, opening, closing): |
119 | 404 | 405 | ||
120 | === modified file 'openlp/plugins/custom/lib/mediaitem.py' | |||
121 | --- openlp/plugins/custom/lib/mediaitem.py 2009-06-03 15:38:14 +0000 | |||
122 | +++ openlp/plugins/custom/lib/mediaitem.py 2009-06-05 19:00:57 +0000 | |||
123 | @@ -248,5 +248,6 @@ | |||
124 | 248 | raw_footer.append(title + u' '+ credit) | 248 | raw_footer.append(title + u' '+ credit) |
125 | 249 | if theme is not None: | 249 | if theme is not None: |
126 | 250 | service_item.title = title | 250 | service_item.title = title |
128 | 251 | service_item.raw_slides = raw_slides | 251 | for slide in raw_slides: |
129 | 252 | service_item.add_from_text(slide[:30], slide) | ||
130 | 252 | service_item.raw_footer = raw_footer | 253 | service_item.raw_footer = raw_footer |
131 | 253 | 254 | ||
132 | === modified file 'openlp/plugins/images/lib/mediaitem.py' | |||
133 | --- openlp/plugins/images/lib/mediaitem.py 2009-06-01 17:50:37 +0000 | |||
134 | +++ openlp/plugins/images/lib/mediaitem.py 2009-06-05 19:00:57 +0000 | |||
135 | @@ -150,10 +150,12 @@ | |||
136 | 150 | 150 | ||
137 | 151 | def generateSlideData(self, service_item): | 151 | def generateSlideData(self, service_item): |
138 | 152 | indexes = self.ImageListView.selectedIndexes() | 152 | indexes = self.ImageListView.selectedIndexes() |
139 | 153 | service_item.title = u'Images' | ||
140 | 153 | for index in indexes: | 154 | for index in indexes: |
141 | 154 | filename = self.ImageListData.getFilename(index) | 155 | filename = self.ImageListData.getFilename(index) |
142 | 155 | frame = QtGui.QPixmap(str(filename)) | 156 | frame = QtGui.QPixmap(str(filename)) |
144 | 156 | service_item.frames.append({u'title': filename , u'image': frame}) | 157 | (path, name) =os.path.split(filename) |
145 | 158 | service_item.add_from_image(name, frame) | ||
146 | 157 | 159 | ||
147 | 158 | def onImagePreviewClick(self): | 160 | def onImagePreviewClick(self): |
148 | 159 | log.debug(u'Image Preview Requested') | 161 | log.debug(u'Image Preview Requested') |
149 | 160 | 162 | ||
150 | === modified file 'openlp/plugins/songs/lib/mediaitem.py' | |||
151 | --- openlp/plugins/songs/lib/mediaitem.py 2009-06-03 16:14:56 +0000 | |||
152 | +++ openlp/plugins/songs/lib/mediaitem.py 2009-06-05 19:00:57 +0000 | |||
153 | @@ -168,7 +168,7 @@ | |||
154 | 168 | self.onSongLiveClick)) | 168 | self.onSongLiveClick)) |
155 | 169 | self.SongListView.addAction(self.contextMenuAction(self.SongListView, | 169 | self.SongListView.addAction(self.contextMenuAction(self.SongListView, |
156 | 170 | ':/system/system_add.png', translate('SongMediaItem', u'&Add to Service'), | 170 | ':/system/system_add.png', translate('SongMediaItem', u'&Add to Service'), |
158 | 171 | self.onSongEditClick)) | 171 | self.onSongAddClick)) |
159 | 172 | 172 | ||
160 | 173 | def retranslateUi(self): | 173 | def retranslateUi(self): |
161 | 174 | self.SearchTypeLabel.setText(translate('SongMediaItem', u'Search Type:')) | 174 | self.SearchTypeLabel.setText(translate('SongMediaItem', u'Search Type:')) |
162 | @@ -258,9 +258,8 @@ | |||
163 | 258 | else: | 258 | else: |
164 | 259 | service_item.theme = song.theme_name | 259 | service_item.theme = song.theme_name |
165 | 260 | verses = song.lyrics.split(u'\n\n') | 260 | verses = song.lyrics.split(u'\n\n') |
169 | 261 | for verse in verses: | 261 | for slide in verses: |
170 | 262 | raw_slides.append(verse) | 262 | service_item.add_from_text(slide[:30], slide) |
168 | 263 | service_item.raw_slides = raw_slides | ||
171 | 264 | service_item.title = song.title | 263 | service_item.title = song.title |
172 | 265 | raw_footer.append(str(u'%s \n%s \n' % (song.title, song.copyright ))) | 264 | raw_footer.append(str(u'%s \n%s \n' % (song.title, song.copyright ))) |
173 | 266 | raw_footer.append(song.copyright) | 265 | raw_footer.append(song.copyright) |
Fix up serviceitem interface