Merge branch 'bug_167_bsbe2_tone_amplitude'

diff --combined lib/python/Screens/Satconfig.py
index 93fdcd3,634d231..d5249b9
--- 1/lib/python/Screens/Satconfig.py
--- 2/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@@ -5,8 -5,7 +5,8 @@@ from Components.ActionMap import Action
  from Components.ConfigList import ConfigListScreen
  from Components.MenuList import MenuList
  from Components.NimManager import nimmanager
 -from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
 +from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement,\
 +      ConfigSatlist
  from Components.Sources.List import List
  from Screens.MessageBox import MessageBox
  from Screens.ChoiceBox import ChoiceBox
@@@ -146,6 -145,8 +146,8 @@@ class NimSetup(Screen, ConfigListScreen
                                        currSat = self.nimConfig.advanced.sat[cur_orb_pos]
                                        self.fillListWithAdvancedSatEntrys(currSat)
                                self.have_advanced = True
+                       if self.nim.description == "Alps BSBE2" and config.usage.setup_level.index >= 2: # expert
+                               self.list.append(getConfigListEntry(_("Tone Amplitude"), self.nimConfig.toneAmplitude))
                elif self.nim.isCompatible("DVB-C"):
                        self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
                        self.list.append(self.configMode)
@@@ -382,11 -383,10 +384,11 @@@
  
                ConfigListScreen.__init__(self, self.list)
  
 -              self["actions"] = ActionMap(["SetupActions"],
 +              self["actions"] = ActionMap(["SetupActions", "SatlistShortcutAction"],
                {
                        "ok": self.keySave,
                        "cancel": self.keyCancel,
 +                      "nothingconnected": self.nothingConnectedShortcut
                }, -2)
  
                self.slotid = slotid
@@@ -423,11 -423,6 +425,11 @@@
                # we need to call saveAll to reset the connectedTo choices
                self.saveAll()
                self.close()
 +              
 +      def nothingConnectedShortcut(self):
 +              if type(self["config"].getCurrent()[1]) is ConfigSatlist:
 +                      self["config"].getCurrent()[1].setValue("3601")
 +                      self["config"].invalidateCurrent()
                        
  class NimSelection(Screen):
        def __init__(self, session):