Merge lp:~marmyshev/openlp/presentation into lp:openlp

[Dmitriy Marmyshev]

Add support to load presentations with PowerPoint and Keynote on Mac OS X.

[Andreas Preikschat (googol-deactivatedaccount)]

Please don't commit uncommented things. Please remove lines 10+11, 86, 112 and more.

112 + #except pywintypes.com_error:
113 + except:

Don't commit the uncommented line. You should catch the generic exception (I don't know why you commented except pywintypes.com_error out). Also you should log that you cought an exception.

Line 123: Should be openlp_settings = Settings(u'openlp.org', u'OpenLP')
We use u'' for strings. And you missed the space after the comma.

Line 127: You have two spaces there (should be just one)

Line 128 (and some more): Don't use <>, rather use != for inequality.

And please add some more comments. Regards

PS: Unable to test the code here, as I don't have a MAC

review: Needs Fixing

[Tim Bentley (trb143)]

Will need to be approved by matysek_

[matysek (mzibricky)]

> Will need to be approved by matysek_

I will need to test it.

Could you please add the 'appscript' osx dependency to the following script?

./scripts/check_dependencies.py

Thanks

[matysek (mzibricky)]

I tested the branch and trying to load a presentation in openlp. MS powerpoint is started with openlp.

These are the issues I get:
- when the user quits manually powerpoint before exiting openlp - powerpoint is started again after openlp exits.
- when trying to load a ppt presentation - .ppt file is loaded into powerpoint but new presentation item is not added to openlp and I get the following exception:

cat openlp_trace.txt
 --- Exception Traceback ---
Traceback (most recent call last):
  File "/Users/martin/Documents/openlp/bug-836574/openlp/core/lib/mediamanageritem.py", line 334, in onFileClick
    self.validateAndLoad(files)
  File "/Users/martin/Documents/openlp/bug-836574/openlp/core/lib/mediamanageritem.py", line 383, in validateAndLoad
    self.loadList(full_list)
  File "/Users/martin/Documents/openlp/bug-836574/openlp/plugins/presentations/lib/mediaitem.py", line 188, in loadList
    doc.load_presentation()
  File "/Users/martin/Documents/openlp/bug-836574/openlp/plugins/presentations/lib/powerpointmaccontroller.py", line 153, in load_presentation
    self.create_thumbnails()
  File "/Users/martin/Documents/openlp/bug-836574/openlp/plugins/presentations/lib/powerpointmaccontroller.py", line 175, in create_thumbnails
    for filename in os.listdir(temp_dir):
OSError: [Errno 2] No such file or directory: '/Users/martin/Library/Application Support/openlp/Data/presentations/thumbnails/Chapter08.ppt/Chapter08.ppt'

--- System information ---
Platform: Darwin-11.4.2-x86_64-i386-64bit

--- Library Versions ---
Python: 2.7.3
Qt4: 4.8.4
Phonon: 4.6.0
PyQt4: 4.9.6
QtWebkit: 534.34
SQLAlchemy: 0.7.9
SQLAlchemy Migrate: 0.7.2
BeautifulSoup: 3.2.1
lxml: 2.3.2
Chardet: 2.0.1
PyEnchant: 1.6.5
PySQLite: -
Mako: 0.7.3
pyUNO bridge: -

[matysek (mzibricky)]

review: Needs Fixing

[Andreas Preikschat (googol-deactivatedaccount)]

Just a note: when you are ready with your changes (fixed) which were requested then resubmit your proposal (upper-left corner -> Resubmit proposal). Then the developers know that your code base is again read to be reviewed.

Keep it up :)

[matysek (mzibricky)]

Today I tested the r2118 - the temp_dir check and relaunching ppt are fixed.

There are some other issues:

- when opening a presentation the preview of the 1st slide is not generated in openlp. Last time it was created.
- What is the use case scenario when the powerpoint should be started?
  - Should it start directly with openlp when enabled and powerpoint is installed?
  - Or start it later when .ppt file is imported?
  - now it sometimes start with openlp
  - when powerpoint is started with openlp it is put above openlp window and openlp is thus hidden
- powerpoint and openlp icon is not visible in the dock bar - last time there were visible both.
- when a .ppt file is opened and I click on the preview button - powerpoint window takes focus and is put above openlp. But then in openlp i get message like

  "The presentation /Users/martin/Downloads/lecture22.ppt is incomplete, please reload."

[Dmitriy Marmyshev (marmyshev)]

Yes, matysek, the work with PPT on Mac OS is really really hard.

There are some other issues with it:
for example, if your are in slideshow mode (with presenter view) and switch
to another app - PPT hide slideshow window from second screen. or if you
send command to PPT "Next slide" or "Go to slide N" the PPT wont do this
until you activate the PPT app.
If you use "full screen" mode (without presenter view) on second screen the
PPT app change global settings of display to "Mirror displays" and after
slideshow exits the PPT app change displays back to "extention" mode.
As it seems, the behavior of PPT will be different then on Windows platform.
I also analyzed other applications (like ProPresenter, Mediashout, new
EasyWorship) they have the same issue. They solve it in two ways:
1st - convert PPT file to its own slide's format and forget about MS PPT
forever.
2nd - use MS PPT app on Mac as launched app from their app - by sending
command (as i do) to MS PPT to start slideshow with .ppt file from service
schedule. and all controlling continuing in MS PPT, after MS PPT finish
slideshow the controlling of second screen returns back to their app.

I think, the best we can do - is the 2nd way.

Almost the same is for Keynote app controller.

So, I want to change the behavior of mac-controllers and then will propose
to merge again.

On Tue, Feb 12, 2013 at 2:03 AM, matysek <email address hidden> wrote:

> Today I tested the r2118 - the temp_dir check and relaunching ppt are
> fixed.
>
> There are some other issues:
>
> - when opening a presentation the preview of the 1st slide is not
> generated in openlp. Last time it was created.
> - What is the use case scenario when the powerpoint should be started?
> - Should it start directly with openlp when enabled and powerpoint is
> installed?
> - Or start it later when .ppt file is imported?
> - now it sometimes start with openlp
> - when powerpoint is started with openlp it is put above openlp window
> and openlp is thus hidden
> - powerpoint and openlp icon is not visible in the dock bar - last time
> there were visible both.
> - when a .ppt file is opened and I click on the preview button -
> powerpoint window takes focus and is put above openlp. But then in openlp i
> get message like
>
> "The presentation /Users/martin/Downloads/lecture22.ppt is incomplete,
> please reload."
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/143389
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[Jonathan Corwin (j-corwin)]

You may have tried this, but is it possible to re-activate the PowerPoint window prior to sending the commands? There looks to be some "Activate" applescript command to do this?

[Dmitriy Marmyshev (marmyshev)]

Yes, now I use "Activate()" command for changing slides in PPT, but this
looks ugly.
This is not understandable for user's mind.

And also Keynote has the same problem as PPT - if you activate another app
during slideshow it hides slideshow window from second screen.

On Wed, Feb 13, 2013 at 2:58 PM, Jonathan Corwin <email address hidden> wrote:

> You may have tried this, but is it possible to re-activate the PowerPoint
> window prior to sending the commands? There looks to be some "Activate"
> applescript command to do this?
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/143389
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[Andreas Preikschat (googol-deactivatedaccount)]

Any progress on this?

[Andreas Preikschat (googol-deactivatedaccount)]

- You have a conflict in 'openlp/plugins/presentations/lib/presentationtab.py'

This
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
should be
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
We moved from 80 characters to 120.

Please do not add commented lines (e. g. 207, 221, ...).

review: Needs Fixing

[Andreas Preikschat (googol-deactivatedaccount)]

If you need help or have any questions in regard to my comments feel free to ask. :)

[Andreas Preikschat (googol-deactivatedaccount)]

Please do not do this:
55 +from appscript import *
rather do
import appscript

59 +
60 +log = logging.getLogger(__name__)
61 +
62 +class KeynoteController(PresentationController)
Before and after the "log = " should be two blank lines

106 + if self.process and len(self.process.slideshows()) > 0:
When dealing with lists do "if not my_list" instead of "if len(my_list) > 0"

387 + text = ''
391 + text += shape.TextFrame.TextRange.Text + '\n'
If not explicit wanted do not use strings; use unicode strings: u''

review: Needs Fixing

[matysek (mzibricky)]

I'm testing it with macoffice 2011 but:
- the macoffice is not recognized by openl
- all the presentation controllers are greyed out in properties
- in the log there is a text like

2013-03-23 13:22:37,125 presentationplugin INFO Presentations Initialising
2013-03-23 13:22:37,140 openlp.plugins.presentations.lib.keynotemaccontroller DEBUG check_available
2013-03-23 13:22:37,140 openlp.plugins.presentations.lib.impresscontroller DEBUG check_available
2013-03-23 13:22:37,141 openlp.plugins.presentations.lib.powerpointmaccontroller DEBUG check_available
2013-03-23 13:22:37,141 openlp.plugins.presentations.lib.pptviewcontroller DEBUG check_available
2013-03-23 13:22:37,142 openlp.core.ui.mediadockmanager DEBUG Inserting Presentations dock
2013-03-23 13:22:37,145 openlp.plugins.presentations.lib.keynotemaccontroller DEBUG start_process
2013-03-23 13:22:37,146 presentationplugin WARNING Failed to start controller process
2013-03-23 13:22:37,146 openlp.plugins.presentations.lib.powerpointmaccontroller DEBUG start_process
2013-03-23 13:22:37,146 presentationplugin WARNING Failed to start controller process
2013-03-23 13:22:37,148 openlp.core.lib.pluginmanager INFO Initialisation Complete for presentations

