# HG changeset patch # User Edouard Tisserant # Date 1542967280 -3600 # Node ID 2a70d52403006ad46045aca2b32dc5e1f4bc1b7a # Parent 65ff9a309ff33592fa2c173deaa46f502f84df0e IDManager : small cosmetic fixes and cleanup. diff -r 65ff9a309ff3 -r 2a70d5240300 controls/IDBrowser.py --- a/controls/IDBrowser.py Fri Nov 23 00:45:51 2018 +0100 +++ b/controls/IDBrowser.py Fri Nov 23 11:01:20 2018 +0100 @@ -37,14 +37,6 @@ def GetCount(self): return len(self.data) - def GetAttrByRow(self, row, col, attr): - if col == 3: - attr.SetColour('blue') - attr.SetBold(True) - return True - return False - - def Compare(self, item1, item2, col, ascending): if not ascending: # swap sort order? item2, item1 = item1, item2 @@ -84,7 +76,7 @@ class IDBrowser(wx.Panel): def __init__(self, parent, ctr, SelectURICallBack=None, SelectIDCallBack=None, **kwargs): big = self.isManager = SelectURICallBack is None and SelectIDCallBack is None - wx.Panel.__init__(self, parent, -1, size=(800 if big else 400, + wx.Panel.__init__(self, parent, -1, size=(800 if big else 450, 600 if big else 200)) self.SelectURICallBack = SelectURICallBack @@ -99,9 +91,9 @@ args = lambda *a,**k:(a,k) ColumnsDesc = [ - args(_("ID"), COL_ID, width = 100), - args(_("Last URI"), COL_URI, width = 160 if big else 80), - args(_("Description"), COL_DESC, width = 200, + args(_("ID"), COL_ID, width = 70), + args(_("Last URI"), COL_URI, width = 300 if big else 80), + args(_("Description"), COL_DESC, width = 300 if big else 200, mode = dv.DATAVIEW_CELL_EDITABLE if self.isManager else dv.DATAVIEW_CELL_INERT), @@ -111,12 +103,13 @@ self.model = IDBrowserModel(ctr.ProjectPath, len(ColumnsDesc)) self.dvc.AssociateModel(self.model) + col_list = [] for a,k in ColumnsDesc: - self.dvc.AppendTextColumn(*a,**dict(k, flags = colflags)) - - # TODO : when select, - # - update ID field of scheme editor - # - enable use URI button + col_list.append( + self.dvc.AppendTextColumn(*a,**dict(k, flags = colflags))) + col_list[COL_LAST].SetSortOrder(False) + + # TODO : sort by last bvisit by default self.Sizer = wx.BoxSizer(wx.VERTICAL) self.Sizer.Add(self.dvc, 1, wx.EXPAND) @@ -141,8 +134,6 @@ else : # selector mode - # use last known URI button - # TODO : disable use URI button until something selected self.useURIButton = wx.Button(self, label=_("Use last URI")) self.Bind(wx.EVT_BUTTON, self.OnUseURIButton, self.useURIButton) self.useURIButton.Disable()