diff --git a/graphs/gui/frame.py b/graphs/gui/frame.py index 1ce31543f..2d20063f7 100644 --- a/graphs/gui/frame.py +++ b/graphs/gui/frame.py @@ -45,7 +45,7 @@ class GraphFrame(AuxiliaryFrame): pyfalog.warning('Matplotlib is not enabled. Skipping initialization.') return - super().__init__(parent, title='Graphs', style=wx.RESIZE_BORDER, size=(520, 390)) + super().__init__(parent, title='Graphs', size=(520, 390), resizeable=True) self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.SetIcon(wx.Icon(BitmapLoader.getBitmap('graphs_small', 'gui'))) diff --git a/gui/auxFrame.py b/gui/auxFrame.py index 30237cfac..a751737be 100644 --- a/gui/auxFrame.py +++ b/gui/auxFrame.py @@ -26,8 +26,10 @@ class AuxiliaryFrame(wx.Frame): _instance = None - def __init__(self, parent, id=None, title=None, pos=None, size=None, style=None, name=None): + def __init__(self, parent, id=None, title=None, pos=None, size=None, style=None, name=None, resizeable=False): baseStyle = wx.FRAME_NO_TASKBAR | wx.FRAME_FLOAT_ON_PARENT | wx.CAPTION | wx.CLOSE_BOX | wx.SYSTEM_MENU + if resizeable: + baseStyle = baseStyle | wx.RESIZE_BORDER | wx.MAXIMIZE_BOX kwargs = { 'parent': parent, 'style': baseStyle if style is None else baseStyle | style} diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 05dab9638..ae26fcaa8 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -154,7 +154,9 @@ class CharacterEntityEditor(EntityEditor): class CharacterEditor(AuxiliaryFrame): def __init__(self, parent): - super().__init__(parent, id=wx.ID_ANY, title="Character Editor", pos=wx.DefaultPosition, size=wx.Size(640, 600)) + super().__init__( + parent, id=wx.ID_ANY, title="Character Editor", resizeable=True, + pos=wx.DefaultPosition, size=wx.Size(640, 600)) i = wx.Icon(BitmapLoader.getBitmap("character_small", "gui")) self.SetIcon(i) diff --git a/gui/devTools.py b/gui/devTools.py index 5abd4d80c..3e5ac725e 100644 --- a/gui/devTools.py +++ b/gui/devTools.py @@ -39,7 +39,7 @@ class DevTools(AuxiliaryFrame): def __init__(self, parent): super().__init__( - parent, id=wx.ID_ANY, title="Development Tools", style=wx.RESIZE_BORDER, + parent, id=wx.ID_ANY, title="Development Tools", resizeable=True, size=wx.Size(400, 320) if "wxGTK" in wx.PlatformInfo else wx.Size(400, 240)) self.mainFrame = parent self.block = False diff --git a/gui/esiFittings.py b/gui/esiFittings.py index 0a0e4e1db..a94c362e5 100644 --- a/gui/esiFittings.py +++ b/gui/esiFittings.py @@ -25,7 +25,7 @@ class EveFittings(AuxiliaryFrame): def __init__(self, parent): super().__init__( parent, id=wx.ID_ANY, title="Browse EVE Fittings", pos=wx.DefaultPosition, - size=wx.Size(750, 450), style=wx.RESIZE_BORDER) + size=wx.Size(750, 450), resizeable=True) self.mainFrame = parent mainSizer = wx.BoxSizer(wx.VERTICAL) @@ -204,7 +204,7 @@ class ExportToEve(AuxiliaryFrame): def __init__(self, parent): super().__init__( parent, id=wx.ID_ANY, title="Export fit to EVE", pos=wx.DefaultPosition, - size=wx.Size(400, 120) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 100), style=wx.RESIZE_BORDER) + size=wx.Size(400, 120) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 100), resizeable=True) self.mainFrame = parent @@ -317,7 +317,7 @@ class SsoCharacterMgmt(AuxiliaryFrame): def __init__(self, parent): super().__init__( parent, id=wx.ID_ANY, title="SSO Character Management", pos=wx.DefaultPosition, - size=wx.Size(550, 250), style=wx.RESIZE_BORDER) + size=wx.Size(550, 250), resizeable=True) self.mainFrame = parent mainSizer = wx.BoxSizer(wx.HORIZONTAL) diff --git a/gui/itemStats.py b/gui/itemStats.py index e9bb14cec..62667befe 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -56,7 +56,7 @@ class ItemStatsFrame(AuxiliaryFrame): title="Item stats", pos=pos, size=size, - style=wx.RESIZE_BORDER) + resizeable=True) empty = getattr(victim, "isEmpty", False) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 543b5d71c..9ce5e7c2c 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -94,7 +94,7 @@ class DmgPatternEditor(AuxiliaryFrame): def __init__(self, parent): super().__init__( - parent, id=wx.ID_ANY, title="Damage Pattern Editor", style=wx.RESIZE_BORDER, + parent, id=wx.ID_ANY, title="Damage Pattern 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(400, 240)) diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py index cc71c8886..d5b827bbf 100644 --- a/gui/propertyEditor.py +++ b/gui/propertyEditor.py @@ -24,7 +24,7 @@ class AttributeEditor(AuxiliaryFrame): def __init__(self, parent): super().__init__( parent, wx.ID_ANY, title="Attribute Editor", pos=wx.DefaultPosition, - size=wx.Size(650, 600), style=wx.RESIZE_BORDER) + size=wx.Size(650, 600), resizeable=True) i = wx.Icon(BitmapLoader.getBitmap("fit_rename_small", "gui")) self.SetIcon(i) diff --git a/gui/setEditor.py b/gui/setEditor.py index ba6443d8e..5af95f35b 100644 --- a/gui/setEditor.py +++ b/gui/setEditor.py @@ -119,7 +119,7 @@ class ImplantSetEditor(AuxiliaryFrame): def __init__(self, parent): super().__init__( - parent, id=wx.ID_ANY, title="Implant Set Editor", style=wx.RESIZE_BORDER, + parent, id=wx.ID_ANY, title="Implant Set Editor", resizeable=True, size=wx.Size(950, 500) if "wxGTK" in wx.PlatformInfo else wx.Size(850, 420)) self.block = False diff --git a/gui/targetProfileEditor.py b/gui/targetProfileEditor.py index 7ae5b4aa5..0112ef73f 100644 --- a/gui/targetProfileEditor.py +++ b/gui/targetProfileEditor.py @@ -126,7 +126,7 @@ class TargetProfileEditor(AuxiliaryFrame): def __init__(self, parent): super().__init__( - parent, id=wx.ID_ANY, title="Target Profile Editor", style=wx.RESIZE_BORDER, + parent, id=wx.ID_ANY, title="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))