StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redo padding and layout of network views

This commit is contained in:
Michael Hudson-Doyle 2017-10-20 14:55:01 +13:00
parent c71825c445
commit b6a27582c9
4 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquitycore/ui/views/network.py
View File

@ -127,9 +127,10 @@ class NetworkView(BaseView):
]) ])
self.error_showing = False self.error_showing = False
self.frame = Pile([ self.frame = Pile([
('pack', Text("")),
self.lb, self.lb,
('pack', self.footer)]) ('pack', self.footer)])
self.frame.focus_position = 1 self.frame.focus_position = 2
super().__init__(self.frame) super().__init__(self.frame)
def _build_buttons(self): def _build_buttons(self):

16
subiquitycore/ui/views/network_configure_interface.py
View File

@ -13,12 +13,15 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
from urwid import Text
from subiquitycore.view import BaseView from subiquitycore.view import BaseView
from subiquitycore.ui.buttons import done_btn, menu_btn from subiquitycore.ui.buttons import done_btn, menu_btn
from subiquitycore.ui.container import ListBox, Pile from subiquitycore.ui.container import ListBox, Pile
from subiquitycore.ui.utils import button_pile, Padding from subiquitycore.ui.utils import button_pile, Padding
from subiquitycore.ui.views.network import _build_gateway_ip_info_for_version, _build_wifi_info from subiquitycore.ui.views.network import _build_gateway_ip_info_for_version, _build_wifi_info
import logging
log = logging.getLogger('subiquitycore.network.network_configure_interface') log = logging.getLogger('subiquitycore.network.network_configure_interface')
@ -29,7 +32,15 @@ class NetworkConfigureInterfaceView(BaseView):
self.controller = controller self.controller = controller
self.dev = self.model.get_netdev_by_name(name) self.dev = self.model.get_netdev_by_name(name)
self._build_widgets() self._build_widgets()
super().__init__(ListBox(self._build_body())) super().__init__(Pile([
('pack', Text("")),
ListBox(self._build_body()),
('pack', Pile([
('pack', Text("")),
self._build_buttons(),
('pack', Text("")),
])),
]))
def _build_widgets(self): def _build_widgets(self):
self.ipv4_info = Pile(_build_gateway_ip_info_for_version(self.dev, 4)) self.ipv4_info = Pile(_build_gateway_ip_info_for_version(self.dev, 4))
@ -57,7 +68,6 @@ class NetworkConfigureInterfaceView(BaseView):
Padding.center_79(self.ipv6_info), Padding.center_79(self.ipv6_info),
Padding.center_79(self.ipv6_method), Padding.center_79(self.ipv6_method),
Padding.line_break(""), Padding.line_break(""),
self._build_buttons(),
]) ])
return body return body

18
subiquitycore/ui/views/network_configure_manual_interface.py
View File

@ -20,8 +20,8 @@ from urwid import connect_signal, Text
from subiquitycore.view import BaseView from subiquitycore.view import BaseView
from subiquitycore.ui.buttons import menu_btn from subiquitycore.ui.buttons import menu_btn
from subiquitycore.ui.container import ListBox from subiquitycore.ui.container import ListBox, Pile
from subiquitycore.ui.utils import button_pile, Padding from subiquitycore.ui.utils import Padding
from subiquitycore.ui.interactive import RestrictedEditor, StringEditor from subiquitycore.ui.interactive import RestrictedEditor, StringEditor
from subiquitycore.ui.form import Form, FormField, StringField from subiquitycore.ui.form import Form, FormField, StringField
@ -133,14 +133,18 @@ class BaseNetworkConfigureManualView(BaseView):
self.form.searchdomains.value = ', '.join(self.dev.configured_searchdomains) self.form.searchdomains.value = ', '.join(self.dev.configured_searchdomains)
self.error = Text("", align='center') self.error = Text("", align='center')
#self.set_as_default_gw_button = Pile(self._build_set_as_default_gw_button()) #self.set_as_default_gw_button = Pile(self._build_set_as_default_gw_button())
body = [ body = Pile([
Padding.center_79(self.form.as_rows(self)), ('pack', Text("")),
Padding.center_79(ListBox([self.form.as_rows(self)])),
#Padding.line_break(""), #Padding.line_break(""),
#Padding.center_79(self.set_as_default_gw_button), #Padding.center_79(self.set_as_default_gw_button),
Padding.line_break(""), ('pack', Pile([
('pack', Text("")),
self.form.buttons, self.form.buttons,
] ('pack', Text("")),
super().__init__(ListBox(body)) ])),
])
super().__init__(body)
def refresh_model_inputs(self): def refresh_model_inputs(self):
try: try:

15
subiquitycore/ui/views/network_configure_wlan_interface.py
View File

@ -71,15 +71,18 @@ class NetworkConfigureWLANView(BaseView):
self.inputs = Pile(self._build_iface_inputs()) self.inputs = Pile(self._build_iface_inputs())
self.error = Text("") self.error = Text("")
self.body = [ self.body = Pile([
Padding.center_79(self.inputs), ('pack', Text("")),
Padding.line_break(""), ListBox([Padding.center_79(self.inputs)]),
('pack', Pile([
('pack', Text("")),
Padding.center_79(Color.info_error(self.error)), Padding.center_79(Color.info_error(self.error)),
Padding.line_break(""),
self.form.buttons, self.form.buttons,
] ('pack', Text("")),
])),
])
self.orig_w = None self.orig_w = None
super().__init__(ListBox(self.body)) super().__init__(self.body)
def show_ssid_list(self, sender): def show_ssid_list(self, sender):
self.show_overlay(NetworkList(self, self.dev.actual_ssids)) self.show_overlay(NetworkList(self, self.dev.actual_ssids))