Move the view to his own module

configure.ac

@@ -48,8 +48,9 @@ bindings/threadframe/Makefile
 shell/Makefile
 shell/conf/Makefile
 shell/data/Makefile
-shell/home/Makefile
+shell/view/Makefile
-shell/frame/Makefile
+shell/view/home/Makefile
+shell/view/frame/Makefile
 shell/model/Makefile
 shell/PresenceService/Makefile
 sugar/Makefile

shell/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = conf data frame home model PresenceService
+SUBDIRS = conf data model view PresenceService
 
 bin_SCRIPTS = 				\
 	sugar				\
@@ -10,12 +10,6 @@ bin_SCRIPTS = 				\
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =				\
 	__init__.py			\
-	ActivityHost.py			\
-	ConsoleWindow.py		\
-	FirstTimeDialog.py		\
-	FriendIcon.py			\
-	FriendPopup.py			\
-	Shell.py			\
 	Session.py
 
 EXTRA_DIST = $(bin_SCRIPTS)

shell/Session.py

@@ -1,9 +1,8 @@
 import os
 import gtk
 
-from Shell import Shell
+from view.Shell import Shell
 from model.ShellModel import ShellModel
-from ConsoleWindow import ConsoleWindow
 from sugar import env
 from sugar import logger
 
@@ -11,7 +10,7 @@ from sugar.session.Process import Process
 from sugar.session.DbusProcess import DbusProcess
 from sugar.session.MatchboxProcess import MatchboxProcess
 
-from FirstTimeDialog import FirstTimeDialog
+from view.FirstTimeDialog import FirstTimeDialog
 import conf
 
 class DBusMonitorProcess(Process):

shell/view/FriendIcon.py

@@ -1,6 +1,6 @@
 from sugar.canvas.IconItem import IconItem
-from FriendPopup import FriendPopup
 from sugar.canvas.Grid import Grid
+from view.FriendPopup import FriendPopup
 
 class _PopupShell:
 	def __init__(self):

shell/view/Makefile.am

@@ -0,0 +1,11 @@
+SUBDIRS = frame home
+
+sugardir = $(pkgdatadir)/shell/view
+sugar_PYTHON =				\
+	__init__.py			\
+	ActivityHost.py			\
+	ConsoleWindow.py		\
+	FirstTimeDialog.py		\
+	FriendIcon.py			\
+	FriendPopup.py			\
+	Shell.py

shell/view/Shell.py

@@ -2,9 +2,9 @@ import gtk
 import gobject
 import wnck
 
-from home.HomeWindow import HomeWindow
+from view.home.HomeWindow import HomeWindow
-from ActivityHost import ActivityHost
+from view.ActivityHost import ActivityHost
-from frame.Frame import Frame
+from view.frame.Frame import Frame
 from globalkeys import KeyGrabber
 import sugar
 

shell/view/frame/Frame.py

@@ -2,10 +2,10 @@ import gtk
 import gobject
 import goocanvas
 
-from frame.BottomPanel import BottomPanel
+from view.frame.BottomPanel import BottomPanel
-from frame.RightPanel import RightPanel
+from view.frame.RightPanel import RightPanel
-from frame.TopPanel import TopPanel
+from view.frame.TopPanel import TopPanel
-from frame.PanelWindow import PanelWindow
+from view.frame.PanelWindow import PanelWindow
 from sugar.canvas.Grid import Grid
 
 class Frame:

shell/view/frame/Makefile.am

@@ -1,4 +1,4 @@
-sugardir = $(pkgdatadir)/shell/frame
+sugardir = $(pkgdatadir)/shell/view/frame
 sugar_PYTHON =				\
 	__init__.py			\
 	RightPanel.py			\

shell/view/frame/RightPanel.py

@@ -4,7 +4,7 @@ from sugar.canvas.IconItem import IconItem
 from sugar.canvas.IconColor import IconColor
 from sugar.canvas.CanvasBox import CanvasBox
 from sugar.presence import PresenceService
-from FriendIcon import FriendIcon
+from view.FriendIcon import FriendIcon
 from model.Friends import Friend
 
 class RightPanel(CanvasBox):

shell/view/home/FriendsGroup.py

@@ -2,9 +2,9 @@ import random
 
 import goocanvas
 
-from home.IconLayout import IconLayout
+from view.home.IconLayout import IconLayout
-from home.MyIcon import MyIcon
+from view.home.MyIcon import MyIcon
-from FriendIcon import FriendIcon
+from view.FriendIcon import FriendIcon
 
 class FriendsGroup(goocanvas.Group):
 	def __init__(self, shell_model):

shell/view/home/HomeGroup.py

@@ -1,7 +1,7 @@
 import goocanvas
 
-from home.DonutItem import DonutItem
+from view.home.DonutItem import DonutItem
-from home.MyIcon import MyIcon
+from view.home.MyIcon import MyIcon
 
 class TasksItem(DonutItem):
 	def __init__(self, shell_model):

shell/view/home/HomeWindow.py

@@ -3,9 +3,9 @@ import goocanvas
 import cairo
 
 from sugar.canvas.CanvasView import CanvasView
-from home.MeshGroup import MeshGroup
+from view.home.MeshGroup import MeshGroup
-from home.HomeGroup import HomeGroup
+from view.home.HomeGroup import HomeGroup
-from home.FriendsGroup import FriendsGroup
+from view.home.FriendsGroup import FriendsGroup
 import sugar
 
 class HomeWindow(gtk.Window):

shell/view/home/Makefile.am

@@ -1,4 +1,4 @@
-sugardir = $(pkgdatadir)/shell/home
+sugardir = $(pkgdatadir)/shell/view/home
 sugar_PYTHON =				\
 	__init__.py			\
 	DonutItem.py			\

shell/view/home/MeshGroup.py

@@ -6,7 +6,7 @@ import conf
 from sugar.canvas.IconItem import IconItem
 from sugar.canvas.IconItem import IconColor
 from sugar.presence import PresenceService
-from home.IconLayout import IconLayout
+from view.home.IconLayout import IconLayout
 
 class ActivityItem(IconItem):
 	def __init__(self, activity, service):