July 2011 - tor-commits - lists.torproject.org

[arm/release] Added drop-down second level menus.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit fbd07955c5376457a5a9ecc4e778dd4a9f97deb9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon May 30 01:33:22 2011 +0500 Added drop-down second level menus. Second level menus can now be brought down using the arrow key. Popup init is modified to support top and left gaps, setLeft() is added to Panel for left padding. Constructor arguments for Panel are left unchanged so that existing panel-using code isn't broken. --- src/cli/menu.py | 154 +++++++++++++++++++++++++++++++++++++++++++++++++---- src/cli/popups.py | 9 +++- src/util/panel.py | 18 ++++++- 3 files changed, 168 insertions(+), 13 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 71b56a4..69538e0 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,19 +8,40 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL = 0 +TOPLEVEL, SECONDLEVEL = range(2) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" def __init__(self, item=None): DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( - menuItem.MenuItem(label="File" , callback=self._callbackDefault), - menuItem.MenuItem(label="Logs" , callback=self._callbackDefault), - menuItem.MenuItem(label="View" , callback=self._callbackDefault), - menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), - menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), - menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault))) + menuItem.MenuItem(label="File" , children=( + menuItem.MenuItem(label="Exit" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Logs" , children=( + menuItem.MenuItem(label="Events" , callback=self._callbackDefault), + menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), + menuItem.MenuItem(label="Save" , callback=self._callbackDefault), + menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), + menuItem.MenuItem(label="Duplicates" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="View" , children=( + menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), + menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Graph" , children=( + menuItem.MenuItem(label="Stats" , callback=self._callbackDefault), + menuItem.MenuItem(label="Size" , callback=self._callbackDefault), + menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), + menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Connections" , children=( + menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Configuration" , children=( + menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), + menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) + )) self._first = [0] self._selection = [0] @@ -51,6 +72,10 @@ class Menu(): elif key == curses.KEY_LEFT: if len(self._selection) == 1: self._moveTopLevelLeft(width) + elif key == curses.KEY_DOWN: + if len(self._selection) == 1: + self._dropSecondLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -58,17 +83,42 @@ class Menu(): finally: popups.finalize() - def _calculateTopLevelWidths(self, width): + def _getCurrentTopLevelItem(self): + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + return self._rootItem.getChildren()[index] + + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] # width per label is set according to the longest label labelwidth = max(map(len, labels)) + 2 - # total number of labels that can be printed in current width + # total number of labels that can be printed in supplied width printable = min(width / labelwidth - 1, self._rootItem.getChildrenCount()) return (labelwidth, printable) + def _calculateSecondLevelWidths(self): + parent = self._getCurrentTopLevelItem() + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateSecondLevelHeights(self, height=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentTopLevelItem() + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -90,7 +140,7 @@ class Menu(): self._selection[TOPLEVEL] = self._selection[TOPLEVEL] - 1 else: if self._first[TOPLEVEL] == 0: - self._first[TOPLEVEL] = (self._rootItem.getChildrenCount() / printable) * printable + self._first[TOPLEVEL] = ((self._rootItem.getChildrenCount() / printable) * printable) % self._rootItem.getChildrenCount() else: self._first[TOPLEVEL] = abs(self._first[TOPLEVEL] - printable) % self._rootItem.getChildrenCount() self._selection[TOPLEVEL] = self._rootItem.getChildrenCount() - self._first[TOPLEVEL] - 1 @@ -115,6 +165,90 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 + def _dropSecondLevel(self): + self._first.append(0) + self._selection.append(0) + + labelwidth = self._calculateSecondLevelWidths() + printable = self._calculateSecondLevelHeights() + + toplabelwidth, _ = self._calculateTopLevelWidths() + left = (toplabelwidth + 2) * self._selection[TOPLEVEL] + + popup, width, height = popups.init(height=printable+2, width=labelwidth+2, top=2, left=left) + + if popup.win: + try: + while True: + popup.win.erase() + popup.win.box() + + self._drawSecondLevel(popup, width, height) + + popup.win.refresh() + + control = cli.controller.getController() + key = control.getScreen().getch() + + if key == curses.KEY_DOWN: + self._moveSecondLevelDown(height) + elif key == curses.KEY_UP: + self._moveSecondLevelUp(height) + elif uiTools.isSelectionKey(key): + self._handleEvent() + self._first.pop() + self._selection.pop() + break + + finally: + popups.finalize() + + def _drawSecondLevel(self, popup, width, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] + + toplabelwidth, _ = self._calculateTopLevelWidths(width) + + top = 1 + left = 1 + for (index, item) in enumerate(children): + labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + + popup.addstr(top, left, item.getLabel(), labelformat) + top = top + 1 + + def _moveSecondLevelDown(self, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + + if self._selection[SECONDLEVEL] < printable - 1: + self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + else: + self._selection[SECONDLEVEL] = 0 + if printable < parent.getChildrenCount(): + self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + + if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): + self._first[SECONDLEVEL] = 0 + self._selection[SECONDLEVEL] = 0 + + def _moveSecondLevelUp(self, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + + if self._selection[SECONDLEVEL] > 0: + self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + else: + if self._first[SECONDLEVEL] == 0: + self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + else: + self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() + self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + + if self._selection[SECONDLEVEL] > printable: + self._selection[SECONDLEVEL] = printable - 1 + def _handleEvent(self): item = self._rootItem sums = [sum(values) for values in zip(self._first, self._selection)] diff --git a/src/cli/popups.py b/src/cli/popups.py index 7ed5302..b3eb105 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -8,7 +8,7 @@ import cli.controller from util import panel, uiTools -def init(height = -1, width = -1): +def init(height = -1, width = -1, top = -1, left = -1): """ Preparation for displaying a popup. This creates a popup with a valid subwindow instance. If that's successful then the curses lock is acquired @@ -23,8 +23,15 @@ def init(height = -1, width = -1): control = cli.controller.getController() topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + leftSize = 0 + + if top != -1: + topSize = topSize + top + if left != -1: + leftSize = left popup = panel.Panel(control.getScreen(), "popup", topSize, height, width) + popup.setLeft(leftSize) popup.setVisible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then diff --git a/src/util/panel.py b/src/util/panel.py index a104a07..4fc2158 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -74,6 +74,7 @@ class Panel(): self.pauseTime = -1 self.top = top + self.left = 0 self.height = height self.width = width @@ -261,6 +262,18 @@ class Panel(): """ return self.height + + def setLeft(self, left): + """ + Changes the position where subwindows are placed within its parent. + + Arguments: + top - positioning of top within parent + """ + + if self.left != left: + self.left = left + self.win = None def setHeight(self, height): """ @@ -303,6 +316,7 @@ class Panel(): newHeight, newWidth = self.parent.getmaxyx() setHeight, setWidth = self.getHeight(), self.getWidth() newHeight = max(0, newHeight - self.top) + newWidth = max(0, newWidth - self.left) if setHeight != -1: newHeight = min(newHeight, setHeight) if setWidth != -1: newWidth = min(newWidth, setWidth) return (newHeight, newWidth) @@ -569,7 +583,7 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] - inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, x) + inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText) @@ -682,7 +696,7 @@ class Panel(): # would mean far more complicated code and no more selective refreshing) if recreate: - self.win = self.parent.subwin(newHeight, newWidth, self.top, 0) + self.win = self.parent.subwin(newHeight, newWidth, self.top, self.left) # note: doing this log before setting win produces an infinite loop msg = "recreating panel '%s' with the dimensions of %i/%i" % (self.getName(), newHeight, newWidth)

