# HG changeset patch # User sirebral # Date 1253186972 18000 # Node ID b84e0799fed2e21a72fefdbd29ae85de67d07a6f # Parent 763a04270cf695d7ece60fa3fcd8013decc495e5 Traipse Alpha 'OpenRPG' {090917-03} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: 00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. 01: Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands. 02: Fixes problems with Remote Image Upload. Fixes Drop and Drag of Minis to Map. CherryPy can now use any image in the webfiles/ folder and sub-folders. CherryPy can now Drop and Drag Minis to the Map. 03: Minor changes to Update Manager's GUI. Expert recommendation warning added to Revision Update. Step down compatibility with open_rpg & component added to orpgCore. diff -r 763a04270cf6 -r b84e0799fed2 orpg/orpgCore.py --- a/orpg/orpgCore.py Thu Sep 17 04:44:37 2009 -0500 +++ b/orpg/orpgCore.py Thu Sep 17 06:29:32 2009 -0500 @@ -71,6 +71,13 @@ if self.__components.has_key(key): del self.__components[key] else: return + ###Grumpy to Ornery### + def add_component(self, key, com): + self.add(self, key, com) + + def get_component(self, key): + self.get(self, key) + def singleton(cls): instances = {} def getinstance(): @@ -81,3 +88,6 @@ ORPGStorage = singleton(ORPGStorage) component = ORPGStorage() + +###Grumpy to Ornery### +open_rpg = component diff -r 763a04270cf6 -r b84e0799fed2 orpg/orpg_version.py --- a/orpg/orpg_version.py Thu Sep 17 04:44:37 2009 -0500 +++ b/orpg/orpg_version.py Thu Sep 17 06:29:32 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Alpha" DIS_VER = "Ornery Orc" -BUILD = "090917-02" +BUILD = "090917-03" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r 763a04270cf6 -r b84e0799fed2 upmana/updatemana.py --- a/upmana/updatemana.py Thu Sep 17 04:44:37 2009 -0500 +++ b/upmana/updatemana.py Thu Sep 17 06:29:32 2009 -0500 @@ -26,7 +26,7 @@ self.parent = parent self.SetBackgroundColour(wx.WHITE) self.sizer = wx.GridBagSizer(hgap=1, vgap=1) - self.changelog = wx.TextCtrl(self, wx.ID_ANY, size=(325, -1), style=wx.TE_MULTILINE | wx.TE_READONLY) + self.changelog = wx.TextCtrl(self, wx.ID_ANY, size=(300, -1), style=wx.TE_MULTILINE | wx.TE_READONLY) self.filelist = wx.TextCtrl(self, wx.ID_ANY, size=(275, 300), style=wx.TE_MULTILINE | wx.TE_READONLY) self.buttons = {} self.buttons['progress_bar'] = wx.Gauge(self, wx.ID_ANY, 100) @@ -436,8 +436,10 @@ ## Branches / Revisions branchcp = wx.Panel(self) + self.current = self.repo.dirstate.branch() self.branchcp = wx.GridBagSizer(hgap=1, vgap=1) self.branches = wx.Choice(branchcp, wx.ID_ANY, choices=self.package_list) + self.branches.SetSelection(self.package_list.index(self.current)) self.branch_txt = wx.StaticText(branchcp, wx.ID_ANY, "Branches") self.branchcp.Add(self.branches, (0,0)) self.branchcp.Add(self.branch_txt, (0,1), flag=wx.ALIGN_CENTER_VERTICAL) @@ -482,7 +484,6 @@ self.SetSizer(self.sizer) self.SetAutoLayout(True) - self.current = self.repo.dirstate.branch() self.currev = self.repo.changelog.rev(self.repo.branchtags()[self.current]) self.RevInfo(self.currev) self.revlist.Select(self.revlist.FindItem(0, str(self.currev), 1)) @@ -541,18 +542,22 @@ pass def RevUpdate(self, event): - filename = 'ignorelist.txt' - self.filename = dir_struct["home"] + 'upmana' + os.sep + filename - component.get('validate').config_file(filename, "default_ignorelist.txt") - self.mana = self.LoadDoc() - temp = dir_struct["home"] + 'upmana' + os.sep + 'tmp' + os.sep - for ignore in self.ignorelist: - shutil.copy(ignore, temp + ignore.split('/')[len(ignore.split('/')) - 1]) - hg.clean(self.repo, self.currev) - for ignore in self.ignorelist: - shutil.copyfile(temp + ignore.split('/')[len(ignore.split('/')) - 1], ignore) - os.remove(temp + ignore.split('/')[len(ignore.split('/')) - 1]) - pass + dlg = wx.MessageDialog(None, 'Revision Updates are recommended for Developers only.\n\nAre you sure to preform a Revision Update?\n\nNewer builds tend to have less bugs while older revisions may no longer function properly.', 'Expert Feature', wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION) + if dlg.ShowModal() == wx.ID_YES: + dlg.Destroy() + filename = 'ignorelist.txt' + self.filename = dir_struct["home"] + 'upmana' + os.sep + filename + component.get('validate').config_file(filename, "default_ignorelist.txt") + self.mana = self.LoadDoc() + temp = dir_struct["home"] + 'upmana' + os.sep + 'tmp' + os.sep + for ignore in self.ignorelist: + shutil.copy(ignore, temp + ignore.split('/')[len(ignore.split('/')) - 1]) + hg.clean(self.repo, self.currev) + for ignore in self.ignorelist: + shutil.copyfile(temp + ignore.split('/')[len(ignore.split('/')) - 1], ignore) + os.remove(temp + ignore.split('/')[len(ignore.split('/')) - 1]) + else: + dlg.Destroy(); pass def LoadDoc(self): ignore = open(self.filename)