From bc4b051af20d0d0c2d02d16a7486c4e8bf0e85cb Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Tue, 1 May 2007 18:26:26 +0200
Subject: [PATCH] Some refactoring to get styles right

---
 shell/view/frame/Makefile.am                        | 2 +-
 shell/view/frame/clipboardpanelwindow.py            | 6 +++---
 shell/view/frame/frame.py                           | 4 ++--
 shell/view/frame/{PanelWindow.py => framewindow.py} | 6 +++---
 sugar/graphics/toolbox.py                           | 1 -
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename shell/view/frame/{PanelWindow.py => framewindow.py} (94%)

diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am
index fe14746f..f33648ea 100644
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
@@ -9,5 +9,5 @@ sugar_PYTHON =				\
 	frame.py			\
 	ZoomBox.py			\
 	overlaybox.py			\
-	PanelWindow.py			\
+	framewindow.py			\
 	framepopupcontext.py
diff --git a/shell/view/frame/clipboardpanelwindow.py b/shell/view/frame/clipboardpanelwindow.py
index 0f916459..0eb8b1d2 100644
--- a/shell/view/frame/clipboardpanelwindow.py
+++ b/shell/view/frame/clipboardpanelwindow.py
@@ -2,14 +2,14 @@ import logging
 import gtk
 import hippo
 
-from view.frame.PanelWindow import PanelWindow
+from view.frame.framewindow import FrameWindow
 from view.frame.clipboardbox import ClipboardBox
 from sugar.clipboard import clipboardservice
 from sugar import util
 
-class ClipboardPanelWindow(PanelWindow):
+class ClipboardPanelWindow(FrameWindow):
     def __init__(self, frame, orientation):
-        PanelWindow.__init__(self, orientation)
+        FrameWindow.__init__(self, orientation)
 
         self._frame = frame
 
diff --git a/shell/view/frame/frame.py b/shell/view/frame/frame.py
index d37ce4c1..521cd8d3 100644
--- a/shell/view/frame/frame.py
+++ b/shell/view/frame/frame.py
@@ -24,7 +24,7 @@ from view.frame.ActivitiesBox import ActivitiesBox
 from view.frame.ZoomBox import ZoomBox
 from view.frame.overlaybox import OverlayBox
 from view.frame.FriendsBox import FriendsBox
-from view.frame.PanelWindow import PanelWindow
+from view.frame.framewindow import FrameWindow
 from view.frame.clipboardpanelwindow import ClipboardPanelWindow
 from view.frame.framepopupcontext import FramePopupContext
 from model.ShellModel import ShellModel
@@ -257,7 +257,7 @@ class Frame(object):
             self._timeline.goto('slide_out', True)
         
     def _create_panel(self, orientation):
-        panel = PanelWindow(orientation)
+        panel = FrameWindow(orientation)
         self._connect_to_panel(panel)
 
         return panel
diff --git a/shell/view/frame/PanelWindow.py b/shell/view/frame/framewindow.py
similarity index 94%
rename from shell/view/frame/PanelWindow.py
rename to shell/view/frame/framewindow.py
index 5dfe4461..3cb55d2a 100644
--- a/shell/view/frame/PanelWindow.py
+++ b/shell/view/frame/framewindow.py
@@ -19,7 +19,8 @@ import hippo
 
 from sugar.graphics import units
 
-class PanelWindow(gtk.Window):
+class FrameWindow(gtk.Window):
+    __gtype_name__ = 'SugarFrameWindow'
     def __init__(self, orientation):
         gtk.Window.__init__(self)
         self.hover = False
@@ -35,8 +36,7 @@ class PanelWindow(gtk.Window):
         self.add(self._canvas)
         self._canvas.show()
 
-        self._bg = hippo.CanvasBox(background_color=0x414141ff,
-                                   orientation=self._orientation)
+        self._bg = hippo.CanvasBox(orientation=self._orientation)
         self._canvas.set_root(self._bg)
 
         self._update_size()
diff --git a/sugar/graphics/toolbox.py b/sugar/graphics/toolbox.py
index 86cae591..968ae56d 100644
--- a/sugar/graphics/toolbox.py
+++ b/sugar/graphics/toolbox.py
@@ -29,7 +29,6 @@ class Toolbox(gtk.VBox):
         gtk.VBox.__init__(self)
         
         self._notebook = gtk.Notebook()
-        self._notebook.set_name('sugar-toolbox-notebook')
         self._notebook.set_tab_pos(gtk.POS_BOTTOM)
         self._notebook.set_show_border(False)
         self.pack_start(self._notebook)