Merge branch 'master' into cyphermox/snap
This commit is contained in:
commit
39348df975
|
@ -1,2 +1,7 @@
|
||||||
tar-ignore = *.img
|
tar-ignore = *.img
|
||||||
tar-ignore = .git*
|
tar-ignore = .git*
|
||||||
|
tar-ignore = .subiquity
|
||||||
|
tar-ignore = *.snap
|
||||||
|
tar-ignore = stage
|
||||||
|
tar-ignore = parts
|
||||||
|
tar-ignore = prime
|
||||||
|
|
|
@ -20,12 +20,21 @@ configuration.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
from urwid import connect_signal, Text
|
from urwid import (
|
||||||
|
connect_signal,
|
||||||
|
LineBox,
|
||||||
|
Padding as UrwidPadding,
|
||||||
|
Text,
|
||||||
|
WidgetWrap,
|
||||||
|
)
|
||||||
|
|
||||||
from subiquitycore.ui.buttons import (done_btn,
|
from subiquitycore.ui.buttons import (
|
||||||
reset_btn,
|
cancel_btn,
|
||||||
cancel_btn,
|
continue_btn,
|
||||||
menu_btn)
|
done_btn,
|
||||||
|
menu_btn,
|
||||||
|
reset_btn,
|
||||||
|
)
|
||||||
from subiquitycore.ui.container import Columns, ListBox, Pile
|
from subiquitycore.ui.container import Columns, ListBox, Pile
|
||||||
from subiquitycore.ui.utils import Padding, Color
|
from subiquitycore.ui.utils import Padding, Color
|
||||||
from subiquitycore.view import BaseView
|
from subiquitycore.view import BaseView
|
||||||
|
@ -36,6 +45,32 @@ from subiquity.models.filesystem import _humanize_size
|
||||||
log = logging.getLogger('subiquity.ui.filesystem.filesystem')
|
log = logging.getLogger('subiquity.ui.filesystem.filesystem')
|
||||||
|
|
||||||
|
|
||||||
|
confirmation_text = """
|
||||||
|
Selecting Continue below will result of the loss of data on the disks selected to be formatted.
|
||||||
|
|
||||||
|
Are you sure you want to continue?
|
||||||
|
"""
|
||||||
|
|
||||||
|
class FilesystemConfirmationView(WidgetWrap):
|
||||||
|
def __init__(self, parent, controller):
|
||||||
|
self.parent = parent
|
||||||
|
self.controller = controller
|
||||||
|
pile = Pile([
|
||||||
|
UrwidPadding(Text(confirmation_text), left=2, right=2),
|
||||||
|
Padding.fixed_15(Color.button(cancel_btn(label="No", on_press=self.cancel))),
|
||||||
|
Padding.fixed_15(Color.button(continue_btn(on_press=self.ok))),
|
||||||
|
Text(""),
|
||||||
|
])
|
||||||
|
lb = LineBox(pile, title="Confirm destructive action")
|
||||||
|
super().__init__(Padding.center_75(lb))
|
||||||
|
|
||||||
|
def ok(self, sender):
|
||||||
|
self.controller.finish()
|
||||||
|
|
||||||
|
def cancel(self, sender):
|
||||||
|
self.parent.remove_overlay()
|
||||||
|
|
||||||
|
|
||||||
class FilesystemView(BaseView):
|
class FilesystemView(BaseView):
|
||||||
def __init__(self, model, controller):
|
def __init__(self, model, controller):
|
||||||
log.debug('FileSystemView init start()')
|
log.debug('FileSystemView init start()')
|
||||||
|
@ -175,4 +210,4 @@ class FilesystemView(BaseView):
|
||||||
self.controller.reset()
|
self.controller.reset()
|
||||||
|
|
||||||
def done(self, button):
|
def done(self, button):
|
||||||
self.controller.finish()
|
self.show_overlay(FilesystemConfirmationView(self, self.controller))
|
||||||
|
|
Loading…
Reference in New Issue