1 0

[arm/release] Replaced namedtuples with MenuItem instances, fixed left arrow key on
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit cf4ae8454debdf8a9ace9a4f4cc3e4536152d1dd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun May 29 15:32:34 2011 +0500 Replaced namedtuples with MenuItem instances, fixed left arrow key on top level menu. The MenuItem class is added replacing LeafEntry and ParentEntry namedtuples. Replaced "entry" with "item" and defined the constant TOPLEVEL to improve readability. The scrolling calculations in _moveTopLevelLeft contained a bug, menus with large number of top items did not scroll to the end. Fixed by adding a check to see if we're "spilling" to left of first entry. --- src/cli/menu.py | 98 +++++++++++++++++++++++++------------------------- src/util/menuItem.py | 34 +++++++++++++++++ 2 files changed, 83 insertions(+), 49 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index bedb98e..71b56a4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -3,34 +3,32 @@ A drop-down menu for sending actions to panels. """ import curses -from collections import namedtuple import cli.controller import popups -from util import log, panel, uiTools +from util import log, panel, uiTools, menuItem -LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) -ParentEntry = namedtuple('ParentEntry', ['title', 'children']) +TOPLEVEL = 0 class Menu(): """Displays a popup menu and sends keys to appropriate panels""" - def __init__(self, entry=None): - DEFAULT_ROOT = ParentEntry(title="Root", children=( - LeafEntry(title="File" , callback=self._callbackDefault), - LeafEntry(title="Logs" , callback=self._callbackDefault), - LeafEntry(title="View" , callback=self._callbackDefault), - LeafEntry(title="Graph" , callback=self._callbackDefault), - LeafEntry(title="Connections" , callback=self._callbackDefault), - LeafEntry(title="Configuration" , callback=self._callbackDefault))) + def __init__(self, item=None): + DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( + menuItem.MenuItem(label="File" , callback=self._callbackDefault), + menuItem.MenuItem(label="Logs" , callback=self._callbackDefault), + menuItem.MenuItem(label="View" , callback=self._callbackDefault), + menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault))) self._first = [0] self._selection = [0] - if entry and isinstance(entry, ParentEntry): - self._rootEntry = entry + if item and item.isParent(): + self._rootItem = item else: - self._rootEntry = DEFAULT_ROOT + self._rootItem = DEFAULT_ROOT def showMenu(self): popup, width, height = popups.init(height=3) @@ -61,73 +59,75 @@ class Menu(): popups.finalize() def _calculateTopLevelWidths(self, width): - titles = [menuItem.title for menuItem in self._rootEntry.children] + labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] - # width per title is set according to the longest title - titlewidth = max(map(len, titles)) + 2 + # width per label is set according to the longest label + labelwidth = max(map(len, labels)) + 2 - # total number of titles that can be printed in current width - printable = min(width / titlewidth - 1, len(self._rootEntry.children)) + # total number of labels that can be printed in current width + printable = min(width / labelwidth - 1, self._rootItem.getChildrenCount()) - return (titlewidth, printable) + return (labelwidth, printable) def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] < printable - 1: - self._selection[0] = self._selection[0] + 1 + if self._selection[TOPLEVEL] < printable - 1: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] + 1 else: - self._selection[0] = 0 - if printable < len(self._rootEntry.children): - self._first[0] = (self._first[0] + printable) % len(self._rootEntry.children) + self._selection[TOPLEVEL] = 0 + if printable < self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = (self._first[TOPLEVEL] + printable) % self._rootItem.getChildrenCount() - if self._first[0] + self._selection[0] == len(self._rootEntry.children): - self._first[0] = 0 - self._selection[0] = 0 + if self._first[TOPLEVEL] + self._selection[TOPLEVEL] == self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = 0 + self._selection[TOPLEVEL] = 0 def _moveTopLevelLeft(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] > 0: - self._selection[0] = self._selection[0] - 1 + if self._selection[TOPLEVEL] > 0: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] - 1 else: - self._first[0] = abs(self._first[0] - printable) % len(self._rootEntry.children) - self._selection[0] = len(self._rootEntry.children) - self._first[0] - 1 + if self._first[TOPLEVEL] == 0: + self._first[TOPLEVEL] = (self._rootItem.getChildrenCount() / printable) * printable + else: + self._first[TOPLEVEL] = abs(self._first[TOPLEVEL] - printable) % self._rootItem.getChildrenCount() + self._selection[TOPLEVEL] = self._rootItem.getChildrenCount() - self._first[TOPLEVEL] - 1 - if self._selection[0] > printable: - self._selection[0] = printable - 1 + if self._selection[TOPLEVEL] > printable: + self._selection[TOPLEVEL] = printable - 1 def _drawTopLevel(self, popup, width, height): - titlewidth, printable = self._calculateTopLevelWidths(width) - children = self._rootEntry.children[self._first[0]:self._first[0] + printable] + labelwidth, printable = self._calculateTopLevelWidths(width) + children = self._rootItem.getChildren()[self._first[TOPLEVEL]:self._first[TOPLEVEL] + printable] top = 1 left = 1 - for (index, entry) in enumerate(children): - titleformat = curses.A_STANDOUT if index == self._selection[0] else curses.A_NORMAL + for (index, item) in enumerate(children): + labelformat = curses.A_STANDOUT if index == self._selection[TOPLEVEL] else curses.A_NORMAL popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - popup.addstr(top, left, entry.title.center(titlewidth), titleformat) - left = left + titlewidth + popup.addstr(top, left, item.getLabel().center(labelwidth), labelformat) + left = left + labelwidth popup.addch(top, left, curses.ACS_VLINE) left = left + 1 def _handleEvent(self): - entry = self._rootEntry + item = self._rootItem sums = [sum(values) for values in zip(self._first, self._selection)] for index in sums: - if isinstance(entry, ParentEntry): - entry = entry.children[index] + if item.isParent(): + item = item.getChildren()[index] else: break - log.log(log.ERR, "first: %d" % self._first[0]) - if isinstance(entry, LeafEntry): - entry.callback(entry) + if item.isLeaf(): + item.select() - def _callbackDefault(self, entry): - log.log(log.NOTICE, "%s selected" % entry.title) + def _callbackDefault(self, item): + log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py new file mode 100644 index 0000000..4800a0f --- /dev/null +++ b/src/util/menuItem.py @@ -0,0 +1,34 @@ +""" +Menu Item class, used by the drop-down menus +""" + +class MenuItem(): + """Contains title, callback handler and possible children""" + + def __init__(self, label=None, callback=None, children=[], parent=None): + self._label = label + self._callback = callback + self._children = children + self._parent = parent + + def getLabel(self): + return self._label + + def isLeaf(self): + return self._children == [] + + def isParent(self): + return self._children != [] + + def getChildren(self): + return self._children + + def getParent(self): + return self._parent + + def getChildrenCount(self): + return len(self._children) + + def select(self): + self._callback(self) +

