From acb9a17f1a6aa418cc744e18faab971cabef1a16 Mon Sep 17 00:00:00 2001 From: Corollax Date: Sat, 30 Oct 2010 15:31:08 -0500 Subject: [PATCH 1/4] Revert "Filter out unwanted groups in shipbrowser" This reverts commit e3203c588a3e264c0919dd5dbc19faa9cebadde9. --- gui/shipBrowser.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 603d01049..04aa61633 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -36,7 +36,6 @@ class ShipBrowser(wx.Panel): self._stage3ShipName = "" self.fitIDMustEditName = -1 self.filterShipsWithNoFits = False - self.filterGroups = [1022] self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) @@ -104,8 +103,7 @@ class ShipBrowser(wx.Panel): self.categoryList = sMarket.getShipRoot() self.categoryList.sort(key=self.nameKey) for ID, name in self.categoryList: - if ID not in self.filterGroups: - self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) + self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) self.lpane.RefreshList() self.Show() From e3203c588a3e264c0919dd5dbc19faa9cebadde9 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sat, 30 Oct 2010 23:31:56 +0300 Subject: [PATCH 2/4] Filter out unwanted groups in shipbrowser --- gui/shipBrowser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 04aa61633..603d01049 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -36,6 +36,7 @@ class ShipBrowser(wx.Panel): self._stage3ShipName = "" self.fitIDMustEditName = -1 self.filterShipsWithNoFits = False + self.filterGroups = [1022] self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) @@ -103,7 +104,8 @@ class ShipBrowser(wx.Panel): self.categoryList = sMarket.getShipRoot() self.categoryList.sort(key=self.nameKey) for ID, name in self.categoryList: - self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) + if ID not in self.filterGroups: + self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) self.lpane.RefreshList() self.Show() From 7dcdb54f394e3f0745b712c2948083b1426c44d8 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sat, 30 Oct 2010 23:34:19 +0300 Subject: [PATCH 3/4] Revert "Filter out unwanted groups in shipbrowser" This reverts commit e3203c588a3e264c0919dd5dbc19faa9cebadde9. --- gui/shipBrowser.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 603d01049..04aa61633 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -36,7 +36,6 @@ class ShipBrowser(wx.Panel): self._stage3ShipName = "" self.fitIDMustEditName = -1 self.filterShipsWithNoFits = False - self.filterGroups = [1022] self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) @@ -104,8 +103,7 @@ class ShipBrowser(wx.Panel): self.categoryList = sMarket.getShipRoot() self.categoryList.sort(key=self.nameKey) for ID, name in self.categoryList: - if ID not in self.filterGroups: - self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) + self.lpane.AddWidget(CategoryItem(self.lpane, ID, (name, 0))) self.lpane.RefreshList() self.Show() From 0903197ec5c2d1e6a0e88630897a557c69c2b7af Mon Sep 17 00:00:00 2001 From: Corollax Date: Sat, 30 Oct 2010 15:43:14 -0500 Subject: [PATCH 4/4] Removed the empty Prototype Exploration Ship Zephyr was moved to limited edition, so...yeah. --- service/market.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/market.py b/service/market.py index 7152a33ee..c52d72798 100644 --- a/service/market.py +++ b/service/market.py @@ -165,7 +165,8 @@ class Market(): for grp in cat.groups: if grp.published or grp.name in self.FORCED_GROUPS: root.append((grp.ID, grp.name)) - + zephyr = eos.db.getGroup("Prototype Exploration Ship") + root.remove((zephyr.ID, zephyr.name)) return root