diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-07 10:28:26 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-07 10:28:26 (GMT) |
| commit | 060ee03d19f8d395ff97bfe4f5a149e38ce3e082 (patch) | |
| tree | f84c51da57eeb4af8bcfe34370462cb41153e07d /src | |
| parent | e623294eaab90af4549e730c1bf038ac29a2682b (diff) | |
Hook up the launch box.
Diffstat (limited to 'src')
| -rw-r--r-- | src/view/Shell.py | 12 | ||||
| -rw-r--r-- | src/view/home/HomeWindow.py | 2 | ||||
| -rw-r--r-- | src/view/home/launchbox.py | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/view/Shell.py b/src/view/Shell.py index 41f83a3..2750333 100644 --- a/src/view/Shell.py +++ b/src/view/Shell.py @@ -67,6 +67,7 @@ class Shell(gobject.GObject): home_model = self._model.get_home() home_model.connect('launch-started', self.__launch_started_cb) + home_model.connect('launch-failed', self.__launch_failed_cb) home_model.connect('launch-completed', self.__launch_completed_cb) home_model.connect('activity-removed', self._activity_removed_cb) home_model.connect('active-activity-changed', @@ -94,8 +95,15 @@ class Shell(gobject.GObject): self.start_activity('org.laptop.JournalActivity') def __launch_started_cb(self, home_model, home_activity): - # Zoom to Home for launch feedback - self.set_zoom_level(shellmodel.ShellModel.ZOOM_HOME) + if home_activity.get_type() == 'org.laptop.JournalActivity': + return + + self._screen.toggle_showing_desktop(True) + self._home_window.set_zoom_level(shellmodel.ShellModel.ZOOM_ACTIVITY) + + def __launch_failed_cb(self, home_model, home_activity): + if self._screen.get_showing_desktop(): + self._home_window.set_zoom_level(shellmodel.ShellModel.ZOOM_HOME) def __launch_completed_cb(self, home_model, home_activity): activity_host = ActivityHost(home_activity) diff --git a/src/view/home/HomeWindow.py b/src/view/home/HomeWindow.py index 9500b02..25d94ae 100644 --- a/src/view/home/HomeWindow.py +++ b/src/view/home/HomeWindow.py @@ -131,7 +131,7 @@ class HomeWindow(gtk.Window): size = style.LARGE_ICON_SIZE elif level == ShellModel.ZOOM_MESH: size = style.STANDARD_ICON_SIZE - elif level == ShellModel.ZOOM_ACTIVIY: + elif level == ShellModel.ZOOM_ACTIVITY: size = style.XLARGE_ICON_SIZE self._transition_box.set_size(size) diff --git a/src/view/home/launchbox.py b/src/view/home/launchbox.py index addda39..c9e0ffc 100644 --- a/src/view/home/launchbox.py +++ b/src/view/home/launchbox.py @@ -24,3 +24,8 @@ class LaunchBox(hippo.CanvasBox): gobject.GObject.__init__( self, background_color=style.COLOR_WHITE.get_int()) + def suspend(self): + pass + + def resume(self): + pass |