Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes from global variables to 'g' object defined in globals.py

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2002-12-09 09:46:58 +00:00
parent ee950b94e2
commit 4acfbf894d
2 changed files with 42 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
wxPython/wxPython/tools/XRCed/params.py
View File

@@ -4,18 +4,11 @@
# Created: 22.08.2001 # Created: 22.08.2001
# RCS-ID: $Id$ # RCS-ID: $Id$
from wxPython.wx import *
from wxPython.xrc import *
import string import string
import os.path import os.path
from globals import *
from types import * from types import *
# Object which is currently processed
currentXXX = None
def SetCurrentXXX(xxx):
global currentXXX
currentXXX = xxx
genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER', genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER',
'wxSUNKEN_BORDER', 'wxRAISED_BORDER', 'wxSUNKEN_BORDER', 'wxRAISED_BORDER',
'wxSTATIC_BORDER', 'wxNO_BORDER', 'wxSTATIC_BORDER', 'wxNO_BORDER',
@@ -36,14 +29,19 @@ class PPanel(wxPanel):
wxPanel.Enable(self, value) wxPanel.Enable(self, value)
def SetModified(self): def SetModified(self):
self.modified = true self.modified = true
panel.SetModified(true) g.panel.SetModified(true)
# Common method to set modified state
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
class ParamBinaryOr(PPanel): class ParamBinaryOr(PPanel):
def __init__(self, parent, name): def __init__(self, parent, name):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_CHOICES = wxNewId() self.ID_BUTTON_CHOICES = wxNewId()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5) sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
@@ -54,10 +52,6 @@ class ParamBinaryOr(PPanel):
sizer.Fit(self) sizer.Fit(self)
EVT_BUTTON(self, self.ID_BUTTON_CHOICES, self.OnButtonChoices) EVT_BUTTON(self, self.ID_BUTTON_CHOICES, self.OnButtonChoices)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
def GetValue(self): def GetValue(self):
return self.text.GetValue() return self.text.GetValue()
def SetValue(self, value): def SetValue(self, value):
@@ -121,18 +115,18 @@ class ParamFlag(ParamBinaryOr):
class ParamStyle(ParamBinaryOr): class ParamStyle(ParamBinaryOr):
equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE'} equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE'}
def __init__(self, parent, name): def __init__(self, parent, name):
self.values = currentXXX.winStyles + genericStyles self.values = g.currentXXX.winStyles + genericStyles
ParamBinaryOr.__init__(self, parent, name) ParamBinaryOr.__init__(self, parent, name)
class ParamNonGenericStyle(ParamBinaryOr): class ParamNonGenericStyle(ParamBinaryOr):
def __init__(self, parent, name): def __init__(self, parent, name):
self.values = currentXXX.winStyles self.values = g.currentXXX.winStyles
ParamBinaryOr.__init__(self, parent, name) ParamBinaryOr.__init__(self, parent, name)
class ParamExStyle(ParamBinaryOr): class ParamExStyle(ParamBinaryOr):
def __init__(self, parent, name): def __init__(self, parent, name):
if currentXXX: if g.currentXXX:
self.values = currentXXX.exStyles # constant at the moment self.values = g.currentXXX.exStyles # constant at the moment
else: else:
self.values = [] self.values = []
ParamBinaryOr.__init__(self, parent, name) ParamBinaryOr.__init__(self, parent, name)
@@ -142,7 +136,7 @@ class ParamColour(PPanel):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON = wxNewId() self.ID_BUTTON = wxNewId()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(65,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(65,-1))
sizer.Add(self.text, 0, wxRIGHT, 5) sizer.Add(self.text, 0, wxRIGHT, 5)
@@ -165,10 +159,6 @@ class ParamColour(PPanel):
self.button.SetBackgroundColour(colour) self.button.SetBackgroundColour(colour)
self.button.Refresh() self.button.Refresh()
self.freeze = false self.freeze = false
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
def OnPaintButton(self, evt): def OnPaintButton(self, evt):
dc = wxPaintDC(self.button) dc = wxPaintDC(self.button)
dc.SetBrush(wxTRANSPARENT_BRUSH) dc.SetBrush(wxTRANSPARENT_BRUSH)
@@ -206,7 +196,7 @@ class ParamFont(PPanel):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_SELECT = wxNewId() self.ID_BUTTON_SELECT = wxNewId()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5) sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
@@ -219,10 +209,8 @@ class ParamFont(PPanel):
EVT_BUTTON(self, self.ID_BUTTON_SELECT, self.OnButtonSelect) EVT_BUTTON(self, self.ID_BUTTON_SELECT, self.OnButtonSelect)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt): def OnChange(self, evt):
if self.freeze: return PPanel.OnChange(self, evt)
self.SetModified()
self.textModified = true self.textModified = true
evt.Skip()
def _defaultValue(self): def _defaultValue(self):
return ['12', 'default', 'normal', 'normal', '0', '', ''] return ['12', 'default', 'normal', 'normal', '0', '', '']
def GetValue(self): def GetValue(self):
@@ -302,7 +290,7 @@ class ParamInt(PPanel):
self.ID_SPIN_CTRL = wxNewId() self.ID_SPIN_CTRL = wxNewId()
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=wxSize(50,-1)) self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=wxSize(50,-1))
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer.Add(self.spin) sizer.Add(self.spin)
self.SetAutoLayout(true) self.SetAutoLayout(true)
self.SetSizer(sizer) self.SetSizer(sizer)
@@ -315,10 +303,6 @@ class ParamInt(PPanel):
if not value: value = 0 if not value: value = 0
self.spin.SetValue(int(value)) self.spin.SetValue(int(value))
self.freeze = false self.freeze = false
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
class ParamText(PPanel): class ParamText(PPanel):
def __init__(self, parent, name, textWidth=200): def __init__(self, parent, name, textWidth=200):
@@ -326,7 +310,7 @@ class ParamText(PPanel):
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
# We use sizer even here to have the same size of text control # We use sizer even here to have the same size of text control
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1))
sizer.Add(self.text, 0, wxALIGN_CENTER_VERTICAL) sizer.Add(self.text, 0, wxALIGN_CENTER_VERTICAL)
self.SetAutoLayout(true) self.SetAutoLayout(true)
@@ -339,10 +323,6 @@ class ParamText(PPanel):
self.freeze = true # disable other handlers self.freeze = true # disable other handlers
self.text.SetValue(value) self.text.SetValue(value)
self.freeze = false # disable other handlers self.freeze = false # disable other handlers
def OnChange(self, evt):
if self.freeze: return
self.SetModified()
evt.Skip()
class ParamAccel(ParamText): class ParamAccel(ParamText):
def __init__(self, parent, name): def __init__(self, parent, name):
@@ -355,7 +335,7 @@ class ParamPosSize(ParamText):
class ContentDialog(wxDialogPtr): class ContentDialog(wxDialogPtr):
def __init__(self, parent, value): def __init__(self, parent, value):
# Is this normal??? # Is this normal???
w = frame.res.LoadDialog(parent, 'DIALOG_CONTENT') w = g.frame.res.LoadDialog(parent, 'DIALOG_CONTENT')
wxDialogPtr.__init__(self, w.this) wxDialogPtr.__init__(self, w.this)
self.thisown = 1 self.thisown = 1
self.Center() self.Center()
@@ -406,7 +386,7 @@ class ContentDialog(wxDialogPtr):
class ContentCheckListDialog(wxDialogPtr): class ContentCheckListDialog(wxDialogPtr):
def __init__(self, parent, value): def __init__(self, parent, value):
# Is this normal??? # Is this normal???
w = frame.res.LoadDialog(parent, 'DIALOG_CONTENT_CHECK_LIST') w = g.frame.res.LoadDialog(parent, 'DIALOG_CONTENT_CHECK_LIST')
wxDialogPtr.__init__(self, w.this) wxDialogPtr.__init__(self, w.this)
self.thisown = 1 self.thisown = 1
self.Center() self.Center()
@@ -468,7 +448,7 @@ class ParamContent(PPanel):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_EDIT = wxNewId() self.ID_BUTTON_EDIT = wxNewId()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5) sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
@@ -481,10 +461,8 @@ class ParamContent(PPanel):
EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit) EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt): def OnChange(self, evt):
if self.freeze: return PPanel.OnChange(self, evt)
self.SetModified()
self.textModified = true self.textModified = true
evt.Skip()
def GetValue(self): def GetValue(self):
if self.textModified: # text has newer value if self.textModified: # text has newer value
try: try:
@@ -542,7 +520,7 @@ class ParamContentCheckList(ParamContent):
class IntListDialog(wxDialogPtr): class IntListDialog(wxDialogPtr):
def __init__(self, parent, value): def __init__(self, parent, value):
# Is this normal??? # Is this normal???
w = frame.res.LoadDialog(parent, 'DIALOG_INTLIST') w = g.frame.res.LoadDialog(parent, 'DIALOG_INTLIST')
wxDialogPtr.__init__(self, w.this) wxDialogPtr.__init__(self, w.this)
self.thisown = 1 self.thisown = 1
self.Center() self.Center()
@@ -613,7 +591,7 @@ class RadioBox(PPanel):
def __init__(self, parent, id, choices, def __init__(self, parent, id, choices,
pos=wxDefaultPosition, name='radiobox'): pos=wxDefaultPosition, name='radiobox'):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
self.choices = choices self.choices = choices
topSizer = wxBoxSizer() topSizer = wxBoxSizer()
for i in choices: for i in choices:
@@ -664,7 +642,7 @@ class ParamFile(PPanel):
PPanel.__init__(self, parent, name) PPanel.__init__(self, parent, name)
self.ID_TEXT_CTRL = wxNewId() self.ID_TEXT_CTRL = wxNewId()
self.ID_BUTTON_BROWSE = wxNewId() self.ID_BUTTON_BROWSE = wxNewId()
self.SetBackgroundColour(panel.GetBackgroundColour()) self.SetBackgroundColour(g.panel.GetBackgroundColour())
sizer = wxBoxSizer() sizer = wxBoxSizer()
self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5) sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
@@ -677,10 +655,8 @@ class ParamFile(PPanel):
EVT_BUTTON(self, self.ID_BUTTON_BROWSE, self.OnButtonBrowse) EVT_BUTTON(self, self.ID_BUTTON_BROWSE, self.OnButtonBrowse)
EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
def OnChange(self, evt): def OnChange(self, evt):
if self.freeze: return PPanel.OnChange(self, evt)
self.SetModified()
self.textModified = true self.textModified = true
evt.Skip()
def GetValue(self): def GetValue(self):
if self.textModified: # text has newer value if self.textModified: # text has newer value
return self.text.GetValue() return self.text.GetValue()
@@ -698,7 +674,7 @@ class ParamFile(PPanel):
defaultFile = os.path.basename(self.value)) defaultFile = os.path.basename(self.value))
if dlg.ShowModal() == wxID_OK: if dlg.ShowModal() == wxID_OK:
# Make relative # Make relative
common = os.path.commonprefix([os.path.abspath(frame.dataFile), common = os.path.commonprefix([os.path.abspath(g.frame.dataFile),
dlg.GetPath()]) dlg.GetPath()])
self.SetValue(dlg.GetPath()[len(common):]) self.SetValue(dlg.GetPath()[len(common):])
self.SetModified() self.SetModified()

