From 58b60be5b1135a202cb1e51cf25023e8b5b8fb1c Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 30 Sep 2008 21:20:36 +0000 Subject: Move frame to his own module. --- diff --git a/configure.ac b/configure.ac index 81ba825..82b1bf0 100644 --- a/configure.ac +++ b/configure.ac @@ -51,12 +51,12 @@ src/jarabe/controlpanel/frame/Makefile src/jarabe/controlpanel/language/Makefile src/jarabe/controlpanel/network/Makefile src/jarabe/controlpanel/power/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/frame/Makefile src/jarabe/view/home/Makefile src/jarabe/model/Makefile src/jarabe/model/devices/Makefile diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am index aa56cc3..57347cd 100644 --- a/src/jarabe/Makefile.am +++ b/src/jarabe/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = controlpanel hardware journal model view intro +SUBDIRS = controlpanel frame hardware journal model view intro sugardir = $(pythondir)/jarabe sugar_PYTHON = \ diff --git a/src/jarabe/view/frame/Makefile.am b/src/jarabe/frame/Makefile.am index 4e6e237..15f5fe3 100644 --- a/src/jarabe/view/frame/Makefile.am +++ b/src/jarabe/frame/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/jarabe/view/frame +sugardir = $(pythondir)/jarabe/frame sugar_PYTHON = \ __init__.py \ activitiestray.py \ diff --git a/src/jarabe/view/frame/__init__.py b/src/jarabe/frame/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/jarabe/view/frame/__init__.py +++ b/src/jarabe/frame/__init__.py diff --git a/src/jarabe/view/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index c461cce..d203e33 100644 --- a/src/jarabe/view/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -33,10 +33,10 @@ from sugar import profile 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 +from jarabe.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.notification import NotificationIcon from jarabe.view import Shell -import jarabe.view.frame.frame +import jarabe.frame.frame class ActivityButton(RadioToolButton): def __init__(self, home_activity, group): @@ -95,7 +95,7 @@ class BaseInviteButton(ToolButton): def __clicked_cb(self, button): if self._notif_icon is not None: - frame = jarabe.view.frame.frame.get_instance() + frame = jarabe.frame.frame.get_instance() frame.remove_notification(self._notif_icon) self._notif_icon = None self._launch() @@ -105,7 +105,7 @@ class BaseInviteButton(ToolButton): raise NotImplementedError def __destroy_cb(self, button): - frame = jarabe.view.frame.frame.get_instance() + frame = jarabe.frame.frame.get_instance() frame.remove_notification(self._notif_icon) class ActivityInviteButton(BaseInviteButton): @@ -142,9 +142,9 @@ class ActivityInviteButton(BaseInviteButton): palette.set_group_id('frame') self._notif_icon.palette = palette - frame = jarabe.view.frame.frame.get_instance() + frame = jarabe.frame.frame.get_instance() frame.add_notification(self._notif_icon, - jarabe.view.frame.frame.TOP_LEFT) + jarabe.frame.frame.TOP_LEFT) def _launch(self): """Join the activity in the invite.""" @@ -188,9 +188,9 @@ class PrivateInviteButton(BaseInviteButton): palette.set_group_id('frame') self._notif_icon.palette = palette - frame = jarabe.view.frame.frame.get_instance() + frame = jarabe.frame.frame.get_instance() frame.add_notification(self._notif_icon, - jarabe.view.frame.frame.TOP_LEFT) + jarabe.frame.frame.TOP_LEFT) def _launch(self): """Start the activity with private channel.""" diff --git a/src/jarabe/view/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py index bd1959e..b4ccba0 100644 --- a/src/jarabe/view/frame/clipboardpanelwindow.py +++ b/src/jarabe/frame/clipboardpanelwindow.py @@ -20,8 +20,8 @@ from urlparse import urlparse import gtk import hippo -from jarabe.view.frame.framewindow import FrameWindow -from jarabe.view.frame.clipboardtray import ClipboardTray +from jarabe.frame.framewindow import FrameWindow +from jarabe.frame.clipboardtray import ClipboardTray from jarabe.model import clipboard diff --git a/src/jarabe/view/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py index ca67b82..ca67b82 100644 --- a/src/jarabe/view/frame/clipboardtray.py +++ b/src/jarabe/frame/clipboardtray.py diff --git a/src/jarabe/view/frame/devicestray.py b/src/jarabe/frame/devicestray.py index eb6707e..eb6707e 100644 --- a/src/jarabe/view/frame/devicestray.py +++ b/src/jarabe/frame/devicestray.py diff --git a/src/jarabe/view/frame/eventarea.py b/src/jarabe/frame/eventarea.py index 0eba150..0eba150 100644 --- a/src/jarabe/view/frame/eventarea.py +++ b/src/jarabe/frame/eventarea.py diff --git a/src/jarabe/view/frame/frame.py b/src/jarabe/frame/frame.py index 10dcf26..7a60ba4 100644 --- a/src/jarabe/view/frame/frame.py +++ b/src/jarabe/frame/frame.py @@ -24,14 +24,14 @@ from sugar.graphics import animator from sugar.graphics import style from sugar.graphics import palettegroup -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 +from jarabe.frame.eventarea import EventArea +from jarabe.frame.activitiestray import ActivitiesTray +from jarabe.frame.zoomtoolbar import ZoomToolbar +from jarabe.frame.friendstray import FriendsTray +from jarabe.frame.devicestray import DevicesTray +from jarabe.frame.framewindow import FrameWindow +from jarabe.frame.clipboardpanelwindow import ClipboardPanelWindow +from jarabe.frame.notification import NotificationIcon, NotificationWindow TOP_RIGHT = 0 TOP_LEFT = 1 diff --git a/src/jarabe/view/frame/frameinvoker.py b/src/jarabe/frame/frameinvoker.py index e4a13e1..e4a13e1 100644 --- a/src/jarabe/view/frame/frameinvoker.py +++ b/src/jarabe/frame/frameinvoker.py diff --git a/src/jarabe/view/frame/framewindow.py b/src/jarabe/frame/framewindow.py index 623d162..623d162 100644 --- a/src/jarabe/view/frame/framewindow.py +++ b/src/jarabe/frame/framewindow.py diff --git a/src/jarabe/view/frame/friendstray.py b/src/jarabe/frame/friendstray.py index fe9b648..6021e1f 100644 --- a/src/jarabe/view/frame/friendstray.py +++ b/src/jarabe/frame/friendstray.py @@ -19,7 +19,7 @@ from sugar.graphics.tray import VTray, TrayIcon from jarabe.view import Shell from jarabe.view.BuddyMenu import BuddyMenu -from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.frameinvoker import FrameWidgetInvoker from jarabe.model import shellmodel from jarabe.model.BuddyModel import BuddyModel diff --git a/src/jarabe/view/frame/notification.py b/src/jarabe/frame/notification.py index 68107ba..68107ba 100644 --- a/src/jarabe/view/frame/notification.py +++ b/src/jarabe/frame/notification.py diff --git a/src/jarabe/view/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py index eba5606..a9dd786 100644 --- a/src/jarabe/view/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -23,7 +23,7 @@ from sugar.graphics.palette import Palette from sugar.graphics.radiotoolbutton import RadioToolButton from jarabe.view import Shell -from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.frameinvoker import FrameWidgetInvoker from jarabe.model import shellmodel class ZoomToolbar(gtk.Toolbar): diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am index 040e6e7..2f24e29 100644 --- a/src/jarabe/view/Makefile.am +++ b/src/jarabe/view/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = devices frame home +SUBDIRS = devices home sugardir = $(pythondir)/jarabe/view sugar_PYTHON = \ diff --git a/src/jarabe/view/Shell.py b/src/jarabe/view/Shell.py index 8f015b4..b1e596f 100644 --- a/src/jarabe/view/Shell.py +++ b/src/jarabe/view/Shell.py @@ -58,7 +58,7 @@ class Shell(gobject.GObject): from jarabe.view.keyhandler import KeyHandler self._key_handler = KeyHandler() - from jarabe.view.frame import frame + from jarabe.frame import frame self._frame = frame.get_instance() from jarabe.view.home.HomeWindow import HomeWindow diff --git a/src/jarabe/view/clipboardicon.py b/src/jarabe/view/clipboardicon.py index a2b4193..cb83900 100644 --- a/src/jarabe/view/clipboardicon.py +++ b/src/jarabe/view/clipboardicon.py @@ -25,9 +25,9 @@ from sugar import profile 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 jarabe.view.frame.frame +from jarabe.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.notification import NotificationIcon +import jarabe.frame.frame class ClipboardIcon(RadioToolButton): __gtype_name__ = 'SugarClipboardIcon' @@ -123,9 +123,9 @@ class ClipboardIcon(RadioToolButton): self._notif_icon.props.xo_color = \ XoColor('%s,%s' % (self._icon.props.stroke_color, self._icon.props.fill_color)) - frame = jarabe.view.frame.frame.get_instance() + frame = jarabe.frame.frame.get_instance() frame.add_notification(self._notif_icon, - jarabe.view.frame.frame.BOTTOM_LEFT) + jarabe.frame.frame.BOTTOM_LEFT) self._current_percent = cb_object.get_percent() def _notify_active_cb(self, widget, pspec): diff --git a/src/jarabe/view/devices/battery.py b/src/jarabe/view/devices/battery.py index 90137ea..0302ecd 100644 --- a/src/jarabe/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 jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'battery' diff --git a/src/jarabe/view/devices/mesh.py b/src/jarabe/view/devices/mesh.py index 321240a..d6248e2 100644 --- a/src/jarabe/view/devices/mesh.py +++ b/src/jarabe/view/devices/mesh.py @@ -27,7 +27,7 @@ from sugar.graphics.palette import Palette from jarabe.model.devices import device from jarabe.model.devices import wireless from jarabe.hardware import hardwaremanager -from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.frameinvoker import FrameWidgetInvoker class DeviceView(TrayIcon): diff --git a/src/jarabe/view/devices/speaker.py b/src/jarabe/view/devices/speaker.py index 3c907e8..be32b1c 100644 --- a/src/jarabe/view/devices/speaker.py +++ b/src/jarabe/view/devices/speaker.py @@ -27,7 +27,7 @@ from sugar.graphics.tray import TrayIcon from sugar.graphics.palette import Palette from sugar.graphics.xocolor import XoColor -from jarabe.view.frame.frameinvoker import FrameWidgetInvoker +from jarabe.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'speaker' diff --git a/src/jarabe/view/devices/wireless.py b/src/jarabe/view/devices/wireless.py index b000a77..6be74fb 100644 --- a/src/jarabe/view/devices/wireless.py +++ b/src/jarabe/view/devices/wireless.py @@ -28,7 +28,7 @@ from jarabe.model.devices 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 +from jarabe.frame.frameinvoker import FrameWidgetInvoker _ICON_NAME = 'network-wireless' diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py index f858fd6..614d32e 100644 --- a/src/jarabe/view/tabbinghandler.py +++ b/src/jarabe/view/tabbinghandler.py @@ -19,7 +19,7 @@ import gtk import gobject from jarabe.view import Shell -from jarabe.view.frame import frame +from jarabe.frame import frame from jarabe.model import shellmodel _RAISE_DELAY = 250 -- cgit v0.9.1