Fix up more fixed layouts with button_pile().
This commit is contained in:
parent
14fa3cd107
commit
785b4d5568
|
@ -39,7 +39,7 @@ class DiskPartitionView(BaseView):
|
||||||
Padding.line_break(""),
|
Padding.line_break(""),
|
||||||
Padding.center_79(self.show_disk_info_w()),
|
Padding.center_79(self.show_disk_info_w()),
|
||||||
Padding.line_break(""),
|
Padding.line_break(""),
|
||||||
Padding.fixed_10(self._build_buttons()),
|
self._build_buttons(),
|
||||||
]
|
]
|
||||||
super().__init__(ListBox(self.body))
|
super().__init__(ListBox(self.body))
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ class GuidedDiskSelectionView(BaseView):
|
||||||
Padding.center_70(Text("")),
|
Padding.center_70(Text("")),
|
||||||
Padding.center_70(Pile(disks)),
|
Padding.center_70(Pile(disks)),
|
||||||
Padding.center_70(Text("")),
|
Padding.center_70(Text("")),
|
||||||
Padding.fixed_10(cancel),
|
button_pile([cancel]),
|
||||||
])
|
])
|
||||||
super().__init__(lb)
|
super().__init__(lb)
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ from urwid import BoxAdapter
|
||||||
|
|
||||||
from subiquitycore.ui.lists import SimpleList
|
from subiquitycore.ui.lists import SimpleList
|
||||||
from subiquitycore.ui.buttons import back_btn, menu_btn
|
from subiquitycore.ui.buttons import back_btn, menu_btn
|
||||||
from subiquitycore.ui.utils import Padding
|
from subiquitycore.ui.utils import Padding, button_pile
|
||||||
from subiquitycore.ui.container import ListBox, Pile
|
from subiquitycore.ui.container import ListBox, Pile
|
||||||
from subiquitycore.view import BaseView
|
from subiquitycore.view import BaseView
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class InstallpathView(BaseView):
|
||||||
self.body = [
|
self.body = [
|
||||||
Padding.center_79(self._build_model_inputs()),
|
Padding.center_79(self._build_model_inputs()),
|
||||||
Padding.line_break(""),
|
Padding.line_break(""),
|
||||||
Padding.fixed_10(self._build_buttons()),
|
self._build_buttons(),
|
||||||
]
|
]
|
||||||
super().__init__(ListBox(self.body))
|
super().__init__(ListBox(self.body))
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ class InstallpathView(BaseView):
|
||||||
self.buttons = [
|
self.buttons = [
|
||||||
back_btn(on_press=self.cancel),
|
back_btn(on_press=self.cancel),
|
||||||
]
|
]
|
||||||
return Pile(self.buttons)
|
return button_pile(self.buttons)
|
||||||
|
|
||||||
def _build_model_inputs(self):
|
def _build_model_inputs(self):
|
||||||
sl = []
|
sl = []
|
||||||
|
|
|
@ -33,7 +33,7 @@ from urwid import (
|
||||||
from subiquitycore.ui.buttons import close_btn
|
from subiquitycore.ui.buttons import close_btn
|
||||||
from subiquitycore.ui.container import Pile
|
from subiquitycore.ui.container import Pile
|
||||||
from subiquitycore.ui.selector import Selector
|
from subiquitycore.ui.selector import Selector
|
||||||
from subiquitycore.ui.utils import Color, Padding
|
from subiquitycore.ui.utils import Color, Padding, button_pile
|
||||||
|
|
||||||
log = logging.getLogger("subiquitycore.ui.input")
|
log = logging.getLogger("subiquitycore.ui.input")
|
||||||
|
|
||||||
|
@ -118,8 +118,8 @@ class YesNo(Selector):
|
||||||
class _HelpDisplay(WidgetWrap):
|
class _HelpDisplay(WidgetWrap):
|
||||||
def __init__(self, closer, help_text):
|
def __init__(self, closer, help_text):
|
||||||
self._closer = closer
|
self._closer = closer
|
||||||
button = close_btn(on_press=lambda btn:self._closer())
|
buttons = [close_btn(on_press=lambda btn:self._closer())]
|
||||||
super().__init__(LineBox(Pile([Text(help_text), Padding.fixed_10(button)]), title=_("Help")))
|
super().__init__(LineBox(Pile([Text(help_text), button_pile(buttons)]), title=_("Help")))
|
||||||
|
|
||||||
|
|
||||||
class Help(WidgetWrap):
|
class Help(WidgetWrap):
|
||||||
|
|
|
@ -47,7 +47,7 @@ class ApplyingConfigWidget(WidgetWrap):
|
||||||
complete='progress_complete',
|
complete='progress_complete',
|
||||||
current=0, done=step_count)
|
current=0, done=step_count)
|
||||||
box = LineBox(Pile([self.bar,
|
box = LineBox(Pile([self.bar,
|
||||||
Padding.fixed_10(button)]),
|
button_pile([button])]),
|
||||||
title=_("Applying network config"))
|
title=_("Applying network config"))
|
||||||
super().__init__(box)
|
super().__init__(box)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue