Menu
▾
▴
pythoncard-cvs — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(185) |
Jun
|
Jul
(36) |
Aug
(205) |
Sep
(98) |
Oct
(107) |
Nov
(6) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(1) |
Feb
(2) |
Mar
(19) |
Apr
(26) |
May
(18) |
Jun
|
Jul
(12) |
Aug
(16) |
Sep
(22) |
Oct
(7) |
Nov
(11) |
Dec
(74) |
| 2006 |
Jan
(14) |
Feb
(1) |
Mar
(3) |
Apr
(3) |
May
(14) |
Jun
(5) |
Jul
(20) |
Aug
(10) |
Sep
(1) |
Oct
|
Nov
(4) |
Dec
(1) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(14) |
Aug
|
Sep
|
Oct
(6) |
Nov
(1) |
Dec
|
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:07
|
Update of /cvsroot/pythoncard/PythonCard/samples/moderator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/moderator Modified Files: moderator.py moderator.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: moderator.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/moderator/moderator.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** moderator.py 24 Apr 2004 21:09:19 -0000 1.2 --- moderator.py 5 May 2004 16:53:27 -0000 1.3 *************** *** 85,91 **** if self.components.txtTime.text != self.clockModel.readout(): self.components.txtTime.text = self.clockModel.readout() - - def on_menuFileExit_select(self, event): - self.close() class CountdownClockModel: --- 85,88 ---- Index: moderator.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/moderator/moderator.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** moderator.rsrc.py 23 Apr 2004 14:08:45 -0000 1.1 --- moderator.rsrc.py 5 May 2004 16:53:27 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit', }, ] |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:07
|
Update of /cvsroot/pythoncard/PythonCard/samples/montyhall In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/montyhall Modified Files: montyhall.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: montyhall.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/montyhall/montyhall.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** montyhall.rsrc.py 17 Apr 2004 17:10:07 -0000 1.1 --- montyhall.rsrc.py 5 May 2004 16:53:27 -0000 1.2 *************** *** 18,21 **** --- 18,22 ---- 'name':'menuFileExit', 'label':'E&xit', + 'command':'exit', }, ] |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:07
|
Update of /cvsroot/pythoncard/PythonCard/samples/minimalStandalone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/minimalStandalone Modified Files: minimal.fr.rsrc.py minimal.py minimal.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: minimal.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalStandalone/minimal.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minimal.rsrc.py 29 Jul 2002 17:44:55 -0000 1.1 --- minimal.rsrc.py 5 May 2004 16:53:26 -0000 1.2 *************** *** 21,25 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] } ] }, --- 21,26 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] } ] }, Index: minimal.fr.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalStandalone/minimal.fr.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minimal.fr.rsrc.py 29 Jul 2002 17:44:55 -0000 1.1 --- minimal.fr.rsrc.py 5 May 2004 16:53:26 -0000 1.2 *************** *** 21,25 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'Q&uitter\tAlt+Q' } ] } ] }, --- 21,26 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'Q&uitter\tAlt+Q', ! 'command':'exit' } ] } ] }, Index: minimal.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalStandalone/minimal.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** minimal.py 24 Apr 2004 21:09:19 -0000 1.4 --- minimal.py 5 May 2004 16:53:26 -0000 1.5 *************** *** 17,23 **** class Minimal(model.Background): ! ! def on_menuFileExit_select(self, event): ! self.close() --- 17,21 ---- class Minimal(model.Background): ! pass |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:07
|
Update of /cvsroot/pythoncard/PythonCard/samples/pictureViewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/pictureViewer Modified Files: pictureViewer.py pictureViewer.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: pictureViewer.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/pictureViewer/pictureViewer.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pictureViewer.rsrc.py 9 Jun 2002 16:54:10 -0000 1.1 --- pictureViewer.rsrc.py 5 May 2004 16:53:28 -0000 1.2 *************** *** 30,34 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] }, { 'type':'Menu', 'name':'menuEdit', --- 30,35 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] }, { 'type':'Menu', 'name':'menuEdit', Index: pictureViewer.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/pictureViewer/pictureViewer.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pictureViewer.py 25 Apr 2004 23:12:46 -0000 1.20 --- pictureViewer.py 5 May 2004 16:53:28 -0000 1.21 *************** *** 233,239 **** self.components.bufOff.clear() - def on_menuFileExit_select(self, event): - self.close() - # decided not to use sizers # but leaving this in on the chance --- 233,236 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:06
|
Update of /cvsroot/pythoncard/PythonCard/samples/minimalTree In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/minimalTree Modified Files: minimalTree.py minimalTree.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: minimalTree.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalTree/minimalTree.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minimalTree.rsrc.py 31 Aug 2003 17:23:35 -0000 1.1 --- minimalTree.rsrc.py 5 May 2004 16:53:27 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit', }, ] Index: minimalTree.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalTree/minimalTree.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** minimalTree.py 3 May 2004 16:14:08 -0000 1.5 --- minimalTree.py 5 May 2004 16:53:27 -0000 1.6 *************** *** 34,39 **** event.skip() - def on_menuFileExit_select(self, event): - self.close() if __name__ == '__main__': --- 34,37 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/life In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/life Modified Files: life.py life.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: life.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/life/life.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** life.py 29 Apr 2004 20:13:47 -0000 1.36 --- life.py 5 May 2004 16:53:26 -0000 1.37 *************** *** 375,381 **** event.skip() - def on_menuFileExit_select(self, event): - self.close() - def on_setScale_command(self, event): self.setCanvasAttributes(int(event.target.name[9:])) --- 375,378 ---- Index: life.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/life/life.rsrc.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** life.rsrc.py 19 Dec 2002 04:49:34 -0000 1.4 --- life.rsrc.py 5 May 2004 16:53:26 -0000 1.5 *************** *** 31,35 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] }, { 'type':'Menu', 'name':'menuEdit', --- 31,36 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] }, { 'type':'Menu', 'name':'menuEdit', |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/hopalong In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/hopalong Modified Files: hopalong.py hopalong.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: hopalong.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/hopalong/hopalong.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** hopalong.py 24 Apr 2004 21:09:18 -0000 1.25 --- hopalong.py 5 May 2004 16:53:26 -0000 1.26 *************** *** 144,150 **** event.skip() - def on_menuFileExit_select(self, event): - self.close() - if __name__ == '__main__': --- 144,147 ---- Index: hopalong.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/hopalong/hopalong.rsrc.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** hopalong.rsrc.py 8 Dec 2002 04:06:47 -0000 1.11 --- hopalong.rsrc.py 5 May 2004 16:53:26 -0000 1.12 *************** *** 19,22 **** --- 19,23 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit' }, ] |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/minimalList In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/minimalList Modified Files: minimalList.py minimalList.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: minimalList.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalList/minimalList.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** minimalList.py 24 Apr 2004 21:09:19 -0000 1.7 --- minimalList.py 5 May 2004 16:53:26 -0000 1.8 *************** *** 101,107 **** print "on_list_keyDown: %d\n" % event.keyCode event.skip() - - def on_menuFileExit_select(self, event): - self.close() --- 101,104 ---- Index: minimalList.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/minimalList/minimalList.rsrc.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** minimalList.rsrc.py 31 Aug 2003 17:53:01 -0000 1.2 --- minimalList.rsrc.py 5 May 2004 16:53:26 -0000 1.3 *************** *** 21,25 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] } ] }, --- 21,26 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] } ] }, |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/jabberChat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/jabberChat Modified Files: chatWindow.py chatWindow.rsrc.py groupChatWindow.rsrc.py jabberChat.py jabberChat.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: chatWindow.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/chatWindow.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** chatWindow.py 25 Apr 2004 23:12:46 -0000 1.21 --- chatWindow.py 5 May 2004 16:53:26 -0000 1.22 *************** *** 151,155 **** self.components.fldInput.text = "" ! def on_menuFileExit_select(self, event): self.close() --- 151,155 ---- self.components.fldInput.text = "" ! def on_menuFileClose_select(self, event): self.close() Index: jabberChat.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/jabberChat.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** jabberChat.py 24 Apr 2004 21:09:18 -0000 1.29 --- jabberChat.py 5 May 2004 16:53:26 -0000 1.30 *************** *** 305,311 **** event.skip() - def on_menuFileExit_select(self, event): - self.close() - def on_changeStatus_command(self, event): self.jabberConnection.sendPresence(event.target.label) --- 305,308 ---- Index: jabberChat.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/jabberChat.rsrc.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jabberChat.rsrc.py 27 Jan 2003 22:28:01 -0000 1.4 --- jabberChat.rsrc.py 5 May 2004 16:53:26 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit', }, ] Index: groupChatWindow.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/groupChatWindow.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** groupChatWindow.rsrc.py 25 Dec 2002 23:31:21 -0000 1.1 --- groupChatWindow.rsrc.py 5 May 2004 16:53:26 -0000 1.2 *************** *** 20,24 **** }, {'type':'MenuItem', ! 'name':'menuFileExit', 'label':'Close', }, --- 20,24 ---- }, {'type':'MenuItem', ! 'name':'menuFileClose', 'label':'Close', }, Index: chatWindow.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/jabberChat/chatWindow.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** chatWindow.rsrc.py 19 Aug 2002 22:34:00 -0000 1.1 --- chatWindow.rsrc.py 5 May 2004 16:53:26 -0000 1.2 *************** *** 20,24 **** }, {'type':'MenuItem', ! 'name':'menuFileExit', 'label':'Close', }, --- 20,24 ---- }, {'type':'MenuItem', ! 'name':'menuFileClose', 'label':'Close', }, |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/fpop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/fpop Modified Files: fpop.py fpop.rsrc.py message.py message.rsrc.py preview.py preview.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: message.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/message.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** message.py 25 Apr 2004 23:12:45 -0000 1.15 --- message.py 5 May 2004 16:53:25 -0000 1.16 *************** *** 67,71 **** print text ! def on_menuFileExit_select(self, event): self.close() --- 67,71 ---- print text ! def on_menuFileClose_select(self, event): self.close() Index: fpop.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/fpop.py,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** fpop.py 24 Apr 2004 21:09:18 -0000 1.41 --- fpop.py 5 May 2004 16:53:25 -0000 1.42 *************** *** 315,321 **** self.close() - def on_menuFileExit_select(self, event): - self.close() - # this doesn't really process the blacklist # just dumps the msgs so we can debug what we have --- 315,318 ---- Index: preview.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/preview.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** preview.py 24 Apr 2004 21:09:18 -0000 1.18 --- preview.py 5 May 2004 16:53:25 -0000 1.19 *************** *** 78,82 **** self.panel.Layout() ! def on_menuFileExit_select(self, event): self.close() --- 78,82 ---- self.panel.Layout() ! def on_menuFileClose_select(self, event): self.close() Index: preview.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/preview.rsrc.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** preview.rsrc.py 25 Dec 2002 08:27:38 -0000 1.7 --- preview.rsrc.py 5 May 2004 16:53:25 -0000 1.8 *************** *** 26,30 **** {'type':'MenuItem', 'name':'filesep1', 'label':'-'}, { 'type':'MenuItem', ! 'name':'menuFileExit', 'label':'&Close\tAlt+F4', }, --- 26,30 ---- {'type':'MenuItem', 'name':'filesep1', 'label':'-'}, { 'type':'MenuItem', ! 'name':'menuFileClose', 'label':'&Close\tAlt+F4', }, Index: message.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/message.rsrc.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** message.rsrc.py 25 Dec 2002 08:27:38 -0000 1.2 --- message.rsrc.py 5 May 2004 16:53:25 -0000 1.3 *************** *** 25,29 **** {'type':'MenuItem', 'name':'filesep1', 'label':'-'}, { 'type':'MenuItem', ! 'name':'menuFileExit', 'label':'&Close\tAlt+F4', }, --- 25,29 ---- {'type':'MenuItem', 'name':'filesep1', 'label':'-'}, { 'type':'MenuItem', ! 'name':'menuFileClose', 'label':'&Close\tAlt+F4', }, Index: fpop.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/fpop/fpop.rsrc.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fpop.rsrc.py 31 Aug 2003 18:13:33 -0000 1.5 --- fpop.rsrc.py 5 May 2004 16:53:25 -0000 1.6 *************** *** 22,26 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] }, --- 22,27 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] }, |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/dialogs Modified Files: dialogs.py dialogs.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: dialogs.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/dialogs/dialogs.rsrc.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** dialogs.rsrc.py 28 May 2002 00:34:21 -0000 1.12 --- dialogs.rsrc.py 5 May 2004 16:53:25 -0000 1.13 *************** *** 24,28 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X'} ] } ] }, --- 24,29 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit'} ] } ] }, Index: dialogs.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/dialogs/dialogs.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** dialogs.py 24 Apr 2004 21:09:18 -0000 1.20 --- dialogs.py 5 May 2004 16:53:25 -0000 1.21 *************** *** 128,134 **** self.components.fldResults.text = "minimalDialog result:\naccepted: %s\ntext: %s" % (result['accepted'], result['text']) - def on_menuFileExit_select(self, event): - self.close() - if __name__ == '__main__': --- 128,131 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:04
|
Update of /cvsroot/pythoncard/PythonCard/samples/counter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/counter Modified Files: counter.py counter.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: counter.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/counter/counter.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** counter.py 24 Apr 2004 21:09:17 -0000 1.6 --- counter.py 5 May 2004 16:53:25 -0000 1.7 *************** *** 18,24 **** class Counter(model.Background): - def on_menuFileExit_select(self, event): - self.close() - def on_menuCounterIncrement_select(self, event): startValue = int(self.components.field1.text) --- 18,21 ---- Index: counter.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/counter/counter.rsrc.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** counter.rsrc.py 11 Jul 2002 01:27:08 -0000 1.5 --- counter.rsrc.py 5 May 2004 16:53:25 -0000 1.6 *************** *** 16,19 **** --- 16,20 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit', }, ] |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:04
|
Update of /cvsroot/pythoncard/PythonCard/samples/conversions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/conversions Modified Files: conversions.py conversions.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: conversions.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/conversions/conversions.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** conversions.py 24 Apr 2004 21:09:17 -0000 1.13 --- conversions.py 5 May 2004 16:53:25 -0000 1.14 *************** *** 163,169 **** self.menuBar.setChecked('menuConvertCurrency') - def on_menuFileExit_select(self, event): - self.close() - if __name__ == '__main__': --- 163,166 ---- Index: conversions.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/conversions/conversions.rsrc.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** conversions.rsrc.py 28 May 2002 00:34:21 -0000 1.7 --- conversions.rsrc.py 5 May 2004 16:53:25 -0000 1.8 *************** *** 21,25 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit' } ] }, { 'type':'Menu', 'name':'mnuConvert', --- 21,26 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit', ! 'command':'exit' } ] }, { 'type':'Menu', 'name':'mnuConvert', |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:04
|
Update of /cvsroot/pythoncard/PythonCard/samples/chat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/chat Modified Files: chat.py chat.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: chat.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/chat/chat.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** chat.py 24 Apr 2004 21:09:17 -0000 1.5 --- chat.py 5 May 2004 16:53:25 -0000 1.6 *************** *** 94,100 **** #print "after send" ! def on_menuFileExit_select(self, event): self.echoServer.keepRunning = 0 ! self.close() --- 94,100 ---- #print "after send" ! def on_close(self, event): self.echoServer.keepRunning = 0 ! event.skip() Index: chat.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/chat/chat.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** chat.rsrc.py 12 Jun 2002 18:45:05 -0000 1.1 --- chat.rsrc.py 5 May 2004 16:53:25 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt+X', + 'command':'exit' }, ] |
Update of /cvsroot/pythoncard/PythonCard/samples/SourceForgeTracker In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples/SourceForgeTracker Modified Files: SourceForgeTracker.colorized.rsrc.py SourceForgeTracker.original.rsrc.py SourceForgeTracker.py SourceForgeTracker.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: SourceForgeTracker.original.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/SourceForgeTracker/SourceForgeTracker.original.rsrc.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SourceForgeTracker.original.rsrc.py 22 Apr 2004 16:42:41 -0000 1.6 --- SourceForgeTracker.original.rsrc.py 5 May 2004 16:53:24 -0000 1.7 *************** *** 21,25 **** {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X'} ] } --- 21,26 ---- {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit'} ] } Index: SourceForgeTracker.colorized.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/SourceForgeTracker/SourceForgeTracker.colorized.rsrc.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SourceForgeTracker.colorized.rsrc.py 22 Apr 2004 16:42:41 -0000 1.3 --- SourceForgeTracker.colorized.rsrc.py 5 May 2004 16:53:24 -0000 1.4 *************** *** 30,34 **** {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X'} ] } --- 30,35 ---- {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit'} ] } Index: SourceForgeTracker.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/SourceForgeTracker/SourceForgeTracker.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SourceForgeTracker.py 24 Apr 2004 21:09:06 -0000 1.21 --- SourceForgeTracker.py 5 May 2004 16:53:24 -0000 1.22 *************** *** 200,206 **** self.displayTopics(group, category) - def on_menuFileExit_select(self, event): - self.close() - if __name__ == '__main__': --- 200,203 ---- Index: SourceForgeTracker.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/SourceForgeTracker/SourceForgeTracker.rsrc.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SourceForgeTracker.rsrc.py 22 Apr 2004 16:42:41 -0000 1.9 --- SourceForgeTracker.rsrc.py 5 May 2004 16:53:24 -0000 1.10 *************** *** 21,25 **** {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X'} ] } --- 21,26 ---- {'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit'} ] } |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:03
|
Update of /cvsroot/pythoncard/PythonCard/docs/GettingStarted In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/docs/GettingStarted Modified Files: starter1.py starter1.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: starter1.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/docs/GettingStarted/starter1.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** starter1.py 14 Apr 2004 02:38:49 -0000 1.5 --- starter1.py 5 May 2004 16:53:23 -0000 1.6 *************** *** 10,16 **** class Minimal(model.Background): ! ! def on_menuFileExit_select(self, event): ! pass if __name__ == '__main__': --- 10,14 ---- class Minimal(model.Background): ! pass if __name__ == '__main__': Index: starter1.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/docs/GettingStarted/starter1.rsrc.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** starter1.rsrc.py 22 Feb 2002 02:00:45 -0000 1.1 --- starter1.rsrc.py 5 May 2004 16:53:24 -0000 1.2 *************** *** 21,25 **** { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X' } ] } ] }, --- 21,26 ---- { 'type':'MenuItem', 'name':'menuFileExit', ! 'label':'E&xit\tAlt+X', ! 'command':'exit' } ] } ] }, |
|
From: Kevin A. <ka...@us...> - 2004-05-05 16:54:03
|
Update of /cvsroot/pythoncard/PythonCard/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28150/samples Modified Files: samples.py samples.rsrc.py Log Message: removed on_menuFileExit_select, using Background on_exit_command instead Index: samples.rsrc.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/samples.rsrc.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** samples.rsrc.py 2 May 2004 02:40:43 -0000 1.56 --- samples.rsrc.py 5 May 2004 16:53:24 -0000 1.57 *************** *** 18,21 **** --- 18,22 ---- 'name':'menuFileExit', 'label':'E&xit\tAlt-X', + 'command':'exit', }, ] Index: samples.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/samples.py,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** samples.py 25 Apr 2004 06:26:49 -0000 1.55 --- samples.py 5 May 2004 16:53:24 -0000 1.56 *************** *** 63,69 **** self.readme = '' - def on_menuFileExit_select(self, event): - self.close() - def getCommandLineArgs(self): args = [] --- 63,66 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-05 03:52:04
|
Update of /cvsroot/pythoncard/PythonCard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3487 Modified Files: component.py debug.py error.py event.py menu.py model.py widget.py Log Message: tossed unneeded classes from event.py, removed references to Handler Index: debug.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/debug.py,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** debug.py 4 May 2004 20:40:39 -0000 1.128 --- debug.py 5 May 2004 03:51:53 -0000 1.129 *************** *** 124,153 **** self.SetSize(size) - event.EventQueue().addListener( self ) event.EventLog.getInstance().addEventListener( self ) def eventOccurred(self, eventAdapter): ! if isinstance(eventAdapter, tuple): ! # new way hack to stay compatible with one arg notifyEventListeners ! eventName, sourceName, used = eventAdapter ! if eventName == event.IdleEvent.name: ! return ! else: ! # old way ! evt = eventAdapter.getDispatchedEvent() ! eventName = evt.getName() ! sourceName = evt.getSource().name ! evt = None ! ! # KEA 2002-06-10 ! # displaying idle is a losing proposition ! # the act of displaying the idle event ends up ! # causing another idle event as the queue empties ! # with the wxSTC or at least that is what I think was ! # happening ! if eventName == event.IdleEvent.name: ! # print eventAdapter.getEventWasUsed(), eventName, sourceName ! return ! used = eventAdapter.getEventWasUsed() if used: --- 124,134 ---- self.SetSize(size) event.EventLog.getInstance().addEventListener( self ) def eventOccurred(self, eventAdapter): ! # new way hack to stay compatible with one arg notifyEventListeners ! eventName, sourceName, used = eventAdapter ! if eventName == event.IdleEvent.name: ! return if used: *************** *** 185,189 **** # event listeners so that we don't end up trying to access # a dead object - event.EventQueue().removeListener( self ) event.EventLog.getInstance().removeEventListener( self ) evt.Skip() --- 166,169 ---- Index: widget.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/widget.py,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** widget.py 4 May 2004 20:49:11 -0000 1.125 --- widget.py 5 May 2004 03:51:53 -0000 1.126 *************** *** 22,26 **** class WidgetSpec( component.ComponentSpec ) : def __init__( self, name, parent, events, subclassAttributes ) : ! events.extend( event.MOUSE_EVENTS ) attributes = { 'id':{'presence':'optional', 'default':-1}, --- 22,26 ---- class WidgetSpec( component.ComponentSpec ) : def __init__( self, name, parent, events, subclassAttributes ) : ! events.extend( event.WIDGET_EVENTS ) attributes = { 'id':{'presence':'optional', 'default':-1}, *************** *** 332,336 **** # is created than to reparse for each component #self.eventIdToHandler[eventClass.id] = handler ! self.eventIdToHandler[eventClass.id] = handler.getFunction() if 0: --- 332,337 ---- # is created than to reparse for each component #self.eventIdToHandler[eventClass.id] = handler ! #self.eventIdToHandler[eventClass.id] = handler.getFunction() ! self.eventIdToHandler[eventClass.id] = handler if 0: *************** *** 351,355 **** eventClass = self.wxEventIdMap[eventType] ! eventClassInstance = eventClass(self) # decorate will add the relevant event attributes aWxEvent = eventClassInstance.decorate(aWxEvent, self) --- 352,356 ---- eventClass = self.wxEventIdMap[eventType] ! eventClassInstance = eventClass() # decorate will add the relevant event attributes aWxEvent = eventClassInstance.decorate(aWxEvent, self) Index: event.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/event.py,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** event.py 4 May 2004 17:15:41 -0000 1.66 --- event.py 5 May 2004 03:51:53 -0000 1.67 *************** *** 5,11 **** import error - import log import singleton ! import sys, types import wx --- 5,10 ---- import error [...1233 lines suppressed...] - - return True - else : - return False - - # KEA 2004-04-26 - # some event types use _createEvent and others don't - # sometimes the line below is used - # evt = self.wxEventIdMap[eventType](self._component) - # which is part of the _dispatch method above - def _createEvent( self, aEventClass, aWxEvent ) : - if 0: - print "DefaultEventBinding._createEvent", aEventClass - evt = aEventClass( self._component ) - evt.setNativeEvent( aWxEvent ) - return evt - - - --- 519,520 ---- Index: error.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/error.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** error.py 6 Aug 2001 19:53:12 -0000 1.1.1.1 --- error.py 5 May 2004 03:51:53 -0000 1.2 *************** *** 17,29 **** PythonCardException.__init__( self, aValue ) ! class EventBindingException( PythonCardException ) : ! ! def __init__( self, aValue ) : ! PythonCardException.__init__( self, aValue ) ! ! class EventQueueException( PythonCardException ) : ! ! def __init__( self, aValue ) : ! PythonCardException.__init__( self, aValue ) --- 17,29 ---- PythonCardException.__init__( self, aValue ) ! ##class EventBindingException( PythonCardException ) : ! ## ! ## def __init__( self, aValue ) : ! ## PythonCardException.__init__( self, aValue ) ! ## ! ##class EventQueueException( PythonCardException ) : ! ## ! ## def __init__( self, aValue ) : ! ## PythonCardException.__init__( self, aValue ) *************** *** 34,41 **** ! class HandlerException( PythonCardException ) : ! ! def __init__( self, aValue ) : ! PythonCardException.__init__( self, aValue ) --- 34,41 ---- ! ##class HandlerException( PythonCardException ) : ! ## ! ## def __init__( self, aValue ) : ! ## PythonCardException.__init__( self, aValue ) Index: model.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/model.py,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** model.py 1 May 2004 18:11:24 -0000 1.163 --- model.py 5 May 2004 03:51:53 -0000 1.164 *************** *** 412,416 **** if aMethod.__name__ not in self._handlers: log.debug("_addHandler: " + aMethod.__name__) ! self._handlers[aMethod.__name__] = event.Handler(aMethod) def addMethod(self, aFunction): --- 412,417 ---- if aMethod.__name__ not in self._handlers: log.debug("_addHandler: " + aMethod.__name__) ! #self._handlers[aMethod.__name__] = event.Handler(aMethod) ! self._handlers[aMethod.__name__] = aMethod def addMethod(self, aFunction): *************** *** 512,516 **** - ##class Background( event.Changeable, Scriptable, wx.Frame, event.EventSource): class Background(Scriptable, wx.Frame, event.EventSource): """ --- 513,516 ---- *************** *** 522,526 **** Initialize this instance. """ - ## event.Changeable.__init__( self ) Scriptable.__init__(self, aStack) event.EventSource.__init__(self) --- 522,525 ---- *************** *** 534,538 **** self.menuBar = None self.statusBar = None - ## self.dispatch = event.EventDispatch(self, self) self._exiting = False --- 533,536 ---- *************** *** 601,605 **** # for some reason the Message Watcher isn't a listener yet # so calling EventLog doesn't do anything - #print event.EventQueue()._impl._listeners #event.EventLog.getInstance().log('initialize', self.name, True) --- 599,602 ---- *************** *** 630,640 **** self.panel.Layout() - ## def _dispatchOpenBackground( self, evt ) : - ## # KEA 2002-06-10 - ## # don't need this dispatch since dispatch is already - ## # bound in the background - ## ##self.event.eventOccurred( event.InitializationEvent( self.scriptable ) ) - ## self.dispatch.eventOccurred( event.InitializationEvent( self ) ) - # KEA 2004-04-28 --- 627,630 ---- *************** *** 777,781 **** # this is what is in event.py # aHandler.getFunction()( aOwner, self.getSource(), self ) ! handler.getFunction()(self, aWxEvent) # do we have to clean up this alias? aWxEvent.skip = None --- 767,772 ---- # this is what is in event.py # aHandler.getFunction()( aOwner, self.getSource(), self ) ! #handler.getFunction()(self, aWxEvent) ! handler(self, aWxEvent) # do we have to clean up this alias? aWxEvent.skip = None *************** *** 1014,1020 **** wx.EVT_WINDOW_DESTROY(self, self.OnDestroy) - # def postEvent( self, aEvent ) : - # self.eventQueue.postEvent( aEvent ) - # KEA 2002-07-09 # make sure wxSTC text, bitmaps, etc. aren't lost --- 1005,1008 ---- *************** *** 1135,1139 **** ! class CustomDialog( event.Changeable, Scriptable, wx.Dialog, event.EventSource): """The dialog class used by all custom dialogs.""" --- 1123,1127 ---- ! class CustomDialog( Scriptable, wx.Dialog, event.EventSource): """The dialog class used by all custom dialogs.""" Index: component.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/component.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** component.py 2 May 2004 22:09:29 -0000 1.11 --- component.py 5 May 2004 03:51:53 -0000 1.12 *************** *** 310,314 **** # are defined in a Scriptable object. ! event.EventDispatch(component, aScriptable) # Return the newly created Component --- 310,314 ---- # are defined in a Scriptable object. ! ## event.EventDispatch(component, aScriptable) # Return the newly created Component Index: menu.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/menu.py,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** menu.py 4 May 2004 20:49:11 -0000 1.32 --- menu.py 5 May 2004 03:51:53 -0000 1.33 *************** *** 79,89 **** wx.CallAfter(self.Enable, aResource.enabled) - ## # events are bound to the parent wxFrame - ## # aka aParent.parent.parent - ## wx.EVT_MENU(aScriptable, id, aParent.parent.doMenu) component.Component.__init__( self ) - ## event.EventDispatch(self, aScriptable) self._bindEvents((MenuSelectEvent,), aScriptable, id) --- 79,85 ---- *************** *** 138,142 **** if 0: print " binding", self.name, eventClass.name, handler._name, eventClass.id ! self.eventIdToHandler[eventClass.id] = handler.getFunction() if 0: --- 134,139 ---- if 0: print " binding", self.name, eventClass.name, handler._name, eventClass.id ! #self.eventIdToHandler[eventClass.id] = handler.getFunction() ! self.eventIdToHandler[eventClass.id] = handler if 0: *************** *** 161,165 **** eventClass = self.wxEventIdMap[eventType] ! eventClassInstance = eventClass(self) # decorate will add the relevant event attributes aWxEvent = eventClassInstance.decorate(aWxEvent, self) --- 158,162 ---- eventClass = self.wxEventIdMap[eventType] ! eventClassInstance = eventClass() # decorate will add the relevant event attributes aWxEvent = eventClassInstance.decorate(aWxEvent, self) *************** *** 259,266 **** - ## def parseMenuItems( self, aParent, aResource ) : - ## for item in aResource : - ## self.appendMenuItem( MenuItem( aParent, item ) ) - def _getName( self ) : return self.name --- 256,259 ---- *************** *** 334,371 **** self.EnableTop(i, 0) - def doMenu( self, aWxMenuEvent ) : - id = aWxMenuEvent.GetId() - #if id in self.id2cmdMap: - # command = self.id2cmdMap[ id ] - # if command is None : - # evt = MenuEvent( self.id2nameMap[ id ], self ) - # else : - - item = self.id2itemMap[ id ] - if item.getCommand() is not None : - evt = event.CommandEvent( item.getCommand(), item ) - else : - evt = event.SelectEvent( item ) - # KEA 2002-03-07 - # change to (self, event) event handler dispatch - # add target manually since this is a custom event - # and doesn't go through normal dispatch - aWxMenuEvent.target = self.id2itemMap[id] - aWxMenuEvent.eventObject = aWxMenuEvent.target - try: - aWxMenuEvent.checked = aWxMenuEvent.IsChecked() - except: - pass - #aWxMenuEvent.target = aWxMenuEvent.GetEventObject() - - # KEA 2001-12-03 - # added missing setNativeEvent - evt.setNativeEvent(aWxMenuEvent) - item.notifyEventListeners(evt) - - ## def parseMenus(self, aParent, aResource): - ## for menu in aResource: - ## self.menus.append(Menu(aParent, menu)) - def __repr__(self): return 'MenuBar=' + str(self.__dict__) --- 327,330 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-05 03:52:04
|
Update of /cvsroot/pythoncard/PythonCard/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3487/components Modified Files: iehtmlwindow.py Log Message: tossed unneeded classes from event.py, removed references to Handler Index: iehtmlwindow.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/components/iehtmlwindow.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** iehtmlwindow.py 4 May 2004 20:49:11 -0000 1.15 --- iehtmlwindow.py 5 May 2004 03:51:54 -0000 1.16 *************** *** 206,210 **** # is created than to reparse for each component #self.eventIdToHandler[eventClass.id] = handler ! self.eventIdToHandler[eventClass.id] = handler.getFunction() if 0: --- 206,211 ---- # is created than to reparse for each component #self.eventIdToHandler[eventClass.id] = handler ! #self.eventIdToHandler[eventClass.id] = handler.getFunction() ! self.eventIdToHandler[eventClass.id] = handler if 0: |
|
From: Kevin A. <ka...@us...> - 2004-05-05 03:52:04
|
Update of /cvsroot/pythoncard/PythonCard/samples/proof In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3487/samples/proof Modified Files: proof.py Log Message: tossed unneeded classes from event.py, removed references to Handler Index: proof.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/proof/proof.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** proof.py 24 Apr 2004 21:09:20 -0000 1.15 --- proof.py 5 May 2004 03:51:54 -0000 1.16 *************** *** 50,59 **** log.debug( 'imagebutton-mouseClick:' + str( event.target ) ) - # RDS - MessageEvent has been removed - replacement functionality - # has not been decided yet. - - #msgEvent = MessageEvent( 'button1', 'doClick', None, self ) - ##self.postEvent( msgEvent ) - def on_list_select ( self, event ) : print 'list-select event, selected: ' + str( event.target.stringSelection ) --- 50,53 ---- |
|
From: Kevin A. <ka...@us...> - 2004-05-04 23:32:07
|
Update of /cvsroot/pythoncard/PythonCard/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22930/docs Modified Files: changelog.txt Log Message: added ataxx sample Index: changelog.txt =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/docs/changelog.txt,v retrieving revision 1.281 retrieving revision 1.282 diff -C2 -d -r1.281 -r1.282 *** changelog.txt 3 May 2004 19:27:22 -0000 1.281 --- changelog.txt 4 May 2004 23:31:54 -0000 1.282 *************** *** 3,6 **** --- 3,7 ---- Release 0.8 2004-05-?? + added ataxx sample codeEditor now persists all View menu settings added reversi (Othello) sample |
|
From: Kevin A. <ka...@us...> - 2004-05-04 23:32:05
|
Update of /cvsroot/pythoncard/PythonCard/samples/ataxx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22930/samples/ataxx Added Files: .cvsignore ataxx.py ataxx.rsrc.py readme.txt Log Message: added ataxx sample --- NEW FILE: ataxx.rsrc.py --- { 'stack':{ 'type':'Stack', 'name':'Ataxx', 'backgrounds': [ { 'type':'Background', 'name':'bgAtaxx', 'title':'Ataxx Game', 'size':( 350, 350 ), 'statusBar':True, 'menubar': { 'type':'MenuBar', 'menus': [ { 'type':'Menu', 'name':'menuFile', 'label':'&File', 'items': [ { 'type':'MenuItem', 'name':'menuFileNewGame', 'label':'&New Game\tCtrl+N' }, { 'type':'MenuItem', 'name':'menuFileExit', 'label':'E&xit\tAlt+X', 'command':'exit' } ] }, { 'type':'Menu', 'name':'mnuStrategy', 'label':'&Strategy', 'items': [ { 'type':'MenuItem', 'name':'menuStrategyFlipMostPieces', 'label':'Flip Most Pieces', 'checkable':1, 'checked':1 }, { 'type':'MenuItem', 'name':'menuStrategyRandom', 'label':'Random', 'checkable':1, 'checked':0}, ] } ] }, 'components': [ { 'type':'BitmapCanvas', 'name':'bufOff', 'position':(0, 30), 'size':(300, 300), 'backgroundColor':'lightgray', }, ] } ] } } --- NEW FILE: .cvsignore --- .cvsignore *.pyc *.log .DS_Store --- NEW FILE: ataxx.py --- #!/usr/bin/python """ Simplistic implementation of the board game reversi, better known as Othello. The algorithm for determining legal moves is not particularly efficient since no attempt is made to cache legal moves. """ """ __version__ = "$Revision: 1.1 $" __date__ = "$Date: 2004/05/04 23:31:56 $" """ from PythonCard import dialog, model from random import randint import time EMPTY = 0 BLOCK = 1 HUMAN = RED = 2 COMPUTER = PLAYER2 = BLUE = 3 BOARDWIDTH = BOARDHEIGHT = 7 DIRECTIONS = ((-1, -1), (0, -1), (1, -1), (-1, 0), (1, 0), (-1, 1), (0, 1), (1, 1)) SPLIT = DIRECTIONS JUMP = ((-2, -2), (-1, -2), (0, -2), (1, -2), (2, -2), (-2, -1), (2, -1), (-2, 0), (2, 0), (-2, 1), (2, 1), (-2, 2), (-1, 2), (0, 2), (1, 2), (2, 2)) BOARDCOLOR = 'black' GRIDCOLOR = 'cyan' BLOCKCOLOR = 'light gray' CELLWIDTH = CELLHEIGHT = 37 class GameBoard: def __init__(self): self.initializeBoard() def initializeBoard(self): self.board = {} # the board references are column, row # to simplify x, y translation for column in range(BOARDWIDTH): for row in range(BOARDHEIGHT): self.board[(column, row)] = EMPTY # different board arrangements could be used # to vary the gameplay self.board[(3, 0)] = BLOCK self.board[(0, 3)] = BLOCK self.board[(6, 3)] = BLOCK self.board[(3, 6)] = BLOCK self.board[(0, 0)] = HUMAN self.board[(6, 6)] = HUMAN self.board[(6, 0)] = COMPUTER self.board[(0, 6)] = COMPUTER # black always goes first self.nextMove = HUMAN #self.buildLegalMoves(self.nextMove) self.gameOver = False def opponentColor(self, color): if color == HUMAN: return COMPUTER else: return HUMAN def buildLegalMoves(self, column, row): """build a dictionary of legal moves with the (column, row) as the key and the number of pieces flipped as the value""" board = self.board legalMoves = {} for dx, dy in SPLIT: x = column + dx y = row + dy if board.get((x, y), None) == EMPTY: legalMoves[(x, y)] = 1 for dx, dy in JUMP: x = column + dx y = row + dy if board.get((x, y), None) == EMPTY: legalMoves[(x, y)] = 1 return legalMoves def makeMove(self, fromX, fromY, toX, toY): board = self.board color = board[(fromX, fromY)] opponent = self.opponentColor(color) dx = toX - fromX dy = toY - fromY if abs(dx) == 2 or abs(dy) == 2: # jump, so move the piece board[(fromX, fromY)] = EMPTY board[(toX, toY)] = color # now flip all the opponent pieces touching the new position for dx, dy in DIRECTIONS: x = toX + dx y = toY + dy if board.get((x, y), None) == opponent: board[(x, y)] = color self.nextMove = opponent def getScore(self): """return a tuple containing the number of empty, black, and white squares""" score = {HUMAN:0, COMPUTER:0, EMPTY:0, BLOCK:0} for value in self.board.values(): score[value] += 1 return score class Ataxx(model.Background): def on_initialize(self, event): self.boardModel = GameBoard() self.components.bufOff.size = (BOARDWIDTH * CELLWIDTH + 1, BOARDHEIGHT * CELLHEIGHT + 1) self.singleItemExpandingSizerLayout() self.drawBoard() self.updateStatus() self.player = HUMAN self.computer = COMPUTER self.lastHover = None if self.computer == HUMAN: self.boardModel.doComputerMove(HUMAN) def computerMove(self): if self.menuBar.getChecked('menuStrategyFlipMostPieces'): self.boardModel.doFlipMostPiecesComputerMove(self.computer) else: self.boardModel.doRandomComputerMove(self.computer) # sleep for a second to make it appear # the computer thought long and hard on her choice :) time.sleep(1) self.drawBoard() self.updateStatus() def newGame(self): self.boardModel.initializeBoard() self.drawBoard() self.updateStatus() if self.computer == BLACK: self.computerMove() def drawCell(self, x, y, state): view = self.components.bufOff if state in [HUMAN, COMPUTER]: if state == HUMAN: color = 'red' else: color = 'blue' view.setFillColor(color) view.foregroundColor = 'black' center = (x * CELLWIDTH + CELLWIDTH / 2 + 1, y * CELLHEIGHT + CELLHEIGHT / 2 + 1) view.drawCircle(center, round((CELLWIDTH / 2.0) - 3)) elif state == BLOCK: view.setFillColor(BLOCKCOLOR) view.foregroundColor = BLOCKCOLOR view.drawRectangle((x * CELLWIDTH + 3, y * CELLHEIGHT + 3), (CELLWIDTH - 5, CELLHEIGHT - 5)) else: view.setFillColor(BOARDCOLOR) view.foregroundColor = BOARDCOLOR view.drawRectangle((x * CELLWIDTH + 1, y * CELLHEIGHT + 1), (CELLWIDTH - 2, CELLHEIGHT - 2)) def drawBoard(self): view = self.components.bufOff view.autoRefresh = False view.backgroundColor = BOARDCOLOR view.clear() # draw the right and bottom edge borders view.foregroundColor = GRIDCOLOR view.drawLine((0, BOARDHEIGHT * CELLHEIGHT), (BOARDWIDTH * CELLWIDTH, BOARDHEIGHT * CELLHEIGHT)) view.drawLine((BOARDWIDTH * CELLWIDTH, 0), (BOARDWIDTH * CELLWIDTH, BOARDHEIGHT * CELLHEIGHT)) for x in range(BOARDWIDTH): view.foregroundColor = GRIDCOLOR view.drawLine((x * CELLWIDTH, 0), (x * CELLWIDTH, BOARDHEIGHT * CELLHEIGHT)) for y in range(BOARDHEIGHT): view.foregroundColor = GRIDCOLOR view.drawLine((0, y * CELLHEIGHT), (BOARDWIDTH * CELLWIDTH, y * CELLHEIGHT)) state = self.boardModel.board[(x, y)] self.drawCell(x, y, state) view.autoRefresh = True view.refresh() def updateStatus(self): if self.boardModel.gameOver: score = self.boardModel.getScore() playerScore = score[self.player] computerScore = score[self.computer] scoreString = "Red: %d Blue: %d" % (score[HUMAN], score[COMPUTER]) if playerScore > computerScore: message = "Player won!" elif playerScore < computerScore: message = "Computer won!" else: message = "Tie Game" status = message + " - " + scoreString else: if self.boardModel.nextMove == HUMAN: status = "Red's move" else: status = "Blue's move" self.statusBar.text = status def on_bufOff_mouseDown(self, event): self.startLocation = None x, y = event.position x = x / CELLWIDTH y = y / CELLHEIGHT if (x >= 0 and x < BOARDWIDTH) and (y >= 0 and y < BOARDHEIGHT): if self.boardModel.board[(x, y)] == self.boardModel.nextMove: self.startLocation = (x, y) self.legalMoves = self.boardModel.buildLegalMoves(x, y) def on_bufOff_mouseDrag(self, event): if self.startLocation: x, y = event.position x = x / CELLWIDTH y = y / CELLHEIGHT #if self.boardModel.legalMove(x, y, self.boardModel.nextMove): if (x, y) != self.lastHover: # erase lastHover if needed if self.lastHover and self.boardModel.board[self.lastHover] is EMPTY: self.drawCell(self.lastHover[0], self.lastHover[1], EMPTY) # if the move is legal, show it if self.legalMoves.get((x, y), None): self.drawCell(x, y, self.boardModel.nextMove) # don't track positions outside the valid range if (x >= 0 and x < BOARDWIDTH) and (y >= 0 and y < BOARDHEIGHT): self.lastHover = (x, y) def on_bufOff_mouseUp(self, event): if self.startLocation: x, y = event.position # this is a simplistic translation # when users click on the lines # separating cells they may get a cell # they didn't expect x = x / CELLWIDTH y = y / CELLHEIGHT if self.legalMoves.get((x, y), None): self.boardModel.makeMove(self.startLocation[0], self.startLocation[1], x, y) self.drawBoard() self.updateStatus() def on_menuFileNewGame_select(self, event): self.newGame() if __name__ == '__main__': app = model.Application(Ataxx) app.MainLoop() --- NEW FILE: readme.txt --- Ataxx http://www.pressibus.org/ataxx/indexgb.html THE GAME ISN'T DONE YET, IT CURRENTLY HANDLES HUMAN VERSUS HUMAN, BUT DOESN'T CHECK FOR WHETHER THE GAME IS OVER. I JUST WANTED TO GET THIS INTO CVS SO I DON'T LOSE THE CODE. |
|
From: Kevin A. <ka...@us...> - 2004-05-04 23:30:25
|
Update of /cvsroot/pythoncard/PythonCard/samples/ataxx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22670/ataxx Log Message: Directory /cvsroot/pythoncard/PythonCard/samples/ataxx added to the repository |
|
From: Kevin A. <ka...@us...> - 2004-05-04 20:49:51
|
Update of /cvsroot/pythoncard/PythonCard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18372 Modified Files: menu.py widget.py Log Message: switched to new style event binding and dispatch Index: widget.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/widget.py,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** widget.py 3 May 2004 02:56:33 -0000 1.124 --- widget.py 4 May 2004 20:49:11 -0000 1.125 *************** *** 378,382 **** event.EventLog.getInstance().log(eventName, self.name, True) if 0: ! print "dispatching", handler._name # make a lowercase alias aWxEvent.skip = aWxEvent.Skip --- 378,382 ---- event.EventLog.getInstance().log(eventName, self.name, True) if 0: ! print "dispatching", handler.__name__ # make a lowercase alias aWxEvent.skip = aWxEvent.Skip Index: menu.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/menu.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** menu.py 1 May 2004 18:47:50 -0000 1.31 --- menu.py 4 May 2004 20:49:11 -0000 1.32 *************** *** 32,35 **** --- 32,45 ---- """ + class MenuSelectEvent(event.SelectEvent): + binding = wx.EVT_MENU + id = wx.wxEVT_COMMAND_MENU_SELECTED + + def decorate(self, aWxEvent, source): + aWxEvent = event.Event.decorate(self, aWxEvent, source) + aWxEvent.checked = aWxEvent.IsChecked() + return aWxEvent + + class MenuItem(wx.MenuItem, component.Component): """ *************** *** 69,82 **** wx.CallAfter(self.Enable, aResource.enabled) ! # events are bound to the parent wxFrame ! # aka aParent.parent.parent ! wx.EVT_MENU(aScriptable, id, aParent.parent.doMenu) component.Component.__init__( self ) ! event.EventDispatch(self, aScriptable) aParent.parent.id2itemMap[id] = self def _getName( self ) : --- 79,211 ---- wx.CallAfter(self.Enable, aResource.enabled) ! ## # events are bound to the parent wxFrame ! ## # aka aParent.parent.parent ! ## wx.EVT_MENU(aScriptable, id, aParent.parent.doMenu) component.Component.__init__( self ) ! ## event.EventDispatch(self, aScriptable) ! self._bindEvents((MenuSelectEvent,), aScriptable, id) aParent.parent.id2itemMap[id] = self + def _bindEvents(self, eventList, aScriptable, menuId): + ## background = wx.GetTopLevelParent(self) + background = aScriptable + + # where should this check go? + # should we just set a "global" in the app instance such as + # self.stack.app.bindUnusedEvents + # this kind of thing isn't going to work for Rowland's compound + # components + if wx.GetApp()._showDebugMenu: + bindUnusedEvents = True + else: + bindUnusedEvents = False + + # helper variable to simplify test for whether to bind InsteadOfTypeEvents + # there is a good chance we will need to know + # which events are bound, if we want to dynamically add or remove + # events later, so go ahead and keep a reference to the list + self.boundEvents = {} + + self.eventIdToHandler = {} + self.wxEventIdMap = {} + + if 0: + print "\nBINDING...", self.name + + for eventClass in eventList: + self.wxEventIdMap[eventClass.id] = eventClass + if issubclass(eventClass, event.CommandTypeEvent) and self.command: + handler = background.findHandler('on_' + self.command + '_command') + if not handler: + handler = background.findHandler('on_' + self.name + '_' + eventClass.name) + else: + handler = background.findHandler('on_' + self.name + '_' + eventClass.name) + if not handler: + handler = background.findHandler('on_' + eventClass.name) + if handler or bindUnusedEvents: + if not self.boundEvents.get(eventClass.binding, None): + ## self.Bind(eventClass.binding, self._dispatch) + # KEA 2004-05-04 + # not sure yet if there is a different way to handle the bind + # apparently we have to bind the event to the parent frame + # and I think we also need the id, need to check with Robin + background.Bind(eventClass.binding, self._dispatch, id=menuId) + self.boundEvents[eventClass.binding] = eventClass.name + if handler: + if 0: + print " binding", self.name, eventClass.name, handler._name, eventClass.id + self.eventIdToHandler[eventClass.id] = handler.getFunction() + + if 0: + print "\n boundEvents:" + for name in self.boundEvents.values(): + print " ", name + print "\n\n" + print "\n self.eventIdToHandler:" + for id in self.eventIdToHandler: + # KEA 2004-05-02 + # change to just using the method directly, Handler class not needed + #print " ", id, self.eventIdToHandler[id]._function + print " ", id, self.eventIdToHandler[id] + print "\n\n" + + def _dispatch(self, aWxEvent): + eventType = aWxEvent.GetEventType() + # KEA 2004-05-04 + # for a menu item this event will always be the same + # so this is redundant unless there is some binding other than + # EVT_MENU that we're going to support?! + eventClass = self.wxEventIdMap[eventType] + + eventClassInstance = eventClass(self) + # decorate will add the relevant event attributes + aWxEvent = eventClassInstance.decorate(aWxEvent, self) + + if self.command and isinstance(eventClassInstance, event.CommandTypeEvent): + # need to report the name for the handler if it exists + eventName = 'command' + else: + if isinstance(eventClassInstance, event.InsteadOfTypeEvent): + # changes eventType if needed + # e.g. mouseDrag instead of mouseMove + eventType = eventClassInstance.translateEventType(aWxEvent) + eventName = self.wxEventIdMap[eventType].name + + # cleanup + eventClass = None + eventClassInstance = None + + handler = self.eventIdToHandler.get(eventType, None) + if handler: + event.EventLog.getInstance().log(eventName, self.name, True) + if 0: + print "dispatching", handler.__name__ + # make a lowercase alias + aWxEvent.skip = aWxEvent.Skip + + # KEA 2004-05-04 + # the menu events are always bound to the parent frame + # so the target of the event will be the "background" + background = aWxEvent.GetEventObject() + ## background = wx.GetTopLevelParent(self) + + handler(background, aWxEvent) + + # do we have to clean up this alias? + aWxEvent.skip = None + # how about this local reference to handler? + handler = None + background = None + else: + event.EventLog.getInstance().log(eventName, self.name, False) + # hopefully this is all we need to do for "unused events" + aWxEvent.Skip() + + # cleanup + aWxEvent.target = aWxEvent.eventObject = None + def _getName( self ) : |
|
From: Kevin A. <ka...@us...> - 2004-05-04 20:49:50
|
Update of /cvsroot/pythoncard/PythonCard/samples/simpleIEBrowser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18372/samples/simpleIEBrowser Modified Files: simpleIEBrowser.py Log Message: switched to new style event binding and dispatch Index: simpleIEBrowser.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/samples/simpleIEBrowser/simpleIEBrowser.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simpleIEBrowser.py 25 Apr 2004 23:12:46 -0000 1.10 --- simpleIEBrowser.py 4 May 2004 20:49:11 -0000 1.11 *************** *** 35,45 **** def on_htmlDisplay_titleChange(self, event): ! self.title = "SimpleIEBrowser: %s" % event.GetText1() def on_htmlDisplay_statusTextChange(self, event): ! self.statusBar.text = event.GetText1() def on_htmlDisplay_documentComplete(self, evt): ! self.current = evt.GetText1() self.components.fldURL.text = self.current --- 35,45 ---- def on_htmlDisplay_titleChange(self, event): ! self.title = "SimpleIEBrowser: %s" % event.Text def on_htmlDisplay_statusTextChange(self, event): ! self.statusBar.text = event.Text def on_htmlDisplay_documentComplete(self, evt): ! self.current = evt.URL self.components.fldURL.text = self.current |
