Move the model to his own module

12 files changed, 14 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 842a113..dfebdf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ shell/conf/Makefile
 shell/data/Makefile
 shell/home/Makefile
 shell/frame/Makefile
+shell/model/Makefile
 shell/PresenceService/Makefile
 sugar/Makefile
 sugar/__installed__.py
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 80aad02..69dbe87 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = conf data frame home PresenceService
+SUBDIRS = conf data frame home model PresenceService
 
 bin_SCRIPTS = 				\
 	sugar				\
@@ -15,9 +15,6 @@ sugar_PYTHON =				\
 	FirstTimeDialog.py		\
 	FriendIcon.py			\
 	FriendPopup.py			\
-	Friends.py			\
-	Invites.py			\
-	Owner.py			\
 	Shell.py			\
 	Session.py
 
diff --git a/shell/Session.py b/shell/Session.py
index 0bf3fa4..bbd1c73 100644
--- a/shell/Session.py
+++ b/shell/Session.py
@@ -2,7 +2,7 @@ import os
 import gtk
 
 from Shell import Shell
-from ShellModel import ShellModel
+from model.ShellModel import ShellModel
 from ConsoleWindow import ConsoleWindow
 from sugar import env
 from sugar import logger
diff --git a/shell/Shell.py b/shell/Shell.py
index 30a7957..30a7957 100755..100644
--- a/shell/Shell.py
+++ b/shell/Shell.py
diff --git a/shell/frame/RightPanel.py b/shell/frame/RightPanel.py
index 1bc27f5..c60cc46 100644
--- a/shell/frame/RightPanel.py
+++ b/shell/frame/RightPanel.py
@@ -5,7 +5,7 @@ from sugar.canvas.IconColor import IconColor
 from sugar.canvas.CanvasBox import CanvasBox
 from sugar.presence import PresenceService
 from FriendIcon import FriendIcon
-from Friends import Friend
+from model.Friends import Friend
 
 class RightPanel(CanvasBox):
 	def __init__(self, grid, shell_model):
diff --git a/shell/home/HomeGroup.py b/shell/home/HomeGroup.py
index 3834bda..90fc079 100644
--- a/shell/home/HomeGroup.py
+++ b/shell/home/HomeGroup.py
@@ -27,7 +27,6 @@ class TasksItem(DonutItem):
 	def _add(self, activity):
 		icon_name = activity.get_icon_name()
 		icon_color = activity.get_icon_color()
-		print 'Add activity %s' % icon_color.to_string()
 
 		item = self.add_piece(100 / 8, icon_name, icon_color)
 		item.get_icon().connect('clicked',
diff --git a/shell/Friends.py b/shell/model/Friends.py
index 6beca66..6beca66 100644
--- a/shell/Friends.py
+++ b/shell/model/Friends.py
diff --git a/shell/Invites.py b/shell/model/Invites.py
index 24f9913..24f9913 100644
--- a/shell/Invites.py
+++ b/shell/model/Invites.py
diff --git a/shell/model/Makefile.am b/shell/model/Makefile.am
new file mode 100644
index 0000000..2ce494b
--- /dev/null
+++ b/shell/model/Makefile.am
@@ -0,0 +1,7 @@
+sugardir = $(pkgdatadir)/shell/model
+sugar_PYTHON =			\
+	__init__.py		\
+	Friends.py		\
+	Invites.py		\
+	Owner.py		\
+	ShellModel.py
diff --git a/shell/Owner.py b/shell/model/Owner.py
index 7dec04a..7dec04a 100644
--- a/shell/Owner.py
+++ b/shell/model/Owner.py
diff --git a/shell/ShellModel.py b/shell/model/ShellModel.py
index c0c8bcc..2f9dd25 100644
--- a/shell/ShellModel.py
+++ b/shell/model/ShellModel.py
@@ -1,11 +1,11 @@
 import gobject
 
-from Owner import ShellOwner
 from sugar.presence import PresenceService
 from sugar.activity import ActivityFactory
 from sugar.activity import Activity
-from Friends import Friends
-from Invites import Invites
+from model.Friends import Friends
+from model.Invites import Invites
+from model.Owner import ShellOwner
 
 class ShellModel(gobject.GObject):
 	__gsignals__ = {
diff --git a/shell/model/__init__.py b/shell/model/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/shell/model/__init__.py