From 9cbaac4542c9944a89f8a19e973fda0750c364c9 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 22 Jun 2018 09:38:18 +1200 Subject: [PATCH] use our custom WidgetWrap everywhere --- subiquity/ui/mount.py | 12 ++++++++++-- subiquity/ui/views/identity.py | 2 +- subiquity/ui/views/keyboard.py | 2 +- subiquitycore/ui/actionmenu.py | 7 +++++-- subiquitycore/ui/anchors.py | 9 ++++++++- subiquitycore/ui/form.py | 4 +++- subiquitycore/ui/frame.py | 6 ++++-- subiquitycore/ui/interactive.py | 4 +++- subiquitycore/ui/selector.py | 6 ++++-- subiquitycore/ui/views/network.py | 8 ++++++-- .../ui/views/network_configure_wlan_interface.py | 8 ++++++-- subiquitycore/view.py | 9 +++++++-- 12 files changed, 58 insertions(+), 19 deletions(-) diff --git a/subiquity/ui/mount.py b/subiquity/ui/mount.py index 74342ccd..763a50ee 100644 --- a/subiquity/ui/mount.py +++ b/subiquity/ui/mount.py @@ -1,9 +1,17 @@ import re -from urwid import connect_signal, Padding, Text, WidgetWrap +from urwid import ( + connect_signal, + Padding, + Text, + ) -from subiquitycore.ui.container import Columns, Pile +from subiquitycore.ui.container import ( + Columns, + Pile, + WidgetWrap, + ) from subiquitycore.ui.form import FormField from subiquitycore.ui.interactive import Selector, StringEditor diff --git a/subiquity/ui/views/identity.py b/subiquity/ui/views/identity.py index fdc3c878..9d882595 100644 --- a/subiquity/ui/views/identity.py +++ b/subiquity/ui/views/identity.py @@ -21,7 +21,6 @@ from urwid import ( LineBox, Pile, Text, - WidgetWrap, ) from subiquitycore.ui.buttons import ( @@ -31,6 +30,7 @@ from subiquitycore.ui.buttons import ( ) from subiquitycore.ui.container import ( ListBox, + WidgetWrap, ) from subiquitycore.ui.interactive import ( PasswordEditor, diff --git a/subiquity/ui/views/keyboard.py b/subiquity/ui/views/keyboard.py index 89b1ace6..a1eed66d 100644 --- a/subiquity/ui/views/keyboard.py +++ b/subiquity/ui/views/keyboard.py @@ -19,7 +19,6 @@ from urwid import ( connect_signal, LineBox, Text, - WidgetWrap, ) from subiquitycore.ui.buttons import ( @@ -30,6 +29,7 @@ from subiquitycore.ui.buttons import ( from subiquitycore.ui.container import ( Columns, Pile, + WidgetWrap, ) from subiquitycore.ui.form import ( ChoiceField, diff --git a/subiquitycore/ui/actionmenu.py b/subiquitycore/ui/actionmenu.py index 712ca037..68fe9e2f 100644 --- a/subiquitycore/ui/actionmenu.py +++ b/subiquitycore/ui/actionmenu.py @@ -22,11 +22,14 @@ from urwid import ( PopUpLauncher, SelectableIcon, Text, - WidgetWrap, Widget, ) -from subiquitycore.ui.container import Columns, ListBox +from subiquitycore.ui.container import ( + Columns, + ListBox, + WidgetWrap, +) from subiquitycore.ui.selector import Option from subiquitycore.ui.utils import Color diff --git a/subiquitycore/ui/anchors.py b/subiquitycore/ui/anchors.py index 9c7e3444..96c2bd13 100644 --- a/subiquitycore/ui/anchors.py +++ b/subiquitycore/ui/anchors.py @@ -13,7 +13,14 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from urwid import WidgetWrap, Pile, Text, ProgressBar +from urwid import ( + Text, + ProgressBar, + ) +from subiquitycore.ui.container import ( + Pile, + WidgetWrap, + ) from subiquitycore.ui.utils import Padding, Color diff --git a/subiquitycore/ui/form.py b/subiquitycore/ui/form.py index 7994e895..dbd509b8 100644 --- a/subiquitycore/ui/form.py +++ b/subiquitycore/ui/form.py @@ -24,10 +24,12 @@ from urwid import ( MetaSignals, Text, WidgetDecoration, - WidgetWrap, ) from subiquitycore.ui.buttons import cancel_btn, done_btn +from subiquitycore.ui.container import ( + WidgetWrap, +) from subiquitycore.ui.interactive import ( PasswordEditor, IntegerEditor, diff --git a/subiquitycore/ui/frame.py b/subiquitycore/ui/frame.py index 4189e219..4568091d 100644 --- a/subiquitycore/ui/frame.py +++ b/subiquitycore/ui/frame.py @@ -18,10 +18,12 @@ from urwid import ( Frame, Text, - WidgetWrap, ) from subiquitycore.ui.anchors import Header, Footer -from subiquitycore.ui.container import ListBox +from subiquitycore.ui.container import ( + ListBox, + WidgetWrap, + ) from subiquitycore.ui.utils import Color import logging diff --git a/subiquitycore/ui/interactive.py b/subiquitycore/ui/interactive.py index 580652bb..93387a44 100644 --- a/subiquitycore/ui/interactive.py +++ b/subiquitycore/ui/interactive.py @@ -23,9 +23,11 @@ import re from urwid import ( Edit, IntEdit, - WidgetWrap, ) +from subiquitycore.ui.container import ( + WidgetWrap, + ) from subiquitycore.ui.selector import Selector log = logging.getLogger("subiquitycore.ui.input") diff --git a/subiquitycore/ui/selector.py b/subiquitycore/ui/selector.py index 3ae92ef5..f0bb4d4c 100644 --- a/subiquitycore/ui/selector.py +++ b/subiquitycore/ui/selector.py @@ -21,10 +21,12 @@ from urwid import ( PopUpLauncher, SelectableIcon, Text, - WidgetWrap, ) -from subiquitycore.ui.container import ListBox +from subiquitycore.ui.container import ( + ListBox, + WidgetWrap, + ) class _PopUpButton(SelectableIcon): diff --git a/subiquitycore/ui/views/network.py b/subiquitycore/ui/views/network.py index 438079a2..a45458dc 100644 --- a/subiquitycore/ui/views/network.py +++ b/subiquitycore/ui/views/network.py @@ -26,12 +26,16 @@ from urwid import ( LineBox, ProgressBar, Text, - WidgetWrap, ) from urwid import Padding as uPadding from subiquitycore.ui.buttons import back_btn, cancel_btn, done_btn, menu_btn -from subiquitycore.ui.container import Columns, ListBox, Pile +from subiquitycore.ui.container import ( + Columns, + ListBox, + Pile, + WidgetWrap, + ) from subiquitycore.ui.utils import button_pile, Color, Padding from subiquitycore.view import BaseView diff --git a/subiquitycore/ui/views/network_configure_wlan_interface.py b/subiquitycore/ui/views/network_configure_wlan_interface.py index a64a6892..70414b28 100644 --- a/subiquitycore/ui/views/network_configure_wlan_interface.py +++ b/subiquitycore/ui/views/network_configure_wlan_interface.py @@ -3,11 +3,15 @@ from urwid import ( connect_signal, LineBox, Text, - WidgetWrap, ) from subiquitycore.view import BaseView from subiquitycore.ui.buttons import cancel_btn, menu_btn -from subiquitycore.ui.container import Columns, ListBox, Pile +from subiquitycore.ui.container import ( + Columns, + ListBox, + Pile, + WidgetWrap, + ) from subiquitycore.ui.form import Form, PasswordField, StringField from subiquitycore.ui.utils import Color, Padding import logging diff --git a/subiquitycore/view.py b/subiquitycore/view.py index 00066895..f0eeef0a 100644 --- a/subiquitycore/view.py +++ b/subiquitycore/view.py @@ -18,9 +18,14 @@ Contains some default key navigations """ -from subiquitycore.ui.stretchy import StretchyOverlay +from urwid import Overlay, Text -from urwid import Columns, Overlay, Pile, Text, WidgetWrap +from subiquitycore.ui.container import ( + Columns, + Pile, + WidgetWrap, + ) +from subiquitycore.ui.stretchy import StretchyOverlay class BaseView(WidgetWrap):