From 49bf9f6f627c3a4d74b4e760d5491d5294d11dfd Mon Sep 17 00:00:00 2001 From: Reinier Heeres Date: Sun, 23 Mar 2008 11:01:23 +0000 Subject: Get new icons working on XO --- diff --git a/MANIFEST b/MANIFEST index ef9fcbf..02d1092 100644 --- a/MANIFEST +++ b/MANIFEST @@ -7,30 +7,30 @@ plotlib.py rational.py svgimage.py toolbars.py -icons/Algebra/xpowy.svg -icons/Algebra/xinv.svg -icons/Algebra/square.svg -icons/Algebra/ln.svg -icons/Algebra/exp.svg -icons/Algebra/sqrt.svg -icons/Algebra/fac.svg -icons/Boolean/and.svg -icons/Boolean/eq.svg -icons/Boolean/or.svg -icons/Boolean/neq.svg -icons/Constants/pi.svg -icons/Constants/e.svg -icons/Format/rad.svg -icons/Format/deg.svg -icons/Trinogometry/tan.svg -icons/Trinogometry/sin.svg -icons/Trinogometry/cos.svg -icons/Trinogometry/atan.svg -icons/Trinogometry/asin.svg -icons/Trinogometry/acos.svg -icons/Trinogometry/tanh.svg -icons/Trinogometry/sinh.svg -icons/Trinogometry/cosh.svg +icons/algebra-xpowy.svg +icons/algebra-xinv.svg +icons/algebra-square.svg +icons/algebra-ln.svg +icons/algebra-exp.svg +icons/algebra-sqrt.svg +icons/algebra-fac.svg +icons/boolean-and.svg +icons/boolean-eq.svg +icons/boolean-or.svg +icons/boolean-neq.svg +icons/constants-pi.svg +icons/constants-e.svg +icons/format-rad.svg +icons/format-deg.svg +icons/trigonometry-tan.svg +icons/trigonometry-sin.svg +icons/trigonometry-cos.svg +icons/trigonometry-atan.svg +icons/trigonometry-asin.svg +icons/trigonometry-acos.svg +icons/trigonometry-tanh.svg +icons/trigonometry-sinh.svg +icons/trigonometry-cosh.svg po/Calculate.pot po/POTFILES.in po/am.po diff --git a/icons/Algebra/exp.svg b/icons/algebra-exp.svg index a806924..a806924 100644 --- a/icons/Algebra/exp.svg +++ b/icons/algebra-exp.svg diff --git a/icons/Algebra/fac.svg b/icons/algebra-fac.svg index 1d21f91..1d21f91 100644 --- a/icons/Algebra/fac.svg +++ b/icons/algebra-fac.svg diff --git a/icons/Algebra/ln.svg b/icons/algebra-ln.svg index eacd197..eacd197 100644 --- a/icons/Algebra/ln.svg +++ b/icons/algebra-ln.svg diff --git a/icons/Algebra/sqrt.svg b/icons/algebra-sqrt.svg index 650f08c..650f08c 100644 --- a/icons/Algebra/sqrt.svg +++ b/icons/algebra-sqrt.svg diff --git a/icons/Algebra/square.svg b/icons/algebra-square.svg index c93d624..c93d624 100644 --- a/icons/Algebra/square.svg +++ b/icons/algebra-square.svg diff --git a/icons/Algebra/xinv.svg b/icons/algebra-xinv.svg index 73e3b0d..73e3b0d 100644 --- a/icons/Algebra/xinv.svg +++ b/icons/algebra-xinv.svg diff --git a/icons/Algebra/xpowy.svg b/icons/algebra-xpowy.svg index d1dad0c..d1dad0c 100644 --- a/icons/Algebra/xpowy.svg +++ b/icons/algebra-xpowy.svg diff --git a/icons/Boolean/and.svg b/icons/boolean-and.svg index 62405bd..62405bd 100644 --- a/icons/Boolean/and.svg +++ b/icons/boolean-and.svg diff --git a/icons/Boolean/eq.svg b/icons/boolean-eq.svg index 4d6b462..4d6b462 100644 --- a/icons/Boolean/eq.svg +++ b/icons/boolean-eq.svg diff --git a/icons/Boolean/neq.svg b/icons/boolean-neq.svg index 7376fda..7376fda 100644 --- a/icons/Boolean/neq.svg +++ b/icons/boolean-neq.svg diff --git a/icons/Boolean/or.svg b/icons/boolean-or.svg index 4992576..4992576 100644 --- a/icons/Boolean/or.svg +++ b/icons/boolean-or.svg diff --git a/icons/Constants/e.svg b/icons/constants-e.svg index 15190b4..15190b4 100644 --- a/icons/Constants/e.svg +++ b/icons/constants-e.svg diff --git a/icons/Constants/pi.svg b/icons/constants-pi.svg index ab593b7..ab593b7 100644 --- a/icons/Constants/pi.svg +++ b/icons/constants-pi.svg diff --git a/icons/Format/deg.svg b/icons/format-deg.svg index d1b67ae..d1b67ae 100644 --- a/icons/Format/deg.svg +++ b/icons/format-deg.svg diff --git a/icons/Format/rad.svg b/icons/format-rad.svg index f3a6944..f3a6944 100644 --- a/icons/Format/rad.svg +++ b/icons/format-rad.svg diff --git a/icons/Trinogometry/acos.svg b/icons/trigonometry-acos.svg index 584c4eb..584c4eb 100644 --- a/icons/Trinogometry/acos.svg +++ b/icons/trigonometry-acos.svg diff --git a/icons/Trinogometry/asin.svg b/icons/trigonometry-asin.svg index 39e0832..39e0832 100644 --- a/icons/Trinogometry/asin.svg +++ b/icons/trigonometry-asin.svg diff --git a/icons/Trinogometry/atan.svg b/icons/trigonometry-atan.svg index 2f5f0b9..2f5f0b9 100644 --- a/icons/Trinogometry/atan.svg +++ b/icons/trigonometry-atan.svg diff --git a/icons/Trinogometry/cos.svg b/icons/trigonometry-cos.svg index 5f9c02b..5f9c02b 100644 --- a/icons/Trinogometry/cos.svg +++ b/icons/trigonometry-cos.svg diff --git a/icons/Trinogometry/cosh.svg b/icons/trigonometry-cosh.svg index b1109f3..b1109f3 100644 --- a/icons/Trinogometry/cosh.svg +++ b/icons/trigonometry-cosh.svg diff --git a/icons/Trinogometry/sin.svg b/icons/trigonometry-sin.svg index 800166c..800166c 100644 --- a/icons/Trinogometry/sin.svg +++ b/icons/trigonometry-sin.svg diff --git a/icons/Trinogometry/sinh.svg b/icons/trigonometry-sinh.svg index 44236bc..44236bc 100644 --- a/icons/Trinogometry/sinh.svg +++ b/icons/trigonometry-sinh.svg diff --git a/icons/Trinogometry/tan.svg b/icons/trigonometry-tan.svg index 6ec75d0..6ec75d0 100644 --- a/icons/Trinogometry/tan.svg +++ b/icons/trigonometry-tan.svg diff --git a/icons/Trinogometry/tanh.svg b/icons/trigonometry-tanh.svg index 1ec07c6..1ec07c6 100644 --- a/icons/Trinogometry/tanh.svg +++ b/icons/trigonometry-tanh.svg diff --git a/toolbars.py b/toolbars.py index 262cf50..51545ba 100644 --- a/toolbars.py +++ b/toolbars.py @@ -62,10 +62,10 @@ class IconToggleToolButton(ToggleToolButton): def __init__(self, items, cb, desc): ToggleToolButton.__init__(self) self.items = items - if _icon_exists(items[0][0]): - self.set_named_icon(items[0][0]) + if _icon_exists(items[0]['icon']): + self.set_named_icon(items[0]['icon']) else: - self.set_label(items[0][0]) + self.set_label(items[0]['html']) # self.set_tooltip(items[0][1]) self.set_tooltip(desc) self.selected = 0 @@ -75,13 +75,13 @@ class IconToggleToolButton(ToggleToolButton): def toggle_button(self, w): self.selected = (self.selected + 1) % len(self.items) but = self.items[self.selected] - if _icon_exists(but[0]): - self.set_named_icon(but[0]) + if _icon_exists(but['icon']): + self.set_named_icon(but['icon']) else: - self.set_label(but[0]) + self.set_label(but['html']) # self.set_tooltip(but[1]) if self.callback is not None: - self.callback(but[0]) + self.callback(but) class TextToggleToolButton(gtk.ToggleToolButton): def __init__(self, items, cb): @@ -124,40 +124,40 @@ class AlgebraToolbar(gtk.Toolbar): def __init__(self, calc): gtk.Toolbar.__init__(self) - self.insert(IconToolButton('square', _('Square'), + self.insert(IconToolButton('algebra-square', _('Square'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '^2'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(square)'), alt_html='x2'), -1) - self.insert(IconToolButton('sqrt', _('Square root'), + self.insert(IconToolButton('algebra-sqrt', _('Square root'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'sqrt'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(sqrt)'), alt_html='√x'), -1) - self.insert(IconToolButton('xinv', _('Inverse'), + self.insert(IconToolButton('algebra-xinv', _('Inverse'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '^-1'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(inv)'), alt_html='x-1'), -1) self.insert(LineSeparator(), -1) - self.insert(IconToolButton('exp', _('e to the power x'), + self.insert(IconToolButton('algebra-exp', _('e to the power x'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'exp'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(exp)'), alt_html='ex'), -1) - self.insert(IconToolButton('xpowy', _('x to the power y'), + self.insert(IconToolButton('algebra-xpowy', _('x to the power y'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'pow'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(pow)'), alt_html='xy'), -1) - self.insert(IconToolButton('ln', _('Natural logarithm'), + self.insert(IconToolButton('algebra-ln', _('Natural logarithm'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'ln'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(ln)')), -1) self.insert(LineSeparator(), -1) - self.insert(IconToolButton('fac', _('Factorial'), + self.insert(IconToolButton('algebra-fac', _('Factorial'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '!'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(fac)')), -1) @@ -165,43 +165,43 @@ class TrigonometryToolbar(gtk.Toolbar): def __init__(self, calc): gtk.Toolbar.__init__(self) - self.insert(IconToolButton('sin', _('Sine'), + self.insert(IconToolButton('trigonometry-sin', _('Sine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'sin'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(sin)')), -1) - self.insert(IconToolButton('cos', _('Cosine'), + self.insert(IconToolButton('trigonometry-cos', _('Cosine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'cos'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(cos)')), -1) - self.insert(IconToolButton('tan', _('Tangent'), + self.insert(IconToolButton('trigonometry-tan', _('Tangent'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'tan'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(tan)')), -1) self.insert(LineSeparator(), -1) - self.insert(IconToolButton('asin', _('Arc sine'), + self.insert(IconToolButton('trigonometry-asin', _('Arc sine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'asin'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(asin)')), -1) - self.insert(IconToolButton('acos', _('Arc cosine'), + self.insert(IconToolButton('trigonometry-acos', _('Arc cosine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'acos'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(acos)')), -1) - self.insert(IconToolButton('atan', _('Arc tangent'), + self.insert(IconToolButton('trigonometry-atan', _('Arc tangent'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'atan'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(atan)')), -1) self.insert(LineSeparator(), -1) - self.insert(IconToolButton('sinh', _('Hyperbolic sine'), + self.insert(IconToolButton('trigonometry-sinh', _('Hyperbolic sine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'sinh'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(sinh)')), -1) - self.insert(IconToolButton('cosh', _('Hyperbolic cosine'), + self.insert(IconToolButton('trigonometry-cosh', _('Hyperbolic cosine'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'cosh'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(cosh)')), -1) - self.insert(IconToolButton('tanh', _('Hyperbolic tangent'), + self.insert(IconToolButton('trigonometry-tanh', _('Hyperbolic tangent'), lambda x: calc.button_pressed(calc.TYPE_FUNCTION, 'tanh'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(tanh)')), -1) @@ -209,43 +209,43 @@ class BooleanToolbar(gtk.Toolbar): def __init__(self, calc): gtk.Toolbar.__init__(self) - self.insert(IconToolButton('and', _('Logical and'), + self.insert(IconToolButton('boolean-and', _('Logical and'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '&'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(and))')), -1) - self.insert(IconToolButton('or', _('Logical or'), + self.insert(IconToolButton('boolean-or', _('Logical or'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '|'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(or)')), -1) -# self.insert(IconToolButton('xor', _('Logical xor'), +# self.insert(IconToolButton('boolean-xor', _('Logical xor'), # lambda x: calc.button_pressed(calc.TYPE_OP_POST, '^'), # lambda x: calc.button_pressed(calc.TYPE_TEXT, 'help(xor)')), -1) self.insert(LineSeparator(), -1) - self.insert(IconToolButton('eq', _('Equals'), + self.insert(IconToolButton('boolean-eq', _('Equals'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '=')), -1) - self.insert(IconToolButton('neq', _('Not equals'), + self.insert(IconToolButton('boolean-neq', _('Not equals'), lambda x: calc.button_pressed(calc.TYPE_OP_POST, '!=')), -1) class ConstantsToolbar(gtk.Toolbar): def __init__(self, calc): gtk.Toolbar.__init__(self) - self.insert(IconToolButton('pi', _('Pi'), + self.insert(IconToolButton('constants-pi', _('Pi'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'pi'), alt_html='π'), -1) - self.insert(IconToolButton('e', _('e'), + self.insert(IconToolButton('constants-e', _('e'), lambda x: calc.button_pressed(calc.TYPE_TEXT, 'e')), -1) class FormatToolbar(gtk.Toolbar): def __init__(self, calc): gtk.Toolbar.__init__(self) el = [ - ['deg', _('Degrees')], - ['rad', _('Radians')] + {'icon': 'format-deg', 'desc': _('Degrees'), 'html': 'Deg'}, + {'icon': 'format-rad', 'desc': _('Radians'), 'html': 'Rad'}, ] self.insert(IconToggleToolButton(el, lambda x: self.update_angle_type(x, calc), -- cgit v0.9.1