diff options
| author | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:52:44 (GMT) |
|---|---|---|
| committer | Ignacio Rodríguez <ignacio@Ignacio-Magallanes.(none)> | 2012-10-26 14:52:44 (GMT) |
| commit | 5cbe56a0a48ba254dc7833ad308383ab149cbe8b (patch) | |
| tree | ca7cd02fa8ea444795b62a67819122e8c9a72f9c | |
| parent | c84eb52bc3ebc44586691c2a84fa4c8aabf89e68 (diff) | |
Port finish, But i Need Summary!
39 files changed, 1046 insertions, 2410 deletions
diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..7cf404a --- /dev/null +++ b/MANIFEST @@ -0,0 +1,59 @@ +window.py +sliderule.py +COPYING +setup.py +constants.py +genslides.py +sprite_factory.py +toolbar_utils.py +sprites.py +SlideruleActivity.py +NEWS +icons/A.svg +icons/custom.svg +icons/K.svg +icons/custom2.svg +icons/CI.svg +icons/LLn2.svg +icons/sliderule.svg +icons/LL0.svg +icons/LL02.svg +icons/DI.svg +icons/T.svg +icons/D.svg +icons/LLn.svg +icons/B.svg +icons/S.svg +icons/custom-stator.svg +icons/S2.svg +icons/T2.svg +icons/custom-slide.svg +icons/L.svg +icons/realign.svg +icons/L2.svg +icons/K2.svg +icons/C.svg +locale/en_US/activity.linfo +locale/en_US/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +locale/fr/activity.linfo +locale/fr/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +locale/en/activity.linfo +locale/en/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +locale/da/activity.linfo +locale/da/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +locale/nl/activity.linfo +locale/nl/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +locale/en_GB/activity.linfo +locale/en_GB/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo +po/Sliderule.pot +po/en.po +po/en_US.po +po/da.po +po/fr.po +po/en_GB.po +po/nl.po +activity/activity.info +activity/activity-sliderule.svg +images/reticule.svg +images/tab.svg +images/label.svg @@ -1,6 +1,10 @@ 24 ENHANCEMENTS: +* Ignacio Rodriguez port to gtk3 +23 + +ENHANCEMENTS: * Conversion to Cairo graphics * New translations @@ -9,7 +13,7 @@ BUG FIXES: 23 -BUG FIXES: +ENHANCEMENT: * Harmonize strings: Can not divide by zero 22 diff --git a/SlideruleActivity.py b/SlideruleActivity.py index 8afc598..dd7a2ef 100644 --- a/SlideruleActivity.py +++ b/SlideruleActivity.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- #Copyright (c) 2009,2010 Walter Bender +#Copyright (c) 2012 Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,28 +27,26 @@ graphics associated with your slide and stator. 3. In window.py, you need to import the new class objects from #2. """ - +from gi.repository import Gtk, Gdk, GObject import pygtk pygtk.require('2.0') -import gtk -import gobject -import sugar -from sugar.activity import activity +import sugar3 +from sugar3.activity import activity try: - from sugar.graphics.toolbarbox import ToolbarBox + from sugar3.graphics.toolbarbox import ToolbarBox _have_toolbox = True except ImportError: _have_toolbox = False if _have_toolbox: - from sugar.bundle.activitybundle import ActivityBundle - from sugar.activity.widgets import ActivityToolbarButton, StopButton, \ + from sugar3.bundle.activitybundle import ActivityBundle + from sugar3.activity.widgets import ActivityToolbarButton, StopButton, \ EditToolbar - from sugar.graphics.toolbarbox import ToolbarButton + from sugar3.graphics.toolbarbox import ToolbarButton -from sugar.datastore import datastore +from sugar3.datastore import datastore from toolbar_utils import combo_factory, button_factory, entry_factory, \ separator_factory, label_factory @@ -86,9 +85,9 @@ class SlideruleActivity(activity.Activity): self._setup_toolbars(_have_toolbox) - canvas = gtk.DrawingArea() - canvas.set_size_request(gtk.gdk.screen_width(), - gtk.gdk.screen_height()) + canvas = Gtk.DrawingArea() + canvas.set_size_request(Gdk.Screen.width(), + Gdk.Screen.height()) self.set_canvas(canvas) canvas.show() self.show_all() @@ -199,14 +198,14 @@ class SlideruleActivity(activity.Activity): """ Move the top slider onto top layer """ self._hide_top() self.sr.active_slide.draw() - self.top_button.set_icon(self.sr.active_slide.name) + self.top_button.set_icon_name(self.sr.active_slide.name) self._set_custom_entries(SLIDE, self.sr.active_slide.name) def set_stator(self): """ Move the bottom slider onto top layer """ self._hide_bottom() self.sr.active_stator.draw() - self.bottom_button.set_icon(self.sr.active_stator.name) + self.bottom_button.set_icon_name(self.sr.active_stator.name) self._set_custom_entries(STATOR, self.sr.active_stator.name) def move_stators(self, x, y): @@ -407,7 +406,7 @@ class SlideruleActivity(activity.Activity): def _copy_cb(self, arg=None): """ Copy a number to the clipboard from the active slide. """ - clipBoard = gtk.Clipboard() + clipBoard = Gtk.Clipboard() if self.sr.last is not None and \ self.sr.last.labels is not None and \ self.sr.last.labels[0] is not None: @@ -416,7 +415,7 @@ class SlideruleActivity(activity.Activity): def _paste_cb(self, arg=None): """ Paste a number from the clipboard to the active slide. """ - clipBoard = gtk.Clipboard() + clipBoard = Gtk.Clipboard() text = clipBoard.wait_for_text() if text is not None: self.sr.enter_value(self.sr.last, text) @@ -424,10 +423,10 @@ class SlideruleActivity(activity.Activity): def _setup_toolbars(self, have_toolbox): """ Setup the toolbars.. """ - project_toolbar = gtk.Toolbar() - custom_slide_toolbar = gtk.Toolbar() - custom_stator_toolbar = gtk.Toolbar() - edit_toolbar = gtk.Toolbar() + project_toolbar = Gtk.Toolbar() + custom_slide_toolbar = Gtk.Toolbar() + custom_stator_toolbar = Gtk.Toolbar() + edit_toolbar = Gtk.Toolbar() # no sharing self.max_participants = 1 diff --git a/dist/Sliderule-1.tar.bz2 b/dist/Sliderule-1.tar.bz2 Binary files differdeleted file mode 100644 index 1bc22ce..0000000 --- a/dist/Sliderule-1.tar.bz2 +++ /dev/null diff --git a/dist/Sliderule-1.xo b/dist/Sliderule-1.xo Binary files differdeleted file mode 100644 index f3d62a4..0000000 --- a/dist/Sliderule-1.xo +++ /dev/null diff --git a/genslides.py b/genslides.py index 8ced9ff..8ced9ff 100755..100644 --- a/genslides.py +++ b/genslides.py diff --git a/locale/da/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/da/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..de5a5eb --- /dev/null +++ b/locale/da/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo new file mode 100644 index 0000000..99f1112 --- /dev/null +++ b/locale/da/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Regnestok diff --git a/locale/en/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/en/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..1b832ae --- /dev/null +++ b/locale/en/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo new file mode 100644 index 0000000..5f2b4fd --- /dev/null +++ b/locale/en/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Sliderule diff --git a/locale/en_GB/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/en_GB/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..e8842ed --- /dev/null +++ b/locale/en_GB/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo new file mode 100644 index 0000000..5f2b4fd --- /dev/null +++ b/locale/en_GB/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Sliderule diff --git a/locale/en_US/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/en_US/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..7d98139 --- /dev/null +++ b/locale/en_US/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo new file mode 100644 index 0000000..5f2b4fd --- /dev/null +++ b/locale/en_US/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Sliderule diff --git a/locale/fr/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/fr/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..01ef42c --- /dev/null +++ b/locale/fr/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/fr/activity.linfo b/locale/fr/activity.linfo new file mode 100644 index 0000000..2132a60 --- /dev/null +++ b/locale/fr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Règle à calcul diff --git a/locale/nl/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo b/locale/nl/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo Binary files differnew file mode 100644 index 0000000..a34c7d9 --- /dev/null +++ b/locale/nl/LC_MESSAGES/org.sugarlabs.SlideruleActivity.mo diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo new file mode 100644 index 0000000..e4222db --- /dev/null +++ b/locale/nl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Schuifliniaal diff --git a/po/Sliderule.pot b/po/Sliderule.pot index d1b4dd1..88c5c2f 100644 --- a/po/Sliderule.pot +++ b/po/Sliderule.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2010-09-27 10:23-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,211 +16,247 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 msgid "Sliderule" msgstr "" -#: SlideruleActivity.py:68 sliderule.py:23 +#: /home/walter/Desktop/sliderule/constants.py:52 +msgid "log²" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:54 +msgid "log" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:56 +msgid "1/log" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:58 +msgid "log³" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:59 +msgid "sin" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:60 +msgid "tan" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:61 +msgid "linear" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:62 +msgid "log log" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:63 +msgid "ln" +msgstr "" + +#: /home/walter/Desktop/sliderule/constants.py:64 +msgid "user defined" +msgstr "" + +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:71 +#: /home/walter/Desktop/sliderule/sliderule.py:24 msgid "square/square root" msgstr "" -#: SlideruleActivity.py:69 sliderule.py:24 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:72 +#: /home/walter/Desktop/sliderule/sliderule.py:25 msgid "multiply/divide" msgstr "" -#: SlideruleActivity.py:70 sliderule.py:25 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:73 +#: /home/walter/Desktop/sliderule/sliderule.py:26 msgid "divide/multiply" msgstr "" -#: SlideruleActivity.py:71 sliderule.py:26 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:74 +#: /home/walter/Desktop/sliderule/sliderule.py:27 msgid "cube/cube root" msgstr "" -#: SlideruleActivity.py:72 sliderule.py:27 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:75 +#: /home/walter/Desktop/sliderule/sliderule.py:28 msgid "sin, asin" msgstr "" -#: SlideruleActivity.py:73 sliderule.py:28 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:76 +#: /home/walter/Desktop/sliderule/sliderule.py:29 msgid "tan, atan" msgstr "" -#: SlideruleActivity.py:74 sliderule.py:29 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:77 +#: /home/walter/Desktop/sliderule/sliderule.py:30 msgid "add/subtract" msgstr "" -#: SlideruleActivity.py:75 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:78 msgid "natural log" msgstr "" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:532 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:550 msgid "Edit" msgstr "" -#: SlideruleActivity.py:479 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:547 msgid "Project" msgstr "" -#: SlideruleActivity.py:480 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:548 msgid "Custom slide" msgstr "" -#: SlideruleActivity.py:481 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:549 msgid "Custom stator" msgstr "" -#: SlideruleActivity.py:496 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:563 msgid "select function" msgstr "" -#: SlideruleActivity.py:498 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:564 msgid "active slide" msgstr "" -#: SlideruleActivity.py:501 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:567 msgid "select slide" msgstr "" -#: SlideruleActivity.py:503 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:568 msgid "active stator" msgstr "" -#: SlideruleActivity.py:506 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:571 msgid "select stator" msgstr "" -#: SlideruleActivity.py:510 sliderule.py:72 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:573 +#: /home/walter/Desktop/sliderule/sliderule.py:73 msgid "realign slides" msgstr "" -#: SlideruleActivity.py:523 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:588 msgid "create custom slide" msgstr "" -#: SlideruleActivity.py:523 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:588 msgid "create custom stator" msgstr "" -#: SlideruleActivity.py:528 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:593 msgid "position function" msgstr "" -#: SlideruleActivity.py:531 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:596 msgid "result function" msgstr "" -#: SlideruleActivity.py:534 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:599 msgid "label function" msgstr "" -#: SlideruleActivity.py:536 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:601 msgid "domain minimum" msgstr "" -#: SlideruleActivity.py:538 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:603 msgid "domain maximum" msgstr "" -#: SlideruleActivity.py:540 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:605 msgid "step size" msgstr "" -#: SlideruleActivity.py:546 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:609 msgid "Copy" msgstr "" -#: SlideruleActivity.py:548 +#: /home/walter/Desktop/sliderule/SlideruleActivity.py:611 msgid "Paste" msgstr "" -#: constants.py:51 -msgid "log²" -msgstr "" - -#: constants.py:53 -msgid "log" -msgstr "" - -#: constants.py:55 -msgid "1/log" +#: /home/walter/Desktop/sliderule/sliderule.py:41 +msgid "Slide Rule" msgstr "" -#: constants.py:57 -msgid "log³" +#: /home/walter/Desktop/sliderule/sliderule.py:45 +msgid "L" msgstr "" -#: constants.py:58 -msgid "sin" +#: /home/walter/Desktop/sliderule/sliderule.py:49 +msgid "C" msgstr "" -#: constants.py:59 -msgid "tan" +#: /home/walter/Desktop/sliderule/sliderule.py:53 +msgid "CI" msgstr "" -#: constants.py:60 -msgid "linear" +#: /home/walter/Desktop/sliderule/sliderule.py:57 +msgid "A" msgstr "" -#: constants.py:61 -msgid "log log" +#: /home/walter/Desktop/sliderule/sliderule.py:61 +msgid "K" msgstr "" -#: constants.py:62 -msgid "ln" +#: /home/walter/Desktop/sliderule/sliderule.py:65 +msgid "S" msgstr "" -#: constants.py:63 -msgid "user defined" +#: /home/walter/Desktop/sliderule/sliderule.py:69 +msgid "T" msgstr "" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: /home/walter/Desktop/sliderule/window.py:261 +#: /home/walter/Desktop/sliderule/window.py:716 +#: /home/walter/Desktop/sliderule/window.py:754 +#: /home/walter/Desktop/sliderule/genslides.py:720 msgid "Overflow Error" msgstr "" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: /home/walter/Desktop/sliderule/window.py:265 +#: /home/walter/Desktop/sliderule/window.py:719 +#: /home/walter/Desktop/sliderule/window.py:756 +#: /home/walter/Desktop/sliderule/genslides.py:722 msgid "Name Error" msgstr "" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" +#: /home/walter/Desktop/sliderule/window.py:268 +#: /home/walter/Desktop/sliderule/window.py:722 +#: /home/walter/Desktop/sliderule/window.py:758 +msgid "Zero-division Error" msgstr "" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: /home/walter/Desktop/sliderule/window.py:272 +#: /home/walter/Desktop/sliderule/window.py:275 +#: /home/walter/Desktop/sliderule/window.py:725 +#: /home/walter/Desktop/sliderule/window.py:728 +#: /home/walter/Desktop/sliderule/window.py:760 +#: /home/walter/Desktop/sliderule/window.py:762 +#: /home/walter/Desktop/sliderule/genslides.py:726 msgid "Type Error" msgstr "" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: /home/walter/Desktop/sliderule/window.py:278 +#: /home/walter/Desktop/sliderule/window.py:731 +#: /home/walter/Desktop/sliderule/window.py:764 +#: /home/walter/Desktop/sliderule/genslides.py:730 msgid "Syntax Error" msgstr "" -#: sliderule.py:44 -msgid "L" -msgstr "" - -#: sliderule.py:48 -msgid "C" -msgstr "" - -#: sliderule.py:52 -msgid "CI" -msgstr "" - -#: sliderule.py:56 -msgid "A" -msgstr "" - -#: sliderule.py:60 -msgid "K" -msgstr "" - -#: sliderule.py:64 -msgid "S" +#: /home/walter/Desktop/sliderule/window.py:295 +#: /home/walter/Desktop/sliderule/window.py:308 +#: /home/walter/Desktop/sliderule/window.py:321 +#: /home/walter/Desktop/sliderule/genslides.py:728 +msgid "Value Error" msgstr "" -#: sliderule.py:68 -msgid "T" +#: /home/walter/Desktop/sliderule/genslides.py:724 +msgid "Zero Division Error" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-09 03:15+0200\n" "Last-Translator: Aputsiaq Niels <aj@isit.gl>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Regnestok" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "kvadrat/kvadratrod" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "multiplicér/dividér" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "dividér/multiplicér" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "kubik/kubikrod" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "addér/subtrahér" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "naturlig logaritme" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Redigér" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Projekt" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Tilpasset skyder" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Tilpasset stator" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "vælg funktion" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "aktiv skyder" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "vælg skyder" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "aktiv stator" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "vælg stator" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "nulstil skydere" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "opret tilpasset skyder" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "opret tilpasset stator" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "positionsfunktion" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "resultatfunktion" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "etikettefunktion" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "minimum på domæne" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "maksimum på domæne" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "størrelse på trin" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Kopiér" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Indsæt" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "lineær" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "brugerdefineret" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Overløbsfejl" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Navnefejl" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Kan ikke dividere med nul" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Typefejl" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Værdifejl" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Syntaksfejl" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-08 22:43+0200\n" "Last-Translator: Chris <cjl@laptop.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Sliderule" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "square/square root" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "multiply/divide" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "divide/multiply" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "cube/cube root" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "add/subtract" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "natural log" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Edit" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Project" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Custom slide" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Custom stator" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "select function" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "active slide" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "select slide" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "active stator" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "select stator" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "realign slides" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "create custom slide" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "create custom stator" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "position function" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "result function" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "label function" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "domain minimum" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "domain maximum" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "step size" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Copy" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Paste" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "linear" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "user defined" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Overflow Error" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Name Error" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Can not divide by zero" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Type Error" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Value Error" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Syntax Error" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" diff --git a/po/en_GB.po b/po/en_GB.po index 4501514..6fafddc 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-08 22:46+0200\n" "Last-Translator: Chris <cjl@laptop.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Sliderule" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "square/square root" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "multiply/divide" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "divide/multiply" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "cube/cube root" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "add/subtract" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "natural log" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Edit" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Project" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Custom slide" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Custom stator" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "select function" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "active slide" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "select slide" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "active stator" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "select stator" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "realign slides" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "create custom slide" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "create custom stator" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "position function" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "result function" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "label function" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "domain minimum" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "domain maximum" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "step size" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Copy" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Paste" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "linear" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "user defined" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Overflow Error" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Name Error" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Can not divide by zero" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Type Error" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Value Error" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Syntax Error" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" diff --git a/po/en_US.po b/po/en_US.po index ab216a2..ef1d2e5 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-08 22:44+0200\n" "Last-Translator: Chris <cjl@laptop.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Sliderule" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "square/square root" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "multiply/divide" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "divide/multiply" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "cube/cube root" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "add/subtract" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "natural log" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Edit" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Project" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Custom slide" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Custom stator" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "select function" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "active slide" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "select slide" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "active stator" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "select stator" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "realign slides" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "create custom slide" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "create custom stator" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "position function" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "result function" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "label function" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "domain minimum" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "domain maximum" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "step size" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Copy" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Paste" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "linear" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "user defined" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Overflow Error" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Name Error" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Can not divide by zero" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Type Error" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Value Error" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Syntax Error" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" diff --git a/po/es.po b/po/es.po deleted file mode 100644 index 99f8d6a..0000000 --- a/po/es.po +++ /dev/null @@ -1,237 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-01-11 01:19+0200\n" -"Last-Translator: AlanJAS <alanjas@hotmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "Regla de cálculo" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "cuadrado/raíz cuadrada" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "multiplicar/dividir" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "dividir/multiplicar" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "cubo/raíz cúbica" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "sumar/restar" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "logaritmo natural" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "Editar" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "Proyecto" - -# not a photo slide, a slide rule slide -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "Regleta personalizada" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "Estátor personalizada" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "seleccionar función" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "regleta activa" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "seleccionar regleta" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "estátor activa" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "seleccionar estátor" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "reordenar regletas" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "crear regleta personalizada" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "crear estátor personalizada" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "función posición" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "función resultado" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "función etiqueta" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "mínimo dominio" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "máximo dominio" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "tamaño de paso" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "Copiar" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "Pegar" - -#: constants.py:51 -msgid "log²" -msgstr "log²" - -#: constants.py:53 -msgid "log" -msgstr "log" - -#: constants.py:55 -msgid "1/log" -msgstr "1/log" - -#: constants.py:57 -msgid "log³" -msgstr "log³" - -#: constants.py:58 -msgid "sin" -msgstr "sin" - -#: constants.py:59 -msgid "tan" -msgstr "tan" - -#: constants.py:60 -msgid "linear" -msgstr "linear" - -#: constants.py:61 -msgid "log log" -msgstr "log log" - -#: constants.py:62 -msgid "ln" -msgstr "ln" - -#: constants.py:63 -msgid "user defined" -msgstr "definido por el usuario" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "Error de Desbordamiento" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "Error de Nombre" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "No se puede dividir por cero" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "Error de Tipo" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "Error de Valor" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "Error de Sintaxis" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" - -#~ msgid "Slide Rule" -#~ msgstr "Regla de cálculo" - -#~ msgid "Zero-division Error" -#~ msgstr "Error de división por cero" - -#~ msgid "Zero Division Error" -#~ msgstr "Error de División por cero" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-10 19:48+0200\n" "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Règle à calcul" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "carré/racine carrée" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "multiplier/diviser" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "diviser/multiplier" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "cube/racine cubique" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "addition/soustraction" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "log naturel" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Éditer" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Projet" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Réglette personnalisée" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Base personnalisée" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "sélectionner la fonction" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "réglette active" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "sélectionner la réglette" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "base active" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "sélectionner la base" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "réaligner les réglettes" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "créer une réglette personnalisée" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "créer une base personnalisée" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "fonction position" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "fonction résultat" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "fonction étiquette" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "minimum domaine" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "maximum domaine" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "pas" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Copier" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Coller" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "linéaire" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "personnalisé" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Erreur de dépassement" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Erreur de nom" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Division par zéro impossible" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Erreur de type" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Erreur de valeur" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Erreur de syntaxe" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" diff --git a/po/hus.po b/po/hus.po deleted file mode 100644 index 6f20ff1..0000000 --- a/po/hus.po +++ /dev/null @@ -1,231 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-03-01 21:46+0200\n" -"Last-Translator: Chris <cjl@laptop.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: hus\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "" - -#: SlideruleActivity.py:72 sliderule.py:27 -#, fuzzy -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -#, fuzzy -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "Jalk'uy" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "K'ot'biy" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "Ts'at'k'a'" - -#: constants.py:51 -msgid "log²" -msgstr "" - -#: constants.py:53 -msgid "log" -msgstr "" - -#: constants.py:55 -msgid "1/log" -msgstr "" - -#: constants.py:57 -msgid "log³" -msgstr "" - -#: constants.py:58 -#, fuzzy -msgid "sin" -msgstr "sin" - -#: constants.py:59 -#, fuzzy -msgid "tan" -msgstr "tan" - -#: constants.py:60 -msgid "linear" -msgstr "" - -#: constants.py:61 -msgid "log log" -msgstr "" - -#: constants.py:62 -msgid "ln" -msgstr "" - -#: constants.py:63 -msgid "user defined" -msgstr "" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "" - -#: sliderule.py:44 -msgid "L" -msgstr "" - -#: sliderule.py:48 -msgid "C" -msgstr "" - -#: sliderule.py:52 -msgid "CI" -msgstr "" - -#: sliderule.py:56 -msgid "A" -msgstr "" - -#: sliderule.py:60 -msgid "K" -msgstr "" - -#: sliderule.py:64 -msgid "S" -msgstr "" - -#: sliderule.py:68 -msgid "T" -msgstr "" diff --git a/po/hy.po b/po/hy.po deleted file mode 100644 index 602dd36..0000000 --- a/po/hy.po +++ /dev/null @@ -1,240 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2011-12-23 05:55+0200\n" -"Last-Translator: Jasmine <udea_jasmine@yahoo.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: hy\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "Լոգարիթմական քանոն" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "քառակուսի/քառակուսի արմատ" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "բազմապատկել/բաժանել" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "բաժանել/բազմապատկել" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "խորանարդ/խորանարդ արմատ" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "Սինուս, ասինուս" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "տանգես, արկտանգես" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "գումարել/հանել" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "Բնական լոգարիթմ" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "խմբագրել" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "Նախագիծ" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "Անհատականացված ժապավեն" - -# stator - որևէ պտտվող սարքի անշարժ մասը /ի տարբերություն շարժականի` Ռոտորի/: -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "Անհատականացված Ստատոր" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "ընտրել գործողությունը" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "ակտիվ ժապավեն" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "ընտրել ժապավեն" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "ակտիվ ստատոր" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "ընտրել ստատորը" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "կարգավորել ժապավենները" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "Ստեղծել անհատականացված ժապավեն" - -# Ստատոր - որևէ սարքի անշարժ մասը / շարժակամ մասը` ռոտոր/ -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "Ստեղծել անհատականացված Ստատոր" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "դիրքային ֆունկցիան" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "արդյունքի ֆունկցիան" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "պիտակի ֆունկցիան" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "նվազագույն տիրույթ" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "առավելագույն տիրույթ" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "քայլի չափսը" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "պատճենել" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "փակցնել" - -#: constants.py:51 -msgid "log²" -msgstr "լոգարիթմ²" - -#: constants.py:53 -msgid "log" -msgstr "լոգարիթմ" - -#: constants.py:55 -msgid "1/log" -msgstr "1/լոգարիթմ" - -#: constants.py:57 -msgid "log³" -msgstr "լոգարիթմ³" - -#: constants.py:58 -msgid "sin" -msgstr "սինուս" - -#: constants.py:59 -msgid "tan" -msgstr "տանգես" - -#: constants.py:60 -msgid "linear" -msgstr "գծային" - -# Սա թվային տվյալի երկչափ պատկերն է, որ լոգարիթմային սնադղակ է կիրառում Դեակարտյան դիրքացույցենրի ուղղահայաց և հորիզոնական առանցքների վրա: -#: constants.py:61 -msgid "log log" -msgstr "log log" - -#: constants.py:62 -msgid "ln" -msgstr "Բնական լոգարիթմ" - -#: constants.py:63 -msgid "user defined" -msgstr "օգտվողի կողմից սահմանված" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "Գերլցման սխալ" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "Անվան սխալ" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "զրոյի չի բաժանվում" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "Սխալի տեսակը" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "Արժեքի սխալ" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "Շարահյուսության սխալ" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -# CI - Cociente intelectual? -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" - -#~ msgid "Slide Rule" -#~ msgstr "Լոգարիթմական քանոն" - -#~ msgid "Zero-division Error" -#~ msgstr "Զրոյի-բաժանման սխալ" - -#~ msgid "Zero Division Error" -#~ msgstr "Զրոյի-բաժանման սխալ" diff --git a/po/id.po b/po/id.po deleted file mode 100644 index d74f1bc..0000000 --- a/po/id.po +++ /dev/null @@ -1,231 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-05-22 00:44+0200\n" -"Last-Translator: Chris <cjl@laptop.org>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: id\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -#, fuzzy -msgid "Edit" -msgstr "Sunting" - -#: SlideruleActivity.py:479 -#, fuzzy -msgid "Project" -msgstr "Proyek" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "" - -#: SlideruleActivity.py:546 -#, fuzzy -msgid "Copy" -msgstr "Salin" - -#: SlideruleActivity.py:548 -#, fuzzy -msgid "Paste" -msgstr "Tempel" - -#: constants.py:51 -msgid "log²" -msgstr "" - -#: constants.py:53 -msgid "log" -msgstr "" - -#: constants.py:55 -msgid "1/log" -msgstr "" - -#: constants.py:57 -msgid "log³" -msgstr "" - -#: constants.py:58 -msgid "sin" -msgstr "" - -#: constants.py:59 -msgid "tan" -msgstr "" - -#: constants.py:60 -msgid "linear" -msgstr "" - -#: constants.py:61 -msgid "log log" -msgstr "" - -#: constants.py:62 -msgid "ln" -msgstr "" - -#: constants.py:63 -msgid "user defined" -msgstr "" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" +"POT-Creation-Date: 2011-10-30 00:33-0400\n" "PO-Revision-Date: 2011-11-10 08:29+0200\n" "Last-Translator: Chris <cjl@laptop.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,212 +17,212 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" -#: activity/activity.info:2 sliderule.py:40 +#: activity/activity.info:2 sliderule.py:41 msgid "Sliderule" msgstr "Schuifliniaal" -#: SlideruleActivity.py:68 sliderule.py:23 +#: SlideruleActivity.py:71 sliderule.py:24 msgid "square/square root" msgstr "kwadraat/vierkantswortel" -#: SlideruleActivity.py:69 sliderule.py:24 +#: SlideruleActivity.py:72 sliderule.py:25 msgid "multiply/divide" msgstr "vermenigvuldig/deel" -#: SlideruleActivity.py:70 sliderule.py:25 +#: SlideruleActivity.py:73 sliderule.py:26 msgid "divide/multiply" msgstr "deel/vermenigvuldig" -#: SlideruleActivity.py:71 sliderule.py:26 +#: SlideruleActivity.py:74 sliderule.py:27 msgid "cube/cube root" msgstr "derde macht/derdemachtswortel" -#: SlideruleActivity.py:72 sliderule.py:27 +#: SlideruleActivity.py:75 sliderule.py:28 msgid "sin, asin" msgstr "sin, asin" -#: SlideruleActivity.py:73 sliderule.py:28 +#: SlideruleActivity.py:76 sliderule.py:29 msgid "tan, atan" msgstr "tan, atan" -#: SlideruleActivity.py:74 sliderule.py:29 +#: SlideruleActivity.py:77 sliderule.py:30 msgid "add/subtract" msgstr "optellen/aftrekken" -#: SlideruleActivity.py:75 +#: SlideruleActivity.py:78 msgid "natural log" msgstr "natuurlijke log" -#: SlideruleActivity.py:464 SlideruleActivity.py:482 +#: SlideruleActivity.py:532 SlideruleActivity.py:550 msgid "Edit" msgstr "Wijzig" -#: SlideruleActivity.py:479 +#: SlideruleActivity.py:547 msgid "Project" msgstr "Project" -#: SlideruleActivity.py:480 +#: SlideruleActivity.py:548 msgid "Custom slide" msgstr "Aangepaste dia" -#: SlideruleActivity.py:481 +#: SlideruleActivity.py:549 msgid "Custom stator" msgstr "Aangepaste stator" -#: SlideruleActivity.py:496 +#: SlideruleActivity.py:563 msgid "select function" msgstr "selecteer functie" -#: SlideruleActivity.py:498 +#: SlideruleActivity.py:564 msgid "active slide" msgstr "actieve dia" -#: SlideruleActivity.py:501 +#: SlideruleActivity.py:567 msgid "select slide" msgstr "selecteer dia" -#: SlideruleActivity.py:503 +#: SlideruleActivity.py:568 msgid "active stator" msgstr "actieve stator" -#: SlideruleActivity.py:506 +#: SlideruleActivity.py:571 msgid "select stator" msgstr "selecteer stator" -#: SlideruleActivity.py:510 sliderule.py:72 +#: SlideruleActivity.py:573 sliderule.py:73 msgid "realign slides" msgstr "dia´s uitlijnen" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom slide" msgstr "maak aangepaste dia" -#: SlideruleActivity.py:523 +#: SlideruleActivity.py:588 msgid "create custom stator" msgstr "maak aangepaste stator" -#: SlideruleActivity.py:528 +#: SlideruleActivity.py:593 msgid "position function" msgstr "positie functie" -#: SlideruleActivity.py:531 +#: SlideruleActivity.py:596 msgid "result function" msgstr "resultaat functie" -#: SlideruleActivity.py:534 +#: SlideruleActivity.py:599 msgid "label function" msgstr "label functie" -#: SlideruleActivity.py:536 +#: SlideruleActivity.py:601 msgid "domain minimum" msgstr "domein minimum" -#: SlideruleActivity.py:538 +#: SlideruleActivity.py:603 msgid "domain maximum" msgstr "domein maximum" -#: SlideruleActivity.py:540 +#: SlideruleActivity.py:605 msgid "step size" msgstr "stapgrootte" -#: SlideruleActivity.py:546 +#: SlideruleActivity.py:609 msgid "Copy" msgstr "Kopieer" -#: SlideruleActivity.py:548 +#: SlideruleActivity.py:611 msgid "Paste" msgstr "Plak" -#: constants.py:51 +#: constants.py:52 msgid "log²" msgstr "log²" -#: constants.py:53 +#: constants.py:54 msgid "log" msgstr "log" -#: constants.py:55 +#: constants.py:56 msgid "1/log" msgstr "1/log" -#: constants.py:57 +#: constants.py:58 msgid "log³" msgstr "log³" -#: constants.py:58 +#: constants.py:59 msgid "sin" msgstr "sin" -#: constants.py:59 +#: constants.py:60 msgid "tan" msgstr "tan" -#: constants.py:60 +#: constants.py:61 msgid "linear" msgstr "lineair" -#: constants.py:61 +#: constants.py:62 msgid "log log" msgstr "log log" -#: constants.py:62 +#: constants.py:63 msgid "ln" msgstr "ln" -#: constants.py:63 +#: constants.py:64 msgid "user defined" msgstr "gebruiker gedefinieerd" -#: genslides.py:719 window.py:286 window.py:748 window.py:790 +#: genslides.py:720 window.py:273 window.py:735 window.py:777 msgid "Overflow Error" msgstr "Overloop Fout" -#: genslides.py:721 window.py:290 window.py:751 window.py:792 +#: genslides.py:722 window.py:277 window.py:738 window.py:779 msgid "Name Error" msgstr "Naam Fout" -#: genslides.py:723 window.py:293 window.py:754 window.py:794 +#: genslides.py:724 window.py:280 window.py:741 window.py:781 msgid "Can not divide by zero" msgstr "Kan niet delen door nul" -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 +#: genslides.py:726 window.py:284 window.py:287 window.py:744 window.py:747 +#: window.py:783 window.py:785 msgid "Type Error" msgstr "Type Fout" -#: genslides.py:727 window.py:320 window.py:333 window.py:346 +#: genslides.py:728 window.py:307 window.py:320 window.py:333 msgid "Value Error" msgstr "Waarde Fout" -#: genslides.py:729 window.py:303 window.py:763 window.py:800 +#: genslides.py:730 window.py:290 window.py:750 window.py:787 msgid "Syntax Error" msgstr "Syntax Fout" -#: sliderule.py:44 +#: sliderule.py:45 msgid "L" msgstr "L" -#: sliderule.py:48 +#: sliderule.py:49 msgid "C" msgstr "C" -#: sliderule.py:52 +#: sliderule.py:53 msgid "CI" msgstr "CI" -#: sliderule.py:56 +#: sliderule.py:57 msgid "A" msgstr "A" -#: sliderule.py:60 +#: sliderule.py:61 msgid "K" msgstr "K" -#: sliderule.py:64 +#: sliderule.py:65 msgid "S" msgstr "S" -#: sliderule.py:68 +#: sliderule.py:69 msgid "T" msgstr "T" diff --git a/po/pl.po b/po/pl.po deleted file mode 100644 index 38ffccc..0000000 --- a/po/pl.po +++ /dev/null @@ -1,237 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-01-26 13:27+0200\n" -"Last-Translator: lkjlkj <agniechka@o2.pl>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "Obliczenia" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "kwadrat/pierwiastek kwadratowy" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "mnożenie/dzielenie" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "dzielenie/mnożenie" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "sześcian/pierwiastek sześcienny" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "dodaj/odejmij" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "logarytm naturalny" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "Edytuj" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "Projekt" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "Dowolny suwak" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "Dowolny stojan" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "Wybierz funkcję" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "aktywny suwak" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "wybierz suwak" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "aktywny stojan" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "wybierz stojan" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "wyrównaj suwaki" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "stwórz dowolny suwak" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "stwórz dowolny stojan" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "funkcja pozycja" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "funkcja wynik" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "funkcja etykieta" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "minimum domeny" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "maximum domeny" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "rozmiar kroku" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "Kopiuj" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "Wklej" - -#: constants.py:51 -msgid "log²" -msgstr "log²" - -#: constants.py:53 -msgid "log" -msgstr "log" - -#: constants.py:55 -msgid "1/log" -msgstr "1/log" - -#: constants.py:57 -msgid "log³" -msgstr "log³" - -#: constants.py:58 -msgid "sin" -msgstr "sin" - -#: constants.py:59 -msgid "tan" -msgstr "tan" - -#: constants.py:60 -msgid "linear" -msgstr "liniowy" - -#: constants.py:61 -msgid "log log" -msgstr "log log" - -#: constants.py:62 -msgid "ln" -msgstr "In" - -#: constants.py:63 -msgid "user defined" -msgstr "zdefiniowany przez użytkownika" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "Błąd przepełnienia" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "Błąd nazwy" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "Nie można dzielić przez zero" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "Błąd typu" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "Błąd wartości" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "Błąd składni" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" - -#~ msgid "Slide Rule" -#~ msgstr "Suwmiarka" - -#~ msgid "Zero-division Error" -#~ msgstr "Błąd dzielenia przez zero" - -#~ msgid "Zero Division Error" -#~ msgstr "Błąd dzielenia przez zero" diff --git a/po/pt.po b/po/pt.po deleted file mode 100644 index d5f67bd..0000000 --- a/po/pt.po +++ /dev/null @@ -1,228 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-04-03 01:11+0200\n" -"Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "Régua de Cálculo" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "quadrado/raiz quadrada" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "multiplicar/dividir" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "dividir/multiplicar" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "cubo/raiz cúbica" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "somar/subtrair" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "Logaritmo natural" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "Editar" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "Projeto" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "" - -#: constants.py:51 -msgid "log²" -msgstr "log²" - -#: constants.py:53 -msgid "log" -msgstr "log" - -#: constants.py:55 -msgid "1/log" -msgstr "" - -#: constants.py:57 -#, fuzzy -msgid "log³" -msgstr "log" - -#: constants.py:58 -msgid "sin" -msgstr "" - -#: constants.py:59 -msgid "tan" -msgstr "" - -#: constants.py:60 -msgid "linear" -msgstr "" - -#: constants.py:61 -msgid "log log" -msgstr "" - -#: constants.py:62 -msgid "ln" -msgstr "" - -#: constants.py:63 -msgid "user defined" -msgstr "definido pelo utilizador" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "" - -#: sliderule.py:44 -msgid "L" -msgstr "" - -#: sliderule.py:48 -msgid "C" -msgstr "" - -#: sliderule.py:52 -msgid "CI" -msgstr "" - -#: sliderule.py:56 -msgid "A" -msgstr "" - -#: sliderule.py:60 -msgid "K" -msgstr "" - -#: sliderule.py:64 -msgid "S" -msgstr "" - -#: sliderule.py:68 -msgid "T" -msgstr "" diff --git a/po/th.po b/po/th.po deleted file mode 100644 index e675eed..0000000 --- a/po/th.po +++ /dev/null @@ -1,227 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-03-12 09:58+0200\n" -"Last-Translator: Meechai <malaku38@hotmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: th\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "Sliderule" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "ยกกำลังสอง/รากที่สอง" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "คูณ/หาร" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "หาร/คูณ" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "ยกกำลังสาม/รากที่สาม" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "บวก/ลบ" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "ลอการิทึมธรรมชาติ" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "แก้ไข" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "โครงการ" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "กำหนดค่าแถบเลื่อน" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "กำหนดค่าสเตเตอร์" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "เลือกฟังก์ชัน" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "แถบเลื่อนที่ใช้งานอยู่" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "เลือกแถบเลื่อน" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "สเตเตอร์ที่ใช้งานอยู่" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "เลือกสเตเตอร์" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "ตั้งค่าสไลด์ใหม่" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "สร้างแถบเลื่อนที่กำหนดเอง" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "สร้างสเตเตอร์ที่กำหนดเอง" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "ตำแหน่งฟังก์ชั่น" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "ผลลัพธ์ฟังก์ชั่น" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "ป้ายฟังก์ชั่น" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "โดเมนต่ำสุด" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "โดเมนสูงสุด" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "ขนาดเว้นเชื่อม" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "คัดลอก" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "วาง" - -#: constants.py:51 -msgid "log²" -msgstr "log²" - -#: constants.py:53 -msgid "log" -msgstr "log" - -#: constants.py:55 -msgid "1/log" -msgstr "1/log" - -#: constants.py:57 -msgid "log³" -msgstr "log³" - -#: constants.py:58 -msgid "sin" -msgstr "sin" - -#: constants.py:59 -msgid "tan" -msgstr "tan" - -#: constants.py:60 -msgid "linear" -msgstr "linear" - -#: constants.py:61 -msgid "log log" -msgstr "log log" - -#: constants.py:62 -msgid "ln" -msgstr "ln" - -#: constants.py:63 -msgid "user defined" -msgstr "สร้างโดยผู้ใช้" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "ข้อผิดพลาดจำนวนที่ล้นออกมา" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "ชื่อข้อผิดพลาด" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "ไม่สามารถหารด้วยศูนย์" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "ประเภทของข้อผิดพลาด" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "ค่าผิดพลาด" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "ข้อผิดพลาดทางไวยากรณ์" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" diff --git a/po/zh_CN.po b/po/zh_CN.po deleted file mode 100644 index 1192713..0000000 --- a/po/zh_CN.po +++ /dev/null @@ -1,236 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 00:33-0500\n" -"PO-Revision-Date: 2012-03-15 03:30+0200\n" -"Last-Translator: lite <litekok@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" - -#: activity/activity.info:2 sliderule.py:40 -msgid "Sliderule" -msgstr "计算尺" - -#: SlideruleActivity.py:68 sliderule.py:23 -msgid "square/square root" -msgstr "平方/平方根" - -#: SlideruleActivity.py:69 sliderule.py:24 -msgid "multiply/divide" -msgstr "乘法/除法" - -#: SlideruleActivity.py:70 sliderule.py:25 -msgid "divide/multiply" -msgstr "除法/乘法" - -#: SlideruleActivity.py:71 sliderule.py:26 -msgid "cube/cube root" -msgstr "立方/立方根" - -#: SlideruleActivity.py:72 sliderule.py:27 -msgid "sin, asin" -msgstr "sin, asin" - -#: SlideruleActivity.py:73 sliderule.py:28 -msgid "tan, atan" -msgstr "tan, atan" - -#: SlideruleActivity.py:74 sliderule.py:29 -msgid "add/subtract" -msgstr "加法/减法" - -#: SlideruleActivity.py:75 -msgid "natural log" -msgstr "自然对数" - -#: SlideruleActivity.py:464 SlideruleActivity.py:482 -msgid "Edit" -msgstr "编辑" - -#: SlideruleActivity.py:479 -msgid "Project" -msgstr "项目" - -#: SlideruleActivity.py:480 -msgid "Custom slide" -msgstr "定制幻灯片" - -#: SlideruleActivity.py:481 -msgid "Custom stator" -msgstr "定制定子" - -#: SlideruleActivity.py:496 -msgid "select function" -msgstr "选择函数" - -#: SlideruleActivity.py:498 -msgid "active slide" -msgstr "活动幻灯片" - -#: SlideruleActivity.py:501 -msgid "select slide" -msgstr "选择幻灯片" - -#: SlideruleActivity.py:503 -msgid "active stator" -msgstr "活动定子" - -#: SlideruleActivity.py:506 -msgid "select stator" -msgstr "选择定子" - -#: SlideruleActivity.py:510 sliderule.py:72 -msgid "realign slides" -msgstr "重新调整幻灯片" - -#: SlideruleActivity.py:523 -msgid "create custom slide" -msgstr "创建定制幻灯片" - -#: SlideruleActivity.py:523 -msgid "create custom stator" -msgstr "创建定制定子" - -#: SlideruleActivity.py:528 -msgid "position function" -msgstr "位置函数" - -#: SlideruleActivity.py:531 -msgid "result function" -msgstr "计算结果函数" - -#: SlideruleActivity.py:534 -msgid "label function" -msgstr "标记函数" - -#: SlideruleActivity.py:536 -msgid "domain minimum" -msgstr "域的最小值" - -#: SlideruleActivity.py:538 -msgid "domain maximum" -msgstr "域的最大值" - -#: SlideruleActivity.py:540 -msgid "step size" -msgstr "步长" - -#: SlideruleActivity.py:546 -msgid "Copy" -msgstr "复制" - -#: SlideruleActivity.py:548 -msgid "Paste" -msgstr "粘贴" - -#: constants.py:51 -msgid "log²" -msgstr "log²" - -#: constants.py:53 -msgid "log" -msgstr "log" - -#: constants.py:55 -msgid "1/log" -msgstr "1/log" - -#: constants.py:57 -msgid "log³" -msgstr "log³" - -#: constants.py:58 -msgid "sin" -msgstr "sin" - -#: constants.py:59 -msgid "tan" -msgstr "tan" - -#: constants.py:60 -msgid "linear" -msgstr "linear" - -#: constants.py:61 -msgid "log log" -msgstr "log log" - -#: constants.py:62 -msgid "ln" -msgstr "ln" - -#: constants.py:63 -msgid "user defined" -msgstr "用户定义" - -#: genslides.py:719 window.py:286 window.py:748 window.py:790 -msgid "Overflow Error" -msgstr "溢出错误" - -#: genslides.py:721 window.py:290 window.py:751 window.py:792 -msgid "Name Error" -msgstr "名称错误" - -#: genslides.py:723 window.py:293 window.py:754 window.py:794 -msgid "Can not divide by zero" -msgstr "不能除零" - -#: genslides.py:725 window.py:297 window.py:300 window.py:757 window.py:760 -#: window.py:796 window.py:798 -msgid "Type Error" -msgstr "类型错误" - -#: genslides.py:727 window.py:320 window.py:333 window.py:346 -msgid "Value Error" -msgstr "值错误" - -#: genslides.py:729 window.py:303 window.py:763 window.py:800 -msgid "Syntax Error" -msgstr "语法错误" - -#: sliderule.py:44 -msgid "L" -msgstr "L" - -#: sliderule.py:48 -msgid "C" -msgstr "C" - -#: sliderule.py:52 -msgid "CI" -msgstr "CI" - -#: sliderule.py:56 -msgid "A" -msgstr "A" - -#: sliderule.py:60 -msgid "K" -msgstr "K" - -#: sliderule.py:64 -msgid "S" -msgstr "S" - -#: sliderule.py:68 -msgid "T" -msgstr "T" - -#~ msgid "Slide Rule" -#~ msgstr "计算尺" - -#~ msgid "Zero-division Error" -#~ msgstr "除零错误" - -#~ msgid "Zero Division Error" -#~ msgstr "除零错误" @@ -1,5 +1,5 @@ #!/usr/bin/env python -from sugar.activity import bundlebuilder +from sugar3.activity import bundlebuilder if __name__ == "__main__": bundlebuilder.start() diff --git a/sliderule.py b/sliderule.py index 14525f3..dfbf64b 100755..100644 --- a/sliderule.py +++ b/sliderule.py @@ -1,6 +1,7 @@ #!/usr/bin/env python #Copyright (c) 2009, 2010 Walter Bender +#Copyright (c) 2012 Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -10,10 +11,9 @@ # You should have received a copy of the GNU General Public License # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - +from gi.repository import Gtk, Gdk, GdkPixbuf import pygtk pygtk.require('2.0') -import gtk from gettext import gettext as _ import os @@ -35,57 +35,57 @@ class SlideruleMain: self.r = 0 self.sr = None - self.win = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.win = Gtk.Window(Gtk.WindowType.TOPLEVEL) self.win.maximize() self.win.set_title(_('Sliderule')) - self.win.connect('delete_event', lambda w,e: gtk.main_quit()) + self.win.connect('delete_event', lambda w,e: Gtk.main_quit()) - menu = gtk.Menu() - menu_items = gtk.MenuItem(_("L") + ' ' + _FL) + menu = Gtk.Menu() + menu_items = Gtk.MenuItem(_("L") + ' ' + _FL) menu.append(menu_items) menu_items.connect("activate", self._l_cb) menu_items.show() - menu_items = gtk.MenuItem(_("C") + ' ' + _FC) + menu_items = Gtk.MenuItem(_("C") + ' ' + _FC) menu.append(menu_items) menu_items.connect("activate", self._c_cb) menu_items.show() - menu_items = gtk.MenuItem(_("CI") + ' ' + _FCI) + menu_items = Gtk.MenuItem(_("CI") + ' ' + _FCI) menu.append(menu_items) menu_items.connect("activate", self._ci_cb) menu_items.show() - menu_items = gtk.MenuItem(_("A") + ' ' + _FA) + menu_items = Gtk.MenuItem(_("A") + ' ' + _FA) menu.append(menu_items) menu_items.connect("activate", self._a_cb) menu_items.show() - menu_items = gtk.MenuItem(_("K") + ' ' + _FK) + menu_items = Gtk.MenuItem(_("K") + ' ' + _FK) menu.append(menu_items) menu_items.connect("activate", self._k_cb) menu_items.show() - menu_items = gtk.MenuItem(_("S") + ' ' + _FS) + menu_items = Gtk.MenuItem(_("S") + ' ' + _FS) menu.append(menu_items) menu_items.connect("activate", self._s_cb) menu_items.show() - menu_items = gtk.MenuItem(_("T") + ' ' + _FT) + menu_items = Gtk.MenuItem(_("T") + ' ' + _FT) menu.append(menu_items) menu_items.connect("activate", self._t_cb) menu_items.show() - menu_items = gtk.MenuItem(_("realign slides")) + menu_items = Gtk.MenuItem(_("realign slides")) menu.append(menu_items) menu_items.connect("activate", self._realign_cb) menu_items.show() - root_menu = gtk.MenuItem("Tools") + root_menu = Gtk.MenuItem("Tools") root_menu.show() root_menu.set_submenu(menu) - vbox = gtk.VBox(False, 0) + vbox = Gtk.VBox(False, 0) self.win.add(vbox) vbox.show() - menu_bar = gtk.MenuBar() + menu_bar = Gtk.MenuBar() vbox.pack_start(menu_bar, False, False, 2) menu_bar.show() - canvas = gtk.DrawingArea() + canvas = Gtk.DrawingArea() vbox.pack_end(canvas, True, True) canvas.show() @@ -174,7 +174,7 @@ class SlideruleMain: def main(): - gtk.main() + Gtk.main() return 0 if __name__ == "__main__": diff --git a/sprite_factory.py b/sprite_factory.py index 5dd8e02..ea93f2a 100644 --- a/sprite_factory.py +++ b/sprite_factory.py @@ -1,4 +1,5 @@ #Copyright (c) 2009, 2010 Walter Bender +#Copyright (c) 2012, Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -8,11 +9,9 @@ # You should have received a copy of the GNU General Public License # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA - +from gi.repository import Gtk, Gdk, GObject, GdkPixbuf import pygtk pygtk.require('2.0') -import gtk -import gobject import os.path from constants import SHEIGHT, SWIDTH, LEFT, RIGHT, TOP, BOTTOM, TABWIDTH @@ -152,13 +151,13 @@ class Tab(): def file_to_pixbuf(path, name, w, h): """ Load pixbuf from a file. """ - return gtk.gdk.pixbuf_new_from_file_at_size( + return GdkPixbuf.Pixbuf.new_from_file_at_size( os.path.join(path+name+'.svg'), int(w), int(h)) def svg_str_to_pixbuf(svg_string): """ Load pixbuf from SVG string. """ - pl = gtk.gdk.PixbufLoader('svg') + pl = GdkPixbuf.PixbufLoader.new_with_type('svg') pl.write(svg_string) pl.close() pixbuf = pl.get_pixbuf() @@ -73,9 +73,12 @@ def svg_str_to_pixbuf(svg_string): pl.close() pixbuf = pl.get_pixbuf() return pixbuf +''' +## <-----------GTK2---------------->## ''' + import pygtk pygtk.require('2.0') import gtk @@ -84,35 +87,35 @@ import pangocairo import cairo class Sprites: - ''' A class for the list of sprites and everything they share in common ''' + # A class for the list of sprites and everything they share in common # def __init__(self, widget): - ''' Initialize an empty array of sprites ''' + # Initialize an empty array of sprites # self.widget = widget self.list = [] self.cr = None def set_cairo_context(self, cr): - ''' Cairo context may be set or reset after __init__ ''' + # Cairo context may be set or reset after __init__ # self.cr = cr def get_sprite(self, i): - ''' Return a sprint from the array ''' + # Return a sprint from the array # if i < 0 or i > len(self.list) - 1: return(None) else: return(self.list[i]) def length_of_list(self): - ''' How many sprites are there? ''' + # How many sprites are there? # return(len(self.list)) def append_to_list(self, spr): - ''' Append a new sprite to the end of the list. ''' + # Append a new sprite to the end of the list. # self.list.append(spr) def insert_in_list(self, spr, i): - ''' Insert a sprite at position i. ''' + # Insert a sprite at position i. # if i < 0: self.list.insert(0, spr) elif i > len(self.list) - 1: @@ -121,21 +124,22 @@ class Sprites: self.list.insert(i, spr) def remove_from_list(self, spr): - ''' Remove a sprite from the list. ''' + # Remove a sprite from the list. # if spr in self.list: self.list.remove(spr) - def find_sprite(self, pos): - ''' Search based on (x, y) position. Return the 'top/first' one. ''' + def find_sprite(self, pos, inverse=False): + # Search based on (x, y) position. Return the 'top/first' one. # list = self.list[:] - list.reverse() + if not inverse: + list.reverse() for spr in list: if spr.hit(pos): return spr return None def redraw_sprites(self, area=None, cr=None): - ''' Redraw the sprites that intersect area. ''' + # Redraw the sprites that intersect area. # # I think I need to do this to save Cairo some work if cr is None: cr = self.cr @@ -154,10 +158,10 @@ class Sprites: class Sprite: - ''' A class for the individual sprites ''' + # A class for the individual sprites # def __init__(self, sprites, x, y, image): - ''' Initialize an individual sprite ''' + # Initialize an individual sprite # self._sprites = sprites self.save_xy = (x, y) # remember initial (x, y) position self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0) @@ -180,14 +184,15 @@ class Sprite: self._sprites.append_to_list(self) def set_image(self, image, i=0, dx=0, dy=0): - ''' Add an image to the sprite. ''' + # Add an image to the sprite. # while len(self.cached_surfaces) < i + 1: self.cached_surfaces.append(None) self._dx.append(0) self._dy.append(0) self._dx[i] = dx self._dy[i] = dy - if isinstance(image, gtk.gdk.Pixbuf): + if isinstance(image, gtk.gdk.Pixbuf) or \ + isinstance(image, cairo.ImageSurface): w = image.get_width() h = image.get_height() else: @@ -200,48 +205,51 @@ class Sprite: self.rect.width = w + dx if h + dy > self.rect.height: self.rect.height = h + dy - surface = cairo.ImageSurface( - cairo.FORMAT_ARGB32, self.rect.width, self.rect.height) - context = cairo.Context(surface) - context = gtk.gdk.CairoContext(context) - context.set_source_pixbuf(image, 0, 0) - context.rectangle(0, 0, self.rect.width, self.rect.height) - context.fill() - self.cached_surfaces[i] = surface + if isinstance(image, cairo.ImageSurface): + self.cached_surfaces[i] = image + else: # Convert to Cairo surface + surface = cairo.ImageSurface( + cairo.FORMAT_ARGB32, self.rect.width, self.rect.height) + context = cairo.Context(surface) + context = gtk.gdk.CairoContext(context) + context.set_source_pixbuf(image, 0, 0) + context.rectangle(0, 0, self.rect.width, self.rect.height) + context.fill() + self.cached_surfaces[i] = surface def move(self, pos): - ''' Move to new (x, y) position ''' + # Move to new (x, y) position # self.inval() self.rect.x, self.rect.y = int(pos[0]), int(pos[1]) self.inval() def move_relative(self, pos): - ''' Move to new (x+dx, y+dy) position ''' + # Move to new (x+dx, y+dy) position # self.inval() self.rect.x += int(pos[0]) self.rect.y += int(pos[1]) self.inval() def get_xy(self): - ''' Return current (x, y) position ''' + # Return current (x, y) position # return (self.rect.x, self.rect.y) def get_dimensions(self): - ''' Return current size ''' + # Return current size # return (self.rect.width, self.rect.height) def get_layer(self): - ''' Return current layer ''' + # Return current layer # return self.layer def set_shape(self, image, i=0): - ''' Set the current image associated with the sprite ''' + # Set the current image associated with the sprite # self.inval() self.set_image(image, i) self.inval() def set_layer(self, layer=None): - ''' Set the layer for a sprite ''' + # Set the layer for a sprite # self._sprites.remove_from_list(self) if layer is not None: self.layer = layer @@ -254,7 +262,7 @@ class Sprite: self.inval() def set_label(self, new_label, i=0): - ''' Set the label drawn on the sprite ''' + # Set the label drawn on the sprite # self._extend_labels_array(i) if type(new_label) is str or type(new_label) is unicode: # pango doesn't like nulls @@ -264,11 +272,11 @@ class Sprite: self.inval() def set_margins(self, l=0, t=0, r=0, b=0): - ''' Set the margins for drawing the label ''' + # Set the margins for drawing the label # self._margins = [l, t, r, b] def _extend_labels_array(self, i): - ''' Append to the labels attribute list ''' + # Append to the labels attribute list # if self._fd is None: self.set_font('Sans') if self._color is None: @@ -281,11 +289,11 @@ class Sprite: self._vert_align.append(self._vert_align[0]) def set_font(self, font): - ''' Set the font for a label ''' + # Set the font for a label # self._fd = pango.FontDescription(font) def set_label_color(self, rgb): - ''' Set the font color for a label ''' + # Set the font color for a label # COLORTABLE = {'black': '#000000', 'white': '#FFFFFF', 'red': '#FF0000', 'yellow': '#FFFF00', 'green': '#00FF00', 'cyan': '#00FFFF', @@ -301,7 +309,7 @@ class Sprite: def set_label_attributes(self, scale, rescale=True, horiz_align="center", vert_align="middle", i=0): - ''' Set the various label attributes ''' + # Set the various label attributes # self._extend_labels_array(i) self._scale[i] = scale self._rescale[i] = rescale @@ -309,23 +317,23 @@ class Sprite: self._vert_align[i] = vert_align def hide(self): - ''' Hide a sprite ''' + # Hide a sprite # self.inval() self._sprites.remove_from_list(self) def restore(self): - ''' Restore a hidden sprite ''' + # Restore a hidden sprite # self.set_layer() def inval(self): - ''' Invalidate a region for gtk ''' + # Invalidate a region for gtk # self._sprites.widget.queue_draw_area(self.rect.x, self.rect.y, self.rect.width, self.rect.height) def draw(self, cr=None): - ''' Draw the sprite (and label) ''' + # Draw the sprite (and label) # if cr is None: print 'sprite.draw: no Cairo context.' return @@ -342,7 +350,7 @@ class Sprite: self.draw_label(cr) def hit(self, pos): - ''' Is (x, y) on top of the sprite? ''' + # Is (x, y) on top of the sprite? # x, y = pos if x < self.rect.x: return False @@ -355,7 +363,7 @@ class Sprite: return True def draw_label(self, cr): - ''' Draw the label based on its attributes ''' + # Draw the label based on its attributes # # Create a pangocairo context cr = pangocairo.CairoContext(cr) my_width = self.rect.width - self._margins[0] - self._margins[2] @@ -404,7 +412,7 @@ class Sprite: cr.restore() def label_width(self): - ''' Calculate the width of a label ''' + # Calculate the width of a label # cr = pangocairo.CairoContext(self._sprites.cr) if cr is not None: max = 0 @@ -421,19 +429,19 @@ class Sprite: return self.rect.width def label_safe_width(self): - ''' Return maximum width for a label ''' + # Return maximum width for a label # return self.rect.width - self._margins[0] - self._margins[2] def label_safe_height(self): - ''' Return maximum height for a label ''' + # Return maximum height for a label # return self.rect.height - self._margins[1] - self._margins[3] def label_left_top(self): - ''' Return the upper-left corner of the label safe zone ''' + # Return the upper-left corner of the label safe zone # return(self._margins[0], self._margins[1]) def get_pixel(self, pos, i=0): - ''' Return the pixel at (x, y) ''' + # Return the pixel at (x, y) # x = int(pos[0] - self.rect.x) y = int(pos[1] - self.rect.y) if x < 0 or x > (self.rect.width - 1) or \ @@ -452,3 +460,393 @@ class Sprite: pixels = cs.get_data() return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0) +''' + +#<-----------------------GTK3-----------># +import gi +from gi.repository import Gtk, GdkPixbuf, Gdk +from gi.repository import Pango, PangoCairo +import cairo + + +class Sprites: + ''' A class for the list of sprites and everything they share in common ''' + + def __init__(self, widget): + ''' Initialize an empty array of sprites ''' + self.cr = None + self.widget = widget + self.list = [] + + def set_cairo_context(self, cr): + ''' Cairo context may be set or reset after __init__ ''' + self.cr = cr + + def get_sprite(self, i): + ''' Return a sprint from the array ''' + if i < 0 or i > len(self.list)-1: + return(None) + else: + return(self.list[i]) + + def length_of_list(self): + ''' How many sprites are there? ''' + return(len(self.list)) + + def append_to_list(self, spr): + ''' Append a new sprite to the end of the list. ''' + self.list.append(spr) + + def insert_in_list(self, spr, i): + ''' Insert a sprite at position i. ''' + if i < 0: + self.list.insert(0, spr) + elif i > len(self.list) - 1: + self.list.append(spr) + else: + self.list.insert(i, spr) + + def remove_from_list(self, spr): + ''' Remove a sprite from the list. ''' + if spr in self.list: + self.list.remove(spr) + + def find_sprite(self, pos): + ''' Search based on (x, y) position. Return the 'top/first' one. ''' + list = self.list[:] + list.reverse() + for spr in list: + if spr.hit(pos): + return spr + return None + + def redraw_sprites(self, area=None, cr=None): + ''' Redraw the sprites that intersect area. ''' + # I think I need to do this to save Cairo some work + if cr is None: + cr = self.cr + else: + self.cr = cr + if cr is None: + print 'sprites.redraw_sprites: no Cairo context' + return + for spr in self.list: + if area == None: + spr.draw(cr=cr) + else: + intersection = spr.rect.intersect(area) + if intersection.width > 0 or intersection.height > 0: + spr.draw(cr=cr) + + +class Sprite: + ''' A class for the individual sprites ''' + + def __init__(self, sprites, x, y, image): + ''' Initialize an individual sprite ''' + self._sprites = sprites + self.save_xy = (x, y) # remember initial (x, y) position + self.rect = [int(x), int(y), 0, 0] + self._scale = [12] + self._rescale = [True] + self._horiz_align = ["center"] + self._vert_align = ["middle"] + self._x_pos = [None] + self._y_pos = [None] + self._fd = None + self._bold = False + self._italic = False + self._color = None + self._margins = [0, 0, 0, 0] + self.layer = 100 + self.labels = [] + self.images = [] + self._dx = [] # image offsets + self._dy = [] + self.type = None + self.set_image(image) + self._sprites.append_to_list(self) + + def set_image(self, image, i=0, dx=0, dy=0): + ''' Add an image to the sprite. ''' + while len(self.images) < i + 1: + self.images.append(None) + self._dx.append(0) + self._dy.append(0) + self.images[i] = image + self._dx[i] = dx + self._dy[i] = dy + if hasattr(self.images[i], 'get_width'): + w = self.images[i].get_width() + h = self.images[i].get_height() + else: + w, h = self.images[i].get_size() + if i == 0: # Always reset width and height when base image changes. + self.rect[2] = w + dx + self.rect[3] = h + dy + else: + if w + dx > self.rect[2]: + self.rect[2] = w + dx + if h + dy > self.rect[3]: + self.rect[3] = h + dy + + def move(self, pos): + ''' Move to new (x, y) position ''' + self.inval() + self.rect[0], self.rect[1] = int(pos[0]), int(pos[1]) + self.inval() + + def move_relative(self, pos): + ''' Move to new (x+dx, y+dy) position ''' + self.inval() + self.rect[0] += int(pos[0]) + self.rect[1] += int(pos[1]) + self.inval() + + def get_xy(self): + ''' Return current (x, y) position ''' + return (self.rect[0], self.rect[1]) + + def get_dimensions(self): + ''' Return current size ''' + return (self.rect[2], self.rect[3]) + + def get_layer(self): + ''' Return current layer ''' + return self.layer + + def set_shape(self, image, i=0): + ''' Set the current image associated with the sprite ''' + self.inval() + self.set_image(image, i) + self.inval() + + def set_layer(self, layer=None): + ''' Set the layer for a sprite ''' + self._sprites.remove_from_list(self) + if layer is not None: + self.layer = layer + for i in range(self._sprites.length_of_list()): + if self.layer < self._sprites.get_sprite(i).layer: + self._sprites.insert_in_list(self, i) + self.inval() + return + self._sprites.append_to_list(self) + self.inval() + + def set_label(self, new_label, i=0): + ''' Set the label drawn on the sprite ''' + self._extend_labels_array(i) + if type(new_label) is str or type(new_label) is unicode: + # pango doesn't like nulls + self.labels[i] = new_label.replace("\0", " ") + else: + self.labels[i] = str(new_label) + self.inval() + + def set_margins(self, l=0, t=0, r=0, b=0): + ''' Set the margins for drawing the label ''' + self._margins = [l, t, r, b] + + def _extend_labels_array(self, i): + ''' Append to the labels attribute list ''' + if self._fd is None: + self.set_font('Sans') + if self._color is None: + self._color = (0., 0., 0.) + while len(self.labels) < i + 1: + self.labels.append(" ") + self._scale.append(self._scale[0]) + self._rescale.append(self._rescale[0]) + self._horiz_align.append(self._horiz_align[0]) + self._vert_align.append(self._vert_align[0]) + self._x_pos.append(self._x_pos[0]) + self._y_pos.append(self._y_pos[0]) + + def set_font(self, font): + ''' Set the font for a label ''' + self._fd = Pango.FontDescription(font) + + def set_label_color(self, rgb): + ''' Set the font color for a label ''' + COLORTABLE = {'black': '#000000', 'white': '#FFFFFF', + 'red': '#FF0000', 'yellow': '#FFFF00', + 'green': '#00FF00', 'cyan': '#00FFFF', + 'blue': '#0000FF', 'purple': '#FF00FF', + 'gray': '#808080'} + if rgb.lower() in COLORTABLE: + rgb = COLORTABLE[rgb.lower()] + # Convert from '#RRGGBB' to floats + self._color = (int('0x' + rgb[1:3], 16) / 256., + int('0x' + rgb[3:5], 16) / 256., + int('0x' + rgb[5:7], 16) / 256.) + return + + def set_label_attributes(self, scale, rescale=True, horiz_align="center", + vert_align="middle", x_pos=None, y_pos=None, i=0): + ''' Set the various label attributes ''' + self._extend_labels_array(i) + self._scale[i] = scale + self._rescale[i] = rescale + self._horiz_align[i] = horiz_align + self._vert_align[i] = vert_align + self._x_pos[i] = x_pos + self._y_pos[i] = y_pos + + def hide(self): + ''' Hide a sprite ''' + self.inval() + self._sprites.remove_from_list(self) + + def restore(self): + ''' Restore a hidden sprite ''' + self.set_layer() + + def inval(self): + ''' Invalidate a region for gtk ''' + # self._sprites.window.invalidate_rect(self.rect, False) + self._sprites.widget.queue_draw_area(self.rect[0], + self.rect[1], + self.rect[2], + self.rect[3]) + + def draw(self, cr=None): + ''' Draw the sprite (and label) ''' + if cr is None: + cr = self._sprites.cr + if cr is None: + print 'sprite.draw: no Cairo context.' + return + for i, img in enumerate(self.images): + if isinstance(img, GdkPixbuf.Pixbuf): + Gdk.cairo_set_source_pixbuf(cr, img, + self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i]) + cr.rectangle(self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i], + self.rect[2], + self.rect[3]) + cr.fill() + elif type(img) == cairo.ImageSurface: + cr.set_source_surface(img, self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i]) + cr.rectangle(self.rect[0] + self._dx[i], + self.rect[1] + self._dy[i], + self.rect[2], + self.rect[3]) + cr.fill() + else: + print 'sprite.draw: source not a pixbuf (%s)' % (type(img)) + if len(self.labels) > 0: + self.draw_label(cr) + + def hit(self, pos): + ''' Is (x, y) on top of the sprite? ''' + x, y = pos + if x < self.rect[0]: + return False + if x > self.rect[0] + self.rect[2]: + return False + if y < self.rect[1]: + return False + if y > self.rect[1] + self.rect[3]: + return False + return True + + def draw_label(self, cr): + ''' Draw the label based on its attributes ''' + my_width = self.rect[2] - self._margins[0] - self._margins[2] + if my_width < 0: + my_width = 0 + my_height = self.rect[3] - self._margins[1] - self._margins[3] + for i in range(len(self.labels)): + pl = PangoCairo.create_layout(cr) + pl.set_text(str(self.labels[i]), -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) + pl.set_font_description(self._fd) + w = pl.get_size()[0] / Pango.SCALE + if w > my_width: + if self._rescale[i]: + self._fd.set_size( + int(self._scale[i] * Pango.SCALE * my_width / w)) + pl.set_font_description(self._fd) + w = pl.get_size()[0] / Pango.SCALE + else: + j = len(self.labels[i]) - 1 + while(w > my_width and j > 0): + pl.set_text( + "…" + self.labels[i][len(self.labels[i]) - j:], -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) + pl.set_font_description(self._fd) + w = pl.get_size()[0] / Pango.SCALE + j -= 1 + if self._x_pos[i] is not None: + x = int(self.rect[0] + self._x_pos[i]) + elif self._horiz_align[i] == "center": + x = int(self.rect[0] + self._margins[0] + (my_width - w) / 2) + elif self._horiz_align[i] == 'left': + x = int(self.rect[0] + self._margins[0]) + else: # right + x = int(self.rect[0] + self.rect[2] - w - self._margins[2]) + h = pl.get_size()[1] / Pango.SCALE + if self._y_pos[i] is not None: + y = int(self.rect[1] + self._y_pos[i]) + elif self._vert_align[i] == "middle": + y = int(self.rect[1] + self._margins[1] + (my_height - h) / 2) + elif self._vert_align[i] == "top": + y = int(self.rect[1] + self._margins[1]) + else: # bottom + y = int(self.rect[1] + self.rect[3] - h - self._margins[3]) + cr.save() + cr.translate(x, y) + cr.set_source_rgb(self._color[0], self._color[1], self._color[2]) + PangoCairo.update_layout(cr, pl) + PangoCairo.show_layout(cr, pl) + cr.restore() + + def label_width(self, cr=None): + ''' Calculate the width of a label ''' + if cr is None: + cr = self._sprites.cr + max = 0 + for i in range(len(self.labels)): + pl = PangoCairo.create_layout(cr) + pl.set_text(str(self.labels[i]), -1) + self._fd.set_size(int(self._scale[i] * Pango.SCALE)) + pl.set_font_description(self._fd) + w = pl.get_size()[0] / Pango.SCALE + if w > max: + max = w + return max + + def label_safe_width(self): + ''' Return maximum width for a label ''' + return self.rect[2] - self._margins[0] - self._margins[2] + + def label_safe_height(self): + ''' Return maximum height for a label ''' + return self.rect[3] - self._margins[1] - self._margins[3] + + def label_left_top(self): + ''' Return the upper-left corner of the label safe zone ''' + return(self._margins[0], self._margins[1]) + + def get_pixel(self, pos, i=0): + ''' Return the pixl at (x, y) ''' + x, y = pos + x = x - self.rect[0] + y = y - self.rect[1] + if y > self.images[i].get_height() - 1: + return(-1, -1, -1, -1) + try: + array = self.images[i].get_pixels() + if array is not None: + offset = (y * self.images[i].get_width() + x) * 4 + r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\ + ord(array[offset + 2]), ord(array[offset + 3]) + return(r, g, b, a) + else: + return(-1, -1, -1, -1) + except IndexError: + print "Index Error: %d %d" % (len(array), offset) + return(-1, -1, -1, -1) diff --git a/toolbar_utils.py b/toolbar_utils.py index 701ddb4..03f5461 100644 --- a/toolbar_utils.py +++ b/toolbar_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2011, Walter Bender - +# Copyright (c) 2012, Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -10,13 +10,12 @@ # along with this library; if not, write to the Free Software # Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA +from gi.repository import Gtk -import gtk - -from sugar.graphics.radiotoolbutton import RadioToolButton -from sugar.graphics.toolbutton import ToolButton -from sugar.graphics.combobox import ComboBox -from sugar.graphics.toolcombobox import ToolComboBox +from sugar3.graphics.radiotoolbutton import RadioToolButton +from sugar3.graphics.toolbutton import ToolButton +from sugar3.graphics.combobox import ComboBox +from sugar3.graphics.toolcombobox import ToolComboBox def combo_factory(combo_array, toolbar, callback, cb_arg=None, @@ -32,7 +31,7 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None, for i, selection in enumerate(combo_array): combo.append_item(i, selection, None) combo.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(combo) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -44,15 +43,15 @@ def combo_factory(combo_array, toolbar, callback, cb_arg=None, return combo -def entry_factory(default_string, toolbar, tooltip=None, max=10): +def entry_factory(default_string, toolbar, tooltip=None, max=3): ''' Factory for adding a text box to a toolbar ''' - entry = gtk.Entry() + entry = Gtk.Entry() entry.set_text(default_string) if tooltip is not None and hasattr(entry, 'set_tooltip_text'): entry.set_tooltip_text(tooltip) entry.set_width_chars(max) entry.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(entry) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -87,7 +86,7 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, group=None): ''' Add a radio button to a toolbar ''' button = RadioToolButton(group=group) - button.set_named_icon(name) + button.set_icon_name(name) if callback is not None: if cb_arg is None: button.connect('clicked', callback) @@ -105,12 +104,12 @@ def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None, def label_factory(toolbar, label_text, width=None): ''' Factory for adding a label to a toolbar ''' - label = gtk.Label(label_text) + label = Gtk.Label(label_text) label.set_line_wrap(True) if width is not None: label.set_size_request(width, -1) # doesn't work on XOs label.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(label) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -122,7 +121,7 @@ def label_factory(toolbar, label_text, width=None): def separator_factory(toolbar, expand=False, visible=True): ''' add a separator to a toolbar ''' - separator = gtk.SeparatorToolItem() + separator = Gtk.SeparatorToolItem() separator.props.draw = visible separator.set_expand(expand) if hasattr(toolbar, 'insert'): # the main toolbar @@ -134,9 +133,9 @@ def separator_factory(toolbar, expand=False, visible=True): def image_factory(image, toolbar, tooltip=None): ''' Add an image to the toolbar ''' - img = gtk.Image() + img = Gtk.Image() img.set_from_pixbuf(image) - img_tool = gtk.ToolItem() + img_tool = Gtk.ToolItem() img_tool.add(img) if tooltip is not None: img.set_tooltip_text(tooltip) @@ -149,12 +148,12 @@ def image_factory(image, toolbar, tooltip=None): def spin_factory(default, min, max, callback, toolbar): - spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0) - spin = gtk.SpinButton(spin_adj, 0, 0) + spin_adj = Gtk.Adjustment(default, min, max, 1, 32, 0) + spin = Gtk.SpinButton(spin_adj, 0, 0) spin_id = spin.connect('value-changed', callback) spin.set_numeric(True) spin.show() - toolitem = gtk.ToolItem() + toolitem = Gtk.ToolItem() toolitem.add(spin) if hasattr(toolbar, 'insert'): # the main toolbar toolbar.insert(toolitem, -1) @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- #Copyright (c) 2009-11 Walter Bender +#Copyright (c) 2012 Ignacio Rodriguez # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,15 +32,14 @@ graphics associated with your slide and stator. import pygtk pygtk.require('2.0') -import gtk - +from gi.repository import Gtk, Gdk, GdkPixbuf import locale from gettext import gettext as _ from math import * try: - from sugar.graphics import style + from sugar3.graphics import style GRID_CELL_SIZE = style.GRID_CELL_SIZE except: GRID_CELL_SIZE = 0 @@ -94,17 +94,16 @@ class SlideRule(): self.parent = parent parent.show_all() - self.canvas.set_flags(gtk.CAN_FOCUS) - self.canvas.add_events(gtk.gdk.BUTTON_PRESS_MASK) - self.canvas.add_events(gtk.gdk.BUTTON_RELEASE_MASK) - self.canvas.add_events(gtk.gdk.POINTER_MOTION_MASK) - self.canvas.connect("expose-event", self._expose_cb) + self.canvas.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self.canvas.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK) + self.canvas.add_events(Gdk.EventMask.POINTER_MOTION_MASK) + self.canvas.connect("draw", self.__draw_cb) self.canvas.connect("button-press-event", self._button_press_cb) self.canvas.connect("button-release-event", self._button_release_cb) self.canvas.connect("motion-notify-event", self._mouse_move_cb) self.canvas.connect("key_press_event", self._keypress_cb) - self.width = gtk.gdk.screen_width() - self.height = gtk.gdk.screen_height()-GRID_CELL_SIZE + self.width = Gdk.Screen.width() + self.height = Gdk.Screen.height()-GRID_CELL_SIZE self.sprites = Sprites(self.canvas) self.slides = [] self.stators = [] @@ -145,10 +144,8 @@ class SlideRule(): self.last = None self.dragpos = 0 - def _expose_cb(self, win, event): - ''' Callback to handle window expose events ''' - self.do_expose_event(event) - return True + def __draw_cb(self, canvas, cr): + self.sprites.redraw_sprites(cr=cr) # Handle the expose-event by drawing def do_expose_event(self, event): @@ -165,11 +162,11 @@ class SlideRule(): self.sprites.redraw_sprites(cr=cr) def _destroy_cb(self, win, event): - gtk.main_quit() + Gtk.main_quit() def _keypress_cb(self, area, event): """ Keypress: moving the slides with the arrow keys """ - k = gtk.gdk.keyval_name(event.keyval) + k = Gdk.keyval_name(event.keyval) if self.parent is None: return if k in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'period', |