diff options
| -rw-r--r-- | TurtleArt/tawindow.py | 19 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 8 |
2 files changed, 19 insertions, 8 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index c5ab0c6..91e60d2 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,6 +2200,19 @@ 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' @@ -3686,6 +3696,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 """ diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index a33a611..f15650e 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -1634,17 +1634,17 @@ in order to use the plugin.')) self._old_cursor = self.get_window().get_cursor() self.get_window().set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND1)) - def empty_trash_alert(self): + def empty_trash_alert(self, title, msg): ''' We get confirmation from the user before emptying the trash ''' alert = ConfirmationAlert() - alert.props.title = _('empty trash') - alert.props.msg = _('Do you really want to empty the trash?') + alert.props.title = title + alert.props.msg = msg def _empty_trash_alert_response_cb(alert, response_id, self): if response_id is gtk.RESPONSE_OK: _logger.debug('emptying the trash') self.remove_alert(alert) - self.tw.empty_trash() + self.tw._empty_trash() elif response_id is gtk.RESPONSE_CANCEL: _logger.debug('cancel emptying the trash') self.remove_alert(alert) |