[Idle-dev] CVS: idle EditorWindow.py,1.31,1.32 config-keys.def,1.13,1.14 configHandler.py,1.24,1.25

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv13538

Modified Files:
	EditorWindow.py config-keys.def configHandler.py 
Log Message:
Fix Bug 612886 copy/paste menu items fail
	(cut vs. Cut etc.)
Fix Bug 613006 Ctrl-x Unix Binding Clears Selection
	(do-nothing does something :)
Leave some debugging prints behind, commented out
M EditorWindow.py
M config-keys.def
M configHandler.py


Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/idlefork/idle/EditorWindow.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** EditorWindow.py	16 Sep 2002 02:13:15 -0000	1.31
--- EditorWindow.py	26 Sep 2002 22:13:22 -0000	1.32
***************
*** 81,84 ****
--- 81,87 ----
          self.top.protocol("WM_DELETE_WINDOW", self.close)
          self.top.bind("<<close-window>>", self.close_event)
+         text.bind("<<cut>>", self.cut)
+         text.bind("<<copy>>", self.copy)
+         text.bind("<<paste>>", self.paste)
          text.bind("<<center-insert>>", self.center_insert_event)
          text.bind("<<help>>", self.help_dialog)
***************
*** 312,315 ****
--- 315,330 ----
          webbrowser.open(url)
  
+     def cut(self,event):
+         self.text.event_generate("<<Cut>>")
+         return "break"
+ 
+     def copy(self,event):
+         self.text.event_generate("<<Copy>>")
+         return "break"
+ 
+     def paste(self,event):
+         self.text.event_generate("<<Paste>>")
+         return "break"
+ 
      def select_all(self, event=None):
          self.text.tag_add("sel", "1.0", "end-1c")
***************
*** 744,747 ****
--- 759,763 ----
          text.keydefs = keydefs
          for event, keylist in keydefs.items():
+             ##print>>sys.__stderr__, "event, list: ", event, keylist
              if keylist:
                  apply(text.event_add, (event,) + tuple(keylist))
***************
*** 756,759 ****
--- 772,776 ----
          if keydefs is None:
              keydefs = self.Bindings.default_keydefs
+         ##print>>sys.__stderr__, "*keydefs: " , keydefs
          menudict = self.menudict
          text = self.text
***************
*** 771,774 ****
--- 788,792 ----
                          label = label[1:]
                      underline, label = prepstr(label)
+                     ##print>>sys.__stderr__, "*Event: " , event
                      accelerator = get_accelerator(keydefs, event)
                      def command(text=text, event=event):
***************
*** 780,785 ****
                              variable=var)
                      else:
                          menu.add_command(label=label, underline=underline,
!                             command=command, accelerator=accelerator)
  
      def getvar(self, name):
--- 798,807 ----
                              variable=var)
                      else:
+                         ##print>>sys.__stderr__, "label, ul, cmd, accel: ",
+                         ##                       label, underline, command,
+                         ##                       accelerator
                          menu.add_command(label=label, underline=underline,
!                                          command=command,
!                                          accelerator=accelerator)
  
      def getvar(self, name):

Index: config-keys.def
===================================================================
RCS file: /cvsroot/idlefork/idle/config-keys.def,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** config-keys.def	23 Sep 2002 01:11:57 -0000	1.13
--- config-keys.def	26 Sep 2002 22:13:22 -0000	1.14
***************
*** 16,19 ****
--- 16,20 ----
  close-all-windows=<Control-Key-q>
  close-window=<Alt-Key-F4>
+ do-nothing=<Control-Key-F12>
  end-of-file=<Control-Key-d>
  python-docs=<Key-F1>
***************
*** 109,112 ****
--- 110,114 ----
  close-all-windows=<Command-Key-q>
  close-window=<Command-Key-w>
+ do-nothing=<Control-Key-F12>
  end-of-file=<Control-Key-d>
  python-docs=<Key-F1>

Index: configHandler.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configHandler.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** configHandler.py	14 Sep 2002 03:17:01 -0000	1.24
--- configHandler.py	26 Sep 2002 22:13:22 -0000	1.25
***************
*** 497,500 ****
--- 497,501 ----
              '<<close-all-windows>>': ['<Control-q>'],
              '<<close-window>>': ['<Alt-F4>'],
+             '<<do-nothing>>': ['<Control-x>'],
              '<<end-of-file>>': ['<Control-d>'],
              '<<python-docs>>': ['<F1>'],