regenerated after wxSelectDispatcher addition (patch 1618976)

[wxWidgets.git] / wxPython / wx / tools / XRCed / panel.py

diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
index 785cca2c87e7c2dd1d56342dc78a326624cdbc16..d05dc3793c24bdc37f035c82fa5a41fae39f6fa7 100644 (file)
--- a/wxPython/wx/tools/XRCed/panel.py
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -6,40 +6,40 @@
 
 from xxx import *                       # xxx imports globals and params
 from undo import *
 
 from xxx import *                       # xxx imports globals and params
 from undo import *

-from wxPython.html import wxHtmlWindow
+from wx.html import HtmlWindow

 
 # Properties panel containing notebook
 
 # Properties panel containing notebook

-class Panel(wxNotebook):
+class Panel(wx.Notebook):

     def __init__(self, parent, id = -1):
     def __init__(self, parent, id = -1):

-        if wxPlatform != '__WXMAC__':   # some problems with this style on macs
-            wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
+        if wx.Platform != '__WXMAC__':   # some problems with this style on macs
+            wx.Notebook.__init__(self, parent, id, style=wx.NB_BOTTOM)

         else:
         else:

-            wxNotebook.__init__(self, parent, id)
+            wx.Notebook.__init__(self, parent, id)

         global panel
         g.panel = panel = self
         self.modified = False
 
         # Set common button size for parameter buttons
         global panel
         g.panel = panel = self
         self.modified = False
 
         # Set common button size for parameter buttons

-        bTmp = wxButton(self, -1, '')
+        bTmp = wx.Button(self, -1, '')

         import params
         import params

-        params.buttonSize = (self.DLG_SZE(buttonSize)[0], bTmp.GetSize()[1])
+        params.buttonSize = (self.DLG_SZE(buttonSizeD)[0], bTmp.GetSize()[1])

         bTmp.Destroy()
         del bTmp
 
         # List of child windows
         self.pages = []
         # Create scrolled windows for pages
         bTmp.Destroy()
         del bTmp
 
         # List of child windows
         self.pages = []
         # Create scrolled windows for pages

-        self.page1 = wxScrolledWindow(self, -1)
-        sizer = wxBoxSizer()
-        sizer.Add(wxBoxSizer())         # dummy sizer
+        self.page1 = wx.ScrolledWindow(self, -1)
+        sizer = wx.BoxSizer()
+        sizer.Add(wx.BoxSizer())         # dummy sizer

         self.page1.SetAutoLayout(True)
         self.page1.SetSizer(sizer)
         self.AddPage(self.page1, 'Properties')
         # Second page
         self.page1.SetAutoLayout(True)
         self.page1.SetSizer(sizer)
         self.AddPage(self.page1, 'Properties')
         # Second page

-        self.page2 = wxScrolledWindow(self, -1)
+        self.page2 = wx.ScrolledWindow(self, -1)

         self.page2.Hide()
         self.page2.Hide()

-        sizer = wxBoxSizer()
-        sizer.Add(wxBoxSizer())         # dummy sizer
+        sizer = wx.BoxSizer()
+        sizer.Add(wx.BoxSizer())         # dummy sizer

         self.page2.SetAutoLayout(True)
         self.page2.SetSizer(sizer)
         # Cache for already used panels
         self.page2.SetAutoLayout(True)
         self.page2.SetSizer(sizer)
         # Cache for already used panels


@@ -59,12 +59,12 @@ class Panel(wxNotebook):
                 w.Destroy()
         topSizer.Remove(sizer)
         # Create new windows
                 w.Destroy()
         topSizer.Remove(sizer)
         # Create new windows

-        sizer = wxBoxSizer(wxVERTICAL)
+        sizer = wx.BoxSizer(wx.VERTICAL)

         # Special case - resize html window
         if g.conf.panic:
         # Special case - resize html window
         if g.conf.panic:

-            topSizer.Add(sizer, 1, wxEXPAND)
+            topSizer.Add(sizer, 1, wx.EXPAND)

         else:
         else:

