1
=== modified file 'openlp/core/lib/pluginmanager.py'
2
--- openlp/core/lib/pluginmanager.py	2013-03-19 19:43:22 +0000
3
+++ openlp/core/lib/pluginmanager.py	2013-04-01 23:08:22 +0000
4
@@ -94,11 +94,6 @@
5
94
        present_plugin_dir = os.path.join(self.base_path, 'presentations')
94
        present_plugin_dir = os.path.join(self.base_path, 'presentations')
6
95
        log.debug(u'finding plugins in %s at depth %d', unicode(self.base_path), start_depth)
95
        log.debug(u'finding plugins in %s at depth %d', unicode(self.base_path), start_depth)
7
96
        for root, dirs, files in os.walk(self.base_path):
96
        for root, dirs, files in os.walk(self.base_path):
8
97
            if sys.platform == 'darwin' and root.startswith(present_plugin_dir):
9
98
                # TODO Presentation plugin is not yet working on Mac OS X.
10
99
                # For now just ignore it. The following code will ignore files from the presentation plugin directory
11
100
                # and thereby never import the plugin.
12
101
                continue
13
102
            for name in files:
97
            for name in files:
14
103
                if name.endswith(u'.py') and not name.startswith(u'__'):
98
                if name.endswith(u'.py') and not name.startswith(u'__'):
15
104
                    path = os.path.abspath(os.path.join(root, name))
99
                    path = os.path.abspath(os.path.join(root, name))
16
105
100
17
=== added file 'openlp/plugins/presentations/lib/keynotemaccontroller.py'
18
--- openlp/plugins/presentations/lib/keynotemaccontroller.py	1970-01-01 00:00:00 +0000
19
+++ openlp/plugins/presentations/lib/keynotemaccontroller.py	2013-04-01 23:08:22 +0000
20
@@ -0,0 +1,362 @@
21
1
# -*- coding: utf-8 -*-
22
2
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
23
3
24
4
###############################################################################
25
5
# OpenLP - Open Source Lyrics Projection                                      #
26
6
# --------------------------------------------------------------------------- #
27
7
# Copyright (c) 2008-2012 Raoul Snyman                                        #
28
8
# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
29
9
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
30
10
# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
31
11
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
32
12
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
33
13
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
34
14
# Frode Woldsund, Martin Zibricky                                             #
35
15
# --------------------------------------------------------------------------- #
36
16
# This program is free software; you can redistribute it and/or modify it     #
37
17
# under the terms of the GNU General Public License as published by the Free  #
38
18
# Software Foundation; version 2 of the License.                              #
39
19
#                                                                             #
40
20
# This program is distributed in the hope that it will be useful, but WITHOUT #
41
21
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
42
22
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
43
23
# more details.                                                               #
44
24
#                                                                             #
45
25
# You should have received a copy of the GNU General Public License along     #
46
26
# with this program; if not, write to the Free Software Foundation, Inc., 59  #
47
27
# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
48
28
###############################################################################
49
29
50
30
import os
51
31
import sys
52
32
import logging
53
33
import mactypes
54
34
55
35
import appscript
56
36
57
37
from openlp.core.lib import Settings,  ScreenList
58
38
from presentationcontroller import PresentationController, PresentationDocument
59
39
60
40
61
41
log = logging.getLogger(__name__)
62
42
63
43
64
44
class KeynoteController(PresentationController):
65
45
    """
66
46
    Class to control interactions with KeyNote Presentations
67
47
    It creates the runtime Environment , Loads the and Closes the Presentation
68
48
    As well as triggering the correct activities based on the users input
69
49
    """
70
50
    log.info(u'KeynoteController loaded')
71
51
72
52
    def __init__(self, plugin):
73
53
        """
74
54
        Initialise the class
75
55
        """
76
56
        log.debug(u'Initialising')
77
57
        PresentationController.__init__(self, plugin, u'Keynote', KeynoteDocument)
78
58
        self.supports = [u'key']
79
59
        self.process = None
80
60
81
61
    def check_available(self):
82
62
        """
83
63
        KeyNote is able to run on this machine
84
64
        """
85
65
        log.debug(u'check_available')
86
66
        try:
87
67
            self.process = appscript.app('Keynote')
88
68
        except appscript.ApplicationNotFoundError:
89
69
            return False
90
70
        self.kill()
91
71
        return True
92
72
    
93
73
    def start_process(self):
94
74
        """
95
75
        Loads KeyNote process
96
76
        """
97
77
        log.debug(u'start_process')
98
78
        if not self.process or not self.process.isrunning():            
99
79
            self.process = appscript.app('Keynote')
100
80
            self.process.relaunchmode = 'limited' #'always'
101
81
            self.process.launch()
102
82
            self.apply_app_settings()
103
83
        
104
84
    def kill(self):
105
85
        """
106
86
        Called at system exit to clean up any running presentations
107
87
        """
108
88
        log.debug(u'Kill Keynote')
109
89
        while self.docs and self.process.isrunning():
110
90
            self.docs[0].close_presentation()
111
91
        if self.process is None or not self.process.isrunning():
112
92
            return    
113
93
        try:
114
94
            total = self.process.slideshows()
115
95
            if self.process and total != appscript.k.missing_value and len(total) > 0:
116
96
                return
117
97
            self.process.quit(saving = appscript.k.ask)
118
98
        except appscript.CantLaunchApplicationError:
119
99
            pass
120
100
        self.process = None
121
101
        
122
102
    def apply_app_settings(self):
