Hi,
the patch does remove the unused chat code. We might want to remove the
overlay code as well. What do others think?
Best,
Simon
diff --git a/src/view/ActivityHost.py b/src/view/ActivityHost.py
index 4332372..c576d5f 100644
--- a/src/view/ActivityHost.py
+++ b/src/view/ActivityHost.py
@@ -22,20 +22,6 @@ from sugar.presence import presenceservice
import OverlayWindow
-class ActivityChatWindow(gtk.Window):
- def __init__(self, gdk_window, chat_widget):
- gtk.Window.__init__(self)
-
- self.realize()
- self.set_decorated(False)
- self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
- self.window.set_accept_focus(True)
- self.window.set_transient_for(gdk_window)
- self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
- self.set_default_size(600, 450)
-
- self.add(chat_widget)
-
class ActivityHost:
def __init__(self, model):
self._model = model
@@ -44,14 +30,8 @@ class ActivityHost:
try:
self._overlay_window = OverlayWindow.OverlayWindow(self._gdk_window)
- win = self._overlay_window.window
except RuntimeError:
self._overlay_window = None
- win = self._gdk_window
-
- #self._chat_widget = ActivityChat.ActivityChat(self)
- self._chat_widget = gtk.HBox()
- self._chat_window = ActivityChatWindow(win, self._chat_widget)
self._frame_was_visible = False
@@ -91,28 +71,9 @@ class ActivityHost:
dialog.show()
dialog.window.set_transient_for(self._gdk_window)
- def chat_show(self, frame_was_visible):
- if self._overlay_window:
- self._overlay_window.appear()
- self._chat_window.show_all()
- self._frame_was_visible = frame_was_visible
-
- def chat_hide(self):
- self._chat_window.hide()
- if self._overlay_window:
- self._overlay_window.disappear()
- wasvis = self._frame_was_visible
- self._frame_was_visible = False
- return wasvis
-
- def is_chat_visible(self):
- return self._chat_window.get_property('visible')
-
def set_active(self, active):
if not active:
- self.chat_hide()
self._frame_was_visible = False
def destroy(self):
- self._chat_window.destroy()
self._frame_was_visible = False
diff --git a/src/view/Shell.py b/src/view/Shell.py
index 7335df7..2810c74 100644
--- a/src/view/Shell.py
+++ b/src/view/Shell.py
@@ -239,20 +239,6 @@ class Shell(gobject.GObject):
return host
return None
- def toggle_chat_visibility(self):
- act = self.get_current_activity()
- if not act:
- return
- is_visible = self._frame.is_visible()
- if act.is_chat_visible():
- frame_was_visible = act.chat_hide()
- if not frame_was_visible:
- self._frame.do_slide_out()
- else:
- if not is_visible:
- self._frame.do_slide_in()
- act.chat_show(is_visible)
-
def take_screenshot(self):
file_path = os.path.join(tempfile.gettempdir(), '%i' % time.time())
diff --git a/src/view/keyhandler.py b/src/view/keyhandler.py
index b14d27d..38f8a22 100644
--- a/src/view/keyhandler.py
+++ b/src/view/keyhandler.py
@@ -49,8 +49,6 @@ _actions_table = {
'<alt>1' : 'screenshot',
'<alt>f' : 'frame',
'0x93' : 'frame',
- '<alt>o' : 'overlay',
- '0xE0' : 'overlay',
'0xEB' : 'rotate',
'<alt>r' : 'rotate',
'<alt>q' : 'quit_emulator',
@@ -187,9 +185,6 @@ class KeyHandler(object):
def handle_frame(self):
view.Shell.get_instance().get_frame().notify_key_press()
- def handle_overlay(self):
- view.Shell.get_instance().toggle_chat_visibility()
-
def handle_rotate(self):
states = [ 'normal', 'left', 'inverted', 'right']
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
