traipse: orpg/player_list.py comparison

comparison orpg/player_list.py @ 13:211ac836b6a0 grumpy-goblin

{090731-00} Fixes problem with Name & Settings window, cleans code.

author	sirebral
date	Fri, 31 Jul 2009 15:22:11 -0500
parents	d5e81dac98ff
children	265b987cce4f

comparison

equal deleted inserted replaced

-:d492f137cd3c
+:211ac836b6a0
 # [END] Snowdog Password/Room Name altering code 12/02
 #---------------------------------------------------------
 class player_list(wx.ListCtrl):
 def __init__( self, parent):
-##        wx.ListCtrl.__init__( self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.LC_REPORT|wx.SUNKEN_BORDER|wx.EXPAND )
+##wx.ListCtrl.__init__( self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.LC_REPORT|wx.SUNKEN_BORDER|wx.EXPAND )
-wx.ListCtrl.__init__( self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.LC_REPORT|wx.SUNKEN_BORDER|wx.EXPAND|wx.LC_HRULES )
+wx.ListCtrl.__init__( self, parent, -1, wx.DefaultPosition, wx.DefaultSize,
+wx.LC_REPORT|wx.SUNKEN_BORDER|wx.EXPAND|wx.LC_HRULES )
 self.session = open_rpg.get_component("session")
 self.settings = open_rpg.get_component('settings')
 self.chat = open_rpg.get_component('chat')
 self.password_manager = open_rpg.get_component("password_manager")
 # Create in image list -- for whatever reason...guess it will be nice when we can tell which is a bot
 self.session = open_rpg.get_component("session")
 self.password_manager = open_rpg.get_component("password_manager")
 self.chat = open_rpg.get_component("chat")
 boot_pwd = self.password_manager.GetPassword("admin",int(self.session.group_id))
 if boot_pwd != None:
-alter_pwd_dialog = wx.TextEntryDialog(self,"Enter new room password: (blank for no password)","Alter Room Password")
+alter_pwd_dialog = wx.TextEntryDialog(self,
+"Enter new room password: (blank for no password)","Alter Room Password")
 if alter_pwd_dialog.ShowModal() == wx.ID_OK:
 new_pass = alter_pwd_dialog.GetValue()
 self.chat.InfoPost( "Requesting password change on server..." )
 self.session.set_room_pass(new_pass, boot_pwd)
 def clean_sub_menus(self):
 for mid in WG_MENU_LIST:
 try:
 self.wgMenu.Remove(WG_MENU_LIST[mid]["menuid"])
 WG_MENU_LIST[mid]["menu"].Destroy()
-except:
+except: self.wgMenu.UpdateUI()
-self.wgMenu.UpdateUI()
+if self.wgMenu.GetMenuItemCount() == 2: WG_MENU_LIST.clear()
-if self.wgMenu.GetMenuItemCount() == 2:
-WG_MENU_LIST.clear()
 return
 def on_menu_whispergroup( self, evt ):
 self.session = open_rpg.get_component("session")
 self.settings = open_rpg.get_component('settings')
 create_new_group_dialog = wx.TextEntryDialog(self,"Enter Group Name","Create New Whisper Group")
 if create_new_group_dialog.ShowModal() == wx.ID_OK:
 group_name = create_new_group_dialog.GetValue()
 WG_LIST[group_name] = {}
 return
-elif id == PLAYER_WG_CLEAR_ALL:
+elif id == PLAYER_WG_CLEAR_ALL: WG_LIST.clear(); return
-WG_LIST.clear()
-return
 #Check Sub Menus
 for mid in WG_MENU_LIST:
