From 8046cf8781950e07b23d5efad44221b3918c6263 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 8 Nov 2010 10:44:40 +0100 Subject: [PATCH] Change nameSorter to correctly handle names with numbers in them and sort accordingly --- gui/builtinContextMenus/moduleAmmoPicker.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index 6e008324e..e7bb9091b 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -55,9 +55,12 @@ class ModuleAmmoPicker(ContextMenu): if damage > 0: return (i, damage, charge.name) + def numericConverter(self, string): + return int(string) if string.isdigit() else string + def nameSorter(self, charge): - n = charge.name - return (len(n), n) + parts = charge.name.split(" ") + return map(self.numericConverter, parts) def addCharge(self, menu, charge): id = wx.NewId()