diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-05 17:34:19 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-05 17:34:19 (GMT) |
commit | 5b37955647ae4b82aefd6f5c491c8a98b109abfa (patch) | |
tree | 5eebb2bfb8b695b8e601720d5e503bca4908b3ce | |
parent | 1b0e469dbd90572d2bf6e4b928d1022a99c447c3 (diff) |
Revert "Install our own matchbox theme to disable shadows"
This reverts 0e77fc5bf9476ff08baf7855476c99fb2aadbc86 commit.
-rw-r--r-- | shell/data/Makefile.am | 5 | ||||
-rw-r--r-- | shell/data/theme.xml | 268 | ||||
-rw-r--r-- | sugar/session/MatchboxProcess.py | 1 |
3 files changed, 1 insertions, 273 deletions
diff --git a/shell/data/Makefile.am b/shell/data/Makefile.am index 5bdb6b8..1f0f9c0 100644 --- a/shell/data/Makefile.am +++ b/shell/data/Makefile.am @@ -1,7 +1,4 @@ -matchboxthemedir = $(datadir)/themes/olpc/matchbox -matchboxtheme_DATA = theme.xml - confdir = $(pkgdatadir) conf_DATA = kbdconfig -EXTRA_DIST = $(conf_DATA) $(matchboxtheme_DATA) +EXTRA_DIST = $(conf_DATA) diff --git a/shell/data/theme.xml b/shell/data/theme.xml deleted file mode 100644 index 0222007..0000000 --- a/shell/data/theme.xml +++ /dev/null @@ -1,268 +0,0 @@ -<?xml version="1.0"?> -<theme name="Default" author="Matthew Allum - mallum@handhelds.org" - desc="" version="1.0" engine_version="1" > - -<color id="white" def="#ffffff" /> -<color id="black" def="#000000" /> - -<color id="borderdark" def="#acaaa5" /> -<color id="borderlight" def="#fcfaf5" /> -<color id="bordermid" def="#bcbab5" /> - -<color id="grad1" def="#dadad5" /> -<color id="grad2" def="#dadad5" /> -<color id="grad3" def="#dadad5" /> - -<color id="menuborder" def="#acaaa5" /> -<color id="menubg" def="#dadad5" /> -<color id="menutext" def="#000000C8" /> - -<!-- below is menu highlight and highlighted titlebar color --> -<color id="menuhl" def="#486880" /> - -<color id="trans" def="#ffffff00" /> -<color id="textcol" def="#ffffff" /> - -<color id="shadowcol" def="#11111166" /> - -<font id="titlefont" def="Sans bold 16px" /> -<font id="menufont" def="Sans bold 16px" /> - -<frame id="main" height="20"> - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="borderdark" /> - - <layer x="1" y="1" w="100%-2" h="1" - type="plain" color="borderlight" /> - - <layer x="1" y="2" w="100%-2" h="13" - type="gradient-vert" startcol="grad1" endcol="grad2"/> - - <layer x="1" y="2" w="100%-2" h="17" - type="plain" color="grad3"/> - - <layer x="22" y="3" w="100%-44" h="14" - type="plain" color="menuhl"/> - - <layer x="22" y="3" w="1" h="1" type="plain" color="grad3"/> - <layer x="22" y="16" w="1" h="1" type="plain" color="grad3"/> - <layer x="100%-23" y="3" w="1" h="1" type="plain" color="grad3"/> - <layer x="100%-23" y="16" w="1" h="1" type="plain" color="grad3"/> - - <layer x="1" y="19" w="2" h="1" - type="plain" color="grad3" /> - - <layer x="100%-3" y="19" w="2" h="1" - type="plain" color="grad3" /> - - <!-- <layer x="6" y="2" w="16" h="16" type="icon" />--> - - <layer x="26" y="3" w="100%-60" h="20" - type="label" color="textcol" justify="left" font="titlefont" /> - - - <button x="labelx" y="0" w="labelw" h="20" - action="menu" options="inputonly" /> - - -</frame> - -<frame id="main-east" width="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="0" w="2" h="100%" - type="plain" color="grad3" /> - -</frame> - -<frame id="main-west" width="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="0" w="2" h="100%" - type="plain" color="grad3" /> - -</frame> - -<frame id="main-south" height="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="1" w="100%-2" h="100%-2" - type="plain" color="grad3" /> - - <layer x="1" y="0" w="2" h="1" - type="plain" color="grad3" /> - - <layer x="100%-3" y="0" w="2" h="1" - type="plain" color="grad3" /> - - <layer x="3" y="1" w="100%-6" h="1" - type="plain" color="borderlight" /> - -</frame> - -<frame id="dialog" height="20" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="borderdark" /> - - <layer x="1" y="1" w="100%-2" h="1" - type="plain" color="borderlight" /> - - <layer x="1" y="2" w="100%-2" h="13" - type="gradient-vert" startcol="grad1" endcol="grad2"/> - - <layer x="1" y="15" w="100%-2" h="4" - type="gradient-vert" startcol="grad2" endcol="grad3"/> - - <layer x="1" y="1" w="1" h="100%-1" - type="gradient-vert" startcol="borderlight" endcol="grad3"/> - - <layer x="100%-2" y="1" w="1" h="100%-1" - type="gradient-vert" startcol="borderlight" endcol="grad3"/> - - <layer x="2" y="19" w="1" h="1" - type="plain" color="grad3" /> - - <layer x="100%-3" y="19" w="1" h="1" - type="plain" color="grad3" /> - - <layer x="5" y="3" w="100%-60" h="20" - type="label" color="black" justify="left" font="titlefont" /> - -</frame> - - -<frame id="dialog-north" height="4"> - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="borderdark" /> - - <layer x="1" y="1" w="100%-2" h="1" - type="plain" color="borderlight" /> - - <layer x="1" y="2" w="100%-2" h="2" - type="plain" color="grad3"/> - - <layer x="1" y="1" w="1" h="100%-1" - type="gradient-vert" startcol="borderlight" endcol="grad3"/> - - <layer x="100%-2" y="1" w="1" h="100%-1" - type="gradient-vert" startcol="borderlight" endcol="grad3"/> - - <layer x="2" y="19" w="1" h="1" - type="plain" color="grad3" /> - - <layer x="100%-3" y="19" w="1" h="1" - type="plain" color="grad3" /> - -</frame> - -<frame id="dialog-east" width="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="0" w="2" h="100%" - type="plain" color="grad3" /> - -</frame> - -<frame id="dialog-west" width="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="0" w="2" h="100%" - type="plain" color="grad3" /> - -</frame> - -<frame id="dialog-south" height="4" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="bordermid" /> - - <layer x="1" y="1" w="100%-2" h="100%-2" - type="plain" color="grad3" /> - - <layer x="1" y="0" w="2" h="1" - type="plain" color="grad3" /> - - <layer x="100%-3" y="0" w="2" h="1" - type="plain" color="grad3" /> - - <layer x="3" y="1" w="100%-6" h="1" - type="plain" color="borderlight" /> - -</frame> - -<!-- below frames are likely not needed, legacy stuff --> - -<frame id="utility-max" width="20"> - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="borderdark" /> - - <layer x="1" y="1" w="100%-2" h="1" - type="plain" color="borderlight" /> - - <layer x="1" y="2" w="100%-2" h="100%-2" - type="gradient-vert" startcol="grad1" endcol="grad2"/> - - <button x="0" y="0" w="100%" h="100%" action="minimize" options="inputonly"/> - -</frame> - -<frame id="utility-min" height="20"> - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="borderdark" /> - - <layer x="1" y="1" w="100%-2" h="1" - type="plain" color="borderlight" /> - - <layer x="1" y="2" w="100%-2" h="100%-2" - type="gradient-vert" startcol="grad1" endcol="grad2"/> - - <layer x="5" y="3" w="100%-60" h="20" - type="label" color="black" justify="left" font="titlefont" /> - - <button x="0" y="0" w="100%-20" h="100%" - action="maximize" options="inputonly"/> - -</frame> - - -<frame id="menu" - border_north="2" - border_south="3" - border_west="2" - border_east="2" - font="menufont" - highlight="menuhl" - color="black" - options="shaped" > - - <layer x="0" y="0" w="100%" h="100%" - type="plain" color="menuborder" /> - - <layer x="1" y="0" w="100%-2" h="100%-1" - type="plain" color="menubg" /> - - <layer x="0" y="-1" w="1" h="1" - type="plain" color="trans" /> - - <layer x="-1" y="-1" w="1" h="1" - type="plain" color="trans" /> - -</frame> - -<shadow style="none"/> - -</theme> diff --git a/sugar/session/MatchboxProcess.py b/sugar/session/MatchboxProcess.py index 4fd4741..fccf47a 100644 --- a/sugar/session/MatchboxProcess.py +++ b/sugar/session/MatchboxProcess.py @@ -9,7 +9,6 @@ class MatchboxProcess(Process): options = '-kbdconfig %s ' % kbd_config options += '-use_titlebar no ' - options += '-theme olpc ' command = 'matchbox-window-manager %s ' % options Process.__init__(self, command) |