diff --git a/Makefile.am b/Makefile.am index e53e1181..3304a383 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = bin data lib po shell services +SUBDIRS = bin data lib po src service bin_SCRIPTS = \ sugar-emulator diff --git a/configure.ac b/configure.ac index 4c91829c..7e2202e1 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ AC_CONFIG_FILES([ bin/sugar bin/sugar-control-panel bin/sugar-shell -shell/config.py +src/config.py ]) AC_OUTPUT([ @@ -58,19 +58,18 @@ lib/sugar/clipboard/Makefile lib/sugar/graphics/Makefile lib/sugar/presence/Makefile lib/sugar/datastore/Makefile -services/Makefile -services/shell/Makefile -shell/Makefile -shell/controlpanel/Makefile -shell/intro/Makefile -shell/hardware/Makefile -shell/view/Makefile -shell/view/devices/Makefile -shell/view/devices/network/Makefile -shell/view/frame/Makefile -shell/view/home/Makefile -shell/model/Makefile -shell/model/devices/Makefile -shell/model/devices/network/Makefile +service/Makefile +src/Makefile +src/controlpanel/Makefile +src/intro/Makefile +src/hardware/Makefile +src/view/Makefile +src/view/devices/Makefile +src/view/devices/network/Makefile +src/view/frame/Makefile +src/view/home/Makefile +src/model/Makefile +src/model/devices/Makefile +src/model/devices/network/Makefile po/Makefile.in ]) diff --git a/services/shell/Makefile.am b/service/Makefile.am similarity index 100% rename from services/shell/Makefile.am rename to service/Makefile.am diff --git a/services/shell/__init__.py b/service/__init__.py similarity index 100% rename from services/shell/__init__.py rename to service/__init__.py diff --git a/services/shell/activityregistryservice.py b/service/activityregistryservice.py similarity index 100% rename from services/shell/activityregistryservice.py rename to service/activityregistryservice.py diff --git a/services/shell/bundleregistry.py b/service/bundleregistry.py similarity index 100% rename from services/shell/bundleregistry.py rename to service/bundleregistry.py diff --git a/services/shell/clipboardobject.py b/service/clipboardobject.py similarity index 100% rename from services/shell/clipboardobject.py rename to service/clipboardobject.py diff --git a/services/shell/clipboardservice.py b/service/clipboardservice.py similarity index 100% rename from services/shell/clipboardservice.py rename to service/clipboardservice.py diff --git a/services/shell/org.laptop.ActivityRegistry.service.in b/service/org.laptop.ActivityRegistry.service.in similarity index 100% rename from services/shell/org.laptop.ActivityRegistry.service.in rename to service/org.laptop.ActivityRegistry.service.in diff --git a/services/shell/org.laptop.Clipboard.service.in b/service/org.laptop.Clipboard.service.in similarity index 100% rename from services/shell/org.laptop.Clipboard.service.in rename to service/org.laptop.Clipboard.service.in diff --git a/services/shell/org.laptop.ObjectTypeRegistry.service.in b/service/org.laptop.ObjectTypeRegistry.service.in similarity index 100% rename from services/shell/org.laptop.ObjectTypeRegistry.service.in rename to service/org.laptop.ObjectTypeRegistry.service.in diff --git a/services/shell/sugar-shell-service b/service/sugar-shell-service similarity index 100% rename from services/shell/sugar-shell-service rename to service/sugar-shell-service diff --git a/services/Makefile.am b/services/Makefile.am deleted file mode 100644 index d7c539dc..00000000 --- a/services/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = shell diff --git a/shell/.gitignore b/src/.gitignore similarity index 100% rename from shell/.gitignore rename to src/.gitignore diff --git a/shell/Makefile.am b/src/Makefile.am similarity index 100% rename from shell/Makefile.am rename to src/Makefile.am diff --git a/shell/__init__.py b/src/__init__.py similarity index 100% rename from shell/__init__.py rename to src/__init__.py diff --git a/shell/config.py.in b/src/config.py.in similarity index 100% rename from shell/config.py.in rename to src/config.py.in diff --git a/shell/controlpanel/Makefile.am b/src/controlpanel/Makefile.am similarity index 100% rename from shell/controlpanel/Makefile.am rename to src/controlpanel/Makefile.am diff --git a/shell/controlpanel/__init__.py b/src/controlpanel/__init__.py similarity index 100% rename from shell/controlpanel/__init__.py rename to src/controlpanel/__init__.py diff --git a/shell/controlpanel/cmd.py b/src/controlpanel/cmd.py similarity index 100% rename from shell/controlpanel/cmd.py rename to src/controlpanel/cmd.py diff --git a/shell/controlpanel/control.py b/src/controlpanel/control.py similarity index 100% rename from shell/controlpanel/control.py rename to src/controlpanel/control.py diff --git a/shell/hardware/Makefile.am b/src/hardware/Makefile.am similarity index 100% rename from shell/hardware/Makefile.am rename to src/hardware/Makefile.am diff --git a/shell/hardware/NetworkManagerInfo.conf b/src/hardware/NetworkManagerInfo.conf similarity index 100% rename from shell/hardware/NetworkManagerInfo.conf rename to src/hardware/NetworkManagerInfo.conf diff --git a/shell/hardware/__init__.py b/src/hardware/__init__.py similarity index 100% rename from shell/hardware/__init__.py rename to src/hardware/__init__.py diff --git a/shell/hardware/hardwaremanager.py b/src/hardware/hardwaremanager.py similarity index 100% rename from shell/hardware/hardwaremanager.py rename to src/hardware/hardwaremanager.py diff --git a/shell/hardware/keydialog.py b/src/hardware/keydialog.py similarity index 100% rename from shell/hardware/keydialog.py rename to src/hardware/keydialog.py diff --git a/shell/hardware/nmclient.py b/src/hardware/nmclient.py similarity index 100% rename from shell/hardware/nmclient.py rename to src/hardware/nmclient.py diff --git a/shell/hardware/nminfo.py b/src/hardware/nminfo.py similarity index 100% rename from shell/hardware/nminfo.py rename to src/hardware/nminfo.py diff --git a/shell/hardware/schoolserver.py b/src/hardware/schoolserver.py similarity index 100% rename from shell/hardware/schoolserver.py rename to src/hardware/schoolserver.py diff --git a/shell/intro/Makefile.am b/src/intro/Makefile.am similarity index 100% rename from shell/intro/Makefile.am rename to src/intro/Makefile.am diff --git a/shell/intro/__init__.py b/src/intro/__init__.py similarity index 100% rename from shell/intro/__init__.py rename to src/intro/__init__.py diff --git a/shell/intro/colorpicker.py b/src/intro/colorpicker.py similarity index 100% rename from shell/intro/colorpicker.py rename to src/intro/colorpicker.py diff --git a/shell/intro/default-picture.png b/src/intro/default-picture.png similarity index 100% rename from shell/intro/default-picture.png rename to src/intro/default-picture.png diff --git a/shell/intro/glive.py b/src/intro/glive.py similarity index 100% rename from shell/intro/glive.py rename to src/intro/glive.py diff --git a/shell/intro/intro.py b/src/intro/intro.py similarity index 100% rename from shell/intro/intro.py rename to src/intro/intro.py diff --git a/shell/logsmanager.py b/src/logsmanager.py similarity index 100% rename from shell/logsmanager.py rename to src/logsmanager.py diff --git a/shell/main.py b/src/main.py similarity index 100% rename from shell/main.py rename to src/main.py diff --git a/shell/model/BuddyModel.py b/src/model/BuddyModel.py similarity index 100% rename from shell/model/BuddyModel.py rename to src/model/BuddyModel.py diff --git a/shell/model/Friends.py b/src/model/Friends.py similarity index 100% rename from shell/model/Friends.py rename to src/model/Friends.py diff --git a/shell/model/Invites.py b/src/model/Invites.py similarity index 100% rename from shell/model/Invites.py rename to src/model/Invites.py diff --git a/shell/model/Makefile.am b/src/model/Makefile.am similarity index 100% rename from shell/model/Makefile.am rename to src/model/Makefile.am diff --git a/shell/model/MeshModel.py b/src/model/MeshModel.py similarity index 100% rename from shell/model/MeshModel.py rename to src/model/MeshModel.py diff --git a/shell/model/Owner.py b/src/model/Owner.py similarity index 100% rename from shell/model/Owner.py rename to src/model/Owner.py diff --git a/shell/model/__init__.py b/src/model/__init__.py similarity index 100% rename from shell/model/__init__.py rename to src/model/__init__.py diff --git a/shell/model/accesspointmodel.py b/src/model/accesspointmodel.py similarity index 100% rename from shell/model/accesspointmodel.py rename to src/model/accesspointmodel.py diff --git a/shell/model/devices/Makefile.am b/src/model/devices/Makefile.am similarity index 100% rename from shell/model/devices/Makefile.am rename to src/model/devices/Makefile.am diff --git a/shell/model/devices/__init__.py b/src/model/devices/__init__.py similarity index 100% rename from shell/model/devices/__init__.py rename to src/model/devices/__init__.py diff --git a/shell/model/devices/battery.py b/src/model/devices/battery.py similarity index 100% rename from shell/model/devices/battery.py rename to src/model/devices/battery.py diff --git a/shell/model/devices/device.py b/src/model/devices/device.py similarity index 100% rename from shell/model/devices/device.py rename to src/model/devices/device.py diff --git a/shell/model/devices/devicesmodel.py b/src/model/devices/devicesmodel.py similarity index 100% rename from shell/model/devices/devicesmodel.py rename to src/model/devices/devicesmodel.py diff --git a/shell/model/devices/network/Makefile.am b/src/model/devices/network/Makefile.am similarity index 100% rename from shell/model/devices/network/Makefile.am rename to src/model/devices/network/Makefile.am diff --git a/shell/model/devices/network/__init__.py b/src/model/devices/network/__init__.py similarity index 100% rename from shell/model/devices/network/__init__.py rename to src/model/devices/network/__init__.py diff --git a/shell/model/devices/network/mesh.py b/src/model/devices/network/mesh.py similarity index 100% rename from shell/model/devices/network/mesh.py rename to src/model/devices/network/mesh.py diff --git a/shell/model/devices/network/wired.py b/src/model/devices/network/wired.py similarity index 100% rename from shell/model/devices/network/wired.py rename to src/model/devices/network/wired.py diff --git a/shell/model/devices/network/wireless.py b/src/model/devices/network/wireless.py similarity index 100% rename from shell/model/devices/network/wireless.py rename to src/model/devices/network/wireless.py diff --git a/shell/model/homeactivity.py b/src/model/homeactivity.py similarity index 100% rename from shell/model/homeactivity.py rename to src/model/homeactivity.py diff --git a/shell/model/homemodel.py b/src/model/homemodel.py similarity index 100% rename from shell/model/homemodel.py rename to src/model/homemodel.py diff --git a/shell/model/shellmodel.py b/src/model/shellmodel.py similarity index 100% rename from shell/model/shellmodel.py rename to src/model/shellmodel.py diff --git a/shell/shellservice.py b/src/shellservice.py similarity index 100% rename from shell/shellservice.py rename to src/shellservice.py diff --git a/shell/view/ActivityHost.py b/src/view/ActivityHost.py similarity index 100% rename from shell/view/ActivityHost.py rename to src/view/ActivityHost.py diff --git a/shell/view/BuddyIcon.py b/src/view/BuddyIcon.py similarity index 100% rename from shell/view/BuddyIcon.py rename to src/view/BuddyIcon.py diff --git a/shell/view/BuddyMenu.py b/src/view/BuddyMenu.py similarity index 100% rename from shell/view/BuddyMenu.py rename to src/view/BuddyMenu.py diff --git a/shell/view/Makefile.am b/src/view/Makefile.am similarity index 100% rename from shell/view/Makefile.am rename to src/view/Makefile.am diff --git a/shell/view/OverlayWindow.py b/src/view/OverlayWindow.py similarity index 100% rename from shell/view/OverlayWindow.py rename to src/view/OverlayWindow.py diff --git a/shell/view/Shell.py b/src/view/Shell.py similarity index 100% rename from shell/view/Shell.py rename to src/view/Shell.py diff --git a/shell/view/__init__.py b/src/view/__init__.py similarity index 100% rename from shell/view/__init__.py rename to src/view/__init__.py diff --git a/shell/view/clipboardicon.py b/src/view/clipboardicon.py similarity index 100% rename from shell/view/clipboardicon.py rename to src/view/clipboardicon.py diff --git a/shell/view/clipboardmenu.py b/src/view/clipboardmenu.py similarity index 100% rename from shell/view/clipboardmenu.py rename to src/view/clipboardmenu.py diff --git a/shell/view/devices/Makefile.am b/src/view/devices/Makefile.am similarity index 100% rename from shell/view/devices/Makefile.am rename to src/view/devices/Makefile.am diff --git a/shell/view/devices/__init__.py b/src/view/devices/__init__.py similarity index 100% rename from shell/view/devices/__init__.py rename to src/view/devices/__init__.py diff --git a/shell/view/devices/battery.py b/src/view/devices/battery.py similarity index 100% rename from shell/view/devices/battery.py rename to src/view/devices/battery.py diff --git a/shell/view/devices/deviceview.py b/src/view/devices/deviceview.py similarity index 100% rename from shell/view/devices/deviceview.py rename to src/view/devices/deviceview.py diff --git a/shell/view/devices/network/Makefile.am b/src/view/devices/network/Makefile.am similarity index 100% rename from shell/view/devices/network/Makefile.am rename to src/view/devices/network/Makefile.am diff --git a/shell/view/devices/network/__init__.py b/src/view/devices/network/__init__.py similarity index 100% rename from shell/view/devices/network/__init__.py rename to src/view/devices/network/__init__.py diff --git a/shell/view/devices/network/mesh.py b/src/view/devices/network/mesh.py similarity index 100% rename from shell/view/devices/network/mesh.py rename to src/view/devices/network/mesh.py diff --git a/shell/view/devices/network/wired.py b/src/view/devices/network/wired.py similarity index 100% rename from shell/view/devices/network/wired.py rename to src/view/devices/network/wired.py diff --git a/shell/view/devices/network/wireless.py b/src/view/devices/network/wireless.py similarity index 100% rename from shell/view/devices/network/wireless.py rename to src/view/devices/network/wireless.py diff --git a/shell/view/frame/Makefile.am b/src/view/frame/Makefile.am similarity index 100% rename from shell/view/frame/Makefile.am rename to src/view/frame/Makefile.am diff --git a/shell/view/frame/__init__.py b/src/view/frame/__init__.py similarity index 100% rename from shell/view/frame/__init__.py rename to src/view/frame/__init__.py diff --git a/shell/view/frame/activitiestray.py b/src/view/frame/activitiestray.py similarity index 100% rename from shell/view/frame/activitiestray.py rename to src/view/frame/activitiestray.py diff --git a/shell/view/frame/activitybutton.py b/src/view/frame/activitybutton.py similarity index 100% rename from shell/view/frame/activitybutton.py rename to src/view/frame/activitybutton.py diff --git a/shell/view/frame/clipboardbox.py b/src/view/frame/clipboardbox.py similarity index 100% rename from shell/view/frame/clipboardbox.py rename to src/view/frame/clipboardbox.py diff --git a/shell/view/frame/clipboardpanelwindow.py b/src/view/frame/clipboardpanelwindow.py similarity index 100% rename from shell/view/frame/clipboardpanelwindow.py rename to src/view/frame/clipboardpanelwindow.py diff --git a/shell/view/frame/eventarea.py b/src/view/frame/eventarea.py similarity index 100% rename from shell/view/frame/eventarea.py rename to src/view/frame/eventarea.py diff --git a/shell/view/frame/frame.py b/src/view/frame/frame.py similarity index 100% rename from shell/view/frame/frame.py rename to src/view/frame/frame.py diff --git a/shell/view/frame/frameinvoker.py b/src/view/frame/frameinvoker.py similarity index 100% rename from shell/view/frame/frameinvoker.py rename to src/view/frame/frameinvoker.py diff --git a/shell/view/frame/framewindow.py b/src/view/frame/framewindow.py similarity index 100% rename from shell/view/frame/framewindow.py rename to src/view/frame/framewindow.py diff --git a/shell/view/frame/friendstray.py b/src/view/frame/friendstray.py similarity index 100% rename from shell/view/frame/friendstray.py rename to src/view/frame/friendstray.py diff --git a/shell/view/frame/overlaybox.py b/src/view/frame/overlaybox.py similarity index 100% rename from shell/view/frame/overlaybox.py rename to src/view/frame/overlaybox.py diff --git a/shell/view/frame/zoomtoolbar.py b/src/view/frame/zoomtoolbar.py similarity index 100% rename from shell/view/frame/zoomtoolbar.py rename to src/view/frame/zoomtoolbar.py diff --git a/shell/view/home/FriendView.py b/src/view/home/FriendView.py similarity index 100% rename from shell/view/home/FriendView.py rename to src/view/home/FriendView.py diff --git a/shell/view/home/FriendsBox.py b/src/view/home/FriendsBox.py similarity index 100% rename from shell/view/home/FriendsBox.py rename to src/view/home/FriendsBox.py diff --git a/shell/view/home/HomeBox.py b/src/view/home/HomeBox.py similarity index 100% rename from shell/view/home/HomeBox.py rename to src/view/home/HomeBox.py diff --git a/shell/view/home/HomeWindow.py b/src/view/home/HomeWindow.py similarity index 100% rename from shell/view/home/HomeWindow.py rename to src/view/home/HomeWindow.py diff --git a/shell/view/home/Makefile.am b/src/view/home/Makefile.am similarity index 100% rename from shell/view/home/Makefile.am rename to src/view/home/Makefile.am diff --git a/shell/view/home/MeshBox.py b/src/view/home/MeshBox.py similarity index 100% rename from shell/view/home/MeshBox.py rename to src/view/home/MeshBox.py diff --git a/shell/view/home/MyIcon.py b/src/view/home/MyIcon.py similarity index 100% rename from shell/view/home/MyIcon.py rename to src/view/home/MyIcon.py diff --git a/shell/view/home/__init__.py b/src/view/home/__init__.py similarity index 100% rename from shell/view/home/__init__.py rename to src/view/home/__init__.py diff --git a/shell/view/home/activitiesdonut.py b/src/view/home/activitiesdonut.py similarity index 100% rename from shell/view/home/activitiesdonut.py rename to src/view/home/activitiesdonut.py diff --git a/shell/view/home/proc_smaps.py b/src/view/home/proc_smaps.py similarity index 100% rename from shell/view/home/proc_smaps.py rename to src/view/home/proc_smaps.py diff --git a/shell/view/home/snowflakelayout.py b/src/view/home/snowflakelayout.py similarity index 100% rename from shell/view/home/snowflakelayout.py rename to src/view/home/snowflakelayout.py diff --git a/shell/view/home/spreadlayout.py b/src/view/home/spreadlayout.py similarity index 100% rename from shell/view/home/spreadlayout.py rename to src/view/home/spreadlayout.py diff --git a/shell/view/home/transitionbox.py b/src/view/home/transitionbox.py similarity index 100% rename from shell/view/home/transitionbox.py rename to src/view/home/transitionbox.py diff --git a/shell/view/keyhandler.py b/src/view/keyhandler.py similarity index 100% rename from shell/view/keyhandler.py rename to src/view/keyhandler.py diff --git a/shell/view/pulsingicon.py b/src/view/pulsingicon.py similarity index 100% rename from shell/view/pulsingicon.py rename to src/view/pulsingicon.py