1 0

[arm/release] Support long top menus on smaller screens, code review fixes.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit fd920dfd4fc88d14b7e569b2513b449cc63cae99 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat May 28 18:29:15 2011 +0500 Support long top menus on smaller screens, code review fixes. The top-menu now displays "remaining" entries when right/left arrow keys are pressed enough times on shorter screens. Menus are no longer persistence and therefore are removed from Controller's init. Code review fixes: * Menu.draw() is renamed to Menu.showMenu(). * Overzealous map()s are replaced in favor of list comprehensions. * Popups are drawn through popup.add*() methods instead of drawing to windows directly. --- src/cli/controller.py | 12 ++----- src/cli/menu.py | 78 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c506302..25c3051 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -81,7 +81,7 @@ def initController(stdscr, startTime): menu = cli.menu.Menu() # initializes the controller - ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels, menu) + ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") @@ -135,7 +135,7 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr, stickyPanels, pagePanels, menu): + def __init__(self, stdscr, stickyPanels, pagePanels): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. @@ -150,7 +150,6 @@ class Controller: self._screen = stdscr self._stickyPanels = stickyPanels self._pagePanels = pagePanels - self._menu = menu self._page = 0 self._isPaused = False self._forceRedraw = False @@ -188,9 +187,6 @@ class Controller: self._forceRedraw = True self.setMsg() - def getMenu(self): - return self._menu - def isPaused(self): """ True if the interface is paused, false otherwise. @@ -517,8 +513,8 @@ def drawTorMonitor(stdscr, startTime): elif key == ord('p') or key == ord('P'): control.setPaused(not control.isPaused()) elif key == ord('m') or key == ord('M'): - menu = control.getMenu() - menu.draw() + menu = cli.menu.Menu() + menu.showMenu() elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py index 0395abb..bedb98e 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -4,7 +4,6 @@ A drop-down menu for sending actions to panels. import curses from collections import namedtuple -from operator import attrgetter import cli.controller import popups @@ -25,16 +24,22 @@ class Menu(): LeafEntry(title="Connections" , callback=self._callbackDefault), LeafEntry(title="Configuration" , callback=self._callbackDefault))) + self._first = [0] self._selection = [0] - self._rootEntry = (entry and isinstance(entry, ParentEntry)) and entry or DEFAULT_ROOT - def draw(self): + if entry and isinstance(entry, ParentEntry): + self._rootEntry = entry + else: + self._rootEntry = DEFAULT_ROOT + + def showMenu(self): popup, width, height = popups.init(height=3) if popup: try: - popup.win.box() - while True: + popup.win.erase() + popup.win.box() + self._drawTopLevel(popup, width, height) popup.win.refresh() @@ -44,12 +49,10 @@ class Menu(): if key == curses.KEY_RIGHT: if len(self._selection) == 1: - # selection is on top menu - self._selection[0] = (self._selection[0] + 1) % len(self._rootEntry.children) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: if len(self._selection) == 1: - # selection is on top menu - self._selection[0] = (self._selection[0] - 1) % len(self._rootEntry.children) + self._moveTopLevelLeft(width) elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -57,40 +60,71 @@ class Menu(): finally: popups.finalize() - def _drawTopLevel(self, popup, width, height): - titles = map(attrgetter('title'), self._rootEntry.children) + def _calculateTopLevelWidths(self, width): + titles = [menuItem.title for menuItem in self._rootEntry.children] # width per title is set according to the longest title - titlewidth = max(map(lambda title: len(title), titles)) + 2 + titlewidth = max(map(len, titles)) + 2 # total number of titles that can be printed in current width - printable = width / titlewidth - 1 + printable = min(width / titlewidth - 1, len(self._rootEntry.children)) + + return (titlewidth, printable) + + def _moveTopLevelRight(self, width): + _, printable = self._calculateTopLevelWidths(width) + + if self._selection[0] < printable - 1: + self._selection[0] = self._selection[0] + 1 + else: + self._selection[0] = 0 + if printable < len(self._rootEntry.children): + self._first[0] = (self._first[0] + printable) % len(self._rootEntry.children) + + if self._first[0] + self._selection[0] == len(self._rootEntry.children): + self._first[0] = 0 + self._selection[0] = 0 + + def _moveTopLevelLeft(self, width): + _, printable = self._calculateTopLevelWidths(width) + + if self._selection[0] > 0: + self._selection[0] = self._selection[0] - 1 + else: + self._first[0] = abs(self._first[0] - printable) % len(self._rootEntry.children) + self._selection[0] = len(self._rootEntry.children) - self._first[0] - 1 + + if self._selection[0] > printable: + self._selection[0] = printable - 1 + + def _drawTopLevel(self, popup, width, height): + titlewidth, printable = self._calculateTopLevelWidths(width) + children = self._rootEntry.children[self._first[0]:self._first[0] + printable] top = 1 left = 1 - for (index, entry) in enumerate(self._rootEntry.children[:printable]): - titleformat = curses.A_NORMAL - - if index == self._selection[0]: - titleformat = curses.A_STANDOUT + for (index, entry) in enumerate(children): + titleformat = curses.A_STANDOUT if index == self._selection[0] else curses.A_NORMAL - popup.win.addch(top, left, curses.ACS_VLINE) + popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - popup.win.addstr(top, left, entry.title.center(titlewidth), titleformat) + popup.addstr(top, left, entry.title.center(titlewidth), titleformat) left = left + titlewidth - popup.win.addch(top, left, curses.ACS_VLINE) + popup.addch(top, left, curses.ACS_VLINE) left = left + 1 def _handleEvent(self): entry = self._rootEntry + sums = [sum(values) for values in zip(self._first, self._selection)] - for index in self._selection: + for index in sums: if isinstance(entry, ParentEntry): entry = entry.children[index] else: break + log.log(log.ERR, "first: %d" % self._first[0]) if isinstance(entry, LeafEntry): entry.callback(entry)