-            topSizer.Add(sizer, 0, wxALL, 5)
+            topSizer.Add(sizer, 0, wx.ALL, 5)

         return sizer
 
     def SetData(self, xxx):
         return sizer
 
     def SetData(self, xxx):


@@ -74,22 +74,22 @@ class Panel(wxNotebook):
         sizer = self.ResetPage(self.page1)
         if not xxx or (not xxx.allParams and not xxx.hasName and not xxx.hasChild):
             if g.tree.selection:
         sizer = self.ResetPage(self.page1)
         if not xxx or (not xxx.allParams and not xxx.hasName and not xxx.hasChild):
             if g.tree.selection:

-                sizer.Add(wxStaticText(self.page1, -1, 'This item has no properties.'))
+                sizer.Add(wx.StaticText(self.page1, -1, 'This item has no properties.'))

             else:                       # nothing selected
                 # If first time, show some help
                 if g.conf.panic:
             else:                       # nothing selected
                 # If first time, show some help
                 if g.conf.panic:

-                    html = wxHtmlWindow(self.page1, -1, wxDefaultPosition,
-                                        wxDefaultSize, wxSUNKEN_BORDER)
+                    html = HtmlWindow(self.page1, -1, wx.DefaultPosition,
+                                        wx.DefaultSize, wx.SUNKEN_BORDER)

                     html.SetPage(g.helpText)
                     html.SetPage(g.helpText)

-                    sizer.Add(html, 1, wxEXPAND)
+                    sizer.Add(html, 1, wx.EXPAND)

                     g.conf.panic = False
                 else:
                     g.conf.panic = False
                 else:

-                    sizer.Add(wxStaticText(self.page1, -1, 'Select a tree item.'))
+                    sizer.Add(wx.StaticText(self.page1, -1, 'Select a tree item.'))

         else:
             g.currentXXX = xxx.treeObject()
             # Normal or SizerItem page
             isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)
         else:
             g.currentXXX = xxx.treeObject()
             # Normal or SizerItem page
             isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)

-            cacheID = (xxx.__class__, isGBSizerItem)            
+            cacheID = (xxx.panelName(), isGBSizerItem)

             try:
                 page = self.pageCache[cacheID]
                 page.box.SetLabel(xxx.panelName())
             try:
                 page = self.pageCache[cacheID]
                 page.box.SetLabel(xxx.panelName())


@@ -99,10 +99,10 @@ class Panel(wxNotebook):
                 self.pageCache[cacheID] = page
             page.SetValues(xxx)
             self.pages.append(page)
                 self.pageCache[cacheID] = page
             page.SetValues(xxx)
             self.pages.append(page)

-            sizer.Add(page, 1, wxEXPAND)
+            sizer.Add(page, 1, wx.EXPAND)

             if xxx.hasChild:
                 # Special label for child objects - they may have different GUI
             if xxx.hasChild:
                 # Special label for child objects - they may have different GUI

-                cacheID = (xxx.child.__class__, xxx.__class__)
+                cacheID = (xxx.child.panelName(), xxx.__class__)

                 try:
                     page = self.pageCache[cacheID]
                     page.box.SetLabel(xxx.child.panelName())
                 try:
                     page = self.pageCache[cacheID]
                     page.box.SetLabel(xxx.child.panelName())


@@ -112,7 +112,7 @@ class Panel(wxNotebook):
                     self.pageCache[cacheID] = page
                 page.SetValues(xxx.child)
                 self.pages.append(page)
                     self.pageCache[cacheID] = page
                 page.SetValues(xxx.child)
                 self.pages.append(page)

-                sizer.Add(page, 0, wxEXPAND | wxTOP, 5)
+                sizer.Add(page, 0, wx.EXPAND | wx.TOP, 5)

         self.page1.Layout()
         size = self.page1.GetSizer().GetMinSize()
         self.page1.SetScrollbars(1, 1, size.width, size.height, 0, 0, True)
         self.page1.Layout()
         size = self.page1.GetSizer().GetMinSize()
         self.page1.SetScrollbars(1, 1, size.width, size.height, 0, 0, True)


