[VuBluetoothSetup/GigaBlueBluetoothSetup]

* cleanup imports

GigaBlueBluetoothSetup/src/OTAUpdate.py

@@ -1,28 +1,20 @@
 from __future__ import absolute_import
 # GUI (Screens)
 from Screens.Screen import Screen
-from Screens.MessageBox import MessageBox
-from Screens.InputBox import InputBox
 from Screens.HelpMenu import HelpableScreen
-from Screens.ChoiceBox import ChoiceBox
 
 # Generic
-from Tools.BoundFunction import boundFunction
 from Tools.Directories import *
-from Components.config import config
-import os
 
 # GUI (Components)
-from Components.ActionMap import ActionMap, HelpableActionMap
+from Components.ActionMap import ActionMap
 from Components.Label import Label
-from Components.Button import Button
 from Components.ProgressBar import ProgressBar
 
 # Timer
 from enigma import eTimer
 
 from . import bt_types
-from .bt_types import getEventDesc
 from .bt_task import BluetoothTask
 
 OTA_ERROR_SERVICE_DISCOVERY = 0

GigaBlueBluetoothSetup/src/bt.py

@@ -1,39 +1,19 @@
 from __future__ import print_function
 from __future__ import absolute_import
-from Plugins.Plugin import PluginDescriptor
 
 from Screens.MessageBox import MessageBox
-from Screens.Screen import Screen
-from Screens.VirtualKeyBoard import VirtualKeyBoard
-from Screens.InputBox import InputBox
 from Screens.ChoiceBox import ChoiceBox
 
-from Components.Label import Label
-from Components.ActionMap import ActionMap
-from Components.config import config, ConfigSelection, getConfigListEntry, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber, ConfigNumber
-from Components.ConfigList import ConfigListScreen
-from Components.Console import Console
-from Components.GUIComponent import GUIComponent
-from Components.MenuList import MenuList
-from Components.Pixmap import Pixmap, MultiPixmap
-from Components.Sources.List import List
-from Components.Sources.StaticText import StaticText
-from Components.VolumeControl import VolumeControl
-
-from Tools.BoundFunction import boundFunction
+from Components.config import config, ConfigSelection, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber, ConfigNumber
 
 from Tools.Notifications import AddNotification, AddNotificationWithCallback, AddPopup
-from Tools.Directories import pathExists, fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_PLUGIN, SCOPE_CURRENT_SKIN, SCOPE_METADIR
-from skin import loadSkin
 
 from enigma import eTimer, eServiceReference
 from enigma import eDVBVolumecontrol
 
-import os
-import re
 import time
 from . import gbbt
-from .bt_types import getEventDesc, isAudioProfile, getIcon
+from .bt_types import isAudioProfile
 from . import bt_types
 from .bt_task import BluetoothTask
 
@@ -221,11 +201,15 @@ def __init__(self):
 		self.initVolumeTimer.start(500, True)
 
 	def InitVolume(self):
-		try:
-			vol = config.audio.volume.value
+		if hasattr(config, "volumeControl"):
+			vol = config.volumeControl.volume.value
 			self.setVolume(vol)
-		except:
-			self.initVolumeTimer.start(100, True)
+		else:
+			try:
+				vol = config.audio.volume.value
+				self.setVolume(vol)
+			except:
+				self.initVolumeTimer.start(100, True)
 
 	def setVolume(self, vol):
 		self.gbbt.setVolume(int(vol))

GigaBlueBluetoothSetup/src/bt_config.py

@@ -1,6 +1,6 @@
 from Screens.Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.config import config, ConfigSelection, getConfigListEntry, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber
+from Components.config import config, getConfigListEntry, ConfigYesNo
 from Components.ConfigList import ConfigListScreen
 from Components.Sources.StaticText import StaticText
 

GigaBlueBluetoothSetup/src/bt_scan.py

@@ -6,7 +6,7 @@
 from Components.Sources.List import List
 from Components.Sources.StaticText import StaticText
 from enigma import eTimer
-from .bt_types import getEventDesc, isAudioProfile, getIcon
+from .bt_types import isAudioProfile, getIcon
 from .bt import pybluetooth_instance
 from .bt_config import BluetoothSetupConfig
 from . import bt_types

GigaBlueBluetoothSetup/src/bt_setup.py

@@ -2,21 +2,18 @@
 from __future__ import absolute_import
 from Screens.Screen import Screen
 from Screens.HelpMenu import HelpableScreen
-from Screens.MessageBox import MessageBox
-from Tools.Notifications import AddNotification
 from Components.Label import Label
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.Sources.List import List
 from Components.Sources.StaticText import StaticText
 from enigma import eTimer
-from .bt_types import getEventDesc, isAudioProfile, getIcon
+from .bt_types import isAudioProfile, getIcon
 from .bt import pybluetooth_instance
 from .bt_config import BluetoothSetupConfig
 from .bt_scan import BluetoothDiscoveryScreen, BluetoothRCUSetup
 from .bt_task import BluetoothTask
 from . import bt_types
