Merge lp:~suutari-olli/openlp/rename_Powerpoint_to_PowerPoint into lp:openlp

Proposed by Azaziah
Status: Needs review
Proposed branch: lp:~suutari-olli/openlp/rename_Powerpoint_to_PowerPoint
Merge into: lp:openlp
Diff against target: 912 lines (+123/-123)
39 files modified
openlp/plugins/presentations/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+10/-10)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/songs/lib/importers/openoffice.py (+1/-1)
resources/i18n/af.ts (+2/-2)
resources/i18n/bg.ts (+2/-2)
resources/i18n/cs.ts (+3/-3)
resources/i18n/da.ts (+3/-3)
resources/i18n/de.ts (+3/-3)
resources/i18n/el.ts (+2/-2)
resources/i18n/en.ts (+3/-3)
resources/i18n/en_GB.ts (+3/-3)
resources/i18n/en_ZA.ts (+3/-3)
resources/i18n/es.ts (+2/-2)
resources/i18n/et.ts (+3/-3)
resources/i18n/fi.ts (+3/-3)
resources/i18n/fr.ts (+2/-2)
resources/i18n/hu.ts (+3/-3)
resources/i18n/id.ts (+2/-2)
resources/i18n/ja.ts (+2/-2)
resources/i18n/ko.ts (+2/-2)
resources/i18n/lt.ts (+3/-3)
resources/i18n/nb.ts (+3/-3)
resources/i18n/nl.ts (+4/-4)
resources/i18n/pl.ts (+3/-3)
resources/i18n/pt_BR.ts (+2/-2)
resources/i18n/ru.ts (+2/-2)
resources/i18n/sk.ts (+3/-3)
resources/i18n/sv.ts (+3/-3)
resources/i18n/ta_LK.ts (+2/-2)
resources/i18n/th_TH.ts (+2/-2)
resources/i18n/zh_CN.ts (+2/-2)
resources/i18n/zh_TW.ts (+3/-3)
tests/functional/openlp_plugins/presentations/test_mediaitem.py (+2/-2)
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py (+24/-24)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+4/-4)
To merge this branch: bzr merge lp:~suutari-olli/openlp/rename_Powerpoint_to_PowerPoint
Reviewer Review Type Date Requested Status
Tim Bentley Disapprove
Review via email: mp+277238@code.launchpad.net

Description of the change

At the moment PowerPoint is called as Powerpoint in the UI.

This branch renames all occurrences of "Powerpoint" to "PowerPoint"
The all small "powerpoint" is left un-touched.
Nothing else is changed in this branch.
Total count of replaced "Powerpoint" in text editor: 126

https://ci.openlp.io/view/Branch/job/Branch-05b-Test_Coverage/470/console

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

This request is incorrect on many fronts.
Though as you say we have spelt Powerpoint wrong most of the cases are internal.
We spent a year refactoring the code to change and fix the names style and have a standard which we adhere to.
The only external change would be 76 the error message all the rest are internal.
Please note that you cannot change translations they need to be done via Transifex and now you are asked 30 people to change the string.

On a side note this patch has a number of other failings.
- You cannot rename settings without adding a settings migration,
- You have no new tests.
- You have not run and proved you have run the Jenkins test suite.

review: Disapprove
Revision history for this message
Azaziah (suutari-olli) wrote :

Thanks for the review trb143,

however, you have clearly have missed some things and leave a few questions:
First of all, this also changes how PowerPoint is called in list of presentation
controllers. This includes both Powerpoint and Powerpoint viewer.

These are un-translatable and come directly from some part of the code which
includes “Powerpoint”. If we change “Powerpoint” from one function but leave
the other “Internals” in-touched, changes are something gets broken. If we are
going to start PowerPoint with big P, we should always bring along the 2nd the
way. While capitalizing the 1st letter seems okayish standard normally, I
think we shouldn’t do it with PowerPoint.

Translations: Really? Can’t we just backup the translations
for the current string and re-place the new one with the old ones.
(With the big P fix). This shouldn’t be too much work for one person,
if it comes to that – I’d gladly do it.

Settings migration: If something was called
“Powerpoint” it is now called: “PowerPoint”
New tests: If something was called “Powerpoint”
it is now called: “PowerPoint”

Jenkins: Please re-read the description, it clearly includes
link to Jenkins test suite. You should be able to open the other
tests from the last one easily.

As stated before, this branch only renames
Powerpoint to PowerPoint everywhere,
if the i18n strings are a problem,
I can leave them out from the branch.

What kind of tests are you perhaps hoping to see with this change?
What do you mean with setting migration?

Revision history for this message
Tim Bentley (trb143) wrote :

1) It does not matter if you think you got all the changes it increases potential instability in code. We have been there are it is a risk for no gain.

2) Internal names do not matter, external ones do and that is why changing the Message may help.

3) The names are used internally and compared to drive processes, this is brittle but works and you plan to change it.

4) Jenkins we need to complete run not just a bit of it. How do I know you did not break the tests.

5) Any test to increase test coverage.

6) if you change a setting then you need to make sure the value is preserved across the change. Look in settings.py there is an example of a change from songs to advanced.

All this said this will not be going in so please do not resubmit, Please can you help and find some bugs and features to add and the tak this project forward. Your effort is appreciated but chaning things for change sake is not going to help.

Unmerged revisions

2567. By Azaziah on 2015-11-11

