From dac6973687ae5d2aa1d8b28f29ca8ed3a8dd019e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 30 Sep 2008 21:31:36 +0000 Subject: Move home to his own module, rename to desktop. --- diff --git a/configure.ac b/configure.ac index 82b1bf0..dd17f7e 100644 --- a/configure.ac +++ b/configure.ac @@ -51,13 +51,13 @@ src/jarabe/controlpanel/frame/Makefile src/jarabe/controlpanel/language/Makefile src/jarabe/controlpanel/network/Makefile src/jarabe/controlpanel/power/Makefile +src/jarabe/desktop/Makefile src/jarabe/frame/Makefile src/jarabe/intro/Makefile src/jarabe/journal/Makefile src/jarabe/hardware/Makefile src/jarabe/view/Makefile src/jarabe/view/devices/Makefile -src/jarabe/view/home/Makefile src/jarabe/model/Makefile src/jarabe/model/devices/Makefile po/Makefile.in diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am index 57347cd..1b41dfb 100644 --- a/src/jarabe/Makefile.am +++ b/src/jarabe/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = controlpanel frame hardware journal model view intro +SUBDIRS = controlpanel desktop frame hardware journal model view intro sugardir = $(pythondir)/jarabe sugar_PYTHON = \ diff --git a/src/jarabe/view/home/FriendView.py b/src/jarabe/desktop/FriendView.py index f1e00b1..f1e00b1 100644 --- a/src/jarabe/view/home/FriendView.py +++ b/src/jarabe/desktop/FriendView.py diff --git a/src/jarabe/view/home/FriendsBox.py b/src/jarabe/desktop/FriendsBox.py index 42e5709..d4432c6 100644 --- a/src/jarabe/view/home/FriendsBox.py +++ b/src/jarabe/desktop/FriendsBox.py @@ -24,8 +24,8 @@ from sugar.graphics.icon import CanvasIcon, Icon from sugar.graphics.palette import Palette from jarabe.model import shellmodel -from jarabe.view.home.FriendView import FriendView -from jarabe.view.home.spreadlayout import SpreadLayout +from jarabe.desktop.FriendView import FriendView +from jarabe.desktop.spreadlayout import SpreadLayout class FriendsBox(hippo.Canvas): __gtype_name__ = 'SugarFriendsBox' diff --git a/src/jarabe/view/home/HomeBox.py b/src/jarabe/desktop/HomeBox.py index 9b38c48..a02b465 100644 --- a/src/jarabe/view/home/HomeBox.py +++ b/src/jarabe/desktop/HomeBox.py @@ -30,8 +30,8 @@ from sugar import profile from sugar import activity from sugar.bundle.activitybundle import ActivityBundle -from jarabe.view.home import favoritesview -from jarabe.view.home.activitieslist import ActivitiesList +from jarabe.desktop import favoritesview +from jarabe.desktop.activitieslist import ActivitiesList _FAVORITES_VIEW = 0 _LIST_VIEW = 1 diff --git a/src/jarabe/view/home/HomeWindow.py b/src/jarabe/desktop/HomeWindow.py index 0bc56a0..cdc1871 100644 --- a/src/jarabe/view/home/HomeWindow.py +++ b/src/jarabe/desktop/HomeWindow.py @@ -19,10 +19,10 @@ import gtk from sugar.graphics import style from sugar.graphics import palettegroup -from jarabe.view.home.MeshBox import MeshBox -from jarabe.view.home.HomeBox import HomeBox -from jarabe.view.home.FriendsBox import FriendsBox -from jarabe.view.home.transitionbox import TransitionBox +from jarabe.desktop.MeshBox import MeshBox +from jarabe.desktop.HomeBox import HomeBox +from jarabe.desktop.FriendsBox import FriendsBox +from jarabe.desktop.transitionbox import TransitionBox from jarabe.model.shellmodel import ShellModel from jarabe.model import shellmodel diff --git a/src/jarabe/view/home/Makefile.am b/src/jarabe/desktop/Makefile.am index c7d9a98..929c913 100644 --- a/src/jarabe/view/home/Makefile.am +++ b/src/jarabe/desktop/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/jarabe/view/home +sugardir = $(pythondir)/jarabe/desktop sugar_PYTHON = \ __init__.py \ activitieslist.py \ diff --git a/src/jarabe/view/home/MeshBox.py b/src/jarabe/desktop/MeshBox.py index fa95591..5dd8dfb 100644 --- a/src/jarabe/view/home/MeshBox.py +++ b/src/jarabe/desktop/MeshBox.py @@ -37,8 +37,8 @@ from jarabe.hardware import hardwaremanager from jarabe.hardware import nmclient from jarabe.view.BuddyIcon import BuddyIcon from jarabe.view.pulsingicon import CanvasPulsingIcon -from jarabe.view.home.snowflakelayout import SnowflakeLayout -from jarabe.view.home.spreadlayout import SpreadLayout +from jarabe.desktop.snowflakelayout import SnowflakeLayout +from jarabe.desktop.spreadlayout import SpreadLayout from jarabe.view import Shell from jarabe.hardware.nmclient import NM_802_11_CAP_PROTO_WEP, \ diff --git a/src/jarabe/view/home/MyIcon.py b/src/jarabe/desktop/MyIcon.py index af0f6ce..af0f6ce 100644 --- a/src/jarabe/view/home/MyIcon.py +++ b/src/jarabe/desktop/MyIcon.py diff --git a/src/jarabe/view/home/__init__.py b/src/jarabe/desktop/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/jarabe/view/home/__init__.py +++ b/src/jarabe/desktop/__init__.py diff --git a/src/jarabe/view/home/activitieslist.py b/src/jarabe/desktop/activitieslist.py index 3e6d2e7..3e6d2e7 100644 --- a/src/jarabe/view/home/activitieslist.py +++ b/src/jarabe/desktop/activitieslist.py diff --git a/src/jarabe/view/home/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py index e6b5c83..fe69e01 100644 --- a/src/jarabe/view/home/favoriteslayout.py +++ b/src/jarabe/desktop/favoriteslayout.py @@ -26,7 +26,7 @@ import hippo from sugar.graphics import style from sugar import activity -from jarabe.view.home.grid import Grid +from jarabe.desktop.grid import Grid _logger = logging.getLogger('FavoritesLayout') diff --git a/src/jarabe/view/home/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 71a49bf..e090186 100644 --- a/src/jarabe/view/home/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -33,8 +33,8 @@ from sugar import activity from jarabe.view import Shell from jarabe.view.palettes import JournalPalette from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette -from jarabe.view.home.MyIcon import MyIcon -from jarabe.view.home import favoriteslayout +from jarabe.desktop.MyIcon import MyIcon +from jarabe.desktop import favoriteslayout from jarabe.model import shellmodel from jarabe.hardware import schoolserver from jarabe.hardware.schoolserver import RegisterError diff --git a/src/jarabe/view/home/grid.py b/src/jarabe/desktop/grid.py index eb7fabc..eb7fabc 100644 --- a/src/jarabe/view/home/grid.py +++ b/src/jarabe/desktop/grid.py diff --git a/src/jarabe/view/home/proc_smaps.py b/src/jarabe/desktop/proc_smaps.py index 090a4cf..090a4cf 100755 --- a/src/jarabe/view/home/proc_smaps.py +++ b/src/jarabe/desktop/proc_smaps.py diff --git a/src/jarabe/view/home/snowflakelayout.py b/src/jarabe/desktop/snowflakelayout.py index 5782cff..5782cff 100644 --- a/src/jarabe/view/home/snowflakelayout.py +++ b/src/jarabe/desktop/snowflakelayout.py diff --git a/src/jarabe/view/home/spreadlayout.py b/src/jarabe/desktop/spreadlayout.py index 72261e7..ffc5bc7 100644 --- a/src/jarabe/view/home/spreadlayout.py +++ b/src/jarabe/desktop/spreadlayout.py @@ -20,7 +20,7 @@ import gtk from sugar.graphics import style -from jarabe.view.home.grid import Grid +from jarabe.desktop.grid import Grid _CELL_SIZE = 4.0 diff --git a/src/jarabe/view/home/transitionbox.py b/src/jarabe/desktop/transitionbox.py index 230b887..47510de 100644 --- a/src/jarabe/view/home/transitionbox.py +++ b/src/jarabe/desktop/transitionbox.py @@ -20,7 +20,7 @@ import gobject from sugar.graphics import style from sugar.graphics import animator -from jarabe.view.home.MyIcon import MyIcon +from jarabe.desktop.MyIcon import MyIcon class _Animation(animator.Animation): def __init__(self, icon, start_size, end_size): diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am index 2f24e29..b22171b 100644 --- a/src/jarabe/view/Makefile.am +++ b/src/jarabe/view/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = devices home +SUBDIRS = devices sugardir = $(pythondir)/jarabe/view sugar_PYTHON = \ diff --git a/src/jarabe/view/Shell.py b/src/jarabe/view/Shell.py index b1e596f..1512a6b 100644 --- a/src/jarabe/view/Shell.py +++ b/src/jarabe/view/Shell.py @@ -61,7 +61,7 @@ class Shell(gobject.GObject): from jarabe.frame import frame self._frame = frame.get_instance() - from jarabe.view.home.HomeWindow import HomeWindow + from jarabe.desktop.HomeWindow import HomeWindow self.home_window = HomeWindow() self.home_window.show() -- cgit v0.9.1