Refactor frame stuff naming some
This commit is contained in:
parent
4c80db6da0
commit
a6f9241e95
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
SUBDIRS = data session home panel PresenceService
|
||||
SUBDIRS = data session frame home PresenceService
|
||||
|
||||
bin_SCRIPTS = \
|
||||
sugar \
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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
|
@ -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
|
@ -1,6 +1,6 @@
|
||||
import goocanvas
|
||||
|
||||
from panel.Panel import Panel
|
||||
from frame.Panel import Panel
|
||||
from sugar.canvas.IconItem import IconItem
|
||||
import sugar
|
||||
|
Loading…
Reference in New Issue
Block a user