Status: | Superseded |
---|---|
Proposed branch: | lp:~trb143/openlp/audit |
Merge into: | lp:openlp |
Diff against target: |
205 lines 11 files modified
openlp/core/lib/plugin.py (+8/-0) openlp/core/ui/plugindialoglistform.py (+17/-1) openlp/core/ui/servicemanager.py (+2/-2) openlp/plugins/audit/auditplugin.py (+3/-0) openlp/plugins/bibles/bibleplugin.py (+2/-0) openlp/plugins/custom/customplugin.py (+3/-0) openlp/plugins/images/imageplugin.py (+3/-0) openlp/plugins/media/mediaplugin.py (+3/-0) openlp/plugins/presentations/presentationplugin.py (+3/-0) openlp/plugins/remotes/remoteplugin.py (+10/-1) openlp/plugins/songs/songsplugin.py (+3/-0) |
To merge this branch: | bzr merge lp:~trb143/openlp/audit |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenLP Core | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2009-10-01.
Commit message
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Tim Bentley (trb143) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Jonathan Corwin (j-corwin) wrote : | # |
Need to make sure the following lines in presentationplu
156 + for controller in self.controllers:
157 + self.controller
- 600. By Tim Bentley
-
Plugin abouts fixed
- 601. By Tim Bentley
-
More Plugin list work
- 602. By Tim Bentley
-
head
- 603. By Tim Bentley
-
Sort out text display on dialog
- 604. By Tim Bentley
-
Update UI
- 605. By Tim Bentley
-
Start of Active / Inactive work
- 606. By Tim Bentley
-
Plugin List Combo boxhandling finished
- 607. By Tim Bentley
-
Audit can now be disabled dynamically
- 608. By Tim Bentley
-
Sort out Initialistion order and Plugin Status code
- 609. By Tim Bentley
-
Media Itmes now hide them selves correctly
- 610. By Tim Bentley
-
Sort out Settings tab items
- 611. By Tim Bentley
-
Fix int issue
- 612. By Tim Bentley
-
Head
- 613. By Tim Bentley
-
Head
- 614. By Tim Bentley
-
Cleanup hinding code and move to disable for now
- 615. By Tim Bentley
-
New file
- 616. By Tim Bentley
-
Clean up disenablement
- 617. By Tim Bentley
-
More cleanups, Bibles and media done
- 618. By Tim Bentley
-
Songs now play hide and seek
- 619. By Tim Bentley
-
Presentations add code but leave for now - Angels fear to tread
- 620. By Tim Bentley
-
Fix Bible plugin rendering
- 621. By Tim Bentley
-
Bible New features and Clean up
- 622. By Tim Bentley
-
More dock hiding work
- 623. By Tim Bentley
-
Head
- 624. By Tim Bentley
-
More hiding changes
- 625. By Tim Bentley
-
Head
- 626. By Tim Bentley
-
Plugins now hide and reappear correctly
- 627. By Tim Bentley
-
Remove all print statements
- 628. By Tim Bentley
-
Theme improvements
- 629. By Tim Bentley
-
Latest Version checking added
- 630. By Tim Bentley
-
Correct Theme name for Export if default
- 631. By Tim Bentley
-
Quick code cleanup and fix test for version checking
- 632. By Tim Bentley
-
Servie Manager DnD part 1
- 633. By Tim Bentley
-
Servie Manager DnD part 2
- 634. By Tim Bentley
-
Audit Cleanup - part 1
- 635. By Tim Bentley
-
Small fix ups and corrections. Plugin list obeys can_be_diabled
- 636. By Tim Bentley
-
Fixes to last merge request
Unmerged revisions
Preview Diff
1 | === modified file 'openlp/core/lib/plugin.py' |
2 | --- openlp/core/lib/plugin.py 2009-09-29 17:05:34 +0000 |
3 | +++ openlp/core/lib/plugin.py 2009-10-01 17:21:11 +0000 |
4 | @@ -149,6 +149,14 @@ |
5 | """ |
6 | return True |
7 | |
8 | + def can_be_disabled(self): |
9 | + """ |
10 | + Indicates whether the plugin can be disabled by the plugin list. |
11 | + |
12 | + Returns True or False. |
13 | + """ |
14 | + return False |
15 | + |
16 | def get_media_manager_item(self): |
17 | """ |
18 | Construct a MediaManagerItem object with all the buttons and things |
19 | |
20 | === modified file 'openlp/core/ui/plugindialoglistform.py' |
21 | --- openlp/core/ui/plugindialoglistform.py 2009-09-21 17:56:36 +0000 |
22 | +++ openlp/core/ui/plugindialoglistform.py 2009-10-01 17:21:11 +0000 |
23 | @@ -48,6 +48,8 @@ |
24 | QtCore.QObject.connect(self.ButtonBox, |
25 | QtCore.SIGNAL(u'accepted()'), PluginForm.close) |
26 | QtCore.QMetaObject.connectSlotsByName(PluginForm) |
27 | + QtCore.QObject.connect(self.PluginViewList, |
28 | + QtCore.SIGNAL(u'itemDoubleClicked(QTableWidgetItem*)'), self.displayAbout) |
29 | |
30 | def retranslateUi(self, PluginForm): |
31 | PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list')) |
32 | @@ -62,15 +64,16 @@ |
33 | """ |
34 | Load the plugin details into the screen |
35 | """ |
36 | - #self.PluginViewList.clear() |
37 | self.PluginViewList.setRowCount(0) |
38 | for plugin in self.parent.plugin_manager.plugins: |
39 | row = self.PluginViewList.rowCount() |
40 | self.PluginViewList.setRowCount(row + 1) |
41 | item1 = QtGui.QTableWidgetItem(plugin.name) |
42 | + item1.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) |
43 | item1.setTextAlignment(QtCore.Qt.AlignVCenter) |
44 | item2 = QtGui.QTableWidgetItem(plugin.version) |
45 | item2.setTextAlignment(QtCore.Qt.AlignVCenter) |
46 | + item2.setFlags(QtCore.Qt.ItemIsSelectable) |
47 | if plugin.status == PluginStatus.Active: |
48 | item3 = QtGui.QTableWidgetItem( |
49 | translate(u'PluginForm', u'Active')) |
50 | @@ -78,8 +81,21 @@ |
51 | item3 = QtGui.QTableWidgetItem( |
52 | translate(u'PluginForm', u'Inactive')) |
53 | item3.setTextAlignment(QtCore.Qt.AlignVCenter) |
54 | + item3.setFlags(QtCore.Qt.ItemIsSelectable) |
55 | self.PluginViewList.setItem(row, 0, item1) |
56 | self.PluginViewList.setItem(row, 1, item2) |
57 | self.PluginViewList.setItem(row, 2, item3) |
58 | self.PluginViewList.setRowHeight(row, 15) |
59 | |
60 | + def displayAbout(self, item): |
61 | + if item is None: |
62 | + return False |
63 | + row = self.PluginViewList.row(item) |
64 | + text = self.parent.plugin_manager.plugins[row].about() |
65 | + if text is not None: |
66 | + ret = QtGui.QMessageBox.information(self, |
67 | + translate(u'PluginList', u'Plugin Information'), |
68 | + translate(u'PluginList', text), |
69 | + QtGui.QMessageBox.StandardButtons( |
70 | + QtGui.QMessageBox.Ok), |
71 | + QtGui.QMessageBox.Ok) |
72 | |
73 | === modified file 'openlp/core/ui/servicemanager.py' |
74 | --- openlp/core/ui/servicemanager.py 2009-09-25 23:06:54 +0000 |
75 | +++ openlp/core/ui/servicemanager.py 2009-10-01 17:21:11 +0000 |
76 | @@ -35,7 +35,7 @@ |
77 | class ServiceManagerList(QtGui.QTreeWidget): |
78 | |
79 | def __init__(self,parent=None,name=None): |
80 | - QtGui.QListView.__init__(self,parent) |
81 | + QtGui.QTreeWidget.__init__(self,parent) |
82 | self.parent = parent |
83 | |
84 | def keyPressEvent(self, event): |
85 | @@ -402,7 +402,7 @@ |
86 | name = filename.split(os.path.sep) |
87 | self.serviceName = name[-1] |
88 | self.parent.serviceChanged(True, self.serviceName) |
89 | - |
90 | + |
91 | def onQuickSaveService(self): |
92 | self.onSaveService(True) |
93 | |
94 | |
95 | === modified file 'openlp/plugins/audit/auditplugin.py' |
96 | --- openlp/plugins/audit/auditplugin.py 2009-09-29 17:05:34 +0000 |
97 | +++ openlp/plugins/audit/auditplugin.py 2009-10-01 17:21:11 +0000 |
98 | @@ -185,3 +185,6 @@ |
99 | |
100 | def onAuditReport(self): |
101 | self.auditdetailform.exec_() |
102 | + |
103 | + def about(self): |
104 | + return u'<b>Audit Plugin</b> <br>This plugin records the use of songs and when they have been used during a live service' |
105 | |
106 | === modified file 'openlp/plugins/bibles/bibleplugin.py' |
107 | --- openlp/plugins/bibles/bibleplugin.py 2009-09-29 17:05:34 +0000 |
108 | +++ openlp/plugins/bibles/bibleplugin.py 2009-10-01 17:21:11 +0000 |
109 | @@ -70,3 +70,5 @@ |
110 | def onBibleNewClick(self): |
111 | self.media_item.onBibleNewClick() |
112 | |
113 | + def about(self): |
114 | + return u'<b>Bible Plugin</b> <br>This plugin allows bible verse from different sources to be displayed on the screen during the service.<br><br>This is a core plugin and cannot be made inactive</b>' |
115 | |
116 | === modified file 'openlp/plugins/custom/customplugin.py' |
117 | --- openlp/plugins/custom/customplugin.py 2009-09-29 17:05:34 +0000 |
118 | +++ openlp/plugins/custom/customplugin.py 2009-10-01 17:21:11 +0000 |
119 | @@ -56,3 +56,6 @@ |
120 | # Create the CustomManagerItem object |
121 | self.media_item = CustomMediaItem(self, self.icon, u'Custom Slides') |
122 | return self.media_item |
123 | + |
124 | + def about(self): |
125 | + return u'<b>Custom Plugin</b> <br>This plugin allows slides to be displayed on the screen in the same way songs are. The difference between this plugin and songs is this plugin provides greater freedom.<br><br>This is a core plugin and cannot be made inactive</b>' |
126 | |
127 | === modified file 'openlp/plugins/images/imageplugin.py' |
128 | --- openlp/plugins/images/imageplugin.py 2009-09-29 02:54:32 +0000 |
129 | +++ openlp/plugins/images/imageplugin.py 2009-10-01 17:21:11 +0000 |
130 | @@ -47,3 +47,6 @@ |
131 | # Create the MediaManagerItem object |
132 | self.media_item = ImageMediaItem(self, self.icon, u'Images') |
133 | return self.media_item |
134 | + |
135 | + def about(self): |
136 | + return u'<b>Image Plugin</b><br>Allows images of all types to be displayed. If a number of images are selected together and presented on the live controller it is possible to turn them into a timed loop.<br> From the plugin if the <i>Override background</i> is chosen and an image is selected any somgs which are rendered will use the selected image from the background instead of the one provied by the theme.<br>' |
137 | |
138 | === modified file 'openlp/plugins/media/mediaplugin.py' |
139 | --- openlp/plugins/media/mediaplugin.py 2009-09-29 02:54:32 +0000 |
140 | +++ openlp/plugins/media/mediaplugin.py 2009-10-01 17:21:11 +0000 |
141 | @@ -44,3 +44,6 @@ |
142 | # Create the MediaManagerItem object |
143 | self.media_item = MediaMediaItem(self, self.icon, u'Media') |
144 | return self.media_item |
145 | + |
146 | + def about(self): |
147 | + return u'<b>Media Plugin</b> <br> One day this may provide access to video and audio clips' |
148 | |
149 | === modified file 'openlp/plugins/presentations/presentationplugin.py' |
150 | --- openlp/plugins/presentations/presentationplugin.py 2009-09-30 19:26:51 +0000 |
151 | +++ openlp/plugins/presentations/presentationplugin.py 2009-10-01 17:21:11 +0000 |
152 | @@ -101,3 +101,6 @@ |
153 | controller = self.controllers[key] |
154 | if controller.enabled: |
155 | controller.kill() |
156 | + |
157 | + def about(self): |
158 | + return u'<b>Presentation Plugin</b> <br> Delivers the ability to show presentations using a number of different programs. The choice of available presentaion programs is available in a drop down.' |
159 | |
160 | === modified file 'openlp/plugins/remotes/remoteplugin.py' |
161 | --- openlp/plugins/remotes/remoteplugin.py 2009-09-28 20:45:04 +0000 |
162 | +++ openlp/plugins/remotes/remoteplugin.py 2009-10-01 17:21:11 +0000 |
163 | @@ -21,7 +21,7 @@ |
164 | |
165 | from PyQt4 import QtNetwork, QtCore |
166 | |
167 | -from openlp.core.lib import Plugin, Receiver |
168 | +from openlp.core.lib import Plugin, Receiver, translate |
169 | from openlp.plugins.remotes.lib import RemoteTab |
170 | |
171 | class RemotesPlugin(Plugin): |
172 | @@ -35,6 +35,9 @@ |
173 | Plugin.__init__(self, u'Remotes', u'1.9.0', plugin_helpers) |
174 | self.weight = -1 |
175 | |
176 | + def can_be_disabled(self): |
177 | + return True |
178 | + |
179 | def check_pre_conditions(self): |
180 | """ |
181 | Check to see if remotes is required |
182 | @@ -52,6 +55,12 @@ |
183 | QtCore.QObject.connect(self.server, |
184 | QtCore.SIGNAL(u'readyRead()'), self.readData) |
185 | |
186 | + def finalise(self): |
187 | + pass |
188 | + |
189 | + def about(self): |
190 | + return u'<b>Remote Plugin</b> <br>This plugin provides the ability to send messages to a running version of openlp on a different computer.<br> The Primary use for this would be to send alerts from a creche' |
191 | + |
192 | def get_settings_tab(self): |
193 | """ |
194 | Create the settings Tab |
195 | |
196 | === modified file 'openlp/plugins/songs/songsplugin.py' |
197 | --- openlp/plugins/songs/songsplugin.py 2009-09-29 02:54:32 +0000 |
198 | +++ openlp/plugins/songs/songsplugin.py 2009-10-01 17:21:11 +0000 |
199 | @@ -159,3 +159,6 @@ |
200 | |
201 | def onExportOpenSongItemClicked(self): |
202 | self.opensong_export_form.show() |
203 | + |
204 | + def about(self): |
205 | + return u'<b>Song Plugin</b> <br>This plugin allows Songs to be managed and displayed.<br><br>This is a core plugin and cannot be made inactive</b>' |
Add About text to Plugin list.
Text can be amended but it is a start.
Plugin list now is no longer editable!