diff options
author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-30 22:06:35 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-30 22:06:35 (GMT) |
commit | 5215434bd729895cc99759998ac103c3b7c510d8 (patch) | |
tree | 6af64ad19f1e04256fe6b0ec9d3dbfaa50394fff /src/jarabe/view | |
parent | d6a7c53d38dc01f1d11664485b7aeab10691542d (diff) |
Fix view module case.
Diffstat (limited to 'src/jarabe/view')
-rw-r--r-- | src/jarabe/view/Makefile.am | 9 | ||||
-rw-r--r-- | src/jarabe/view/OverlayWindow.py | 70 | ||||
-rw-r--r-- | src/jarabe/view/activityhost.py (renamed from src/jarabe/view/ActivityHost.py) | 7 | ||||
-rw-r--r-- | src/jarabe/view/buddyicon.py (renamed from src/jarabe/view/BuddyIcon.py) | 2 | ||||
-rw-r--r-- | src/jarabe/view/buddymenu.py (renamed from src/jarabe/view/BuddyMenu.py) | 4 | ||||
-rw-r--r-- | src/jarabe/view/keyhandler.py | 16 | ||||
-rw-r--r-- | src/jarabe/view/palettes.py | 4 | ||||
-rw-r--r-- | src/jarabe/view/shell.py (renamed from src/jarabe/view/Shell.py) | 2 | ||||
-rw-r--r-- | src/jarabe/view/tabbinghandler.py | 6 |
9 files changed, 21 insertions, 99 deletions
diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am index 18ba0a5..404910a 100644 --- a/src/jarabe/view/Makefile.am +++ b/src/jarabe/view/Makefile.am @@ -1,15 +1,14 @@ sugardir = $(pythondir)/jarabe/view sugar_PYTHON = \ __init__.py \ - ActivityHost.py \ - BuddyIcon.py \ - BuddyMenu.py \ + activityhost.py \ + buddyicon.py \ + buddymenu.py \ clipboardicon.py \ clipboardmenu.py \ keyhandler.py \ launchwindow.py \ pulsingicon.py \ tabbinghandler.py \ - OverlayWindow.py \ palettes.py \ - Shell.py + shell.py diff --git a/src/jarabe/view/OverlayWindow.py b/src/jarabe/view/OverlayWindow.py deleted file mode 100644 index 15bcb49..0000000 --- a/src/jarabe/view/OverlayWindow.py +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (C) 2006-2007 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 cairo - -def _grab_pixbuf(window=None): - if not window: - screen = gtk.gdk.screen_get_default() - window = screen.get_root_window() - color_map = gtk.gdk.colormap_get_system() - (x, y, w, h, bpp_) = window.get_geometry() - return gtk.gdk.pixbuf_get_from_drawable(None, window, color_map, - x, y, 0, 0, w, h) - -class OverlayWindow(gtk.Window): - def __init__(self, lower_window): - gtk.Window.__init__(self) - self._lower_window = lower_window - - self._img = gtk.Image() - self.add(self._img) - - self.realize() - - self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) - self.window.set_accept_focus(False) - self.window.set_transient_for(lower_window) - - self.set_decorated(False) - self.set_position(gtk.WIN_POS_CENTER_ALWAYS) - self.set_default_size(gtk.gdk.screen_width(), gtk.gdk.screen_height()) - self.set_app_paintable(True) - - # self.connect('expose-event', self._expose_cb) - - def appear(self): - pbuf = _grab_pixbuf(self._lower_window) - #pbuf.saturate_and_pixelate(pbuf, 0.5, False) - w = pbuf.get_width() - h = pbuf.get_height() - pbuf2 = pbuf.composite_color_simple(w, h, gtk.gdk.INTERP_NEAREST, - 100, 1024, 0, 0) - self._img.set_from_pixbuf(pbuf2) - self.show_all() - - def disappear(self): - self._img.set_from_pixbuf(None) - self.hide() - - def _expose_cb(self, widget, event): - cr = widget.window.cairo_create() - cr.set_source_rgba(0.0, 0.0, 0.0, 0.4) # Transparent - cr.set_operator(cairo.OPERATOR_SOURCE) - cr.paint() - return False - diff --git a/src/jarabe/view/ActivityHost.py b/src/jarabe/view/activityhost.py index e3be3db..dba3c89 100644 --- a/src/jarabe/view/ActivityHost.py +++ b/src/jarabe/view/activityhost.py @@ -17,19 +17,12 @@ import gtk import logging -from jarabe.view import OverlayWindow - class ActivityHost: def __init__(self, model): self._model = model self._window = model.get_window() self._gdk_window = gtk.gdk.window_foreign_new(self.get_xid()) - try: - self._overlay_window = OverlayWindow.OverlayWindow(self._gdk_window) - except RuntimeError: - self._overlay_window = None - def get_id(self): return self._model.get_activity_id() diff --git a/src/jarabe/view/BuddyIcon.py b/src/jarabe/view/buddyicon.py index 3b1db4c..13edb2c 100644 --- a/src/jarabe/view/BuddyIcon.py +++ b/src/jarabe/view/buddyicon.py @@ -17,7 +17,7 @@ from sugar.graphics.icon import CanvasIcon from sugar.graphics import style -from jarabe.view.BuddyMenu import BuddyMenu +from jarabe.view.buddymenu import BuddyMenu class BuddyIcon(CanvasIcon): def __init__(self, buddy, size=style.STANDARD_ICON_SIZE): diff --git a/src/jarabe/view/BuddyMenu.py b/src/jarabe/view/buddymenu.py index bb2af0d..f4b2b3d 100644 --- a/src/jarabe/view/BuddyMenu.py +++ b/src/jarabe/view/buddymenu.py @@ -23,7 +23,7 @@ from sugar.graphics.menuitem import MenuItem from sugar.graphics.icon import Icon from jarabe.model import shellmodel -from jarabe.view import Shell +from jarabe.view import shell class BuddyMenu(Palette): def __init__(self, buddy): @@ -116,6 +116,6 @@ class BuddyMenu(Palette): friends.remove(self._buddy) def _invite_friend_cb(self, menuitem): - activity = Shell.get_instance().get_current_activity() + activity = shell.get_instance().get_current_activity() activity.invite(self._buddy) diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 4d9f8e8..f86ebca 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -26,7 +26,7 @@ import gtk from sugar._sugarext import KeyGrabber from jarabe.hardware import hardwaremanager -from jarabe.view import Shell +from jarabe.view import shell from jarabe.view.tabbinghandler import TabbingHandler from jarabe.model.shellmodel import ShellModel @@ -148,19 +148,19 @@ class KeyHandler(object): self._tabbing_handler.next_activity() def handle_close_window(self): - Shell.get_instance().close_current_activity() + hell.get_instance().close_current_activity() def handle_zoom_mesh(self): - Shell.get_instance().set_zoom_level(ShellModel.ZOOM_MESH) + shell.get_instance().set_zoom_level(ShellModel.ZOOM_MESH) def handle_zoom_friends(self): - Shell.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS) + shell.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS) def handle_zoom_home(self): - Shell.get_instance().set_zoom_level(ShellModel.ZOOM_HOME) + shell.get_instance().set_zoom_level(ShellModel.ZOOM_HOME) def handle_zoom_activity(self): - Shell.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY) + shell.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY) def handle_brightness_max(self): self._change_brightness(value=_BRIGHTNESS_MAX) @@ -187,10 +187,10 @@ class KeyHandler(object): self._change_volume(step=-_VOLUME_STEP) def handle_screenshot(self): - Shell.get_instance().take_screenshot() + shell.get_instance().take_screenshot() def handle_frame(self): - Shell.get_instance().get_frame().notify_key_press() + shell.get_instance().get_frame().notify_key_press() def handle_rotate(self): diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index 5f41231..cd49cff 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -30,7 +30,7 @@ from sugar.graphics.icon import Icon from sugar.graphics import style from sugar.graphics.xocolor import XoColor -from jarabe.view import Shell +from jarabe.view import shell class BasePalette(Palette): def __init__(self, home_activity): @@ -145,7 +145,7 @@ class ActivityPalette(Palette): self._favorite_icon.props.xo_color = xo_color def __start_activate_cb(self, menu_item): - Shell.get_instance().start_activity(self._bundle_id) + shell.get_instance().start_activity(self._bundle_id) def __change_favorite_activate_cb(self, menu_item): registry = activity.get_registry() diff --git a/src/jarabe/view/Shell.py b/src/jarabe/view/shell.py index cf69e26..6f40f8c 100644 --- a/src/jarabe/view/Shell.py +++ b/src/jarabe/view/shell.py @@ -33,7 +33,7 @@ from sugar.datastore import datastore from sugar import profile from sugar import env -from jarabe.view.ActivityHost import ActivityHost +from jarabe.view.activityhost import ActivityHost from jarabe.view.launchwindow import LaunchWindow from jarabe.model import shellmodel from jarabe.journal import journalactivity diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py index 614d32e..e8e8911 100644 --- a/src/jarabe/view/tabbinghandler.py +++ b/src/jarabe/view/tabbinghandler.py @@ -18,7 +18,7 @@ import logging import gtk import gobject -from jarabe.view import Shell +from jarabe.view import shell from jarabe.frame import frame from jarabe.model import shellmodel @@ -102,7 +102,7 @@ class TabbingHandler(object): home_model.set_tabbing_activity(activity) self._start_timeout() else: - Shell.get_instance().activate_next_activity() + shell.get_instance().activate_next_activity() def previous_activity(self): if not self._tabbing: @@ -126,7 +126,7 @@ class TabbingHandler(object): home_model.set_tabbing_activity(activity) self._start_timeout() else: - Shell.get_instance().activate_next_activity() + shell.get_instance().activate_next_activity() def stop(self): gtk.gdk.keyboard_ungrab() |