123
103
        """
124
104
        Apply settings for Keynote
125
105
        PresentationModeEnableFeedbackDisplay = True if in settings of OpenLP show presenter view = True
126
106
        PresentationModeUseSecondary = 1 if OpenLP monitor for output = Screen 2        
127
107
        """
128
108
        openlp_settings = Settings(u'openlp.org',u'OpenLP')        
129
109
        keynote_settings = Settings(u'apple', u'iWork.Keynote')
130
110
        use_secondary = int(keynote_settings.value(u'PresentationModeUseSecondary'))
131
111
        monitor = openlp_settings.value( u'general/monitor')
132
112
        override_position = openlp_settings.value( u'general/override position')
133
113
        if not override_position and use_secondary != monitor:            
134
114
            keynote_settings.setValue(u'PresentationModeUseSecondary', unicode(monitor))
135
115
        elif override_position and use_secondary != 0:
136
116
            keynote_settings.setValue(u'PresentationModeUseSecondary', u'0')            
137
117
        show_presenter_view = openlp_settings.value(self.plugin.settingsSection + u'/show presenter view')
138
118
        keynote_feedback_display = keynote_settings.value(u'PresentationModeEnableFeedbackDisplay')
139
119
        if show_presenter_view != keynote_feedback_display:
140
120
            keynote_settings.setValue(u'PresentationModeEnableFeedbackDisplay', show_presenter_view)
141
121
        play_well_with_others = keynote_settings.value(u'PresentationModePlayWellWithOthers')
142
122
        if not play_well_with_others:
143
123
            keynote_settings.setValue(u'PresentationModePlayWellWithOthers', True)
144
124
        
145
125
146
126
class KeynoteDocument(PresentationDocument):
147
127
    """
148
128
    Class which holds information and controls a single presentation
149
129
    """
150
130
151
131
    def __init__(self, controller, presentation):
152
132
        """
153
133
        Constructor, store information about the file and initialise
154
134
        """
155
135
        log.debug(u'Init Presentation Keynote')
156
136
        PresentationDocument.__init__(self, controller, presentation)
157
137
        self.presentation = None
158
138
159
139
    def load_presentation(self):
160
140
        """
161
141
        Called when a presentation is added to the SlideController.
162
142
        Opens the Keynote file using the process created earlier.
163
143
        """
164
144
        log.debug(u'load_presentation')        
165
145
        if not self.controller.process or not self.controller.process.isrunning():
166
146
            self.controller.start_process()
167
147
        try:
168
148
            self.controller.process.open(self.filepath)
169
149
        except appscript.CommandError:
170
150
            log.debug(u'Keynote open failed')
171
151
            return False
172
152
        slideshows = self.controller.process.slideshows()
173
153
        for slideshow in slideshows:
174
154
            path = slideshow.path()
175
155
            if self.filepath == path:
176
156
                self.presentation = slideshow
177
157
                self.create_thumbnails()
178
158
                return True
179
159
        self.presentation = None
180
160
        return False
181
161
182
162
    def create_thumbnails(self):
183
163
        """
184
164
        Create the thumbnail images for the current presentation.
185
165
        """
186
166
        log.debug(u'create_thumbnails')
187
167
        if self.check_thumbnails():
188
168
            return
189
169
        thumbnail_folder = self.get_thumbnail_folder()
190
170
        if not os.path.exists(thumbnail_folder): 
191
171
            os.makedirs(thumbnail_folder)
192
172
        try:
193
173
            self.controller.process.open(self.filepath)
194
174
        except appscript.CommandError:
195
175
            log.debug(u'KeyNote open failed')
196
176
            return
197
177
        temp_dir = self.controller.thumbnail_folder
198
178
        keystroke = os.path.join(temp_dir, u'temp' + self.controller.thumbnail_prefix)
199
179
        self.controller.process.activate()
200
180
        appscript.app(u'System Events').processes[u'Keynote'].menu_bars[1].menu_bar_items[3].menus.menu_items[11].click()
201
181
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].tool_bars.buttons[4].click()
202
182
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].radio_groups[1].radio_buttons[1].click()
203
183
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].pop_up_buttons[1].click()
204
184
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].pop_up_buttons[1]\
205
185
            .menus.menu_items[2].click()
206
186
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].buttons[2].click()
207
187
        appscript.app(u'System Events').processes[u'Keynote'].keystroke(keystroke)
208
188
        appscript.app(u'System Events').processes[u'Keynote'].key_code(36)
209
189
        appscript.app(u'System Events').processes[u'Keynote'].windows[1].sheets[1].buttons[1].click()
210
190
        self.controller.plugin._main_window.activateWindow()
211
191
        slide_no = 0
212
192
        for filename in os.listdir(temp_dir):
213
193
            full_filename = os.path.join(temp_dir, filename)
214
194
            if not os.path.isfile(full_filename) or not filename.endswith(u'.png') or filename == u'icon.png':
215
195
                continue
216
196
            slide_no = slide_no + 1
217
197
            if not filename.startswith(self.controller.thumbnail_prefix):                    
218
198
                path = os.path.join(thumbnail_folder,
219
199
                    self.controller.thumbnail_prefix + unicode(slide_no) + u'.png')
220
200
                try:
221
201
                    os.rename(full_filename, path)
222
202
                except:
223
203
                    open(path,'w').write(open(full_filename,'r').read())
224
204
                    os.unlink(full_filename)
225
205
226
206
    def close_presentation(self):
227
207
        """
228
208
        Close presentation and clean up objects. This is triggered by a new
229
209
        object being added to SlideController or OpenLP being shut down.
230
210
        """
