Fix view module case.

17 files changed, 49 insertions, 127 deletions

diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 3e6d2e7..e163b06 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -24,7 +24,7 @@ from sugar import util
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
 
-from jarabe.view import Shell
+from jarabe.view import shell
 from jarabe.view.palettes import ActivityPalette
 
 class ActivitiesList(gtk.VBox):
@@ -248,7 +248,7 @@ class ActivityEntry(hippo.CanvasBox, hippo.CanvasItem):
             self._favorite_icon.props.favorite = self._favorite
 
     def __icon_button_release_event_cb(self, icon, event):
-        Shell.get_instance().start_activity(self._bundle_id)
+        shell.get_instance().start_activity(self._bundle_id)
 
     def get_bundle_id(self):
         return self._bundle_id
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 60f8606..72df099 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -30,7 +30,7 @@ from sugar.graphics.alert import Alert
 from sugar.profile import get_profile
 from sugar import activity
 
-from jarabe.view import Shell
+from jarabe.view import shell
 from jarabe.view.palettes import JournalPalette
 from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette
 from jarabe.desktop.myicon import MyIcon
@@ -349,7 +349,7 @@ class ActivityIcon(CanvasIcon):
     def __button_release_event_cb(self, icon, event):
         self.palette.popdown(immediate=True)
         self._uncolor()
-        Shell.get_instance().start_activity(self._activity_info.bundle_id)
+        shell.get_instance().start_activity(self._activity_info.bundle_id)
 
     def get_bundle_id(self):
         return self._activity_info.bundle_id
diff --git a/src/jarabe/desktop/friendview.py b/src/jarabe/desktop/friendview.py
index f1e00b1..a4add98 100644
--- a/src/jarabe/desktop/friendview.py
+++ b/src/jarabe/desktop/friendview.py
@@ -21,7 +21,7 @@ from sugar.graphics import style
 from sugar.presence import presenceservice
 from sugar import activity
 
-from jarabe.view.BuddyIcon import BuddyIcon
+from jarabe.view.buddyicon import BuddyIcon
 
 class FriendView(hippo.CanvasBox):
     def __init__(self, buddy, **kwargs):
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 5dd8dfb..964bba5 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -35,11 +35,11 @@ from jarabe.model.devices import wireless
 from jarabe.model import shellmodel
 from jarabe.hardware import hardwaremanager
 from jarabe.hardware import nmclient
-from jarabe.view.BuddyIcon import BuddyIcon
+from jarabe.view.buddyicon import BuddyIcon
 from jarabe.view.pulsingicon import CanvasPulsingIcon
 from jarabe.desktop.snowflakelayout import SnowflakeLayout
 from jarabe.desktop.spreadlayout import SpreadLayout
-from jarabe.view import Shell
+from jarabe.view import shell
 
 from jarabe.hardware.nmclient import NM_802_11_CAP_PROTO_WEP, \
     NM_802_11_CAP_PROTO_WPA, NM_802_11_CAP_PROTO_WPA2
@@ -336,7 +336,7 @@ class ActivityView(hippo.CanvasBox):
 
     def _clicked_cb(self, item):
         bundle_id = self._model.get_bundle_id()
-        Shell.get_instance().join_activity(bundle_id, self._model.get_id())
+        shell.get_instance().join_activity(bundle_id, self._model.get_id())
 
     def set_filter(self, query):
         text_to_check = self._model.activity.props.name.lower() + \
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index d203e33..d94634c 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -35,7 +35,7 @@ from jarabe.view.palettes import JournalPalette, CurrentActivityPalette
 from jarabe.view.pulsingicon import PulsingIcon
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.frame.notification import NotificationIcon
-from jarabe.view import Shell
+from jarabe.view import shell
 import jarabe.frame.frame
 
 class ActivityButton(RadioToolButton):
