From 770864358ab20d94288ad95ef7f8fb4d4ea7e062 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 26 Nov 2013 09:55:02 +0000
Subject: resync with 194

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index c5ab0c6..81b1251 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1640,10 +1640,7 @@ before making changes to your program'))
                 elif blk.name == 'restore':
                     self.restore_latest_from_trash()
                 elif blk.name == 'empty':
-                    if self.running_sugar:
-                        self.activity.empty_trash_alert()
-                    else:
-                        self.empty_trash()
+                    self.empty_trash()
                 elif blk.name == 'trashall':
                     for b in self.just_blocks():
                         if b.type != 'trash':
@@ -2203,10 +2200,26 @@ before making changes to your program'))
 
     def empty_trash(self):
         ''' Permanently remove all blocks presently in the trash can. '''
+        title = _('empty trash')
+        msg = _('Do you really want to empty the trash?')
+        if self.running_sugar:
+            self.activity.empty_trash_alert(title, msg)
+        else:
+            dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL, msg)
+            dialog.set_title(title)
+            res = dialog.run()
+            dialog.destroy()
+            if res == gtk.RESPONSE_OK:
+                self._empty_trash()
+
+    def _empty_trash(self):
         for blk in self.block_list.list:
             if blk.type == 'trash':
                 blk.type = 'deleted'
                 blk.spr.hide()
+        for blk in self.block_list.list:
+            if blk.type == 'deleted':
+                self.block_list.list.remove(blk)
         self.trash_stack = []
         if 'trash' in palette_names:
             self.show_toolbar_palette(palette_names.index('trash'),
@@ -3686,6 +3699,7 @@ before making changes to your program'))
             self.keyboard = KEY_DICT[self.keypress]
         else:
             self.keyboard = 0
+        self.keypress = ''
 
     def get_keyboard(self):
         """ Return cached keyboard input """
--
cgit v0.9.1