Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-03-03 16:21:54 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-03-03 16:21:54 (GMT)
commit5e965f20b1f1bdf7f6e58508d6a2244e967918b6 (patch)
tree7bbc520ef3ffd261bcd97e1458f9bd31fb1267d2
parent07499470046474b44542f86eab0d1c98095bb34c (diff)
deprecated...
-rw-r--r--TurtleArt/tabasics.py4
-rw-r--r--TurtleArt/tablock.py2
-rw-r--r--TurtleArt/tacanvas.py6
-rw-r--r--TurtleArt/taconstants.py7
-rw-r--r--TurtleArt/talogo.py4
-rw-r--r--TurtleArt/tawindow.py6
-rw-r--r--plugins/turtle_blocks_plugin.py8
7 files changed, 19 insertions, 18 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index 1cd3941..cc4f144 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -258,7 +258,7 @@ turtle (can be used in place of a number block)'),
self.tw.lc.def_prim(
'heading', 0, lambda self: self.tw.canvas.heading)
- # Depreciated
+ # Deprecated
make_prim('setxy',
style='basic-style-2arg',
label=[_('set xy'), _('x'), _('y')],
@@ -418,7 +418,7 @@ place of a number block)'),
self._make_constant('white', 'colors', WHITE)
self._make_constant('black', 'colors', BLACK)
- # depreciated blocks
+ # deprecated blocks
make_prim('settextcolor',
style='basic-style-1arg',
label=_('set text color'),
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index 863246c..3f4e839 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-#Copyright (c) 2010 Walter Bender
+#Copyright (c) 2010,11 Walter Bender
#Permission is hereby granted, free of charge, to any person obtaining a copy
#of this software and associated documentation files (the "Software"), to deal
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index cf1eb85..553455f 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -135,7 +135,7 @@ class TurtleGraphics:
self.fgcolor = self.cm.alloc_color('red')
self.bgrgb = [255, 248, 222]
self.bgcolor = self.cm.alloc_color('#fff8de')
- self.textsize = 48 # depreciated
+ self.textsize = 48 # deprecated
self.textcolor = self.cm.alloc_color('blue')
self.tw.active_turtle.show()
self.shade = 0
@@ -432,7 +432,7 @@ class TurtleGraphics:
round_int(self.gray)]))
self.tw.send_event(event)
- def settextcolor(self, c): # depreciated
+ def settextcolor(self, c): # deprecated
""" Set the text color """
try:
self.tcolor = c
@@ -442,7 +442,7 @@ class TurtleGraphics:
return
self.set_textcolor()
- def settextsize(self, c): # depreciated
+ def settextsize(self, c): # deprecated
""" Set the text size """
try:
self.tw.textsize = c
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index eb242e6..53e628a 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -144,7 +144,7 @@ EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg',
COLLAPSIBLE = ['sandwichbottom', 'sandwichcollapsed']
#
-# Depreciated block styles that need dock adjustments
+# Deprecated block styles that need dock adjustments
#
OLD_DOCK = ['and', 'or', 'plus', 'minus', 'division', 'product', 'remainder']
@@ -241,7 +241,8 @@ OLD_NAMES = {'product': 'product2', 'storeinbox': 'storein', 'minus': 'minus2',
'template1': 'template1x1', 'template2': 'template2x1',
'template6': 'template1x2', 'template7': 'template2x2',
'template4': 'template1x1a', 'hres': 'width', 'vres': 'height',
- 'sandwichtop2': 'sandwichtop', 'image': 'show'}
+ 'sandwichtop2': 'sandwichtop', 'image': 'show',
+ 'container': 'indentity2', 'insertimage': 'show'}
#
# Define the relative size and postion of media objects
@@ -250,7 +251,7 @@ OLD_NAMES = {'product': 'product2', 'storeinbox': 'storein', 'minus': 'minus2',
TITLEXY = (0.9375, 0.875)
#
-# Relative placement of portfolio objects (used by depreciated blocks)
+# Relative placement of portfolio objects (used by deprecated blocks)
#
TEMPLATES = {'t1x1': (0.5, 0.5, 0.0625, 0.125, 1.05, 0),
't2z1': (0.5, 0.5, 0.0625, 0.125, 1.05, 1.05),
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 373b825..aeb36f4 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -126,7 +126,7 @@ class LogoCode:
self.dsobject = None
self.start_time = None
- # Scale factors for depreciated portfolio blocks
+ # Scale factors for deprecated portfolio blocks
self.title_height = int((self.tw.canvas.height / 20) * self.tw.scale)
self.body_height = int((self.tw.canvas.height / 40) * self.tw.scale)
self.bullet_height = int((self.tw.canvas.height / 30) * self.tw.scale)
@@ -219,7 +219,7 @@ class LogoCode:
except ValueError:
code.append(float(ord(blk.values[0][0])))
elif blk.name == 'string' or \
- blk.name == 'title': # depreciated block
+ blk.name == 'title': # deprecated block
if type(blk.values[0]) == float or type(blk.values[0]) == int:
if int(blk.values[0]) == blk.values[0]:
blk.values[0] = int(blk.values[0])
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 8b11921..b7d9d48 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1682,7 +1682,7 @@ class TurtleArtWindow():
elif blk.name in COLLAPSIBLE:
top = find_sandwich_top(blk)
if collapsed(blk):
- restore_stack(top) # depreciated (bottom block is invisible)
+ restore_stack(top) # deprecated (bottom block is invisible)
elif top is not None:
collapse_stack(top)
@@ -2464,7 +2464,7 @@ class TurtleArtWindow():
# Some blocks get transformed.
if btype in BLOCK_STYLES['basic-style-var-arg'] and value is not None:
# Is there code stored in this userdefined block?
- if value > 0: # catch depreciated format (#2501)
+ if value > 0: # catch deprecated format (#2501)
self.python_code = None
if self.running_sugar:
try:
@@ -2681,7 +2681,7 @@ class TurtleArtWindow():
self.status_spr.move((PALETTE_WIDTH, self.height - 200))
def calc_position(self, template):
- """ Relative placement of portfolio objects (depreciated) """
+ """ Relative placement of portfolio objects (deprecated) """
w, h, x, y, dx, dy = TEMPLATES[template]
x *= self.canvas.width
y *= self.canvas.height
diff --git a/plugins/turtle_blocks_plugin.py b/plugins/turtle_blocks_plugin.py
index 0370f74..8d56e9f 100644
--- a/plugins/turtle_blocks_plugin.py
+++ b/plugins/turtle_blocks_plugin.py
@@ -177,7 +177,7 @@ operators from Numbers palette'))
self.tw.lc.def_prim('showaligned', 1,
lambda self, x: PLUGIN_DICTIONARY['show'](x, False))
- # depreciated
+ # deprecated
PLUGIN_DICTIONARY['write'] = self._prim_write
make_prim('write',
style='basic-style-1arg',
@@ -496,7 +496,7 @@ found in the Journal'))
help_string=_('bottom block in a collapsed stack: click to \
open'))
- # depreciated blocks
+ # deprecated blocks
make_prim('sandwichtop',
style='collapsible-top',
label=_('top of stack'),
@@ -681,7 +681,7 @@ objects'))
prim_name='bottomy')
self.tw.lc.def_prim('bottomy', 0, lambda self: CONSTANTS['bottomy'])
- # depreciated blocks
+ # deprecated blocks
PLUGIN_DICTIONARY['t1x1'] = self._prim_t1x1
make_prim('template1x1',
@@ -1022,7 +1022,7 @@ objects"))
self.tw.lc.update_label_value('time', elapsed_time)
return elapsed_time
- # Depreciated blocks
+ # Deprecated blocks
def _prim_t1x1(self, title, media):
""" title, one image, and description """