231
211
        log.debug(u'ClosePresentation')
232
212
        if self.presentation:
233
213
            try:
234
214
                self.presentation.close()
235
215
            except appscript.CommandError:
236
216
                pass
237
217
        self.presentation = None
238
218
        self.controller.remove_doc(self)
239
219
240
220
    def is_loaded(self):
241
221
        """
242
222
        Returns ``True`` if a presentation is loaded.
243
223
        """
244
224
        log.debug(u'is_loaded')        
245
225
        try:
246
226
            if not self.controller.process.isrunning():
247
227
                return False
248
228
            windows = self.controller.process.windows()
249
229
            if len(windows) == 0:
250
230
                return False
251
231
            slideshows = self.controller.process.slideshows()
252
232
            if len(slideshows) == 0:
253
233
                return False
254
234
        except:
255
235
            return False
256
236
        for slideshow in slideshows:
257
237
            path = slideshow.path()
258
238
            if self.filepath == path:
259
239
                return True
260
240
        return False
261
241
262
242
    def is_active(self):
263
243
        """
264
244
        Returns ``True`` if a presentation is currently active.
265
245
        """
266
246
        log.debug(u'is_active')
267
247
        if not self.is_loaded():
268
248
            return False        
269
249
        try:
270
250
            if not self.presentation.playing():
271
251
                return False
272
252
        except appscript.CommandError:
273
253
            return False
274
254
        return True
275
255
276
256
    def unblank_screen(self):
277
257
        """
278
258
        Unblanks (restores) the presentation.
279
259
        """
280
260
        log.debug(u'unblank_screen')
281
261
        if self.is_blank():
282
262
            slef.presentation.start_presentation()
283
263
284
264
    def blank_screen(self):
285
265
        """
286
266
        Blanks the screen.
287
267
        """
288
268
        log.debug(u'blank_screen')
289
269
        self.presentation.stop_slideshow()
290
270
291
271
    def is_blank(self):
292
272
        """
293
273
        Returns ``True`` if screen is blank.
294
274
        """
295
275
        log.debug(u'is_blank')
296
276
        if self.is_active():
297
277
            return not self.presentation.playing()
298
278
        else:
299
279
            return False
300
280
301
281
    def stop_presentation(self):
302
282
        """
303
283
        Stops the current presentation and hides the output.
304
284
        """
305
285
        log.debug(u'stop_presentation')        
306
286
        self.presentation.stop_slideshow()
307
287
308
288
    
309
289
    def start_presentation(self):
310
290
        """
311
291
        Starts a presentation from the beginning.
312
292
        """
313
293
        log.debug(u'start_presentation')
314
294
        if not self.is_active():
315
295
            self.controller.apply_app_settings()
316
296
            try:
317
297
                self.presentation.start()
318
298
            except appscript.CommandError:
319
299
                return
320
300
            rect = ScreenList().current[u'size']
321
301
            top = rect.y()    
322
302
            height = rect.height() 
323
303
            left_position = rect.x()
324
304
            width = rect.width()
325
305
            self.controller.process.windows[1].bounds.set([left_position, top, left_position + width, top + height])
326
306
327
307
    def get_slide_number(self):
328
308
        """
329
309
        Returns the current slide number.
330
310
        """
331
311
        log.debug(u'get_slide_number')        
332
312
        return self.presentation.current_slide().slide_number()
333
313
334
314
    def get_slide_count(self):
335
315
        """
336
316
        Returns total number of slides.
337
317
        """
338
318
        log.debug(u'get_slide_count')
339
319
        slides = self.presentation.slides()
340
320
        return len(slides)
341
321
342
322
    def goto_slide(self, slideno):
343
323
        """
344
324
        Moves to a specific slide in the presentation.
345
325
        """
346
326
        log.debug(u'goto_slide') 
347
327
        slide = self.presentation.slides()[slideno-1]
348
328
        self.presentation.show(slide)
349
329
350
330
    def next_step(self):
351
331
        """
352
332
        Triggers the next effect of slide on the running presentation.
353
333
        """
354
334
        log.debug(u'next_step')       
355
335
        self.presentation.show_next()
356
336
        if self.get_slide_number() > self.get_slide_count():
357
337
            self.previous_step()
358
338
359
339
    def previous_step(self):
360
340
        """
361
341
        Triggers the previous slide on the running presentation.
362
342
        """
363
343
        log.debug(u'previous_step')        
364
344
        self.presentation.show_previous()
365
345
366
346
    def get_slide_text(self, slide_no):
367
347
        """
368
348
        Returns the text on the slide.
369
349
370
350
        ``slide_no``
371
351
            The slide the text is required for, starting at 1.
372
352
        """
373
353
        return self.presentation.slides[slide_no].body
374
354
375
355
    def get_slide_notes(self, slide_no):
376
356
        """
377
357
        Returns the text on the slide.
378
358
379
359
        ``slide_no``
380
360
            The slide the notes are required for, starting at 1.
381
361
        """
382
362
        return self.presentation.slides[slide_no].notes
