From 905d61a62dfe6a3c274938f7b51e431899770279 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 1 Dec 2021 18:41:03 +0000 Subject: [PATCH] menus: Drop support for dividers Signed-off-by: Michael Tremer --- src/westferry/handlers/analytics.py | 7 ------- src/westferry/handlers/demo.py | 1 - src/westferry/ui/menu.py | 13 ------------- 3 files changed, 21 deletions(-) diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py index f4e944c..5afd429 100644 --- a/src/westferry/handlers/analytics.py +++ b/src/westferry/handlers/analytics.py @@ -38,7 +38,6 @@ class AnalyticsBaseHandler(base.BaseHandler): # Overview m.add_handler(AnalyticsOverviewHandler) - m.add_divider() # Network m.add_handler(AnalyticsNetworkOverviewHandler) @@ -69,11 +68,9 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler): # Back... m.add_handler(AnalyticsOverviewHandler, title=_("Back...")) - m.add_divider() # Overview m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Overview")) - m.add_divider() # Connections m.add_handler(AnalyticsNetworkConnectionsOverviewHandler) @@ -101,11 +98,9 @@ class AnalyticsNetworkConnectionsBaseHandler(AnalyticsBaseHandler): # Back... m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Back...")) - m.add_divider() # Overview m.add_handler(AnalyticsNetworkConnectionsOverviewHandler, title=_("Overview")) - m.add_divider() # Protocol States s = m.add_submenu(_("Procotol States")) @@ -197,11 +192,9 @@ class AnalyticsSystemBaseHandler(AnalyticsBaseHandler): # Back... m.add_handler(AnalyticsOverviewHandler, title=_("Back...")) - m.add_divider() # Overview m.add_handler(AnalyticsSystemOverviewHandler, title=_("Overview")) - m.add_divider() # Most interesting items m.add_handler(AnalyticsSystemProcessorsHandler) diff --git a/src/westferry/handlers/demo.py b/src/westferry/handlers/demo.py index 9cd70e0..93000dd 100644 --- a/src/westferry/handlers/demo.py +++ b/src/westferry/handlers/demo.py @@ -34,7 +34,6 @@ class DemoBaseHandler(base.BaseHandler): # Overview m.add_handler(DemoOverviewHandler) - m.add_divider() # Forms m.add_handler(DemoFormsHandler) diff --git a/src/westferry/ui/menu.py b/src/westferry/ui/menu.py index 0742eda..81a5d51 100644 --- a/src/westferry/ui/menu.py +++ b/src/westferry/ui/menu.py @@ -31,10 +31,6 @@ class MenuItem(object): return False -class MenuDivider(MenuItem): - type = "divider" - - class MenuHeader(MenuItem): type = "header" @@ -78,15 +74,6 @@ class MenuMixin(object): """ return iter(self.items) - def add_divider(self, *args, **kwargs): - """ - Adds a divider to the menu - """ - divider = MenuDivider(*args, **kwargs) - self.items.append(divider) - - return divider - def add_handler(self, handler, title=None, **kwargs): """ Automatically adds a handler to the menu -- 2.47.3