beremiz: comparison c_ext/CFileEditor.py

equal deleted inserted replaced

-:4a36e38e51d3
+:1499a4d225db
 import wx.grid
 import wx.stc as stc
 import wx.lib.buttons
 from controls import CustomGrid, CustomTable
-from editors.ConfTreeNodeEditor import ConfTreeNodeEditor
+from editors.ConfTreeNodeEditor import ConfTreeNodeEditor, SCROLLBAR_UNIT
 from util.BitmapLibrary import GetBitmap
 if wx.Platform == '__WXMSW__':
 faces = { 'times': 'Times New Roman',
 'mono' : 'Courier New',
 fold_symbols = 3
 def __init__(self, parent, name, window, controler):
 stc.StyledTextCtrl.__init__(self, parent, ID_CPPEDITOR, wx.DefaultPosition,
-wx.Size(0, 0), 0)
+wx.Size(-1, 300), 0)
 self.SetMarginType(1, stc.STC_MARGIN_NUMBER)
 self.SetMarginWidth(1, 25)
 self.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)
 main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=4)
 main_sizer.AddGrowableCol(0)
 main_sizer.AddGrowableRow(0)
-self.VariablesGrid = CustomGrid(self, style=wx.VSCROLL)
+self.VariablesGrid = CustomGrid(self, size=wx.Size(-1, 300), style=wx.VSCROLL)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnVariablesGridCellChange)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnVariablesGridCellLeftClick)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN, self.OnVariablesGridEditorShown)
 main_sizer.AddWindow(self.VariablesGrid, flag=wx.GROW)
 dc.SetBrush(wx.TRANSPARENT_BRUSH)
 dc.DrawRectangle(0, 0, width, height)
 class CFileEditor(ConfTreeNodeEditor):
-def _init_ConfNodeEditor(self, prnt):
+CONFNODEEDITOR_TABS = [
-self.ConfNodeEditor = wx.Panel(prnt, style=wx.TAB_TRAVERSAL)
+(_("C code"), "_create_CCodeEditor")]
+def _create_CCodeEditor(self, prnt):
+self.CCodeEditor = wx.ScrolledWindow(prnt,
+style=wx.TAB_TRAVERSAL|wx.HSCROLL|wx.VSCROLL)
+self.CCodeEditor.Bind(wx.EVT_SIZE, self.OnCCodeEditorResize)
 self.Panels = {}
-self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2 * len(CFILE_PARTS) + 1, vgap=0)
+self.MainSizer = wx.BoxSizer(wx.VERTICAL)
-self.MainSizer.AddGrowableCol(0)
 for idx, (name, panel_class) in enumerate(CFILE_PARTS):
 button_id = wx.NewId()
 button = FoldPanelCaption(id=button_id, name='FoldPanelCaption_%s' % name,
 label=name, bitmap=GetBitmap("CollapsedIconData"),
-parent=self.ConfNodeEditor, pos=wx.Point(0, 0),
+parent=self.CCodeEditor, pos=wx.Point(0, 0),
 size=wx.Size(0, 20), style=wx.NO_BORDER|wx.ALIGN_LEFT)
 button.SetBitmapSelected(GetBitmap("ExpandedIconData"))
 button.Bind(wx.EVT_BUTTON, self.GenPanelButtonCallback(name), id=button_id)
 self.MainSizer.AddWindow(button, 0, border=0, flag=wx.TOP|wx.GROW)
 if panel_class == VariablesEditor:
-panel = VariablesEditor(self.ConfNodeEditor, self.ParentWindow, self.Controler)
+panel = VariablesEditor(self.CCodeEditor, self.ParentWindow, self.Controler)
 else:
-panel = panel_class(self.ConfNodeEditor, name, self.ParentWindow, self.Controler)
+panel = panel_class(self.CCodeEditor, name, self.ParentWindow, self.Controler)
 self.MainSizer.AddWindow(panel, 0, border=0, flag=wx.BOTTOM|wx.GROW)
 panel.Hide()
 self.Panels[name] = {"button": button, "panel": panel, "expanded": False, "row": 2 * idx + 1}
-self.Spacer = wx.Panel(self.ConfNodeEditor, -1)
+self.CCodeEditor.SetSizer(self.MainSizer)
-self.SpacerExpanded = True
-self.MainSizer.AddWindow(self.Spacer, 0, border=0, flag=wx.GROW)
+return self.CCodeEditor
-self.MainSizer.AddGrowableRow(2 * len(CFILE_PARTS))
-self.ConfNodeEditor.SetSizer(self.MainSizer)
 def __init__(self, parent, controler, window):
 ConfTreeNodeEditor.__init__(self, parent, controler, window)
 def GetBufferState(self):
 def RefreshView(self):
 ConfTreeNodeEditor.RefreshView(self)
 for infos in self.Panels.itervalues():
 infos["panel"].RefreshView()
+self.RefreshCCodeEditorScrollbars()
 def GenPanelButtonCallback(self, name):
 def PanelButtonCallback(event):
 self.TogglePanel(name)
 return PanelButtonCallback
 infos = self.Panels.get(name, None)
 if infos is not None and not infos["expanded"]:
 infos["expanded"] = True
 infos["button"].SetToggle(True)
 infos["panel"].Show()
-self.MainSizer.AddGrowableRow(infos["row"])
 self.RefreshSizerLayout()
 def CollapsePanel(self, name):
 infos = self.Panels.get(name, None)
 if infos is not None and infos["expanded"]:
 infos["expanded"] = False
 infos["button"].SetToggle(False)
 infos["panel"].Hide()
-self.MainSizer.RemoveGrowableRow(infos["row"])
 self.RefreshSizerLayout()
 def TogglePanel(self, name):
 infos = self.Panels.get(name, None)
 if infos is not None:
 infos["expanded"] = not infos["expanded"]
 infos["button"].SetToggle(infos["expanded"])
 if infos["expanded"]:
 infos["panel"].Show()
-self.MainSizer.AddGrowableRow(infos["row"])
 else:
 infos["panel"].Hide()
-self.MainSizer.RemoveGrowableRow(infos["row"])
 self.RefreshSizerLayout()
 def RefreshSizerLayout(self):
-expand_spacer = True
-for infos in self.Panels.itervalues():
-expand_spacer = expand_spacer and not infos["expanded"]
-if self.SpacerExpanded != expand_spacer:
-self.SpacerExpanded = expand_spacer
-if expand_spacer:
-self.Spacer.Show()
-self.MainSizer.AddGrowableRow(2 * len(CFILE_PARTS))
-else:
-self.Spacer.Hide()
-self.MainSizer.RemoveGrowableRow(2 * len(CFILE_PARTS))
 self.MainSizer.Layout()
+self.RefreshCCodeEditorScrollbars()
+def RefreshCCodeEditorScrollbars(self):
+self.CCodeEditor.GetBestSize()
+xstart, ystart = self.CCodeEditor.GetViewStart()
+window_size = self.CCodeEditor.GetClientSize()
+maxx, maxy = self.MainSizer.GetMinSize()
+posx = max(0, min(xstart, (maxx - window_size[0]) / SCROLLBAR_UNIT))
+posy = max(0, min(ystart, (maxy - window_size[1]) / SCROLLBAR_UNIT))
+self.CCodeEditor.Scroll(posx, posy)
+self.CCodeEditor.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT,
+maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, posx, posy)
+def OnCCodeEditorResize(self, event):
+self.RefreshCCodeEditorScrollbars()
+event.Skip()

changeset 920	1499a4d225db
parent 874	8b24e9312f18
child 1060	ac9896336b90