From 77afb897fa4ea2eb9f0604c6bed363821378643b Mon Sep 17 00:00:00 2001 From: ccremers Date: Thu, 3 Aug 2006 08:18:14 +0000 Subject: [PATCH] - Toolbars should be realized. --- gui/Attackwindow.py | 4 +++- gui/Mainwindow.py | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gui/Attackwindow.py b/gui/Attackwindow.py index 501e997..256479a 100644 --- a/gui/Attackwindow.py +++ b/gui/Attackwindow.py @@ -136,10 +136,12 @@ class AttackWindow(wx.Frame): # Add fit button bmp = wx.ArtProvider_GetBitmap(wx.ART_MISSING_IMAGE,wx.ART_TOOLBAR,(20,20)) if not bmp.Ok(): - bmp = wx.EmptyBitmap(20,20) + bmp = wx.EmptyBitmap(32,32) tb.AddCheckTool(wx.ID_ZOOM_FIT, bmp, bmp, 'Toggle zoom', 'Toggle zoom level') self.Bind(wx.EVT_TOOL, self.OnFit, id=wx.ID_ZOOM_FIT) + tb.Realize() + # And shortcut aTable = wx.AcceleratorTable([ (wx.ACCEL_NORMAL, ord('Z'), wx.ID_ZOOM_FIT) diff --git a/gui/Mainwindow.py b/gui/Mainwindow.py index 11b2864..ce1217a 100644 --- a/gui/Mainwindow.py +++ b/gui/Mainwindow.py @@ -114,13 +114,20 @@ class MainWindow(wx.Frame): | wx.TB_TEXT ) - bmp = wx.ArtProvider_GetBitmap(wx.ART_EXECUTABLE_FILE,wx.ART_TOOLBAR,(20,20)) + #print "Default toolbar tool size: %s\n" % tb.GetToolBitmapSize() + + tsize = (32,32) + + bmp = wx.ArtProvider_GetBitmap(wx.ART_EXECUTABLE_FILE,wx.ART_TOOLBAR,tsize) if not bmp.Ok(): - bmp = wx.EmptyBitmap(20,20) + bmp = wx.EmptyBitmap(tsize) + + # add the actual tools tb.AddSimpleTool(ID_VERIFY, bmp,"Verify","Verify claims") self.Bind(wx.EVT_TOOL, self.OnVerify, id=ID_VERIFY) tb.AddSimpleTool(ID_STATESPACE, bmp,"Statespace","Generate statespace for all roles") self.Bind(wx.EVT_TOOL, self.OnStatespace, id=ID_STATESPACE) + tb.AddSeparator() tb.AddSimpleTool(ID_CHECK, bmp,"Check","Check protocol") @@ -128,6 +135,8 @@ class MainWindow(wx.Frame): tb.AddSimpleTool(ID_AUTOVERIFY, bmp,"Default claims","Verify default claims") self.Bind(wx.EVT_TOOL, self.OnAutoVerify, id=ID_AUTOVERIFY) + tb.Realize() + def CreateMenu(self, bar, name, list): fileMenu = wx.Menu()