Skip to content

Commit

Permalink
Merge branch 'oyarzun-go-root' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jreadey committed Oct 6, 2015
2 parents 8a41ae8 + 7f90ed1 commit 6d80cf2
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 0 deletions.
15 changes: 15 additions & 0 deletions compass_viewer/container/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
ID_GO_MENU_BACK = wx.NewId()
ID_GO_MENU_NEXT = wx.NewId()
ID_GO_MENU_UP = wx.NewId()
ID_GO_MENU_TOP = wx.NewId()

ID_VIEW_MENU_LIST = wx.NewId()
ID_VIEW_MENU_ICON = wx.NewId()
Expand Down Expand Up @@ -59,6 +60,7 @@ def __init__(self, node, pos=None):
go_menu.Append(ID_GO_MENU_BACK, "Back\tCtrl-[")
go_menu.Append(ID_GO_MENU_NEXT, "Next\tCtrl-]")
go_menu.Append(ID_GO_MENU_UP, "Up\tCtrl-Up")
go_menu.Append(ID_GO_MENU_TOP, "Top\tCtrl-/")
self.add_menu(go_menu, "Go")
self.go_menu = go_menu

Expand All @@ -68,6 +70,7 @@ def __init__(self, node, pos=None):
self.Bind(wx.EVT_MENU, lambda evt: self.go_back(), id=ID_GO_MENU_BACK)
self.Bind(wx.EVT_MENU, lambda evt: self.go_next(), id=ID_GO_MENU_NEXT)
self.Bind(wx.EVT_MENU, lambda evt: self.go_up(), id=ID_GO_MENU_UP)
self.Bind(wx.EVT_MENU, lambda evt: self.go_top(), id=ID_GO_MENU_TOP)
self.Bind(wx.EVT_MENU, lambda evt: self.list_view(), id=ID_VIEW_MENU_LIST)
self.Bind(wx.EVT_MENU, lambda evt: self.icon_view(), id=ID_VIEW_MENU_ICON)

Expand All @@ -77,6 +80,7 @@ def __init__(self, node, pos=None):
back_bmp = imagesupport.getbitmap('go_back_24')
next_bmp = imagesupport.getbitmap('go_next_24')
up_bmp = imagesupport.getbitmap('go_up_24')
top_bmp = imagesupport.getbitmap('go_top_24')
icon_bmp = imagesupport.getbitmap('view_icon_24')
list_bmp = imagesupport.getbitmap('view_list_24')