1 0

[arm/release] fix: Remove calculateSecondLevel*() methods.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit f7375855453621fed4919021853bdab5ec017fd6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:38:07 2011 +0500 fix: Remove calculateSecondLevel*() methods. --- src/cli/menu.py | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 8ce97c4..5a51797 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -148,27 +148,6 @@ class Menu(): return (labelwidth, printable) - def _calculateSecondLevelWidths(self): - parent = self._getCurrentTopLevelItem() - - labels = [menuItem.getLabel() for menuItem in parent.getChildren()] - - labelwidth = max(map(len, labels)) - - return labelwidth - - def _calculateSecondLevelHeights(self, height=0): - control = cli.controller.getController() - height, _ = control.getScreen().getmaxyx() - topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) - height = height - topSize - - parent = self._getCurrentTopLevelItem() - - printable = min(height - 4, parent.getChildrenCount()) - - return printable if printable else parent.getChildrenCount() - def _calculateNLevelWidths(self, level=0): parent = self._getCurrentItem(level) @@ -317,7 +296,7 @@ class Menu(): self._selection[PARENTLEVEL] = 0 def _moveNLevelUp(self, height): - printable = self._calculateSecondLevelHeights() + printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL) if self._selection[PARENTLEVEL] > 0:

1 0

[arm/release] fix: var misspelling crashed descriptor popup
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 823630f38f2cdc616dcd9907ff9be75584366126 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:27:25 2011 -0700 fix: var misspelling crashed descriptor popup --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/release] fix: installation wasn't adding uninstall script
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8b8b4230ce305d8aadc4eebc36b4bd9506bd096f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:02:37 2011 -0700 fix: installation wasn't adding uninstall script The uninstall wasn't among the set of non-python resources copied into /usr/share/arm during installation. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index cb0069f..cdda907 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], + ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])], ) # Cleans up the temporary compressed man page.

