[Spambayes-checkins] spambayes/Outlook2000 addin.py, 1.86.2.1, 1.86.2.2

[Adam Walker]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv17289/Outlook2000

Modified Files:
      Tag: outlook-dialog-branch
	addin.py 
Log Message:
Move the html menu options to a Help sub-menu. People will need to delete the outlook.cmd file to get the old ones to go away.

Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.86.2.1
retrieving revision 1.86.2.2
diff -C2 -d -r1.86.2.1 -r1.86.2.2
*** addin.py	5 Aug 2003 22:57:35 -0000	1.86.2.1
--- addin.py	6 Aug 2003 02:15:53 -0000	1.86.2.2
***************
*** 784,801 ****
                             Visible=True,
                             Tag = "SpamBayesCommand.CheckVersion")
!             self._AddControl(popup,
!                            constants.msoControlButton,
!                            ButtonEvent, (ShowAbout, self.manager,),
!                            Caption="About SpamBayes",
!                            Enabled=True,
!                            Visible=True,
!                            Tag = "SpamBayesCommand.ShowAbout")
!             self._AddControl(popup,
!                            constants.msoControlButton,
!                            ButtonEvent, (ShowTroubleshooting, self.manager,),
!                            Caption="Troubleshooting Guide",
!                            Enabled=True,
!                            Visible=True,
!                            Tag = "SpamBayesCommand.ShowTroubleshooting")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):
--- 784,811 ----
                             Visible=True,
                             Tag = "SpamBayesCommand.CheckVersion")
!             helpPopup = self._AddControl(
!                             popup,
!                             constants.msoControlPopup,
!                             None, None,
!                             Caption="Help",
!                             TooltipText = "SpamBayes help documents",
!                             Enabled = True,
!                             Tag = "SpamBayesCommand.HelpPopup")
!             if helpPopup is not None:
!                 helpPopup = CastTo(helpPopup, "CommandBarPopup")
!                 self._AddControl(helpPopup,
!                                constants.msoControlButton,
!                                ButtonEvent, (ShowAbout, self.manager,),
!                                Caption="About SpamBayes",
!                                Enabled=True,
!                                Visible=True,
!                                Tag = "SpamBayesCommand.Help.ShowAbout")
!                 self._AddControl(helpPopup,
!                                constants.msoControlButton,
!                                ButtonEvent, (ShowTroubleshooting, self.manager,),
!                                Caption="Troubleshooting Guide",
!                                Enabled=True,
!                                Visible=True,
!                                Tag = "SpamBayesCommand.Help.ShowTroubleshooting")
          # If we are running from Python sources, enable a few extra items
          if not hasattr(sys, "frozen"):