383
0
363
384
=== added file 'openlp/plugins/presentations/lib/powerpointmaccontroller.py'
385
--- openlp/plugins/presentations/lib/powerpointmaccontroller.py	1970-01-01 00:00:00 +0000
386
+++ openlp/plugins/presentations/lib/powerpointmaccontroller.py	2013-04-01 23:08:22 +0000
387
@@ -0,0 +1,401 @@
388
1
# -*- coding: utf-8 -*-
389
2
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
390
3
391
4
###############################################################################
392
5
# OpenLP - Open Source Lyrics Projection                                      #
393
6
# --------------------------------------------------------------------------- #
394
7
# Copyright (c) 2008-2012 Raoul Snyman                                        #
395
8
# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
396
9
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
397
10
# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
398
11
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
399
12
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
400
13
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
401
14
# Frode Woldsund, Martin Zibricky                                             #
402
15
# --------------------------------------------------------------------------- #
403
16
# This program is free software; you can redistribute it and/or modify it     #
404
17
# under the terms of the GNU General Public License as published by the Free  #
405
18
# Software Foundation; version 2 of the License.                              #
406
19
#                                                                             #
407
20
# This program is distributed in the hope that it will be useful, but WITHOUT #
408
21
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
409
22
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
410
23
# more details.                                                               #
411
24
#                                                                             #
412
25
# You should have received a copy of the GNU General Public License along     #
413
26
# with this program; if not, write to the Free Software Foundation, Inc., 59  #
414
27
# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
415
28
###############################################################################
416
29
417
30
import os
418
31
import sys
419
32
import logging
420
33
import shutil
421
34
import mactypes
422
35
423
36
import appscript
424
37
425
38
from openlp.core.lib import Settings,  ScreenList
426
39
from presentationcontroller import PresentationController, PresentationDocument
427
40
428
41
429
42
log = logging.getLogger(__name__)
430
43
431
44
432
45
class PowerpointController(PresentationController):
433
46
    """
434
47
    Class to control interactions with PowerPoint Presentations
435
48
    It creates the runtime Environment , Loads the and Closes the Presentation
436
49
    As well as triggering the correct activities based on the users input
437
50
    """
438
51
    log.info(u'PowerpointController loaded')
439
52
440
53
    def __init__(self, plugin):
441
54
        """
442
55
        Initialise the class
443
56
        """
444
57
        log.debug(u'Initialising')
445
58
        PresentationController.__init__(self, plugin, u'Powerpoint', PowerpointDocument)
446
59
        self.supports = [u'ppt', u'pps', u'pptx', u'ppsx']
447
60
        self.process = None
448
61
449
62
    def check_available(self):
450
63
        """
451
64
        PowerPoint is able to run on this machine
452
65
        """
453
66
        log.debug(u'check_available')
454
67
        try:
455
68
            self.process = appscript.app(id='com.microsoft.powerpoint')
456
69
        except appscript.ApplicationNotFoundError:
457
70
            return False
458
71
        self.kill()
459
72
        return True
460
73
    
461
74
    def start_process(self):
462
75
        """
463
76
        Loads PowerPoint process
464
77
        """
465
78
        log.debug(u'start_process')
466
79
        if not self.process  or not self.process.isrunning():            
467
80
            self.process = appscript.app(id='com.microsoft.powerpoint')
468
81
            self.process.relaunchmode = 'limited' #'always'
469
82
            self.process.launch()
470
83
            self.apply_app_settings()
471
84
        
472
85
    def kill(self):
473
86
        """
474
87
        Called at system exit to clean up any running presentations
475
88
        """
476
89
        log.debug(u'Kill Powerpoint')
477
90
        while self.docs and self.process.isrunning():
478
91
            self.docs[0].close_presentation()
479
92
        if self.process is None or not self.process.isrunning():
480
93
            return
481
94
        try:
482
95
            total = self.process.presentations()
483
96
            if self.process and total != appscript.k.missing_value and len(total) > 0:
484
97
                return
485
98
            self.process.quit(saving = appscript.k.ask)
486
99
        except appscript.CantLaunchApplicationError:
487
100
            pass
488
101
        self.process = None
489
102
        
490
103
    def apply_app_settings(self):
491
104
        """
492
105
        Apply settings for PowerPoint
493
106
        14\Options\Options\Save graphics screen heigth = 240
494
107
        14\Options\Options\Save graphics screen width = 320
495
108
        14\Options\Options\Save only current slide graphics = 0
496
109
           
497
110
        """
498
111
        openlp_settings = Settings("openlp.org","OpenLP")        
499
112
        ppt_settings = Settings("Microsoft", "Powerpoint")
500
113
#        use_secondary = int(keynote_settings.value(u'PresentationModeUseSecondary', u''))
501
114
#        monitor = openlp_settings.value( u'general/monitor',  0)
502
115
#        display_on_monitor = openlp_settings.value( u'general/display on monitor',  False)
503
116
#        if display_on_monitor and use_secondary != monitor:            
504
117
#            keynote_settings.setValue(u'PresentationModeUseSecondary', unicode(monitor))
505
118
#        elif not display_on_monitor and use_secondary > 0:
506
119
#            keynote_settings.setValue(u'PresentationModeUseSecondary', u'0')            
507
120
#        show_presenter_view = openlp_settings.value(self.plugin.settingsSection + u'/show presenter view',  False)
508
121
#        keynote_feedback_display = keynote_settings.value(u'PresentationModeEnableFeedbackDisplay', False)
509
122
#        if show_presenter_view != keynote_feedback_display:
510
123
#            keynote_settings.setValue(u'PresentationModeEnableFeedbackDisplay', show_presenter_view)
511
124
512
125
513
126
class PowerpointDocument(PresentationDocument):
514
127
    """
515
128
    Class which holds information and controls a single presentation
516
129
    """
517
130
518
131
    def __init__(self, controller, presentation):
519
132
        """
520
133
        Constructor, store information about the file and initialise
521
134
        """
522
135
        log.debug(u'Init Presentation Powerpoint')
