Skip to content

Version 4.0 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
capocchi merged 2 commits into from
Mar 6, 2020
Merged

Version 4.0 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc33a8
dynamic size for SimulationGUI
capocchi Mar 6, 2020
e4eb79a
bug fix for PropertiesGridControl on Linux
capocchi Mar 6, 2020
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
4 changes: 2 additions & 2 deletions AttributeEditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, parent, ID, model, canvas):

# Create a box sizer for self
self._box = wx.BoxSizer(wx.VERTICAL)
self._box.Add(self._list, 1, wx.ALL|wx.EXPAND)
self._box.Add(self._list, 1, wx.EXPAND|wx.ALL)

###linecache module which inspect uses. It caches the file contents and does not reload it accordingly.
linecache.clearcache()
Expand All @@ -80,7 +80,7 @@ def __init__(self, parent, ID, model, canvas):

self.SetSizer(self._box)

# self._box.SetSizeHints(self)
self._box.SetSizeHints(self)
self.CenterOnParent()

self.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
Expand Down
8 changes: 4 additions & 4 deletions SimulationGUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,10 +836,10 @@ def __init__(self, parent, id, title, master):
wx.Frame.__init__(self, parent, id, title, style= wx.DEFAULT_FRAME_STYLE)

### adapt size of frame depending on the plate-form
if '__WXMSW__' in wx.PlatformInfo:
self.SetSize((320,280))
else:
self.SetSize((280,160))
#if '__WXMSW__' in wx.PlatformInfo:
# self.SetSize((320,280))
#else:
# self.SetSize((280,160))

# disable the roll out of the frame
self.SetMinSize(self.GetSize())
Expand Down
3 changes: 2 additions & 1 deletion devsimpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ def MakeToolBar(self):
self.tb.AddTool(self.toggle_list[2], wx.Bitmap(os.path.join(ICON_PATH,'linear_connector.png')), shortHelpString=_('Linear'), longHelpString=_('Linear connector'), isToggle=True)
]
else:

self.tools = [ self.tb.AddTool(wx.ID_NEW, "",wx.Bitmap(os.path.join(ICON_PATH,'new.png')), shortHelp=_('New diagram (Ctrl+N)')),
self.tb.AddTool(wx.ID_OPEN, "",wx.Bitmap(os.path.join(ICON_PATH,'open.png')), shortHelp=_('Open File (Ctrl+O)')),
self.tb.AddTool(wx.ID_PREVIEW_PRINT, "",wx.Bitmap(os.path.join(ICON_PATH,'print-preview.png')), shortHelp=_('Print Preview (Ctrl+P)')),
Expand All @@ -582,7 +583,7 @@ def MakeToolBar(self):
level = currentPage.GetCurrentLevel()

level_label = wx.StaticText(self.tb, -1, _("Level "))
self.spin = wx.SpinCtrl(self.tb, self.toggle_list[3], str(level), (55, 90), (50, -1), min=0, max=10)
self.spin = wx.SpinCtrl(self.tb, self.toggle_list[3], str(level), pos=(55, 90), size=(50, -1), min=0, max=20)

self.tb.AddControl(level_label)
self.tb.AddControl(self.spin)
Expand Down