From 11a7c28e31a6a21daaed4f962bdde7548fe58f5c Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Wed, 10 Nov 2010 02:59:08 -0600
Subject: [PATCH 1/5] Uses the new maxTargetRange property

Caps lock range at 250km
---
 eos                                            | 2 +-
 gui/builtinStatsViews/targetingMiscViewFull.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eos b/eos
index 66d215ab1..296e9159b 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 66d215ab1a701025a14195614ff5e88e8a51a965
+Subproject commit 296e9159b68dcaff0fad30e0bfafb9a7ce623a36
diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py
index e439e1e1f..1fde123cf 100644
--- a/gui/builtinStatsViews/targetingMiscViewFull.py
+++ b/gui/builtinStatsViews/targetingMiscViewFull.py
@@ -98,7 +98,7 @@ class TargetingMiscViewFull(StatsView):
         #If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
         stats = (("labelTargets", lambda: fit.maxTargets, 3, 0, 0, ""),
-                 ("labelRange", lambda: fit.ship.getModifiedItemAttr('maxTargetRange') / 1000, 3, 0, 0, "km"),
+                 ("labelRange", lambda: fit.maxTargetRange / 1000, 3, 0, 0, "km"),
                  ("labelScanRes", lambda: fit.ship.getModifiedItemAttr('scanResolution'), 3, 0, 0, "mm"),
                  ("labelSensorStr", lambda: fit.scanStrength, 3, 0, 0, ""),
                  ("labelCtrlRange", lambda: fit.extraAttributes["droneControlRange"] / 1000, 3, 0, 0, "km"),

From d4d68e990d8e0056404df710a54272ae6fee50b6 Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Wed, 10 Nov 2010 16:04:01 -0600
Subject: [PATCH 2/5] Added the appropriate interpreter invocation

miniframe.py now has excute permissions, and opens the correct interpreter upon doing so
---
 miniframe.py | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 miniframe.py

diff --git a/miniframe.py b/miniframe.py
old mode 100644
new mode 100755
index eef84fe8f..ba8fed819
--- a/miniframe.py
+++ b/miniframe.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import wx
 import copy
 import time

From 51725ddb35776ad082c535cc04b48e6fc85e0d01 Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Thu, 11 Nov 2010 05:15:14 -0600
Subject: [PATCH 3/5] Tiny readability/efficiency change to miniframe.py

min(max()) to enforce variable range
---
 eos          |  2 +-
 miniframe.py | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/eos b/eos
index 296e9159b..39c85374b 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 296e9159b68dcaff0fad30e0bfafb9a7ce623a36
+Subproject commit 39c85374b98bea389dfa159b32a1003aa4719105
diff --git a/miniframe.py b/miniframe.py
index ba8fed819..748d9d7d2 100755
--- a/miniframe.py
+++ b/miniframe.py
@@ -123,12 +123,9 @@ class PFTabRenderer:
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255))
+        b = min(max(b,0),255))
+        g = min(max(g,0),255))
 
         return wx.Colour(r,b,g)
 
@@ -369,12 +366,9 @@ class PFAddRenderer:
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255)
+        b = min(max(b,0),255)
+        g = min(max(g,0),255)
 
         return wx.Colour(r,b,g)
 
@@ -761,6 +755,8 @@ class PFTabsContainer(wx.Window):
                 self.tabs[self.GetTabsCount() - 1].SetSelected(True)
             else:
                 self.tabs[tab].SetSelected(True)
+        elif self.GetTabsCount() == 0:
+            self.Destroy()
         self.AdjustTabsSize()
         self.Refresh()
 

From a179e61ecb03f8b605e9912b08d904db04e6201e Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Thu, 11 Nov 2010 05:18:12 -0600
Subject: [PATCH 4/5] Tiny tweaks to miniframe.py

Use the builting min(max() functions and give wxColour() the right parameters
---
 miniframe.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/miniframe.py b/miniframe.py
index 748d9d7d2..50e1bd904 100755
--- a/miniframe.py
+++ b/miniframe.py
@@ -819,14 +819,11 @@ class PFTabsContainer(wx.Window):
         g = bkG + scale
         b = bkB + scale
 
-        if r > 255: r = 255
-        if r < 0: r = 0
-        if g > 255: g = 255
-        if g < 0: g = 0
-        if b > 255: b = 255
-        if b < 0: b = 0
+        r = min(max(r,0),255)
+        g = min(max(g,0),255)
+        b = min(max(b,0),255)
 
-        return wx.Colour(r,b,g)
+        return wx.Colour(r,g,b)
 
 class MiniFrame(wx.Frame):
     def __init__(self):

From 6b0aa2b4a6647e684b60454b651bfe641c711d1c Mon Sep 17 00:00:00 2001
From: Corollax <corollax@gmail.com>
Date: Thu, 11 Nov 2010 05:25:05 -0600
Subject: [PATCH 5/5] Fixed extra parens

Rackin' a frackin...
---
 miniframe.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/miniframe.py b/miniframe.py
index 50e1bd904..8f71163ad 100755
--- a/miniframe.py
+++ b/miniframe.py
@@ -123,9 +123,9 @@ class PFTabRenderer:
         g = bkG + scale
         b = bkB + scale
 
-        r = min(max(r,0),255))
-        b = min(max(b,0),255))
-        g = min(max(g,0),255))
+        r = min(max(r,0),255)
+        b = min(max(b,0),255)
+        g = min(max(g,0),255)
 
         return wx.Colour(r,b,g)