523
136
        PresentationDocument.__init__(self, controller, presentation)
524
137
        self.presentation = None
525
138
526
139
    def load_presentation(self):
527
140
        """
528
141
        Called when a presentation is added to the SlideController.
529
142
        Opens the PowerPoint file using the process created earlier.
530
143
        """
531
144
        log.debug(u'load_presentation')        
532
145
        if not self.controller.process or not self.controller.process.isrunning():
533
146
            self.controller.start_process()
534
147
        try:
535
148
            self.controller.process.open(self.filepath)
536
149
        except appscript.CommandError:
537
150
            log.debug(u'PPT open failed')
538
151
            return False 
539
152
        presentations = self.controller.process.presentations()
540
153
        for presentation in presentations:
541
154
            full_name = presentation.full_name()
542
155
            full_name = full_name.replace(u'Macintosh HD', u'')
543
156
            full_name = full_name.replace(u':', u'/')
544
157
            if self.filepath == full_name:
545
158
                self.presentation = presentation
546
159
                self.create_thumbnails()
547
160
                return True
548
161
        return False
549
162
550
163
    def create_thumbnails(self):
551
164
        """
552
165
        Create the thumbnail images for the current presentation.
553
166
        """
554
167
        log.debug(u'create_thumbnails')
555
168
        if self.check_thumbnails():
556
169
            return
557
170
        thumbnail_folder = self.get_thumbnail_folder()
558
171
        self.presentation.save(in_ = thumbnail_folder, as_ = appscript.k.save_as_PNG)
559
172
        slide_no = 0
560
173
        temp_dir = os.path.join(thumbnail_folder, self.get_file_name())
561
174
        if not os.path.isdir(temp_dir):
562
175
#            log.debug(u'create_thumbnails failed')
563
176
            temp_dir = thumbnail_folder
564
177
        for filename in os.listdir(temp_dir):
565
178
            full_filename = os.path.join(temp_dir, filename)
566
179
            if not os.path.isfile(full_filename) or not filename.endswith(u'.png') or filename == u'icon.png':
567
180
                continue
568
181
            slide_no = slide_no + 1
569
182
            if not filename.startswith(self.controller.thumbnail_prefix):                    
570
183
                path = os.path.join(thumbnail_folder, 
571
184
                    self.controller.thumbnail_prefix + unicode(slide_no) + u'.png')
572
185
                try:
573
186
                    os.rename(full_filename, path)
574
187
                except:
575
188
                    open(path,'w').write(open(full_filename,'r').read())
576
189
                    os.unlink(full_filename)
577
190
        if temp_dir != thumbnail_folder:
578
191
            try:
579
192
                shutil.rmtree(temp_dir)
580
193
            except:
581
194
                pass
582
195
583
196
    def close_presentation(self):
584
197
        """
585
198
        Close presentation and clean up objects. This is triggered by a new
586
199
        object being added to SlideController or OpenLP being shut down.
587
200
        """
588
201
        log.debug(u'ClosePresentation')
589
202
        if self.presentation:
590
203
            try:
591
204
                self.presentation.close()
592
205
            except appscript.CommandError:
593
206
                pass
594
207
        self.presentation = None
595
208
        self.controller.remove_doc(self)
596
209
597
210
    def is_loaded(self):
598
211
        """
599
212
        Returns ``True`` if a presentation is loaded.
600
213
        """
601
214
        log.debug(u'is_loaded')        
602
215
        try:
603
216
            if not self.controller.process.isrunning():
604
217
                return False
605
218
            if len(self.controller.process.document_windows()) == 0:
606
219
                return False
607
220
            presentations = self.controller.process.presentations()
608
221
            if len(presentations) == 0:
609
222
                return False         
610
223
        except:
611
224
            return False
612
225
        for presentation in presentations:
613
226
            full_name = presentation.full_name()
614
227
            full_name = full_name.replace(u'Macintosh HD', u'')
615
228
            full_name = full_name.replace(u':', u'/')
616
229
            if self.filepath == full_name:
617
230
                return True
618
231
        return False
619
232
620
233
    def is_active(self):
621
234
        """
622
235
        Returns ``True`` if a presentation is currently active.
623
236
        """
624
237
        log.debug(u'is_active')
625
238
        if not self.is_loaded():
626
239
            return False        
627
240
        try:
628
241
            slide_show_window = self.presentation.slide_show_window
629
242
            if slide_show_window is None:
630
243
                return False
631
244
            slide_state = self.presentation.slide_show_window.slideshow_view.slide_state()
632
245
            if slide_state is None or slide_state == appscript.k.missing_value:
633
246
                return False
634
247
        except:
635
248
            return False
636
249
        return True
637
250
638
251
    def unblank_screen(self):
639
252
        """
640
253
        Unblanks (restores) the presentation.
641
254
        """
642
255
        log.debug(u'unblank_screen')        
643
256
        if self.is_blank():
644
257
            settings = self.presentation.slide_show_settings
645
258
            #settings.run_slide_show()
646
259
            self.presentation.slide_show_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_running)
647
260
            self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
648
261
            self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
649
262
650
263
    def blank_screen(self):
651
264
        """
652
265
        Blanks the screen.
653
266
        """
654
267
        log.debug(u'blank_screen')
655
268
        self.presentation.slide_show_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_black_screen)
656
269
657
270
    def is_blank(self):
658
271
        """
659
272
        Returns ``True`` if screen is blank.
660
273
        """
661
274
        log.debug(u'is_blank')
