From f8e0520344a9755cb9dc0b4c37e1002a58bdc1cf Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Mon, 11 Nov 2024 15:07:40 +0100
Subject: [PATCH] Add HP value to target profile editor

---
 gui/targetProfileEditor.py |  30 ++++++++++++------------------
 imgs/gui/hp_big.png        | Bin 0 -> 779 bytes
 2 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 imgs/gui/hp_big.png

diff --git a/gui/targetProfileEditor.py b/gui/targetProfileEditor.py
index 4838fc837..0ad338ee8 100644
--- a/gui/targetProfileEditor.py
+++ b/gui/targetProfileEditor.py
@@ -123,13 +123,14 @@ class TargetProfileEditor(AuxiliaryFrame):
     ATTRIBUTES = OrderedDict([
         ('maxVelocity', (_t('Maximum speed'), 'm/s')),
         ('signatureRadius', (_t('Signature radius\nLeave blank for infinitely big value'), 'm')),
-        ('radius', (_t('Radius'), 'm'))])
+        ('radius', (_t('Radius'), 'm')),
+        ('hp', (_t('Total HP\nLeave blank for infinitely big value'), 'hp'))])
 
     def __init__(self, parent):
         super().__init__(
             parent, id=wx.ID_ANY, title=_t("Target Profile Editor"), resizeable=True,
             # Dropdown list widget is scaled to its longest content line on GTK, adapt to that
-            size=wx.Size(500, 240) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 240))
+            size=wx.Size(550, 240) if "wxGTK" in wx.PlatformInfo else wx.Size(380, 240))
 
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.block = False
@@ -145,36 +146,29 @@ class TargetProfileEditor(AuxiliaryFrame):
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)
 
-        resistEditSizer = wx.FlexGridSizer(2, 6, 0, 2)
-        resistEditSizer.AddGrowableCol(0)
-        resistEditSizer.AddGrowableCol(5)
-        resistEditSizer.SetFlexibleDirection(wx.BOTH)
-        resistEditSizer.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
+        resistEditSizer = wx.BoxSizer(wx.HORIZONTAL)
+        resistEditSizer.AddStretchSpacer()
 
         defSize = wx.Size(50, -1)
 
-        for i, type_ in enumerate(self.DAMAGE_TYPES):
-            if i % 2:
-                style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT
-                border = 25
-            else:
-                style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT
-                border = 5
+        for type_ in self.DAMAGE_TYPES:
+            leftPad = 25 if type_ != list(self.DAMAGE_TYPES)[0] else 0
             ttText = self.DAMAGE_TYPES[type_]
             bmp = wx.StaticBitmap(self, wx.ID_ANY, BitmapLoader.getBitmap("%s_big" % type_, "gui"))
             bmp.SetToolTip(wx.ToolTip(ttText))
-            resistEditSizer.Add(bmp, 0, style, border)
+            resistEditSizer.Add(bmp, 0, wx.LEFT | wx.ALIGN_CENTER_VERTICAL, leftPad)
             # set text edit
-            editBox = FloatBox(parent=self, id=wx.ID_ANY, value=None, pos=wx.DefaultPosition, size=defSize, validator=ResistValidator())
+            editBox = FloatBox(parent=self, id=wx.ID_ANY, value=None, pos=wx.DefaultPosition, size=defSize)
             editBox.SetToolTip(wx.ToolTip(ttText))
             self.Bind(event=wx.EVT_TEXT, handler=self.OnFieldChanged, source=editBox)
             setattr(self, '{}Edit'.format(type_), editBox)
-            resistEditSizer.Add(editBox, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5)
+            resistEditSizer.Add(editBox, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
             unit = wx.StaticText(self, wx.ID_ANY, "%", wx.DefaultPosition, wx.DefaultSize, 0)
             unit.SetToolTip(wx.ToolTip(ttText))
             resistEditSizer.Add(unit, 0, wx.BOTTOM | wx.TOP | wx.ALIGN_CENTER_VERTICAL, 5)
 
-        contentSizer.Add(resistEditSizer, 0, wx.EXPAND | wx.ALL, 5)
+        resistEditSizer.AddStretchSpacer()
+        contentSizer.Add(resistEditSizer, 1, wx.EXPAND | wx.ALL, 5)
 
         miscAttrSizer = wx.BoxSizer(wx.HORIZONTAL)
         miscAttrSizer.AddStretchSpacer()
diff --git a/imgs/gui/hp_big.png b/imgs/gui/hp_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..a68e63daad98e282bae1b71c4d54d686e613d110
GIT binary patch
literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0008gNkl<Zc-rmG
z18^Kr5P;$T5L>6%mTD=eZQHhO+qP}nwr$(DmBwu_?)S`H{!33z#fuj9!Y<N+bf#Rr
zW?3!~nYU@l*zHYA#}CaJ=@CwP*|~eW?YTqiSL|IeQfej!N@h2td`|BJ^-JbV0?Yvu
z(js@1mqUvp;hPiP5MLGI021ngB!xQP4Dt?Y40yQey_~YdMX5-Q<!d)5etvo9(uEDf
z<m}qv(y~~j#Ce!Vq?=lze4Wo^^0e)jHQcj?i<5&nsh}2-sq)=h5fPcuqm~qnbC$yK
zhR<Qn-1c@hKdrGb>w;3DBc*!x?h`E{XXV-|5#v+&X8q)LQXz|rRLt!5A<EnFRGgpv
zVo+8Bya9Dev+pP(?=Nqi@IAn-OQ&S}+yPQ3+DXb~_IPj5*=|!?m`t-YSC;`Y0ZxD!
z|KiEhy8$AyTjZro8{SzeB}7V#iV1RJ<1|SKcacKz?yqgFtj7Qy6$&Z?xd0!)7Etgv
zB4S!JAxomKHG93xFuEy`wiPqW`JIcUazd08im`pJR?-z{0~7@^0^Wc<pdbZu=krxw
zjn*Ueie{8iUFu1(EWQ%!u6hj&1*!pgfM7raSf(U^!b@kH5Uk;<PK9Vesusv77f&CN
z`?oF_>lMs;%}haOAQI34)_{_Kq#V+*Zq8K`Ivo#o#0W^6+U4a3qdYvlMpln$E*)zm
z9n(5k=LW1&@;TsaKD1rMF%@(9ONbLPs8b{P{N$#*xqbZe;Lf#fhZ@Z97t5qImdojB
z^flNFM6EQWEP!)1Rj3<10-bm_wrBm%BG2Xg_JvZdM79gSG+>;IDZ3oZco^wpdC0~>
zod8&o5_XWu!JK|I%9UI@xqqv34N7M{2aE<90?9xjREoCt)}~|CDrG6ao)j_#0)a%J
z0#FYq1%v=LKbr>-3xonzq=E@x2{;0ppQ9;%C;;`(drJOGsV^=`98iyw&P4zK002ov
JPDHLkV1ni?Wpe-k

literal 0
HcmV?d00001