From 85b16f07124f32bd1c6bc23a82781ddd07c468a5 Mon Sep 17 00:00:00 2001 From: olpc Date: Sun, 07 Dec 2008 00:21:15 +0000 Subject: Bundle cleanup, new icon from Loser. --- diff --git a/MANIFEST b/MANIFEST index e996963..9f9da5c 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,9 +1,12 @@ -NEWS COPYING +TODO +xorg-dcon.conf colors.py colorsc.py _colorsc.so setup.py +src/build.sh +src/deploy.sh src/gtk_types.h src/canvas.h src/setup.py diff --git a/NEWS b/NEWS deleted file mode 100644 index 19d8b05..0000000 --- a/NEWS +++ /dev/null @@ -1,28 +0,0 @@ -9 - -8 - -7 - -6 - -5 - -Colors-4 - -* New toolbar icons. - -Colors-3 - -* Add icons & descriptions to samples. -* Fix various bugs. - -Colors-2 - -* Fixed palette display. -* Fixed Journal integration. - -Colors-1 - -* Initial release. Most features basically work, but there are bugs, usability and -memory issues. diff --git a/activity/Activity-colors.svg b/activity/Activity-colors.svg new file mode 100644 index 0000000..d276ef4 --- /dev/null +++ b/activity/Activity-colors.svg @@ -0,0 +1,17 @@ + + + + + ]> + + + + diff --git a/activity/Colors-activity.svg b/activity/Colors-activity.svg deleted file mode 100644 index 2aa7936..0000000 --- a/activity/Colors-activity.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - -]> - - - - diff --git a/activity/activity.info b/activity/activity.info index f3e9607..8417fd1 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,5 +3,5 @@ name = Colors! activity_version = 9 host_version = 1 service_name = org.laptop.community.Colors -icon = Colors-activity +icon = Activity-colors exec = sugar-activity colors.Colors diff --git a/colors.changes b/colors.changes deleted file mode 100644 index 3f6c3b0..0000000 --- a/colors.changes +++ /dev/null @@ -1,11 +0,0 @@ -Colors-4.xo - - * New toolbar icons. - - -- Wade Brainerd May 8th, 2008 - -Colors-3.xo - - * Initial push of Colors!. - - -- Wade Brainerd March 25th, 2008 diff --git a/xorg-dcon.conf b/xorg-dcon.conf new file mode 100644 index 0000000..eb2a9e4 --- /dev/null +++ b/xorg-dcon.conf @@ -0,0 +1,145 @@ +# Xorg configuration file for OLPC + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Wacom Tablet" "SendCoreEvents" + InputDevice "Wacom Pen" "SendCoreEvents" + InputDevice "Wacom Eraser" "SendCoreEvents" + InputDevice "Wacom Mouse" "SendCoreEvents" +EndSection + +#Section "ServerFlags" + #Option "AllowEmptyInput" "yes" +#EndSection + +Section "Module" + SubSection "extmod" + Option "omit XFree86-DGA" + #Option "omit XFree86-Misc" # needed by 'xset m' + Option "omit MIT-SUNDRY-NONSTANDARD" + Option "omit TOG-CUP" + Option "omit Extended-Visual-Information" + EndSubSection + Load "freetype" + Load "evdev" + # Load "record" # Mostly a debugging tool +EndSection + +Section "Extensions" + Option "XTEST" "Disable" # Mostly a debugging tool + #Option "SECURITY" "Disable" # CRASH! + Option "XC-APPGROUP" "Disable" + Option "XINERAMA" "Disable" +EndSection + +Section "Monitor" + Identifier "Monitor0" + HorizSync 30-67 + VertRefresh 48-52 + DisplaySize 152 114 + Mode "1200x900" + DotClock 57.275 + HTimings 1200 1208 1216 1240 + VTimings 900 905 908 912 + Flags "-HSync" "-VSync" + EndMode +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "amd" + VendorName "Advanced Micro Devices, Inc." + BoardName "AMD Geode GX/LX" + + Option "AccelMethod" "EXA" + Option "NoCompression" "true" + Option "PanelGeometry" "1200x900" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 16 + SubSection "Display" + Depth 16 + Modes "1200x900" + EndSubSection +EndSection +Section "InputDevice" + Identifier "fake" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "ATKbd" + Driver "evdev" + + Option "Name" "AT Translated Set 2 keyboard" + Option "evBits" "+1" + Option "keyBits" "~1-255 ~352-511" + Option "Pass" "2" +EndSection +Section "InputDevice" + Identifier "Keyboard" + Driver "evdev" + + Option "evBits" "+1" + Option "keyBits" "~1-115 ~117-255" + Option "Pass" "3" +EndSection + +Section "InputDevice" + Identifier "Mouse" + Driver "evdev" + + Option "evBits" "+1-2" + Option "keyBits" "~272-287" + Option "Pass" "3" +EndSection +Section "InputDevice" + Identifier "GS" + Driver "evdev" + + Option "Name" "OLPC ALPS GlideSensor" + Option "evBits" "+1 +3" + Option "keyBits" "~272-287" + Option "absBits" "~0-2 ~24" + Option "Pass" "2" + Option "Mode" "Relative" +EndSection + +Section "InputDevice" + Driver "wacom" + Identifier "Wacom Pen" + Option "Device" "/dev/input/wacom" + Option "Type" "stylus" + Option "USB" "on" + Option "PressCurve" "0,0,100,100" +EndSection +Section "InputDevice" + Driver "wacom" + Identifier "Wacom Eraser" + Option "Device" "/dev/input/wacom" + Option "Type" "eraser" + Option "USB" "on" +EndSection +Section "InputDevice" + Driver "wacom" + Identifier "Wacom Mouse" + Option "Device" "/dev/input/wacom" + Option "Type" "cursor" + Option "Mode" "relative" + Option "USB" "on" +EndSection +Section "InputDevice" + Driver "wacom" + Identifier "Wacom Tablet" + Option "Device" "/dev/input/wacom" + Option "Type" "pad" + Option "ButtonsOnly" "on" + Option "Button9" "2" + Option "Button10" "3" + Option "USB" "on" +EndSection -- cgit v0.9.1