kopia lustrzana https://github.com/inkstitch/inkstitch
cancel simulator extensions without applying changes (#2876)
rodzic
5eb243e9eb
commit
04e74c2c8f
|
@ -474,9 +474,8 @@ class ParamsTab(ScrolledPanel):
|
||||||
|
|
||||||
|
|
||||||
class SettingsPanel(wx.Panel):
|
class SettingsPanel(wx.Panel):
|
||||||
def __init__(self, parent, tabs_factory=None, on_cancel=None, metadata=None, background_color='white', simulator=None):
|
def __init__(self, parent, tabs_factory=None, metadata=None, background_color='white', simulator=None):
|
||||||
self.tabs_factory = tabs_factory
|
self.tabs_factory = tabs_factory
|
||||||
self.cancel_hook = on_cancel
|
|
||||||
self.metadata = metadata
|
self.metadata = metadata
|
||||||
self.background_color = background_color
|
self.background_color = background_color
|
||||||
self.simulator = simulator
|
self.simulator = simulator
|
||||||
|
@ -610,13 +609,12 @@ class SettingsPanel(wx.Panel):
|
||||||
self.apply(event)
|
self.apply(event)
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
wx.CallAfter(self.GetTopLevelParent().Close)
|
self.simulator.stop()
|
||||||
|
wx.CallAfter(self.GetTopLevelParent().close)
|
||||||
|
|
||||||
def cancel(self, event):
|
def cancel(self, event):
|
||||||
if self.cancel_hook:
|
self.simulator.stop()
|
||||||
self.cancel_hook()
|
wx.CallAfter(self.GetTopLevelParent().cancel)
|
||||||
|
|
||||||
self.close()
|
|
||||||
|
|
||||||
def __do_layout(self):
|
def __do_layout(self):
|
||||||
# begin wxGlade: MyFrame.__do_layout
|
# begin wxGlade: MyFrame.__do_layout
|
||||||
|
|
|
@ -25,11 +25,10 @@ from . import PresetsPanel, PreviewRenderer, info_dialog
|
||||||
class LetteringPanel(wx.Panel):
|
class LetteringPanel(wx.Panel):
|
||||||
DEFAULT_FONT = "small_font"
|
DEFAULT_FONT = "small_font"
|
||||||
|
|
||||||
def __init__(self, parent, simulator, group, on_cancel=None, metadata=None, background_color='white'):
|
def __init__(self, parent, simulator, group, metadata=None, background_color='white'):
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.simulator = simulator
|
self.simulator = simulator
|
||||||
self.group = group
|
self.group = group
|
||||||
self.cancel_hook = on_cancel
|
|
||||||
self.metadata = metadata or dict()
|
self.metadata = metadata or dict()
|
||||||
self.background_color = background_color
|
self.background_color = background_color
|
||||||
|
|
||||||
|
@ -397,13 +396,12 @@ class LetteringPanel(wx.Panel):
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
self.GetTopLevelParent().Close()
|
self.simulator.stop()
|
||||||
|
wx.CallAfter(self.GetTopLevelParent().close)
|
||||||
|
|
||||||
def cancel(self, event):
|
def cancel(self, event):
|
||||||
if self.cancel_hook:
|
self.simulator.stop()
|
||||||
self.cancel_hook()
|
wx.CallAfter(self.GetTopLevelParent().cancel)
|
||||||
|
|
||||||
self.close()
|
|
||||||
|
|
||||||
def __do_layout(self):
|
def __do_layout(self):
|
||||||
outer_sizer = wx.BoxSizer(wx.VERTICAL)
|
outer_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
|
@ -21,11 +21,10 @@ from .help_panel import HelpPanel
|
||||||
|
|
||||||
class MultiColorSatinPanel(wx.Panel):
|
class MultiColorSatinPanel(wx.Panel):
|
||||||
|
|
||||||
def __init__(self, parent, simulator, elements, on_cancel=None, metadata=None, background_color='white'):
|
def __init__(self, parent, simulator, elements, metadata=None, background_color='white'):
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.simulator = simulator
|
self.simulator = simulator
|
||||||
self.elements = elements
|
self.elements = elements
|
||||||
self.cancel_hook = on_cancel
|
|
||||||
self.metadata = metadata or dict()
|
self.metadata = metadata or dict()
|
||||||
self.background_color = background_color
|
self.background_color = background_color
|
||||||
self.output_groups = []
|
self.output_groups = []
|
||||||
|
@ -83,12 +82,12 @@ class MultiColorSatinPanel(wx.Panel):
|
||||||
self.preview_renderer.update()
|
self.preview_renderer.update()
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
self.GetTopLevelParent().Close()
|
self.simulator.stop()
|
||||||
|
wx.CallAfter(self.GetTopLevelParent().close)
|
||||||
|
|
||||||
def cancel(self, event):
|
def cancel(self, event):
|
||||||
if self.cancel_hook:
|
self.simulator.stop()
|
||||||
self.cancel_hook()
|
wx.CallAfter(self.GetTopLevelParent().cancel)
|
||||||
self.close()
|
|
||||||
|
|
||||||
def apply(self, event):
|
def apply(self, event):
|
||||||
self.update_satin_elements()
|
self.update_satin_elements()
|
||||||
|
|
|
@ -1159,6 +1159,7 @@ class SplitSimulatorWindow(wx.Frame):
|
||||||
self.detached_simulator_frame = None
|
self.detached_simulator_frame = None
|
||||||
self.splitter = wx.SplitterWindow(self, style=wx.SP_LIVE_UPDATE)
|
self.splitter = wx.SplitterWindow(self, style=wx.SP_LIVE_UPDATE)
|
||||||
background_color = kwargs.pop('background_color', 'white')
|
background_color = kwargs.pop('background_color', 'white')
|
||||||
|
self.cancel_hook = kwargs.pop('on_cancel', None)
|
||||||
self.simulator_panel = SimulatorPanel(
|
self.simulator_panel = SimulatorPanel(
|
||||||
self.splitter,
|
self.splitter,
|
||||||
background_color=background_color,
|
background_color=background_color,
|
||||||
|
@ -1187,7 +1188,7 @@ class SplitSimulatorWindow(wx.Frame):
|
||||||
wx.CallLater(100, self.set_sash_position)
|
wx.CallLater(100, self.set_sash_position)
|
||||||
|
|
||||||
self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGING, self.splitter_resize)
|
self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGING, self.splitter_resize)
|
||||||
self.Bind(wx.EVT_CLOSE, self.on_close)
|
self.Bind(wx.EVT_CLOSE, self.cancel)
|
||||||
|
|
||||||
if global_settings['pop_out_simulator']:
|
if global_settings['pop_out_simulator']:
|
||||||
self.detach_simulator()
|
self.detach_simulator()
|
||||||
|
@ -1201,7 +1202,13 @@ class SplitSimulatorWindow(wx.Frame):
|
||||||
self.splitter.SetSashPosition(settings_panel_min_size.width)
|
self.splitter.SetSashPosition(settings_panel_min_size.width)
|
||||||
self.statusbar.SetStatusWidths((settings_panel_min_size.width, -1))
|
self.statusbar.SetStatusWidths((settings_panel_min_size.width, -1))
|
||||||
|
|
||||||
def on_close(self, event):
|
def cancel(self, event=None):
|
||||||
|
if self.cancel_hook:
|
||||||
|
self.cancel_hook()
|
||||||
|
self.close(None)
|
||||||
|
|
||||||
|
def close(self, event=None):
|
||||||
|
self.simulator_panel.stop()
|
||||||
if self.detached_simulator_frame:
|
if self.detached_simulator_frame:
|
||||||
self.detached_simulator_frame.Destroy()
|
self.detached_simulator_frame.Destroy()
|
||||||
self.Destroy()
|
self.Destroy()
|
||||||
|
|
|
@ -25,11 +25,10 @@ from . import CodePanel, CustomizePanel, EmbroideryPanel, HelpPanel
|
||||||
|
|
||||||
class TartanMainPanel(wx.Panel):
|
class TartanMainPanel(wx.Panel):
|
||||||
|
|
||||||
def __init__(self, parent, simulator, elements, on_cancel=None, metadata=None, background_color='white'):
|
def __init__(self, parent, simulator, elements, metadata=None, background_color='white'):
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
self.simulator = simulator
|
self.simulator = simulator
|
||||||
self.elements = elements
|
self.elements = elements
|
||||||
self.cancel_hook = on_cancel
|
|
||||||
self.palette = Palette()
|
self.palette = Palette()
|
||||||
self.metadata = metadata or dict()
|
self.metadata = metadata or dict()
|
||||||
self.background_color = background_color
|
self.background_color = background_color
|
||||||
|
@ -195,12 +194,12 @@ class TartanMainPanel(wx.Panel):
|
||||||
return "tartan"
|
return "tartan"
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
self.GetTopLevelParent().Close()
|
self.simulator.stop()
|
||||||
|
wx.CallAfter(self.GetTopLevelParent().close)
|
||||||
|
|
||||||
def cancel(self, event):
|
def cancel(self, event):
|
||||||
if self.cancel_hook:
|
self.simulator.stop()
|
||||||
self.cancel_hook()
|
wx.CallAfter(self.GetTopLevelParent().cancel)
|
||||||
self.close()
|
|
||||||
|
|
||||||
def apply(self, event):
|
def apply(self, event):
|
||||||
self.update_tartan()
|
self.update_tartan()
|
||||||
|
|
Ładowanie…
Reference in New Issue