662
275
        if self.is_active() and self.presentation.slide_show_window.slideshow_view\
663
276
            .slide_state() is appscript.k.slide_show_state_black_screen:
664
277
            return True
665
278
        else:
666
279
            return False
667
280
668
281
    def stop_presentation(self):
669
282
        """
670
283
        Stops the current presentation and hides the output.
671
284
        """
672
285
        log.debug(u'stop_presentation')        
673
286
        self.presentation.slide_show_window.slideshow_view.exit_slide_show()
674
287
675
288
    
676
289
    def start_presentation(self):
677
290
        """
678
291
        Starts a presentation from the beginning.
679
292
        """
680
293
        log.debug(u'start_presentation')
681
294
        rect = ScreenList().current[u'size']          
682
295
        ppt_settings = self.presentation.slide_show_settings
683
296
        openlp_settings = Settings("openlp.org","OpenLP")
684
297
        show_presenter_view = openlp_settings.value(self.controller.plugin.settingsSection + u'/show presenter view')
685
298
        override_position = openlp_settings.value( u'general/override position')
686
299
        if show_presenter_view:
687
300
            ppt_settings.show_type.set(appscript.k.slide_show_type_presenter)
688
301
        elif override_position:
689
302
            ppt_settings.show_type.set(appscript.k.slide_show_type_window)
690
303
        else:
691
304
            ppt_settings.show_type.set(appscript.k.slide_show_type_kiosk)
692
305
            #ppt_settings.show_type.set(appscript.k.slide_show_type_speaker) 
693
306
        ppt_window = ppt_settings.run_slide_show()
694
307
        #TODO set slideshow state = running
695
308
#        if ppt_window.slideshow_view.slide_state() != appscript.k.slide_show_state_running:
696
309
#            ppt_window.slideshow_view.slide_state.set(appscript.k.slide_show_state_running)
697
310
        if not ppt_window or show_presenter_view:
698
311
            return
699
312
        if override_position:
700
313
            top = float(rect.y())
701
314
            height = float(rect.height())
702
315
            left_position = float(rect.x())
703
316
            width = float(rect.width())
704
317
            ppt_window.top.set(top)
705
318
            ppt_window.height.set(height)
706
319
            ppt_window.left_position.set(left_position)
707
320
            ppt_window.width.set(width)
708
321
        else:
709
322
            #TODO set output monitor for fullscreen mode
710
323
            pass       
711
324
712
325
    def get_slide_number(self):
713
326
        """
714
327
        Returns the current slide number.
715
328
        """
716
329
        log.debug(u'get_slide_number')        
717
330
        return self.presentation.slide_show_window.slideshow_view.current_show_position()
718
331
719
332
    def get_slide_count(self):
720
333
        """
721
334
        Returns total number of slides.
722
335
        """
723
336
        log.debug(u'get_slide_count')
724
337
        return len(self.presentation.slides())
725
338
726
339
    def goto_slide(self, slideno):
727
340
        """
728
341
        Moves to a specific slide in the presentation.
729
342
        """
730
343
        log.debug(u'goto_slide') 
731
344
        #TODO this works. but needs to fix this dumb code
732
345
        while self.get_slide_number() != slideno:
733
346
            if self.get_slide_number() < slideno:
734
347
                self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
735
348
            else:
736
349
                self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
737
350
        self.controller.process.activate()
738
351
739
352
    def next_step(self):
740
353
        """
741
354
        Triggers the next effect of slide on the running presentation.
742
355
        """
743
356
        log.debug(u'next_step')       
744
357
        self.presentation.slide_show_window.slideshow_view.go_to_next_slide()
745
358
        self.controller.process.activate()
746
359
        if self.get_slide_number() > self.get_slide_count():
747
360
            self.previous_step()
748
361
749
362
    def previous_step(self):
750
363
        """
751
364
        Triggers the previous slide on the running presentation.
752
365
        """
753
366
        log.debug(u'previous_step')        
754
367
        self.presentation.slide_show_window.slideshow_view.go_to_previous_slide()
755
368
        self.controller.process.activate()
756
369
757
370
    def get_slide_text(self, slide_no):
758
371
        """
759
372
        Returns the text on the slide.
760
373
761
374
        ``slide_no``
762
375
            The slide the text is required for, starting at 1.
763
376
        """
764
377
        return _get_text_from_shapes(self.presentation.slides[slide_no-1].shapes)
765
378
766
379
    def get_slide_notes(self, slide_no):
767
380
        """
768
381
        Returns the text on the slide.
769
382
770
383
        ``slide_no``
771
384
            The slide the notes are required for, starting at 1.
772
385
        """
773
386
        return _get_text_from_shapes(
774
387
            self.presentation.slides[slide_no].notes_page.shapes())
775
388
776
389
def _get_text_from_shapes(shapes):
777
390
    """
778
391
    Returns any text extracted from the shapes on a presentation slide.
779
392
780
393
    ``shapes``
781
394
        A set of shapes to search for text.
782
395
    """
783
396
    text = u''
784
397
    for idx in range(len(shapes)):
785
398
        shape = shapes[idx + 1]
786
399
        if shape.has_text_frame():
787
400
            text += shape.text_frame.text_range.content() + '\n'
788
401
    return text
