Mercurial > traipse_dev
changeset 102:905fa5b06d53 alpha
Traipse Alpha 'OpenRPG' {091006-00}
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 Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images!
| author | sirebral |
|---|---|
| date | Tue, 06 Oct 2009 05:42:50 -0500 |
| parents | a647e0e8f520 |
| children | 6127549aed8b |
| files | images/add.png images/star.png orpg/networking/gsclient.py orpg/orpg_version.py |
| diffstat | 4 files changed, 221 insertions(+), 163 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/gsclient.py Fri Sep 25 20:37:54 2009 -0500 +++ b/orpg/networking/gsclient.py Tue Oct 06 05:42:50 2009 -0500 @@ -36,24 +36,14 @@ import orpg.tools.rgbhex from orpg.orpgCore import component import traceback +from orpg.tools.validate import validate +from xml.etree.ElementTree import ElementTree, Element +from xml.etree.ElementTree import fromstring, tostring gs_host = 1 gs_join = 2 # constants -LIST_SERVER = wx.NewId() -LIST_ROOM = wx.NewId() -ADDRESS = wx.NewId() -GS_CONNECT = wx.NewId() -GS_DISCONNECT = wx.NewId() -GS_SERVER_REFRESH = wx.NewId() -GS_JOIN = wx.NewId() -GS_JOINLOBBY = wx.NewId() -GS_CREATE_ROOM = wx.NewId() -GS_PWD = wx.NewId() -GS_CLOSE = wx.NewId() -OR_CLOSE = wx.NewId() - class server_instance: def __init__(self, id, name="[Unknown]", users="0", address="127.0.0.1", port="9557"): self.id = id @@ -64,29 +54,30 @@ def server_instance_compare(x,y): """compares server insances for list sort""" + ### Alpha ### makes changes from core. DEV_SERVER = "OpenRPG DEV" - xuser = 0 - yuser = 0 - try: xuser = int(x.user) - except: pass - try: yuser = int(y.user) - except: pass + xname = x.name + xuser = int(x.user) + yname = y.name + yuser = int(y.user) + + who_name = cmp(yname, xname) + who_user = cmp(yuser, xuser) + if x.name.startswith(DEV_SERVER): if y.name.startswith(DEV_SERVER): - if x.name > y.name: return 1 - elif x.name == y.name: - if xuser < yuser: return 1 - elif xuser > yuser: return -1 - else: return 0 - else: return -1 - else: return -1 + if not who_name: + return who_user + else: + return who_name + else: + return -1 + elif y.name.startswith(DEV_SERVER): return 1 - elif xuser < yuser: return 1 - elif xuser == yuser: - if x.name > y.name: return 1 - elif x.name == y.name: return 0 - else: return -1 - else: return -1 + elif not who_user: + return who_name + else: + return who_user def roomCmp(room1, room2): if int(room1) > int(room2): @@ -99,10 +90,10 @@ def __init__(self,parent): wx.Panel.__init__(self, parent, -1) self.parent = parent - self.password_manager = component.get('password_manager') # passtool --SD 8/03 + self.password_manager = component.get('password_manager') self.frame = component.get('frame') self.session = component.get('session') - self.xml = component.get('xml') #Not used?? + #self.xml = component.get('xml') #Not used?? self.serverNameSet = 0 self.last_motd = "" self.buttons = {} @@ -110,11 +101,11 @@ self.svrList = [] self.build_ctrls() self.refresh_server_list() - self.refresh_room_list() + self.refresh_room_list() + self.build_bookmarks() ## Not yet implemented + #self.refresh_server_list() + #self.refresh_room_list() -#--------------------------------------------------------- -# [START] Snowdog: Updated Game Server Window 12/02 -#--------------------------------------------------------- def build_ctrls(self): ## Section Sizers (with frame edges and text captions) self.box_sizers = {} @@ -133,18 +124,19 @@ #Build Server Sizer adder = wx.StaticText(self, -1, "Address:") - self.texts["address"] = wx.TextCtrl(self, ADDRESS) + self.texts["address"] = wx.TextCtrl(self, wx.ID_ANY) servers = wx.StaticText(self, -1, "Servers:") - self.server_list = wx.ListCtrl(self, LIST_SERVER, style=wx.LC_REPORT | wx.SUNKEN_BORDER ) - self.server_list.InsertColumn(0, "Players", wx.LIST_FORMAT_LEFT, 0) - self.server_list.InsertColumn(1, "Name", wx.LIST_FORMAT_LEFT, 0) - self.buttons[GS_CONNECT] = wx.Button(self, GS_CONNECT, "Connect") - self.buttons[GS_SERVER_REFRESH] = wx.Button(self, GS_SERVER_REFRESH, "Refresh") - self.buttons[GS_DISCONNECT] = wx.Button(self, GS_DISCONNECT, "Disconnect") + self.server_list = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_REPORT | wx.SUNKEN_BORDER ) + self.server_list.InsertColumn(0, '', wx.LIST_FORMAT_LEFT, 0) + self.server_list.InsertColumn(1, "Players", wx.LIST_FORMAT_LEFT, 0) + self.server_list.InsertColumn(2, "Name", wx.LIST_FORMAT_LEFT, 0) + self.buttons['gs_connect'] = wx.Button(self, wx.ID_ANY, "Connect") + self.buttons['gs_refresh'] = wx.Button(self, wx.ID_ANY, "Refresh") + self.buttons['gs_disconnect'] = wx.Button(self, wx.ID_ANY, "Disconnect") self.sizers["svrbtns"] = wx.BoxSizer(wx.HORIZONTAL) - self.sizers["svrbtns"].Add(self.buttons[GS_CONNECT], 0, wx.EXPAND) - self.sizers["svrbtns"].Add(self.buttons[GS_SERVER_REFRESH], 0, wx.EXPAND) - self.sizers["svrbtns"].Add(self.buttons[GS_DISCONNECT], 0, wx.EXPAND) + self.sizers["svrbtns"].Add(self.buttons['gs_connect'], 0, wx.EXPAND) + self.sizers["svrbtns"].Add(self.buttons['gs_refresh'], 0, wx.EXPAND) + self.sizers["svrbtns"].Add(self.buttons['gs_disconnect'], 0, wx.EXPAND) self.sizers["server"].Add(adder, 0, wx.EXPAND) self.sizers["server"].Add(self.texts["address"], 0, wx.EXPAND) self.sizers["server"].Add(servers, 0, wx.EXPAND) @@ -152,33 +144,33 @@ self.sizers["server"].Add(self.sizers["svrbtns"], 0, wx.EXPAND) #Build Rooms Sizer - self.room_list = wx.ListCtrl(self, LIST_ROOM, style=wx.LC_REPORT | wx.SUNKEN_BORDER) + self.room_list = wx.ListCtrl(self, wx.ID_ANY, style=wx.LC_REPORT | wx.SUNKEN_BORDER) self.room_list.InsertColumn(0,"Game", wx.LIST_FORMAT_LEFT,-1) self.room_list.InsertColumn(1,"Players", wx.LIST_FORMAT_LEFT,-1) self.room_list.InsertColumn(2,"PW", wx.LIST_FORMAT_LEFT,-1) - self.buttons[GS_JOIN] = wx.Button(self, GS_JOIN, "Join Room") - self.buttons[GS_JOINLOBBY] = wx.Button(self, GS_JOINLOBBY, "Lobby") + self.buttons['gs_join_room'] = wx.Button(self, wx.ID_ANY, "Join Room") + self.buttons['gs_join_lobby'] = wx.Button(self, wx.ID_ANY, "Lobby") self.sizers["roombtns"] = wx.BoxSizer(wx.HORIZONTAL) - self.sizers["roombtns"].Add(self.buttons[GS_JOIN], 0, wx.EXPAND) - self.sizers["roombtns"].Add(self.buttons[GS_JOINLOBBY], 0, wx.EXPAND) + self.sizers["roombtns"].Add(self.buttons['gs_join_room'], 0, wx.EXPAND) + self.sizers["roombtns"].Add(self.buttons['gs_join_lobby'], 0, wx.EXPAND) self.sizers["rooms"].Add(self.room_list, 1, wx.EXPAND) self.sizers["rooms"].Add(self.sizers["roombtns"], 0, wx.EXPAND) #Build Close Sizer - self.buttons[OR_CLOSE] = wx.Button(self, OR_CLOSE,"Exit OpenRPG") - self.buttons[GS_CLOSE] = wx.Button(self, GS_CLOSE,"Close Window") - self.sizers["close"].Add(self.buttons[OR_CLOSE], 1, wx.ALIGN_CENTER_VERTICAL) - self.sizers["close"].Add(self.buttons[GS_CLOSE], 1, wx.ALIGN_CENTER_VERTICAL) + self.buttons['close_orpg'] = wx.Button(self, wx.ID_ANY,"Exit OpenRPG") + self.buttons['gs_close'] = wx.Button(self, wx.ID_ANY,"Close Window") + self.sizers["close"].Add(self.buttons['close_orpg'], 1, wx.ALIGN_CENTER_VERTICAL) + self.sizers["close"].Add(self.buttons['gs_close'], 1, wx.ALIGN_CENTER_VERTICAL) #Build Create Room Sizer rname = wx.StaticText(self,-1, "Room Name:") self.texts["room_name"] = wx.TextCtrl(self, -1) rpass = wx.StaticText(self,-1, "Password:") - self.buttons[GS_PWD] = wx.CheckBox(self, GS_PWD, "") + self.buttons['gs_pwd'] = wx.CheckBox(self, wx.ID_ANY, "") self.texts["room_pwd"] = wx.TextCtrl(self, -1) self.texts["room_pwd"].Enable(0) pwsizer = wx.BoxSizer(wx.HORIZONTAL) - pwsizer.Add(self.buttons[GS_PWD],0,0) + pwsizer.Add(self.buttons['gs_pwd'],0,0) pwsizer.Add(self.texts["room_pwd"], 1, wx.EXPAND) apass = wx.StaticText(self,-1, "Admin Password:") self.texts["room_boot_pwd"] = wx.TextCtrl(self, -1) @@ -194,9 +186,9 @@ self.sizers["c_room_layout"].Add(minver, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL) self.sizers["c_room_layout"].Add(self.texts["room_min_version"], 0, wx.EXPAND) self.sizers["c_room_layout"].AddGrowableCol(1) - self.buttons[GS_CREATE_ROOM] = wx.Button(self, GS_CREATE_ROOM, "Create Room") + self.buttons['gs_create_room'] = wx.Button(self, wx.ID_ANY, "Create Room") self.sizers["c_room"].Add(self.sizers["c_room_layout"], 1, wx.EXPAND) - self.sizers["c_room"].Add(self.buttons[GS_CREATE_ROOM], 0, wx.EXPAND) + self.sizers["c_room"].Add(self.buttons['gs_create_room'], 0, wx.EXPAND) #Build Main Sizer self.sizers["main"].Add(self.sizers["server"], (0,0), span=(2,1), flag=wx.EXPAND) @@ -211,36 +203,101 @@ self.Fit() ## Event Handlers - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_CONNECT) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_DISCONNECT) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_CREATE_ROOM) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_JOIN) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_JOINLOBBY) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_SERVER_REFRESH) - self.Bind(wx.EVT_BUTTON, self.on_button, id=GS_CLOSE) - self.Bind(wx.EVT_BUTTON, self.on_button, id=OR_CLOSE) - self.Bind(wx.EVT_CHECKBOX, self.on_button, id=GS_PWD) + self.Bind(wx.EVT_BUTTON, self.gs_connect, self.buttons['gs_connect']) + self.Bind(wx.EVT_BUTTON, self.gs_disconnect, self.buttons['gs_disconnect']) + self.Bind(wx.EVT_BUTTON, self.gs_create_room, self.buttons['gs_create_room']) + self.Bind(wx.EVT_BUTTON, self.gs_join, self.buttons['gs_join_room']) + self.Bind(wx.EVT_BUTTON, self.gs_join_lobby, self.buttons['gs_join_lobby']) + self.Bind(wx.EVT_BUTTON, self.gs_server_refresh, self.buttons['gs_refresh']) + self.Bind(wx.EVT_BUTTON, self.gs_close, self.buttons['gs_close']) + self.Bind(wx.EVT_BUTTON, self.close_orpg, self.buttons['close_orpg']) + self.Bind(wx.EVT_CHECKBOX, self.gs_pwd, self.buttons['gs_pwd']) # Added double click handlers 5/05 -- Snowdog - self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_server_dbclick, id=LIST_SERVER) - self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_room_dbclick, id=LIST_ROOM) - self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_select, id=LIST_ROOM) - self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_select, id=LIST_SERVER) + self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_server_dbclick, self.server_list) + self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_room_dbclick, self.room_list) + self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_room_select, self.room_list) + self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_server_select, self.server_list) self.texts['address'].Bind(wx.EVT_SET_FOCUS, self.on_text) self.set_connected(self.session.is_connected()) self.cur_room_index = -1 self.cur_server_index = -1 self.rmList = {} + + # Create Book Mark Image List + self.server_list.Bind(wx.EVT_LEFT_DOWN, self.on_hit) + self._imageList = wx.ImageList( 16, 16, False ) + img = wx.Image(dir_struct["icon"]+"add.png", wx.BITMAP_TYPE_PNG).ConvertToBitmap() + self._imageList.Add( img ) + img = wx.Image(dir_struct["icon"]+"star.png", wx.BITMAP_TYPE_PNG).ConvertToBitmap() + self._imageList.Add( img ) + self.server_list.SetImageList( self._imageList, wx.IMAGE_LIST_SMALL ) -#--------------------------------------------------------- -# [END] Snowdog: Updated Game Server Window 12/02 -#--------------------------------------------------------- + def build_bookmarks(self): + gsm = self.frame.mainmenu.GetMenu( + self.frame.mainmenu.FindMenu('Game Server')) + self.bookmarks_menu = wx.Menu() + validate.config_file('server_bookmarks.xml', + 'default_server_bookmarks.xml') + self.bookmarks = ElementTree() + self.bookmarks.parse(dir_struct['user'] + 'server_bookmarks.xml') + x = 0 + for server in self.bookmarks.findall('server'): + for svr in self.svrList: + name = svr.name + if server.get('name') == name: self.server_list.SetItemImage(x, 1) + x += 1 + #self.server_list.SetItemImage( self.server_list.FindItem(0, server.get('name')), 1 ) + item = wx.MenuItem(self.bookmarks_menu, wx.ID_ANY, + server.get('name'), server.get('name')) + open_rpg.get_component('frame').Bind(wx.EVT_MENU, + self.on_bookmarks_menu, item) + self.bookmarks_menu.AppendItem(item) + gsm.AppendSubMenu(self.bookmarks_menu, "Bookmarks") - #----------------------------------------------------- - # on_server_dbclick() - # support for double click selection of server. - # 5/16/05 -- Snowdog - #----------------------------------------------------- + def on_bookmarks_menu(self, evt): + id = evt.GetId() + menu = self.bookmarks_menu.FindItemById(id) + for server in self.bookmarks.findall('server'): + if server.name == menu.GetLabel(): + address = server.addy + self.cur_server_index = 999 + self.name = server.name + if self.session.is_connected(): + if self.session.host_server == address : return + else: self.frame.kill_mplay_session() + self.do_connect(address) + break + + def bookmark(self, item, flag): + name = self.svrList[item].name + address = self.svrList[item].addy + port = self.svrList[item].port + self.server_list.SetItemImage(item, 1) + + for server in self.bookmarks.findall('server'): + if server.get('name') == name: + self.bookmarks_menu.Remove( + self.bookmarks_menu.FindItem(server.get('name'))) + self.bookmarks.getroot().remove(server) + self.server_list.SetItemImage(item, 0) + break + else: + server = Element('server') + server.set('name', name) + server.set('address', address + ':' + port) + self.bookmarks.getroot().append(server) + item = wx.MenuItem(self.bookmarks_menu, wx.ID_ANY, name, name) + open_rpg.get_component('frame').Bind(wx.EVT_MENU, + self.on_bookmarks_menu, item) + self.bookmarks_menu.AppendItem(item) + + self.save_bookmarks() + + def save_bookmarks(self): + with open(dir_struct['user'] + 'server_bookmarks.xml', 'w') as f: + self.bookmarks.write(f) + def on_server_dbclick(self, evt=None): #make sure address is updated just in case list select wasn't done try: @@ -257,13 +314,6 @@ self.frame.kill_mplay_session() self.do_connect(address) - - #----------------------------------------------------- - # on_room_dbclick() - # support for double click selection of server. - # 5/16/05 -- Snowdog - #----------------------------------------------------- - def on_room_dbclick(self, evt=None): #make sure address is updated just in case list select wasn't done try: @@ -291,18 +341,23 @@ pwd = "" self.session.send_join_group(group_id, pwd) + def on_room_select(self,evt): + self.cur_room_index = evt.m_itemIndex - def on_select(self,evt): - id = evt.GetId() - if id == LIST_ROOM: - self.cur_room_index = evt.m_itemIndex - elif id==LIST_SERVER: - self.cur_server_index = evt.m_itemIndex - self.name = self.svrList[self.cur_server_index].name - address = self.svrList[self.cur_server_index].addy - port = self.svrList[self.cur_server_index].port - self.texts["address"].SetValue(address+":"+str(port)) - self.refresh_room_list() + def on_hit(self, evt): + pos = wx.Point( evt.GetX(), evt.GetY() ) + (item, flag) = self.server_list.HitTest( pos ) + ## Item == list[server], flag == (32 = 0 colum, 128 = else) ## + if flag == 32: self.bookmark(item, flag) + evt.Skip() + + def on_server_select(self,evt): + self.cur_server_index = evt.m_itemIndex + self.name = self.svrList[self.cur_server_index].name + address = self.svrList[self.cur_server_index].addy + port = self.svrList[self.cur_server_index].port + self.texts["address"].SetValue(address + ":" + str(port)) + self.refresh_room_list() def on_text(self,evt): id = evt.GetId() @@ -326,16 +381,7 @@ self.room_list.DeleteItem(i) self.refresh_room_list() -#--------------------------------------------------------- -# [START] Snowdog Password/Room Name altering code 12/02 -#--------------------------------------------------------- - def update_room(self,data): - - #------------------------------------------------------- - # Udated 12/02 by Snowdog - # allows refresh of all room data not just player counts - #------------------------------------------------------- i = self.room_list.FindItemData(-1,int(data[0])) if data[2]=="1" : pwd="yes" else: pwd="no" @@ -344,25 +390,21 @@ self.room_list.SetStringItem(i,2,pwd) self.refresh_room_list() -#--------------------------------------------------------- -# [END] Snowdog Password/Room Name altering code 12/02 -#--------------------------------------------------------- - def set_cur_room_text(self,name): pass #self.texts["cur_room"].SetLabel(name) #self.sizers["room"].Layout() def set_lobbybutton(self,allow): - self.buttons[GS_JOINLOBBY].Enable(allow) + self.buttons['gs_join_lobby'].Enable(allow) def set_connected(self,connected): - self.buttons[GS_CONNECT].Enable(not connected) - self.buttons[GS_DISCONNECT].Enable(connected) - self.buttons[GS_JOIN].Enable(connected) - self.buttons[GS_CREATE_ROOM].Enable(connected) + self.buttons['gs_connect'].Enable(not connected) + self.buttons['gs_disconnect'].Enable(connected) + self.buttons['gs_join_room'].Enable(connected) + self.buttons['gs_create_room'].Enable(connected) if not connected: - self.buttons[GS_JOINLOBBY].Enable(connected) + self.buttons['gs_join_lobby'].Enable(connected) self.room_list.DeleteAllItems() self.set_cur_room_text("Not Connected!") self.cur_room_index = -1 @@ -372,30 +414,43 @@ self.frame.status.set_connect_status(self.name) self.set_cur_room_text("Lobby") - def on_button(self,evt): - id = evt.GetId() - if id == GS_CONNECT: - address = self.texts["address"].GetValue() - ### check to see if this is a manual entry vs. list entry. - try: - dummy = self.name - except: - self.name = `address` - self.do_connect(address) - elif id == GS_DISCONNECT: self.frame.kill_mplay_session() - elif id == GS_CREATE_ROOM: self.do_create_group() - elif id == GS_JOIN: self.do_join_group() - elif id == GS_JOINLOBBY: self.do_join_lobby() - elif id == GS_SERVER_REFRESH: self.refresh_server_list() - elif id == GS_PWD: self.texts["room_pwd"].Enable(evt.Checked()) - elif id == OR_CLOSE: - dlg = wx.MessageDialog(self,"Quit OpenRPG?","OpenRPG",wx.YES_NO) - if dlg.ShowModal() == wx.ID_YES: - dlg.Destroy() - self.frame.kill_mplay_session() - self.frame.closed_confirmed() - elif id == GS_CLOSE: - self.parent.OnMB_GameServerBrowseServers() + def gs_connect(self, evt): + address = self.texts['address'].GetValue() + try: + dummy = self.name + except: + self.name = `address` + self.do_connect(address) + + def gs_disconnect(self, evt): + self.frame.kill_mplay_session() + + def gs_create_room(self, evt): + self.do_create_group() + + def gs_join(self, evt): + print 'here' + self.do_join_group() + + def gs_join_lobby(self, evt): + self.do_join_lobby() + + def gs_server_refresh(self, evt): + self.refresh_server_list() + + def gs_pwd(self, evt): + self.texts['room_pwd'].Enable(evt.Checked()) + + def close_orpg(self, evt): + dlg = wx.MessageDialog(self, 'Quit OpenRPG?', "OpenRPG", wx.YES_NO) + if dlg.ShowModal() == wx.ID_YES: + dlg.Destroy() + self.frame.kill_mplay_session() + self.frame.closed_confirmed() + + def gs_close(self, evt): + self.parent.OnMB_GameServerBrowseServers() + def refresh_room_list(self): self.room_list.DeleteAllItems() @@ -466,8 +521,9 @@ i = self.server_list.GetItemCount() name = n.name players = n.user - self.server_list.InsertStringItem(i,players) - self.server_list.SetStringItem(i,1,name) + self.server_list.InsertImageStringItem(i, '', 0) + self.server_list.SetStringItem(i,1,players) + self.server_list.SetStringItem(i,2,name) r,g,b = hex.rgb_tuple(color1) svrcolor = wx.Colour(red=r,green=g,blue=b) @@ -488,17 +544,11 @@ # No server is currently selected!!! Versus the broken and random 0! self.cur_server_index = -1 self.server_list.SetColumnWidth(0, wx.LIST_AUTOSIZE) - if self.server_list.GetColumnWidth(0) < 70: self.server_list.SetColumnWidth(0, 70) self.server_list.SetColumnWidth(1, wx.LIST_AUTOSIZE) + if self.server_list.GetColumnWidth(1) < 70: self.server_list.SetColumnWidth(1, 70) + self.server_list.SetColumnWidth(2, wx.LIST_AUTOSIZE) if self.serverNameSet == 0: - # Pointless to constantly set the address field to random - # server. This way, at least, if someone has their own local - # server it can now easily be connected with. Nor do we want - # to reset this every time as it would wipe any previously - # entered data or even the previously selected server data! - # Localhost should probably be used but some systems are ultra/lame - # broken about localhost use. self.texts["address"].SetValue("127.0.0.1:6774") self.serverNameSet = 1 else: @@ -512,7 +562,15 @@ except Exception, e: print "Server List not available." traceback.print_exc() - + x = 0 + try: ### Alpha ### + for server in self.bookmarks.findall('server'): + for svr in self.svrList: + name = svr.name + if server.get('name') == name: self.server_list.SetItemImage(x, 1) + x += 1 + except: pass + def failed_connection(self): if(self.cur_server_index >= 0): id = self.servers[self.cur_server_index].getAttribute('id') @@ -539,13 +597,13 @@ self.set_lobbybutton(0); def do_join_group(self): - if self.cur_room_index >= 0: - if self.cur_room_index != 0: - self.set_lobbybutton(1); - else: - self.set_lobbybutton(0); - group_id = str(self.room_list.GetItemData(self.cur_room_index)) - group = self.session.get_group_info(group_id) + if self.cur_room_index >= 0: + if self.cur_room_index != 0: + self.set_lobbybutton(1); + else: + self.set_lobbybutton(0); + group_id = str(self.room_list.GetItemData(self.cur_room_index)) + group = self.session.get_group_info(group_id) pwd = "" if (group[2] == "True") or (group[2] == "1"): pwd = self.password_manager.GetPassword("room", group_id) @@ -592,7 +650,7 @@ e = name[loc+1:] name = b + "'" + e oldloc = loc+1 - if self.buttons[GS_PWD].GetValue(): + if self.buttons['gs_pwd'].GetValue(): pwd = self.texts["room_pwd"].GetValue() else: pwd = ""
--- a/orpg/orpg_version.py Fri Sep 25 20:37:54 2009 -0500 +++ b/orpg/orpg_version.py Tue Oct 06 05:42:50 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 = "090925-01" +BUILD = "091006-00" # This version is for network capability. PROTOCOL_VERSION = "1.2"