Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tablock.py30
-rw-r--r--taconstants.py19
-rw-r--r--talogo.py1
-rw-r--r--tawindow.py8
4 files changed, 20 insertions, 38 deletions
diff --git a/tablock.py b/tablock.py
index 8d6ec68..00a3eca 100644
--- a/tablock.py
+++ b/tablock.py
@@ -353,7 +353,6 @@ class Block:
self._make_basic_block(svg)
self.docks = [['flow',True,self.svg.docks[0][0],self.svg.docks[0][1]],
['flow',False,self.svg.docks[1][0],self.svg.docks[1][1]]]
- # self._left, self._right = 2, 2
def _make_basic_style_head(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -363,7 +362,6 @@ class Block:
self.docks = [['start', True, 0, 0],
['flow', False, self.svg.docks[0][0],
self.svg.docks[0][1]]]
- # self._left, self._right = 2, 2
def _make_basic_style_head_1arg(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -376,7 +374,6 @@ class Block:
self.svg.docks[0][1]],
['flow', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left, self._right = 2, self.svg.get_innie_width()*1.5
def _make_basic_style_tail(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -396,7 +393,6 @@ class Block:
self.svg.docks[1][1]],
['flow', False, self.svg.docks[2][0],
self.svg.docks[2][1]]]
- # self._left, self._right = 2, self.svg.get_innie_width()*1.5
def _make_basic_style_2arg(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -410,7 +406,6 @@ class Block:
self.svg.docks[2][1]],
['flow', False, self.svg.docks[3][0],
self.svg.docks[3][1]]]
- # self._left, self._right = 2, self.svg.get_innie_width()*1.5
def _make_basic_style_var_arg(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -430,7 +425,6 @@ class Block:
self.svg.docks[i+3][1]])
self.docks.append(['flow', False, self.svg.docks[self._ei+3][0],
self.svg.docks[self._ei+3][1], ']'])
- # self._left, self._right = 2, self.svg.get_innie_width()*1.5
def _make_box_style(self, svg):
self.svg.expand(60+self._dx+self._ex, self._ey)
@@ -438,7 +432,6 @@ class Block:
self.docks = [['number', True, self.svg.docks[0][0],
self.svg.docks[0][1]],
['unavailable', False, 0, 0]]
- # self._left, self._right = self.svg.docks[1][0], 1
def _make_media_style(self, svg):
self.svg.expand(40+self._dx+self._ex, 10+self._ey)
@@ -446,7 +439,6 @@ class Block:
self.docks = [['number', True, self.svg.docks[0][0],
self.svg.docks[0][1]],
['unavailable', False, 0, 0]]
- # self._left, self._right = self.svg.docks[1][0], 1
def _make_number_style(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -465,8 +457,6 @@ class Block:
self.svg.docks[0][1]],
['number', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left = self.svg.docks[2][0]
- # self._right = self.svg.get_innie_width()*1.5
def _make_number_style_block(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -482,8 +472,6 @@ class Block:
['number', False, self.svg.docks[1][0],
self.svg.docks[1][1]],
['unavailable', False, 0, 0, ')']]
- # self._left = self.svg.docks[2][0]
- # self._right = self.svg.get_innie_width()*1.5
def _make_number_style_1arg(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -496,7 +484,6 @@ class Block:
self.svg.docks[1][1]],
['number', False, self.svg.docks[0][0],
self.svg.docks[0][1]]]
- # self._left, self._right = self.svg.docks[1][0], self.svg.docks[1][0]
def _make_number_style_1strarg(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -510,7 +497,6 @@ class Block:
['string', False, self.svg.docks[0][0],
self.svg.docks[0][1]],
['unavailable', False, 0, 0]]
- # self._left, self._right = self.svg.docks[1][0], self.svg.docks[1][0]
def _make_number_style_porch(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -526,8 +512,6 @@ class Block:
self.svg.docks[0][1]],
['number', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left = self.svg.docks[2][0]
- # self._right = self.svg.get_width()-self.svg.docks[0][0]
def _make_compare_style(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -539,7 +523,6 @@ class Block:
['number', False, self.svg.docks[2][0],
self.svg.docks[2][1]],
['unavailable', False, 0, 0, ')']]
- self._left, self._right = self.svg.get_width()-self.svg.docks[2][0], 0
def _make_boolean_style(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -550,7 +533,6 @@ class Block:
self.svg.docks[1][1]],
['bool', False, self.svg.docks[2][0],
self.svg.docks[2][1]]]
- self._left, self._right = self.svg.get_width()-self.svg.docks[1][0], 0
def _make_not_style(self, svg):
self.svg.expand(15+self._dx+self._ex, self._ey)
@@ -559,8 +541,6 @@ class Block:
self.svg.docks[0][1]],
['bool', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- self._right = self.svg.get_width()-self.svg.docks[1][0]
- self._left = self._right
def _make_flow_style(self, svg):
self.svg.expand(10+self._dx+self._ex, self._ey)
@@ -579,7 +559,6 @@ class Block:
self.svg.docks[0][1]],
['flow', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left, self._right = 0, self.svg.get_width()-self.svg.docks[1][0]
def _make_flow_style_1arg(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -595,9 +574,6 @@ class Block:
self.svg.docks[2][1], '['],
['flow', False, self.svg.docks[3][0],
self.svg.docks[3][1], ']']]
- # self._left = 2
- # self._right = self.svg.get_width()-self.svg.docks[1][0]+ \
- # self.svg.get_innie_width()*1.5
def _make_flow_style_boolean(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -613,7 +589,6 @@ class Block:
self.svg.docks[2][1], '['],
['flow', False, self.svg.docks[3][0],
self.svg.docks[3][1], ']']]
- # self._left, self._right = 2, self.svg.get_width()-self.svg.docks[1][0]
def _make_flow_style_else(self, svg):
self.svg.expand(self._dx+self._ex, self._ey)
@@ -632,7 +607,6 @@ class Block:
self.svg.docks[2][1], ']['],
['flow', False, self.svg.docks[4][0],
self.svg.docks[4][1], ']']]
- # self._left, self._right = 2, self.svg.get_width()-self.svg.docks[1][0]
def _make_portfolio_style_2x2(self, svg):
self.svg.expand(30+self._dx+self._ex, 10+self._ey)
@@ -654,7 +628,6 @@ class Block:
self.svg.docks[2][1]],
['flow', False, self.svg.docks[3][0],
self.svg.docks[3][1]]]
- # self._left, self._right = 2, self.svg.get_width()-2
def _make_portfolio_style_2x1(self, svg):
self.svg.expand(30+self._dx+self._ex, 10+self._ey)
@@ -672,7 +645,6 @@ class Block:
self.svg.docks[1][1]],
['flow', False, self.svg.docks[2][0],
self.svg.docks[2][1]]]
- # self._left, self._right = 2, self.svg.get_width()-2
def _make_portfolio_style_1x2(self, svg):
self.svg.expand(30+self._dx+self._ex, 15+self._ey)
@@ -691,7 +663,6 @@ class Block:
self.svg.docks[2][1]],
['flow', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left, self._right = 2, self.svg.get_width()-2
def _make_portfolio_style_1x1(self, svg):
self.svg.expand(30+self._dx+self._ex, 15+self._ey)
@@ -708,7 +679,6 @@ class Block:
self.svg.docks[2][1]],
['flow', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- # self._left, self._right = 2, self.svg.get_width()-2
def _make_basic_block(self, svg):
self.shapes.append(svg_str_to_pixbuf(self.svg.basic_block()))
diff --git a/taconstants.py b/taconstants.py
index 4616a2c..7e47493 100644
--- a/taconstants.py
+++ b/taconstants.py
@@ -109,7 +109,8 @@ PALETTE_NAMES = ['turtle', 'pen', 'colors', 'numbers', 'flow', 'blocks',
PALETTES = [['forward', 'back', 'clean', 'left', 'right', 'show',
'seth', 'setxy', 'heading', 'xcor', 'ycor', 'setscale',
- 'arc', 'scale'],
+ 'arc', 'scale', 'width', 'height', 'leftpos', 'toppos', 'rightpos',
+ 'bottompos'],
['penup','pendown', 'setpensize', 'fillscreen', 'pensize',
'settextsize', 'setcolor', 'setshade', 'textsize', 'color',
'shade'],
@@ -123,10 +124,9 @@ PALETTES = [['forward', 'back', 'clean', 'left', 'right', 'show',
'storeinbox1', 'storeinbox2', 'string', 'box1', 'box2', 'box',
'storein', 'start'],
['kbinput', 'push', 'printheap', 'keyboard', 'pop', 'clearheap',
- 'myfunc', 'nop', 'leftpos', 'toppos', 'width', 'rightpos',
- 'bottompos', 'height', 'addturtle', 'print'],
+ 'myfunc', 'nop', 'addturtle', 'print'],
['journal', 'audio', 'description', 'templatelist', 'template1x1a',
- 'template2x2', 'hideblocks', 'showblocks'],
+ 'template2x2', 'hideblocks', 'showblocks', 'fullscreen'],
['empty', 'restoreall']]
#
@@ -225,7 +225,7 @@ EXPANDABLE = ['vspace', 'hspace', 'templatelist', 'identity2']
#
# Old block styles that need dock adjustments
#
-OLD_DOCK = ['and', 'or']
+OLD_DOCK = ['and', 'or', 'plus', 'minus', 'division', 'product', 'remainder']
#
# blocks that contain media
@@ -256,6 +256,7 @@ BLOCK_NAMES = {
'fillscreen':[_('fill screen'),_('color'),_('shade')],
'forever':[_('forever')],
'forward':[_('forward')],
+ 'fullscreen':[_('full screen')],
'greater2':[">"],
'green':[_('green')],
'hat':[_('action')],
@@ -359,6 +360,7 @@ PRIMITIVES = {
'fillscreen':'fillscreen',
'forever':'forever',
'forward':'forward',
+ 'fullscreen':'fullscreen',
'greater2':'greater?',
'green':'green',
'hat':'nop3',
@@ -511,11 +513,11 @@ STATUS_SHAPES = ['status', 'info', 'nostack', 'noinput', 'emptyheap',
#
# Legacy names
#
-OLD_NAMES = {'product':'product2', 'storeinbox':'storein',
+OLD_NAMES = {'product':'product2', 'storeinbox':'storein', 'minus':'minus2',
'division':'division2', 'plus':'plus2', 'and':'and2', 'or':'or2',
'less':'less2', 'greater':'greater2', 'equal':'equal2',
'remainder':'remainder2', 'identity':'identity2',
- 'division':'division2', 'if else':'if', 'audiooff':'audio',
+ 'division':'division2', 'audiooff':'audio',
'descriptionoff':'description','template3':'templatelist',
'template1':'template1x1', 'template2':'template2x1',
'template6':'template1x2', 'template7':'template2x2',
@@ -583,13 +585,14 @@ HELP_STRINGS = {
'colors':_("a palette of pen colors"),
'description':_("Sugar Journal description field"),
'division2':_("divides top numeric input (numerator) by bottom numeric input (denominator)"),
- 'empty':_('permanently deletes items in trash'),
+ 'empty':_("permanently deletes items in trash"),
'equal2':_("logical equal-to operator"),
'extras':_("palette of extra options"),
'fillscreen':_("fills the background with (color, shade)"),
'flow':_("palette of flow operators"),
'forever':_("loop forever"),
'forward':_("move turtle forward"),
+ 'fullscreen':_("hide the Sugar toolbars"),
'greater2':_("logical greater-than operator"),
'hat1':_("top of action 1 stack"),
'hat2':_("top of action 2 stack"),
diff --git a/talogo.py b/talogo.py
index b1dd8f4..4d8efd5 100644
--- a/talogo.py
+++ b/talogo.py
@@ -206,6 +206,7 @@ class LogoCode:
'fillscreen':[2, lambda self, x, y: self.tw.canvas.fillscreen(x, y)],
'forever':[1, self.prim_forever, True],
'forward':[1, lambda self, x: self.tw.canvas.forward(x)],
+ 'fullscreen':[0, lambda self: self.tw.set_fullscreen()],
'greater?':[2, lambda self,x,y: tamore(x,y)],
'green':[0, lambda self: 30],
'heading':[0, lambda self: self.tw.canvas.heading],
diff --git a/tawindow.py b/tawindow.py
index 68a9f01..fd1d949 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -269,6 +269,14 @@ class TurtleArtWindow():
self.nop = 'pythonloaded'
"""
+ Enter fulscreen mode
+ """
+ def set_fullscreen(self):
+ if self.running_sugar:
+ self.activity.fullscreen()
+ self.activity.recenter()
+
+ """
Hide/show button
"""
def hideshow_button(self):
generated by cgit v0.9.1 at 2024-04-18 14:16:52 (GMT)