@@ -131,7 +131,7 @@ class Panel(wxNotebook):
                 self.stylePageCache[xxx.__class__] = page
             page.SetValues(xxx)
             self.pages.append(page)
                 self.stylePageCache[xxx.__class__] = page
             page.SetValues(xxx)
             self.pages.append(page)

-            sizer.Add(page, 0, wxEXPAND)
+            sizer.Add(page, 0, wx.EXPAND)

             # Add page if not exists
             if not self.GetPageCount() == 2:
                 self.AddPage(self.page2, 'Style')
             # Add page if not exists
             if not self.GetPageCount() == 2:
                 self.AddPage(self.page2, 'Style')


@@ -160,6 +160,7 @@ class Panel(wxNotebook):
         # Register undo object when modifying first time
         if not self.modified and value:
            g.undoMan.RegisterUndo(UndoEdit())
         # Register undo object when modifying first time
         if not self.modified and value:
            g.undoMan.RegisterUndo(UndoEdit())

+           g.frame.SetModified()

         self.modified = value
         
     def Apply(self):
         self.modified = value
         
     def Apply(self):


@@ -168,13 +169,13 @@ class Panel(wxNotebook):
 ################################################################################
 
 # General class for notebook pages
 ################################################################################
 
 # General class for notebook pages

-class ParamPage(wxPanel):
+class ParamPage(wx.Panel):

     def __init__(self, parent, xxx):
     def __init__(self, parent, xxx):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

         self.xxx = xxx
         # Register event handlers
         for id in paramIDs.values():
         self.xxx = xxx
         # Register event handlers
         for id in paramIDs.values():

-            EVT_CHECKBOX(self, id, self.OnCheckParams)
+            wx.EVT_CHECKBOX(self, id, self.OnCheckParams)

         self.checks = {}
         self.controls = {}              # save python objects
         self.controlName = None
         self.checks = {}
         self.controls = {}              # save python objects
         self.controlName = None


@@ -184,7 +185,7 @@ class ParamPage(wxPanel):
         param = evt.GetEventObject().GetName()
         w = self.controls[param]
         w.Enable(True)
         param = evt.GetEventObject().GetName()
         w = self.controls[param]
         w.Enable(True)

-        objElem = xxx.element
+        objElem = xxx.node

         if evt.IsChecked():
             # Ad  new text node in order of allParams
             w.SetValue('')              # set empty (default) value
         if evt.IsChecked():
             # Ad  new text node in order of allParams
             w.SetValue('')              # set empty (default) value


@@ -192,7 +193,7 @@ class ParamPage(wxPanel):
             elem = g.tree.dom.createElement(param)
             # Some classes are special
             if param == 'font':
             elem = g.tree.dom.createElement(param)
             # Some classes are special
             if param == 'font':

-                xxx.params[param] = xxxParamFont(xxx.element, elem)
+                xxx.params[param] = xxxParamFont(xxx.node, elem)

             elif param in xxxObject.bitmapTags:
                 xxx.params[param] = xxxParamBitmap(elem)
             else:
             elif param in xxxObject.bitmapTags:
                 xxx.params[param] = xxxParamBitmap(elem)
             else:


@@ -218,7 +219,7 @@ class ParamPage(wxPanel):
             xxx.params[param].remove()
             del xxx.params[param]
             w.SetValue('')
             xxx.params[param].remove()
             del xxx.params[param]
             w.SetValue('')

-            w.modified = False          # mark as not changed
+            w.SetModified(False)        # mark as not changed

             w.Enable(False)
         # Set modified flag (provokes undo storing is necessary)
         panel.SetModified(True)
             w.Enable(False)
         # Set modified flag (provokes undo storing is necessary)
         panel.SetModified(True)


@@ -228,7 +229,7 @@ class ParamPage(wxPanel):
             name = self.controlName.GetValue()
             if xxx.name != name:
                 xxx.name = name
             name = self.controlName.GetValue()
             if xxx.name != name:
                 xxx.name = name

