Remove the shutdown graphical button

3 files changed, 3 insertions, 51 deletions

diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index 5ed8389..cc653d1 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -101,6 +101,7 @@ class Shell(gobject.GObject):
         self._key_grabber.grab('0xDC') # Camera key
         self._key_grabber.grab('0xE0') # Overlay key
         self._key_grabber.grab('0x93') # Frame key
+        self._key_grabber.grab('0x7C') # Power key
         self._key_grabber.grab('<alt>Tab')
 
         # For non-OLPC machines
@@ -158,6 +159,8 @@ class Shell(gobject.GObject):
             self.toggle_chat_visibility()
         elif key == '0x93': # Frame key
             self._frame.notify_key_press()
+        elif key == '0x7C': # Power key
+            self._frame.notify_key_press()
         elif key == '<alt>Tab':
             self.set_zoom_level(sugar.ZOOM_HOME)
             box = self._home_window.get_home_box()
diff --git a/shell/view/frame/Frame.py b/shell/view/frame/Frame.py
index 1fd62a9..aa22fc4 100644
--- a/shell/view/frame/Frame.py
+++ b/shell/view/frame/Frame.py
@@ -27,7 +27,6 @@ from view.frame.FriendsBox import FriendsBox
 from view.frame.PanelWindow import PanelWindow
 from view.frame.clipboardpanelwindow import ClipboardPanelWindow
 from view.frame.notificationtray import NotificationTray
-from view.frame.shutdownicon import ShutdownIcon
 from sugar.graphics.timeline import Timeline
 from sugar.graphics.grid import Grid
 from sugar.graphics.menushell import MenuShell
@@ -207,12 +206,6 @@ class Frame:
         root.append(box, hippo.PACK_FIXED)
         root.move(box, x, y)
 
-        shutdown_icon = ShutdownIcon(menu_shell)
-
-        [x, y] = grid.point(12, 0)
-        root.append(shutdown_icon, hippo.PACK_FIXED)
-        root.move(shutdown_icon, x, y)
-
         # Bottom panel
         panel = self._create_panel(grid, 0, 11, 16, 1)
         menu_shell = panel.get_menu_shell()
diff --git a/shell/view/frame/shutdownicon.py b/shell/view/frame/shutdownicon.py
deleted file mode 100644
index 5814f72..0000000
--- a/shell/view/frame/shutdownicon.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2006, 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 dbus
-
-from sugar.graphics.menuicon import MenuIcon
-from sugar.graphics.menu import Menu
-from sugar.graphics import style
-
-class ShutdownIcon(MenuIcon):
-    ACTION_SHUTDOWN = 2
-
-    def __init__(self, menu_shell):
-        MenuIcon.__init__(self, menu_shell, icon_name='stock-close')
-        style.apply_stylesheet(self, 'menu.ActionIcon')
-
-    def create_menu(self):
-        menu = Menu()
-        menu.add_item('Shut Down', ShutdownIcon.ACTION_SHUTDOWN)
-        menu.connect('action', self._action_cb)
-        return menu
-
-    def _action_cb(self, menu, action):
-        self.popdown()
-
-        if action == ShutdownIcon.ACTION_SHUTDOWN:
-            bus = dbus.SystemBus()
-            proxy = bus.get_object('org.freedesktop.Hal',
-                                   '/org/freedesktop/Hal/devices/computer')
-            mgr = dbus.Interface(proxy, 'org.freedesktop.Hal.Device.SystemPowerManagement')
-            mgr.Shutdown()