Author: reinhard
Date: 2011-06-18 04:17:44 -0500 (Sat, 18 Jun 2011)
New Revision: 10318
Modified:
trunk/gnue-designer/
trunk/gnue-designer/src/base/TemplateParser.py
trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
trunk/gnue-designer/src/ui/wx/uihelpers/GridCellEditors.py
Log:
GetKeyCode method versus KeyCode int object is not callable
Property changes on: trunk/gnue-designer
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2011-05-04 13:11:48.344000101 -0700
committer: whizman
properties:
branch-nick: designer
+ timestamp: 2011-05-05 16:10:25.875999928 -0700
committer: whizman
properties:
branch-nick: designer
Name: bzr:file-ids
- src/forms/document.py
8389@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:src%2Fforms%2Fdocument.py
+ src/base/TemplateParser.py
1427@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:src%2Fbase%2FTemplateParser.py
src/forms/LayoutEditor/LayoutEditor.py
2348@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:src%2Fforms%2FLayoutEditor%2FLayoutEditor.py
src/forms/LayoutEditor/Workspace.py
4453@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:src%2Fforms%2FLayoutEditor%2FWorkspace.py
src/ui/wx/uihelpers/GridCellEditors.py
8335@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:src%2Fui%2Fwx%2Fuihelpers%2FGridCellEditors.py
Name: bzr:revision-id:v4
- 937 reinhard.muel...@bytewise.at-20100426083744-iq5ahvdxf38ltx6r
938 whizman_software_solutions_www.whizman.com-20110131201023-bmx4kgkf4erlim85
939 whizman_software_solutions_www.whizman.com-20110226005239-cn6eioyybe5p62rh
940 whizman-20110504201148-w669gtbff176vhop
+ 937 reinhard.muel...@bytewise.at-20100426083744-iq5ahvdxf38ltx6r
938 whizman_software_solutions_www.whizman.com-20110131201023-bmx4kgkf4erlim85
939 whizman_software_solutions_www.whizman.com-20110226005239-cn6eioyybe5p62rh
940 whizman-20110504201148-w669gtbff176vhop
941 whizman-20110505231025-243w4sfxhzqcbzt2
Name: bzr:text-parents
- src/forms/document.py
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
+ src/base/TemplateParser.py
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/forms/LayoutEditor/LayoutEditor.py
whizman_software_solutions_www.whizman.com-20110131201023-bmx4kgkf4erlim85
src/forms/LayoutEditor/Workspace.py
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/ui/wx/uihelpers/GridCellEditors.py
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
Modified: trunk/gnue-designer/src/base/TemplateParser.py
===================================================================
--- trunk/gnue-designer/src/base/TemplateParser.py 2011-06-18 09:17:40 UTC
(rev 10317)
+++ trunk/gnue-designer/src/base/TemplateParser.py 2011-06-18 09:17:44 UTC
(rev 10318)
@@ -690,7 +690,7 @@
self.seq = seq
def fieldEventTrap(self, event):
- keycode = event.KeyCode()
+ keycode = event.GetKeyCode()
if keycode in (wx.WXK_RETURN,wx.WXK_TAB):
if self.seq < len(self.app.textctrlList) - 1:
self.app.textctrlList[self.seq+1].SetFocus()
Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2011-06-18
09:17:40 UTC (rev 10317)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2011-06-18
09:17:44 UTC (rev 10318)
@@ -633,18 +633,18 @@
def keyTrap(self, event):
- if event.KeyCode() in (wx.WXK_LEFT,wx.WXK_RIGHT,wx.WXK_UP,wx.WXK_DOWN)
and \
+ if event.GetKeyCode() in
(wx.WXK_LEFT,wx.WXK_RIGHT,wx.WXK_UP,wx.WXK_DOWN) and \
len(self._currentSelection):
if event.AltDown() or event.ControlDown() or event.ShiftDown():
# caution: event.MetaDown() is always True on some
architectures
resize = None
- if event.KeyCode() == wx.WXK_LEFT:
+ if event.GetKeyCode() == wx.WXK_LEFT:
resize = (-1,0)
- if event.KeyCode() == wx.WXK_RIGHT:
+ if event.GetKeyCode() == wx.WXK_RIGHT:
resize = (1,0)
- if event.KeyCode() == wx.WXK_UP:
+ if event.GetKeyCode() == wx.WXK_UP:
resize = (0,-1)
- if event.KeyCode() == wx.WXK_DOWN:
+ if event.GetKeyCode() == wx.WXK_DOWN:
resize = (0,1)
if resize:
self.dispatchEvent('BeginUndoGroup')
@@ -653,13 +653,13 @@
self.dispatchEvent('EndUndoGroup')
else:
pos = None
- if event.KeyCode() == wx.WXK_LEFT:
+ if event.GetKeyCode() == wx.WXK_LEFT:
pos = (-1,0)
- if event.KeyCode() == wx.WXK_RIGHT:
+ if event.GetKeyCode() == wx.WXK_RIGHT:
pos = (1,0)
- if event.KeyCode() == wx.WXK_UP:
+ if event.GetKeyCode() == wx.WXK_UP:
pos = (0,-1)
- if event.KeyCode() == wx.WXK_DOWN:
+ if event.GetKeyCode() == wx.WXK_DOWN:
pos = (0,1)
if pos:
@@ -669,7 +669,7 @@
widget._widgetHandler.relativeMove(*pos)
self.dispatchEvent('EndUndoGroup')
- elif event.KeyCode() == wx.WXK_DELETE and \
+ elif event.GetKeyCode() == wx.WXK_DELETE and \
len(self._currentSelection):
self.dispatchEvent('BeginUndoGroup')
for object in self._currentSelection:
@@ -677,7 +677,7 @@
self.dispatchEvent('ObjectDeleted', object=object,
originator=self)
self.dispatchEvent('EndUndoGroup')
- elif event.KeyCode() == wx.WXK_TAB:
+ elif event.GetKeyCode() == wx.WXK_TAB:
if event.ShiftDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type ==
'GFPage':
Modified: trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2011-06-18
09:17:40 UTC (rev 10317)
+++ trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2011-06-18
09:17:44 UTC (rev 10318)
@@ -548,18 +548,18 @@
def keyTrap(self, event):
- if event.KeyCode() in (wx.WXK_LEFT,wx.WXK_RIGHT,wx.WXK_UP,wx.WXK_DOWN)
and \
+ if event.GetKeyCode() in
(wx.WXK_LEFT,wx.WXK_RIGHT,wx.WXK_UP,wx.WXK_DOWN) and \
len(self._currentSelection):
if event.AltDown() or event.ControlDown() or event.ShiftDown():
# caution: event.MetaDown() is always True on some
architectures
resize = None
- if event.KeyCode() == wx.WXK_LEFT:
+ if event.GetKeyCode() == wx.WXK_LEFT:
resize = (-1,0)
- if event.KeyCode() == wx.WXK_RIGHT:
+ if event.GetKeyCode() == wx.WXK_RIGHT:
resize = (1,0)
- if event.KeyCode() == wx.WXK_UP:
+ if event.GetKeyCode() == wx.WXK_UP:
resize = (0,-1)
- if event.KeyCode() == wx.WXK_DOWN:
+ if event.GetKeyCode() == wx.WXK_DOWN:
resize = (0,1)
if resize:
self.layouteditor.dispatchEvent('BeginUndoGroup')
@@ -568,13 +568,13 @@
self.layouteditor.dispatchEvent('EndUndoGroup')
else:
pos = None
- if event.KeyCode() == wx.WXK_LEFT:
+ if event.GetKeyCode() == wx.WXK_LEFT:
pos = (-1,0)
- if event.KeyCode() == wx.WXK_RIGHT:
+ if event.GetKeyCode() == wx.WXK_RIGHT:
pos = (1,0)
- if event.KeyCode() == wx.WXK_UP:
+ if event.GetKeyCode() == wx.WXK_UP:
pos = (0,-1)
- if event.KeyCode() == wx.WXK_DOWN:
+ if event.GetKeyCode() == wx.WXK_DOWN:
pos = (0,1)
if pos:
@@ -584,7 +584,7 @@
widget._widgetHandler.relativeMove(*pos)
self.layouteditor.dispatchEvent('EndUndoGroup')
- elif event.KeyCode() == wx.WXK_DELETE and \
+ elif event.GetKeyCode() == wx.WXK_DELETE and \
len(self._currentSelection):
self.layouteditor.dispatchEvent('BeginUndoGroup')
for object in self._currentSelection:
@@ -592,7 +592,7 @@
self.layouteditor.dispatchEvent('ObjectDeleted',
object=object,
originator=self)
self.layouteditor.dispatchEvent('EndUndoGroup')
- elif event.KeyCode() == wx.WXK_TAB:
+ elif event.GetKeyCode() == wx.WXK_TAB:
if event.ShiftDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type ==
'GFPage':
Modified: trunk/gnue-designer/src/ui/wx/uihelpers/GridCellEditors.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/uihelpers/GridCellEditors.py 2011-06-18
09:17:40 UTC (rev 10317)
+++ trunk/gnue-designer/src/ui/wx/uihelpers/GridCellEditors.py 2011-06-18
09:17:44 UTC (rev 10318)
@@ -137,9 +137,9 @@
wx.EVT_CHAR(self._tc, self.OnKeyPressed)
def OnKeyPressed(self, evt):
- if (ord('0') <= evt.KeyCode() <= ord('9') or \
- evt.KeyCode() in (ord('-'), ord('+')) or \
- evt.KeyCode() < 32 or evt.KeyCode() > 126):
+ if (ord('0') <= evt.GetKeyCode() <= ord('9') or \
+ evt.GetKeyCode() in (ord('-'), ord('+')) or \
+ evt.GetKeyCode() < 32 or evt.GetKeyCode() > 126):
evt.Skip()
def StartingKey(self, evt):
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-gnue
