renamed configured playback mode

DonDavici · Oct 7, 2014 · 92ecbf7 · 92ecbf7
1 parent 4229a96
commit 92ecbf7
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/DP_View.py b/src/DP_View.py
@@ -748,7 +748,7 @@ def initColorFunctions(self):
 		self.setColorFunction(color="red", level="1", functionList=("", self.togglePlayMode))
 		self.setColorFunction(color="green", level="1", functionList=("", self.toggleResumeMode))
 		self.setColorFunction(color="yellow", level="1", functionList=("", self.executeLibraryFunction)) # name is empty because we set it dynamical
-		self.setColorFunction(color="blue", level="1", functionList=(_("playback mode 'default'"), self.togglePlaybackMode))
+		self.setColorFunction(color="blue", level="1", functionList=(_("playback mode '" + self.playbackModes[self.configuredPlaybackMode][1] + "'"), self.togglePlaybackMode))
 
 		self.setColorFunction(color="red", level="2", functionList=(_("View '") + str(self.currentViewName) + " '", self.onToggleView))
 		self.setColorFunction(color="green", level="2", functionList=("", self.toggleFastScroll)) # name is empty because we set it dynamical
@@ -922,10 +922,7 @@ def togglePlaybackMode(self):
 		if self.nextPlaybackMode >= self.lengthOfPlaybackModes:
 			self.nextPlaybackMode = 0
 
-		if self.configuredPlaybackMode == self.nextPlaybackMode:
-			myName = "default"
-		else:
-			myName = self.playbackModes[self.nextPlaybackMode][1]
+		myName = self.playbackModes[self.nextPlaybackMode][1]
 
 		self.playbackMode = self.nextPlaybackMode
 
@@ -2395,6 +2392,9 @@ def finishLayout(self):
 
 		printl("guiElements_key_red" +self.guiElements["key_red"], self, "D")
 
+		# we use this for override playback mode if wanted
+		self.initPlaybackMode()
+
 		self.initColorFunctions()
 
 		self.setLevelActive(currentLevel=1)
@@ -2405,9 +2405,6 @@ def finishLayout(self):
 		# we do like we pressed the button to init the right names
 		self.onKey1(initial=True)
 
-		# we use this for override playback mode if wanted
-		self.initPlaybackMode()
-
 		# first we set the pics for buttons
 		self["btn_red"].instance.setPixmapFromFile(self.guiElements["key_red"])
 		self["btn_green"].instance.setPixmapFromFile(self.guiElements["key_green"])