diff --git a/configure.ac b/configure.ac index 198231b3..68d4602b 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ bindings/threadframe/Makefile shell/Makefile shell/data/Makefile shell/home/Makefile -shell/panel/Makefile +shell/frame/Makefile shell/session/Makefile shell/PresenceService/Makefile sugar/Makefile diff --git a/shell/Makefile.am b/shell/Makefile.am index eaa0672d..b57e2947 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = data session home panel PresenceService +SUBDIRS = data session frame home PresenceService bin_SCRIPTS = \ sugar \ diff --git a/shell/Shell.py b/shell/Shell.py index b949c070..e5de4c88 100755 --- a/shell/Shell.py +++ b/shell/Shell.py @@ -15,7 +15,7 @@ from ChatController import ChatController from sugar.activity import ActivityFactory from sugar.activity import Activity from FirstTimeDialog import FirstTimeDialog -from panel.PanelManager import PanelManager +from frame.Frame import Frame from globalkeys import KeyGrabber from sugar import conf from sugar import env @@ -86,7 +86,7 @@ class Shell(gobject.GObject): elif key == 'F4': self.set_zoom_level(sugar.ZOOM_MESH) elif key == 'F5': - self._panel_manager.toggle_visibility() + self._frame.toggle_visibility() def __first_time_dialog_destroy_cb(self, dialog): conf.get_profile().save() @@ -108,8 +108,8 @@ class Shell(gobject.GObject): self._chat_controller = ChatController(self) self._chat_controller.listen() - self._panel_manager = PanelManager(self, self._owner) - self._panel_manager.show_and_hide(10) + self._frame = Frame(self, self._owner) + self._frame.show_and_hide(10) def set_console(self, console): self._console = console diff --git a/shell/panel/VerbsPanel.py b/shell/frame/BottomPanel.py similarity index 97% rename from shell/panel/VerbsPanel.py rename to shell/frame/BottomPanel.py index fe031e05..29e7ef1b 100644 --- a/shell/panel/VerbsPanel.py +++ b/shell/frame/BottomPanel.py @@ -4,7 +4,7 @@ import goocanvas from sugar.canvas.IconItem import IconItem from sugar.canvas.IconColor import IconColor from sugar import conf -from panel.Panel import Panel +from frame.Panel import Panel import logging class ActivityItem(IconItem): @@ -47,7 +47,7 @@ class ActivityBar(goocanvas.Group): self.add_child(item) -class VerbsPanel(Panel): +class BottomPanel(Panel): def __init__(self, shell): Panel.__init__(self) diff --git a/shell/panel/PanelManager.py b/shell/frame/Frame.py similarity index 81% rename from shell/panel/PanelManager.py rename to shell/frame/Frame.py index 40e79457..d62480f0 100644 --- a/shell/panel/PanelManager.py +++ b/shell/frame/Frame.py @@ -1,21 +1,21 @@ import gtk import gobject -from panel.VerbsPanel import VerbsPanel -from panel.FriendsPanel import FriendsPanel -from panel.TopPanel import TopPanel -from panel.Panel import Panel +from frame.BottomPanel import BottomPanel +from frame.RightPanel import RightPanel +from frame.TopPanel import TopPanel +from frame.Panel import Panel -class PanelManager: +class Frame: def __init__(self, shell, owner): size = 30 - self._verbs_panel = VerbsPanel(shell) + self._verbs_panel = BottomPanel(shell) self._verbs_panel.set_position(size, 0) self._verbs_panel.move(0, gtk.gdk.screen_height() - size) self._verbs_panel.resize(gtk.gdk.screen_width(), size) - self._friends_panel = FriendsPanel(shell, owner.get_friends()) + self._friends_panel = RightPanel(shell, owner.get_friends()) self._friends_panel.move(gtk.gdk.screen_width() - size, size) self._friends_panel.resize(size, gtk.gdk.screen_height() - size * 2) diff --git a/shell/panel/Makefile.am b/shell/frame/Makefile.am similarity index 64% rename from shell/panel/Makefile.am rename to shell/frame/Makefile.am index 311dddbb..6b2159bc 100644 --- a/shell/panel/Makefile.am +++ b/shell/frame/Makefile.am @@ -1,8 +1,8 @@ sugardir = $(pkgdatadir)/shell/panel sugar_PYTHON = \ __init__.py \ - FriendsPanel.py \ + RightPanel.py \ Panel.py \ - PanelManager.py \ + Frame.py \ TopPanel.py \ - VerbsPanel.py + BottomPanel.py diff --git a/shell/panel/Panel.py b/shell/frame/Panel.py similarity index 100% rename from shell/panel/Panel.py rename to shell/frame/Panel.py diff --git a/shell/panel/FriendsPanel.py b/shell/frame/RightPanel.py similarity index 98% rename from shell/panel/FriendsPanel.py rename to shell/frame/RightPanel.py index 53fa8471..c6768a29 100644 --- a/shell/panel/FriendsPanel.py +++ b/shell/frame/RightPanel.py @@ -1,6 +1,6 @@ import goocanvas -from panel.Panel import Panel +from frame.Panel import Panel from sugar.canvas.IconItem import IconItem from sugar.canvas.IconColor import IconColor from sugar.presence import PresenceService @@ -153,7 +153,7 @@ class ActionsBar(goocanvas.Group): def __chat_clicked_cb(self, item): pass -class FriendsPanel(Panel): +class RightPanel(Panel): def __init__(self, shell, friends): Panel.__init__(self) self._shell = shell diff --git a/shell/panel/TopPanel.py b/shell/frame/TopPanel.py similarity index 97% rename from shell/panel/TopPanel.py rename to shell/frame/TopPanel.py index 07df47c2..06554f6c 100644 --- a/shell/panel/TopPanel.py +++ b/shell/frame/TopPanel.py @@ -1,6 +1,6 @@ import goocanvas -from panel.Panel import Panel +from frame.Panel import Panel from sugar.canvas.IconItem import IconItem import sugar diff --git a/shell/panel/__init__.py b/shell/frame/__init__.py similarity index 100% rename from shell/panel/__init__.py rename to shell/frame/__init__.py