review: Needs Information

[matysek (mzibricky)]

It's probably not working because with our latest style fixes you replaced
  from appscript import *
with
  import appscript

However, you should then also add prefix appscript to the objects you use from that module like

  appscript.app
  appscript.k
  appscript.CantLaunchApplicationError

463 + def check_available(self):
464 + """
465 + PowerPoint is able to run on this machine
466 + """
467 + log.debug(u'check_available')
468 + return True

Is there a better way to check availability of powerpoint than only return true?
- probably try to create process by appscript.app() and catch for error appscript.ApplicationNotFoundError

When I add .ppt file to openlp and click on the 'preview'button I get message like

  'The Presentation file.ppt is incomplete, please reload.'

review: Needs Fixing

[Dmitriy Marmyshev (marmyshev)]

I returned back the import. Probably it's temperary.
Please, try all other behaviors of controllers.

[Andreas Preikschat (googol-deactivatedaccount)]

The presentation plugin has been disabled in other places too, you have to enable it there as well.

openlp/core/ui/firsttimeform.py
openlp/core/ui/firsttimewizard.py

(Or search for "TODO Presentation plugin is not yet working on Mac OS X." in the source).

review: Needs Fixing

[Andreas Preikschat (googol-deactivatedaccount)]

168 + except appscript.CantLaunchApplicationError:
169 + pass
Please log that the app could not be launched.

285 + except appscript.CommandError:
286 + pass
Please log your error (u'Could not close the presentation')

299 + if len(windows) == 0:
302 + if len(slideshows) == 0:
Just do "if my_list"

304 + except:
305 + return False
Please add a log message. Probably you should log the whole exception, so it is available when debugging.

Lines 550-560: Is this code needed? If not, remove it. If you need it for "information purpose" then rather add it to the methods docs or add a comment.

Can you explain lines 607-613. "Could not create tmp dir"? There is a function (check_directory_exists) which can be used to check/create dirs.

608 + self.presentation.save(in_ = thumbnail_folder, as_ = appscript.k.save_as_PNG)
Should be self.presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG)
(No spaces around the "=" sign after keyword arguments.)

837 + text = u''
838 + for idx in range(len(shapes)):
839 + shape = shapes[idx + 1]
840 + if shape.has_text_frame():
841 + text += shape.text_frame.text_range.content() + '\n'
842 + return text
Better do:
return u'\n'.join([shape.text_frame.text_range.content() for shape in shapes if shape.has_text_frame()])
But please test if it works, I haven't tested it. Also your function has a '\n' at the end (mine does not), is this wanted?

913 + u'PresentationModeUseSecondary': u'',
914 + u'PresentationModeEnableFeedbackDisplay': False,
915 + u'PresentationModePlayWellWithOthers': False,
What are these needed for? Why do they not follow the section/key_name conversion?

Thanks for your code, if you have any questions to my comment feel free to contact me (see my profile, or just ask here). I don't want to scare you off, but we have to make sure that the code works as best as possible (we have hardly any MAC devs and the presentation plugin was always a bit our sorrow plugin ;) ).

review: Needs Fixing

[Dmitriy Marmyshev (marmyshev)]

299 + if len(windows) == 0:
302 + if len(slideshows) == 0:
> Just do "if my_list"

windows could be not "None" but could has 0 items and "if windows:" returns true - because of appscript reference.

550-560 - I still didnt decide how to solve the probleme of changing settins by user. This is in progress.

607-613: PPT for mac when you save slides as PNG creates dir for slides with same name as file name if the full path of presentation contains non-latin symbols. Probably it's not needed to log, but the algorithm support current work of MS PPT.

837-842: I dont know why this subs are exist in controllers for Windows PPT. I just added the same for support. I didnt find any references to this in other code.

913-915: is needed for setting up values for Keynote. this is because Core devs has changes Settins() system. I need this just in keynotecontroller, may be you could advise how to place it there and append to __default_settings__ of the plugin? I will need to append some setting keys with the same way in pptmaccontroller.

Agree with all other comments to my code. Will fix it soon.

[Andreas Preikschat (googol-deactivatedaccount)]

> 299 + if len(windows) == 0:
> 302 + if len(slideshows) == 0:
> > Just do "if my_list"
>
> windows could be not "None" but could has 0 items and "if windows:" returns
> true - because of appscript reference.

if not my_list:
    print('if')
else:
    print('else')
When the list is empty then this will print "if". I am not sure what you mean with "windows could not be None". (Btw, I said you should write "if my_list" which is wrong, it should be "if not my_list")

Or do you mean windows being None causing an exception being caught returning False?

> 913-915: is needed for setting up values for Keynote. this is because Core
> devs has changes Settins() system. I need this just in keynotecontroller, may
> be you could advise how to place it there and append to __default_settings__
> of the plugin? I will need to append some setting keys with the same way in
> pptmaccontroller.

Just add your settings to the dict, as you already did. Just give it decent names; please no cryptic ones ;)

[Dmitriy Marmyshev (marmyshev)]

> 299 + if len(windows) == 0:
> 302 + if len(slideshows) == 0:

I mean, that because of third part module "appscript" and because of Microsoft's coders, the varaible "windows" could be a list, sometimes could a None and sometimes could be something else (like const appscript.k.missing_value). So "if len(windows) == 0:" returns false ONLY when if windows - is a list and not empty. I think this is easier. Also Keynote always returns a list even empty list. I copied for simularity with keynote controller. May be you have better idea? Ready to use it! :)

> Just add your settings to the dict, as you already did. Just give it decent names; please no cryptic ones ;)

Sorry, What do you mean? Should I write a letter to Apple Developrers of Keynote with advise to use more dicent names for thier setting's varaibles? :) (178-193)

[Dmitriy Marmyshev (marmyshev)]

304-305 not needed to log.

[matysek (mzibricky)]

I cannot test it properly since I cannot open a presentation file:
- when I click on 'Select a new Presentation' button, then
- 'Select Presentation(s)' dialog is opened but immediately disappears
- and there is no time to select any file in that window.
- when the powerpoint integration is disabled then the dialog does not disappear anymore and keeps opened

My guess would be that something is stealing focus of the openlp window or pyqt generates any signals that causes this dialog to disappear.

What is working:
- powerpoint is started when openlp is started
- powerpoint is stopped when openlp is stopped
- if powerpoint is disabled in openl then it is not started

review: Needs Fixing

[matysek (mzibricky)]

I'm not sure if the issue with the 'select presentations' dialog is specific to the osx powerpoint code or to the presentation plugin in general.

[Dmitriy Marmyshev (marmyshev)]

I didnt touch anything in the plugin. I just added new controllers.
I always used DnD and this worked fine.

Just now, I've tried to click "load new presentations" on the toolbar - and
now it doesnt works - the gialog always hides.

On Sun, Apr 7, 2013 at 12:49 AM, matysek <email address hidden> wrote:

> I'm not sure if the issue with the 'select presentations' dialog is
> specific to the osx powerpoint code or to the presentation plugin in
> general.
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/157509
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[Dmitriy Marmyshev (marmyshev)]

try this:
1. launch OpenLP
2. turn off Presentation plugin
3. Quit app
4. Launch OpenLP
5. turn on Presentation plugin
6. Add some presentations for tests, using "Select presentations" dialog.

This should works for now.

On Sun, Apr 7, 2013 at 12:49 AM, matysek <email address hidden> wrote:

> I'm not sure if the issue with the 'select presentations' dialog is
> specific to the osx powerpoint code or to the presentation plugin in
> general.
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/157509
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[matysek (mzibricky)]

> I didnt touch anything in the plugin. I just added new controllers.
> I always used DnD and this worked fine.

What is it DnD?

> Just now, I've tried to click "load new presentations" on the toolbar - and
> now it doesnt works - the gialog always hides.

Then this should be an issue of the presentation plugin as a whole.

[matysek (mzibricky)]

> try this:
> 1. launch OpenLP
> 2. turn off Presentation plugin
> 3. Quit app
> 4. Launch OpenLP
> 5. turn on Presentation plugin
> 6. Add some presentations for tests, using "Select presentations" dialog.
>
> This should works for now.

These instructions work.

How the integration works (MacOffice 2011):
- preview of presentation file is not generated
- when user double clicks on ppt item in openlp then a powerpoint window is opened
- the user can see the presentation in powerpoint and use directly powerpoint to control the presentation.
- powerpoint will show the presentation on second screen and thus override the openlp content on the 2nd screen
- when the user double clicks on another ppt file then another new powerpoint window is opened
- when openlp is closed then all powerpoind windows are automatically closed with openlp.

One small issue that when the user double clicks a ppt item in openlp then the error 'The presentation /filename is incomplete, please reload.'.
- this is probably caused by not generating presentation preview.

Otherwise it seems stable and working properly. I suggest merging this code.

review: Approve

[Dmitriy Marmyshev (marmyshev)]

> What is it DnD?
>
>
DnD = Drag and Drop - actually it is from the trunk code - there is
procedure "activateDnD()" for list_view

[Dmitriy Marmyshev (marmyshev)]

> One small issue that when the user double clicks a ppt item in openlp then
> the error 'The presentation /filename is incomplete, please reload.'.
> - this is probably caused by not generating presentation preview.
>
>
Can you explane more detailly about this? Did you reload it just once and
everything become good? or this issue reproduce EVERYTIME when you add new
presentation?

