openlp-core team mailing list archive

[Samuel Mehrbrodt <s.mehrbrodt@xxxxxxxxx>]

Review: Needs Fixing

Typo (see inline comment)

Diff comments:

> === modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
> --- openlp/plugins/presentations/lib/powerpointcontroller.py	2014-01-14 19:25:18 +0000
> +++ openlp/plugins/presentations/lib/powerpointcontroller.py	2014-06-22 19:54:45 +0000
> @@ -37,6 +37,7 @@
>      import pywintypes
>  
>  from presentationcontroller import PresentationController, PresentationDocument
> +from openlp.core.lib.ui import UiStrings,  critical_error_message_box
>  
>  log = logging.getLogger(__name__)
>  
> @@ -100,7 +101,7 @@
>                  if self.process.Presentations.Count > 0:
>                      return
>                  self.process.Quit()
> -            except pywintypes.com_error:
> +            except (AttributeError, pywintypes.com_error):
>                  pass
>              self.process = None
>  
> @@ -124,18 +125,26 @@
>          Opens the PowerPoint file using the process created earlier.
>          """
>          log.debug(u'load_presentation')
> -        if not self.controller.process or not self.controller.process.Visible:
> -            self.controller.start_process()
>          try:
> +            if not self.controller.process or not self.controller.process.Visible:
> +                self.controller.start_process()
>              self.controller.process.Presentations.Open(self.filepath, False,
>                  False, True)
> -        except pywintypes.com_error:
> -            log.debug(u'PPT open failed')
> +            self.presentation = self.controller.process.Presentations(
> +                self.controller.process.Presentations.Count)
> +            self.create_thumbnails()
> +            # Powerpoint 2013 pops up when loading a file, so we minimize it again
> +            if self.presentation.Application.Version == u'15.0':
> +                try:
> +                    self.presentation.Application.WindowState = 2
> +                except:
> +                    log.error(u'Failed to minimize main powerpoint window')
> +
> +            return True
> +        except pywintypes.com_error as e:
> +            log.error(u'PPT open failed')
> +            log.error(e)
>              return False
> -        self.presentation = self.controller.process.Presentations(
> -            self.controller.process.Presentations.Count)
> -        self.create_thumbnails()
> -        return True
>  
>      def create_thumbnails(self):
>          """
> @@ -187,7 +196,6 @@
>              return False
>          return True
>  
> -
>      def is_active(self):
>          """
>          Returns ``True`` if a presentation is currently active.
> @@ -209,23 +217,33 @@
>          Unblanks (restores) the presentation.
>          """
>          log.debug(u'unblank_screen')
> -        self.presentation.SlideShowSettings.Run()
> -        self.presentation.SlideShowWindow.View.State = 1
> -        self.presentation.SlideShowWindow.Activate()
> -        if self.presentation.Application.Version == u'14.0':
> -            # Unblanking is broken in PowerPoint 2010, need to redisplay
> -            slide = self.presentation.SlideShowWindow.View.CurrentShowPosition
> -            click = self.presentation.SlideShowWindow.View.GetClickIndex()
> -            self.presentation.SlideShowWindow.View.GotoSlide(slide)
> -            if click:
> -                self.presentation.SlideShowWindow.View.GotoClick(click)
> +        try:
> +            self.presentation.SlideShowSettings.Run()
> +            self.presentation.SlideShowWindow.View.State = 1
> +            self.presentation.SlideShowWindow.Activate()
> +            if self.presentation.Application.Version == u'14.0':
> +                # Unblanking is broken in PowerPoint 2010, need to redisplay
> +                slide = self.presentation.SlideShowWindow.View.CurrentShowPosition
> +                click = self.presentation.SlideShowWindow.View.GetClickIndex()
> +                self.presentation.SlideShowWindow.View.GotoSlide(slide)
> +                if click:
> +                    self.presentation.SlideShowWindow.View.GotoClick(click)
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in unblank_screen')
> +            log.error(e)
> +            self.show_error_msg()
>  
>      def blank_screen(self):
>          """
>          Blanks the screen.
>          """
>          log.debug(u'blank_screen')
> -        self.presentation.SlideShowWindow.View.State = 3
> +        try:
> +            self.presentation.SlideShowWindow.View.State = 3
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in blank_screen')
> +            log.error(e)
> +            self.show_error_msg()
>  
>      def is_blank(self):
>          """
> @@ -233,7 +251,12 @@
>          """
>          log.debug(u'is_blank')
>          if self.is_active():
> -            return self.presentation.SlideShowWindow.View.State == 3
> +            try:
> +                return self.presentation.SlideShowWindow.View.State == 3
> +            except pywintypes.com_error as e:
> +                log.error(u'COM error while in is_blank')
> +                log.error(e)
> +                return False
>          else:
>              return False
>  
> @@ -242,7 +265,11 @@
>          Stops the current presentation and hides the output.
>          """
>          log.debug(u'stop_presentation')
> -        self.presentation.SlideShowWindow.View.Exit()
> +        try:
> +            self.presentation.SlideShowWindow.View.Exit()
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in stop_presentation')
> +            log.error(e)
>  
>      if os.name == u'nt':
>          def start_presentation(self):
> @@ -264,39 +291,73 @@
>              ppt_window = self.presentation.SlideShowSettings.Run()
>              if not ppt_window:
>                  return
> -            ppt_window.Top = rect.y() * 72 / dpi
> -            ppt_window.Height = rect.height() * 72 / dpi
> -            ppt_window.Left = rect.x() * 72 / dpi
> -            ppt_window.Width = rect.width() * 72 / dpi
> -
> +            try:
> +                ppt_window.Top = rect.y() * 72 / dpi
> +                ppt_window.Height = rect.height() * 72 / dpi
> +                ppt_window.Left = rect.x() * 72 / dpi
> +                ppt_window.Width = rect.width() * 72 / dpi
> +            except AttributeError as e:
> +                log.error(u'AttributeError while in start_presentation')
> +                log.error(e)
> +            # Powerpoint 2013 pops up when starting a file, so we minimize it again
> +            if self.presentation.Application.Version == u'15.0':
> +                try:
> +                    self.presentation.Application.WindowState = 2
> +                except:
> +                    log.error(u'Failed to minimize main powerpoint window')
>  
>      def get_slide_number(self):
>          """
>          Returns the current slide number.
>          """
>          log.debug(u'get_slide_number')
> -        return self.presentation.SlideShowWindow.View.CurrentShowPosition
> +        try:
> +            ret = self.presentation.SlideShowWindow.View.CurrentShowPosition
> +        except pywintypes.com_error as e:
> +            ret = 0
> +            log.error(u'COM error while in get_slide_number')
> +            log.error(e)
> +            self.show_error_msg()
> +        return ret
>  
>      def get_slide_count(self):
>          """
>          Returns total number of slides.
>          """
>          log.debug(u'get_slide_count')
> -        return self.presentation.Slides.Count
> +        try:
> +            ret = self.presentation.Slides.Count
> +        except pywintypes.com_error as e:
> +            ret = 0
> +            log.error(u'COM error while in get_slide_count')
> +            log.error(e)
> +            self.show_error_msg()
> +        return ret
>  
>      def goto_slide(self, slideno):
>          """
>          Moves to a specific slide in the presentation.
>          """
>          log.debug(u'goto_slide')
> -        self.presentation.SlideShowWindow.View.GotoSlide(slideno)
> +        try:
> +            self.presentation.SlideShowWindow.View.GotoSlide(slideno)
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in goto_slide')
> +            log.error(e)
> +            self.show_error_msg()
>  
>      def next_step(self):
>          """
>          Triggers the next effect of slide on the running presentation.
>          """
>          log.debug(u'next_step')
> -        self.presentation.SlideShowWindow.View.Next()
> +        try:
> +            self.presentation.SlideShowWindow.View.Next()
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in next_step')
> +            log.error(e)
> +            self.show_error_msg()
> +            return
>          if self.get_slide_number() > self.get_slide_count():
>              self.previous_step()
>  
> @@ -305,7 +366,12 @@
>          Triggers the previous slide on the running presentation.
>          """
>          log.debug(u'previous_step')
> -        self.presentation.SlideShowWindow.View.Previous()
> +        try:
> +            self.presentation.SlideShowWindow.View.Previous()
> +        except pywintypes.com_error as e:
> +            log.error(u'COM error while in previous_step')
> +            log.error(e)
> +            self.show_error_msg()
>  
>      def get_slide_text(self, slide_no):
>          """
> @@ -326,6 +392,16 @@
>          return _get_text_from_shapes(
>              self.presentation.Slides(slide_no).NotesPage.Shapes)
>  
> +    def show_error_msg(self):
> +        """
> +        Stop presentation and display an error message.
> +        """
> +        self.stop_presentation()
> +        critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument', 
> +                                                                'An error occurred in the Powerpoint integration '
> +                                                                'and the presentation will be stopped. '
> +                                                                'Relstart the presentation if you wish to present it.'))

Typo: "Relstart"

> +
>  def _get_text_from_shapes(shapes):
>      """
>      Returns any text extracted from the shapes on a presentation slide.
> 


-- 
https://code.launchpad.net/~tomasgroth/openlp/ppt-catch-2.0/+merge/224052
Your team OpenLP Core is subscribed to branch lp:openlp/2.0.