From c2ec4df50d3ea33312e2331804e9601ca52dc3c1 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Wed, 16 Oct 2013 19:30:48 +0000 Subject: cleaning up for v192 --- diff --git a/NEWS b/NEWS index 6ff2d7b..87d3572 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,9 @@ ENHANCEMENTS: * New translations * Moved save snapshot button to Load/Save palette (Users were confusing it for the save image button.) +* New blocks on extras palette: load_file_to_heap and save_heap_to_file +* Enabled floating palette on XO 1 +* Added confirmation alert to empty trash block BUG FIXES: * Fixed regression in Sugar 84 support diff --git a/pysamples/load_file_to_heap.py b/pysamples/load_file_to_heap.py deleted file mode 100644 index 919d6b5..0000000 --- a/pysamples/load_file_to_heap.py +++ /dev/null @@ -1,30 +0,0 @@ -#Copyright (c) 2010-11, Walter Bender, Tony Forster - -# This procedure is invoked when the user-definable block on the -# "extras" palette is selected. - -# Usage: Import this code into a Python (user-definable) block; when -# this code is run, the chooser will be opened for selecting a file -# from the GNU/Linux file system. The contents of that file will be -# loaded onto the FILO heap. Data is assumed to be json encoded. - - -def myblock(tw, path): - ''' Load heap from file (GNOME only) ''' - - import os - from TurtleArt.tautils import get_load_name, data_from_file - - if type(path) == float: - path = '' - - if not os.path.exists(path): - path, tw.load_save_folder = get_load_name('.*', tw.load_save_folder) - if path is None: - return - - data = data_from_file(path) - if data is not None: - for val in data: - tw.lc.heap.append(val) - tw.lc.update_label_value('pop', tw.lc.heap[-1]) diff --git a/pysamples/load_journal_entry_to_heap.py b/pysamples/load_journal_entry_to_heap.py deleted file mode 100644 index 3dd3bb5..0000000 --- a/pysamples/load_journal_entry_to_heap.py +++ /dev/null @@ -1,18 +0,0 @@ -#Copyright (c) 2010-11, Walter Bender, Tony Forster - -# This procedure is invoked when the user-definable block on the -# "extras" palette is selected. - -# Usage: Import this code into a Python (user-definable) block; when -# this code is run, the chooser will be opened for selecting a file -# from the Journal. The contents of that file will be loaded onto the -# FILO heap. - - -def myblock(tw, x): # ignore second argument - ''' Load heap from journal (Sugar only) ''' - - from TurtleArt.tautils import chooser - - # Choose a datastore object and push data to heap (Sugar only) - chooser(tw.parent, '', tw.lc.push_file_data_to_heap) diff --git a/pysamples/save_heap_to_journal_entry.py b/pysamples/save_heap_to_journal_entry.py deleted file mode 100644 index a06d4d0..0000000 --- a/pysamples/save_heap_to_journal_entry.py +++ /dev/null @@ -1,39 +0,0 @@ -#Copyright (c) 2010-11, Walter Bender, Tony Forster - -# This procedure is invoked when the user-definable block on the -# "extras" palette is selected. - -# Usage: Import this code into a Python (user-definable) block; when -# this code is run, the contents of the FILO heap are saved to a -# Journal entry named by the value of the argument to the Python -# block. - - -def myblock(tw, title): - ''' Save heap to journal (Sugar only) ''' - - import os.path - from gettext import gettext as _ - - from sugar.activity import activity - from sugar.datastore import datastore - from sugar import profile - - from TurtleArt.tautils import get_path, data_to_file - - # Save JSON-encoded heap to temporary file - heap_file = os.path.join(get_path(activity, 'instance'), - str(title) + '.txt') - data_to_file(tw.lc.heap, heap_file) - - # Create a datastore object - dsobject = datastore.create() - - # Write any metadata (specifically set the title of the file - # and specify that this is a plain text file). - dsobject.metadata['title'] = str(title) - dsobject.metadata['icon-color'] = profile.get_color().to_string() - dsobject.metadata['mime_type'] = 'text/plain' - dsobject.set_file_path(heap_file) - datastore.write(dsobject) - dsobject.destroy() -- cgit v0.9.1