diff --git a/services/nm/Makefile.am b/services/nm/Makefile.am index 577ada85..f963d949 100644 --- a/services/nm/Makefile.am +++ b/services/nm/Makefile.am @@ -4,6 +4,7 @@ sugar_PYTHON = \ nmclient.py \ nminfo.py \ bubble.py \ + style.py \ wepkeydialog.py bin_SCRIPTS = sugar-nm-applet diff --git a/services/nm/nmclient.py b/services/nm/nmclient.py index 4d48ca49..cd381fbc 100644 --- a/services/nm/nmclient.py +++ b/services/nm/nmclient.py @@ -26,8 +26,7 @@ import os from gettext import gettext as _ import hippo -from sugar.graphics.menu import Menu -from sugar.graphics import style +import style from sugar.graphics.iconcolor import IconColor from sugar.graphics.timeline import Timeline from wepkeydialog import WEPKeyDialog diff --git a/sugar/graphics/style.py b/services/nm/style.py similarity index 100% rename from sugar/graphics/style.py rename to services/nm/style.py diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am index 39307dbd..5b36c721 100644 --- a/shell/view/Makefile.am +++ b/shell/view/Makefile.am @@ -12,5 +12,4 @@ sugar_PYTHON = \ keyhandler.py \ OverlayWindow.py \ Shell.py \ - stylesheet.py \ hardwaremanager.py diff --git a/shell/view/stylesheet.py b/shell/view/stylesheet.py deleted file mode 100644 index 70216442..00000000 --- a/shell/view/stylesheet.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (C) 2006, Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -import gtk -import hippo - -from sugar.graphics.iconcolor import IconColor -from sugar.graphics import style -from sugar.graphics.grid import Grid - -grid = Grid() - -friends_FriendIcon = { - 'scale' : style.large_icon_scale -} - -clipboard_Bubble = { - 'fill-color' : 0x646464FF, - 'stroke-color' : 0x646464FF, - 'progress-color' : 0x333333FF, - 'spacing' : style.space_unit, - 'padding' : style.space_unit * 1.5 -} - -clipboard_MenuItem_Title = { - 'xalign' : hippo.ALIGNMENT_CENTER, - 'padding-left': 5, - 'color' : 0xFFFFFFFF, - 'font' : style.get_font_description('Bold', 1.2) -} diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am index 11c25b5c..ff71448d 100644 --- a/sugar/graphics/Makefile.am +++ b/sugar/graphics/Makefile.am @@ -19,8 +19,6 @@ sugar_PYTHON = \ roundbox.py \ snowflakebox.py \ spreadbox.py \ - style.py \ - stylesheet.py \ timeline.py \ toolbar.py \ units.py diff --git a/sugar/graphics/menu.py b/sugar/graphics/menu.py index 2cc892a1..bb770669 100644 --- a/sugar/graphics/menu.py +++ b/sugar/graphics/menu.py @@ -20,7 +20,6 @@ import hippo import gobject from sugar.graphics.canvasicon import CanvasIcon -from sugar.graphics import style class Menu(gtk.Window): __gsignals__ = { @@ -36,12 +35,10 @@ class Menu(gtk.Window): canvas.show() self._root = hippo.CanvasBox() - style.apply_stylesheet(self._root, 'menu') canvas.set_root(self._root) if title: self._title_item = hippo.CanvasText(text=title) - style.apply_stylesheet(self._title_item, 'menu.Title') self._root.append(self._title_item) else: self._title_item = None @@ -56,7 +53,6 @@ class Menu(gtk.Window): def _create_separator(self): separator = hippo.CanvasBox() - style.apply_stylesheet(separator, 'menu.Separator') return separator def _create_item_box(self): @@ -81,7 +77,6 @@ class Menu(gtk.Window): self._create_item_box() text = hippo.CanvasText(text=label) - style.apply_stylesheet(text, 'menu.Item') if wrap: text.set_property("size-mode", "wrap-word") @@ -96,7 +91,6 @@ class Menu(gtk.Window): if not self._action_box: self._create_action_box() - style.apply_stylesheet(icon, 'menu.ActionIcon') icon.connect('activated', self._action_clicked_cb, action_id) self._action_box.append(icon) diff --git a/sugar/graphics/stylesheet.py b/sugar/graphics/stylesheet.py deleted file mode 100644 index af32a7d0..00000000 --- a/sugar/graphics/stylesheet.py +++ /dev/null @@ -1,31 +0,0 @@ -from sugar.graphics import style - -menu = { - 'background_color' : 0x000000FF, - 'spacing' : style.space_unit, - 'padding' : style.space_unit -} - -menu_Title = { - 'color' : 0xFFFFFFFF, - 'font' : style.get_font_description('Bold', 1.2) -} - -menu_Separator = { - 'background_color' : 0xFFFFFFFF, - 'box_height' : style.separator_thickness -} - -menu_ActionIcon = { - 'scale' : style.standard_icon_scale -} - -menu_Item = { - 'color' : 0xFFFFFFFF, - 'font' : style.get_font_description('Plain', 1.1) -} - -menu_Text = { - 'color' : 0xFFFFFFFF, - 'font' : style.get_font_description('Plain', 1.2) -}