789
0
402
790
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
791
--- openlp/plugins/presentations/lib/presentationtab.py	2013-03-16 21:18:05 +0000
792
+++ openlp/plugins/presentations/lib/presentationtab.py	2013-04-01 23:08:22 +0000
793
@@ -30,6 +30,7 @@
794
30
from PyQt4 import QtGui
30
from PyQt4 import QtGui
795
31
31
796
32
from openlp.core.lib import Settings, SettingsTab, UiStrings, translate
32
from openlp.core.lib import Settings, SettingsTab, UiStrings, translate
797
33
import sys
798
33
34
799
34
35
800
35
class PresentationTab(SettingsTab):
36
class PresentationTab(SettingsTab):
801
@@ -60,6 +61,7 @@
802
60
            controller = self.controllers[key]
61
            controller = self.controllers[key]
803
61
            checkbox = QtGui.QCheckBox(self.controllers_group_box)
62
            checkbox = QtGui.QCheckBox(self.controllers_group_box)
804
62
            checkbox.setObjectName(controller.name + u'CheckBox')
63
            checkbox.setObjectName(controller.name + u'CheckBox')
805
64
<<<<<<< TREE
806
63
            self.presenter_check_boxes[controller.name] = checkbox
65
            self.presenter_check_boxes[controller.name] = checkbox
807
64
            self.controllers_layout.addWidget(checkbox)
66
            self.controllers_layout.addWidget(checkbox)
808
65
        self.left_layout.addWidget(self.controllers_group_box)
67
        self.left_layout.addWidget(self.controllers_group_box)
809
@@ -73,6 +75,26 @@
810
73
        self.left_layout.addWidget(self.advanced_group_box)
75
        self.left_layout.addWidget(self.advanced_group_box)
811
74
        self.left_layout.addStretch()
76
        self.left_layout.addStretch()
812
75
        self.right_layout.addStretch()
77
        self.right_layout.addStretch()
813
78
=======
814
79
            self.PresenterCheckboxes[controller.name] = checkbox
815
80
            self.ControllersLayout.addWidget(checkbox)
816
81
        self.leftLayout.addWidget(self.ControllersGroupBox)
817
82
        self.AdvancedGroupBox = QtGui.QGroupBox(self.leftColumn)
818
83
        self.AdvancedGroupBox.setObjectName(u'AdvancedGroupBox')
819
84
        self.AdvancedLayout = QtGui.QVBoxLayout(self.AdvancedGroupBox)
820
85
        self.AdvancedLayout.setObjectName(u'AdvancedLayout')
821
86
        self.OverrideAppCheckBox = QtGui.QCheckBox(self.AdvancedGroupBox)
822
87
        self.OverrideAppCheckBox.setObjectName(u'OverrideAppCheckBox')
823
88
        self.AdvancedLayout.addWidget(self.OverrideAppCheckBox)
824
89
        self.ShowPresenterViewCheckBox = QtGui.QCheckBox(self.AdvancedGroupBox)
825
90
        self.ShowPresenterViewCheckBox.setObjectName(u'ShowPresenterViewCheckBox')        
826
91
        self.AdvancedLayout.addWidget(self.ShowPresenterViewCheckBox)
827
92
        if not sys.platform.startswith('darwin'):
828
93
            self.ShowPresenterViewCheckBox.setVisible(False)
829
94
        self.leftLayout.addWidget(self.AdvancedGroupBox)
830
95
        self.leftLayout.addStretch()
831
96
        self.rightLayout.addStretch()
832
97
>>>>>>> MERGE-SOURCE
833
76
98
834
77
    def retranslateUi(self):
99
    def retranslateUi(self):
835
78
        """
100
        """
836
@@ -86,6 +108,8 @@
837
86
        self.advanced_group_box.setTitle(UiStrings().Advanced)
108
        self.advanced_group_box.setTitle(UiStrings().Advanced)