@@ -148,9 +148,9 @@ class ActivityInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Join the activity in the invite."""
-        shell = Shell.get_instance()
-        shell.join_activity(self._activity_model.get_bundle_id(),
-                            self._activity_model.get_id())
+        shell_inst = shell.get_instance()
+        shell_inst.join_activity(self._activity_model.get_bundle_id(),
+                                 self._activity_model.get_id())
 
 
 class PrivateInviteButton(BaseInviteButton):
@@ -194,9 +194,9 @@ class PrivateInviteButton(BaseInviteButton):
 
     def _launch(self):
         """Start the activity with private channel."""
-        shell = Shell.get_instance()
-        shell.start_activity_with_uri(self._bundle_id,
-                                      self._private_channel)
+        shell_inst = shell.get_instance()
+        shell_inst.start_activity_with_uri(self._bundle_id,
+                                           self._private_channel)
 
 
 class BaseInvitePalette(Palette):
@@ -246,9 +246,9 @@ class ActivityInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell = Shell.get_instance()
-        shell.join_activity(self._activity_model.get_bundle_id(),
-                            self._activity_model.get_id())
+        shell_inst = shell.get_instance()
+        shell_inst.join_activity(self._activity_model.get_bundle_id(),
+                                 self._activity_model.get_id())
 
     def _decline(self):
         invites = shellmodel.get_instance().get_invites()
@@ -273,9 +273,9 @@ class PrivateInvitePalette(BaseInvitePalette):
             self.set_primary_text(self._bundle_id)
 
     def _join(self):
-        shell = Shell.get_instance()
-        shell.start_activity_with_uri(self._bundle_id,
-                                      self._private_channel)
+        shell_inst = shell.get_instance()
+        shell_inst.start_activity_with_uri(self._bundle_id,
+                                           self._private_channel)
         invites = shellmodel.get_instance().get_invites()
         invites.remove_private_channel(self._private_channel)
 
diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py
index 6021e1f..110234a 100644
--- a/src/jarabe/frame/friendstray.py
+++ b/src/jarabe/frame/friendstray.py
@@ -17,8 +17,8 @@
 from sugar.presence import presenceservice
 from sugar.graphics.tray import VTray, TrayIcon
 
-from jarabe.view import Shell
-from jarabe.view.BuddyMenu import BuddyMenu
+from jarabe.view import shell
+from jarabe.view.buddymenu import BuddyMenu
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import shellmodel
 from jarabe.model.BuddyModel import BuddyModel
@@ -87,7 +87,7 @@ class FriendsTray(VTray):
         self._buddies = {}
 
     def __activity_appeared_cb(self, pservice, activity_ps):
-        activity = Shell.get_instance().get_current_activity()
+        activity = shell.get_instance().get_current_activity()
         if activity and activity_ps.props.id == activity.get_id():
             self._set_activity_ps(activity_ps, True)
 
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index a9dd786..cfc1863 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -22,7 +22,7 @@ import gtk
 from sugar.graphics.palette import Palette
 from sugar.graphics.radiotoolbutton import RadioToolButton
 
-from jarabe.view import Shell
+from jarabe.view import shell
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import shellmodel
 
@@ -68,7 +68,7 @@ class ZoomToolbar(gtk.Toolbar):
         if not button.get_active():
             return
         if shellmodel.get_instance().props.zoom_level != level:
-            Shell.get_instance().set_zoom_level(level)
+            shell.get_instance().set_zoom_level(level)
 
     def __notify_zoom_level_cb(self, model, pspec):
         self._set_zoom_level(model.props.zoom_level)
diff --git a/src/jarabe/shellservice.py b/src/jarabe/shellservice.py
index fd8868e..7918109 100644
--- a/src/jarabe/shellservice.py
+++ b/src/jarabe/shellservice.py
@@ -18,7 +18,7 @@
 import dbus
 import os
 
-from jarabe.view import Shell
+from jarabe.view import shell
 from jarabe.model import shellmodel
 
 _DBUS_SERVICE = "org.laptop.Shell"
@@ -50,7 +50,7 @@ class ShellService(dbus.service.Object):
     _rainbow = None
 
     def __init__(self):
-        self._shell = Shell.get_instance()
+        self._shell = shell.get_instance()
         self._shell_model = shellmodel.get_instance()
 
         self._owner = self._shell_model.get_owner()
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()