[matysek (mzibricky)]

> > One small issue that when the user double clicks a ppt item in openlp then
> > the error 'The presentation /filename is incomplete, please reload.'.
> > - this is probably caused by not generating presentation preview.
> Can you explane more detailly about this? Did you reload it just once and
> everything become good? or this issue reproduce EVERYTIME when you add new
> presentation?

It is reproducible every time. How to reproduce:
- click on 'Load a new presentation'
- select a .ppt file and it will create a new item in openlp
- double click that item - the .ppt file get's loaded into powerpoint and openlp will show that message.

[Raoul Snyman (raoul-snyman)]

> try this:
> 1. launch OpenLP
> 2. turn off Presentation plugin
> 3. Quit app
> 4. Launch OpenLP
> 5. turn on Presentation plugin
> 6. Add some presentations for tests, using "Select presentations" dialog.

Are our users going to have to do this? If so, you need to find a solution, we can't expect our users to have to run workarounds for a bug that we should be able to fix.

review: Needs Information

[matysek (mzibricky)]

>
> Are our users going to have to do this? If so, you need to find a solution, we
> can't expect our users to have to run workarounds for a bug that we should be
> able to fix.

No, our users should not do that. It's just seems that this issue is not caused by Dmitriy's code but by instability of the trunk.

[Dmitriy Marmyshev (marmyshev)]

Of course, no!

Who can help with this bag? Because I have no clue.

On Mon, Apr 8, 2013 at 4:10 PM, Raoul Snyman <email address hidden> wrote:

> Review: Needs Information
>
> > try this:
> > 1. launch OpenLP
> > 2. turn off Presentation plugin
> > 3. Quit app
> > 4. Launch OpenLP
> > 5. turn on Presentation plugin
> > 6. Add some presentations for tests, using "Select presentations" dialog.
>
> Are our users going to have to do this? If so, you need to find a
> solution, we can't expect our users to have to run workarounds for a bug
> that we should be able to fix.
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/157509
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[matysek (mzibricky)]

> Who can help with this bag? Because I have no clue.

Are you speaking about the disappearing dialog, the error message or both?

Regarding the disappearing dialog - after I applied your instructions it seems gone - not sure what happened. I'll have to double check.

[Dmitriy Marmyshev (marmyshev)]

Guys, should i do here something else for merging it?

review: Needs Resubmitting

[matysek (mzibricky)]

> Guys, should i do here something else for merging it?

From my point of view:
- Are you able to reproduce the issue 'The presentation /file/name is incomplete, please reload.'?
  - if yes - are you able to fix it?
  - if not - I will have to look at it what' wrong
- the disappearing dialog is not directly related to your code - it should be fixed but not in this pull request

Other than that I'm fine with merging it.

[matysek (mzibricky)]

Related bug reports: #1168495 #1168493

[Dmitriy Marmyshev (marmyshev)]

The issue 'The presentation /file/name is incomplete, please reload.' cant
be reproduce on my system because it works fine with creating icons for
presentation.
608-639 are responsible for this issue, I guess.

On Fri, Apr 12, 2013 at 9:50 PM, matysek <email address hidden> wrote:

> > Guys, should i do here something else for merging it?
>
> >From my point of view:
> - Are you able to reproduce the issue 'The presentation /file/name is
> incomplete, please reload.'?
> - if yes - are you able to fix it?
> - if not - I will have to look at it what' wrong
> - the disappearing dialog is not directly related to your code - it should
> be fixed but not in this pull request
>
> Other than that I'm fine with merging it.
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/157509
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[matysek (mzibricky)]

Ok, I will try to look at the create_thumbnails().
What documents do you use for testing?
What is your office version? 2011?

[Dmitriy Marmyshev (marmyshev)]

I use *.key, *.ppt and *.pptx documents.
I use MS Office 2011 for Mac with localized interface.
I use both latin and non-latin characters in full file names.
I use both english and translated interface of OpenLP.

and create_thumbnails() works good.

On Fri, Apr 12, 2013 at 11:17 PM, matysek <email address hidden> wrote:

> Ok, I will try to look at the create_thumbnails().
> What documents do you use for testing?
> What is your office version? 2011?
> --
> https://code.launchpad.net/~marmyshev/openlp/presentation/+merge/157509
> You are the owner of lp:~marmyshev/openlp/presentation.
>

[matysek (mzibricky)]

> I use *.key, *.ppt and *.pptx documents.
> I use MS Office 2011 for Mac with localized interface.
> I use both latin and non-latin characters in full file names.
> I use both english and translated interface of OpenLP.
>
> and create_thumbnails() works good.

The following function does not create PNG files.

  self.presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG)

The following directory and its parent directories are just empty (lecture22.ppt is the name of the presentation file)

~/Library/Application\Support/openlp/Data/presentations/thumbnails/lecture22.ppt/lecture22.ppt

[matysek (mzibricky)]

Dmitriy,

what appscript version do you use? 1.0.o or 1.0.1?

Mine is 1.0.0.

Should I try the 1.0.1?

Could this bugfix version make a difference with generating thumbnails?

[Andreas Preikschat (googol-deactivatedaccount)]

Are you still working on this?

[matysek (mzibricky)]

> Are you still working on this?

We are stuck on getting the thumbnails working.
- dmitriys - osx 10.8 - working
- matysek - osx 10.7 - not working

Recently I haven'd had much time for debugging this.

[Raoul Snyman (raoul-snyman)]

Hey Dmitriy, a lot of our users would really benefit from this feature (lots of them have asked for it), are you going to try to figure out that last bug?

[Andreas Preikschat (googol-deactivatedaccount)]

> Hey Dmitriy, a lot of our users would really benefit from this feature (lots
> of them have asked for it), are you going to try to figure out that last bug?

+1

[Tim Bentley (trb143)]

Please resubmit due to the age of this request and additionally it will need converting to Python 3 as on 1/9/2013 truck will be converted.

review: Needs Resubmitting

[Andreas Preikschat (googol-deactivatedaccount)]

In what part of the code does the thumbnail problem lays? Lines?

review: Needs Information

[Dmitriy Marmyshev (marmyshev)]

Lines 589-628 - this is procedure to create thumbnail.

MS PPT can save all slides to PNG at ones. And used it before. But somehow this doesnt work stabale on different systems (I think global settings of showing file extentions, system language, MS Office lanuage are affecting) - thumbnail paths are different. This code i just commented.

So I was going to implement second option of PPT - to save each slide to PNG in cycle. But I still cant find solution so select current slide (or change selection) in PPT by applescript bridge (appscript module). Line 597.

Can you help with this?

[Andreas Preikschat (googol-deactivatedaccount)]

So the problem with the current code is, that you cannot set the current slide?
And the problem with the old (commented) code is, that it does not always work?

Can you post (pastebin) the doc strings for self.presentation and the doc string of "slides".

Did you see that appscript is not developed and supported anymore? http://appscript.sourceforge.net/

[Dmitriy Marmyshev (marmyshev)]

1. yes.
2. yes.
3. they are appscript objects. Can you specify what exactly do you need? I use "Microsoft PowerPoint dictionary" in Aplle script editor to find commands to use in appscript module.
4. Yes. But it works for now, and ScriptingBridge from Python works awfull. The other problem of this was discribed upper - that MS PPT for Apple doesnt have any programm interface except apple script. Appscript is just one of briges between python and apple scriping system.

[Andreas Preikschat (googol-deactivatedaccount)]

> 3. they are appscript objects. Can you specify what exactly do you need? I use
> "Microsoft PowerPoint dictionary" in Aplle script editor to find commands to
> use in appscript module.
I need help(self.presentation) and help(self.presentation.slides())

[Dmitriy Marmyshev (marmyshev)]

I think now this should work well with thumbnails for PPT.

[Dmitriy Marmyshev (marmyshev)]

Can anybody test this on different OSX systems?

interesting to test this:
1. on "full English lang" systems - OS is English and MS PPT is English
2. and on "not English lang at all" - OS is some other lang and MS PPT is the same.

[matysek (mzibricky)]

I get the following stacktrace when trying to run openlp from this branch:

$ python openlp.py
WARNING: bool Phonon::FactoryPrivate::createBackend() phonon backend plugin could not be loaded
Traceback (most recent call last):
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py", line 937, in emit
    msg = self.format(record)
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py", line 808, in format
    return fmt.format(record)
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py", line 554, in format
    record.exc_text = self.formatException(record.exc_info)
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py", line 504, in formatException
    traceback.print_exception(ei[0], ei[1], tb, None, sio)
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/traceback.py", line 156, in print_exception
    for value, tb in values:
  File "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/traceback.py", line 122, in _iter_chain
    context = exc.__context__
AttributeError: 'NoneType' object has no attribute '__context__'
Logged from file __init__.py, line 186
Error in sys.excepthook:
RuntimeError: super-class __init__() of type ExceptionForm was never called