-if id == WG_MENU_LIST[mid]["add"]:
+if id == WG_MENU_LIST[mid]["add"]: WG_LIST[mid][int(item.GetText())] = int(item.GetText()); return
-WG_LIST[mid][int(item.GetText())] = int(item.GetText())
+elif id == WG_MENU_LIST[mid]["remove"]: del WG_LIST[mid][int(item.GetText())]; return
-return
+elif id == WG_MENU_LIST[mid]["clear"]: WG_LIST[mid].clear(); return
-elif id == WG_MENU_LIST[mid]["remove"]:
+elif id == WG_MENU_LIST[mid]["whisper"]: self.chat.set_chat_text("/gw " + mid + "="); return
-del WG_LIST[mid][int(item.GetText())]
-return
-elif id == WG_MENU_LIST[mid]["clear"]:
-WG_LIST[mid].clear()
-return
-elif id == WG_MENU_LIST[mid]["whisper"]:
-self.chat.set_chat_text("/gw " + mid + "=")
-return
 return
 #---------------------------------------------------------
 # [END] Digitalxero Multi Whisper Group 1/1/05
 #---------------------------------------------------------
 self.password_manager = open_rpg.get_component("password_manager")
 if id == PLAYER_BOOT:
 id = str(self.GetItemData(self.selected_item))
 boot_pwd = self.password_manager.GetPassword("admin",int(self.session.group_id))
-if boot_pwd != None:
+if boot_pwd != None: self.session.boot_player(id,boot_pwd)
-self.session.boot_player(id,boot_pwd)
 elif id == PLAYER_WHISPER:
 id = self.GetItemText(self.selected_item)
 self.chat = open_rpg.get_component("chat")
 self.chat.set_chat_text("/w " + id + "=")
 elif id == PLAYER_IGNORE:
 id = str(self.GetItemData(self.selected_item))
 self.chat = open_rpg.get_component("chat")
 (result,id,name) = self.session.toggle_ignore(id)
-if result == 0:
+if result == 0: self.chat.Post(self.chat.colorize(self.chat.syscolor,
-self.chat.Post(self.chat.colorize(self.chat.syscolor, "Player " + name + " with ID:" + id +" no longer ignored"))
+"Player " + name + " with ID:" + id +" no longer ignored"))
-else:
+else: self.chat.Post(self.chat.colorize(self.chat.syscolor,
-self.chat.Post(self.chat.colorize(self.chat.syscolor, "Player " + name + " with ID:" + id +" now being ignored"))
+"Player " + name + " with ID:" + id +" now being ignored"))
 elif id == PLAYER_SHOW_VERSION:
 id = str(self.GetItemData(self.selected_item))
 version_string = self.session.players[id][6]
-if version_string:
+if version_string: wx.MessageBox("Running client version " + version_string,"Version")
-wx.MessageBox("Running client version " + version_string,"Version")
+else: wx.MessageBox("No client version available for this player","Version")
-else:
-wx.MessageBox("No client version available for this player","Version")
 def on_menu(self, evt):
 pos = wx.Point(evt.GetX(),evt.GetY())
 (item, flag) = self.HitTest(pos)
 if item > -1:
 self.selected_item = item
 #  This if-else block makes the menu item to boot players active or inactive, as appropriate
-	    # This block is enabled for 1.7.8. Ver. 1.7.9 will boast Admin features.
+# This block is enabled for 1.7.8. Ver. 1.7.9 will boast Admin features.
 #if open_rpg.get_component("session").group_id == "0":
 #    self.menu.Enable(PLAYER_BOOT,0)
 #    self.menu.SetLabel(PLAYER_BOOT,"Can't boot from Lobby")
 #else:
 self.menu.Enable(PLAYER_BOOT,1)
 #---------------------------------------------------------
 # [START] Digitalxero Multi Whisper Group 1/1/05
 #---------------------------------------------------------
 self.menu.Enable(PLAYER_WG_MENU, True)
 item = self.GetItem( self.selected_item )
