menus: Drop support for dividers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py
index f4e944c68aae321989946bff606098ecd06cc84d..5afd4299dae1d912e1e339052237147b07e0d83f 100644 (file)
--- 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 9cd70e0beaf42765f4480fe3dc9f0d65eaaa723d..93000ddcb19c9447783b7a598b3a78b24835244e 100644 (file)
--- 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 0742edae0d037803bdb368408f2e38f078c3d40f..81a5d515ce39daa83f6d0ad81eff61fee4ae1b04 100644 (file)
--- 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