At the moment PowerPoint is shown as Powerpoint in OLP ui.
This branch renames Powerpoint to PowerPoint in all files.
Total occurances replaced: 126
The all small powerpoint is left un-touched.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
2--- openlp/plugins/presentations/lib/mediaitem.py 2015-06-02 21:13:15 +0000
3+++ openlp/plugins/presentations/lib/mediaitem.py 2015-11-11 12:38:06 +0000
4@@ -42,7 +42,7 @@
5 class PresentationMediaItem(MediaManagerItem):
6 """
7 This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and
8- Powerpoint
9+ PowerPoint
10 """
11 log.info('Presentations Media Item loaded')
12
13
14=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
15--- openlp/plugins/presentations/lib/powerpointcontroller.py 2015-06-16 07:47:42 +0000
16+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2015-11-11 12:38:06 +0000
17@@ -48,19 +48,19 @@
18 log = logging.getLogger(__name__)
19
20
21-class PowerpointController(PresentationController):
22+class PowerPointController(PresentationController):
23 """
24 Class to control interactions with PowerPoint Presentations. It creates the runtime Environment , Loads the and
25 Closes the Presentation. As well as triggering the correct activities based on the users input.
26 """
27- log.info('PowerpointController loaded')
28+ log.info('PowerPointController loaded')
29
30 def __init__(self, plugin):
31 """
32 Initialise the class
33 """
34 log.debug('Initialising')
35- super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument)
36+ super(PowerPointController, self).__init__(plugin, 'PowerPoint', PowerPointDocument)
37 self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
38 self.process = None
39
40@@ -116,7 +116,7 @@
41 self.process = None
42
43
44-class PowerpointDocument(PresentationDocument):
45+class PowerPointDocument(PresentationDocument):
46 """
47 Class which holds information and controls a single presentation.
48 """
49@@ -128,8 +128,8 @@
50 :param controller:
51 :param presentation:
52 """
53- log.debug('Init Presentation Powerpoint')
54- super(PowerpointDocument, self).__init__(controller, presentation)
55+ log.debug('Init Presentation PowerPoint')
56+ super(PowerPointDocument, self).__init__(controller, presentation)
57 self.presentation = None
58 self.index_map = {}
59 self.slide_count = 0
60@@ -155,7 +155,7 @@
61 Registry().get('main_window').activateWindow()
62 return True
63 except (AttributeError, pywintypes.com_error) as e:
64- log.exception('Exception caught while loading Powerpoint presentation')
65+ log.exception('Exception caught while loading PowerPoint presentation')
66 log.exception(e)
67 trace_error_handler(log)
68 return False
69@@ -511,10 +511,10 @@
70 try:
71 self.presentation.SlideShowWindow.View.Exit()
72 except (AttributeError, pywintypes.com_error) as e:
73- log.exception('Failed to exit Powerpoint presentation after error')
74+ log.exception('Failed to exit PowerPoint presentation after error')
75 log.exception(e)
76- critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument',
77- 'An error occurred in the Powerpoint integration '
78+ critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerPointDocument',
79+ 'An error occurred in the PowerPoint integration '
80 'and the presentation will be stopped. '
81 'Restart the presentation if you wish to present it.'))
82
83
84=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
85--- openlp/plugins/presentations/lib/pptviewcontroller.py 2015-01-18 13:39:21 +0000
86+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2015-11-11 12:38:06 +0000
87@@ -55,7 +55,7 @@
88 """
89 log.debug('Initialising')
90 self.process = None
91- super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument)
92+ super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument)
93 self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
94
95 def check_available(self):
96
97=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
98--- openlp/plugins/presentations/lib/presentationcontroller.py 2015-03-09 21:39:31 +0000
99+++ openlp/plugins/presentations/lib/presentationcontroller.py 2015-11-11 12:38:06 +0000
100@@ -352,7 +352,7 @@
101 ``__init__``, ``check_available`` and ``presentation_deleted`` should always be implemented.
102
103 See :class:`~openlp.plugins.presentations.lib.impresscontroller.ImpressController`,
104- :class:`~openlp.plugins.presentations.lib.powerpointcontroller.PowerpointController` or
105+ :class:`~openlp.plugins.presentations.lib.powerpointcontroller.PowerPointController` or
106 :class:`~openlp.plugins.presentations.lib.pptviewcontroller.PptviewController`
107 for examples.
108
109
110=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
111--- openlp/plugins/presentations/lib/presentationtab.py 2015-06-02 21:16:10 +0000
112+++ openlp/plugins/presentations/lib/presentationtab.py 2015-11-11 12:38:06 +0000
113@@ -148,10 +148,10 @@
114 controller = self.controllers[key]
115 checkbox = self.presenter_check_boxes[controller.name]
116 checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name))
117- if controller.name == 'Powerpoint' and controller.is_available():
118+ if controller.name == 'PowerPoint' and controller.is_available():
119 powerpoint_available = True
120 self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app'))
121- # Load Powerpoint settings
122+ # Load PowerPoint settings
123 self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section +
124 '/powerpoint slide click advance'))
125 self.ppt_slide_click_check_box.setEnabled(powerpoint_available)
126
127=== modified file 'openlp/plugins/presentations/presentationplugin.py'
128--- openlp/plugins/presentations/presentationplugin.py 2015-10-16 16:49:58 +0000
129+++ openlp/plugins/presentations/presentationplugin.py 2015-11-11 12:38:06 +0000
130@@ -40,8 +40,8 @@
131 'presentations/enable_pdf_program': QtCore.Qt.Unchecked,
132 'presentations/pdf_program': '',
133 'presentations/Impress': QtCore.Qt.Checked,
134- 'presentations/Powerpoint': QtCore.Qt.Checked,
135- 'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
136+ 'presentations/PowerPoint': QtCore.Qt.Checked,
137+ 'presentations/PowerPoint Viewer': QtCore.Qt.Checked,
138 'presentations/Pdf': QtCore.Qt.Checked,
139 'presentations/presentations files': [],
140 'presentations/thumbnail_scheme': '',
141
142=== modified file 'openlp/plugins/songs/lib/importers/openoffice.py'
143--- openlp/plugins/songs/lib/importers/openoffice.py 2015-08-28 10:22:06 +0000
144+++ openlp/plugins/songs/lib/importers/openoffice.py 2015-11-11 12:38:06 +0000
145@@ -49,7 +49,7 @@
146
147 class OpenOfficeImport(SongImport):
148 """
149- Import songs from Impress/Powerpoint docs using Impress
150+ Import songs from Impress/PowerPoint docs using Impress
151 """
152 def __init__(self, manager, **kwargs):
153 """
154
155=== modified file 'resources/i18n/af.ts'
156--- resources/i18n/af.ts 2015-10-15 16:55:00 +0000
157+++ resources/i18n/af.ts 2015-11-11 12:38:06 +0000
158@@ -7604,10 +7604,10 @@
159 </message>
160 </context>
161 <context>
162- <name>PresentationPlugin.PowerpointDocument</name>
163+ <name>PresentationPlugin.PowerPointDocument</name>
164 <message>
165 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
166- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
167+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
168 <translation type="unfinished"/>
169 </message>
170 </context>
171
172=== modified file 'resources/i18n/bg.ts'
173--- resources/i18n/bg.ts 2015-10-15 16:55:00 +0000
174+++ resources/i18n/bg.ts 2015-11-11 12:38:06 +0000
175@@ -7565,10 +7565,10 @@
176 </message>
177 </context>
178 <context>
179- <name>PresentationPlugin.PowerpointDocument</name>
180+ <name>PresentationPlugin.PowerPointDocument</name>
181 <message>
182 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
183- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
184+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
185 <translation type="unfinished"/>
186 </message>
187 </context>
188
189=== modified file 'resources/i18n/cs.ts'
190--- resources/i18n/cs.ts 2015-10-15 16:55:00 +0000
191+++ resources/i18n/cs.ts 2015-11-11 12:38:06 +0000
192@@ -7708,11 +7708,11 @@
193 </message>
194 </context>
195 <context>
196- <name>PresentationPlugin.PowerpointDocument</name>
197+ <name>PresentationPlugin.PowerPointDocument</name>
198 <message>
199 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
200- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
201- <translation>Vznikla chyba se začlenění Powerpoint prezentace a prezentace bude zastavena. Pokud si přejete prezentaci zobrazit, spusťte ji znovu.</translation>
202+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
203+ <translation>Vznikla chyba se začlenění PowerPoint prezentace a prezentace bude zastavena. Pokud si přejete prezentaci zobrazit, spusťte ji znovu.</translation>
204 </message>
205 </context>
206 <context>
207
208=== modified file 'resources/i18n/da.ts'
209--- resources/i18n/da.ts 2015-10-15 16:55:00 +0000
210+++ resources/i18n/da.ts 2015-11-11 12:38:06 +0000
211@@ -7712,11 +7712,11 @@
212 </message>
213 </context>
214 <context>
215- <name>PresentationPlugin.PowerpointDocument</name>
216+ <name>PresentationPlugin.PowerPointDocument</name>
217 <message>
218 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
219- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
220- <translation>Der opstod en fejl i Powerpoint-integrationen og presentationen vil blive stoppet. Start presentationen igen hvis du vil vise den.</translation>
221+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
222+ <translation>Der opstod en fejl i PowerPoint-integrationen og presentationen vil blive stoppet. Start presentationen igen hvis du vil vise den.</translation>
223 </message>
224 </context>
225 <context>
226
227=== modified file 'resources/i18n/de.ts'
228--- resources/i18n/de.ts 2015-10-15 16:55:00 +0000
229+++ resources/i18n/de.ts 2015-11-11 12:38:06 +0000
230@@ -7680,11 +7680,11 @@
231 </message>
232 </context>
233 <context>
234- <name>PresentationPlugin.PowerpointDocument</name>
235+ <name>PresentationPlugin.PowerPointDocument</name>
236 <message>
237 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
238- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
239- <translation>Ein Fehler in der Powerpoint Integration ist aufgetreten und die Präsentation wird nun gestoppt. Um die Präsentation zu zeigen, muss diese neu gestartet werden.</translation>
240+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
241+ <translation>Ein Fehler in der PowerPoint Integration ist aufgetreten und die Präsentation wird nun gestoppt. Um die Präsentation zu zeigen, muss diese neu gestartet werden.</translation>
242 </message>
243 </context>
244 <context>
245
246=== modified file 'resources/i18n/el.ts'
247--- resources/i18n/el.ts 2015-10-15 16:55:00 +0000
248+++ resources/i18n/el.ts 2015-11-11 12:38:06 +0000
249@@ -7607,10 +7607,10 @@
250 </message>
251 </context>
252 <context>
253- <name>PresentationPlugin.PowerpointDocument</name>
254+ <name>PresentationPlugin.PowerPointDocument</name>
255 <message>
256 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
257- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
258+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
259 <translation type="unfinished"/>
260 </message>
261 </context>
262
263=== modified file 'resources/i18n/en.ts'
264--- resources/i18n/en.ts 2015-10-15 17:34:42 +0000
265+++ resources/i18n/en.ts 2015-11-11 12:38:06 +0000
266@@ -7710,11 +7710,11 @@
267 </message>
268 </context>
269 <context>
270- <name>PresentationPlugin.PowerpointDocument</name>
271+ <name>PresentationPlugin.PowerPointDocument</name>
272 <message>
273 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
274- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
275- <translation>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
276+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
277+ <translation>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
278 </message>
279 </context>
280 <context>
281
282=== modified file 'resources/i18n/en_GB.ts'
283--- resources/i18n/en_GB.ts 2015-10-15 16:55:00 +0000
284+++ resources/i18n/en_GB.ts 2015-11-11 12:38:06 +0000
285@@ -7709,11 +7709,11 @@
286 </message>
287 </context>
288 <context>
289- <name>PresentationPlugin.PowerpointDocument</name>
290+ <name>PresentationPlugin.PowerPointDocument</name>
291 <message>
292 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
293- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
294- <translation>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
295+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
296+ <translation>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
297 </message>
298 </context>
299 <context>
300
301=== modified file 'resources/i18n/en_ZA.ts'
302--- resources/i18n/en_ZA.ts 2015-10-15 16:55:00 +0000
303+++ resources/i18n/en_ZA.ts 2015-11-11 12:38:06 +0000
304@@ -7710,11 +7710,11 @@
305 </message>
306 </context>
307 <context>
308- <name>PresentationPlugin.PowerpointDocument</name>
309+ <name>PresentationPlugin.PowerPointDocument</name>
310 <message>
311 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
312- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
313- <translation>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
314+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
315+ <translation>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</translation>
316 </message>
317 </context>
318 <context>
319
320=== modified file 'resources/i18n/es.ts'
321--- resources/i18n/es.ts 2015-10-15 16:55:00 +0000
322+++ resources/i18n/es.ts 2015-11-11 12:38:06 +0000
323@@ -7712,10 +7712,10 @@
324 </message>
325 </context>
326 <context>
327- <name>PresentationPlugin.PowerpointDocument</name>
328+ <name>PresentationPlugin.PowerPointDocument</name>
329 <message>
330 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
331- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
332+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
333 <translation>Se produjo un error con la integración de PowerPoint y se cerrará la presentación. Reinicie la presentación para mostrarla de nuevo.</translation>
334 </message>
335 </context>
336
337=== modified file 'resources/i18n/et.ts'
338--- resources/i18n/et.ts 2015-10-15 16:55:00 +0000
339+++ resources/i18n/et.ts 2015-11-11 12:38:06 +0000
340@@ -7709,11 +7709,11 @@
341 </message>
342 </context>
343 <context>
344- <name>PresentationPlugin.PowerpointDocument</name>
345+ <name>PresentationPlugin.PowerPointDocument</name>
346 <message>
347 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
348- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
349- <translation>Powerpointi integratsioonil esines viga ja esitlus jääb pooleli. Alusta esitlust uuesti, kui sa siiski tahad seda näidata.</translation>
350+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
351+ <translation>PowerPointi integratsioonil esines viga ja esitlus jääb pooleli. Alusta esitlust uuesti, kui sa siiski tahad seda näidata.</translation>
352 </message>
353 </context>
354 <context>
355
356=== modified file 'resources/i18n/fi.ts'
357--- resources/i18n/fi.ts 2015-10-15 16:55:00 +0000
358+++ resources/i18n/fi.ts 2015-11-11 12:38:06 +0000
359@@ -7849,11 +7849,11 @@
360 </message>
361 </context>
362 <context>
363- <name>PresentationPlugin.PowerpointDocument</name>
364+ <name>PresentationPlugin.PowerPointDocument</name>
365 <message>
366 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
367- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
368- <translation>Tapahtui virhe Powerpoint integraatiossa ja esitys keskeytettiin. Käynnistä esitys uudellee, jos tahdot esittää sen.</translation>
369+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
370+ <translation>Tapahtui virhe PowerPoint integraatiossa ja esitys keskeytettiin. Käynnistä esitys uudellee, jos tahdot esittää sen.</translation>
371 </message>
372 </context>
373 <context>
374
375=== modified file 'resources/i18n/fr.ts'
376--- resources/i18n/fr.ts 2015-10-15 16:55:00 +0000
377+++ resources/i18n/fr.ts 2015-11-11 12:38:06 +0000
378@@ -7628,10 +7628,10 @@
379 </message>
380 </context>
381 <context>
382- <name>PresentationPlugin.PowerpointDocument</name>
383+ <name>PresentationPlugin.PowerPointDocument</name>
384 <message>
385 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
386- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
387+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
388 <translation type="unfinished"/>
389 </message>
390 </context>
391
392=== modified file 'resources/i18n/hu.ts'
393--- resources/i18n/hu.ts 2015-10-15 16:55:00 +0000
394+++ resources/i18n/hu.ts 2015-11-11 12:38:06 +0000
395@@ -7711,11 +7711,11 @@
396 </message>
397 </context>
398 <context>
399- <name>PresentationPlugin.PowerpointDocument</name>
400+ <name>PresentationPlugin.PowerPointDocument</name>
401 <message>
402 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
403- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
404- <translation>Hiba történt a Powerpoint integrációban, ezért a prezentáció leáll. Újraindítással lehet újra bemutatni a prezentációt.</translation>
405+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
406+ <translation>Hiba történt a PowerPoint integrációban, ezért a prezentáció leáll. Újraindítással lehet újra bemutatni a prezentációt.</translation>
407 </message>
408 </context>
409 <context>
410
411=== modified file 'resources/i18n/id.ts'
412--- resources/i18n/id.ts 2015-10-15 16:55:00 +0000
413+++ resources/i18n/id.ts 2015-11-11 12:38:06 +0000
414@@ -7711,10 +7711,10 @@
415 </message>
416 </context>
417 <context>
418- <name>PresentationPlugin.PowerpointDocument</name>
419+ <name>PresentationPlugin.PowerPointDocument</name>
420 <message>
421 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
422- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
423+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
424 <translation>Terjadi kesalahan dalam integrasi PowerPoint dan presentasi akan dihentikan. Silakan mulai-ulang presentasi jika Anda ingin menampilkannya.</translation>
425 </message>
426 </context>
427
428=== modified file 'resources/i18n/ja.ts'
429--- resources/i18n/ja.ts 2015-10-15 16:55:00 +0000
430+++ resources/i18n/ja.ts 2015-11-11 12:38:06 +0000
431@@ -7705,10 +7705,10 @@
432 </message>
433 </context>
434 <context>
435- <name>PresentationPlugin.PowerpointDocument</name>
436+ <name>PresentationPlugin.PowerPointDocument</name>
437 <message>
438 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
439- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
440+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
441 <translation>PowerPointとの通信にエラーが発生し、プレゼンテーションが終了しました。表示するには、プレゼンテーションをもう一度開始してください。</translation>
442 </message>
443 </context>
444
445=== modified file 'resources/i18n/ko.ts'
446--- resources/i18n/ko.ts 2015-10-15 16:55:00 +0000
447+++ resources/i18n/ko.ts 2015-11-11 12:38:06 +0000
448@@ -7578,10 +7578,10 @@
449 </message>
450 </context>
451 <context>
452- <name>PresentationPlugin.PowerpointDocument</name>
453+ <name>PresentationPlugin.PowerPointDocument</name>
454 <message>
455 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
456- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
457+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
458 <translation type="unfinished"/>
459 </message>
460 </context>
461
462=== modified file 'resources/i18n/lt.ts'
463--- resources/i18n/lt.ts 2015-10-15 16:55:00 +0000
464+++ resources/i18n/lt.ts 2015-11-11 12:38:06 +0000
465@@ -7710,11 +7710,11 @@
466 </message>
467 </context>
468 <context>
469- <name>PresentationPlugin.PowerpointDocument</name>
470+ <name>PresentationPlugin.PowerPointDocument</name>
471 <message>
472 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
473- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
474- <translation>Powerpoint integravime įvyko klaida ir pateiktis bus sustabdyta. Paleiskite pateiktį iš naujo, jei norite ją pristatyti.</translation>
475+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
476+ <translation>PowerPoint integravime įvyko klaida ir pateiktis bus sustabdyta. Paleiskite pateiktį iš naujo, jei norite ją pristatyti.</translation>
477 </message>
478 </context>
479 <context>
480
481=== modified file 'resources/i18n/nb.ts'
482--- resources/i18n/nb.ts 2015-10-15 16:55:00 +0000
483+++ resources/i18n/nb.ts 2015-11-11 12:38:06 +0000
484@@ -7709,11 +7709,11 @@
485 </message>
486 </context>
487 <context>
488- <name>PresentationPlugin.PowerpointDocument</name>
489+ <name>PresentationPlugin.PowerPointDocument</name>
490 <message>
491 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
492- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
493- <translation>Det oppstod en feil i Powerpointintegrasjonen og presentasjonen vil bli stoppet. Start presentasjonen på nytt hvis du ønsker å fortsette.</translation>
494+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
495+ <translation>Det oppstod en feil i PowerPointintegrasjonen og presentasjonen vil bli stoppet. Start presentasjonen på nytt hvis du ønsker å fortsette.</translation>
496 </message>
497 </context>
498 <context>
499
500=== modified file 'resources/i18n/nl.ts'
501--- resources/i18n/nl.ts 2015-10-15 17:34:42 +0000
502+++ resources/i18n/nl.ts 2015-11-11 12:38:06 +0000
503@@ -2419,7 +2419,7 @@
504 OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</source>
505 <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Source Lyrics Projection
506
507-OpenLP is gratis presentatiesoftware voor kerken. Het kan gebruikt worden voor het projecteren van liedteksten, bijbelverzen, video&apos;s, afbeeldingen en zelfs bestaande presentaties uit Powerpoint.
508+OpenLP is gratis presentatiesoftware voor kerken. Het kan gebruikt worden voor het projecteren van liedteksten, bijbelverzen, video&apos;s, afbeeldingen en zelfs bestaande presentaties uit PowerPoint.
509
510 Lees meer over OpenLP: http://openlp.org/
511
512@@ -7712,11 +7712,11 @@
513 </message>
514 </context>
515 <context>
516- <name>PresentationPlugin.PowerpointDocument</name>
517+ <name>PresentationPlugin.PowerPointDocument</name>
518 <message>
519 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
520- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
521- <translation>Er is een fout opgetreden in de Powerpoint-integratie waardoor de presentatie zal worden gestopt. U kunt de presentatie herstarten om verder te gaan met presenteren.</translation>
522+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
523+ <translation>Er is een fout opgetreden in de PowerPoint-integratie waardoor de presentatie zal worden gestopt. U kunt de presentatie herstarten om verder te gaan met presenteren.</translation>
524 </message>
525 </context>
526 <context>
527
528=== modified file 'resources/i18n/pl.ts'
529--- resources/i18n/pl.ts 2015-10-15 16:55:00 +0000
530+++ resources/i18n/pl.ts 2015-11-11 12:38:06 +0000
531@@ -7709,11 +7709,11 @@
532 </message>
533 </context>
534 <context>
535- <name>PresentationPlugin.PowerpointDocument</name>
536+ <name>PresentationPlugin.PowerPointDocument</name>
537 <message>
538 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
539- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
540- <translation>Wystąpił błąd we współpracy z Powerpointem i prezentacja zostanie zatrzymana. Uruchom ją ponownie, jeśli chcesz ją zaprezentować.</translation>
541+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
542+ <translation>Wystąpił błąd we współpracy z PowerPointem i prezentacja zostanie zatrzymana. Uruchom ją ponownie, jeśli chcesz ją zaprezentować.</translation>
543 </message>
544 </context>
545 <context>
546
547=== modified file 'resources/i18n/pt_BR.ts'
548--- resources/i18n/pt_BR.ts 2015-10-15 16:55:00 +0000
549+++ resources/i18n/pt_BR.ts 2015-11-11 12:38:06 +0000
550@@ -7612,10 +7612,10 @@
551 </message>
552 </context>
553 <context>
554- <name>PresentationPlugin.PowerpointDocument</name>
555+ <name>PresentationPlugin.PowerPointDocument</name>
556 <message>
557 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
558- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
559+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
560 <translation type="unfinished"/>
561 </message>
562 </context>
563
564=== modified file 'resources/i18n/ru.ts'
565--- resources/i18n/ru.ts 2015-10-15 16:55:00 +0000
566+++ resources/i18n/ru.ts 2015-11-11 12:38:06 +0000
567@@ -7661,10 +7661,10 @@
568 </message>
569 </context>
570 <context>
571- <name>PresentationPlugin.PowerpointDocument</name>
572+ <name>PresentationPlugin.PowerPointDocument</name>
573 <message>
574 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
575- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
576+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
577 <translation type="unfinished"/>
578 </message>
579 </context>
580
581=== modified file 'resources/i18n/sk.ts'
582--- resources/i18n/sk.ts 2015-10-15 16:55:00 +0000
583+++ resources/i18n/sk.ts 2015-11-11 12:38:06 +0000
584@@ -7691,11 +7691,11 @@
585 </message>
586 </context>
587 <context>
588- <name>PresentationPlugin.PowerpointDocument</name>
589+ <name>PresentationPlugin.PowerPointDocument</name>
590 <message>
591 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
592- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
593- <translation>Vznikla chyba pri integrácií Powerpointu a prezentácia bude ukončená. Ak chete zobraziť prezentáciu, spustite ju znovu.</translation>
594+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
595+ <translation>Vznikla chyba pri integrácií PowerPointu a prezentácia bude ukončená. Ak chete zobraziť prezentáciu, spustite ju znovu.</translation>
596 </message>
597 </context>
598 <context>
599
600=== modified file 'resources/i18n/sv.ts'
601--- resources/i18n/sv.ts 2015-10-15 16:55:00 +0000
602+++ resources/i18n/sv.ts 2015-11-11 12:38:06 +0000
603@@ -7710,11 +7710,11 @@
604 </message>
605 </context>
606 <context>
607- <name>PresentationPlugin.PowerpointDocument</name>
608+ <name>PresentationPlugin.PowerPointDocument</name>
609 <message>
610 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
611- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
612- <translation>Ett fel inträffade i Powerpoint-integrationen och presentationen kommer att avbrytas. Starta om presentationen om du vill visa den.</translation>
613+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
614+ <translation>Ett fel inträffade i PowerPoint-integrationen och presentationen kommer att avbrytas. Starta om presentationen om du vill visa den.</translation>
615 </message>
616 </context>
617 <context>
618
619=== modified file 'resources/i18n/ta_LK.ts'
620--- resources/i18n/ta_LK.ts 2015-10-15 16:55:00 +0000
621+++ resources/i18n/ta_LK.ts 2015-11-11 12:38:06 +0000
622@@ -7606,10 +7606,10 @@
623 </message>
624 </context>
625 <context>
626- <name>PresentationPlugin.PowerpointDocument</name>
627+ <name>PresentationPlugin.PowerPointDocument</name>
628 <message>
629 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
630- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
631+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
632 <translation type="unfinished"/>
633 </message>
634 </context>
635
636=== modified file 'resources/i18n/th_TH.ts'
637--- resources/i18n/th_TH.ts 2015-10-15 16:55:00 +0000
638+++ resources/i18n/th_TH.ts 2015-11-11 12:38:06 +0000
639@@ -7606,10 +7606,10 @@
640 </message>
641 </context>
642 <context>
643- <name>PresentationPlugin.PowerpointDocument</name>
644+ <name>PresentationPlugin.PowerPointDocument</name>
645 <message>
646 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
647- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
648+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
649 <translation type="unfinished"/>
650 </message>
651 </context>
652
653=== modified file 'resources/i18n/zh_CN.ts'
654--- resources/i18n/zh_CN.ts 2015-10-15 16:55:00 +0000
655+++ resources/i18n/zh_CN.ts 2015-11-11 12:38:06 +0000
656@@ -7603,10 +7603,10 @@
657 </message>
658 </context>
659 <context>
660- <name>PresentationPlugin.PowerpointDocument</name>
661+ <name>PresentationPlugin.PowerPointDocument</name>
662 <message>
663 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
664- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
665+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
666 <translation type="unfinished"/>
667 </message>
668 </context>
669
670=== modified file 'resources/i18n/zh_TW.ts'
671--- resources/i18n/zh_TW.ts 2015-10-15 16:55:00 +0000
672+++ resources/i18n/zh_TW.ts 2015-11-11 12:38:06 +0000
673@@ -7706,11 +7706,11 @@
674 </message>
675 </context>
676 <context>
677- <name>PresentationPlugin.PowerpointDocument</name>
678+ <name>PresentationPlugin.PowerPointDocument</name>
679 <message>
680 <location filename="openlp/plugins/presentations/lib/powerpointcontroller.py" line="517"/>
681- <source>An error occurred in the Powerpoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
682- <translation>整合Powerpoint時發生了錯誤,簡報即將結束。若您希望顯示,請重新啟動簡報。</translation>
683+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
684+ <translation>整合PowerPoint時發生了錯誤,簡報即將結束。若您希望顯示,請重新啟動簡報。</translation>
685 </message>
686 </context>
687 <context>
688
689=== modified file 'tests/functional/openlp_plugins/presentations/test_mediaitem.py'
690--- tests/functional/openlp_plugins/presentations/test_mediaitem.py 2015-03-18 22:04:30 +0000
691+++ tests/functional/openlp_plugins/presentations/test_mediaitem.py 2015-11-11 12:38:06 +0000
692@@ -68,8 +68,8 @@
693 # Mock the controllers.
694 self.media_item.controllers = {
695 'Impress': impress_controller,
696- 'Powerpoint': presentation_controller,
697- 'Powerpoint Viewer': presentation_viewer_controller,
698+ 'PowerPoint': presentation_controller,
699+ 'PowerPoint Viewer': presentation_viewer_controller,
700 'Pdf': pdf_controller
701 }
702
703
704=== modified file 'tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py'
705--- tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2015-05-05 13:20:24 +0000
706+++ tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2015-11-11 12:38:06 +0000
707@@ -31,7 +31,7 @@
708 from tests.helpers.testmixin import TestMixin
709 from tests.utils.constants import TEST_RESOURCES_PATH
710
711-from openlp.plugins.presentations.lib.powerpointcontroller import PowerpointController, PowerpointDocument,\
712+from openlp.plugins.presentations.lib.powerpointcontroller import PowerPointController, PowerPointDocument,\
713 _get_text_from_shapes
714 from openlp.core.common import is_win, Settings
715
716@@ -43,9 +43,9 @@
717 }
718
719
720-class TestPowerpointController(TestCase, TestMixin):
721+class TestPowerPointController(TestCase, TestMixin):
722 """
723- Test the PowerpointController Class
724+ Test the PowerPointController Class
725 """
726
727 def setUp(self):
728@@ -67,22 +67,22 @@
729
730 def constructor_test(self):
731 """
732- Test the Constructor from the PowerpointController
733+ Test the Constructor from the PowerPointController
734 """
735 # GIVEN: No presentation controller
736 controller = None
737
738 # WHEN: The presentation controller object is created
739- controller = PowerpointController(plugin=self.mock_plugin)
740+ controller = PowerPointController(plugin=self.mock_plugin)
741
742 # THEN: The name of the presentation controller should be correct
743- self.assertEqual('Powerpoint', controller.name,
744+ self.assertEqual('PowerPoint', controller.name,
745 'The name of the presentation controller should be correct')
746
747
748-class TestPowerpointDocument(TestCase, TestMixin):
749+class TestPowerPointDocument(TestCase, TestMixin):
750 """
751- Test the PowerpointDocument Class
752+ Test the PowerPointDocument Class
753 """
754
755 def setUp(self):
756@@ -95,7 +95,7 @@
757 self.temp_folder = mkdtemp()
758 self.mock_plugin.settings_section = self.temp_folder
759 self.powerpoint_document_stop_presentation_patcher = patch(
760- 'openlp.plugins.presentations.lib.powerpointcontroller.PowerpointDocument.stop_presentation')
761+ 'openlp.plugins.presentations.lib.powerpointcontroller.PowerPointDocument.stop_presentation')
762 self.presentation_document_get_temp_folder_patcher = patch(
763 'openlp.plugins.presentations.lib.powerpointcontroller.PresentationDocument.get_temp_folder')
764 self.presentation_document_setup_patcher = patch(
765@@ -107,7 +107,7 @@
766 self.mock_presentation = MagicMock()
767 self.mock_presentation_document_get_temp_folder.return_value = 'temp folder'
768 self.file_name = os.path.join(TEST_RESOURCES_PATH, 'presentations', 'test.pptx')
769- self.real_controller = PowerpointController(self.mock_plugin)
770+ self.real_controller = PowerPointController(self.mock_plugin)
771 Settings().extend_default_settings(__default_settings__)
772
773 def tearDown(self):
774@@ -122,13 +122,13 @@
775
776 def show_error_msg_test(self):
777 """
778- Test the PowerpointDocument.show_error_msg() method gets called on com exception
779+ Test the PowerPointDocument.show_error_msg() method gets called on com exception
780 """
781 if is_win():
782- # GIVEN: A PowerpointDocument with mocked controller and presentation
783+ # GIVEN: A PowerPointDocument with mocked controller and presentation
784 with patch('openlp.plugins.presentations.lib.powerpointcontroller.critical_error_message_box') as \
785 mocked_critical_error_message_box:
786- instance = PowerpointDocument(self.mock_controller, self.mock_presentation)
787+ instance = PowerPointDocument(self.mock_controller, self.mock_presentation)
788 instance.presentation = MagicMock()
789 instance.presentation.SlideShowWindow.View.GotoSlide = MagicMock(side_effect=pywintypes.com_error('1'))
790 instance.index_map[42] = 42
791@@ -137,7 +137,7 @@
792 instance.goto_slide(42)
793
794 # THEN: mocked_critical_error_message_box should have been called
795- mocked_critical_error_message_box.assert_called_with('Error', 'An error occurred in the Powerpoint '
796+ mocked_critical_error_message_box.assert_called_with('Error', 'An error occurred in the PowerPoint '
797 'integration and the presentation will be stopped.'
798 ' Restart the presentation if you wish to '
799 'present it.')
800@@ -148,8 +148,8 @@
801 Test loading a document in PowerPoint
802 """
803 if is_win() and self.real_controller.check_available():
804- # GIVEN: A PowerpointDocument and a presentation
805- doc = PowerpointDocument(self.real_controller, self.file_name)
806+ # GIVEN: A PowerPointDocument and a presentation
807+ doc = PowerPointDocument(self.real_controller, self.file_name)
808
809 # WHEN: loading the filename
810 doc.load_presentation()
811@@ -158,19 +158,19 @@
812 # THEN: result should be true
813 self.assertEqual(result, True, 'The result should be True')
814 else:
815- self.skipTest('Powerpoint not available, skipping test.')
816+ self.skipTest('PowerPoint not available, skipping test.')
817
818 def create_titles_and_notes_test(self):
819 """
820 Test creating the titles from PowerPoint
821 """
822 # GIVEN: mocked save_titles_and_notes, _get_text_from_shapes and two mocked slides
823- self.doc = PowerpointDocument(self.mock_controller, self.file_name)
824+ self.doc = PowerPointDocument(self.mock_controller, self.file_name)
825 self.doc.get_slide_count = MagicMock()
826 self.doc.get_slide_count.return_value = 2
827 self.doc.index_map = {1: 1, 2: 2}
828 self.doc.save_titles_and_notes = MagicMock()
829- self.doc._PowerpointDocument__get_text_from_shapes = MagicMock()
830+ self.doc._PowerPointDocument__get_text_from_shapes = MagicMock()
831 slide = MagicMock()
832 slide.Shapes.Title.TextFrame.TextRange.Text = 'SlideText'
833 pres = MagicMock()
834@@ -188,9 +188,9 @@
835 Test creating the titles from PowerPoint when it returns no slides
836 """
837 # GIVEN: mocked save_titles_and_notes, _get_text_from_shapes and two mocked slides
838- doc = PowerpointDocument(self.mock_controller, self.file_name)
839+ doc = PowerPointDocument(self.mock_controller, self.file_name)
840 doc.save_titles_and_notes = MagicMock()
841- doc._PowerpointDocument__get_text_from_shapes = MagicMock()
842+ doc._PowerPointDocument__get_text_from_shapes = MagicMock()
843 pres = MagicMock()
844 pres.Slides = []
845 doc.presentation = pres
846@@ -236,7 +236,7 @@
847 Test that goto_slide goes to next effect if the slide is already displayed
848 """
849 # GIVEN: A Document with mocked controller, presentation, and mocked functions get_slide_number and next_step
850- doc = PowerpointDocument(self.mock_controller, self.mock_presentation)
851+ doc = PowerPointDocument(self.mock_controller, self.mock_presentation)
852 doc.presentation = MagicMock()
853 doc.presentation.SlideShowWindow.View.GetClickIndex.return_value = 1
854 doc.presentation.SlideShowWindow.View.GetClickCount.return_value = 2
855@@ -256,7 +256,7 @@
856 Test that blank_screen works as expected
857 """
858 # GIVEN: A Document with mocked controller, presentation, and mocked function get_slide_number
859- doc = PowerpointDocument(self.mock_controller, self.mock_presentation)
860+ doc = PowerPointDocument(self.mock_controller, self.mock_presentation)
861 doc.presentation = MagicMock()
862 doc.presentation.SlideShowWindow.View.GetClickIndex.return_value = 3
863 doc.presentation.Application.Version = 14.0
864@@ -280,7 +280,7 @@
865 mocked_screen_list_ret = MagicMock()
866 mocked_screen_list_ret.screen_list = [1]
867 mocked_screen_list.return_value = mocked_screen_list_ret
868- doc = PowerpointDocument(self.mock_controller, self.mock_presentation)
869+ doc = PowerPointDocument(self.mock_controller, self.mock_presentation)
870 doc.presentation = MagicMock()
871 doc.presentation.SlideShowWindow.View.GetClickIndex.return_value = 3
872 doc.presentation.Application.Version = 14.0
873
874=== modified file 'tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py'
875--- tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2015-01-18 13:39:21 +0000
876+++ tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2015-11-11 12:38:06 +0000
877@@ -76,7 +76,7 @@
878 controller = PptviewController(plugin=self.mock_plugin)
879
880 # THEN: The name of the presentation controller should be correct
881- self.assertEqual('Powerpoint Viewer', controller.name,
882+ self.assertEqual('PowerPoint Viewer', controller.name,
883 'The name of the presentation controller should be correct')
884
885 def check_available_test(self):
886@@ -204,7 +204,7 @@
887
888 def create_titles_and_notes_test(self):
889 """
890- Test PowerpointController.create_titles_and_notes
891+ Test PowerPointController.create_titles_and_notes
892 """
893 # GIVEN: mocked PresentationController.save_titles_and_notes and a pptx file
894 doc = PptviewDocument(self.mock_controller, self.mock_presentation)
895@@ -221,7 +221,7 @@
896
897 def create_titles_and_notes_nonexistent_file_test(self):
898 """
899- Test PowerpointController.create_titles_and_notes with nonexistent file
900+ Test PowerPointController.create_titles_and_notes with nonexistent file
901 """
902 # GIVEN: mocked PresentationController.save_titles_and_notes and an nonexistent file
903 with patch('builtins.open') as mocked_open, \
904@@ -244,7 +244,7 @@
905
906 def create_titles_and_notes_invalid_file_test(self):
907 """
908- Test PowerpointController.create_titles_and_notes with invalid file
909+ Test PowerPointController.create_titles_and_notes with invalid file
910 """
911 # GIVEN: mocked PresentationController.save_titles_and_notes and an invalid file
912 with patch('builtins.open') as mocked_open, \