sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move hardwaremanager out of the view to his own module

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-25 01:07:05 +01:00
parent cb6a808832
commit 89aa65d0f6
7 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -117,6 +117,7 @@ services/clipboard/Makefile
services/datastore/Makefile services/datastore/Makefile
shell/Makefile shell/Makefile
shell/data/Makefile shell/data/Makefile
shell/hardware/Makefile
shell/view/Makefile shell/view/Makefile
shell/view/devices/Makefile shell/view/devices/Makefile
shell/view/frame/Makefile shell/view/frame/Makefile

4
shell/hardware/Makefile.am Normal file
View File

@ -0,0 +1,4 @@
sugardir = $(pkgdatadir)/shell/hardware
sugar_PYTHON = \
__init__.py \
hardwaremanager.py

0
shell/hardware/__init__.py Normal file
View File

29
shell/view/hardwaremanager.py → shell/hardware/hardwaremanager.py
View File

@ -18,20 +18,22 @@ import logging
import dbus import dbus
HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager' from _sugar import AudioManager
HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
HARDWARE_MANAGER_OBJECT_PATH = '/org/laptop/HardwareManager' _HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
_HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
_HARDWARE_MANAGER_OBJECT_PATH = '/org/laptop/HardwareManager'
COLOR_MODE = 0
B_AND_W_MODE = 1
class HardwareManager(object): class HardwareManager(object):
COLOR_MODE = 0
B_AND_W_MODE = 1
def __init__(self): def __init__(self):
try: try:
bus = dbus.SystemBus() bus = dbus.SystemBus()
proxy = bus.get_object(HARDWARE_MANAGER_SERVICE, proxy = bus.get_object(_HARDWARE_MANAGER_SERVICE,
HARDWARE_MANAGER_OBJECT_PATH) _HARDWARE_MANAGER_OBJECT_PATH)
self._service = dbus.Interface(proxy, HARDWARE_MANAGER_INTERFACE) self._service = dbus.Interface(proxy, _HARDWARE_MANAGER_INTERFACE)
except dbus.DBusException: except dbus.DBusException:
self._service = None self._service = None
logging.error('Hardware manager service not found.') logging.error('Hardware manager service not found.')
@ -56,3 +58,12 @@ class HardwareManager(object):
self._service.set_keyboard_brightness(False) self._service.set_keyboard_brightness(False)
else: else:
self._service.set_keyboard_brightness(True) self._service.set_keyboard_brightness(True)
def get_hardware_manager():
return _hardware_manager
def get_audio_manager():
return _audio_manager
_hardware_manager = HardwareManager()
_audio_manager = AudioManager()

3
shell/view/Makefile.am
View File

@ -11,5 +11,4 @@ sugar_PYTHON = \
clipboardmenu.py \ clipboardmenu.py \
keyhandler.py \ keyhandler.py \
OverlayWindow.py \ OverlayWindow.py \
Shell.py \ Shell.py
hardwaremanager.py

11
shell/view/Shell.py
View File

@ -26,8 +26,6 @@ from view.ActivityHost import ActivityHost
from sugar.activity import activityfactory from sugar.activity import activityfactory
from view.frame.frame import Frame from view.frame.frame import Frame
from view.keyhandler import KeyHandler from view.keyhandler import KeyHandler
from view.hardwaremanager import HardwareManager
from _sugar import AudioManager
import sugar import sugar
class Shell(gobject.GObject): class Shell(gobject.GObject):
@ -40,9 +38,6 @@ class Shell(gobject.GObject):
self._current_host = None self._current_host = None
self._screen_rotation = 0 self._screen_rotation = 0
self._hw_manager = HardwareManager()
self._audio_manager = AudioManager()
self._home_window = HomeWindow(self) self._home_window = HomeWindow(self)
self._home_window.show() self._home_window.show()
self.set_zoom_level(sugar.ZOOM_HOME) self.set_zoom_level(sugar.ZOOM_HOME)
@ -88,12 +83,6 @@ class Shell(gobject.GObject):
if self._current_host: if self._current_host:
self._current_host.set_active(True) self._current_host.set_active(True)
def get_hardware_manager(self):
return self._hw_manager
def get_audio_manager(self):
return self._audio_manager
def get_model(self): def get_model(self):
return self._model return self._model

10
shell/view/keyhandler.py
View File

@ -2,7 +2,7 @@ import dbus
import gobject import gobject
from sugar import env from sugar import env
from view.hardwaremanager import HardwareManager from hardware import hardwaremanager
from model.ShellModel import ShellModel from model.ShellModel import ShellModel
from _sugar import KeyGrabber from _sugar import KeyGrabber
import sugar import sugar
@ -40,8 +40,8 @@ _actions_table = {
class KeyHandler(object): class KeyHandler(object):
def __init__(self, shell): def __init__(self, shell):
self._shell = shell self._shell = shell
self._hw_manager = shell.get_hardware_manager() self._hw_manager = hardwaremanager.get_hardware_manager()
self._audio_manager = shell.get_audio_manager() self._audio_manager = hardwaremanager.get_audio_manager()
self._screen_rotation = 0 self._screen_rotation = 0
self._key_grabber = KeyGrabber() self._key_grabber = KeyGrabber()
@ -90,10 +90,10 @@ class KeyHandler(object):
self._audio_manager.set_volume(100) self._audio_manager.set_volume(100)
def handle_color_mode(self): def handle_color_mode(self):
self._hw_manager.set_display_mode(HardwareManager.COLOR_MODE) self._hw_manager.set_display_mode(hardwaremanager.COLOR_MODE)
def handle_b_and_w_mode(self): def handle_b_and_w_mode(self):
self._hw_manager.set_display_mode(HardwareManager.B_AND_W_MODE) self._hw_manager.set_display_mode(hardwaremanager.B_AND_W_MODE)
def handle_console(self): def handle_console(self):
gobject.idle_add(self._toggle_console_visibility_cb) gobject.idle_add(self._toggle_console_visibility_cb)