From 6f629593ed7e4daf526af301ec229f2fc9e3db79 Mon Sep 17 00:00:00 2001 From: klevin.gluo Date: Sun, 01 Dec 2013 20:56:58 +0000 Subject: deleted the line that outputs language after calculations --- diff --git a/layout.py b/layout.py index c967527..db19560 100644 --- a/layout.py +++ b/layout.py @@ -1,4 +1,5 @@ # layout.py, see calculate.py for info +# -*- coding: UTF-8 -*- from gettext import gettext as _ @@ -17,6 +18,7 @@ from sugar3.activity.widgets import ActivityToolbarButton from sugar3.activity.widgets import StopButton from toolbars import * +import numParser class CalcLayout: @@ -57,19 +59,19 @@ class CalcLayout: [2, 0, 2, 1, u'\u2192', self.col_gray3, lambda w: self._parent.move_right()], [4, 0, 2, 1, u'\u232B', self.col_gray3, lambda w: self._parent.remove_character(-1)], - [0, 1, 1, 2, '7', self.col_gray2, lambda w: self._parent.add_text('7')], - [1, 1, 1, 2, '8', self.col_gray2, lambda w: self._parent.add_text('8')], - [2, 1, 1, 2, '9', self.col_gray2, lambda w: self._parent.add_text('9')], + [0, 1, 1, 2, numParser.local('7'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('7'))], + [1, 1, 1, 2, numParser.local('8'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('8'))], + [2, 1, 1, 2, numParser.local('9'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('9'))], - [0, 3, 1, 2, '4', self.col_gray2, lambda w: self._parent.add_text('4')], - [1, 3, 1, 2, '5', self.col_gray2, lambda w: self._parent.add_text('5')], - [2, 3, 1, 2, '6', self.col_gray2, lambda w: self._parent.add_text('6')], + [0, 3, 1, 2, numParser.local('4'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('4'))], + [1, 3, 1, 2, numParser.local('5'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('5'))], + [2, 3, 1, 2, numParser.local('6'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('6'))], - [0, 5, 1, 2, '1', self.col_gray2, lambda w: self._parent.add_text('1')], - [1, 5, 1, 2, '2', self.col_gray2, lambda w: self._parent.add_text('2')], - [2, 5, 1, 2, '3', self.col_gray2, lambda w: self._parent.add_text('3')], + [0, 5, 1, 2, numParser.local('1'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('1'))], + [1, 5, 1, 2, numParser.local('2'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('2'))], + [2, 5, 1, 2, numParser.local('3'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('3'))], - [0, 7, 2, 2, '0', self.col_gray2, lambda w: self._parent.add_text('0')], + [0, 7, 2, 2, numParser.local('0'), self.col_gray2, lambda w: self._parent.add_text(numParser.local('0'))], [2, 7, 1, 2, '.', self.col_gray2, lambda w: self._parent.add_text('.')], [3, 1, 3, 2, _('Clear'), self.col_gray1, lambda w: self._parent.clear()], -- cgit v0.9.1