Expand All @@ -85,6 +89,7 @@ def __init__(self, node, pos=None):
self.toolbar.AddLabelTool(ID_GO_MENU_NEXT, "Next", next_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddSeparator()
self.toolbar.AddLabelTool(ID_GO_MENU_UP, "Up", up_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddLabelTool(ID_GO_MENU_TOP, "Top", top_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddStretchableSpace()
self.toolbar.AddLabelTool(ID_VIEW_MENU_LIST, "List View", list_bmp, shortHelp="New", longHelp="Long help for 'New'")
self.toolbar.AddLabelTool(ID_VIEW_MENU_ICON, "Icon View", icon_bmp, shortHelp="New", longHelp="Long help for 'New'")
Expand Down Expand Up @@ -136,6 +141,13 @@ def go_up(self):
parent = node.store.getparent(node.key)
if parent.key != node.key: # at the root item
self.go(parent)

def go_top(self):
""" Go to the root node """
node = self.history[self.history_ptr]
parent = node.store.root
if parent.key != node.key: # at the root item
self.go(parent)


def go(self, newnode):
Expand All @@ -161,12 +173,15 @@ def update_view(self):
can_go_back = self.history_ptr > 0
can_go_next = self.history_ptr < (len(self.history)-1)
can_go_up = self.node.store.getparent(self.node.key) is not None
can_go_top = self.node.key != self.node.store.root.key
self.go_menu.Enable(ID_GO_MENU_BACK, can_go_back)
self.go_menu.Enable(ID_GO_MENU_NEXT, can_go_next)
self.go_menu.Enable(ID_GO_MENU_UP, can_go_up)
self.go_menu.Enable(ID_GO_MENU_TOP, can_go_top)
self.toolbar.EnableTool(ID_GO_MENU_BACK, can_go_back)
self.toolbar.EnableTool(ID_GO_MENU_NEXT, can_go_next)
self.toolbar.EnableTool(ID_GO_MENU_UP, can_go_up)
self.toolbar.EnableTool(ID_GO_MENU_TOP, can_go_top)

icon_view_allowed = len(self.node) <= 1000
self.view_menu.Enable(ID_VIEW_MENU_ICON, icon_view_allowed)
Expand Down
Binary file added compass_viewer/icons/go-top_24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added compass_viewer/icons/go-top_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions compass_viewer/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -8400,6 +8400,58 @@ def go_up_32():
"qfo2JjIP2JKadcLnXKrkU5kQHoahnzC7m6Hy5j2Vm2ILuUqLDUDeSKcUPjiXfvKdwngP5ofwCZp"
"Zc/KoDT3AAAAABJRU5ErkJggg==")

def go_top_24():
return base64.b64decode("iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAA"
"ABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3wkdExQPIK4+hA"
"AAA9NJREFUSMetlk1oXFUYht/zd++dTGba/EynTad1JiZNiMkkmthWSGup2E2kCyVQwUhFGhVBV"
"5booosuRHSpGKKWYgWtgUYDgoVuil34AwGRbCox2kgzKW0yycy983PvPedzURCJPxnTfPDuvvc8"
"vN934ByGGqp/dEIVi9Gz9++OvMSI2Nxi5f1YzDsz88ELwUZeWQtgOVc5e3QgNpZqcUBE2L09HLv"
"yfYUAvLGRl9cCUCZ/yq+6KHoGRc/ALeYR4YXRWrw1AVYWf9Pzv5fA7SRUXQsWb/tYzt0ItwxQLd"
"ycupObB+cSAEdu4ReU8gtTtXhZLU1oa7MtN/qhbTlPAEDVr3zl13unMDdXxVZW6/DEto7j52L/x"
"8NrbUweeyfannRm05m62dTwZGTLATvi+OSZ4YdTI0/27t0Z88/V6hO1NO189PRzJ47vH2tJJcGl"
"RNwKe3L1j/+8MvvF7D0nSBx4pf1g9r7xtn0plFwPnuuitTWB3rR9vmPkQubeAEeOyGRz5MvBwW7"
"bLXpwXQ+eW0KxUMIjD+2yYw6m+0cn1KYBzYX0m0cP93VV/RBusQS3WL4rt4RKxcehrnhPoRA9s6"
"kdNHWdeKx/oHO8rSPDiAhEgDYGxhgYbRDqEJYlEFRKh1h6+Nry7KVfa06wrWeoIZHc/lm27wEeB"
"AZhSAg0QRsg1ECgCUFI8H2NznQ9izvBxc5nP26qGSAROX9w8ECCiEMbBm04jBEwRoBIgEjCGIZQ"
"A6EmZDMiocveRYDYhiOKtQ09n32w+3TLnhQYF+BCgnMJxgQYFwDjIAIMMWhtEIYGIII0Xqve9V0"
"hf/3yt/+aIJY+1tmcaHgv074PWnMYEiAogFngwgb7UxbAFMAUCBKhZtjRGENz1H+r9al3B/4Z0N"
"+vSOnPO7r7nDBkMOAABBhTYEKBcwkhFIRQ4PyuwBSksBCrr4NjWdibjKrQXZ3MjlyI/u1Fc245r"
"7e0t2chLVR8A2EBUnFIElBGAFKBcQGCgSCBEAxEBmteCTcX76CwmkehkIcpu5niavRtAC//JcER"
"CcZf88nB0q0ibq+UsLJWxZpn4JY1ygFDoAWMUTDGRjXkKPsEt6xRCQBl2VC2DaUsSMFgwurQugR"
"XDdjhS0vzM6mlOa0AkgxakQ7TQ0+/mmjq6kW0LgLHsUEEVKpVGCLcmPsJV6Y+WhWRxpyy4wFz4o"
"GKNAQS7NP1IzKVhW9Orr9Rzp7940LwF6WUsCwL0bo6EAjGGCgpILmCdBqnV69/fXJTvwrO1I/XL"
"k/SD1enGWcA5wxgDEQAEUM10CSsyMx/nfEH0Vqah5dE7QIAAAAASUVORK5CYII=")

def go_top_32():
return base64.b64decode("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")

def logo():
return base64.b64decode(
"iVBORw0KGgoAAAANSUhEUgAAAigAAADjCAYAAACvve/bAAAAAXNSR0IArs4c6QAAAAlwSFlzAAA"
Expand Down

0 comments on commit 6d80cf2

Please sign in to comment.