Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnish Mangal <anish@sugarlabs.org>2011-08-10 13:00:24 (GMT)
committer Anish Mangal <anish@sugarlabs.org>2011-08-26 05:55:56 (GMT)
commitae9638d7613dba427ce8e29b800228d2c474a281 (patch)
treec8bd773ecd4f88fe49817f271aaa8cc9754398dc
parent75644a897b3db58c14bb371578ba8f276dcaea23 (diff)
Cleanup cpsection Makefiles, remove virtualkeyboarddx1.5
Signed-off-by: Anish Mangal <anish@sugarlabs.org>
-rw-r--r--extensions/cpsection/Makefile.am2
-rw-r--r--extensions/deviceicon/Makefile.am3
-rw-r--r--extensions/deviceicon/virtualkeyboard.py76
3 files changed, 1 insertions, 80 deletions
diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
index a92b5dd..08d9550 100644
--- a/extensions/cpsection/Makefile.am
+++ b/extensions/cpsection/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = aboutme aboutcomputer datetime frame keyboard language \
+SUBDIRS = aboutme aboutcomputer datetime frame language \
modemconfiguration network power updater
sugardir = $(pkgdatadir)/extensions/cpsection
diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.am
index cad6813..8a2e765 100644
--- a/extensions/deviceicon/Makefile.am
+++ b/extensions/deviceicon/Makefile.am
@@ -4,8 +4,5 @@ sugar_PYTHON = \
__init__.py \
battery.py \
network.py \
- recources.py \
speaker.py \
- touchpad.py \
- vitrualkeyboard.py \
volume.py
diff --git a/extensions/deviceicon/virtualkeyboard.py b/extensions/deviceicon/virtualkeyboard.py
deleted file mode 100644
index fbd0b35..0000000
--- a/extensions/deviceicon/virtualkeyboard.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from gettext import gettext as _
-
-import logging
-import gobject
-import gtk
-import gconf
-import os
-
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.palette import Palette
-from sugar.graphics import style
-from jarabe.frame.frameinvoker import FrameWidgetInvoker
-
-import jarabe.view.virtualkeyboard
-from jarabe.model import accessibility
-
-class DeviceView(TrayIcon):
-
- FRAME_POSITION_RELATIVE = 500
-
- def __init__(self):
- icon_name = 'virtualkeyboard'
-
- client = gconf.client_get_default()
- color = XoColor(client.get_string('/desktop/sugar/user/color'))
- TrayIcon.__init__(self, icon_name=icon_name, xo_color=color)
- self.set_palette_invoker(FrameWidgetInvoker(self))
-
- def create_palette(self):
- palette = VirtualkeyboardPalette(_('Teclado Virtual'))
- palette.set_group_id('frame')
- return palette
-
-class VirtualkeyboardPalette(Palette):
-
- def __init__(self, primary_text):
- Palette.__init__(self, label=primary_text)
-
- self.connect('popup', self._popup_cb)
- self.connect('popdown', self._popdown_cb)
-
- self._popped_up = False
-
- self._open_item = gtk.MenuItem(_('Open'))
- self._open_item.connect('activate', self._open_activate_cb)
- self.menu.append(self._open_item)
- self._open_item.show()
-
- self._close_item = gtk.MenuItem(_('Close'))
- self._close_item.connect('activate', self._close_activate_cb)
- self.menu.append(self._close_item)
- self._close_item.show()
-
- def _popup_cb(self, gobject_ref):
- self._popped_up = True
-
- def _popdown_cb(self, gobject_ref):
- self._popped_up = False
-
- def _open_activate_cb(self, gobject_ref):
- self.v = jarabe.view.virtualkeyboard.Teclado()
-
- def _close_activate_cb(self, gobject_ref):
- try:
- self.v.close()
- except:
- pass
-
-def setup(tray):
- try:
- keyboard = accessibility.Keyboard()
- if keyboard.get_virtualkeyboard():
- tray.add_device(DeviceView())
- except:
- logging.error('show virtual keyboard device icon')