diff options
-rw-r--r-- | TurtleArtActivity.py | 19 | ||||
-rw-r--r-- | images/emptyheap.svg | 22 | ||||
-rw-r--r-- | images/nocode.svg | 64 | ||||
-rw-r--r-- | images/noinput.svg | 117 | ||||
-rw-r--r-- | images/nomedia.svg | 23 | ||||
-rw-r--r-- | images/nostack.svg | 98 | ||||
-rw-r--r-- | images/status.svg | 78 | ||||
-rw-r--r-- | images/syntaxerror.svg | 14 | ||||
-rw-r--r-- | tasetup.py | 4 | ||||
-rw-r--r-- | tawindow.py | 2 |
10 files changed, 242 insertions, 199 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 8d33af7..47d4042 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -633,7 +633,21 @@ class ProjectToolbar(gtk.Toolbar): self.sampb.props.sensitive = True self.sampb.connect('clicked', self.do_samples) self.insert(self.sampb, -1) - self.sampb.show() + self.sampb.show( +) + separator = gtk.SeparatorToolItem() + separator.set_draw(True) + self.insert(separator, -1) + separator.show() + + # full screen + self.fullscreenb = ToolButton( "view-fullscreen" ) + self.fullscreenb.set_tooltip(_('fullscreen')) + self.fullscreenb.props.sensitive = True + self.fullscreenb.props.accelerator = '<Alt>Enter' + self.fullscreenb.connect('clicked', self.do_fullscreen) + self.insert(self.fullscreenb, -1) + self.fullscreenb.show() def do_palette(self, button): if self.activity.tw.palette == True: @@ -713,4 +727,5 @@ class ProjectToolbar(gtk.Toolbar): # run the activity tawindow.runbutton(self.activity.tw, 0) - + def do_fullscreen(self, button): + self.activity.fullscreen() diff --git a/images/emptyheap.svg b/images/emptyheap.svg index 3ca8e01..8ad93ef 100644 --- a/images/emptyheap.svg +++ b/images/emptyheap.svg @@ -10,24 +10,24 @@ <defs id="defs32" /> <path - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" id="path4" - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <g - transform="translate(655,63)" - id="g4650"> + transform="translate(656,65.625)" + id="g6"> <path - d="M 79.5,438.375 C 79.5,442.86231 75.750385,446.5 71.125,446.5 C 66.499615,446.5 62.75,442.86231 62.75,438.375 C 62.75,433.88769 66.499615,430.25 71.125,430.25 C 75.750385,430.25 79.5,433.88769 79.5,438.375 L 79.5,438.375 z" + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" - id="path7" + id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text - id="text9" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"> + id="text10" + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan x="91" y="-42" - id="tspan11" + id="tspan12" style="font-size:12px">X</tspan> </text> </g> @@ -42,6 +42,7 @@ style="font-size:24px">[]</tspan> </text> <g + transform="translate(6,0)" id="g17"> <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" @@ -60,10 +61,11 @@ style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <text + x="6" id="text25" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> <tspan - x="21" + x="27" y="29" id="tspan27" style="font-size:24px">!</tspan> diff --git a/images/nocode.svg b/images/nocode.svg index 2c35684..123e6ed 100644 --- a/images/nocode.svg +++ b/images/nocode.svg @@ -11,43 +11,6 @@ <defs id="defs41"> <linearGradient - x1="0.94254935" - y1="-31.669659" - x2="104.37702" - y2="20.434471" - id="linearGradient3172" - xlink:href="#linearGradient3166" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /> - <linearGradient - id="linearGradient3166"> - <stop - id="stop3168" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop3170" - style="stop-color:#ffff00;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - x1="0.94254935" - y1="-31.669659" - x2="104.37702" - y2="20.434471" - id="linearGradient2558" - xlink:href="#linearGradient3166" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7083638,0,0,1.0012565,346.13381,24.632067)" /> - <linearGradient - x1="0" - y1="22" - x2="74" - y2="22" - id="linearGradient2498" - xlink:href="#linearGradient3166" - gradientUnits="userSpaceOnUse" /> - <linearGradient id="linearGradient2492"> <stop id="stop2494" @@ -69,20 +32,20 @@ gradientTransform="matrix(0.4746037,0,0,0.6708419,62.671562,26.937823)" /> </defs> <path - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" id="path4" - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <g - transform="translate(656,63)" + transform="translate(656,65.625)" id="g6"> <path - d="M 79.5,438.375 C 79.5,442.86231 75.750385,446.5 71.125,446.5 C 66.499615,446.5 62.75,442.86231 62.75,438.375 C 62.75,433.88769 66.499615,430.25 71.125,430.25 C 75.750385,430.25 79.5,433.88769 79.5,438.375 L 79.5,438.375 z" + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text id="text10" - style="font-size:12px;font-weight:bold;fill:#000000;fill-opacity:1;font-family:Bitstream Vera Sans"> + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan x="91" y="-42" @@ -91,16 +54,16 @@ </text> </g> <text - x="-41.722656" - id="text24" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> + id="text13" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan - x="128.27734" + x="128" y="28" id="tspan26" style="font-size:24px">???</tspan> </text> <g + transform="translate(6,0)" id="g28"> <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" @@ -119,12 +82,13 @@ style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <text - id="text36" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> + x="6" + id="text20" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan - x="21" + x="27" y="29" - id="tspan38" + id="tspan22" style="font-size:24px">!</tspan> </text> <path diff --git a/images/noinput.svg b/images/noinput.svg index ec53935..eee29e2 100644 --- a/images/noinput.svg +++ b/images/noinput.svg @@ -1,70 +1,93 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg:svg +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" width="767" height="38" - version="1.0"> - <svg:path - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" /> - <svg:g - transform="translate(656,63)"> - <svg:path + id="svg2393"> + <defs + id="defs2427" /> + <path + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" + id="path4" + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <g + transform="translate(656,65.625)" + id="g6"> + <path + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" - d="M 79.5,438.375 A 8.375,8.125 0 1 1 62.75,438.375 A 8.375,8.125 0 1 1 79.5,438.375 z" + id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:text - style="font-size:12px;font-weight:bold;fill:#000000;fill-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan - style="font-size:12" + <text + id="text10" + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> + <tspan + x="91" y="-42" - x="91">X</svg:tspan> - </svg:text> - </svg:g> - <svg:g - transform="translate(0,-0.25)"> - <svg:path + id="tspan12" + style="font-size:12px">X</tspan> + </text> + </g> + <g + transform="translate(0,-0.25)" + id="g2400"> + <path d="M 122.5,8.5 L 133.5,8.5 L 133.5,12.5 L 131,12.5 L 131,10.5 L 124,10.5" + id="path2402" style="fill:#a0a0a0;fill-opacity:1;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path + <path d="M 122.5,27 L 133.5,27 L 133.5,23 L 131,23 L 131,25 L 124,25" + id="path2404" style="fill:#a0a0a0;fill-opacity:1;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - d="M 108,5.25 C 118.5,5.25 118.5,5.25 118.5,5.25 C 118.5,5.25 121.5,7 122.25,8 C 123,9 124.5,12 124.5,12 L 124.5,24.5 C 124.5,24.5 123,27 122.25,28 C 121.25,29 118.5,30.5 118.5,30.5 L 107.25,30.5 L 107.25,30. L 107.25,33.25 L 94,33.25 L 94,30.5 L 82.5,30.5 C 82.5,30.5 80,29 79,28 C 78,27 76.5,24.5 76.5,24.5 L 76.5,12 C 76.5,12 78,9 79,8 C 80,7 82.5,5.25 82.5,5.25 L 93.25,5.25 L 93.25,8.5 L 108,8.5 L 108,5.25 z" + <path + d="M 108,5.25 C 118.5,5.25 118.5,5.25 118.5,5.25 C 118.5,5.25 121.5,7 122.25,8 C 123,9 124.5,12 124.5,12 L 124.5,24.5 C 124.5,24.5 123,27 122.25,28 C 121.25,29 118.5,30.5 118.5,30.5 L 107.25,30.5 L 107.25,30 L 107.25,33.25 L 94,33.25 L 94,30.5 L 82.5,30.5 C 82.5,30.5 80,29 79,28 C 78,27 76.5,24.5 76.5,24.5 L 76.5,12 C 76.5,12 78,9 79,8 C 80,7 82.5,5.25 82.5,5.25 L 93.25,5.25 L 93.25,8.5 L 108,8.5 L 108,5.25 z" + id="path2406" style="fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.33340001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </svg:g> - <svg:path - style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 151.5,17.875 A 14.625,16.125 0 1 1 122.25,17.875 A 14.625,16.125 0 1 1 151.5,17.875 z" - transform="matrix(0.934374,0,0,0.8474554,3.8575668,3.8517347)" /> - <svg:text + </g> + <path + d="M 151.5,17.875 C 151.5,26.780592 144.95216,34 136.875,34 C 128.79784,34 122.25,26.780592 122.25,17.875 C 122.25,8.9694084 128.79784,1.75 136.875,1.75 C 144.95216,1.75 151.5,8.9694084 151.5,17.875 L 151.5,17.875 z" + transform="matrix(0.934374,0,0,0.8474554,3.8575668,3.8517347)" + id="path2408" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <text + id="text2410" style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan - sodipodi:role="line" + <tspan x="170" y="28" - style="font-size:24px">???</svg:tspan> - </svg:text> - <svg:g> - <svg:path - transform="translate(-4,20)" + id="tspan2412" + style="font-size:24px">???</tspan> + </text> + <g + transform="translate(6,0)" + id="g2414"> + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-4,20)" + id="path2416" style="opacity:1;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(1,17)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(1,17)" + id="path2418" style="opacity:1;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(-1,18)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-1,18)" + id="path2420" style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </svg:g> - <svg:text + </g> + <text + x="6" + id="text2422" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan - x="21" + <tspan + x="27" y="29" - style="font-size:24px">!</svg:tspan> - </svg:text> -</svg:svg> + id="tspan2424" + style="font-size:24px">!</tspan> + </text> +</svg> diff --git a/images/nomedia.svg b/images/nomedia.svg index 6eb6bb2..b199b57 100644 --- a/images/nomedia.svg +++ b/images/nomedia.svg @@ -41,20 +41,20 @@ gradientTransform="matrix(0.7083638,0,0,1.0012565,346.13381,24.632067)" /> </defs> <path - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" id="path4" - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <g - transform="translate(656,63)" + transform="translate(656,65.625)" id="g6"> <path - d="M 79.5,438.375 C 79.5,442.86231 75.750385,446.5 71.125,446.5 C 66.499615,446.5 62.75,442.86231 62.75,438.375 C 62.75,433.88769 66.499615,430.25 71.125,430.25 C 75.750385,430.25 79.5,433.88769 79.5,438.375 L 79.5,438.375 z" + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text id="text10" - style="font-size:12px;font-weight:bold;fill:#000000;fill-opacity:1;font-family:Bitstream Vera Sans"> + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan x="91" y="-42" @@ -63,16 +63,16 @@ </text> </g> <text - x="-41.722656" - id="text24" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> + id="text2445" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan - x="128.27734" + x="128" y="28" - id="tspan26" + id="tspan2447" style="font-size:24px">???</tspan> </text> <g + transform="translate(6,0)" id="g28"> <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" @@ -91,10 +91,11 @@ style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <text + x="6" id="text36" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> <tspan - x="21" + x="27" y="29" id="tspan38" style="font-size:24px">!</tspan> diff --git a/images/nostack.svg b/images/nostack.svg index 0ccd510..838d061 100644 --- a/images/nostack.svg +++ b/images/nostack.svg @@ -1,56 +1,76 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg:svg - xmlns:xlink="http://www.w3.org/1999/xlink" +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + version="1.0" width="767" height="38" - version="1.0"> - <svg:path - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" /> - <svg:g - id="g4650" - transform="translate(655,63)"> - <svg:path + id="svg2467"> + <defs + id="defs2493" /> + <path + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" + id="path4" + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <g + transform="translate(656,65.625)" + id="g6"> + <path + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" - d="M 79.5,438.375 A 8.375,8.125 0 1 1 62.75,438.375 A 8.375,8.125 0 1 1 79.5,438.375 z" + id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:text - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"> - <svg:tspan - style="font-size:12px" + <text + id="text10" + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> + <tspan + x="91" y="-42" - x="91">X</svg:tspan> - </svg:text> - </svg:g> - <svg:text + id="tspan12" + style="font-size:12px">X</tspan> + </text> + </g> + <text + id="text2474" style="font-size:12px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan + <tspan x="170" y="28" - style="font-size:24px">???</svg:tspan> - </svg:text> - <svg:g> - <svg:path - transform="translate(-4,20)" + id="tspan2476" + style="font-size:24px">???</tspan> + </text> + <g + transform="translate(6,0)" + id="g2478"> + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-4,20)" + id="path2480" style="opacity:1;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(1,17)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(1,17)" + id="path2482" style="opacity:1;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(-1,18)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-1,18)" + id="path2484" style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </svg:g> - <svg:text + </g> + <text + x="6" + id="text2486" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan - x="21" + <tspan + x="27" y="29" - style="font-size:24px">!</svg:tspan> - </svg:text> - <svg:path - style="fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:#c0a000;stroke-width:1.33340001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 148.5,19 L 148.5,19 L 122.5,34 L 122.5,34 L 122.5,37 L 109,37 L 109,34 C 109,34 83,19 83,19 C 83,19 116,1 116,1 C 116,1 148.5,19 148.5,19 z" /> -</svg:svg> + id="tspan2488" + style="font-size:24px">!</tspan> + </text> + <path + d="M 148.5,19 L 148.5,19 L 122.5,34 L 122.5,34 L 122.5,37 L 109,37 L 109,34 C 109,34 83,19 83,19 C 83,19 116,1 116,1 C 116,1 148.5,19 148.5,19 z" + id="path2490" + style="fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:#c0a000;stroke-width:1.33340001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> +</svg> diff --git a/images/status.svg b/images/status.svg index d4f1474..cb72835 100644 --- a/images/status.svg +++ b/images/status.svg @@ -1,47 +1,63 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg:svg +<svg + xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.0" width="767" height="38" - version="1.0"> - <svg:path - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758.25,2.5 L 764.25,7 L 767,15 L 767,38 L 0.5,37.5 z" /> - <svg:g - transform="translate(656,63)"> - <svg:path + id="svg2"> + <defs + id="defs27" /> + <path + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" + id="path4" + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <g + transform="translate(656,65.625)" + id="g6"> + <path + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" - d="M 79.5,438.375 A 8.375,8.125 0 1 1 62.75,438.375 A 8.375,8.125 0 1 1 79.5,438.375 z" + id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:text - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"> - <svg:tspan - style="font-size:12" + <text + id="text10" + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;"> + <tspan + x="91" y="-42" - x="91">X</svg:tspan> - </svg:text> - </svg:g> - <svg:g> - <svg:path - transform="translate(-4,20)" + id="tspan12" + style="font-size:12px">X</tspan> + </text> + </g> + <g + transform="translate(5.5,0)" + id="g14"> + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-4,20)" + id="path16" style="opacity:1;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(1,17)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(1,17)" + id="path18" style="opacity:1;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <svg:path - transform="translate(-1,18)" + <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" + transform="translate(-1,18)" + id="path20" style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </svg:g> - <svg:text + </g> + <text + x="5.5" + id="text22" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> - <svg:tspan - x="21" + <tspan + x="26.5" y="29" - style="font-size:24px">!</svg:tspan> - </svg:text> -</svg:svg> + id="tspan24" + style="font-size:24px">!</tspan> + </text> +</svg> diff --git a/images/syntaxerror.svg b/images/syntaxerror.svg index 792e725..0963986 100644 --- a/images/syntaxerror.svg +++ b/images/syntaxerror.svg @@ -32,20 +32,20 @@ </linearGradient> </defs> <path - d="M 0.5,37.5 L 0.5,13 L 3.5,6.5 L 8.5,2.5 L 15,0 L 751.5,0 L 758,2.5 L 764,7 L 767,15 L 767,38 L 0.5,37.5 z" + d="M 15,37.5 C 11.5,37.5 8,35 5.5,32.5 C 3,30 0.5,26.5 0.5,23 L 0.5,15 C 0.5,11.75 3,6.5 5.5,4.5 C 8,2.5 11.5,0.5 15,0.5 L 751.5,0.5 C 754,0.5 758.5,1.5 762,4.5 C 765.5,7.25 766.5,12 766.5,15 L 766.5,23 C 766.5,26.5 764.5,30 762,32.5 C 759.5,35 755.5,37.5 751.5,37.5 L 15,37.5 z" id="path4" - style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:0.99423993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <g - transform="translate(656,63)" + transform="translate(656,65.625)" id="g6"> <path - d="M 79.5,438.375 C 79.5,442.86231 75.750385,446.5 71.125,446.5 C 66.499615,446.5 62.75,442.86231 62.75,438.375 C 62.75,433.88769 66.499615,430.25 71.125,430.25 C 75.750385,430.25 79.5,433.88769 79.5,438.375 L 79.5,438.375 z" + d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z" transform="translate(24,-485)" id="path8" style="fill:#ff4040;fill-opacity:1;fill-rule:nonzero;stroke:#ff4040;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <text id="text10" - style="font-size:12px;font-weight:bold;fill:#000000;fill-opacity:1;font-family:Bitstream Vera Sans"> + style="font-size:12px;font-weight:bold;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"> <tspan x="91" y="-42" @@ -89,6 +89,7 @@ style="font-size:24px">???</tspan> </text> <g + transform="translate(6,0)" id="g28"> <path d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z" @@ -107,10 +108,11 @@ style="opacity:1;fill:#ffe000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <text + x="6" id="text36" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"> <tspan - x="21" + x="27" y="29" id="tspan38" style="font-size:24px">!</tspan> @@ -257,10 +257,10 @@ def setup_misc(tw): tw.status_shapes['syntaxerror'] = load_image(tw.path, '', 'syntaxerror') # for some reason, the status bar is displayed off screen on the XO if os.path.exists('/sys/power/olpc-pm'): - tw.status_spr = sprNew(tw,0,(tw.height-83), \ + tw.status_spr = sprNew(tw,0,(tw.height-183), \ tw.status_shapes['status'],True) else: - tw.status_spr = sprNew(tw,0,(tw.height-73), \ + tw.status_spr = sprNew(tw,0,(tw.height-173), \ tw.status_shapes['status'],True) tw.status_spr.type = 'status' setlayer(tw.status_spr,400) diff --git a/tawindow.py b/tawindow.py index da77f08..c3a49ed 100644 --- a/tawindow.py +++ b/tawindow.py @@ -54,7 +54,7 @@ def twNew(win, path, lang, tboxh, parent=None): tw.save_file_name = None win.set_flags(gtk.CAN_FOCUS) tw.width = gtk.gdk.screen_width() - tw.height = gtk.gdk.screen_height() - tboxh + tw.height = gtk.gdk.screen_height() # - tboxh win.set_size_request(tw.width, tw.height) if parent is None: win.show_all() else: parent.show_all() |