Show More
@@ -554,6 +554,8 b' class IGridGrid(wx.grid.Grid):' | |||||
554 | quit |
|
554 | quit | |
555 | """ |
|
555 | """ | |
556 | frame = self.GetParent().GetParent().GetParent() |
|
556 | frame = self.GetParent().GetParent().GetParent() | |
|
557 | if frame.helpdialog: | |||
|
558 | frame.helpdialog.Destroy() | |||
557 | frame.parent.returnobj = returnobj |
|
559 | frame.parent.returnobj = returnobj | |
558 | frame.Close() |
|
560 | frame.Close() | |
559 | frame.Destroy() |
|
561 | frame.Destroy() | |
@@ -661,6 +663,7 b' class IGridFrame(wx.Frame):' | |||||
661 | self.menubar.Append(self.m_help, "&Help") |
|
663 | self.menubar.Append(self.m_help, "&Help") | |
662 | self.SetMenuBar(self.menubar) |
|
664 | self.SetMenuBar(self.menubar) | |
663 | self.searchtext = "" |
|
665 | self.searchtext = "" | |
|
666 | self.helpdialog = None | |||
664 |
|
667 | |||
665 | def sortasc(self, event): |
|
668 | def sortasc(self, event): | |
666 | grid = self.notebook.GetPage(self.notebook.GetSelection()).grid |
|
669 | grid = self.notebook.GetPage(self.notebook.GetSelection()).grid | |
@@ -704,9 +707,11 b' class IGridFrame(wx.Frame):' | |||||
704 | """ |
|
707 | """ | |
705 | Display a help dialog |
|
708 | Display a help dialog | |
706 | """ |
|
709 | """ | |
|
710 | if self.helpdialog: | |||
|
711 | self.helpdialog.Destroy() | |||
707 | filename = os.path.join(os.path.dirname(__file__), "igrid_help.html") |
|
712 | filename = os.path.join(os.path.dirname(__file__), "igrid_help.html") | |
708 |
|
|
713 | self.helpdialog = IGridHTMLHelp(None, title="Help", filename=filename, size=wx.Size(600,400)) | |
709 |
|
|
714 | self.helpdialog.Show() | |
710 |
|
715 | |||
711 | def display_help_in_browser(self, event): |
|
716 | def display_help_in_browser(self, event): | |
712 | """ |
|
717 | """ | |
@@ -715,9 +720,9 b' class IGridFrame(wx.Frame):' | |||||
715 | """ |
|
720 | """ | |
716 | filename = urllib.pathname2url(os.path.abspath(os.path.join(os.path.dirname(__file__), "igrid_help.html"))) |
|
721 | filename = urllib.pathname2url(os.path.abspath(os.path.join(os.path.dirname(__file__), "igrid_help.html"))) | |
717 | if not filename.startswith("file"): |
|
722 | if not filename.startswith("file"): | |
718 |
|
|
723 | filename = "file:" + filename | |
719 | webbrowser.open(filename, new=1, autoraise=True) |
|
724 | webbrowser.open(filename, new=1, autoraise=True) | |
720 |
|
725 | |||
721 | def enter_searchexpression(self, event): |
|
726 | def enter_searchexpression(self, event): | |
722 | pass |
|
727 | pass | |
723 |
|
728 |
@@ -1,3 +1,8 b'' | |||||
|
1 | 2007-03-09 Walter Doerwald <walter@livinglogic.de> | |||
|
2 | ||||
|
3 | * IPython/Extensions/igrid.py: Patch by Nik Tautenhahn: | |||
|
4 | Close help window if exiting igrid. | |||
|
5 | ||||
1 | 2007-03-02 J�rgen Stenarson <jorgen.stenarson@bostream.nu> |
|
6 | 2007-03-02 J�rgen Stenarson <jorgen.stenarson@bostream.nu> | |
2 |
|
7 | |||
3 | * IPython/Extensions/ipy_defaults.py: Check if readline is available |
|
8 | * IPython/Extensions/ipy_defaults.py: Check if readline is available |
General Comments 0
You need to be logged in to leave comments.
Login now