Factor out and remove more code from the shell view.

3 files changed, 19 insertions, 38 deletions

diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 9f57036..08d6d25 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -32,7 +32,8 @@ from sugar.datastore import datastore
 
 from jarabe.model import screen
 from jarabe.model import sound
-from jarabe.view import shell
+from jarabe.model import shell
+from jarabe.view import shell as shellview
 from jarabe.view.tabbinghandler import TabbingHandler
 from jarabe.model.shell import ShellModel
 
@@ -150,19 +151,23 @@ class KeyHandler(object):
         self._tabbing_handler.next_activity()
 
     def handle_close_window(self):
-        shell.get_instance().close_current_activity()
+        active_activity = shell.get_model().get_active_activity()
+        if active_activity.is_journal():
+            return
+
+        active_activity.get_window().close()
 
     def handle_zoom_mesh(self):
-        shell.get_instance().set_zoom_level(ShellModel.ZOOM_MESH)
+        shellview.get_instance().set_zoom_level(ShellModel.ZOOM_MESH)
 
     def handle_zoom_friends(self):
-        shell.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS)
+        shellview.get_instance().set_zoom_level(ShellModel.ZOOM_FRIENDS)
 
     def handle_zoom_home(self):
-        shell.get_instance().set_zoom_level(ShellModel.ZOOM_HOME)
+        shellview.get_instance().set_zoom_level(ShellModel.ZOOM_HOME)
 
     def handle_zoom_activity(self):
-        shell.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY)
+        shellview.get_instance().set_zoom_level(ShellModel.ZOOM_ACTIVITY)
 
     def handle_brightness_max(self):
         self._change_brightness(value=_BRIGHTNESS_MAX)
@@ -216,8 +221,7 @@ class KeyHandler(object):
             del jobject
 
     def handle_frame(self):
-        shell.get_instance().get_frame().notify_key_press()
-
+        shellview.get_instance().get_frame().notify_key_press()
 
     def handle_rotate(self):
         """
diff --git a/src/jarabe/view/shell.py b/src/jarabe/view/shell.py
index 6fcdc77..8f445fc 100644
--- a/src/jarabe/view/shell.py
+++ b/src/jarabe/view/shell.py
@@ -139,33 +139,6 @@ class Shell(gobject.GObject):
             self._model.set_zoom_level(level)
             self._screen.toggle_showing_desktop(True)
 
-    def toggle_activity_fullscreen(self):
-        if self._model.get_zoom_level() == shell.ShellModel.ZOOM_ACTIVITY:
-            active_activity = self._model.get_active_activity()
-            fullscreen = not self._window.is_fullscreen()
-            active_activity.get_window().set_fullscreen(fullscreen)
-
-    def activate_previous_activity(self):
-        previous_activity = self._model.get_previous_activity()
-        if previous_activity:
-            previous_activity.get_window().activate(
-						gtk.get_current_event_time())
-
-    def activate_next_activity(self):
-        next_activity = self._model.get_next_activity()
-        if next_activity:
-            next_activity.get_window().activate(gtk.get_current_event_time())
-
-    def close_current_activity(self):
-        if self._model.get_zoom_level() != shell.ShellModel.ZOOM_ACTIVITY:
-            return
-
-        active_activity = self._model.get_active_activity()
-        if active_activity.is_journal():
-            return
-
-        self._model.get_active_activity().get_window().close()
-
 _instance = None
 
 def get_instance():
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index 3c33e78..e86d0de 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -18,7 +18,6 @@ import logging
 import gtk
 import gobject
 
-from jarabe.view import shell as shellview
 from jarabe.frame import frame
 from jarabe.model import shell
 
@@ -100,7 +99,7 @@ class TabbingHandler(object):
             shell_model.set_tabbing_activity(activity)
             self._start_timeout()
         else:
-            shellview.get_instance().activate_next_activity()
+            self._activate_next_activity()
 
     def previous_activity(self):
         if not self._tabbing:
@@ -123,7 +122,12 @@ class TabbingHandler(object):
             shell_model.set_tabbing_activity(activity)
             self._start_timeout()
         else:
-            shellview.get_instance().activate_next_activity()
+            self._activate_next_activity()
+
+    def _activate_next_activity(self):
+        next_activity = shell.get_model().get_next_activity()
+        if next_activity:
+            next_activity.get_window().activate(gtk.get_current_event_time())
 
     def stop(self):
         gtk.gdk.keyboard_ungrab()