Browse Source

Merge pull request #52 from cuu/master

fix dimming
GNU 5 years ago
parent
commit
b82cffd837
4 changed files with 27 additions and 13 deletions
  1. 12 4
      Menu/GameShell/10_Settings/Sound/sound_page.py
  2. 2 3
      sys.py/UI/main_screen.py
  3. 6 2
      sys.py/UI/title_bar.py
  4. 7 4
      sys.py/run.py

+ 12 - 4
Menu/GameShell/10_Settings/Sound/sound_page.py

@@ -122,12 +122,20 @@ class SoundPage(Page):
 
         self._MySlider.Init()
         
-        m = alsaaudio.Mixer()
-        self._MySlider.SetValue(m.getvolume()[0])
+        try:
+		m = alsaaudio.Mixer()
+	        self._MySlider.SetValue(m.getvolume()[0])
+	except Exception,e:
+		print(str(e))
+		self._MySlider.SetValue(0)
+
 
     def OnLoadCb(self):
-        m = alsaaudio.Mixer()
-        self._MySlider.SetValue(m.getvolume()[0])
+	try:
+	        m = alsaaudio.Mixer()
+        	self._MySlider.SetValue(m.getvolume()[0])
+	except Exception,e:
+		print(str(e))
                 
     def WhenSliderDrag(self,value): ##value 0-100
         if value < 0 or value > 100:

+ 2 - 3
sys.py/UI/main_screen.py

@@ -472,7 +472,7 @@ class MainScreen(object):
 
                     elif self.IsExecPackage(_dir+"/"+i):
                         iconitem._MyType  = ICON_TYPES["EXE"]                        
-                        iconitem._CmdPath = _dir+"/"+i+"/"+i2+".sh"
+                        iconitem._CmdPath = os.path.realpath(_dir+"/"+i+"/"+i2+".sh")
                         MakeExecutable(iconitem._CmdPath)
                         cur_page._Icons.append(iconitem)
                     else:                            
@@ -488,7 +488,7 @@ class MainScreen(object):
                     
                     #cmd      =  ReadTheFileContent(_dir+"/"+i)
                     iconitem = IconItem()
-                    iconitem._CmdPath = _dir+"/"+i
+                    iconitem._CmdPath = os.path.realpath(_dir+"/"+i)
                     MakeExecutable(iconitem._CmdPath)
                     iconitem._MyType  = ICON_TYPES["EXE"]
                     if FileExists( SkinMap( _dir+"/"+ReplaceSuffix(i2,"png"))):
@@ -517,7 +517,6 @@ class MainScreen(object):
         pygame.time.delay(1000)
         cmdpath = cmdpath.strip()
         cmdpath = CmdClean(cmdpath)
-
         pygame.event.post( pygame.event.Event(RUNEVT, message=cmdpath))
 
     def OnExitCb(self,event):

+ 6 - 2
sys.py/UI/title_bar.py

@@ -95,8 +95,12 @@ class TitleBar:
         return ge
 
     def SyncSoundVolume(self):
-        m = alsaaudio.Mixer()
-        vol = m.getvolume()[0]
+	try:
+	        m = alsaaudio.Mixer()
+	        vol = m.getvolume()[0]	
+	except Exception,e:
+		print(str(e))
+	        vol = 0
 
         snd_segs = [ [0,10],[10,30],[30,70],[70,100] ]
 

+ 7 - 4
sys.py/run.py

@@ -189,8 +189,9 @@ def InspectionTeam(main_screen):
                 content = f.readlines()
                 content = [x.strip() for x in content]
                 brt=int(content[0])
-                if brt != 1 and brt > 0:
-                    last_brt = brt ## remember brt for restore
+                if brt > 0:
+                    if last_brt < 0:
+                        last_brt = brt ## remember brt for restore
 
                     brt = 1
                     f.seek(0)
@@ -283,7 +284,8 @@ def event_process(event,main_screen):
                 pygame.quit()
                 gobject_main_loop.quit()
                 os.chdir( GetExePath())
-                exec_app_cmd = event.message
+                exec_app_cmd = "cd "+os.path.dirname(event.message)+";"
+                exec_app_cmd += event.message
                 exec_app_cmd += "; sync & cd "+GetExePath()+"; exec python "+myscriptname
                 print(exec_app_cmd)
                 os.execlp("/bin/sh","/bin/sh","-c", exec_app_cmd)
@@ -300,7 +302,8 @@ def event_process(event,main_screen):
                 pygame.quit()
                 gobject_main_loop.quit()
                 os.chdir( GetExePath())
-                exec_app_cmd = event.message
+                exec_app_cmd = "cd "+os.path.dirname(event.message)+";" 
+                exec_app_cmd += event.message
                 exec_app_cmd += "; sync & cd "+GetExePath()+"; exec python "+myscriptname
                 print(exec_app_cmd)
                 os.execlp("/bin/sh","/bin/sh","-c", exec_app_cmd)