-from .OTAUpdate import GbRcuOtaUpdate
 
 
 class BluetoothSetup(BluetoothTask):

GigaBlueBluetoothSetup/src/plugin.py

@@ -2,10 +2,7 @@
 from Plugins.Plugin import PluginDescriptor
 from .bt_setup import BluetoothSetupScreen
 from .bt import pybluetooth_instance
-from Components.config import config, ConfigBoolean
 from enigma import eActionMap, eDVBVolumecontrol
-from Tools.HardwareInfo import HardwareInfo
-import os
 
 g_BTVolumeControlHandle = None
 

VuBluetoothSetup/src/OTAUpdate.py

@@ -1,20 +1,13 @@
 # GUI (Screens)
 from Screens.Screen import Screen
-from Screens.MessageBox import MessageBox
-from Screens.InputBox import InputBox
 from Screens.HelpMenu import HelpableScreen
-from Screens.ChoiceBox import ChoiceBox
 
 # Generic
-from Tools.BoundFunction import boundFunction
 from Tools.Directories import *
-from Components.config import config
-import os
 
 # GUI (Components)
-from Components.ActionMap import ActionMap, HelpableActionMap
+from Components.ActionMap import ActionMap
 from Components.Label import Label
-from Components.Button import Button
 from Components.ProgressBar import ProgressBar
 
 # Timer

VuBluetoothSetup/src/bt.py

@@ -1,37 +1,16 @@
-from Plugins.Plugin import PluginDescriptor
-
 from Screens.MessageBox import MessageBox
-from Screens.Screen import Screen
-from Screens.VirtualKeyBoard import VirtualKeyBoard
-from Screens.InputBox import InputBox
 from Screens.ChoiceBox import ChoiceBox
 
-from Components.Label import Label
-from Components.ActionMap import ActionMap
-from Components.config import config, ConfigSelection, getConfigListEntry, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber, ConfigNumber
-from Components.ConfigList import ConfigListScreen
-from Components.Console import Console
-from Components.GUIComponent import GUIComponent
-from Components.MenuList import MenuList
-from Components.Pixmap import Pixmap, MultiPixmap
-from Components.Sources.List import List
-from Components.Sources.StaticText import StaticText
-from Components.VolumeControl import VolumeControl
-
-from Tools.BoundFunction import boundFunction
+from Components.config import config, ConfigSelection, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber, ConfigNumber
 
 from Tools.Notifications import AddNotification, AddNotificationWithCallback, AddPopup
-from Tools.Directories import pathExists, fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_CURRENT_PLUGIN, SCOPE_CURRENT_SKIN, SCOPE_METADIR
-from skin import loadSkin
 
 from enigma import eTimer, eServiceReference
 from enigma import eDVBVolumecontrol
 
-import os
-import re
 import time
 from . import vubt
-from .bt_types import getEventDesc, isAudioProfile, getIcon
+from .bt_types import isAudioProfile
 from . import bt_types
 
 from .OTAUpdate import VuRcuOtaUpdate
@@ -239,11 +218,15 @@ def __init__(self):
 		self.initVolumeTimer.start(500, True)
 
 	def InitVolume(self):
-		try:
-			vol = config.audio.volume.value
+		if hasattr(config, "volumeControl"):
+			vol = config.volumeControl.volume.value
 			self.setVolume(vol)
-		except:
-			self.initVolumeTimer.start(100, True)
+		else:
+			try:
+				vol = config.audio.volume.value
+				self.setVolume(vol)
+			except:
+				self.initVolumeTimer.start(100, True)
 
 	def setVolume(self, vol):
 		self.vubt.setVolume(int(vol))

VuBluetoothSetup/src/bt_config.py

@@ -1,6 +1,6 @@
 from Screens.Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.config import config, ConfigSelection, getConfigListEntry, ConfigSubsection, ConfigYesNo, ConfigText, ConfigSelectionNumber
+from Components.config import config, getConfigListEntry, ConfigYesNo
 from Components.ConfigList import ConfigListScreen
 from Components.Sources.StaticText import StaticText
 

VuBluetoothSetup/src/bt_setup.py

@@ -1,7 +1,5 @@
 from Screens.Screen import Screen
 from Screens.HelpMenu import HelpableScreen
-from Screens.MessageBox import MessageBox
-from Tools.Notifications import AddNotification
 from Components.Label import Label
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
@@ -14,7 +12,6 @@
 from .bt_scan import BluetoothDiscoveryScreen, BluetoothRCUSetup
 from .bt_task import BluetoothTask
 from . import bt_types
-from .OTAUpdate import VuRcuOtaUpdate
 
 
 class BluetoothSetup(BluetoothTask):

VuBluetoothSetup/src/plugin.py

@@ -2,10 +2,7 @@
 from Plugins.Plugin import PluginDescriptor
 from .bt_setup import BluetoothSetupScreen
 from .bt import pybluetooth_instance
-from Components.config import config, ConfigBoolean
 from enigma import eActionMap, eDVBVolumecontrol
-from Tools.HardwareInfo import HardwareInfo
-import os
 
 g_BTVolumeControlHandle = None