diff options
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/main.py | 4 | ||||
| -rw-r--r-- | src/session.py | 79 | ||||
| -rw-r--r-- | src/view/home/activitiesring.py | 40 |
4 files changed, 89 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 36f64b1..daf31ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ sugar_PYTHON = \ emulator.py \ logsmanager.py \ main.py \ + session.py \ shellservice.py EXTRA_DIST = $(bin_SCRIPTS) $(conf_DATA) diff --git a/src/main.py b/src/main.py index d2da9cc..70f5b4e 100644 --- a/src/main.py +++ b/src/main.py @@ -35,6 +35,7 @@ import view.Shell from shellservice import ShellService from hardware import hardwaremanager from intro import intro +from session import get_session import logsmanager import config @@ -146,6 +147,9 @@ def main(): view.Shell.get_instance() ShellService() + session = get_session() + session.start() + try: gtk.main() except KeyboardInterrupt: diff --git a/src/session.py b/src/session.py new file mode 100644 index 0000000..4157370 --- /dev/null +++ b/src/session.py @@ -0,0 +1,79 @@ +# Copyright (C) 2008, Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import gtk +import dbus + +from sugar import session +from sugar import env + +from hardware import hardwaremanager + +_session = None + +class Session(session.Session): + MODE_LOGOUT = 0 + MODE_SHUTDOWN = 1 + MODE_REBOOT = 2 + + def __init__(self): + session.Session.__init__(self) + self._logout_mode = None + + def logout(self): + self._logout_mode = self.MODE_LOGOUT + self.initiate_shutdown() + + def shutdown(self): + self._logout_mode = self.MODE_SHUTDOWN + self.initiate_shutdown() + + def reboot(self): + self._logout_mode = self.MODE_REBOOT + self.initiate_shutdown() + + def shutdown_completed(self): + hw_manager = hardwaremanager.get_manager() + hw_manager.shutdown() + + bus = dbus.SystemBus() + proxy = bus.get_object('org.freedesktop.Hal', + '/org/freedesktop/Hal/devices/computer') + pm = dbus.Interface(proxy, \ + 'org.freedesktop.Hal.Device.SystemPowerManagement') + + if env.is_emulator(): + pass + #self._close_emulator() + else: + if self._logout_mode == self.MODE_LOGOUT: + gtk.main_quit() + elif self._logout_mode == self.MODE_SHUTDOWN: + pm.Shutdown() + elif self._logout_mode == self.MODE_REBOOT: + pm.Reboot() + + def _close_emulator(self): + if os.environ.has_key('SUGAR_EMULATOR_PID'): + pid = int(os.environ['SUGAR_EMULATOR_PID']) + os.kill(pid, signal.SIGTERM) + +def get_session(): + global _session + + if _session == None: + _session = Session() + return _session diff --git a/src/view/home/activitiesring.py b/src/view/home/activitiesring.py index aae3dea..8c7234e 100644 --- a/src/view/home/activitiesring.py +++ b/src/view/home/activitiesring.py @@ -26,7 +26,6 @@ import gtk import hippo import dbus -from hardware import hardwaremanager from sugar.graphics import style from sugar.graphics.palette import Palette from sugar.graphics.icon import Icon, CanvasIcon @@ -43,6 +42,7 @@ from model import shellmodel from model.shellmodel import ShellModel from hardware import schoolserver from controlpanel.gui import ControlPanel +from session import get_session _logger = logging.getLogger('ActivitiesRing') @@ -339,29 +339,15 @@ class _MyIcon(MyIcon): model = shellmodel.get_instance() model.props.state = ShellModel.STATE_SHUTDOWN - pm = self._get_power_manager() - - hw_manager = hardwaremanager.get_manager() - hw_manager.shutdown() - - if env.is_emulator(): - self._close_emulator() - else: - pm.Reboot() + session = get_session() + session.shutdown() def _shutdown_activate_cb(self, menuitem): model = shellmodel.get_instance() model.props.state = ShellModel.STATE_SHUTDOWN - pm = self._get_power_manager() - - hw_manager = hardwaremanager.get_manager() - hw_manager.shutdown() - - if env.is_emulator(): - self._close_emulator() - else: - pm.Shutdown() + session = get_session() + session.shutdown() def _register_activate_cb(self, menuitem): schoolserver.register_laptop() @@ -379,19 +365,3 @@ class _MyIcon(MyIcon): def _response_cb(self, widget, response_id): if response_id == gtk.RESPONSE_OK: widget.destroy() - - def _close_emulator(self): - if os.environ.has_key('SUGAR_EMULATOR_PID'): - pid = int(os.environ['SUGAR_EMULATOR_PID']) - os.kill(pid, signal.SIGTERM) - - def _get_power_manager(self): - if self._power_manager is None: - bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.Hal', - '/org/freedesktop/Hal/devices/computer') - self._power_manager = dbus.Interface(proxy, \ - 'org.freedesktop.Hal.Device.SystemPowerManagement') - - return self._power_manager - |