# HG changeset patch # User sirebral # Date 1249487165 18000 # Node ID f00b02fbf511ef7544c6cd7e713ca2f9b5c47e2e # Parent 81254b3935fb2265e33e17f1df21255f76727f16 Delete works, GUI updates wrong. Refresh now Force pulls. diff -r 81254b3935fb -r f00b02fbf511 orpg/orpg_version.py --- a/orpg/orpg_version.py Wed Aug 05 10:09:11 2009 -0500 +++ b/orpg/orpg_version.py Wed Aug 05 10:46:05 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Dev" DIS_VER = "Grumpy Goblin" -BUILD = "090805-05" +BUILD = "090805-06" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r 81254b3935fb -r f00b02fbf511 upmana/updatemana.py --- a/upmana/updatemana.py Wed Aug 05 10:09:11 2009 -0500 +++ b/upmana/updatemana.py Wed Aug 05 10:46:05 2009 -0500 @@ -135,10 +135,6 @@ if dlg.ShowModal(): dlg.Destroy() - if self.Updated: - self.Updated = False - self.filelist.SetValue('') - wx.CallAfter(self.check) def PackageSet(self, event): for btn in self.btn: @@ -258,7 +254,7 @@ self.sizers["repolist_layout"] = wx.FlexGridSizer(rows=1, cols=1, hgap=2, vgap=5) self.manifest = manifest - self.id = 0; self.box = {}; self.box_name= {}; self.main = {}; self.container = {}; self.layout = {} + self.id = -1; self.box = {}; self.box_name= {}; self.main = {}; self.container = {}; self.layout = {} self.name = {}; self.url = {}; self.url_list = {}; self.pull = {}; self.uri = {}; self.delete = {} self.defaultcheck = {}; self.default = {}; self.repotrac = {} self.pull_list = {}; self.delete_list = {}; self.defchecklist = {} @@ -320,7 +316,9 @@ self.layout[self.id].Add(self.default[self.id], -1, wx.EXPAND) self.layout[self.id].AddGrowableCol(1) self.container[self.id].Add(self.layout[self.id], -1, wx.EXPAND) + #Button Events self.Bind(wx.EVT_BUTTON, self.RefreshRepo, self.pull[self.id]) + self.Bind(wx.EVT_BUTTON, self.DelRepo, self.delete[self.id]) self.sizers["repolist_layout"].Insert(0, self.container[self.id], -1, wx.EXPAND) self.sizers['repolist_layout'].Layout() @@ -335,11 +333,18 @@ self.manifest.SetList('UpdateManifest', 'repolist', repolist) self.BuildRepoList(None) + def DelRepo(self, event): + self.id = self.delete_list[event.GetEventObject()] + repolist = self.manifest.GetList('UpdateManifest', 'repolist', '') + repolist.pop(self.id); self.manifest.SetList('UpdateManifest', 'repolist', repolist) + self.sizers["repolist_layout"].Remove(self.container[self.id]) + self.sizers['repolist_layout'].Layout() + def RefreshRepo(self, event): self.id = self.pull_list[event.GetEventObject()] self.manifest.SetString('updaterepo', str(self.box_name[self.id]), self.url[self.id].GetValue()) try: - commands.pull(self.ui, self.r, self.url[self.id].GetValue()) + commands.pull(self.ui, self.r, self.url[self.id].GetValue(), force=True) except: pass