1 0

[arm/release] fix: updating bandwidth graph on shutdown
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3cfa3533d3ce1e2ac24b382bc310710c5e02ee00 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 08:22:43 2011 -0700 fix: updating bandwidth graph on shutdown If we have accounting and shut down Tor the accounting section should say "Connection Closed...". However, this wasn't happening unless we forced a redraw, such as by changing pages. This change makes the bandwidthStats initiate a redraw itself on controller status changes. --- src/cli/graphing/bandwidthStats.py | 4 ++++ src/cli/graphing/graphPanel.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index d378c45..4e033f6 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -87,6 +87,10 @@ class BandwidthStats(graphPanel.GraphStats): if eventType == torTools.State.INIT and self._config["features.graph.bw.accounting.show"]: self.isAccounting = conn.getInfo('accounting/enabled') == '1' + + # redraws to reflect changes (this especially noticeable when we have + # accounting and shut down since it then gives notice of the shutdown) + if self._graphPanel and self.isSelected: self._graphPanel.redraw(True) def prepopulateFromState(self): """ diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index b48f82b..5fa1262 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -221,7 +221,7 @@ class GraphStats(TorCtl.PostEventListener): self.secondaryCounts[i].insert(0, 0) del self.secondaryCounts[i][self.maxCol + 1:] - if isRedraw: self._graphPanel.redraw(True) + if isRedraw and self._graphPanel: self._graphPanel.redraw(True) class GraphPanel(panel.Panel): """

