mirror of
https://github.com/gryf/wicd.git
synced 2025-12-19 04:20:22 +01:00
Style changes for python files
This commit is contained in:
@@ -23,16 +23,17 @@ Also recycles a lot of configscript.py, too. :-)
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
# MA 02110-1301, USA.
|
||||
|
||||
import sys
|
||||
import os
|
||||
|
||||
import urwid
|
||||
import urwid.curses_display
|
||||
|
||||
from wicd.translations import _
|
||||
|
||||
from configscript import write_scripts, get_script_info
|
||||
from configscript import none_to_blank, blank_to_none
|
||||
|
||||
import urwid
|
||||
import urwid.curses_display
|
||||
import sys
|
||||
import os
|
||||
|
||||
ui = None
|
||||
frame = None
|
||||
pre_entry = None
|
||||
@@ -42,20 +43,18 @@ post_disconnect_entry = None
|
||||
|
||||
|
||||
def main(argv):
|
||||
""" Main function. """
|
||||
"""Main function."""
|
||||
global ui, frame
|
||||
if len(argv) < 2:
|
||||
print('Network id to configure is missing, aborting.')
|
||||
sys.exit(1)
|
||||
|
||||
ui = urwid.curses_display.Screen()
|
||||
ui.register_palette([
|
||||
('body', 'default', 'default'),
|
||||
('focus', 'dark magenta', 'light gray'),
|
||||
('editcp', 'default', 'default', 'standout'),
|
||||
('editbx', 'light gray', 'dark blue'),
|
||||
('editfc', 'white', 'dark blue', 'bold'),
|
||||
])
|
||||
ui.register_palette([('body', 'default', 'default'),
|
||||
('focus', 'dark magenta', 'light gray'),
|
||||
('editcp', 'default', 'default', 'standout'),
|
||||
('editbx', 'light gray', 'dark blue'),
|
||||
('editfc', 'white', 'dark blue', 'bold')])
|
||||
|
||||
network = argv[1]
|
||||
network_type = argv[2]
|
||||
@@ -70,69 +69,69 @@ def main(argv):
|
||||
|
||||
global pre_entry, post_entry, pre_disconnect_entry, post_disconnect_entry
|
||||
pre_entry = urwid.AttrWrap(urwid.Edit(pre_entry_t,
|
||||
none_to_blank(script_info.get('pre_entry'))),
|
||||
'editbx', 'editfc')
|
||||
none_to_blank(script_info.
|
||||
get('pre_entry'))),
|
||||
'editbx', 'editfc')
|
||||
post_entry = urwid.AttrWrap(urwid.Edit(post_entry_t,
|
||||
none_to_blank(script_info.get('post_entry'))),
|
||||
'editbx', 'editfc')
|
||||
none_to_blank(script_info.
|
||||
get('post_entry'))),
|
||||
'editbx', 'editfc')
|
||||
|
||||
pre_disconnect_entry = urwid.AttrWrap(urwid.Edit(pre_disconnect_entry_t,
|
||||
none_to_blank(script_info.get('pre_disconnect_entry'))),
|
||||
pre_disconnect_entry = urwid.AttrWrap(
|
||||
urwid.Edit(pre_disconnect_entry_t,
|
||||
none_to_blank(script_info.get('pre_disconnect_entry'))),
|
||||
'editbx', 'editfc')
|
||||
post_disconnect_entry = urwid.AttrWrap(urwid.Edit(post_disconnect_entry_t,
|
||||
none_to_blank(script_info.get('post_disconnect_entry'))),
|
||||
post_disconnect_entry = urwid.AttrWrap(
|
||||
urwid.Edit(post_disconnect_entry_t,
|
||||
none_to_blank(script_info.get('post_disconnect_entry'))),
|
||||
'editbx', 'editfc')
|
||||
|
||||
# The buttons
|
||||
ok_button = urwid.AttrWrap(
|
||||
urwid.Button(_('OK'), ok_callback),
|
||||
'body', 'focus'
|
||||
)
|
||||
cancel_button = urwid.AttrWrap(
|
||||
urwid.Button(_('Cancel'), cancel_callback),
|
||||
'body', 'focus'
|
||||
)
|
||||
ok_button = urwid.AttrWrap(urwid.Button(_('OK'), ok_callback), 'body',
|
||||
'focus')
|
||||
cancel_button = urwid.AttrWrap(urwid.Button(_('Cancel'), cancel_callback),
|
||||
'body', 'focus')
|
||||
|
||||
button_cols = urwid.Columns([ok_button, cancel_button], dividechars=1)
|
||||
|
||||
lbox = urwid.Pile([('fixed', 2, urwid.Filler(pre_entry)),
|
||||
#('fixed', urwid.Filler(blank), 1),
|
||||
# ('fixed', urwid.Filler(blank), 1),
|
||||
('fixed', 2, urwid.Filler(post_entry)),
|
||||
('fixed', 2, urwid.Filler(pre_disconnect_entry)),
|
||||
('fixed', 2, urwid.Filler(post_disconnect_entry)),
|
||||
#blank, blank, blank, blank, blank,
|
||||
urwid.Filler(button_cols, 'bottom')
|
||||
])
|
||||
# blank, blank, blank, blank, blank,
|
||||
urwid.Filler(button_cols, 'bottom')])
|
||||
frame = urwid.Frame(lbox)
|
||||
result = ui.run_wrapper(run)
|
||||
|
||||
if result:
|
||||
script_info["pre_entry"] = blank_to_none(pre_entry.get_edit_text())
|
||||
script_info["post_entry"] = blank_to_none(post_entry.get_edit_text())
|
||||
script_info["pre_disconnect_entry"] = \
|
||||
blank_to_none(pre_disconnect_entry.get_edit_text())
|
||||
script_info["post_disconnect_entry"] = \
|
||||
blank_to_none(post_disconnect_entry.get_edit_text())
|
||||
script_info["pre_disconnect_entry"] = blank_to_none(
|
||||
pre_disconnect_entry.get_edit_text())
|
||||
script_info["post_disconnect_entry"] = blank_to_none(
|
||||
post_disconnect_entry.get_edit_text())
|
||||
write_scripts(network, network_type, script_info)
|
||||
|
||||
|
||||
OK_PRESSED = False
|
||||
CANCEL_PRESSED = False
|
||||
|
||||
|
||||
def ok_callback(button_object, user_data=None):
|
||||
""" Callback. """
|
||||
"""Callback."""
|
||||
global OK_PRESSED
|
||||
OK_PRESSED = True
|
||||
|
||||
|
||||
def cancel_callback(button_object, user_data=None):
|
||||
""" Callback. """
|
||||
"""Callback."""
|
||||
global CANCEL_PRESSED
|
||||
CANCEL_PRESSED = True
|
||||
|
||||
|
||||
def run():
|
||||
""" Run the UI. """
|
||||
"""Run the UI."""
|
||||
dim = ui.get_cols_rows()
|
||||
ui.set_mouse_tracking()
|
||||
|
||||
@@ -147,7 +146,7 @@ def run():
|
||||
if "esc" in keys or 'Q' in keys:
|
||||
return False
|
||||
for k in keys:
|
||||
#Send key to underlying widget:
|
||||
# Send key to underlying widget:
|
||||
if urwid.is_mouse_event(k):
|
||||
event, button, col, row = k
|
||||
frame.mouse_event(dim, event, button, col, row, focus=True)
|
||||
@@ -159,6 +158,7 @@ def run():
|
||||
if OK_PRESSED or 'meta enter' in keys:
|
||||
return True
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if os.getuid() != 0:
|
||||
print("Root privileges are required to configure scripts. Exiting.")
|
||||
|
||||
Reference in New Issue
Block a user