From 091adf5ee3ae797507328ab72225133039dfdebb Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 28 Sep 2008 10:27:47 +0000 Subject: Move the shell code into site-packages. --- diff --git a/bin/.gitignore b/bin/.gitignore index 9f9897c..9e78b64 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,5 +1 @@ -sugar-control-panel -sugar-emulator -sugar-shell sugar-shell-service -sugar-ui-check diff --git a/bin/sugar.in b/bin/sugar index 88e478a..88e478a 100644 --- a/bin/sugar.in +++ b/bin/sugar diff --git a/bin/sugar-backup b/bin/sugar-backup deleted file mode 100644 index c90da63..0000000 --- a/bin/sugar-backup +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import sys -import time - -i = 0 -while i <= 100: - time.sleep(0.5) - sys.stdout.write('%d\n' % i) - sys.stdout.flush() - i += 5 diff --git a/bin/sugar-emulator.in b/bin/sugar-control-panel index 1ee6fc5..4f14e77 100644 --- a/bin/sugar-emulator.in +++ b/bin/sugar-control-panel @@ -15,11 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import sys - -sys.path.insert(0, '@prefix@/share/sugar/shell') - -from emulator import main +from jarube.controlpanel.cmd import main main() diff --git a/bin/sugar-control-panel.in b/bin/sugar-emulator index 922f95c..c42612b 100644 --- a/bin/sugar-control-panel.in +++ b/bin/sugar-emulator @@ -15,11 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import sys - -sys.path.insert(0, '@prefix@/share/sugar/shell') - -from controlpanel.cmd import main +from jarube.emulator import main main() diff --git a/bin/sugar-shell.in b/bin/sugar-shell index 55a25a7..176196b 100644 --- a/bin/sugar-shell.in +++ b/bin/sugar-shell @@ -16,7 +16,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import os -import sys if os.environ.has_key('SUGAR_THEME'): theme = os.environ['SUGAR_THEME'] @@ -25,9 +24,7 @@ else: os.environ['GTK2_RC_FILES'] = '@prefix@/share/sugar/data/%s.gtkrc' % theme -sys.path.insert(0, '@prefix@/share/sugar/shell') - -from main import main +from jarube.main import main main() diff --git a/bin/sugar-ui-check.in b/bin/sugar-ui-check index 03166ab..edf0c62 100644 --- a/bin/sugar-ui-check.in +++ b/bin/sugar-ui-check @@ -15,11 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import sys - -sys.path.insert(0, '@prefix@/share/sugar/shell') - -import uicheck +import jarube.uicheck uicheck.main() diff --git a/configure.ac b/configure.ac index ff8ed2b..d63d5af 100644 --- a/configure.ac +++ b/configure.ac @@ -30,11 +30,6 @@ AC_ARG_ENABLE(update-mimedb, AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) AC_CONFIG_FILES([ -bin/sugar -bin/sugar-control-panel -bin/sugar-emulator -bin/sugar-ui-check -bin/sugar-shell bin/sugar-shell-service service/config.py src/config.py @@ -46,25 +41,25 @@ bin/Makefile data/Makefile data/icons/Makefile service/Makefile -src/Makefile -src/controlpanel/Makefile -src/controlpanel/aboutme/Makefile -src/controlpanel/aboutxo/Makefile -src/controlpanel/datetime/Makefile -src/controlpanel/frame/Makefile -src/controlpanel/language/Makefile -src/controlpanel/network/Makefile -src/controlpanel/power/Makefile -src/intro/Makefile -src/journal/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 +src/jarube/Makefile +src/jarube/controlpanel/Makefile +src/jarube/controlpanel/aboutme/Makefile +src/jarube/controlpanel/aboutxo/Makefile +src/jarube/controlpanel/datetime/Makefile +src/jarube/controlpanel/frame/Makefile +src/jarube/controlpanel/language/Makefile +src/jarube/controlpanel/network/Makefile +src/jarube/controlpanel/power/Makefile +src/jarube/intro/Makefile +src/jarube/journal/Makefile +src/jarube/hardware/Makefile +src/jarube/view/Makefile +src/jarube/view/devices/Makefile +src/jarube/view/devices/network/Makefile +src/jarube/view/frame/Makefile +src/jarube/view/home/Makefile +src/jarube/model/Makefile +src/jarube/model/devices/Makefile +src/jarube/model/devices/network/Makefile po/Makefile.in ]) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index e1da7ce..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = controlpanel hardware journal model view intro - -sugardir = $(pkgdatadir)/shell -sugar_PYTHON = \ - config.py \ - emulator.py \ - logsmanager.py \ - main.py \ - session.py \ - shellservice.py \ - uicheck.py - -EXTRA_DIST = $(bin_SCRIPTS) $(conf_DATA) diff --git a/src/controlpanel/language/Makefile.am b/src/controlpanel/language/Makefile.am deleted file mode 100644 index 53bd236..0000000 --- a/src/controlpanel/language/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/language - -sugar_PYTHON = \ - __init__.py \ - model.py \ - view.py diff --git a/src/.gitignore b/src/jarabe/.gitignore index 4acd06b..4acd06b 100644 --- a/src/.gitignore +++ b/src/jarabe/.gitignore diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am new file mode 100644 index 0000000..83571a4 --- /dev/null +++ b/src/jarabe/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = jarabe diff --git a/src/__init__.py b/src/jarabe/__init__.py index 41b4b1c..41b4b1c 100644 --- a/src/__init__.py +++ b/src/jarabe/__init__.py diff --git a/src/config.py.in b/src/jarabe/config.py.in index 7469b00..7469b00 100644 --- a/src/config.py.in +++ b/src/jarabe/config.py.in diff --git a/src/controlpanel/Makefile.am b/src/jarabe/controlpanel/Makefile.am index 8fa3bbe..7d17b4f 100644 --- a/src/controlpanel/Makefile.am +++ b/src/jarabe/controlpanel/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = aboutme aboutxo datetime frame language network power -sugardir = $(pkgdatadir)/shell/controlpanel +sugardir = $(pythondir)/jarabe/controlpanel sugar_PYTHON = \ __init__.py \ cmd.py \ diff --git a/src/controlpanel/__init__.py b/src/jarabe/controlpanel/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/controlpanel/__init__.py +++ b/src/jarabe/controlpanel/__init__.py diff --git a/src/controlpanel/aboutxo/Makefile.am b/src/jarabe/controlpanel/aboutme/Makefile.am index a9463e0..da77593 100644 --- a/src/controlpanel/aboutxo/Makefile.am +++ b/src/jarabe/controlpanel/aboutme/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/aboutxo +sugardir = $(pythondir)/jarabe/controlpanel/aboutme sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/aboutme/__init__.py b/src/jarabe/controlpanel/aboutme/__init__.py index b683e28..b683e28 100644 --- a/src/controlpanel/aboutme/__init__.py +++ b/src/jarabe/controlpanel/aboutme/__init__.py diff --git a/src/controlpanel/aboutme/model.py b/src/jarabe/controlpanel/aboutme/model.py index 3818792..3818792 100644 --- a/src/controlpanel/aboutme/model.py +++ b/src/jarabe/controlpanel/aboutme/model.py diff --git a/src/controlpanel/aboutme/view.py b/src/jarabe/controlpanel/aboutme/view.py index a871871..fc4f351 100644 --- a/src/controlpanel/aboutme/view.py +++ b/src/jarabe/controlpanel/aboutme/view.py @@ -23,8 +23,8 @@ from sugar.graphics import style from sugar.graphics.xocolor import XoColor from sugar import profile -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert CLASS = 'AboutMe' ICON = 'module-about_me' diff --git a/src/controlpanel/network/Makefile.am b/src/jarabe/controlpanel/aboutxo/Makefile.am index b02d5c2..77cb5d8 100644 --- a/src/controlpanel/network/Makefile.am +++ b/src/jarabe/controlpanel/aboutxo/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/network +sugardir = $(pythondir)/jarabe/controlpanel/aboutxo sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/aboutxo/__init__.py b/src/jarabe/controlpanel/aboutxo/__init__.py index 4dc2cb2..4dc2cb2 100644 --- a/src/controlpanel/aboutxo/__init__.py +++ b/src/jarabe/controlpanel/aboutxo/__init__.py diff --git a/src/controlpanel/aboutxo/model.py b/src/jarabe/controlpanel/aboutxo/model.py index ebbcca7..ebbcca7 100644 --- a/src/controlpanel/aboutxo/model.py +++ b/src/jarabe/controlpanel/aboutxo/model.py diff --git a/src/controlpanel/aboutxo/view.py b/src/jarabe/controlpanel/aboutxo/view.py index f85e8d2..e18d38d 100644 --- a/src/controlpanel/aboutxo/view.py +++ b/src/jarabe/controlpanel/aboutxo/view.py @@ -21,7 +21,7 @@ from gettext import gettext as _ import config from sugar.graphics import style -from controlpanel.sectionview import SectionView +from jarabe.controlpanel.sectionview import SectionView class AboutXO(SectionView): def __init__(self, model, alerts=None): diff --git a/src/controlpanel/cmd.py b/src/jarabe/controlpanel/cmd.py index 8e41af5..8e41af5 100644 --- a/src/controlpanel/cmd.py +++ b/src/jarabe/controlpanel/cmd.py diff --git a/src/controlpanel/datetime/Makefile.am b/src/jarabe/controlpanel/datetime/Makefile.am index 47ec21a..f522683 100644 --- a/src/controlpanel/datetime/Makefile.am +++ b/src/jarabe/controlpanel/datetime/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/datetime +sugardir = $(pythondir)/jarabe/controlpanel/datetime sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/datetime/__init__.py b/src/jarabe/controlpanel/datetime/__init__.py index fc9be45..fc9be45 100644 --- a/src/controlpanel/datetime/__init__.py +++ b/src/jarabe/controlpanel/datetime/__init__.py diff --git a/src/controlpanel/datetime/model.py b/src/jarabe/controlpanel/datetime/model.py index 4a4c560..4a4c560 100644 --- a/src/controlpanel/datetime/model.py +++ b/src/jarabe/controlpanel/datetime/model.py diff --git a/src/controlpanel/datetime/view.py b/src/jarabe/controlpanel/datetime/view.py index ed788f7..58719b4 100644 --- a/src/controlpanel/datetime/view.py +++ b/src/jarabe/controlpanel/datetime/view.py @@ -21,8 +21,8 @@ from gettext import gettext as _ from sugar.graphics import style from sugar.graphics import iconentry -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert class TimeZone(SectionView): def __init__(self, model, alerts): diff --git a/src/controlpanel/frame/Makefile.am b/src/jarabe/controlpanel/frame/Makefile.am index 3fa3847..10e2b40 100644 --- a/src/controlpanel/frame/Makefile.am +++ b/src/jarabe/controlpanel/frame/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/frame +sugardir = $(pythondir)/jarabe/controlpanel/frame sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/frame/__init__.py b/src/jarabe/controlpanel/frame/__init__.py index a93f9c7..a93f9c7 100644 --- a/src/controlpanel/frame/__init__.py +++ b/src/jarabe/controlpanel/frame/__init__.py diff --git a/src/controlpanel/frame/model.py b/src/jarabe/controlpanel/frame/model.py index 0e19703..0e19703 100644 --- a/src/controlpanel/frame/model.py +++ b/src/jarabe/controlpanel/frame/model.py diff --git a/src/controlpanel/frame/view.py b/src/jarabe/controlpanel/frame/view.py index eba8361..7ab7bd2 100644 --- a/src/controlpanel/frame/view.py +++ b/src/jarabe/controlpanel/frame/view.py @@ -20,8 +20,8 @@ from gettext import gettext as _ from sugar.graphics import style -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert _never = _('never') _instantaneous = _('instantaneous') diff --git a/src/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py index 11f93cd..a0e4498 100644 --- a/src/controlpanel/gui.py +++ b/src/jarabe/controlpanel/gui.py @@ -26,8 +26,8 @@ from sugar.graphics.alert import Alert import config from session import get_session_manager -from controlpanel.toolbar import MainToolbar -from controlpanel.toolbar import SectionToolbar +from jarabe.controlpanel.toolbar import MainToolbar +from jarabe.controlpanel.toolbar import SectionToolbar _logger = logging.getLogger('ControlPanel') _MAX_COLUMNS = 5 diff --git a/src/controlpanel/inlinealert.py b/src/jarabe/controlpanel/inlinealert.py index 619a379..619a379 100644 --- a/src/controlpanel/inlinealert.py +++ b/src/jarabe/controlpanel/inlinealert.py diff --git a/src/controlpanel/frame/Makefile.am b/src/jarabe/controlpanel/language/Makefile.am index 3fa3847..ed8992c 100644 --- a/src/controlpanel/frame/Makefile.am +++ b/src/jarabe/controlpanel/language/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/frame +sugardir = $(pythondir)/jarabe/controlpanel/language sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/language/__init__.py b/src/jarabe/controlpanel/language/__init__.py index a8f9f08..a8f9f08 100644 --- a/src/controlpanel/language/__init__.py +++ b/src/jarabe/controlpanel/language/__init__.py diff --git a/src/controlpanel/language/model.py b/src/jarabe/controlpanel/language/model.py index 404d9dd..404d9dd 100644 --- a/src/controlpanel/language/model.py +++ b/src/jarabe/controlpanel/language/model.py diff --git a/src/controlpanel/language/view.py b/src/jarabe/controlpanel/language/view.py index 5d423eb..71a185f 100644 --- a/src/controlpanel/language/view.py +++ b/src/jarabe/controlpanel/language/view.py @@ -21,8 +21,8 @@ from gettext import gettext as _ from sugar.graphics import style from sugar.graphics import iconentry -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert class Language(SectionView): def __init__(self, model, alerts): diff --git a/src/controlpanel/aboutme/Makefile.am b/src/jarabe/controlpanel/network/Makefile.am index a53cdb9..e480aa3 100644 --- a/src/controlpanel/aboutme/Makefile.am +++ b/src/jarabe/controlpanel/network/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/aboutme +sugardir = $(pythondir)/jarabe/controlpanel/network sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/network/__init__.py b/src/jarabe/controlpanel/network/__init__.py index 8fea274..8fea274 100644 --- a/src/controlpanel/network/__init__.py +++ b/src/jarabe/controlpanel/network/__init__.py diff --git a/src/controlpanel/network/model.py b/src/jarabe/controlpanel/network/model.py index cbe0473..b6f71a0 100644 --- a/src/controlpanel/network/model.py +++ b/src/jarabe/controlpanel/network/model.py @@ -19,7 +19,7 @@ import dbus from gettext import gettext as _ from sugar import profile -from hardware import hardwaremanager +from jarabe.hardware import hardwaremanager NM_SERVICE_NAME = 'org.freedesktop.NetworkManager' NM_SERVICE_PATH = '/org/freedesktop/NetworkManager' diff --git a/src/controlpanel/network/view.py b/src/jarabe/controlpanel/network/view.py index 2b19656..4f4ada7 100644 --- a/src/controlpanel/network/view.py +++ b/src/jarabe/controlpanel/network/view.py @@ -20,8 +20,8 @@ from gettext import gettext as _ from sugar.graphics import style -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert CLASS = 'Network' ICON = 'module-network' diff --git a/src/controlpanel/power/Makefile.am b/src/jarabe/controlpanel/power/Makefile.am index 21cf5ef..e989e97 100644 --- a/src/controlpanel/power/Makefile.am +++ b/src/jarabe/controlpanel/power/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/power +sugardir = $(pythondir)/jarabe/controlpanel/power sugar_PYTHON = \ __init__.py \ diff --git a/src/controlpanel/power/__init__.py b/src/jarabe/controlpanel/power/__init__.py index 8b2e85f..8b2e85f 100644 --- a/src/controlpanel/power/__init__.py +++ b/src/jarabe/controlpanel/power/__init__.py diff --git a/src/controlpanel/power/model.py b/src/jarabe/controlpanel/power/model.py index 47af483..47af483 100644 --- a/src/controlpanel/power/model.py +++ b/src/jarabe/controlpanel/power/model.py diff --git a/src/controlpanel/power/view.py b/src/jarabe/controlpanel/power/view.py index e2efa3b..8f1ed56 100644 --- a/src/controlpanel/power/view.py +++ b/src/jarabe/controlpanel/power/view.py @@ -19,8 +19,8 @@ from gettext import gettext as _ from sugar.graphics import style -from controlpanel.sectionview import SectionView -from controlpanel.inlinealert import InlineAlert +from jarabe.controlpanel.sectionview import SectionView +from jarabe.controlpanel.inlinealert import InlineAlert class Power(SectionView): def __init__(self, model, alerts): diff --git a/src/controlpanel/sectionview.py b/src/jarabe/controlpanel/sectionview.py index 7b76aa1..7b76aa1 100644 --- a/src/controlpanel/sectionview.py +++ b/src/jarabe/controlpanel/sectionview.py diff --git a/src/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py index 6bb8328..6bb8328 100644 --- a/src/controlpanel/toolbar.py +++ b/src/jarabe/controlpanel/toolbar.py diff --git a/src/emulator.py b/src/jarabe/emulator.py index ac1f4e2..ac1f4e2 100755 --- a/src/emulator.py +++ b/src/jarabe/emulator.py diff --git a/src/hardware/Makefile.am b/src/jarabe/hardware/Makefile.am index 8cd9c77..6684848 100644 --- a/src/hardware/Makefile.am +++ b/src/jarabe/hardware/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/hardware +sugardir = $(pythondir)/jarabe/hardware sugar_PYTHON = \ __init__.py \ hardwaremanager.py \ diff --git a/src/hardware/NetworkManagerInfo.conf b/src/jarabe/hardware/NetworkManagerInfo.conf index 4fb8270..4fb8270 100644 --- a/src/hardware/NetworkManagerInfo.conf +++ b/src/jarabe/hardware/NetworkManagerInfo.conf diff --git a/src/hardware/__init__.py b/src/jarabe/hardware/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/hardware/__init__.py +++ b/src/jarabe/hardware/__init__.py diff --git a/src/hardware/hardwaremanager.py b/src/jarabe/hardware/hardwaremanager.py index c4f9f75..22cb1db 100644 --- a/src/hardware/hardwaremanager.py +++ b/src/jarabe/hardware/hardwaremanager.py @@ -19,7 +19,7 @@ import logging import dbus import gobject -from hardware.nmclient import NMClient +from jarabe.hardware.nmclient import NMClient from sugar.profile import get_profile from sugar import env from sugar import _sugarext diff --git a/src/hardware/keydialog.py b/src/jarabe/hardware/keydialog.py index 781f77a..e70e12b 100644 --- a/src/hardware/keydialog.py +++ b/src/jarabe/hardware/keydialog.py @@ -206,7 +206,7 @@ class WEPKeyDialog(KeyDialog): def create_security(self): (we_cipher, key, auth_alg) = self._get_security() - from hardware.nminfo import Security + from jarabe.hardware.nminfo import Security return Security.new_from_args(we_cipher, (key, auth_alg)) def _update_response_sensitivity(self, ignored=None): @@ -296,7 +296,7 @@ class WPAKeyDialog(KeyDialog): def create_security(self): (we_cipher, key, wpa_ver) = self._get_security() - from hardware.nminfo import Security + from jarabe.hardware.nminfo import Security return Security.new_from_args(we_cipher, (key, wpa_ver, IW_AUTH_KEY_MGMT_PSK)) diff --git a/src/hardware/nmclient.py b/src/jarabe/hardware/nmclient.py index cf77452..b1921aa 100644 --- a/src/hardware/nmclient.py +++ b/src/jarabe/hardware/nmclient.py @@ -22,7 +22,7 @@ import dbus.glib import dbus.decorators import gobject -from hardware import nminfo +from jarabe.hardware import nminfo from sugar.graphics import xocolor IW_AUTH_ALG_OPEN_SYSTEM = 0x00000001 diff --git a/src/hardware/nminfo.py b/src/jarabe/hardware/nminfo.py index a6c956a..64c5ab3 100644 --- a/src/hardware/nminfo.py +++ b/src/jarabe/hardware/nminfo.py @@ -26,7 +26,7 @@ import dbus.service from sugar import env -from hardware import keydialog +from jarabe.hardware import keydialog IW_AUTH_KEY_MGMT_802_1X = 0x1 IW_AUTH_KEY_MGMT_PSK = 0x2 @@ -483,7 +483,7 @@ class NMInfo(object): def get_key_for_network(self, dev_op, net_op, ssid, attempt, new_key, async_cb, async_err_cb): - from hardware import nmclient + from jarabe.hardware import nmclient if not isinstance(ssid, unicode): raise ValueError("Invalid arguments; ssid must be unicode.") diff --git a/src/hardware/schoolserver.py b/src/jarabe/hardware/schoolserver.py index a9ed60b..a9ed60b 100644 --- a/src/hardware/schoolserver.py +++ b/src/jarabe/hardware/schoolserver.py diff --git a/src/intro/Makefile.am b/src/jarabe/intro/Makefile.am index 089c84a..b9ddcf4 100644 --- a/src/intro/Makefile.am +++ b/src/jarabe/intro/Makefile.am @@ -2,7 +2,7 @@ imagedir = $(pkgdatadir)/shell/intro image_DATA = default-picture.png EXTRA_DIST = $(conf_DATA) $(image_DATA) -sugardir = $(pkgdatadir)/shell/intro +sugardir = $(pythondir)/jarabe/intro sugar_PYTHON = \ __init__.py \ colorpicker.py \ diff --git a/src/intro/__init__.py b/src/jarabe/intro/__init__.py index e69de29..e69de29 100644 --- a/src/intro/__init__.py +++ b/src/jarabe/intro/__init__.py diff --git a/src/intro/colorpicker.py b/src/jarabe/intro/colorpicker.py index a939857..a939857 100644 --- a/src/intro/colorpicker.py +++ b/src/jarabe/intro/colorpicker.py diff --git a/src/intro/default-picture.png b/src/jarabe/intro/default-picture.png index e26b9b0..e26b9b0 100644 --- a/src/intro/default-picture.png +++ b/src/jarabe/intro/default-picture.png Binary files differ diff --git a/src/intro/window.py b/src/jarabe/intro/window.py index fd8e00c..be1a963 100644 --- a/src/intro/window.py +++ b/src/jarabe/intro/window.py @@ -29,7 +29,7 @@ from sugar.graphics.entry import CanvasEntry from sugar.graphics.xocolor import XoColor from sugar.profile import get_profile -from intro import colorpicker +from jarabe.intro import colorpicker _BACKGROUND_COLOR = style.COLOR_WHITE diff --git a/src/journal/Makefile.am b/src/jarabe/journal/Makefile.am index f9944e6..11886d6 100644 --- a/src/journal/Makefile.am +++ b/src/jarabe/journal/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/journal +sugardir = $(pythondir)/jarabe/journal sugar_PYTHON = \ __init__.py \ collapsedentry.py \ diff --git a/src/journal/__init__.py b/src/jarabe/journal/__init__.py index e69de29..e69de29 100644 --- a/src/journal/__init__.py +++ b/src/jarabe/journal/__init__.py diff --git a/src/journal/collapsedentry.py b/src/jarabe/journal/collapsedentry.py index cc5a951..235ac4c 100644 --- a/src/journal/collapsedentry.py +++ b/src/jarabe/journal/collapsedentry.py @@ -28,9 +28,9 @@ from sugar.graphics import style from sugar.datastore import datastore from sugar.graphics.entry import CanvasEntry -from journal.keepicon import KeepIcon -from journal.palettes import ObjectPalette, BuddyPalette -from journal import misc +from jarabe.journal.keepicon import KeepIcon +from jarabe.journal.palettes import ObjectPalette, BuddyPalette +from jarabe.journal import misc class BuddyIcon(CanvasIcon): def __init__(self, buddy, **kwargs): diff --git a/src/journal/detailview.py b/src/jarabe/journal/detailview.py index 3e9a721..5748d6f 100644 --- a/src/journal/detailview.py +++ b/src/jarabe/journal/detailview.py @@ -25,7 +25,7 @@ from sugar.graphics import style from sugar.graphics.icon import CanvasIcon from sugar.datastore import datastore -from journal.expandedentry import ExpandedEntry +from jarabe.journal.expandedentry import ExpandedEntry class DetailView(gtk.VBox): __gtype_name__ = 'DetailView' diff --git a/src/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index 4644bbb..8957728 100644 --- a/src/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -30,9 +30,9 @@ from sugar.graphics.xocolor import XoColor from sugar.graphics.entry import CanvasEntry from sugar.datastore import datastore -from journal.keepicon import KeepIcon -from journal.palettes import ObjectPalette, BuddyPalette -from journal import misc +from jarabe.journal.keepicon import KeepIcon +from jarabe.journal.palettes import ObjectPalette, BuddyPalette +from jarabe.journal import misc class Separator(hippo.CanvasBox, hippo.CanvasItem): def __init__(self, orientation): diff --git a/src/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index c83ca46..51f0c61 100644 --- a/src/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -33,14 +33,14 @@ from sugar import env from sugar.activity import activityfactory from sugar import wm -from journal.journaltoolbox import MainToolbox, DetailToolbox -from journal.listview import ListView -from journal.detailview import DetailView -from journal.volumestoolbar import VolumesToolbar -from journal import misc -from journal.journalentrybundle import JournalEntryBundle -from journal.objectchooser import ObjectChooser -from journal.modalalert import ModalAlert +from jarabe.journal.journaltoolbox import MainToolbox, DetailToolbox +from jarabe.journal.listview import ListView +from jarabe.journal.detailview import DetailView +from jarabe.journal.volumestoolbar import VolumesToolbar +from jarabe.journal import misc +from jarabe.journal.journalentrybundle import JournalEntryBundle +from jarabe.journal.objectchooser import ObjectChooser +from jarabe.journal.modalalert import ModalAlert DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' diff --git a/src/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py index 8862ca3..8862ca3 100644 --- a/src/journal/journalentrybundle.py +++ b/src/jarabe/journal/journalentrybundle.py diff --git a/src/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py index b1391f9..8d52a06 100644 --- a/src/journal/journaltoolbox.py +++ b/src/jarabe/journal/journaltoolbox.py @@ -35,8 +35,8 @@ from sugar import profile from sugar import mime from sugar.datastore import datastore -from journal import volumesmanager -from journal import misc +from jarabe.journal import volumesmanager +from jarabe.journal import misc _AUTOSEARCH_TIMEOUT = 1000 diff --git a/src/journal/keepicon.py b/src/jarabe/journal/keepicon.py index 8a86c83..8a86c83 100644 --- a/src/journal/keepicon.py +++ b/src/jarabe/journal/keepicon.py diff --git a/src/journal/listview.py b/src/jarabe/journal/listview.py index a0f71e5..befc7f4 100644 --- a/src/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -27,8 +27,8 @@ import dbus from sugar.graphics import style from sugar.graphics.icon import CanvasIcon -from journal.collapsedentry import CollapsedEntry -from journal import query +from jarabe.journal.collapsedentry import CollapsedEntry +from jarabe.journal import query DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' diff --git a/src/journal/misc.py b/src/jarabe/journal/misc.py index 566769b..42d179b 100644 --- a/src/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -32,7 +32,7 @@ from sugar.bundle.contentbundle import ContentBundle from sugar.bundle.bundle import MalformedBundleException from sugar import util -from journal.journalentrybundle import JournalEntryBundle +from jarabe.journal.journalentrybundle import JournalEntryBundle def _get_icon_file_name(icon_name): icon_theme = gtk.icon_theme_get_default() diff --git a/src/journal/modalalert.py b/src/jarabe/journal/modalalert.py index 6c7bce9..6c7bce9 100644 --- a/src/journal/modalalert.py +++ b/src/jarabe/journal/modalalert.py diff --git a/src/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py index 00e4a26..947141d 100644 --- a/src/journal/objectchooser.py +++ b/src/jarabe/journal/objectchooser.py @@ -25,10 +25,10 @@ from sugar.graphics import style from sugar.graphics.toolbutton import ToolButton from sugar.datastore import datastore -from journal.listview import ListView -from journal.collapsedentry import BaseCollapsedEntry -from journal.journaltoolbox import SearchToolbar -from journal.volumestoolbar import VolumesToolbar +from jarabe.journal.listview import ListView +from jarabe.journal.collapsedentry import BaseCollapsedEntry +from jarabe.journal.journaltoolbox import SearchToolbar +from jarabe.journal.volumestoolbar import VolumesToolbar class ObjectChooser(gtk.Window): diff --git a/src/journal/palettes.py b/src/jarabe/journal/palettes.py index 2800ca5..dfed3b9 100644 --- a/src/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -27,7 +27,7 @@ from sugar.graphics.icon import Icon from sugar.datastore import datastore from sugar.graphics.xocolor import XoColor -from journal import misc +from jarabe.journal import misc class ObjectPalette(Palette): def __init__(self, jobject): diff --git a/src/journal/query.py b/src/jarabe/journal/query.py index 04d9b16..04d9b16 100644 --- a/src/journal/query.py +++ b/src/jarabe/journal/query.py diff --git a/src/journal/volumesmanager.py b/src/jarabe/journal/volumesmanager.py index b2ef08d..b2ef08d 100644 --- a/src/journal/volumesmanager.py +++ b/src/jarabe/journal/volumesmanager.py diff --git a/src/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py index 372db8b..f4f21db 100644 --- a/src/journal/volumestoolbar.py +++ b/src/jarabe/journal/volumestoolbar.py @@ -24,7 +24,7 @@ from sugar.datastore import datastore from sugar.graphics.radiotoolbutton import RadioToolButton from sugar.graphics.palette import Palette -from journal import volumesmanager +from jarabe.journal import volumesmanager class VolumesToolbar(gtk.Toolbar): __gtype_name__ = 'VolumesToolbar' diff --git a/src/logsmanager.py b/src/jarabe/logsmanager.py index 9360211..9360211 100644 --- a/src/logsmanager.py +++ b/src/jarabe/logsmanager.py diff --git a/src/main.py b/src/jarabe/main.py index e14b5d6..b8fab9b 100644 --- a/src/main.py +++ b/src/jarabe/main.py @@ -31,9 +31,9 @@ from sugar.profile import get_profile import view.Shell from shellservice import ShellService -from hardware import hardwaremanager -from intro.window import IntroWindow -from intro.window import create_profile +from jarabe.hardware import hardwaremanager +from jarabe.intro.window import IntroWindow +from jarabe.intro.window import create_profile from session import get_session_manager import logsmanager import config diff --git a/src/model/BuddyModel.py b/src/jarabe/model/BuddyModel.py index b51b808..b51b808 100644 --- a/src/model/BuddyModel.py +++ b/src/jarabe/model/BuddyModel.py diff --git a/src/model/Friends.py b/src/jarabe/model/Friends.py index 6fc3e97..fc6ff65 100644 --- a/src/model/Friends.py +++ b/src/jarabe/model/Friends.py @@ -20,7 +20,7 @@ from ConfigParser import ConfigParser import gobject -from model.BuddyModel import BuddyModel +from jarabe.model.BuddyModel import BuddyModel from sugar import env import logging diff --git a/src/model/Invites.py b/src/jarabe/model/Invites.py index 8bcffd2..8bcffd2 100644 --- a/src/model/Invites.py +++ b/src/jarabe/model/Invites.py diff --git a/src/model/Makefile.am b/src/jarabe/model/Makefile.am index 9447b03..2c4150b 100644 --- a/src/model/Makefile.am +++ b/src/jarabe/model/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = devices -sugardir = $(pkgdatadir)/shell/model +sugardir = $(pythondir)/jarabe/model sugar_PYTHON = \ __init__.py \ accesspointmodel.py \ diff --git a/src/model/MeshModel.py b/src/jarabe/model/MeshModel.py index 2f77d01..8e16c21 100644 --- a/src/model/MeshModel.py +++ b/src/jarabe/model/MeshModel.py @@ -20,10 +20,10 @@ from sugar.graphics.xocolor import XoColor from sugar.presence import presenceservice from sugar import activity -from model.BuddyModel import BuddyModel -from model.accesspointmodel import AccessPointModel -from hardware import hardwaremanager -from hardware import nmclient +from jarabe.model.BuddyModel import BuddyModel +from jarabe.model.accesspointmodel import AccessPointModel +from jarabe.hardware import hardwaremanager +from jarabe.hardware import nmclient class ActivityModel: def __init__(self, act, bundle): diff --git a/src/model/Owner.py b/src/jarabe/model/Owner.py index 934a8fc..91be127 100644 --- a/src/model/Owner.py +++ b/src/jarabe/model/Owner.py @@ -25,7 +25,7 @@ from sugar import env from sugar import profile from sugar.presence import presenceservice from sugar import util -from model.Invites import Invites +from jarabe.model.Invites import Invites class ShellOwner(gobject.GObject): """Class representing the owner of this machine/instance. This class diff --git a/src/model/__init__.py b/src/jarabe/model/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/model/__init__.py +++ b/src/jarabe/model/__init__.py diff --git a/src/model/accesspointmodel.py b/src/jarabe/model/accesspointmodel.py index f464f75..a4760bc 100644 --- a/src/model/accesspointmodel.py +++ b/src/jarabe/model/accesspointmodel.py @@ -16,7 +16,7 @@ import gobject -from hardware import nmclient +from jarabe.hardware import nmclient STATE_CONNECTING = 0 STATE_CONNECTED = 1 diff --git a/src/model/clipboard.py b/src/jarabe/model/clipboard.py index bde6535..b79867e 100644 --- a/src/model/clipboard.py +++ b/src/jarabe/model/clipboard.py @@ -24,7 +24,7 @@ import gobject from sugar import mime -from model.clipboardobject import ClipboardObject, Format +from jarabe.model.clipboardobject import ClipboardObject, Format class Clipboard(gobject.GObject): diff --git a/src/model/clipboardobject.py b/src/jarabe/model/clipboardobject.py index a4cd388..a4cd388 100644 --- a/src/model/clipboardobject.py +++ b/src/jarabe/model/clipboardobject.py diff --git a/src/model/devices/Makefile.am b/src/jarabe/model/devices/Makefile.am index 274f1e7..564d609 100644 --- a/src/model/devices/Makefile.am +++ b/src/jarabe/model/devices/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = network -sugardir = $(pkgdatadir)/shell/model/devices +sugardir = $(pythondir)/jarabe/model/devices sugar_PYTHON = \ __init__.py \ battery.py \ diff --git a/src/model/devices/__init__.py b/src/jarabe/model/devices/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/model/devices/__init__.py +++ b/src/jarabe/model/devices/__init__.py diff --git a/src/model/devices/battery.py b/src/jarabe/model/devices/battery.py index 7b52d4c..d041907 100644 --- a/src/model/devices/battery.py +++ b/src/jarabe/model/devices/battery.py @@ -19,7 +19,7 @@ import logging import gobject import dbus -from model.devices import device +from jarabe.model.devices import device _LEVEL_PROP = 'battery.charge_level.percentage' _CHARGING_PROP = 'battery.rechargeable.is_charging' diff --git a/src/model/devices/device.py b/src/jarabe/model/devices/device.py index 3273da9..8d62415 100644 --- a/src/model/devices/device.py +++ b/src/jarabe/model/devices/device.py @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import gobject -from hardware import nmclient +from jarabe.hardware import nmclient from sugar import util diff --git a/src/model/devices/devicesmodel.py b/src/jarabe/model/devices/devicesmodel.py index f328109..5d6353d 100644 --- a/src/model/devices/devicesmodel.py +++ b/src/jarabe/model/devices/devicesmodel.py @@ -19,13 +19,13 @@ import logging import gobject import dbus -from model.devices import device -from model.devices.network import wireless -from model.devices.network import mesh -from model.devices import battery -from model.devices import speaker -from hardware import hardwaremanager -from hardware import nmclient +from jarabe.model.devices import device +from jarabe.model.devices.network import wireless +from jarabe.model.devices.network import mesh +from jarabe.model.devices import battery +from jarabe.model.devices import speaker +from jarabe.hardware import hardwaremanager +from jarabe.hardware import nmclient class DevicesModel(gobject.GObject): __gsignals__ = { diff --git a/src/model/devices/network/Makefile.am b/src/jarabe/model/devices/network/Makefile.am index 04074e5..736d96c 100644 --- a/src/model/devices/network/Makefile.am +++ b/src/jarabe/model/devices/network/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/model/devices/network +sugardir = $(pythondir)/jarabe/model/devices/network sugar_PYTHON = \ __init__.py \ mesh.py \ diff --git a/src/model/devices/network/__init__.py b/src/jarabe/model/devices/network/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/model/devices/network/__init__.py +++ b/src/jarabe/model/devices/network/__init__.py diff --git a/src/model/devices/network/mesh.py b/src/jarabe/model/devices/network/mesh.py index 36626e6..57f375f 100644 --- a/src/model/devices/network/mesh.py +++ b/src/jarabe/model/devices/network/mesh.py @@ -17,7 +17,7 @@ import gobject -from model.devices import device +from jarabe.model.devices import device class Device(device.Device): __gproperties__ = { diff --git a/src/model/devices/network/wired.py b/src/jarabe/model/devices/network/wired.py index aa0ba00..4178010 100644 --- a/src/model/devices/network/wired.py +++ b/src/jarabe/model/devices/network/wired.py @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from model.devices import device +from jarabe.model.devices import device class Device(device.Device): def __init__(self, nm_device): diff --git a/src/model/devices/network/wireless.py b/src/jarabe/model/devices/network/wireless.py index 8bf407e..c5b2a5c 100644 --- a/src/model/devices/network/wireless.py +++ b/src/jarabe/model/devices/network/wireless.py @@ -17,7 +17,7 @@ import gobject -from model.devices import device +from jarabe.model.devices import device def freq_to_channel(freq): ftoc = { 2.412: 1, 2.417: 2, 2.422: 3, 2.427: 4, diff --git a/src/model/devices/speaker.py b/src/jarabe/model/devices/speaker.py index c2a3a18..73e4f6e 100644 --- a/src/model/devices/speaker.py +++ b/src/jarabe/model/devices/speaker.py @@ -16,8 +16,8 @@ import gobject -from hardware import hardwaremanager -from model.devices import device +from jarabe.hardware import hardwaremanager +from jarabe.model.devices import device class Device(device.Device): __gproperties__ = { diff --git a/src/model/homeactivity.py b/src/jarabe/model/homeactivity.py index ba0979e..ba0979e 100644 --- a/src/model/homeactivity.py +++ b/src/jarabe/model/homeactivity.py diff --git a/src/model/homemodel.py b/src/jarabe/model/homemodel.py index 4810044..3f116bf 100644 --- a/src/model/homemodel.py +++ b/src/jarabe/model/homemodel.py @@ -23,7 +23,7 @@ import gtk from sugar import wm from sugar.activity import get_registry -from model.homeactivity import HomeActivity +from jarabe.model.homeactivity import HomeActivity def get_sugar_window_type(wnck_window): window = gtk.gdk.window_foreign_new(wnck_window.get_xid()) diff --git a/src/model/shellmodel.py b/src/jarabe/model/shellmodel.py index d1d8db8..0c37f35 100644 --- a/src/model/shellmodel.py +++ b/src/jarabe/model/shellmodel.py @@ -18,11 +18,11 @@ import wnck import gobject from sugar.presence import presenceservice -from model.Friends import Friends -from model.MeshModel import MeshModel -from model.homemodel import HomeModel -from model.Owner import ShellOwner -from model.devices.devicesmodel import DevicesModel +from jarabe.model.Friends import Friends +from jarabe.model.MeshModel import MeshModel +from jarabe.model.homemodel import HomeModel +from jarabe.model.Owner import ShellOwner +from jarabe.model.devices.devicesmodel import DevicesModel class ShellModel(gobject.GObject): ZOOM_MESH = 0 diff --git a/src/session.py b/src/jarabe/session.py index 1594fb5..c1f8d0f 100644 --- a/src/session.py +++ b/src/jarabe/session.py @@ -22,7 +22,7 @@ import signal from sugar import session from sugar import env -from hardware import hardwaremanager +from jarabe.hardware import hardwaremanager _session_manager = None diff --git a/src/shellservice.py b/src/jarabe/shellservice.py index 706f2f2..fd8868e 100644 --- a/src/shellservice.py +++ b/src/jarabe/shellservice.py @@ -18,8 +18,8 @@ import dbus import os -from view import Shell -from model import shellmodel +from jarabe.view import Shell +from jarabe.model import shellmodel _DBUS_SERVICE = "org.laptop.Shell" _DBUS_SHELL_IFACE = "org.laptop.Shell" diff --git a/src/uicheck.py b/src/jarabe/uicheck.py index a7eb922..aebe990 100644 --- a/src/uicheck.py +++ b/src/jarabe/uicheck.py @@ -26,7 +26,7 @@ import wnck from sugar import wm -from model.homemodel import get_sugar_window_type +from jarabe.model.homemodel import get_sugar_window_type import config checks_queue = [] diff --git a/src/view/ActivityHost.py b/src/jarabe/view/ActivityHost.py index cf68f26..e3be3db 100644 --- a/src/view/ActivityHost.py +++ b/src/jarabe/view/ActivityHost.py @@ -17,7 +17,7 @@ import gtk import logging -from view import OverlayWindow +from jarabe.view import OverlayWindow class ActivityHost: def __init__(self, model): diff --git a/src/view/BuddyIcon.py b/src/jarabe/view/BuddyIcon.py index b921fa5..3b1db4c 100644 --- a/src/view/BuddyIcon.py +++ b/src/jarabe/view/BuddyIcon.py @@ -17,7 +17,7 @@ from sugar.graphics.icon import CanvasIcon from sugar.graphics import style -from view.BuddyMenu import BuddyMenu +from jarabe.view.BuddyMenu import BuddyMenu class BuddyIcon(CanvasIcon): def __init__(self, buddy, size=style.STANDARD_ICON_SIZE): diff --git a/src/view/BuddyMenu.py b/src/jarabe/view/BuddyMenu.py index 427ac3d..2f7a048 100644 --- a/src/view/BuddyMenu.py +++ b/src/jarabe/view/BuddyMenu.py @@ -22,7 +22,7 @@ from sugar.graphics.palette import Palette from sugar.graphics.menuitem import MenuItem from sugar.graphics.icon import Icon -from model import shellmodel +from jarabe.model import shellmodel import view.Shell class BuddyMenu(Palette): diff --git a/src/view/Makefile.am b/src/jarabe/view/Makefile.am index d905b7a..040e6e7 100644 --- a/src/view/Makefile.am +++ b/src/jarabe/view/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = devices frame home -sugardir = $(pkgdatadir)/shell/view +sugardir = $(pythondir)/jarabe/view sugar_PYTHON = \ __init__.py \ ActivityHost.py \ diff --git a/src/view/OverlayWindow.py b/src/jarabe/view/OverlayWindow.py index 15bcb49..15bcb49 100644 --- a/src/view/OverlayWindow.py +++ b/src/jarabe/view/OverlayWindow.py diff --git a/src/view/Shell.py b/src/jarabe/view/Shell.py index a028a2c..089bfb5 100644 --- a/src/view/Shell.py +++ b/src/jarabe/view/Shell.py @@ -33,13 +33,13 @@ from sugar.datastore import datastore from sugar import profile from sugar import env -from view.ActivityHost import ActivityHost -from view.frame import frame -from view.keyhandler import KeyHandler -from view.home.HomeWindow import HomeWindow -from view.launchwindow import LaunchWindow -from model import shellmodel -from journal import journalactivity +from jarabe.view.ActivityHost import ActivityHost +from jarabe.view.frame import frame +from jarabe.view.keyhandler import KeyHandler +from jarabe.view.home.HomeWindow import HomeWindow +from jarabe.view.launchwindow import LaunchWindow +from jarabe.model import shellmodel +from jarabe.journal import journalactivity # #3903 - this constant can be removed and assumed to be 1 when dbus-python # 0.82.3 is the only version used diff --git a/src/view/__init__.py b/src/jarabe/view/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/view/__init__.py +++ b/src/jarabe/view/__init__.py diff --git a/src/view/clipboardicon.py b/src/jarabe/view/clipboardicon.py index c5b6ae7..bd5d00e 100644 --- a/src/view/clipboardicon.py +++ b/src/jarabe/view/clipboardicon.py @@ -23,10 +23,10 @@ from sugar.graphics.icon import Icon from sugar.graphics.xocolor import XoColor from sugar import profile -from model import clipboard -from view.clipboardmenu import ClipboardMenu -from view.frame.frameinvoker import FrameWidgetInvoker -from view.frame.notification import NotificationIcon +from jarabe.model import clipboard +from jarabe.view.clipboardmenu import ClipboardMenu +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.view.frame.notification import NotificationIcon import view.frame.frame class ClipboardIcon(RadioToolButton): diff --git a/src/view/clipboardmenu.py b/src/jarabe/view/clipboardmenu.py index f71e8cf..cacdef0 100644 --- a/src/view/clipboardmenu.py +++ b/src/jarabe/view/clipboardmenu.py @@ -30,7 +30,7 @@ from sugar import mime from sugar import profile from sugar import activity -from model import clipboard +from jarabe.model import clipboard import journal.misc class ClipboardMenu(Palette): diff --git a/src/view/devices/Makefile.am b/src/jarabe/view/devices/Makefile.am index 2b19443..dd71ce6 100644 --- a/src/view/devices/Makefile.am +++ b/src/jarabe/view/devices/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = network -sugardir = $(pkgdatadir)/shell/view/devices +sugardir = $(pythondir)/jarabe/view/devices sugar_PYTHON = \ __init__.py \ battery.py \ diff --git a/src/view/devices/__init__.py b/src/jarabe/view/devices/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/view/devices/__init__.py +++ b/src/jarabe/view/devices/__init__.py diff --git a/src/view/devices/battery.py b/src/jarabe/view/devices/battery.py index 07fe09b..90137ea 100644 --- a/src/view/devices/battery.py +++ b/src/jarabe/view/devices/battery.py @@ -25,7 +25,7 @@ from sugar.graphics.tray import TrayIcon from sugar.graphics.palette import Palette from sugar.graphics.xocolor import XoColor -from view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'battery' diff --git a/src/view/devices/deviceview.py b/src/jarabe/view/devices/deviceview.py index 90ebbf5..90ebbf5 100644 --- a/src/view/devices/deviceview.py +++ b/src/jarabe/view/devices/deviceview.py diff --git a/src/view/devices/network/Makefile.am b/src/jarabe/view/devices/network/Makefile.am index 518362a..433bbfd 100644 --- a/src/view/devices/network/Makefile.am +++ b/src/jarabe/view/devices/network/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/view/devices/network +sugardir = $(pythondir)/jarabe/view/devices/network sugar_PYTHON = \ __init__.py \ mesh.py \ diff --git a/src/view/devices/network/__init__.py b/src/jarabe/view/devices/network/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/view/devices/network/__init__.py +++ b/src/jarabe/view/devices/network/__init__.py diff --git a/src/view/devices/network/mesh.py b/src/jarabe/view/devices/network/mesh.py index 1d115e9..0a945ea 100644 --- a/src/view/devices/network/mesh.py +++ b/src/jarabe/view/devices/network/mesh.py @@ -24,10 +24,10 @@ from sugar.graphics.tray import TrayIcon from sugar.graphics import style from sugar.graphics.palette import Palette -from model.devices import device -from model.devices.network import wireless -from hardware import hardwaremanager -from view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.model.devices import device +from jarabe.model.devices.network import wireless +from jarabe.hardware import hardwaremanager +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker class DeviceView(TrayIcon): diff --git a/src/view/devices/network/wireless.py b/src/jarabe/view/devices/network/wireless.py index 8cf0ac9..5db3ae2 100644 --- a/src/view/devices/network/wireless.py +++ b/src/jarabe/view/devices/network/wireless.py @@ -24,11 +24,11 @@ from sugar.graphics.tray import TrayIcon from sugar.graphics import style from sugar.graphics.palette import Palette -from model.devices.network import wireless -from model.devices import device -from hardware import hardwaremanager -from hardware import nmclient -from view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.model.devices.network import wireless +from jarabe.model.devices import device +from jarabe.hardware import hardwaremanager +from jarabe.hardware import nmclient +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'network-wireless' diff --git a/src/view/devices/speaker.py b/src/jarabe/view/devices/speaker.py index 818ba9a..3c907e8 100644 --- a/src/view/devices/speaker.py +++ b/src/jarabe/view/devices/speaker.py @@ -18,7 +18,7 @@ from gettext import gettext as _ import gtk -from hardware import hardwaremanager +from jarabe.hardware import hardwaremanager from sugar import profile from sugar.graphics import style from sugar.graphics.icon import get_icon_state, Icon @@ -27,7 +27,7 @@ from sugar.graphics.tray import TrayIcon from sugar.graphics.palette import Palette from sugar.graphics.xocolor import XoColor -from view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'speaker' diff --git a/src/view/frame/Makefile.am b/src/jarabe/view/frame/Makefile.am index 4d5b96b..4e6e237 100644 --- a/src/view/frame/Makefile.am +++ b/src/jarabe/view/frame/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/view/frame +sugardir = $(pythondir)/jarabe/view/frame sugar_PYTHON = \ __init__.py \ activitiestray.py \ diff --git a/src/view/frame/__init__.py b/src/jarabe/view/frame/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/view/frame/__init__.py +++ b/src/jarabe/view/frame/__init__.py diff --git a/src/view/frame/activitiestray.py b/src/jarabe/view/frame/activitiestray.py index 0291732..735fa96 100644 --- a/src/view/frame/activitiestray.py +++ b/src/jarabe/view/frame/activitiestray.py @@ -30,11 +30,11 @@ from sugar.graphics.menuitem import MenuItem from sugar import activity from sugar import profile -from model import shellmodel -from view.palettes import JournalPalette, CurrentActivityPalette -from view.pulsingicon import PulsingIcon -from view.frame.frameinvoker import FrameWidgetInvoker -from view.frame.notification import NotificationIcon +from jarabe.model import shellmodel +from jarabe.view.palettes import JournalPalette, CurrentActivityPalette +from jarabe.view.pulsingicon import PulsingIcon +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.view.frame.notification import NotificationIcon import view.frame.frame class ActivityButton(RadioToolButton): diff --git a/src/view/frame/clipboardpanelwindow.py b/src/jarabe/view/frame/clipboardpanelwindow.py index 08794b8..bd1959e 100644 --- a/src/view/frame/clipboardpanelwindow.py +++ b/src/jarabe/view/frame/clipboardpanelwindow.py @@ -20,10 +20,10 @@ from urlparse import urlparse import gtk import hippo -from view.frame.framewindow import FrameWindow -from view.frame.clipboardtray import ClipboardTray +from jarabe.view.frame.framewindow import FrameWindow +from jarabe.view.frame.clipboardtray import ClipboardTray -from model import clipboard +from jarabe.model import clipboard class ClipboardPanelWindow(FrameWindow): def __init__(self, frame, orientation): diff --git a/src/view/frame/clipboardtray.py b/src/jarabe/view/frame/clipboardtray.py index 8c3939f..ca67b82 100644 --- a/src/view/frame/clipboardtray.py +++ b/src/jarabe/view/frame/clipboardtray.py @@ -24,8 +24,8 @@ from sugar import util from sugar.graphics import tray from sugar.graphics import style -from model import clipboard -from view.clipboardicon import ClipboardIcon +from jarabe.model import clipboard +from jarabe.view.clipboardicon import ClipboardIcon class _ContextMap(object): """Maps a drag context to the clipboard object involved in the dragging.""" diff --git a/src/view/frame/devicestray.py b/src/jarabe/view/frame/devicestray.py index b4ec8ca..eb6707e 100644 --- a/src/view/frame/devicestray.py +++ b/src/jarabe/view/frame/devicestray.py @@ -18,8 +18,8 @@ import logging from sugar.graphics import tray -from view.devices import deviceview -from model import shellmodel +from jarabe.view.devices import deviceview +from jarabe.model import shellmodel _logger = logging.getLogger('DevicesTray') diff --git a/src/view/frame/eventarea.py b/src/jarabe/view/frame/eventarea.py index 0eba150..0eba150 100644 --- a/src/view/frame/eventarea.py +++ b/src/jarabe/view/frame/eventarea.py diff --git a/src/view/frame/frame.py b/src/jarabe/view/frame/frame.py index ce28736..10dcf26 100644 --- a/src/view/frame/frame.py +++ b/src/jarabe/view/frame/frame.py @@ -24,14 +24,14 @@ from sugar.graphics import animator from sugar.graphics import style from sugar.graphics import palettegroup -from view.frame.eventarea import EventArea -from view.frame.activitiestray import ActivitiesTray -from view.frame.zoomtoolbar import ZoomToolbar -from view.frame.friendstray import FriendsTray -from view.frame.devicestray import DevicesTray -from view.frame.framewindow import FrameWindow -from view.frame.clipboardpanelwindow import ClipboardPanelWindow -from view.frame.notification import NotificationIcon, NotificationWindow +from jarabe.view.frame.eventarea import EventArea +from jarabe.view.frame.activitiestray import ActivitiesTray +from jarabe.view.frame.zoomtoolbar import ZoomToolbar +from jarabe.view.frame.friendstray import FriendsTray +from jarabe.view.frame.devicestray import DevicesTray +from jarabe.view.frame.framewindow import FrameWindow +from jarabe.view.frame.clipboardpanelwindow import ClipboardPanelWindow +from jarabe.view.frame.notification import NotificationIcon, NotificationWindow TOP_RIGHT = 0 TOP_LEFT = 1 diff --git a/src/view/frame/frameinvoker.py b/src/jarabe/view/frame/frameinvoker.py index e4a13e1..e4a13e1 100644 --- a/src/view/frame/frameinvoker.py +++ b/src/jarabe/view/frame/frameinvoker.py diff --git a/src/view/frame/framewindow.py b/src/jarabe/view/frame/framewindow.py index 623d162..623d162 100644 --- a/src/view/frame/framewindow.py +++ b/src/jarabe/view/frame/framewindow.py diff --git a/src/view/frame/friendstray.py b/src/jarabe/view/frame/friendstray.py index 7236d75..93d023e 100644 --- a/src/view/frame/friendstray.py +++ b/src/jarabe/view/frame/friendstray.py @@ -18,10 +18,10 @@ from sugar.presence import presenceservice from sugar.graphics.tray import VTray, TrayIcon import view.Shell -from view.BuddyMenu import BuddyMenu -from view.frame.frameinvoker import FrameWidgetInvoker -from model import shellmodel -from model.BuddyModel import BuddyModel +from jarabe.view.BuddyMenu import BuddyMenu +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.model import shellmodel +from jarabe.model.BuddyModel import BuddyModel class FriendIcon(TrayIcon): def __init__(self, buddy): diff --git a/src/view/frame/notification.py b/src/jarabe/view/frame/notification.py index 8a779f3..68107ba 100644 --- a/src/view/frame/notification.py +++ b/src/jarabe/view/frame/notification.py @@ -20,7 +20,7 @@ import gtk from sugar.graphics import style from sugar.graphics.xocolor import XoColor -from view.pulsingicon import PulsingIcon +from jarabe.view.pulsingicon import PulsingIcon class NotificationIcon(gtk.EventBox): __gtype_name__ = 'SugarNotificationIcon' diff --git a/src/view/frame/zoomtoolbar.py b/src/jarabe/view/frame/zoomtoolbar.py index ed8d048..8829790 100644 --- a/src/view/frame/zoomtoolbar.py +++ b/src/jarabe/view/frame/zoomtoolbar.py @@ -23,8 +23,8 @@ from sugar.graphics.palette import Palette from sugar.graphics.radiotoolbutton import RadioToolButton import view.Shell -from view.frame.frameinvoker import FrameWidgetInvoker -from model import shellmodel +from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.model import shellmodel class ZoomToolbar(gtk.Toolbar): def __init__(self): diff --git a/src/view/home/FriendView.py b/src/jarabe/view/home/FriendView.py index be2f46f..f1e00b1 100644 --- a/src/view/home/FriendView.py +++ b/src/jarabe/view/home/FriendView.py @@ -21,7 +21,7 @@ from sugar.graphics import style from sugar.presence import presenceservice from sugar import activity -from view.BuddyIcon import BuddyIcon +from jarabe.view.BuddyIcon import BuddyIcon class FriendView(hippo.CanvasBox): def __init__(self, buddy, **kwargs): diff --git a/src/view/home/FriendsBox.py b/src/jarabe/view/home/FriendsBox.py index c45c1c6..42e5709 100644 --- a/src/view/home/FriendsBox.py +++ b/src/jarabe/view/home/FriendsBox.py @@ -23,9 +23,9 @@ from sugar.graphics import style from sugar.graphics.icon import CanvasIcon, Icon from sugar.graphics.palette import Palette -from model import shellmodel -from view.home.FriendView import FriendView -from view.home.spreadlayout import SpreadLayout +from jarabe.model import shellmodel +from jarabe.view.home.FriendView import FriendView +from jarabe.view.home.spreadlayout import SpreadLayout class FriendsBox(hippo.Canvas): __gtype_name__ = 'SugarFriendsBox' diff --git a/src/view/home/HomeBox.py b/src/jarabe/view/home/HomeBox.py index cc781ca..400ee8f 100644 --- a/src/view/home/HomeBox.py +++ b/src/jarabe/view/home/HomeBox.py @@ -30,8 +30,8 @@ from sugar import profile from sugar import activity from sugar.bundle.activitybundle import ActivityBundle -from view.home import favoritesview -from view.home.activitieslist import ActivitiesList +from jarabe.view.home import favoritesview +from jarabe.view.home.activitieslist import ActivitiesList _FAVORITES_VIEW = 0 _LIST_VIEW = 1 @@ -147,7 +147,7 @@ class HomeBox(gtk.VBox): update_trigger_file) if response_id == gtk.RESPONSE_OK: - from controlpanel.gui import ControlPanel + from jarabe.controlpanel.gui import ControlPanel panel = ControlPanel() panel.set_transient_for(self.get_toplevel()) panel.show() diff --git a/src/view/home/HomeWindow.py b/src/jarabe/view/home/HomeWindow.py index 316d572..0bc56a0 100644 --- a/src/view/home/HomeWindow.py +++ b/src/jarabe/view/home/HomeWindow.py @@ -19,12 +19,12 @@ import gtk from sugar.graphics import style from sugar.graphics import palettegroup -from view.home.MeshBox import MeshBox -from view.home.HomeBox import HomeBox -from view.home.FriendsBox import FriendsBox -from view.home.transitionbox import TransitionBox -from model.shellmodel import ShellModel -from model import shellmodel +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.model.shellmodel import ShellModel +from jarabe.model import shellmodel _HOME_PAGE = 0 _FRIENDS_PAGE = 1 diff --git a/src/view/home/Makefile.am b/src/jarabe/view/home/Makefile.am index b323589..c7d9a98 100644 --- a/src/view/home/Makefile.am +++ b/src/jarabe/view/home/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/view/home +sugardir = $(pythondir)/jarabe/view/home sugar_PYTHON = \ __init__.py \ activitieslist.py \ diff --git a/src/view/home/MeshBox.py b/src/jarabe/view/home/MeshBox.py index c850145..f94b930 100644 --- a/src/view/home/MeshBox.py +++ b/src/jarabe/view/home/MeshBox.py @@ -30,18 +30,18 @@ from sugar.graphics import iconentry from sugar.graphics.menuitem import MenuItem from sugar import profile -from model import accesspointmodel -from model.devices.network import wireless -from model import shellmodel -from hardware import hardwaremanager -from hardware import nmclient -from view.BuddyIcon import BuddyIcon -from view.pulsingicon import CanvasPulsingIcon -from view.home.snowflakelayout import SnowflakeLayout -from view.home.spreadlayout import SpreadLayout +from jarabe.model import accesspointmodel +from jarabe.model.devices.network import wireless +from jarabe.model import shellmodel +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 import view.Shell -from hardware.nmclient import NM_802_11_CAP_PROTO_WEP, \ +from jarabe.hardware.nmclient import NM_802_11_CAP_PROTO_WEP, \ NM_802_11_CAP_PROTO_WPA, NM_802_11_CAP_PROTO_WPA2 diff --git a/src/view/home/MyIcon.py b/src/jarabe/view/home/MyIcon.py index af0f6ce..af0f6ce 100644 --- a/src/view/home/MyIcon.py +++ b/src/jarabe/view/home/MyIcon.py diff --git a/src/view/home/__init__.py b/src/jarabe/view/home/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/view/home/__init__.py +++ b/src/jarabe/view/home/__init__.py diff --git a/src/view/home/activitieslist.py b/src/jarabe/view/home/activitieslist.py index d654787..54bd023 100644 --- a/src/view/home/activitieslist.py +++ b/src/jarabe/view/home/activitieslist.py @@ -25,7 +25,7 @@ from sugar.graphics import style from sugar.graphics.icon import CanvasIcon import view.Shell -from view.palettes import ActivityPalette +from jarabe.view.palettes import ActivityPalette class ActivitiesList(gtk.VBox): __gtype_name__ = 'SugarActivitiesList' diff --git a/src/view/home/favoriteslayout.py b/src/jarabe/view/home/favoriteslayout.py index 9afb5a2..e6b5c83 100644 --- a/src/view/home/favoriteslayout.py +++ b/src/jarabe/view/home/favoriteslayout.py @@ -26,7 +26,7 @@ import hippo from sugar.graphics import style from sugar import activity -from view.home.grid import Grid +from jarabe.view.home.grid import Grid _logger = logging.getLogger('FavoritesLayout') diff --git a/src/view/home/favoritesview.py b/src/jarabe/view/home/favoritesview.py index 0a7f0b3..3dae714 100644 --- a/src/view/home/favoritesview.py +++ b/src/jarabe/view/home/favoritesview.py @@ -31,14 +31,14 @@ from sugar.profile import get_profile from sugar import activity import view.Shell -from view.palettes import JournalPalette -from view.palettes import CurrentActivityPalette, ActivityPalette -from view.home.MyIcon import MyIcon -from view.home import favoriteslayout -from model import shellmodel -from hardware import schoolserver -from hardware.schoolserver import RegisterError -from controlpanel.gui import ControlPanel +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.model import shellmodel +from jarabe.hardware import schoolserver +from jarabe.hardware.schoolserver import RegisterError +from jarabe.controlpanel.gui import ControlPanel from session import get_session_manager _logger = logging.getLogger('FavoritesView') diff --git a/src/view/home/grid.py b/src/jarabe/view/home/grid.py index eb7fabc..eb7fabc 100644 --- a/src/view/home/grid.py +++ b/src/jarabe/view/home/grid.py diff --git a/src/view/home/proc_smaps.py b/src/jarabe/view/home/proc_smaps.py index 090a4cf..090a4cf 100755 --- a/src/view/home/proc_smaps.py +++ b/src/jarabe/view/home/proc_smaps.py diff --git a/src/view/home/snowflakelayout.py b/src/jarabe/view/home/snowflakelayout.py index 5782cff..5782cff 100644 --- a/src/view/home/snowflakelayout.py +++ b/src/jarabe/view/home/snowflakelayout.py diff --git a/src/view/home/spreadlayout.py b/src/jarabe/view/home/spreadlayout.py index 0faabca..72261e7 100644 --- a/src/view/home/spreadlayout.py +++ b/src/jarabe/view/home/spreadlayout.py @@ -20,7 +20,7 @@ import gtk from sugar.graphics import style -from view.home.grid import Grid +from jarabe.view.home.grid import Grid _CELL_SIZE = 4.0 diff --git a/src/view/home/transitionbox.py b/src/jarabe/view/home/transitionbox.py index fb351f8..230b887 100644 --- a/src/view/home/transitionbox.py +++ b/src/jarabe/view/home/transitionbox.py @@ -20,7 +20,7 @@ import gobject from sugar.graphics import style from sugar.graphics import animator -from view.home.MyIcon import MyIcon +from jarabe.view.home.MyIcon import MyIcon class _Animation(animator.Animation): def __init__(self, icon, start_size, end_size): diff --git a/src/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 142bab4..d6b7565 100644 --- a/src/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -25,10 +25,10 @@ import gtk from sugar._sugarext import KeyGrabber -from hardware import hardwaremanager +from jarabe.hardware import hardwaremanager import view.Shell -from view.tabbinghandler import TabbingHandler -from model.shellmodel import ShellModel +from jarabe.view.tabbinghandler import TabbingHandler +from jarabe.model.shellmodel import ShellModel _BRIGHTNESS_STEP = 2 _VOLUME_STEP = hardwaremanager.VOL_CHANGE_INCREMENT_RECOMMENDATION diff --git a/src/view/launchwindow.py b/src/jarabe/view/launchwindow.py index d954abc..384e6ec 100644 --- a/src/view/launchwindow.py +++ b/src/jarabe/view/launchwindow.py @@ -23,8 +23,8 @@ from sugar.graphics import style from sugar.graphics import animator from sugar.graphics.xocolor import XoColor -from model import shellmodel -from view.pulsingicon import CanvasPulsingIcon +from jarabe.model import shellmodel +from jarabe.view.pulsingicon import CanvasPulsingIcon class LaunchWindow(hippo.CanvasWindow): def __init__(self, home_activity): diff --git a/src/view/palettes.py b/src/jarabe/view/palettes.py index 416ff0f..416ff0f 100644 --- a/src/view/palettes.py +++ b/src/jarabe/view/palettes.py diff --git a/src/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py index 499ae99..499ae99 100644 --- a/src/view/pulsingicon.py +++ b/src/jarabe/view/pulsingicon.py diff --git a/src/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py index b3d4008..f1df2e3 100644 --- a/src/view/tabbinghandler.py +++ b/src/jarabe/view/tabbinghandler.py @@ -19,8 +19,8 @@ import gtk import gobject import view.Shell -from view.frame import frame -from model import shellmodel +from jarabe.view.frame import frame +from jarabe.model import shellmodel _RAISE_DELAY = 250 -- cgit v0.9.1