1 0

[arm/release] Fixed typo.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8b4dc162f75d5129e41f028c7253b7b265c8af76 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:00:20 2011 +0500 Fixed typo. --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/release] Initial commit for the menu code. Currently displays a top-bar in a
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 5fd9b5f74a86eb7e641366ae1c0a1a47404cf873 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:01:25 2011 +0500 Initial commit for the menu code. Currently displays a top-bar in a popup and dispatches the menu entry to the callback function, which shall later on be used to determine the panel/key combination for taking specified action. --- src/cli/controller.py | 18 +++++++- src/cli/menu.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e94f7f6..c506302 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -17,6 +17,7 @@ import cli.graphing.bandwidthStats import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel +import cli.menu from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools @@ -76,8 +77,11 @@ def initController(stdscr, startTime): # fourth page: torrc pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + # top menu + menu = cli.menu.Menu() + # initializes the controller - ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) + ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels, menu) # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") @@ -131,7 +135,7 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr, stickyPanels, pagePanels): + def __init__(self, stdscr, stickyPanels, pagePanels, menu): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. @@ -140,11 +144,13 @@ class Controller: stdscr - curses window stickyPanels - panels shown at the top of each page pagePanels - list of pages, each being a list of the panels on it + menu - popup drop-down menu """ self._screen = stdscr self._stickyPanels = stickyPanels self._pagePanels = pagePanels + self._menu = menu self._page = 0 self._isPaused = False self._forceRedraw = False @@ -182,6 +188,9 @@ class Controller: self._forceRedraw = True self.setMsg() + def getMenu(self): + return self._menu + def isPaused(self): """ True if the interface is paused, false otherwise. @@ -299,7 +308,7 @@ class Controller: if attr == None: if not self._isPaused: - msg = "page %i / %i - q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) + msg = "page %i / %i - m: menu, q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) attr = curses.A_NORMAL else: msg = "Paused" @@ -507,6 +516,9 @@ def drawTorMonitor(stdscr, startTime): control.prevPage() elif key == ord('p') or key == ord('P'): control.setPaused(not control.isPaused()) + elif key == ord('m') or key == ord('M'): + menu = control.getMenu() + menu.draw() elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py new file mode 100644 index 0000000..315d349 --- /dev/null +++ b/src/cli/menu.py @@ -0,0 +1,99 @@ +""" +A drop-down menu for sending actions to panels. +""" + +import curses +from collections import namedtuple +from operator import attrgetter + +import cli.controller +import popups +from util import log, panel, uiTools + +LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) +ParentEntry = namedtuple('ParentEntry', ['title', 'children']) + +class Menu(): + """Displays a popup menu and sends keys to appropriate panels""" + + def __init__(self, entry=None): + DEFAULT_ROOT = ParentEntry(title="Root", children=( + LeafEntry(title="File" , callback=self._callbackDefault), + LeafEntry(title="Logs" , callback=self._callbackDefault), + LeafEntry(title="View" , callback=self._callbackDefault), + LeafEntry(title="Graph" , callback=self._callbackDefault), + LeafEntry(title="Connections" , callback=self._callbackDefault), + LeafEntry(title="Configuration" , callback=self._callbackDefault))) + + self._selection = [0] + self._rootEntry = (entry and isinstance(entry, ParentEntry)) and entry or DEFAULT_ROOT + + def draw(self): + popup, width, height = popups.init(height=3) + if popup: + try: + popup.win.box() + + while True: + self._drawTopLevel(popup, width, height) + + popup.win.refresh() + + control = cli.controller.getController() + key = control.getScreen().getch() + + if key == curses.KEY_RIGHT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] + 1) % len(self._rootEntry.children) + elif key == curses.KEY_LEFT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] - 1) % len(self._rootEntry.children) + elif uiTools.isSelectionKey(key): + self._handleEvent() + break + + finally: + popups.finalize() + + def _drawTopLevel(self, popup, width, height): + titles = map(attrgetter('title'), self._rootEntry.children) + + # width per title is set according to the longest title + titlewidth = max(map(lambda title: len(title), titles)) + 2 + + # total number of titles that can be printed in current width + printable = (width - 2) / titlewidth + + top = 1 + left = 1 + for (index, entry) in enumerate(self._rootEntry.children[:printable]): + titleformat = curses.A_NORMAL + + if index == self._selection[0]: + titleformat = curses.A_STANDOUT + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + popup.win.addstr(top, left, entry.title.center(titlewidth), titleformat) + left = left + titlewidth + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + + def _handleEvent(self): + entry = self._rootEntry + + for index in self._selection: + if isinstance(entry, ParentEntry): + entry = entry.children[index] + else: + break + + if isinstance(entry, LeafEntry): + entry.callback(entry) + + def _callbackDefault(self, entry): + log.log(log.NOTICE, "%s selected" % entry.title) +

