diff options
Diffstat (limited to '')
| -rwxr-xr-x | parrot_zik/parrot_zik_tray (renamed from parrot_zik_tray) | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/parrot_zik_tray b/parrot_zik/parrot_zik_tray index b3deaa2..dcdacd0 100755 --- a/parrot_zik_tray +++ b/parrot_zik/parrot_zik_tray @@ -1,20 +1,18 @@ #!/usr/bin/env python import functools from threading import Lock - import gtk -import bluetooth_paired_devices -from parrot_zik import BatteryStates -from parrot_zik import ParrotZikVersion1 -from parrot_zik import ParrotZikVersion2 -from parrot_zik import NoiseControlTypes -from bluetooth_paired_devices import connect -from parrot_zik import Rooms -from indicator import MenuItem -from indicator import Menu -from indicator import SysIndicator -import resource_manager +from parrot_zik import resource_manager +from parrot_zik import bluetooth_paired_devices +from parrot_zik.parrot_zik_model import BatteryStates +from parrot_zik.parrot_zik_model import ParrotZikVersion1 +from parrot_zik.parrot_zik_model import ParrotZikVersion2 +from parrot_zik.parrot_zik_model import NoiseControlTypes +from parrot_zik.parrot_zik_model import Rooms +from parrot_zik.indicator import MenuItem +from parrot_zik.indicator import Menu +from parrot_zik.indicator import SysIndicator REFRESH_FREQUENCY = 30000 RECONNECT_FREQUENCY = 5000 @@ -72,7 +70,7 @@ class ParrotZikIndicator(SysIndicator): else: self.info("Trying to connect") try: - manager = connect() + manager = bluetooth_paired_devices.connect() except bluetooth_paired_devices.BluetoothIsNotOn: self.info("Bluetooth is turned off") except bluetooth_paired_devices.DeviceNotConnected: |