Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions devsimpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def __init__(self, parent, id, title):
## Set i18n locales --------------------------------------------------------
self.Seti18n()

wx.Frame.__init__(self, parent, wx.NewIdRef(), title, size = DefineScreenSize(), style = wx.DEFAULT_FRAME_STYLE|wx.NO_FULL_REPAINT_ON_RESIZE)
wx.Frame.__init__(self, parent, wx.NewIdRef(), title, style = wx.DEFAULT_FRAME_STYLE|wx.NO_FULL_REPAINT_ON_RESIZE)

self.window = None
self.otherWin = None
Expand Down Expand Up @@ -345,7 +345,14 @@ def __init__(self, parent, id, title):

sys.stdout.write("DEVSimPy is ready!\n")

self.Centre(wx.BOTH)
### load last size and position if exist
self.SetSize(DefineScreenSize() if not self.last_size else self.last_size)

if self.last_position:
self.SetPosition(self.last_position)
else:
self.Centre(wx.BOTH)

self.Show()

def GetVersion(self):
Expand All @@ -372,6 +379,8 @@ def WriteDefaultConfigFile(self, cfg):
self.openFileList = ['']*NB_OPENED_FILE # number of last opened files
self.language = 'fr' if 'fr_FR' in locale.getdefaultlocale() else 'en' # default language
self.perspectives = {} # perpsective is void
self.last_position = None
self.last_size = None

### verison of the main (fo compatibility of DEVSimPy)
cfg.Write('version', str(__version__))
Expand All @@ -385,6 +394,8 @@ def WriteDefaultConfigFile(self, cfg):
cfg.Write('active_plugins', str("[]"))
cfg.Write('perspectives', str(eval("self.perspectives")))
cfg.Write('builtin_dict', str(eval("builtins.__dict__")))
cfg.Write('last_position', str(eval("self.last_position")))
cfg.Write('last_size', str(eval("self.last_size")))

sys.stdout.write("OK! \n")

Expand Down Expand Up @@ -425,6 +436,14 @@ def SetConfig(self, cfg):
### load perspective profile
self.perspectives = eval(self.cfg.Read("perspectives"))

### load last position and size
try:
self.last_position = eval(self.cfg.Read("last_position"))
self.last_size = eval(self.cfg.Read("last_size"))
except:
self.last_position = None
self.last_size = None

### restore the builtin dict
try:
D = eval(self.cfg.Read("builtin_dict"))
Expand Down Expand Up @@ -925,6 +944,14 @@ def SaveBuiltinDict(self):
self.cfg.Write("builtin_dict", str(eval('dict((k, builtins.__dict__[k]) for k in builtin_dict)')))
self.cfg.Flush()

def SavePosition(self):
self.cfg.Write("last_position", str(self.GetPosition()))
self.cfg.Flush()

def SaveSize(self):
self.cfg.Write("last_size", str(self.GetSize()))
self.cfg.Flush()

###
def OnCloseWindow(self, event):
""" Close icon has been pressed. Closing DEVSimPy.
Expand All @@ -946,6 +973,8 @@ def OnCloseWindow(self, event):
self.SaveLibraryProfile()
self.SavePerspectiveProfile()
self.SaveBuiltinDict()
self.SavePosition()
self.SaveSize()
self._mgr.UnInit()
del self._mgr
self.Destroy()
Expand Down
14 changes: 8 additions & 6 deletions plugins/verbose.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ def write(self, string):
if wx.Platform == '__WXGTK__':
wx.CallAfter(self.out.WriteText, string)
else:
self.out.WriteText(string)

if self.out:
self.out.WriteText(string)
else:
sys.stdout.write("TextCtrl is deleted!")
def flush(self):
pass

Expand Down Expand Up @@ -201,11 +203,11 @@ def __do_layout(self):
sizer_3.Add(self.checkbox_6, 0, wx.EXPAND, 2, 2)

### adding buttons
sizer_5.Add(self.button_2, 1, wx.ALIGN_CENTER_HORIZONTAL)
sizer_5.Add(self.button_3, 1, wx.ALIGN_CENTER_HORIZONTAL)
sizer_5.Add(self.button_2, 1, wx.ALIGN_CENTER)
sizer_5.Add(self.button_3, 1, wx.ALIGN_CENTER)

sizer_4.Add(sizer_3, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL,0)
sizer_4.Add(sizer_5, 1, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL,0)
sizer_4.Add(sizer_3, 0, wx.ALL|wx.EXPAND,0)
sizer_4.Add(sizer_5, 1, wx.ALL|wx.EXPAND,0)

self.panel.SetSizer(sizer_4)

Expand Down