Original exception was:
Traceback (most recent call last):
  File "openlp.py", line 45, in <module>
    main()
  File "/Users/martin/Projects/openlp/presentation/openlp/core/__init__.py", line 326, in main
    sys.exit(application.run(qt_args))
  File "/Users/martin/Projects/openlp/presentation/openlp/core/__init__.py", line 137, in run
    Registry().execute('bootstrap_initialise')
  File "/Users/martin/Projects/openlp/presentation/openlp/core/lib/registry.py", line 159, in execute
    result = function(*args, **kwargs)
  File "/Users/martin/Projects/openlp/presentation/openlp/core/lib/pluginmanager.py", line 86, in bootstrap_initialise
    self.initialise_plugins()
  File "/Users/martin/Projects/openlp/presentation/openlp/core/lib/pluginmanager.py", line 201, in initialise_plugins
    plugin.initialise()
  File "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/presentationplugin.py", line 91, in initialise
    super(PresentationPlugin, self).initialise()
  File "/Users/martin/Projects/openlp/presentation/openlp/core/lib/plugin.py", line 296, in initialise
    self.media_item.initialise()
  File "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/lib/mediaitem.py", line 127, in initialise
    self.populate_display_types()
  File "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/lib/mediaitem.py", line 137, in populate_display_types
    if self.controllers[item].enabled():
  File "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/lib/presentationcontroller.py", line 380, in enabled
    return self.is_available()
  File "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/lib/presentationcontroller.py", line 386, ...

review: Needs Information

[Dmitriy Marmyshev (marmyshev)]

Do you have appscript for Python 3.3? afrter I have installed Py-33 env - I
re-install appscript 1.0.1 for python33
And do you have MS PPT 2011 on mac?

Because self.check_available() works fine on my system.

On Fri, Sep 20, 2013 at 2:02 AM, matysek <email address hidden> wrote:

> Review: Needs Information
>
> I get the following stacktrace when trying to run openlp from this branch:
>
> $ python openlp.py
> WARNING: bool Phonon::FactoryPrivate::createBackend() phonon backend
> plugin could not be loaded
> Traceback (most recent call last):
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py",
> line 937, in emit
> msg = self.format(record)
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py",
> line 808, in format
> return fmt.format(record)
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py",
> line 554, in format
> record.exc_text = self.formatException(record.exc_info)
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/logging/__init__.py",
> line 504, in formatException
> traceback.print_exception(ei[0], ei[1], tb, None, sio)
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/traceback.py",
> line 156, in print_exception
> for value, tb in values:
> File
> "/opt/openlp_2_2/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/traceback.py",
> line 122, in _iter_chain
> context = exc.__context__
> AttributeError: 'NoneType' object has no attribute '__context__'
> Logged from file __init__.py, line 186
> Error in sys.excepthook:
> RuntimeError: super-class __init__() of type ExceptionForm was never called
>
> Original exception was:
> Traceback (most recent call last):
> File "openlp.py", line 45, in <module>
> main()
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/__init__.py", line
> 326, in main
> sys.exit(application.run(qt_args))
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/__init__.py", line
> 137, in run
> Registry().execute('bootstrap_initialise')
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/lib/registry.py",
> line 159, in execute
> result = function(*args, **kwargs)
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/lib/pluginmanager.py",
> line 86, in bootstrap_initialise
> self.initialise_plugins()
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/lib/pluginmanager.py",
> line 201, in initialise_plugins
> plugin.initialise()
> File
> "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/presentationplugin.py",
> line 91, in initialise
> super(PresentationPlugin, self).initialise()
> File
> "/Users/martin/Projects/openlp/presentation/openlp/core/lib/plugin.py",
> line 296, in initialise
> self.media_item.initialise()
> File
> "/Users/martin/Projects/openlp/presentation/openlp/plugins/presentations/lib/mediaitem.py",
> line 127, in initialise
> self.populate_display_types()
> File
>...

[matysek (mzibricky)]

I was using appscript 1.0.0. It seems like this version does not work properly with python 3.3. I upgraded to 1.0.1 and openlp is now working. I'm sorry for that. So this exception is now gone.

A few notes:
- presentation previews are not generated when a new presentation is added to openlp
- when I try to show presentation preview in openlp it complains with message:

  "The presentation file.ppt is incomplete, please reload."

What code is responsible for creating the preview from the ppt file?

[Dmitriy Marmyshev (marmyshev)]

Creating preview calls from line: 597
and the code doing it is in lines: 601-638

Generating of preview should start on adding PPT to OpenLP (line: 597). But if you had file already added befor without generated preview you need to delete it and add it again.

Can you go step-by-step to the procedure "create_thumbnails" and tell me where it fails?

[matysek (mzibricky)]

It turns out that the following line does not create any .png files:

  self.presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG)

Btw, I'm testing a .ppt file if that makes a difference. Did you test only pptx files?

[matysek (mzibricky)]

My Powerpoint version is:

Microsoft PowerPoint for Mac 2011
Version 14.0
Latest Installed Update: 14.0.0

[matysek (mzibricky)]

Is there any documentation or any other way what all functions/objects are provided by appscript to controll PowerPoint?

[Dmitriy Marmyshev (marmyshev)]

I have PowerPoint 14.1 (110310)
Latest installed update 14.1.0

I dont want to beleave that 14.1.0 and 14.0.0 is such big difference that "save" command doesnt work.

You can look in apple script commands here:
Open "AppleScript Editor" app
Menu: File - Open Dictionary... then select "Microsoft PowerPoint"
type save command and look into the syntax.

What i have in syntax:

save specifier: the object to save
   [in Macintosh path/Posix path]: the file in which to save the object
   [as save ast presentation/save as template/.../save as PNG/... and etc.]: the file type of the document in which to save the data

so, command on applescript, something like this:

tell presentation
   save in <path> as save as PNG
end tell

converts to call in appscript bridge as:

presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG)

What do you have in syntax?

[matysek (mzibricky)]

On my system there is:

save v : Save an object
save specifier : the object to save
[in Macintosh path/Posix path] : the file in which to save the object
[as save as presentation/save as template/save as RTF/save as show/save as default/save as HTML/save as movie/save as package/save as PDF/save as Open XML presentation/save as Open XML presentation macro enabled/save as Open XML show/save as Open XML show macro enabled/save as Open XML template/save as Open XML template macro enabled/save as Open XML theme/save as GIF/save as JPG/save as PNG/save as BMP/save as TIF] : the file type of the document in which to save the data

It looks the same as yours.

Is it possible to update macoffice to 14.1 without additional costs?

[matysek (mzibricky)]

I upgraded macoffice to version 14.1 and now the presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG) is working and thumbnails are generated properly.

We should mention in the manual that macoffice 14.0 is not working and upgrade to 14.1 is recommended.

I thus confirm that ppt integration on osx is working.

review: Approve

[Phill (phill-ridout)]

> We should mention in the manual that macoffice 14.0 is not working and upgrade
> to 14.1 is recommended.

I've added a bug report for this: https://bugs.launchpad.net/openlp/+bug/1244242
A comment like this could easily get forgotten about, so if you notice something like this in the future please raise a bug report and use "Target to Series" to target it to the documentation series.

Is 14.x the minimum version, or is this a regression and the plugin works with earlier versions as well?

[lp:~marmyshev/openlp/presentation]

2138. By Dmitriy Marmyshev on 2013-10-24

Tests

2139. By Dmitriy Marmyshev on 2013-10-24

Added check_ver for appscript module

2140. By Dmitriy Marmyshev on 2013-10-24

Trunk

2141. By Dmitriy Marmyshev on 2013-10-24

cleanups.

2142. By Dmitriy Marmyshev on 2013-10-26

Trunk

2143. By Dmitriy Marmyshev on 2013-10-26

tests fixes

Unmerged revisions

2143. By Dmitriy Marmyshev on 2013-10-26

tests fixes

2142. By Dmitriy Marmyshev on 2013-10-26

Trunk

2141. By Dmitriy Marmyshev on 2013-10-24

cleanups.

2140. By Dmitriy Marmyshev on 2013-10-24

Trunk

2139. By Dmitriy Marmyshev on 2013-10-24

Added check_ver for appscript module

2138. By Dmitriy Marmyshev on 2013-10-24

Tests

2137. By Dmitriy Marmyshev on 2013-09-17

thumbnail fixes

2136. By Dmitriy Marmyshev on 2013-09-16

Trunk

2135. By Dmitriy Marmyshev on 2013-09-16

fixes unicode & bzr eric5 ignore

2134. By Dmitriy Marmyshev on 2013-09-11

Trunk

=== modified file '.bzrignore'
--- .bzrignore	2013-09-14 02:42:12 +0000
+++ .bzrignore	2013-10-24 16:44:10 +0000
@@ -2,6 +2,7 @@
 *.*~
 \#*\#
 *.eric4project
+*.eric5project
 *.ropeproject
 *.e4*
 .eric4project
 
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py	2013-10-13 13:51:13 +0000
+++ openlp/core/lib/pluginmanager.py	2013-10-24 16:44:10 +0000
@@ -94,11 +94,6 @@
         present_plugin_dir = os.path.join(self.base_path, 'presentations')
         log.debug('finding plugins in %s at depth %d', str(self.base_path), start_depth)
         for root, dirs, files in os.walk(self.base_path):
-            if sys.platform == 'darwin' and root.startswith(present_plugin_dir):
-                # TODO Presentation plugin is not yet working on Mac OS X.
-                # For now just ignore it. The following code will ignore files from the presentation plugin directory
-                # and thereby never import the plugin.
-                continue
             for name in files:
                 if name.endswith('.py') and not name.startswith('__'):
                     path = os.path.abspath(os.path.join(root, name))
 
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2013-10-13 21:07:28 +0000
+++ openlp/core/ui/firsttimeform.py	2013-10-24 16:44:10 +0000
@@ -414,10 +414,7 @@
         self._increment_progress_bar(translate('OpenLP.FirstTimeWizard', 'Enabling selected plugins...'))
         self._set_plugin_status(self.songs_check_box, 'songs/status')
         self._set_plugin_status(self.bible_check_box, 'bibles/status')