838
87
        self.override_app_check_box.setText(
109
        self.override_app_check_box.setText(
839
88
            translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
110
            translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
840
111
        self.ShowPresenterViewCheckBox.setText(
841
112
            translate('PresentationPlugin.PresentationTab', 'Show Presenter View'))
842
89
113
843
90
    def set_controller_text(self, checkbox, controller):
114
    def set_controller_text(self, checkbox, controller):
844
91
        if checkbox.isEnabled():
115
        if checkbox.isEnabled():
845
@@ -100,9 +124,16 @@
846
100
        """
124
        """
847
101
        for key in self.controllers:
125
        for key in self.controllers:
848
102
            controller = self.controllers[key]
126
            controller = self.controllers[key]
849
127
<<<<<<< TREE
850
103
            checkbox = self.presenter_check_boxes[controller.name]
128
            checkbox = self.presenter_check_boxes[controller.name]
851
104
            checkbox.setChecked(Settings().value(self.settings_section + u'/' + controller.name))
129
            checkbox.setChecked(Settings().value(self.settings_section + u'/' + controller.name))
852
105
        self.override_app_check_box.setChecked(Settings().value(self.settings_section + u'/override app'))
130
        self.override_app_check_box.setChecked(Settings().value(self.settings_section + u'/override app'))
853
131
=======
854
132
            checkbox = self.PresenterCheckboxes[controller.name]
855
133
            checkbox.setChecked(Settings().value(self.settingsSection + u'/' + controller.name))
856
134
        self.OverrideAppCheckBox.setChecked(Settings().value(self.settingsSection + u'/override app'))
857
135
        self.ShowPresenterViewCheckBox.setChecked(Settings().value(self.settingsSection + u'/show presenter view'))
858
136
>>>>>>> MERGE-SOURCE
859
106
137
860
107
    def save(self):
138
    def save(self):
861
108
        """
139
        """
862
@@ -128,6 +159,10 @@
863
128
        if Settings().value(setting_key) != self.override_app_check_box.checkState():
159
        if Settings().value(setting_key) != self.override_app_check_box.checkState():
864
129
            Settings().setValue(setting_key, self.override_app_check_box.checkState())
160
            Settings().setValue(setting_key, self.override_app_check_box.checkState())
865
130
            changed = True
161
            changed = True
866
162
        setting_key = self.settingsSection + u'/show presenter view'
867
163
        if Settings().value(setting_key) != self.ShowPresenterViewCheckBox.checkState():
868
164
            Settings().setValue(setting_key, self.ShowPresenterViewCheckBox.isChecked())
869
165
            changed = True
870
131
        if changed:
166
        if changed:
871
132
            self.settings_form.register_post_process(u'mediaitem_suffix_reset')
167
            self.settings_form.register_post_process(u'mediaitem_suffix_reset')
872
133
            self.settings_form.register_post_process(u'mediaitem_presentation_rebuild')
168
            self.settings_form.register_post_process(u'mediaitem_presentation_rebuild')
873
134
169
874
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
875
--- openlp/plugins/presentations/presentationplugin.py	2013-03-19 19:43:22 +0000
876
+++ openlp/plugins/presentations/presentationplugin.py	2013-04-01 23:08:22 +0000
877
@@ -31,6 +31,7 @@
878
31
presentations from a variety of document formats.
31
presentations from a variety of document formats.
879
32
"""
32
"""
880
33
import os
33
import os
881
34
import sys
882
34
import logging
35
import logging
883
35
36
884
36
from PyQt4 import QtCore
37
from PyQt4 import QtCore
885
@@ -46,6 +47,11 @@
886
46
        u'presentations/Impress': QtCore.Qt.Checked,
47
        u'presentations/Impress': QtCore.Qt.Checked,
887
47
        u'presentations/Powerpoint': QtCore.Qt.Checked,
48
        u'presentations/Powerpoint': QtCore.Qt.Checked,
888
48
        u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
49
        u'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
889
50
        u'presentations/Keynote': QtCore.Qt.Checked,
890
51
        u'presentations/show presenter view': QtCore.Qt.Checked,
891
52
        u'PresentationModeUseSecondary': u'',
892
53
        u'PresentationModeEnableFeedbackDisplay': False,
893
54
        u'PresentationModePlayWellWithOthers': False, 
894
49
        u'presentations/presentations files': []
55
        u'presentations/presentations files': []
895
50
    }
56
    }
896
51
57
897
@@ -130,6 +136,12 @@
898
130
            u'presentations', u'lib')
136
            u'presentations', u'lib')
899
131
        for filename in os.listdir(controller_dir):
137
        for filename in os.listdir(controller_dir):
900
132
            if filename.endswith(u'controller.py') and not filename == 'presentationcontroller.py':
138
            if filename.endswith(u'controller.py') and not filename == 'presentationcontroller.py':
901
139
                if not sys.platform.startswith('darwin') and filename == 'powerpointmaccontroller.py':
902
140
                    continue
903
141
                if not sys.platform.startswith('darwin') and filename == 'keynotemaccontroller.py':
904
142
                    continue
905
143
                if not sys.platform.startswith('win') and filename == 'powerpointcontroller.py':
906
144
                    continue
907
133
                path = os.path.join(controller_dir, filename)
145
                path = os.path.join(controller_dir, filename)
908
134
                if os.path.isfile(path):
146
                if os.path.isfile(path):
909
135
                    module_name = u'openlp.plugins.presentations.lib.' + os.path.splitext(filename)[0]
147
                    module_name = u'openlp.plugins.presentations.lib.' + os.path.splitext(filename)[0]
910
136
148
911
=== modified file 'scripts/check_dependencies.py'
912
--- scripts/check_dependencies.py	2013-03-14 10:51:49 +0000
913
+++ scripts/check_dependencies.py	2013-04-01 23:08:22 +0000
914
@@ -47,6 +47,7 @@
915
47
    pass
47
    pass
916
48
48
917
49
IS_WIN = sys.platform.startswith('win')
49
IS_WIN = sys.platform.startswith('win')
918
50
IS_OSX = sys.platform.startswith('darwin')
919
50
51
920
51
VERS = {
52
VERS = {
921
52
    'Python': '2.6',
53
    'Python': '2.6',
922
@@ -64,6 +65,11 @@
923
64
    'pywintypes',
65
    'pywintypes',
924
65
]
66
]
925
66
67
926
68
# OSX
927
69
OSX_MODULES = [
928
70
    'appscript',
929
71
    'mactypes', 
930
72
]
931
67
MODULES = [
73
MODULES = [
932
68
    'PyQt4',
74
    'PyQt4',
933
69
    'PyQt4.QtCore',
75
    'PyQt4.QtCore',
934
@@ -187,6 +193,11 @@
935
187
        print('Checking for Windows specific modules...')
193
        print('Checking for Windows specific modules...')
936
188
        for m in WIN32_MODULES:
194
        for m in WIN32_MODULES:
937
189
            check_module(m)
195
            check_module(m)
938
196
    
939
197
    if IS_OSX:
940
198
        print('Checking for OS X specific modules...')
941
199
        for m in OSX_MODULES:
942
200
            check_module(m)
943
190
201
944
191
    verify_versions()
202
    verify_versions()
945
192
    verify_pyqt()
203
    verify_pyqt()
Reviewer	Date Requested	Status
matysek (community)	2013-03-22	Needs Fixing on 2013-03-23
Andreas Preikschat	2013-03-22	Pending
Review via email: mp+155063@code.launchpad.net