-if len(WG_MENU_LIST) > len(WG_LIST):
+if len(WG_MENU_LIST) > len(WG_LIST): self.clean_sub_menus()
-self.clean_sub_menus()
+if len(WG_LIST) == 0: self.wgMenu.Enable(PLAYER_WG_CLEAR_ALL, False)
-if len(WG_LIST) == 0:
+else: self.wgMenu.Enable(PLAYER_WG_CLEAR_ALL, True)
-self.wgMenu.Enable(PLAYER_WG_CLEAR_ALL, False)
-else:
-self.wgMenu.Enable(PLAYER_WG_CLEAR_ALL, True)
 for gid in WG_LIST:
 if not WG_MENU_LIST.has_key(gid):
 WG_MENU_LIST[gid] = {}
 WG_MENU_LIST[gid]["menuid"] = wx.NewId()
 WG_MENU_LIST[gid]["whisper"] = wx.NewId()
 #---------------------------------------------------------
 # [START] Digitalxero Multi Whisper Group 1/1/05
 #---------------------------------------------------------
 for gid in WG_LIST:
-if WG_LIST[gid].has_key(int(player[2])):
+if WG_LIST[gid].has_key(int(player[2])): del WG_LIST[gid][int(player[2])]
-del WG_LIST[gid][int(player[2])]
 #---------------------------------------------------------
 # [END] Digitalxero Multi Whisper Group 1/1/05
 #---------------------------------------------------------
 # play sound
 ic = self.GetItemCount()
 self.whisperCount = 0
 index = 0
 while index < ic:
 item = self.GetItem( index )
-if item.GetImage():
+if item.GetImage(): self.whisperCount += 1
-self.whisperCount += 1
 index += 1
 self.colorize_player_list()
 self.Refresh()
 #  This method updates the player info
 def colorize_player_list(self):
 session = open_rpg.get_component("session")
 settings = open_rpg.get_component('settings')
 mode = settings.get_setting("ColorizeRoles")
-if mode.lower() == "0":
+if mode.lower() == "0": return
-return
 players = session.players
 for m in players.keys():
 item_list_location = self.FindItemData(-1,int(m))
 if item_list_location == -1: continue
 player_info = session.get_player_by_player_id(m)
 item = self.GetItem(item_list_location)
 role = player_info[7]
 color = wx.GREEN
-if self.session.group_id != "0":
+if self.session.group_id != "0": item.SetTextColour(settings.get_setting(role + "RoleColor"))
-item.SetTextColour(settings.get_setting(role + "RoleColor"))
 self.SetItem(item)
 def reset(self):
 self.whisperCount = 0
 #---------------------------------------------------------
 # [END] Digitalxero Multi Whisper Group 1/1/05
 #---------------------------------------------------------
 self.DeleteAllItems()
 def strip_html(self,player):
-ret_string = ""
+ret_string = ""; x = 0; in_tag = 0
-x = 0
-in_tag = 0
 for x in range(len(player[0])) :
 if player[0][x] == "<" or player[0][x] == ">" or in_tag == 1 :
-if player[0][x] == "<" :
+if player[0][x] == "<": in_tag = 1
-in_tag = 1
+elif player[0][x] == ">": in_tag = 0
-elif player[0][x] == ">" :
+else: pass
-in_tag = 0
+else: ret_string = ret_string + player[0][x]
-else :
-pass
-else :
-ret_string = ret_string + player[0][x]
 return ret_string
 def size_cols(self):
-##        # moved skip here to see if it breaks
+##moved skip here to see if it breaks
-##        w,h = self.GetClientSizeTuple()
+## w,h = self.GetClientSizeTuple()
-##        w /= 8
+## w /= 8
-##        self.SetColumnWidth( 0, w*2 )
+## self.SetColumnWidth( 0, w*2 )
-##        self.SetColumnWidth( 1, w*2 )
+## self.SetColumnWidth( 1, w*2 )
-##        self.SetColumnWidth( 2, w*3 )
+## self.SetColumnWidth( 2, w*3 )
 pass

Mercurial > traipse

comparison orpg/player_list.py @ 13:211ac836b6a0 grumpy-goblin