-        # TODO Presentation plugin is not yet working on Mac OS X.
-        # For now just ignore it.
-        if sys.platform != 'darwin':
-            self._set_plugin_status(self.presentation_check_box, 'presentations/status')
+        self._set_plugin_status(self.presentation_check_box, 'presentations/status')
         self._set_plugin_status(self.image_check_box, 'images/status')
         self._set_plugin_status(self.media_check_box, 'media/status')
         self._set_plugin_status(self.remote_check_box, 'remotes/status')
 
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py	2013-10-13 21:07:28 +0000
+++ openlp/core/ui/firsttimewizard.py	2013-10-24 16:44:10 +0000
@@ -93,13 +93,10 @@
         self.image_check_box.setChecked(True)
         self.image_check_box.setObjectName('image_check_box')
         self.plugin_layout.addWidget(self.image_check_box)
-        # TODO Presentation plugin is not yet working on Mac OS X.
-        # For now just ignore it.
-        if sys.platform != 'darwin':
-            self.presentation_check_box = QtGui.QCheckBox(self.plugin_page)
-            self.presentation_check_box.setChecked(True)
-            self.presentation_check_box.setObjectName('presentation_check_box')
-            self.plugin_layout.addWidget(self.presentation_check_box)
+        self.presentation_check_box = QtGui.QCheckBox(self.plugin_page)
+        self.presentation_check_box.setChecked(True)
+        self.presentation_check_box.setObjectName('presentation_check_box')
+        self.plugin_layout.addWidget(self.presentation_check_box)
         self.media_check_box = QtGui.QCheckBox(self.plugin_page)
         self.media_check_box.setChecked(True)
         self.media_check_box.setObjectName('media_check_box')
@@ -219,10 +216,7 @@
         self.custom_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Custom Slides'))
         self.bible_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Bible'))
         self.image_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Images'))
-        # TODO Presentation plugin is not yet working on Mac OS X.
-        # For now just ignore it.
-        if sys.platform != 'darwin':
-            self.presentation_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Presentations'))
+        self.presentation_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Presentations'))
         self.media_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Media (Audio and Video)'))
         self.remote_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Allow remote access'))
         self.song_usage_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Monitor Song Usage'))
 
=== added file 'openlp/plugins/presentations/lib/keynotemaccontroller.py'
--- openlp/plugins/presentations/lib/keynotemaccontroller.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/presentations/lib/keynotemaccontroller.py	2013-10-24 16:44:10 +0000
@@ -0,0 +1,362 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Frode Woldsund, Martin Zibricky                                             #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import os
+#import sys
+import logging
+#import mactypes
+
+import appscript
+
+from openlp.core.lib import Settings,  ScreenList
+from .presentationcontroller import PresentationController, PresentationDocument
+
+
+log = logging.getLogger(__name__)
+
+
+class KeynoteController(PresentationController):
+    """
+    Class to control interactions with KeyNote Presentations
+    It creates the runtime Environment , Loads the and Closes the Presentation
+    As well as triggering the correct activities based on the users input
+    """
+    log.info('KeynoteController loaded')
+
+    def __init__(self, plugin):
+        """
+        Initialise the class
+        """
+        log.debug('Initialising')
+        super(KeynoteController,  self).__init__(plugin, 'Keynote', KeynoteDocument)
+        self.supports = ['key']
+        self.process = None
+
+    def check_available(self):
+        """
+        KeyNote is able to run on this machine
+        """
+        log.debug('check_available')
+        try:
+            self.process = appscript.app('Keynote')
+        except appscript.ApplicationNotFoundError:
+            return False
+        self.kill()
+        return True
+    
+    def start_process(self):
+        """
+        Loads KeyNote process
+        """
+        log.debug('start_process')
+        if not self.process or not self.process.isrunning():            
+            self.process = appscript.app('Keynote')
+            self.process.relaunchmode = 'limited' #'always'
+            self.process.launch()
+            self.apply_app_settings()
+        
+    def kill(self):
+        """
+        Called at system exit to clean up any running presentations
+        """
+        log.debug('Kill Keynote')
+        while self.docs and self.process.isrunning():
+            self.docs[0].close_presentation()
+        if self.process is None or not self.process.isrunning():
+            return    
+        try:
+            total = self.process.slideshows()
+            if self.process and total != appscript.k.missing_value and len(total) > 0:
+                return
+            self.process.quit(saving = appscript.k.ask)
+        except appscript.CantLaunchApplicationError:
+            log.debug('Kill Keynote failed')
+        self.process = None
+        
+    def apply_app_settings(self):
+        """
+        Apply settings for Keynote
+        PresentationModeEnableFeedbackDisplay = True if in settings of OpenLP show presenter view = True
+        PresentationModeUseSecondary = 1 if OpenLP monitor for output = Screen 2        
+        """
+        openlp_settings = Settings('openlp.org','OpenLP')        
+        keynote_settings = Settings('apple', 'iWork.Keynote')
+        use_secondary = int(keynote_settings.value('PresentationModeUseSecondary'))
+        monitor = openlp_settings.value( 'core/monitor')
+        override_position = openlp_settings.value( 'core/override position')
+        if not override_position and use_secondary != monitor:            
+            keynote_settings.setValue('PresentationModeUseSecondary', monitor)
+        elif override_position and use_secondary != 0:
+            keynote_settings.setValue('PresentationModeUseSecondary', '0')            
+        show_presenter_view = openlp_settings.value(self.plugin.settings_section + '/show presenter view')
+        keynote_feedback_display = keynote_settings.value('PresentationModeEnableFeedbackDisplay')
+        if show_presenter_view != keynote_feedback_display:
+            keynote_settings.setValue('PresentationModeEnableFeedbackDisplay', show_presenter_view)
+        play_well_with_others = keynote_settings.value('PresentationModePlayWellWithOthers')
+        if not play_well_with_others:
+            keynote_settings.setValue('PresentationModePlayWellWithOthers', True)
+        
+
+class KeynoteDocument(PresentationDocument):
+    """
+    Class which holds information and controls a single presentation
+    """
+
+    def __init__(self, controller, presentation):
+        """
+        Constructor, store information about the file and initialise
+        """
+        log.debug('Init Presentation Keynote')
+        super(KeynoteDocument, self).__init__(controller, presentation)
+        self.presentation = None
+
+    def load_presentation(self):
+        """
+        Called when a presentation is added to the SlideController.
+        Opens the Keynote file using the process created earlier.
+        """
+        log.debug('load_presentation')        
+        if not self.controller.process or not self.controller.process.isrunning():
+            self.controller.start_process()
+        try:
+            self.controller.process.open(self.filepath)
+        except appscript.CommandError:
+            log.debug('Keynote open failed')
+            return False
+        slideshows = self.controller.process.slideshows()
+        for slideshow in slideshows:
+            path = slideshow.path()
+            if self.filepath == path:
+                self.presentation = slideshow
+                self.create_thumbnails()
+                return True
+        self.presentation = None
+        return False
+
+    def create_thumbnails(self):
+        """
+        Create the thumbnail images for the current presentation.
+        """
+        log.debug('create_thumbnails')
+        if self.check_thumbnails():
+            return
+        thumbnail_folder = self.get_thumbnail_folder()
+        if not os.path.exists(thumbnail_folder): 
+            os.makedirs(thumbnail_folder)
+        try:
+            self.controller.process.open(self.filepath)
+        except appscript.CommandError:
+            log.debug('KeyNote open failed')
+            return
+        temp_dir = self.controller.thumbnail_folder
+        keystroke = os.path.join(temp_dir, 'temp' + self.controller.thumbnail_prefix)
+        self.controller.process.activate()
+        appscript.app('System Events').processes['Keynote'].menu_bars[1].menu_bar_items[3].menus.menu_items[11].click()
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].tool_bars.buttons[4].click()
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].radio_groups[1].radio_buttons[1].click()
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].pop_up_buttons[1].click()
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].pop_up_buttons[1]\
+            .menus.menu_items[2].click()
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].buttons[2].click()
+        appscript.app('System Events').processes['Keynote'].keystroke(keystroke)
+        appscript.app('System Events').processes['Keynote'].key_code(36)
+        appscript.app('System Events').processes['Keynote'].windows[1].sheets[1].buttons[1].click()
+        self.controller.plugin._main_window.activateWindow()
+        slide_no = 0
+        for filename in os.listdir(temp_dir):
+            full_filename = os.path.join(temp_dir, filename)
+            if not os.path.isfile(full_filename) or not filename.endswith('.png') or filename == 'icon.png':
+                continue
+            slide_no = slide_no + 1
+            if not filename.startswith(self.controller.thumbnail_prefix):                    
+                path = os.path.join(thumbnail_folder,
+                    self.controller.thumbnail_prefix + str(slide_no) + '.png')
+                try:
+                    os.rename(full_filename, path)
+                except:
+                    open(path,'w').write(open(full_filename,'r').read())
+                    os.unlink(full_filename)
+
+    def close_presentation(self):
+        """
+        Close presentation and clean up objects. This is triggered by a new
+        object being added to SlideController or OpenLP being shut down.
+        """
+        log.debug('close_presentation')
+        if self.presentation:
+            try:
+                self.presentation.close()
+            except appscript.CommandError:
+                log.debug('Could not close the presentation')
+        self.presentation = None
+        self.controller.remove_doc(self)
+
+    def is_loaded(self):
+        """
+        Returns ``True`` if a presentation is loaded.
+        """
+        log.debug('is_loaded')        
+        try:
+            if not self.controller.process.isrunning():
+                return False
+            windows = self.controller.process.windows()
+            if len(windows) == 0:
+                return False
+            slideshows = self.controller.process.slideshows()
+            if len(slideshows) == 0:
+                return False
+        except:
+            return False
+        for slideshow in slideshows:
+            path = slideshow.path()
+            if self.filepath == path:
+                return True
+        return False
+
+    def is_active(self):
+        """
+        Returns ``True`` if a presentation is currently active.
+        """
+        log.debug('is_active')
+        if not self.is_loaded():
+            return False        
+        try:
+            if not self.presentation.playing():
+                return False
+        except appscript.CommandError:
+            return False
+        return True
+
+    def unblank_screen(self):
+        """
+        Unblanks (restores) the presentation.
+        """
+        log.debug('unblank_screen')
+        if self.is_blank():
+            self.presentation.start_presentation()
+
+    def blank_screen(self):
+        """
+        Blanks the screen.
+        """
+        log.debug('blank_screen')
+        self.presentation.stop_slideshow()
+
+    def is_blank(self):
+        """
+        Returns ``True`` if screen is blank.
+        """
+        log.debug('is_blank')
+        if self.is_active():
+            return not self.presentation.playing()
+        else:
+            return False
+
+    def stop_presentation(self):
+        """
+        Stops the current presentation and hides the output.
+        """
+        log.debug('stop_presentation')        
+        self.presentation.stop_slideshow()
+
+    
+    def start_presentation(self):
+        """
+        Starts a presentation from the beginning.
+        """
+        log.debug('start_presentation')
+        if not self.is_active():
+            self.controller.apply_app_settings()
+            try:
+                self.presentation.start()
+            except appscript.CommandError:
+                return
+            rect = ScreenList().current['size']
+            top = rect.y()    
+            height = rect.height() 
+            left_position = rect.x()
+            width = rect.width()
+            self.controller.process.windows[1].bounds.set([left_position, top, left_position + width, top + height])
+
+    def get_slide_number(self):
+        """
+        Returns the current slide number.
+        """
+        log.debug('get_slide_number')        
+        return self.presentation.current_slide().slide_number()
+
+    def get_slide_count(self):
+        """
+        Returns total number of slides.
+        """
+        log.debug('get_slide_count')
+        slides = self.presentation.slides()
+        return len(slides)
+
+    def goto_slide(self, slideno):
+        """
+        Moves to a specific slide in the presentation.
+        """
+        log.debug('goto_slide') 
+        slide = self.presentation.slides()[slideno-1]
+        self.presentation.show(slide)
+
+    def next_step(self):
+        """
+        Triggers the next effect of slide on the running presentation.
+        """
+        log.debug('next_step')       
+        self.presentation.show_next()
+        if self.get_slide_number() > self.get_slide_count():
+            self.previous_step()
+
+    def previous_step(self):
+        """
+        Triggers the previous slide on the running presentation.
+        """
+        log.debug('previous_step')        
+        self.presentation.show_previous()
+
+    def get_slide_text(self, slide_no):
+        """
+        Returns the text on the slide.
+
+        ``slide_no``
+            The slide the text is required for, starting at 1.
+        """
+        return self.presentation.slides[slide_no].body
+
+    def get_slide_notes(self, slide_no):
+        """
+        Returns the text on the slide.
+
+        ``slide_no``
+            The slide the notes are required for, starting at 1.
+        """
+        return self.presentation.slides[slide_no].notes
 
