QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firstboot: indent some options

Browse Source 
QubesOS/qubes-issues#1629
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-08 02:17:33 +01:00
parent 098a2752af
commit e20d87b79b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firstboot/modules/qubes_setup.py
View File

@ -81,13 +81,19 @@ def started_from_usb():
class QubesChoice(object): class QubesChoice(object):
instances = [] instances = []
def __init__(self, label, states, depend=None, extra_check=None, def __init__(self, label, states, depend=None, extra_check=None,
replace=None): replace=None, indent=False):
self.widget = gtk.CheckButton(label) self.widget = gtk.CheckButton(label)
self.states = states self.states = states
self.depend = depend self.depend = depend
self.extra_check = extra_check self.extra_check = extra_check
self.selected = None self.selected = None
self.replace = replace self.replace = replace
if indent:
self.outer_widget = gtk.Alignment()
self.outer_widget.add(self.widget)
self.outer_widget.set_padding(0, 0, 20, 0)
else:
self.outer_widget = self.widget
if self.depend is not None: if self.depend is not None:
self.depend.widget.connect('toggled', self.friend_on_toggled) self.depend.widget.connect('toggled', self.friend_on_toggled)
@ -379,7 +385,8 @@ class moduleClass(Module):
_('Route applications traffic and updates through Tor anonymity ' _('Route applications traffic and updates through Tor anonymity '
'network [experimental]'), 'network [experimental]'),
(), (),
depend=self.choice_whonix) depend=self.choice_whonix,
indent=True)
if not usb_keyboard_present() and not started_from_usb(): if not usb_keyboard_present() and not started_from_usb():
self.choice_usb = QubesChoice( self.choice_usb = QubesChoice(
@ -396,6 +403,7 @@ class moduleClass(Module):
('qvm.sys-net-with-usb',), ('qvm.sys-net-with-usb',),
depend=self.choice_usb, depend=self.choice_usb,
replace=('qvm.sys-usb',), replace=('qvm.sys-usb',),
indent=True
) )
self.check_advanced = gtk.CheckButton( self.check_advanced = gtk.CheckButton(
@ -404,7 +412,7 @@ class moduleClass(Module):
QubesChoice.on_check_advanced_toggled) QubesChoice.on_check_advanced_toggled)
for choice in QubesChoice.instances: for choice in QubesChoice.instances:
self.vbox.pack_start(choice.widget, False, True) self.vbox.pack_start(choice.outer_widget, False, True)
#self.vbox.pack_start(gtk.HSeparator()) #self.vbox.pack_start(gtk.HSeparator())
self.vbox.pack_end(self.check_advanced, False, True) self.vbox.pack_end(self.check_advanced, False, True)