NeoBoot/neoboot
1
0
Fork 0
mirror of https://github.com/gutosie/neoboot.git synced 2025-11-02 12:25:46 +01:00
Code Issues Packages Projects Releases Activity

Update devices.py

Browse Source
This commit is contained in:
gutosie
2022-06-08 09:44:50 +03:00
committed by GitHub
parent 1e5e48d754
commit 7593659983
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
NeoBoot/files/devices.py
View File

@@ -78,12 +78,12 @@ class ManagerDevice(Screen):
self.list = [] self.list = []
self['list'] = List(self.list) self['list'] = List(self.list)
self['list'].onSelectionChanged.append(self.selectionChanged) self['list'].onSelectionChanged.append(self.selectionChanged)
self['actions'] = ActionMap(['WizardActions', 'ColorActions', 'MenuActions'], {'back': self.myclose, self['actions'] = ActionMap(['WizardActions', 'ColorActions', 'MenuActions'], {'back': self.close,
'red': self.Format_ext3, 'red': self.Format_ext3,
'green': self.SetupMounts, 'green': self.SetupMounts,
'yellow': self.Format_ext4, 'yellow': self.Format_ext4,
'blue': self.InitializationNeoB, 'blue': self.InitializationNeoB,
'back': self.myclose}) 'back': self.close})
self.activityTimer = eTimer() self.activityTimer = eTimer()
self.activityTimer.timeout.get().append(self.updateList2) self.activityTimer.timeout.get().append(self.updateList2)
self.updateList() self.updateList()
@@ -303,18 +303,8 @@ class ManagerDevice(Screen):
out.write(line) out.write(line)
out.close() out.close()
self.Console.ePopen('mount -a', self.updateList) self.Console.ePopen('mount -a', self.updateList)
def restBo(self, answer):
if answer is True:
self.session.open(TryQuitMainloop, 2)
else:
self.updateList()
self.selectionChanged()
def myclose(self):
system('reboot -f')
class DevicesConf(Screen, ConfigListScreen): class DevicesConf(Screen, ConfigListScreen):
screenwidth = getDesktop(0).size().width() screenwidth = getDesktop(0).size().width()
if screenwidth and screenwidth == 1920: if screenwidth and screenwidth == 1920:
@@ -468,15 +458,13 @@ class DevicesConf(Screen, ConfigListScreen):
def delay(self, val): def delay(self, val):
if fileExists('/etc/init.d/volatile-media.sh') and getBoxHostName() == "vusolo2": if fileExists('/etc/init.d/volatile-media.sh') and getBoxHostName() == "vusolo2":
system('mv /etc/init.d/volatile-media.sh /etc/init.d/volatile-media.sh.org') system('mv /etc/init.d/volatile-media.sh /etc/init.d/volatile-media.sh.org')
message = _('Completed assembly of disks.\nReturn to installation ?') message = _('GUI needs a restart.\nDo you want to Restart the GUI now?')
ybox = self.session.openWithCallback(self.myclose, MessageBox, message, MessageBox.TYPE_YESNO) ybox = self.session.openWithCallback(self.myclose, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('MOUNTING....')) ybox.setTitle(_('MOUNTING....'))
def myclose(self, answer): def myclose(self, answer):
if answer is True: if answer is True:
self.messagebox = self.session.open(MessageBox, _('Return to installation...'), MessageBox.TYPE_INFO) os.system('reboot -f')
#self.close()
system('reboot -f')
else: else:
self.messagebox = self.session.open(MessageBox, _('Return to installation...'), MessageBox.TYPE_INFO) self.messagebox = self.session.open(MessageBox, _('Return to installation...'), MessageBox.TYPE_INFO)
self.close() self.close()
@@ -604,8 +592,8 @@ class SetDiskLabel(Screen):
self['key_green'] = Button(_('Set label')) self['key_green'] = Button(_('Set label'))
self['key_yellow'] = Button(_('Add label')) self['key_yellow'] = Button(_('Add label'))
self['key_blue'] = Button(_('Delete label')) self['key_blue'] = Button(_('Delete label'))
self['actions'] = ActionMap(['OkCancelActions', 'ColorActions', 'DirectionActions'], {'cancel': self.myclose, self['actions'] = ActionMap(['OkCancelActions', 'ColorActions', 'DirectionActions'], {'cancel': self.MyClose,
'red': self.myclose, 'red': self.MyClose,
'green': self.wlacz, 'green': self.wlacz,
'yellow': self.addlabel, 'yellow': self.addlabel,
'blue': self.dellabel, 'blue': self.dellabel,
@@ -715,8 +703,17 @@ class SetDiskLabel(Screen):
return jest return jest
def myclose(self): def MyClose(self):
system('reboot -f') message = _('GUI needs a restart.\nDo you want to Restart the GUI now?')
ybox = self.session.openWithCallback(self.mbdelete, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('Label Disc'))
def mbdelete(self, answer):
if answer is True:
os.system('reboot -f')
else:
self.messagebox = self.session.open(MessageBox, _('Return to installation...'), MessageBox.TYPE_INFO)
self.close()
class DeviceManagerSummary(Screen): class DeviceManagerSummary(Screen):