=== added file 'openlp/plugins/presentations/lib/powerpointmaccontroller.py'
--- openlp/plugins/presentations/lib/powerpointmaccontroller.py	1970-01-01 00:00:00 +0000
+++ openlp/plugins/presentations/lib/powerpointmaccontroller.py	2013-10-24 16:44:10 +0000
@@ -0,0 +1,399 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Frode Woldsund, Martin Zibricky                                             #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import os
+import sys
+import logging
+import shutil
+#import mactypes
+
+import appscript
+
+from openlp.core.lib import Settings,  ScreenList
+from .presentationcontroller import PresentationController, PresentationDocument
+
+
+log = logging.getLogger(__name__)
+
+
+class PowerpointController(PresentationController):
+    """
+    Class to control interactions with PowerPoint Presentations
+    It creates the runtime Environment , Loads the and Closes the Presentation
+    As well as triggering the correct activities based on the users input
+    """
+    log.info(u'PowerpointController loaded')
+
+    def __init__(self, plugin):
+        """
+        Initialise the class
+        """
+        log.debug('Initialising')
+        super(PowerpointController,  self).__init__(plugin, 'Powerpoint', PowerpointDocument)
+        self.supports = ['ppt', 'pps', 'pptx', 'ppsx']
+        self.process = None
+
+    def check_available(self):
+        """
+        PowerPoint is able to run on this machine
+        """
+        log.debug('check_available')
+        try:
+            self.process = appscript.app(id='com.microsoft.powerpoint')
+        except appscript.ApplicationNotFoundError:
+            return False
+        self.kill()
+        return True
+    
+    def start_process(self):
+        """
+        Loads PowerPoint process
+        """
+        log.debug('start_process')
+        if not self.process  or not self.process.isrunning():            
+            self.process = appscript.app(id='com.microsoft.powerpoint')
+            self.process.relaunchmode = 'limited' #'always'
+            self.process.launch()
+            self.apply_app_settings()
+        
+    def kill(self):
+        """
+        Called at system exit to clean up any running presentations
+        """
+        log.debug('Kill Powerpoint')
+        while self.docs and self.process.isrunning():
+            self.docs[0].close_presentation()
+        if self.process is None or not self.process.isrunning():
+            return
+        try:
+            total = self.process.presentations()
+            if self.process and total != appscript.k.missing_value and len(total) > 0:
+                return
+            self.process.quit(saving = appscript.k.ask)
+        except appscript.CantLaunchApplicationError:
+            log.debug('Kill Keynote failed')
+        self.process = None
+        
+    def apply_app_settings(self):
+        """
+        Apply settings for PowerPoint
+        14\Options\Options\Save graphics screen heigth = 240
+        14\Options\Options\Save graphics screen width = 320
+        14\Options\Options\Save only current slide graphics = 0
+           
+        """
+        #TODO: add settings for different versions of MS PPT
+        pass
+
+
+class PowerpointDocument(PresentationDocument):
+    """
+    Class which holds information and controls a single presentation
+    """
+
+    def __init__(self, controller, presentation):
+        """
+        Constructor, store information about the file and initialise
+        """
+        log.debug('Init Presentation Powerpoint')
+        super(PowerpointDocument, self).__init__(controller, presentation)
+        self.presentation = None
+
+    def load_presentation(self):
+        """
+        Called when a presentation is added to the SlideController.
+        Opens the PowerPoint file using the process created earlier.
+        """
+        log.debug('load_presentation')        
+        if not self.controller.process or not self.controller.process.isrunning():
+            self.controller.start_process()
+        try:
+            self.controller.process.open(self.filepath)
+        except appscript.CommandError:
+            log.debug('PPT open failed')
+            return False 
+        presentations = self.controller.process.presentations()
+        for presentation in presentations:
+            full_name = presentation.full_name()
+            full_name = full_name.replace('Macintosh HD', '')
+            full_name = full_name.replace(':', '/')
+            if self.filepath == full_name:
+                self.presentation = presentation
+                self.create_thumbnails()
+                return True
+        return False
+
+    def create_thumbnails(self):
+        """
+        Create the thumbnail images for the current presentation.
+        """
+        log.debug('create_thumbnails')
+        if self.check_thumbnails():
+            return
+        thumbnail_folder = self.get_thumbnail_folder()
+        self.presentation.save(in_=thumbnail_folder, as_=appscript.k.save_as_PNG)
+        slide_no = 0
+        self.move_thumbnails(thumbnail_folder, slide_no, thumbnail_folder)
+    
+    def move_thumbnails(self, thumbnail_folder, slide_no, temp_dir):
+        """
+        Move the thumbnail images from subdirectories to right path.
+        """
+        if not os.path.isdir(temp_dir):
+            return
+        for filename in os.listdir(temp_dir):
+            full_filename = os.path.join(temp_dir, filename)
+            if os.path.isdir(full_filename):
+                self.move_thumbnails(thumbnail_folder, slide_no, full_filename)
+            elif os.path.isfile(full_filename) and filename.endswith('.png') and not filename == 'icon.png':
+                slide_no = slide_no + 1
+                new_name = os.path.join(thumbnail_folder, self.controller.thumbnail_prefix + str(slide_no) + '.png')
+                if full_filename == new_name \
+                    or full_filename.startswith(os.path.join(thumbnail_folder, self.controller.thumbnail_prefix)):
+                    continue
+                try:
+                    os.rename(full_filename, new_name)
+                except:
+                    open(new_name,'w').write(open(full_filename,'r').read())
+                    os.unlink(full_filename)
+        if temp_dir != thumbnail_folder:
+            try:
+                shutil.rmtree(temp_dir)
+            except:
+                pass
+
+    def close_presentation(self):
+        """
+        Close presentation and clean up objects. This is triggered by a new
+        object being added to SlideController or OpenLP being shut down.
+        """
+        log.debug('close_presentation')
+        if self.presentation:
+            try:
+                self.presentation.close()
+            except appscript.CommandError:
+                log.debug('Could not close the presentation')
+        self.presentation = None
+        self.controller.remove_doc(self)
+
+    def is_loaded(self):
+        """
+        Returns ``True`` if a presentation is loaded.
+        """
+        log.debug('is_loaded')        
+        try:
+            if not self.controller.process.isrunning():
+                return False
+            if len(self.controller.process.document_windows()) == 0:
+                return False
+            presentations = self.controller.process.presentations()
+            if len(presentations) == 0:
+                return False         
+        except:
+            return False
+        for presentation in presentations:
+            full_name = presentation.full_name()
+            full_name = full_name.replace('Macintosh HD', '')
+            full_name = full_name.replace(':', '/')
+            if self.filepath == full_name:
+                return True
+        return False
+
+    def is_active(self):
+        """
+        Returns ``True`` if a presentation is currently active.
+        """
+        log.debug('is_active')
+        if not self.is_loaded():
+            return False        
+        try:
+            slide_show_window = self.presentation.slide_show_window
+            if slide_show_window is None:
+                return False
+            slide_state = self.presentation.slide_show_window.slideshow_view.slide_state()
+            if slide_state is None or slide_state == appscript.k.missing_value:
+                return False
+        except:
+            return False
+        return True
+
+    def unblank_screen(self):
+        """
+        Unblanks (restores) the presentation.
+        """
+        log.debug('unblank_screen')        
+        if self.is_blank():
+            settings = self.presentation.slide_show_settings
+            self.presentation.slide_show_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_running)
+            self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
+            self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
+
+    def blank_screen(self):
+        """
+        Blanks the screen.
+        """
+        log.debug('blank_screen')
+        self.presentation.slide_show_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_black_screen)
+
+    def is_blank(self):
+        """
+        Returns ``True`` if screen is blank.
+        """
+        log.debug('is_blank')
+        if self.is_active() and self.presentation.slide_show_window.slideshow_view\
+            .slide_state() is appscript.k.slide_show_state_black_screen:
+            return True
+        else:
+            return False
+
+    def stop_presentation(self):
+        """
+        Stops the current presentation and hides the output.
+        """
+        log.debug('stop_presentation')        
+        self.presentation.slide_show_window.slideshow_view.exit_slide_show()
+
+    
+    def start_presentation(self):
+        """
+        Starts a presentation from the beginning.
+        """
+        log.debug('start_presentation')
+        rect = ScreenList().current['size']          
+        ppt_settings = self.presentation.slide_show_settings
+        openlp_settings = Settings("openlp.org","OpenLP")
+        show_presenter_view = openlp_settings.value(self.controller.plugin.settings_section + '/show presenter view')
+        override_position = openlp_settings.value( 'general/override position')
+        if show_presenter_view:
+            ppt_settings.show_type.set(appscript.k.slide_show_type_presenter)
+        elif override_position:
+            ppt_settings.show_type.set(appscript.k.slide_show_type_window)
+        else:
+            ppt_settings.show_type.set(appscript.k.slide_show_type_kiosk)
+            #ppt_settings.show_type.set(appscript.k.slide_show_type_speaker) 
+        ppt_window = ppt_settings.run_slide_show()
+        #TODO: set slideshow state = running
+#        if ppt_window.slideshow_view.slide_state() != appscript.k.slide_show_state_running:
+#            ppt_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_running)
+        if not ppt_window or show_presenter_view:
+            return
+        if override_position:
+            top = float(rect.y())
+            height = float(rect.height())
+            left_position = float(rect.x())
+            width = float(rect.width())
+            ppt_window.top.set(top)
+            ppt_window.height.set(height)
+            ppt_window.left_position.set(left_position)
+            ppt_window.width.set(width)
+        else:
+            #TODO: set output monitor for fullscreen mode
+            pass       
+
+    def get_slide_number(self):
+        """
+        Returns the current slide number.
+        """
+        log.debug('get_slide_number')        
+        return self.presentation.slide_show_window.slideshow_view.current_show_position()
+
+    def get_slide_count(self):
+        """
+        Returns total number of slides.
+        """
+        log.debug('get_slide_count')
+        return len(self.presentation.slides())
+
+    def goto_slide(self, slideno):
+        """
+        Moves to a specific slide in the presentation.
+        """
+        log.debug('goto_slide') 
+        #FIXME: this works. but needs to fix this dumb code
+        while self.get_slide_number() != slideno:
+            if self.get_slide_number() < slideno:
+                self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
+            else:
+                self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
+        self.controller.process.activate()
+
+    def next_step(self):
+        """
+        Triggers the next effect of slide on the running presentation.
+        """
+        log.debug('next_step')
+        #TODO: check if slideshow stoped then restart it from current position
+        if self.is_active():
+            self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
+            self.controller.process.activate()
+            if self.get_slide_number() > self.get_slide_count():
+                self.previous_step()
+
+    def previous_step(self):
+        """
+        Triggers the previous slide on the running presentation.
+        """
+        log.debug('previous_step')
+        #TODO: check if slideshow stoped then restart it from current position
+        if self.is_active():
+            self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
+            self.controller.process.activate()
+
+    def get_slide_text(self, slide_no):
+        """
+        Returns the text on the slide.
+
+        ``slide_no``
+            The slide the text is required for, starting at 1.
+        """
+        return _get_text_from_shapes(self.presentation.slides[slide_no-1].shapes)
+
+    def get_slide_notes(self, slide_no):
+        """
+        Returns the text on the slide.
+
+        ``slide_no``
+            The slide the notes are required for, starting at 1.
+        """
+        return _get_text_from_shapes(
+            self.presentation.slides[slide_no].notes_page.shapes())
+
+def _get_text_from_shapes(shapes):
+    """
+    Returns any text extracted from the shapes on a presentation slide.
+
+    ``shapes``
+        A set of shapes to search for text.
+    """
+    text = ''
+    for idx in range(len(shapes)):
+        shape = shapes[idx + 1]
+        if shape.has_text_frame():
+            text += shape.text_frame.text_range.content() + '\n'
+    return text
 
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2013-10-13 20:36:42 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2013-10-24 16:44:10 +0000
@@ -71,6 +71,11 @@
         self.override_app_check_box = QtGui.QCheckBox(self.advanced_group_box)
         self.override_app_check_box.setObjectName('override_app_check_box')
         self.advanced_layout.addWidget(self.override_app_check_box)
