remove ignore file support
This commit is contained in:
parent
5cd0a1dd67
commit
b0459fa7f9
@ -122,7 +122,6 @@ driver=vcsaDriver
|
|||||||
encoding=auto
|
encoding=auto
|
||||||
screenUpdateDelay=0.05
|
screenUpdateDelay=0.05
|
||||||
suspendingScreen=
|
suspendingScreen=
|
||||||
suspendingScreenFile=/tmp/fenrirSuspend
|
|
||||||
autodetectSuspendingScreen=True
|
autodetectSuspendingScreen=True
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
|
@ -124,7 +124,6 @@ driver=vcsaDriver
|
|||||||
encoding=auto
|
encoding=auto
|
||||||
screenUpdateDelay=0.05
|
screenUpdateDelay=0.05
|
||||||
suspendingScreen=
|
suspendingScreen=
|
||||||
suspendingScreenFile=/tmp/fenrirSuspend
|
|
||||||
autodetectSuspendingScreen=True
|
autodetectSuspendingScreen=True
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
|
@ -125,7 +125,6 @@ driver=vcsaDriver
|
|||||||
encoding=auto
|
encoding=auto
|
||||||
screenUpdateDelay=0.05
|
screenUpdateDelay=0.05
|
||||||
suspendingScreen=
|
suspendingScreen=
|
||||||
suspendingScreenFile=/tmp/fenrirSuspend
|
|
||||||
autodetectSuspendingScreen=True
|
autodetectSuspendingScreen=True
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
|
@ -79,7 +79,6 @@ driver=vcsaDriver
|
|||||||
encoding=auto
|
encoding=auto
|
||||||
screenUpdateDelay=0.05
|
screenUpdateDelay=0.05
|
||||||
suspendingScreen=
|
suspendingScreen=
|
||||||
suspendingScreenFile=/tmp/fenrirSuspend
|
|
||||||
autodetectSuspendingScreen=True
|
autodetectSuspendingScreen=True
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
|
@ -124,7 +124,6 @@ driver=vcsaDriver
|
|||||||
encoding=auto
|
encoding=auto
|
||||||
screenUpdateDelay=0.05
|
screenUpdateDelay=0.05
|
||||||
suspendingScreen=
|
suspendingScreen=
|
||||||
suspendingScreenFile=/tmp/fenrirSuspend
|
|
||||||
autodetectSuspendingScreen=True
|
autodetectSuspendingScreen=True
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
|
@ -195,15 +195,7 @@ class screenManager():
|
|||||||
if fixIgnoreScreens != '':
|
if fixIgnoreScreens != '':
|
||||||
ignoreScreens.extend(fixIgnoreScreens.split(','))
|
ignoreScreens.extend(fixIgnoreScreens.split(','))
|
||||||
if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'):
|
if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'):
|
||||||
ignoreScreens.extend(self.env['screen']['autoIgnoreScreens'])
|
ignoreScreens.extend(self.env['screen']['autoIgnoreScreens'])
|
||||||
try:
|
|
||||||
ignoreFileName = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreenFile')
|
|
||||||
if ignoreFileName != '':
|
|
||||||
if os.access(ignoreFileName, os.R_OK):
|
|
||||||
with open(ignoreFileName) as fp:
|
|
||||||
ignoreScreens.extend(fp.read().replace('\n','').split(','))
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO)
|
||||||
return (screen in ignoreScreens)
|
return (screen in ignoreScreens)
|
||||||
|
|
||||||
@ -214,7 +206,7 @@ class screenManager():
|
|||||||
def isDelta(self, ignoreSpace=False):
|
def isDelta(self, ignoreSpace=False):
|
||||||
newDelta = self.env['screen']['newDelta']
|
newDelta = self.env['screen']['newDelta']
|
||||||
if ignoreSpace:
|
if ignoreSpace:
|
||||||
newDelta = newDelta.strip()
|
newDelta = newDelta.strip()
|
||||||
return newDelta != ''
|
return newDelta != ''
|
||||||
def isNegativeDelta(self):
|
def isNegativeDelta(self):
|
||||||
return self.env['screen']['newNegativeDelta'] != ''
|
return self.env['screen']['newNegativeDelta'] != ''
|
||||||
|
@ -51,7 +51,6 @@ settingsData = {
|
|||||||
'encoding': 'auto',
|
'encoding': 'auto',
|
||||||
'screenUpdateDelay': 0.1,
|
'screenUpdateDelay': 0.1,
|
||||||
'suspendingScreen': '',
|
'suspendingScreen': '',
|
||||||
'suspendingScreenFile': '/tmp/fenrirSuspend',
|
|
||||||
'autodetectSuspendingScreen': False,
|
'autodetectSuspendingScreen': False,
|
||||||
},
|
},
|
||||||
'general':{
|
'general':{
|
||||||
|
Loading…
Reference in New Issue
Block a user