-                xxx.element.setAttribute('name', name)
+                xxx.node.setAttribute('name', name)

         for param, w in self.controls.items():
             if w.modified:
                 paramObj = xxx.params[param]
         for param, w in self.controls.items():
             if w.modified:
                 paramObj = xxx.params[param]


@@ -237,10 +238,11 @@ class ParamPage(wxPanel):
                     xxx.setSpecial(param, value)
                 else:
                     paramObj.update(value)
                     xxx.setSpecial(param, value)
                 else:
                     paramObj.update(value)

+                

     # Save current state
     def SaveState(self):
         self.origChecks = map(lambda i: (i[0], i[1].GetValue()), self.checks.items())
     # Save current state
     def SaveState(self):
         self.origChecks = map(lambda i: (i[0], i[1].GetValue()), self.checks.items())

-        self.origControls = map(lambda i: (i[0], i[1].GetValue(), i[1].IsEnabled()),
+        self.origControls = map(lambda i: (i[0], i[1].GetValue(), i[1].enabled),

                             self.controls.items())
         if self.controlName:
             self.origName = self.controlName.GetValue()
                             self.controls.items())
         if self.controlName:
             self.origName = self.controlName.GetValue()


@@ -257,7 +259,8 @@ class ParamPage(wxPanel):
         for k,v,e in state[1]:
             self.controls[k].SetValue(v)
             self.controls[k].Enable(e)
         for k,v,e in state[1]:
             self.controls[k].SetValue(v)
             self.controls[k].Enable(e)

-            if e: self.controls[k].modified = True
+            # Set all states to modified
+            if e and k in self.xxx.params: self.controls[k].modified = True            

         if self.controlName:
             self.controlName.SetValue(state[2])
 
         if self.controlName:
             self.controlName.SetValue(state[2])
 


@@ -269,27 +272,31 @@ LABEL_WIDTH = 125
 class PropPage(ParamPage):
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)
 class PropPage(ParamPage):
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)

-        self.box = wxStaticBox(self, -1, label)
+        self.box = wx.StaticBox(self, -1, label)

         self.box.SetFont(g.labelFont())
         self.box.SetFont(g.labelFont())

-        topSizer = wxStaticBoxSizer(self.box, wxVERTICAL)
-        sizer = wxFlexGridSizer(len(xxx.allParams), 2, 0, 1)
+        topSizer = wx.StaticBoxSizer(self.box, wx.VERTICAL)
+        sizer = wx.FlexGridSizer(len(xxx.allParams), 2, 0, 1)

         sizer.AddGrowableCol(1)
         if xxx.hasName:
         sizer.AddGrowableCol(1)
         if xxx.hasName:

-            label = wxStaticText(self, -1, 'XML ID:', size=(LABEL_WIDTH,-1))
+            label = wx.StaticText(self, -1, 'XML ID:', size=(LABEL_WIDTH,-1))

             control = ParamText(self, 'XML_name', 200)
             control = ParamText(self, 'XML_name', 200)

-            sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxGROW, 10) ])
+            sizer.AddMany([ (label, 0, wx.ALIGN_CENTER_VERTICAL),
+                            (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.GROW, 10) ])

             self.controlName = control
         for param in xxx.allParams:
             present = xxx.params.has_key(param)
             if param in xxx.required:
             self.controlName = control
         for param in xxx.allParams:
             present = xxx.params.has_key(param)
             if param in xxx.required:

-                label = wxStaticText(self, paramIDs[param], param + ':',
-                                     size = (LABEL_WIDTH,-1), name = param)
+                if isinstance(xxx, xxxComment):
+                    label = None
+                else:
+                    label = wx.StaticText(self, paramIDs[param], param + ':',
+                                          size = (LABEL_WIDTH,-1), name = param)

             else:
             else:

-                # Notebook has one very loooooong parameter
+                # Rename some parameters

                 if param == 'usenotebooksizer': sParam = 'usesizer:'
                 if param == 'usenotebooksizer': sParam = 'usesizer:'

+                elif param == 'option': sParam = 'proportion'

                 else: sParam = param + ':'
                 else: sParam = param + ':'