+        self.show_presenter_view_check_box = QtGui.QCheckBox(self.advanced_group_box)
+        self.show_presenter_view_check_box.setObjectName(u'show_presenter_view_check_box')        
+        self.advanced_layout.addWidget(self.show_presenter_view_check_box)
+        if not sys.platform.startswith('darwin'):
+            self.show_presenter_view_check_box.setVisible(False)
         self.left_layout.addWidget(self.advanced_group_box)
         self.left_layout.addStretch()
         self.right_layout.addStretch()
@@ -87,6 +92,8 @@
         self.advanced_group_box.setTitle(UiStrings().Advanced)
         self.override_app_check_box.setText(
             translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
+        self.show_presenter_view_check_box.setText(translate('PresentationPlugin.PresentationTab', 
+            'Show Presenter View'))
 
     def set_controller_text(self, checkbox, controller):
         if checkbox.isEnabled():
@@ -103,6 +110,7 @@
             checkbox = self.presenter_check_boxes[controller.name]
             checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name))
         self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app'))
+        self.show_presenter_view_check_box.setChecked(Settings().value(self.settings_section + '/show presenter view'))
 
     def save(self):
         """
@@ -128,6 +136,10 @@
         if Settings().value(setting_key) != self.override_app_check_box.checkState():
             Settings().setValue(setting_key, self.override_app_check_box.checkState())
             changed = True
+        setting_key = self.settings_section + '/show presenter view'
+        if Settings().value(setting_key) != self.show_presenter_view_check_box.checkState():
+            Settings().setValue(setting_key, self.show_presenter_view_check_box.isChecked())
+            changed = True
         if changed:
             self.settings_form.register_post_process('mediaitem_suffix_reset')
             self.settings_form.register_post_process('mediaitem_presentation_rebuild')
 
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2013-10-13 21:07:28 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2013-10-24 16:44:10 +0000
@@ -31,6 +31,7 @@
 formats.
 """
 import os
+import sys
 import logging
 
 from PyQt4 import QtCore
@@ -48,6 +49,11 @@
         'presentations/Impress': QtCore.Qt.Checked,
         'presentations/Powerpoint': QtCore.Qt.Checked,
         'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
+        'presentations/Keynote': QtCore.Qt.Checked,
+        'presentations/show presenter view': QtCore.Qt.Checked,
+        'PresentationModeUseSecondary': '',
+        'PresentationModeEnableFeedbackDisplay': False,
+        'PresentationModePlayWellWithOthers': False, 
         'presentations/presentations files': []
 }
 
@@ -125,6 +131,12 @@
         controller_dir = os.path.join(AppLocation.get_directory(AppLocation.PluginsDir), 'presentations', 'lib')
         for filename in os.listdir(controller_dir):
             if filename.endswith('controller.py') and not filename == 'presentationcontroller.py':