35
wxPython/wxPython/tools/XRCed/xxx.py
View File

@@ -4,11 +4,8 @@
# Created: 22.08.2001 # Created: 22.08.2001
# RCS-ID: $Id$ # RCS-ID: $Id$
from wxPython.wx import *
from wxPython.xrc import *
from xml.dom import minidom from xml.dom import minidom
import wxPython.lib.wxpTag from globals import *
from params import * from params import *
currentEncoding = wxLocale_GetSystemEncodingName() currentEncoding = wxLocale_GetSystemEncodingName()
@@ -28,7 +25,7 @@ class xxxParam(xxxNode):
xxxNode.__init__(self, node) xxxNode.__init__(self, node)
if not node.hasChildNodes(): if not node.hasChildNodes():
# If does not have child nodes, create empty text node # If does not have child nodes, create empty text node
text = tree.dom.createTextNode('') text = g.tree.dom.createTextNode('')
node.appendChild(text) node.appendChild(text)
else: else:
text = node.childNodes[0] # first child must be text node text = node.childNodes[0] # first child must be text node
@@ -72,7 +69,7 @@ class xxxParamContent(xxxNode):
assert n.tagName == 'item', 'bad content content' assert n.tagName == 'item', 'bad content content'
if not n.hasChildNodes(): if not n.hasChildNodes():
# If does not have child nodes, create empty text node # If does not have child nodes, create empty text node
text = tree.dom.createTextNode('') text = g.tree.dom.createTextNode('')
node.appendChild(text) node.appendChild(text)
else: else:
# !!! normalize? # !!! normalize?
@@ -94,8 +91,8 @@ class xxxParamContent(xxxNode):
self.node.removeChild(n) self.node.removeChild(n)
l = [] l = []
for str in value: for str in value:
itemElem = tree.dom.createElement('item') itemElem = g.tree.dom.createElement('item')
itemText = tree.dom.createTextNode(str) itemText = g.tree.dom.createTextNode(str)
itemElem.appendChild(itemText) itemElem.appendChild(itemText)
self.node.appendChild(itemElem) self.node.appendChild(itemElem)
l.append(itemText) l.append(itemText)
@@ -118,7 +115,7 @@ class xxxParamContentCheckList(xxxNode):
if not checked: checked = 0 if not checked: checked = 0
if not n.hasChildNodes(): if not n.hasChildNodes():
# If does not have child nodes, create empty text node # If does not have child nodes, create empty text node
text = tree.dom.createTextNode('') text = g.tree.dom.createTextNode('')
node.appendChild(text) node.appendChild(text)
else: else:
# !!! normalize? # !!! normalize?
@@ -140,10 +137,10 @@ class xxxParamContentCheckList(xxxNode):
self.node.removeChild(n) self.node.removeChild(n)
l = [] l = []
for s,ch in value: for s,ch in value:
itemElem = tree.dom.createElement('item') itemElem = g.tree.dom.createElement('item')
# Add checked only if true # Add checked only if true
if ch: itemElem.setAttribute('checked', '1') if ch: itemElem.setAttribute('checked', '1')
itemText = tree.dom.createTextNode(s) itemText = g.tree.dom.createTextNode(s)
itemElem.appendChild(itemText) itemElem.appendChild(itemText)
self.node.appendChild(itemElem) self.node.appendChild(itemElem)
l.append((itemText, itemElem)) l.append((itemText, itemElem))
@@ -255,8 +252,8 @@ class xxxParamFont(xxxObject, xxxNode):
v = [] v = []
for param in self.allParams: for param in self.allParams:
if value[i]: if value[i]:
fontElem = tree.dom.createElement(param) fontElem = g.tree.dom.createElement(param)
textNode = tree.dom.createTextNode(value[i]) textNode = g.tree.dom.createTextNode(value[i])
self.params[param] = textNode self.params[param] = textNode
fontElem.appendChild(textNode) fontElem.appendChild(textNode)
elem.appendChild(fontElem) elem.appendChild(fontElem)
@@ -559,8 +556,8 @@ class xxxFlexGridSizer(xxxGridSizer):
self.params[param].remove() self.params[param].remove()
del self.params[param] del self.params[param]
for i in value: for i in value:
node = tree.dom.createElement(param) node = g.tree.dom.createElement(param)
text = tree.dom.createTextNode(str(i)) text = g.tree.dom.createTextNode(str(i))
node.appendChild(text) node.appendChild(text)
self.element.appendChild(node) self.element.appendChild(node)
self.special(param, node) self.special(param, node)
@@ -732,18 +729,18 @@ def MakeXXXFromDOM(parent, element):
# Make empty DOM element # Make empty DOM element
def MakeEmptyDOM(className): def MakeEmptyDOM(className):
elem = tree.dom.createElement('object') elem = g.tree.dom.createElement('object')
elem.setAttribute('class', className) elem.setAttribute('class', className)
# Set required and default parameters # Set required and default parameters
xxxClass = xxxDict[className] xxxClass = xxxDict[className]
defaultNotRequired = filter(lambda x, l=xxxClass.required: x not in l, defaultNotRequired = filter(lambda x, l=xxxClass.required: x not in l,
xxxClass.default.keys()) xxxClass.default.keys())
for param in xxxClass.required + defaultNotRequired: for param in xxxClass.required + defaultNotRequired:
textElem = tree.dom.createElement(param) textElem = g.tree.dom.createElement(param)
try: try:
textNode = tree.dom.createTextNode(xxxClass.default[param]) textNode = g.tree.dom.createTextNode(xxxClass.default[param])
except KeyError: except KeyError:
textNode = tree.dom.createTextNode('') textNode = g.tree.dom.createTextNode('')
textElem.appendChild(textNode) textElem.appendChild(textNode)
elem.appendChild(textElem) elem.appendChild(textElem)
return elem return elem