1 0

[arm/release] Added support for multiple menu levels.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 46a1023c71f395c62a37a30c13e14db7b851640a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:31:23 2011 +0500 Added support for multiple menu levels. Once the menus have "dropped-down", handling of subsequent "levels" followed the same logical steps. Therefore *SecondLevel() methods have been replaced by *NLevel() equivalents. If a parent item is selected using any of the selection keys, its children are brought up instead of doing nothing. --- src/cli/menu.py | 192 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 6 +-- 2 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 69538e0..8ce97c4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,7 +8,7 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL, SECONDLEVEL = range(2) +PARENTLEVEL, TOPLEVEL = (-1, 0) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" @@ -22,23 +22,61 @@ class Menu(): menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), menuItem.MenuItem(label="Save" , callback=self._callbackDefault), menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), - menuItem.MenuItem(label="Duplicates" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Duplicates" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault),)) + )), menuItem.MenuItem(label="View" , children=( menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Graph" , children=( - menuItem.MenuItem(label="Stats" , callback=self._callbackDefault), - menuItem.MenuItem(label="Size" , callback=self._callbackDefault), - menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), - menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Stats" , children=( + menuItem.MenuItem(label="Bandwidth" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resources" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Size" , children=( + menuItem.MenuItem(label="Increase" , callback=self._callbackDefault), + menuItem.MenuItem(label="Decrease" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Update Interval" , children=( + menuItem.MenuItem(label="Each second" , callback=self._callbackDefault), + menuItem.MenuItem(label="5 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="1 minute" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 minutes" , callback=self._callbackDefault), + menuItem.MenuItem(label="Hourly" , callback=self._callbackDefault), + menuItem.MenuItem(label="Daily" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Bounds" , children=( + menuItem.MenuItem(label="Local Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Global Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Tight" , callback=self._callbackDefault), + )),)), menuItem.MenuItem(label="Connections" , children=( - menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Identity" , children=( + menuItem.MenuItem(label="IP" , callback=self._callbackDefault), + menuItem.MenuItem(label="Fingerprints" , callback=self._callbackDefault), + menuItem.MenuItem(label="Nicknames" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Resolver" , children=( + menuItem.MenuItem(label="auto" , callback=self._callbackDefault), + menuItem.MenuItem(label="proc" , callback=self._callbackDefault), + menuItem.MenuItem(label="netstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="ss" , callback=self._callbackDefault), + menuItem.MenuItem(label="lsof" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat (bsd)" , callback=self._callbackDefault), + menuItem.MenuItem(label="procstat (bsd)" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Configuration" , children=( - menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) )) @@ -67,15 +105,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_RIGHT: - if len(self._selection) == 1: - self._moveTopLevelRight(width) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: - if len(self._selection) == 1: - self._moveTopLevelLeft(width) + self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - if len(self._selection) == 1: - self._dropSecondLevel() - break + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -87,6 +122,21 @@ class Menu(): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] + def _getCurrentItem(self, level=0): + item = self._rootItem + if level == 0: + sums = [sum(values) for values in zip(self._first, self._selection)] + else: + sums = [sum(values) for values in zip(self._first[:level], self._selection[:level])] + + for index in sums: + if item.isParent(): + item = item.getChildren()[index] + else: + break + + return item + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] @@ -119,6 +169,33 @@ class Menu(): return printable if printable else parent.getChildrenCount() + def _calculateNLevelWidths(self, level=0): + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateNLevelHeights(self, height=0, level=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -165,12 +242,17 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _dropSecondLevel(self): + def _showNLevel(self): self._first.append(0) self._selection.append(0) - labelwidth = self._calculateSecondLevelWidths() - printable = self._calculateSecondLevelHeights() + parent = self._getCurrentItem(level=PARENTLEVEL) + + if parent.isLeaf(): + return + + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) + printable = self._calculateNLevelHeights(level=PARENTLEVEL) toplabelwidth, _ = self._calculateTopLevelWidths() left = (toplabelwidth + 2) * self._selection[TOPLEVEL] @@ -183,7 +265,7 @@ class Menu(): popup.win.erase() popup.win.box() - self._drawSecondLevel(popup, width, height) + self._drawNLevel(popup, width, height) popup.win.refresh() @@ -191,9 +273,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_DOWN: - self._moveSecondLevelDown(height) + self._moveNLevelDown(height) elif key == curses.KEY_UP: - self._moveSecondLevelUp(height) + self._moveNLevelUp(height) + elif key == curses.KEY_RIGHT: + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -203,64 +288,57 @@ class Menu(): finally: popups.finalize() - def _drawSecondLevel(self, popup, width, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() - children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] - - toplabelwidth, _ = self._calculateTopLevelWidths(width) + def _drawNLevel(self, popup, width, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) + children = parent.getChildren()[self._first[PARENTLEVEL]:self._first[PARENTLEVEL] + printable] top = 1 left = 1 for (index, item) in enumerate(children): - labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 - def _moveSecondLevelDown(self, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + def _moveNLevelDown(self, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] < printable - 1: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + if self._selection[PARENTLEVEL] < printable - 1: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] + 1 else: - self._selection[SECONDLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 if printable < parent.getChildrenCount(): - self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + self._first[PARENTLEVEL] = (self._first[PARENTLEVEL] + printable) % parent.getChildrenCount() - if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): - self._first[SECONDLEVEL] = 0 - self._selection[SECONDLEVEL] = 0 + if self._first[PARENTLEVEL] + self._selection[PARENTLEVEL] == parent.getChildrenCount(): + self._first[PARENTLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 - def _moveSecondLevelUp(self, height): + def _moveNLevelUp(self, height): printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] > 0: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + if self._selection[PARENTLEVEL] > 0: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] - 1 else: - if self._first[SECONDLEVEL] == 0: - self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + if self._first[PARENTLEVEL] == 0: + self._first[PARENTLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() else: - self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() - self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + self._first[PARENTLEVEL] = abs(self._first[PARENTLEVEL] - printable) % parent.getChildrenCount() + self._selection[PARENTLEVEL] = parent.getChildrenCount() - self._first[PARENTLEVEL] - 1 - if self._selection[SECONDLEVEL] > printable: - self._selection[SECONDLEVEL] = printable - 1 + if self._selection[PARENTLEVEL] > printable: + self._selection[PARENTLEVEL] = printable - 1 def _handleEvent(self): - item = self._rootItem - sums = [sum(values) for values in zip(self._first, self._selection)] - - for index in sums: - if item.isParent(): - item = item.getChildren()[index] - else: - break + item = self._getCurrentItem() if item.isLeaf(): item.select() + else: + self._showNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 4800a0f..3dbf922 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,11 +5,10 @@ Menu Item class, used by the drop-down menus class MenuItem(): """Contains title, callback handler and possible children""" - def __init__(self, label=None, callback=None, children=[], parent=None): + def __init__(self, label=None, callback=None, children=[]): self._label = label self._callback = callback self._children = children - self._parent = parent def getLabel(self): return self._label @@ -23,9 +22,6 @@ class MenuItem(): def getChildren(self): return self._children - def getParent(self): - return self._parent - def getChildrenCount(self): return len(self._children)

1 0