-                label = wxCheckBox(self, paramIDs[param], sParam,
+                label = wx.CheckBox(self, paramIDs[param], sParam,

                                    size = (LABEL_WIDTH,-1), name = param)
                 self.checks[param] = label
             try:
                                    size = (LABEL_WIDTH,-1), name = param)
                 self.checks[param] = label
             try:


@@ -303,13 +310,19 @@ class PropPage(ParamPage):
                     typeClass = ParamText
             control = typeClass(self, param)
             control.Enable(present)
                     typeClass = ParamText
             control = typeClass(self, param)
             control.Enable(present)

-            sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
+            # Comment has only one parameter
+            if isinstance(xxx, xxxComment):
+                # Bind char event to check Enter key
+                control.text.Bind(wx.EVT_CHAR, self.OnEnter)
+                sizer.Add(control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW)
+            else:
+                sizer.AddMany([ (label, 0, wx.ALIGN_CENTER_VERTICAL),
+                                (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW) ])

             self.controls[param] = control
             self.controls[param] = control

-        topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
-        self.SetAutoLayout(True)
+        topSizer.Add(sizer, 1, wx.ALL | wx.EXPAND, 3)

         self.SetSizer(topSizer)
         topSizer.Fit(self)
         self.SetSizer(topSizer)
         topSizer.Fit(self)

+        

     def SetValues(self, xxx):
         self.xxx = xxx
         self.origChecks = []
     def SetValues(self, xxx):
         self.xxx = xxx
         self.origChecks = []


@@ -336,32 +349,40 @@ class PropPage(ParamPage):
                 self.origChecks.append((param, False))
                 self.origControls.append((param, '', False))
 
                 self.origChecks.append((param, False))
                 self.origControls.append((param, '', False))
 

+    # This is called only for comment now
+    def OnEnter(self, evt):
+        if evt.GetKeyCode() == 13:
+            g.tree.Apply(self.xxx, g.tree.selection)
+        else:
+            evt.Skip()
+

 ################################################################################
 
 # Style notebook page
 class StylePage(ParamPage):
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)
 ################################################################################
 
 # Style notebook page
 class StylePage(ParamPage):
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)

-        box = wxStaticBox(self, -1, label)
+        box = wx.StaticBox(self, -1, label)

         box.SetFont(g.labelFont())
         box.SetFont(g.labelFont())

-        topSizer = wxStaticBoxSizer(box, wxVERTICAL)
-        sizer = wxFlexGridSizer(len(xxx.styles), 2, 0, 1)
+        topSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
+        sizer = wx.FlexGridSizer(len(xxx.styles), 2, 0, 1)

         sizer.AddGrowableCol(1)
         for param in xxx.styles:
             present = xxx.params.has_key(param)
         sizer.AddGrowableCol(1)
         for param in xxx.styles:
             present = xxx.params.has_key(param)

-            check = wxCheckBox(self, paramIDs[param],
+            check = wx.CheckBox(self, paramIDs[param],

                                param + ':', size = (LABEL_WIDTH,-1), name = param)
             check.SetValue(present)
             control = paramDict[param](self, name = param)
             control.Enable(present)
                                param + ':', size = (LABEL_WIDTH,-1), name = param)
             check.SetValue(present)
             control = paramDict[param](self, name = param)
             control.Enable(present)

-            sizer.AddMany([ (check, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
+            sizer.AddMany([ (check, 0, wx.ALIGN_CENTER_VERTICAL),
+                            (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW) ])

             self.checks[param] = check
             self.controls[param] = control
             self.checks[param] = check
             self.controls[param] = control

-        topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
+        topSizer.Add(sizer, 1, wx.ALL | wx.EXPAND, 3)

         self.SetAutoLayout(True)
         self.SetSizer(topSizer)
         topSizer.Fit(self)
         self.SetAutoLayout(True)
         self.SetSizer(topSizer)
         topSizer.Fit(self)

+        

     # Set data for a cahced page
     def SetValues(self, xxx):
         self.xxx = xxx
     # Set data for a cahced page
     def SetValues(self, xxx):
         self.xxx = xxx