+                if not sys.platform.startswith('darwin') and filename == 'powerpointmaccontroller.py':
+                    continue
+                if not sys.platform.startswith('darwin') and filename == 'keynotemaccontroller.py':
+                    continue
+                if not sys.platform.startswith('win') and filename == 'powerpointcontroller.py':
+                    continue
                 path = os.path.join(controller_dir, filename)
                 if os.path.isfile(path):
                     module_name = 'openlp.plugins.presentations.lib.' + os.path.splitext(filename)[0]
 
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py	2013-10-03 19:56:12 +0000
+++ scripts/check_dependencies.py	2013-10-24 16:44:10 +0000
@@ -47,6 +47,7 @@
     nose = None
 
 IS_WIN = sys.platform.startswith('win')
+IS_OSX = sys.platform.startswith('darwin')
 
 
 VERS = {
@@ -57,6 +58,8 @@
     # pyenchant 1.6 required on Windows
     'enchant': '1.6' if IS_WIN else '1.3'
 }
+if IS_OSX:
+    VERS.update({'appscript': '1.0.0'})
 
 # pywin32
 WIN32_MODULES = [
@@ -67,6 +70,11 @@
     'icu',
 ]
 
+# OSX
+OSX_MODULES = [
+    'appscript',
+    'mactypes', 
+]
 MODULES = [
     'PyQt4',
     'PyQt4.QtCore',
@@ -177,6 +185,12 @@
         check_vers(enchant.__version__, VERS['enchant'], 'enchant')
     except ImportError:
         print_vers_fail(VERS['enchant'], 'enchant')
+    if IS_OSX:
+        try:
+            import appscript
+            check_vers(appscript.__version__, VERS['appscript'], 'appscript')
+        except ImportError:
+            print_vers_fail(VERS['appscript'], 'appscript')
 
 
 def print_enchant_backends_and_languages():
@@ -228,6 +242,10 @@
         print('Checking for Windows specific modules...')
         for m in WIN32_MODULES:
             check_module(m)
+    if IS_OSX:
+        print('Checking for OS X specific modules...')
+        for m in OSX_MODULES:
+            check_module(m)
     verify_versions()
     print_qt_image_formats()
     print_enchant_backends_and_languages()
 
=== added file 'tests/functional/openlp_plugins/presentations/test_keynotemaccontroller.py'
--- tests/functional/openlp_plugins/presentations/test_keynotemaccontroller.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_plugins/presentations/test_keynotemaccontroller.py	2013-10-24 16:44:10 +0000
@@ -0,0 +1,93 @@
+"""
+This module contains tests for the KeynoteController class of the Presentations plugin.
+"""
+
+from unittest import TestCase
+
+from mock import MagicMock
+import os
+from openlp.plugins.presentations.lib.keynotemaccontroller import KeynoteController, KeynoteDocument
+
+RESOURCES_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources'))
+
+# TODO: write tests for classes
+# - KeynoteController
+# - KeynoteDocument
+
+class TestKeynoteController(TestCase):
+    """
+    Test the KeynoteController class
+    """
+    def setUp(self):
+        """
+        Set up the KeynoteController
+        """
+        presentation_controller = MagicMock()
+        presentation_controller.settings_section = 'presentations'
+        self.keynote_controller = KeynoteController(presentation_controller)
+        self.file_name = os.path.join(RESOURCES_PATH,'test.key')
+        self.doc = KeynoteDocument(self.keynote_controller,self.file_name)
+        self.doc.presentation_deleted()
+
+    def kill_test(self):
+        """
+        Test running the kill() method with an KeynoteController
+        """
+        # GIVEN: A KeynoteController instance and a list of documents
+        presentation_controller = MagicMock()
+        presentation_controller.settings_section = 'presentations'
+        keynote_controller = KeynoteController(presentation_controller)
+        key_document = MagicMock()
+        keynote_controller.docs.append(key_document)
+        # WHEN: we run kill()
+        keynote_controller.kill()
+        # THEN: all docs should be deleted from controller
+        assert keynote_controller.docs.count() == 0, 'The keynote_controller should close all documents.'
+        assert keynote_controller.process in None, 'The keynote_controller should shout down KeyNote application.'
+
+    def verify_installation_test(self):
+        """
+        Test the installation of KeyNote
+        """
+        # GIVEN: A boolean value set to true
+        # WHEN: We "convert" it to a bool
+        is_installed = self.keynote_controller.check_available()
+        # THEN: We should get back a True bool
+        assert is_installed is True, u'The result of check_available() should be True'
+
+    def start_process_test(self):
+        """
+        Test the start_process() of KeyNote
+        """
+        # GIVEN: A boolean value set to true
+        # WHEN: We "convert" it to a bool
+        self.keynote_controller.start_process()
+        # THEN: The process should not be None
+        assert self.keynote_controller.process is not None, u'The result of start_process() should be True'
+
+    def load_presentation_test(self):
+        """
+        Test loading a document in KeyNote
+        """
+        # GIVEN: the filename
+        self.doc = KeynoteDocument(self.keynote_controller,self.file_name)
+        # WHEN: loading the filename
+        self.doc.load_presentation()
+        result = self.doc.is_loaded()
+        # THEN: result should be true
+        assert result is True, u'The KeyNote should load document'
+        assert self.keynote_controller.docs.count() != 0, 'The keynote_controller.docs should have one document.'
+
+    def close_presentation_test(self):
+        """
+        Test closing a document in KeyNote
+        """
+        # GIVEN: loading the filename
+        self.doc = KeynoteDocument(self.keynote_controller,self.file_name)
+        self.doc.load_presentation()
+        # WHEN: closing the filename
+        self.doc.close_presentation()
+        result = self.doc.is_loaded()
+        # THEN: result should be true
+        assert result is False, u'The KeyNote should close document'
+        assert self.keynote_controller.docs.count() == 0, 'The keynote_controller.docs should have 0 documents.'
 
=== added file 'tests/functional/openlp_plugins/presentations/test_powepointmaccontroller.py'
--- tests/functional/openlp_plugins/presentations/test_powepointmaccontroller.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_plugins/presentations/test_powepointmaccontroller.py	2013-10-24 16:44:10 +0000
@@ -0,0 +1,93 @@
+"""
+This module contains tests for the PowerpointController class of the Presentations plugin.
+"""
+
+from unittest import TestCase
+
+from mock import MagicMock
+import os
+from openlp.plugins.presentations.lib.powerpointmaccontroller import PowerpointController, PowerpointDocument
+
+RESOURCES_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources'))
+
+# TODO: write tests for classes
+# - PowerpointController
+# - PowerpointDocument
+
+class TestPowerpointController(TestCase):
+    """
+    Test the PowerpointController class
+    """
+    def setUp(self):
+        """
+        Set up the PowerpointController
+        """
+        presentation_controller = MagicMock()
+        presentation_controller.settings_section = 'presentations'
+        self.powerpoint_controller = PowerpointController(presentation_controller)
+        self.file_name = os.path.join(RESOURCES_PATH,'test.pptx')
+        self.doc = PowerpointDocument(self.powerpoint_controller,self.file_name)
+        self.doc.presentation_deleted()
+
+    def kill_test(self):
+        """
+        Test running the kill() method with an PowerpointController
+        """
+        # GIVEN: A PowerpointController instance and a list of documents
+        presentation_controller = MagicMock()
+        presentation_controller.settings_section = 'presentations'
+        powerpoint_controller = PowerpointController(presentation_controller)
+        ppt_document = MagicMock()
+        powerpoint_controller.docs.append(ppt_document)
+        # WHEN: we run kill()
+        powerpoint_controller.kill()
+        # THEN: all docs should be deleted from controller
+        assert powerpoint_controller.docs.count() == 0, 'The powerpoint_controller should close all documents.'
+        assert powerpoint_controller.process in None, 'The powerpoint_controller should shout down PPT application.'
+
+    def verify_installation_test(self):
+        """
+        Test the installation of PPT
+        """
+        # GIVEN: A boolean value set to true
+        # WHEN: We "convert" it to a bool
+        is_installed = self.powerpoint_controller.check_available()
+        # THEN: We should get back a True bool
+        assert is_installed is True, u'The result of check_available() should be True'
+
+    def start_process_test(self):
+        """
+        Test the start_process() of PPT
+        """
+        # GIVEN: A boolean value set to true
+        # WHEN: We "convert" it to a bool
+        self.powerpoint_controller.start_process()
+        # THEN: The process should not be None
+        assert self.powerpoint_controller.process is not None, u'The result of start_process() should be True'
+
+    def load_presentation_test(self):
+        """
+        Test loading a document in PPT
+        """
+        # GIVEN: the filename
+        self.doc = PowerpointDocument(self.powerpoint_controller,self.file_name)
+        # WHEN: loading the filename
+        self.doc.load_presentation()
+        result = self.doc.is_loaded()
+        # THEN: result should be true
+        assert result is True, u'The PPT should load document'
+        assert self.powerpoint_controller.docs.count() != 0, 'The powerpoint_controller.docs should have one document.'
+
+    def close_presentation_test(self):
+        """
+        Test closing a document in PPT
+        """
+        # GIVEN: loading the filename
+        self.doc = PowerpointDocument(self.powerpoint_controller,self.file_name)
+        self.doc.load_presentation()
+        # WHEN: closing the filename
+        self.doc.close_presentation()
+        result = self.doc.is_loaded()
+        # THEN: result should be true
+        assert result is False, u'The PPT should close document'
+        assert self.powerpoint_controller.docs.count() == 0, 'The powerpoint_controller.docs should have 0 documents.'