[omega] 1.21.0 Public Beta 1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,29 +1,14 @@
 ---
 name: Bug report
-about: Upsilon is not working like it should? Let us know!
+about: Omega is not working like it should? Let us know!
 title: ''
-labels: 'Status: Triage, Type: Bug'
+labels: Bug, Triage
 assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+#### Describe the bug
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Device (please complete the following information):**
- - The device on which you're running Upsilon (computer, n0110, n0100, etc...)
- - Upsilon Version: [go to settings > about > Upsilon Version and type the version here]
- - Upsilon commit: [settings > about > click one time on epsilon version]
+#### Environment
+ - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +1,10 @@
 ---
 name: Feature request
-about: Suggest an idea for Upsilon
+about: Suggest an idea for an improvement of Omega
 title: ''
-labels: 'Status: Triage, Type: Feature'
+labels: Feature, Triage
 assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+#### What I want to see in the next version of Omega

.github/ISSUE_TEMPLATE/other.md

@@ -1,8 +1,8 @@
 ---
 name: Other
-about: A question? A problem? …
+about: A question? A problem? ...
 title: ''
-labels: 'Status: Triage'
+labels: Triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/problems-during-installation.md

@@ -1,19 +1,19 @@
 ---
 name: Problems during installation
-about: Need help to install Upsilon?
+about: Need help to install Omega?
 title: ''
-labels: 'Status: Triage, Type: Installation issue'
+labels: Installation issue, Triage
 assignees: ''
 
 ---
 
-**Describe the problem**
+#### Describe the problem
 
 
-**Logs**
+#### Logs
 ```
 Copy/paste the logs here (If you have some)
 ```
 
-**Environment**
- - Upsilon Version: {go to settings > about > Upsilon Version and type the version here}
+#### Environment
+ - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/workflows/ci-workflow.yml

@@ -1,7 +1,6 @@
 name: Continuous integration
 #on: [pull_request, push]
 on:
-  push:
   pull_request:
   workflow_dispatch:
     inputs:
@@ -13,54 +12,33 @@ on:
         description: 'Run macOS tests'
         required: true
         default: 'no'
-      trigger3DS:
-        description: 'Run 3DS tests'
-        required: true
-        default: 'no'
-jobs:
-  nintendo_3ds:
-    if: github.event.inputs.trigger3DS == 'yes'
-    runs-on: ubuntu-latest
-    steps:
-      - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
-      - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
-      - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
-      - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
-      - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
-      - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
 
-      - uses: actions/checkout@v1
-        with:
-          submodules: true
-      - run: make -j2 PLATFORM=simulator TARGET=3ds
-      - run: make -j2 PLATFORM=simulator TARGET=3ds epsilon.cia
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-3ds.3dsx
-          path: output/release/simulator/3ds/epsilon.3dsx
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-3ds.cia
-          path: output/release/simulator/3ds/epsilon.cia
+jobs:
+  # nintendo_3ds:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
+  #     - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
+  #     - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
+  #     - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
+  #     - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
+  #     - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
+
+  #     - uses: actions/checkout@v1
+  #       with:
+  #         submodules: true
+  #     - run: make -j2 PLATFORM=simulator TARGET=3ds
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: epsilon-3ds.3dsx
+  #         path: output/release/simulator/3ds/epsilon.3dsx
   android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator TARGET=android
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-file'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'output/release/simulator/android/epsilon.apk'
-          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
-          parent: false
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-android.apk
@@ -70,9 +48,9 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: mkdir final-output
       - run: make -j2 MODEL=n0100 EPSILON_I18N=en output/release/device/n0100/epsilon.onboarding.two_binaries
       - run: mv output/release/device/n0100/epsilon.onboarding.internal.bin final-output/epsilon.onboarding.internal.en.bin
@@ -102,18 +80,6 @@ jobs:
       - run: mv output/release/device/n0100/flasher.light.bin final-output/flasher.light.bin
       - run: find final-output/ -type f -exec bash -c "shasum -a 256 -b {} > {}.sha256" \;
       - run: tar cvfz binpack-n0100.tgz final-output/*
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon'}}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-directory'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon'}}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'final-output/'
-          destination: 'upsilon-binfiles.appspot.com/dev/n100/'
-          parent: false
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-binpack-n0100.tgz
@@ -123,58 +89,23 @@ jobs:
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 epsilon.dfu
       - run: make -j2 epsilon.onboarding.dfu
       - run: make -j2 epsilon.onboarding.update.dfu
       - run: make -j2 epsilon.onboarding.beta.dfu
       - run: make -j2 flasher.light.dfu
       - run: make -j2 flasher.verbose.dfu
-      # We  don't need bench as it is used only in factory
-      # - run: make -j2 bench.ram.dfu
-      # - run: make -j2 bench.flash.dfu
+      - run: make -j2 bench.ram.dfu
+      - run: make -j2 bench.flash.dfu
       - run: make -j2 binpack
       - run: cp output/release/device/n0110/binpack-n0110-`git rev-parse HEAD | head -c 7`.tgz output/release/device/n0110/binpack-n0110.tgz
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-directory'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'output/release/device/n0110/binpack/'
-          destination: 'upsilon-binfiles.appspot.com/dev/n110/'
-          parent: false
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-binpack-n0110.tgz
           path: output/release/device/n0110/binpack-n0110.tgz
-  bootloader:
-    runs-on: ubuntu-latest
-    steps:
-      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-      - run: make -j2 bootloader.dfu
-      - run: make MODEL=bootloader -j2 epsilon.A.dfu epsilon.B.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.A.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.B.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.update.A.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.update.B.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.beta.A.dfu
-      - run: make MODEL=bootloader -j2 epsilon.onboarding.beta.B.dfu
-      - run: make MODEL=bootloader -j2 binpack
-      - run: cp output/release/device/bootloader/binpack-bootloader-`git rev-parse HEAD | head -c 7`.tgz output/release/device/bootloader/binpack-bootloader.tgz
-      - uses: actions/upload-artifact@master
-        with:
-          name: epsilon-binpack-bootloader.tgz
-          path: output/release/device/bootloader/binpack-bootloader.tgz
   windows:
     runs-on: windows-latest
     defaults:
@@ -183,24 +114,11 @@ jobs:
     steps:
       - uses: msys2/setup-msys2@v2
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator test.exe
-      - run: cmd /c output\release\simulator\windows\test.exe --headless
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-file'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'output/release/simulator/windows/epsilon.exe'
-          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
-          parent: false
+      - run: make -j2 PLATFORM=simulator epsilon.official.exe
+      - run: make -j2 PLATFORM=simulator test.headless.exe
+      - run: output/release/simulator/windows/test.headless.exe
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-windows.exe
@@ -210,25 +128,11 @@ jobs:
     steps:
       - uses: numworks/setup-emscripten@v1
         with:
-          sdk: 1.40.1
-      - uses: actions/checkout@v2
+          sdk: latest-upstream
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator TARGET=web
-      - run: make -j2 PLATFORM=simulator TARGET=web test.js
-      - run: node output/release/simulator/web/test.js --headless
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-file'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'output/release/simulator/web/epsilon.js'
-          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
-          parent: false
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-web.zip
@@ -237,39 +141,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
         with:
-          submodules: 'recursive'
+          submodules: true
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator test.bin
-      - run: output/release/simulator/linux/test.bin --headless
-      - id: 'auth'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/auth@v0'
-        with:
-          credentials_json: '${{secrets.GOOGLE_CREDENTIALS}}'
-      - id: 'upload-file'
-        if: ${{ github.event_name == 'push' && github.ref_name == 'upsilon-dev' && github.repository == 'UpsilonNumworks/Upsilon' }}
-        uses: 'google-github-actions/upload-cloud-storage@v0'
-        with:
-          path: 'output/release/simulator/linux/epsilon.bin'
-          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
-          parent: false
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-linux.bin
           path: output/release/simulator/linux/epsilon.bin
+      - run: make -j2 PLATFORM=simulator test.headless.bin
   macos:
     if: github.event.inputs.triggerMacos == 'yes'
     runs-on: macOS-latest
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator
-      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.bin
-      - run: output/release/simulator/macos/x86_64/test.bin --headless
+      - run: make -j2 PLATFORM=simulator epsilon.official.app
+      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.headless.bin
+      - run: output/release/simulator/macos/x86_64/test.headless.bin
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-macos.zip
@@ -280,9 +170,9 @@ jobs:
     steps:
       - run: brew install numworks/tap/epsilon-sdk
       - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 epsilon.official.ipa
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 test.ipa
       - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator
       - uses: actions/upload-artifact@master
         with:

.github/workflows/metric-workflow.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Add comment
         uses: actions/github-script@v3.0.0
         with:
+          github-token: ${{ secrets.OMEGA_ROBOT_TOKEN }}
           script: |
             await github.issues.createComment({
               owner: context.repo.owner,

.gitignore

@@ -6,5 +6,3 @@ epsilon.map
 .vscode
 .DS_Store
 .gradle
-.idea/
-.vs

.gitlab-ci.yml

@@ -0,0 +1,26 @@
+image: gcc
+
+stages:
+  - build
+
+job:build:
+    stage: build
+    before_script:
+        - "echo 'deb http://httpredir.debian.org/debian jessie main contrib \n deb-src http://httpredir.debian.org/debian jessie main contrib \n deb http://httpredir.debian.org/debian jessie-updates main contrib \n deb-src http://httpredir.debian.org/debian jessie-updates main contrib \n deb http://security.debian.org/ jessie/updates main contrib \n deb-src http://security.debian.org/ jessie/updates main contrib ' > /etc/apt/source.list"
+        - "apt-get update"
+        - "apt -y install build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config fltk1.3-dev gcc-arm-none-eabi nodejs npm"
+        - "git submodule update --init --recursive"
+        - "git clone https://github.com/RedGl0w/omega-auto-increment"
+        - "cd omega-auto-increment"
+        - "npm i request exeq"
+        - "PrivateToken=$PrivateToken node index.js"
+        - "cd .."
+    script:
+        - make clean
+        - make MODEL=n0100 epsilon.bin
+    artifacts:
+        paths:
+            - output/release/device/n0100/epsilon.bin
+            - omega-auto-increment/version.txt
+        name: artifact:build:simulator
+        

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "apps/rpn"]
 	path = apps/rpn
-	url = https://github.com/Lauryy06/Upsilon-RPN.git
-[submodule "apps/atomic"]
-	path = apps/atomic
-	url = https://github.com/Lauryy06/atomic
+	url = https://github.com/Omega-Numworks/Omega-RPN.git
+[submodule "apps/atom"]
+	path = apps/atom
+	url = https://github.com/Omega-Numworks/Omega-Atom.git

Makefile

@@ -12,43 +12,16 @@ include build/toolchain.$(TOOLCHAIN).mak
 include build/variants.mak
 include build/helpers.mk
 
-ifeq (${MODEL}, n0100)
-  ifeq ($(filter reader,$(apps_list)),)
-  	$(warning reader app included, removing it on n0100. )
-  	EPSILON_APPS := $(filter-out reader,$(EPSILON_APPS))
-  endif
-  ifneq ($(words $(EPSILON_I18N)), 1)
-  	$(warning Only use 1 language on n0100, defaulting to en. )
-  	EPSILON_I18N := en
-  endif
-  ifeq ($(INCLUDE_ULAB), 1)
-    $(warning Removing uLab on n0100. )
-    INCLUDE_ULAB := 0
-  endif
-endif
-
-ifeq ($(filter reader,$(apps_list)),)
-  HAS_READER := 1
-endif
-
 ifeq (${MODEL}, n0110)
   apps_list = ${EPSILON_APPS}
 else
-  ifeq (${MODEL},bootloader)
-    apps_list = ${EPSILON_APPS}
-  else
-    apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
-  endif
+  apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
 endif
 
 ifdef FORCE_EXTERNAL
   apps_list = ${EPSILON_APPS}
 endif
 
-ifeq ($(INCLUDE_ULAB), 1)
-  SFLAGS += -DINCLUDE_ULAB
-endif
-
 ifdef HOME_DISPLAY_EXTERNALS
   ifneq ($(filter external,$(apps_list)),)
     SFLAGS += -DHOME_DISPLAY_EXTERNALS
@@ -109,7 +82,7 @@ print-%:
 	@echo $*\'s origin is $(origin $*)
 
 # Since we're building out-of-tree, we need to make sure the output directories
-# are created, otherwise the recipes will fail (e.g. gcc will fail to create
+# are created, otherwise the receipes will fail (e.g. gcc will fail to create
 # "output/foo/bar.o" because the directory "output/foo" doesn't exist).
 # We need to mark those directories as precious, otherwise Make will try to get
 # rid of them upon completion (and fail, since those folders won't be empty).
@@ -141,7 +114,6 @@ include poincare/Makefile
 include python/Makefile
 include escher/Makefile
 # Executable Makefiles
-include bootloader/Makefile
 include apps/Makefile
 include build/struct_layout/Makefile
 include build/scenario/Makefile
@@ -214,13 +186,3 @@ clean_run: cleanandcompile
 .PHONY: run
 run: compile
 	${MAKE} start
-
-.PHONY: translations
-translations:
-	@echo "TRANSLATIONS"
-	$(Q) ${PYTHON} build/utilities/translate.py
-
-.PHONY: translations_clean
-translations_clean:
-	@echo "TRANSLATIONS CLEAN"
-	$(Q) ${PYTHON} build/utilities/translations_clean.py

README.fr.md

@@ -1,388 +0,0 @@
-<p align="center"><img src="https://github.com/Laporte12974/UpsilonDesign/blob/89a15953ae128aef8aa7d066dcaaf8d5c70f02a5/UPSILogo.png" /></p>
-
-<p align="center">
-  <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
-  <a href="https://github.com/Lauryy06/Upsilon/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Lauryy06/Upsilon.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
-  <br/>
-  <a href="https://discord.gg/sbGvhWETAd"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
-</p>
-
-> Don't understand french ? speak english ? here's the [english README](./README.md) !
-
-## À propos
-
-Upsilon est un fork d'Omega, un fork d'Epsilon, l'OS de Numworks tournant sur les calculatrices du même nom, qui apporte beaucoup de fonctionnalités en plus, mais qui fut archivé et fermé pour des raisons légales après un changement de politique de Numworks. Upsilon est fait pour ceux qui aimeraient voir un futur pour les OS créées par les utilisateurs pour Numworks, même après l'arrèt du projet initial.
-
-### Quelques fonctionnalités supplémentaires
-- Un module python kandinsky amélioré
-- Un support pour fonds d'écrans personnalisés
-- Des applications externes
-- Un thème Upsilon
-- La surcharge des opérateurs en python
-- Un tableau périodique légèrement amélioré
-- L'utilisation possible du signe "=" dans les calculs
-- *Ainsi que tout ce qui a été ajouté sur Omega, et bien plus...* [Changelogs complets d'Omega](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Fonctionnalités principales d'Omega & captures d'écran](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
-
-## Installation
-
-### Site web
-Rendez-vous sur le [site d'Upsilon](https://getupsilon.web.app/) à la section "Installer".
-Si votre calculatrice est reconnue, qu'elle contient une version d'Epsilon inférieure à 16 et que votre navigateur accepte WebUSB, la page vous proposera d'installer Upsilon.  
-Ne débranchez votre calculatrice qu'une fois l'installation terminée.
-
-### Manuelle
-
- *Vous pouvez vous référer à ce  [site internet](https://www.numworks.com/resources/engineering/software/build/)pour la première étape si vous avez des erreurs*
-
-
-
-### 1. Installation du SDK
-
-<br>
-
-<details>
-
-<summary><b>1.1 Linux</b></summary>
-
-<br>
-
-
-<details>
-
-<summary>Debian ou Ubuntu</summary>
-
-<br>
-
-Il suffit juste d'installer les dépendances en tapant ces commandes dans un Terminal en mode super-utilisateur.
-
-```bash
-apt-get install build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi
-```
-
-C'est fait! Vous pouvez aller à l'étape 2.
-
-<br>
-
-</details>
-
-<details>
-
-<summary>Fedora</summary>
-
-<br>
-
-Installez tout d'abord des outils de développement.
-
-```bash
-dnf install make automake gcc gcc-c++ kernel-devel
-```
-
-Puis les pquets requis:
-
-```bash
-dnf install git ImageMagick libX11-devel libXext-devel freetype-devel libpng-devel libjpeg-devel pkg-config
-```
-
-Et enfin la version pour ARM de GCC:
-
-```bash
-dnf install arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++
-```
-
-<br>
-
-</details>
-
-</details>
-
-<details>
-
-<summary><b>1.2 Mac</b></summary>
-
-<br>
-
-Il est recommandé d'utiliser [Homebrew](https://brew.sh/). Une fois intsallé, utilisez:
-```bash
-brew install numworks/tap/epsilon-sdk
-```
-Et toutes les dependances seront installées.
-
-<br>
-
-Vous pouvez aller à l'étape 2.
-
-<br>
-
-</details>
-
-<details>
-
-<summary><b>1.3 Windows</b></summary>
-
-[Git](http://git-scm.com) doit être installé.
-
-<br>
-
-<details>
-
-<summary>Avec Msys2/Mingw (Supportés par Numwoks bien qu'il y ait beaucoup de bugs)</summary>
-
-L'environnement de compilation [Msys2](https://www.msys2.org/) est recommandé par Numworks pour obtenir la plupart des outils requis facilement. C'est ici que vous allez copier-colletoutes lecommandes de ce tutoriel. Une fois installé, copier-coller ces deux commandes dans le terminal:
-
-```bash
-pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config mingw-w64-x86_64-libusb git make python
-echo "export PATH=/mingw64/bin:$PATH" >> .bashrc
-```
-
-Ensuite, vous devrez installer [GCC toolchain for ARM](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads). Quand il vouest demandde choisir u dossier d'installation, choisissez `C:\msys64\home\User\gcc-arm\`. Il vous faudra ensuite ajouter ce dossier à votre $PATH. Tapez juste:
-
-```bash
-echo "export PATH=$PATH:$HOME/gcc-arm/bin" >> .bashrc
-```
-Redémarrez votre terminal et vous pouvez aller à l'étape 2!
-
-</details>
-
-<details>
-
-<summary>Avec WSL 2</summary>
-
-WSL est un système qui virtualise un environnement GNU/Linux dans Windows.
-
-Votre version de windows doit être >= 1903.
-
-#### Installation de WSL
-
-1. Apuyez simulatanément sur les touches "windows" et "x" puis cliquez sur "Powershell administrateur". Entrez ensuite ceci dans la nouvelle fenêtre:
-```powershell
-dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux all /norestart
-```
-Cette commande active WSL
-
-```powershell
-dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart
-```
-Cette commande permet d'autoriser le démarrage des machines signées par Microsoft.
-
-2. Redémarrez votre ordinateur.
-
-3. Téléchargez ce fichier [this file](https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi) et suivez les instructions d'installation.
-
-4. Ouvrez votre fenêtre powershell comme avant et tapez:
-```powershell
-wsl --set-default-version 2
-```
-5. téléchargez [Ubuntu](https://www.microsoft.com/store/apps/9n6svws3rx71) depuis le Microsoft store. Vous pouvez aussi installer [Debian](https://www.microsoft.com/store/productI9MSVKQC78PK6).
-
-WSL est maintenant installé.
-
-### Installation d'usbipd pour connecter la calculatrice à WSL (facultatif)
-Pour connecter la calculatrice, il faut installer cet [outil](https://github.com/dorssel/usbipd-win/releases/download/v1.3.0/usbipd-win_1.3.0.msi). Il permet de connecter deperiphériques USpar internet.Suivez les instructions pour installer.
-
-#### Ubuntu
-1. Dans un terminal WSL Ubuntu, tapez:
-```bash
-sudo apt install linux-tools-5.4.0-77-generic hwdata
-```
-2. Editez /etc/sudoers pour que l'on puisse utiliser la commande usbip. Sur Ubutu, cele est fait de cette manière:
-```bash
-sudo visudo
-```
-3. Ajoutez `/usr/lib/linux-tools/5.4.0-77-generic` au début du secure_path. Après édition, la ligne devrait ressembler à:
-`Defaults secure_path="/usr/lib/linux-tools/5.4.0-77-generic:/usr/local/sbin:..."`
-
-#### Debian
-1.Si vous utiliser Debian, utilisez cette commande:
-```bash
-sudo apt install usbip hwdata usbutils
-```
-
-### Pour connecter la calculatrice à WSL
-1. Ouvrez encore un powershell en mode administrateur et tapez:
-```powershell
-  usbipd wsl list
-```
-Ceci va lister les périphériques USB connectés à l'ordinateur. Reagrdez le BUSID de votre "Numworks Calculator".
-
-2. Maintenant, lancez cette commande en remplçant <BUSID> par celui de votre caculatrice:
-```powershell
-usbipd wsl attach --busid <BUSID>
-```
-
-Le mot de passe de votre machine WSL vous sera demandé.
-
-Vous pouvez aller à l'étape 2.
-
-</details>
-
-</details>
-
-<br>
-
-### 2. Récupérer le code source
-
-
-Le code source est disponible dans une repository git. Récupérez-le de cette manière:
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout upsilon-dev
-```
-<br>
-
-
-### 3. Choisissez le système à compiler
-
-
-<details>
-
-<summary><b>Model n0100</b></summary>
-
-(note: vous pouvez changer l'argument `EPSILON_I18N=en` avec `fr`, `nl`, `pt`, `it`, `de`, `es` or `hu`).
-
-```bash
-make MODEL=n0100 clean
-make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Votre nom, maximum 15 caractères}" -j4
-```
-
-Maintenant, lancez soit:
-
-```bash
-make MODEL=n0100 epsilon_flash
-```
-pour directement flasher la calculatrice après avoir appuyé simultanément sur `reset` et `6` et avoir branché la calculatrice à l'ordinateur.
-
-<br>
-
-soit:
-
-```bash
-make MODEL=n0100 OMEGA_USERNAME="" binpack -j4
-```
-pour compiler les binpacks que vous pouvez distribuer et flasher depuis le [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0100/).
-
-</details>
-
-<details>
-
-<summary><b>Model n0110</b></summary>
-
-```bash
-make clean
-make OMEGA_USERNAME="{Votre nom, maximum 15 caractères}" -j4
-```
-
-Maintenant, lancez soit:
-
-```bash
-make epsilon_flash
-```
-pour directement flasher la calculatrice après avoir appuyé simultanément sur `reset` et `6` et avoir branché la calculatrice à l'ordinateur.
-
-<br>
-
-soit:
-
-```bash
-make OMEGA_USERNAME="" binpack -j4
-```
-pour compiler les binpacks que vous pouvez distribuer et flasher depuis le [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0100/).
-
-</details>
-
-<details>
-
-<summary><b>Simulateur web</b></summary>
-
-D'abord, installez emsdk :
-
-```bash
-git clone https://github.com/emscripten-core/emsdk.git
-cd emsdk
-./emsdk install latest-fastcomp
-./emsdk activate latest-fastcomp
-source emsdk_env.sh
-```
-
-Puis, compilez Upsilon :
-
-```bash
-make clean
-make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Votre nom, maximum 15 caractères}" -j4
-```
-
-Le simulateur se trouve dans `output/release/simulator/web/simulator.zip`
-
-
-</details>
-
-<details>
-
-<summary><b>Simulateur pour 3DS</b></summary>
-
-Il vous faut devkitPro et devkitARM installés et dans votre path (les instructions sont [ici](https://devkitpro.org/wiki/Getting_Started))
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout --recursive upsilon-dev
-make PLATFORM=simulator TARGET=3ds -j
-```
-Vous pouvez ensuite mettre epsilon.3dsx sur une carte SDpour le lancer depuis le HBC ou utilisez 3dslink pour le lancer via le réseau:
-
-```bash
-3dslink output/release/simulator/3ds/epsilon.3dsx -a <3DS' IP ADDRESS>
-```
-
-</details>
-
-<br>
-
-Important: n'oubliez pas l'argument `--recursive` Parce qu'Upsilon dépend de submodules.
-Aussi, vous pouvez changer le nombre de processus de compilation en parallèles en changeant le nombre après l'argument `-j`.
-N'oubliez pas de mettre votre nom à la place `{Votre nom, maximum 15 caractères}`.Si vous n'en voulez pas, enlevez l'argument `OMEGA_USERNAME`.
-
-Si vous avez besoin d'aide, n'hésitez pas à rejoindre notre serveur discord : https://discord.gg/Q9buEMduXG
-
-<a href="https://discord.gg/Q9buEMduXG"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
----
-
-## Liens utiles
-* [Upsilon external (pour installer des applications supplémentaires et des fonds d'écran)](https://lauryy06.github.io/Upsilon-External/)
-* [Documentation d'ulab](https://micropython-ulab.readthedocs.io/en/latest/)
-
-## Contribution
-
-Pour contribuer, merci de lire le [Wiki d'Omega](https://github.com/Omega-Numworks/Omega/wiki/Contributing), les mêmes règles s'appliquent ici.
-
-## Les autres projets
-
-Les anciens projets d'Omega, avant sa fermeture, qui ont été utilisés pour ce projet
-
-* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
-* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
-* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
-* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
-* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
-* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
-* [External Apps](https://github.com/Omega-Numworks/External-Apps)
-
-## À propos d'Epsilon
-
-Upsilon est un fork d'Omega, visant a continuer le projet des OS utilisateurs pour Numworks
-
-Omega est un fork d'Epsilon, un système d'exploitation performant pour calculatrices graphiques. Il inclut huit applications pour les mathématiques de lycée et d'études supérieurs
-
-Vous pouvez essayer Epsilon depuis votre navigateur sur le [simulateur en ligne](https://www.numworks.com/simulator/).
-
-## Licence
-
-NumWorks est une marque déposée de NumWorks SAS, 24 Rue Godot de Mauroy, 75009 Paris, France.
-Nintendo est Nintendo 3DS sont des marques déposées de Nintendo of America Inc, 4600 150th Ave NE, Redmond, WA 98052, Etats-Unis.
-NumWorks SAS et Nintendo of America Inc ne sont en aucun cas associés avec ce projet.
-
-* NumWorks Epsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Omega est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Upsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

README.md

@@ -1,305 +1,97 @@
-<p align="center"><img src="https://github.com/Laporte12974/UpsilonDesign/blob/89a15953ae128aef8aa7d066dcaaf8d5c70f02a5/UPSILogo.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/106272451-60b00500-6231-11eb-8521-09fe93b3b1f4.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
-  <a href="https://github.com/Lauryy06/Upsilon/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Lauryy06/Upsilon.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
+  <a href="https://github.com/Omega-Numworks/Omega/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Omega-Numworks/Omega.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
   <br/>
-  <a href="https://discord.gg/hnEqPzAJzn"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
+  <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
 </p>
 
-> Vous ne comprenez pas l'anglais ? Vous êtes francophone ? Regardez le [*LISEZ-MOI* français](./README.fr.md) !
-
 ## About
 
-Upsilon is a fork of Omega, an user-made OS that runs on the Numworks calculator, which brings many features to it, but was discontinued because of a policy change from Numworks. Upsilon is for the people who want to see a future for user-made OSes for Numworks, even after the closure and archiving of Omega.
-
-
-
+Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!). [Try it online](https://getomega.web.app/simulator).
 
 ### Some new features
-- Enhancements for the Kandinsky python module
-- Support for wallpapers
-- External apps
-- A custom theme
-- Operator overload for python
-- Improvements for the Periodic table application
-- *And everything that has been added to Omega before its termination!* [See Omega's changelog here](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Main Omega features + screenshots](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
-
-<br>
+- Adding symbolic calculation back into the calculator
+- An app for RPN
+- Exernal apps
+- A theme engine
+- New python features (os module, open method...)
+- A periodic table app + all of the molar masses for the elements in the toolbox
+- *And much more to discover...* [Complete changelog](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Main new features + screenshots](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
 
 ## Installation
 
-### Installer
+### Automatic
 
-Go to the [Upsilon website](https://getupsilon.web.app/) to the "Install" section.
-If your calculator is recognized, contains a version of Epsilon lower than 16 and your browser accepts WebUSB, the page will suggest you to install Upsilon.
-Do not disconnect your calculator until the installation is complete.
+You can install Omega automatically on our website [here](https://getomega.web.app/) in the "install" page.
+
+<a href="https://getomega.web.app"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86352956-e9000480-bc66-11ea-82b7-79fd7e56fa27.png" /></p></a>
 
 ### Manual
 
- *You can refer to this [website](https://www.numworks.com/resources/engineering/software/build/) for the first step if you get errors.*
-
-
-
-### 1. Install SDK
-
-<br>
+First of all, follow **step 1** [here](https://www.numworks.com/resources/engineering/software/build/). Then:
 
 <details>
-
-<summary><b>1.1 Linux</b></summary>
-
-<br>
-
-<details>
-
-<summary>Debian or Ubuntu</summary>
-
-<br>
-
-You just have to install dependencies by running these command with superuser privileges in a Terminal:
-
-```bash
-apt-get install build-essential git imagemagick libx11-dev libxext-dev libfreetype6-dev libpng-dev libjpeg-dev pkg-config gcc-arm-none-eabi binutils-arm-none-eabi
-```
-
-And there you can go to step 2!
-
-<br>
-
-</details>
-
-<details>
-
-<summary>Fedora</summary>
-
-<br>
-
-To install basics dev tools:
-
-```bash
-dnf install make automake gcc gcc-c++ kernel-devel
-```
-
-And then install required packages.
-
-```bash
-install git ImageMagick libX11-devel libXext-devel freetype-devel libpng-devel libjpeg-devel pkg-config
-```
-
-Then, install GCC cross compiler for ARM.
-
-```bash
-        dnf install arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++
-```
-
-<br>
-
-</details>
-
-<br>
-
-</details>
-
-<details>
-
-<summary><b>1.2 Mac</b></summary>
-
-<br>
-
-It's recommended to use [Homebrew](https://brew.sh/). Once it's installed, just run:
-
-```bash
-brew install numworks/tap/epsilon-sdk
-```
-
-and it will install all dependencies.
-
-<br>
-
-And there you can go to step 2!
-
-<br>
-
-</details>
-
-<details>
-
-<summary><b>1.3 Windows</b></summary>
-
-<br>
-
-<details>
-
-<summary>With Msys2/Mingw (officialized by numworks but with a lot of bugs)</summary>
-
-[Msys2](https://www.msys2.org/) environment is recommended by Numworks to get most of the required tools on Windows easily. It's where you'll paste all the commands of this tutorial. Once it'sinstalled, paste these commands into the Msys2 terminal.
-
-```bash
-pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config mingw-w64-x86_64-libusb git make python
-echo "export PATH=/mingw64/bin:$PATH" >> .bashrc
-```
-
-Next, you'll need to install the [GCC toolchain for ARM](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads). When prompted for aninstall location, choose `C:\msys64\home\User\gcc-arm\`. You'll then need to add this folder to your $PATH. Just enter:
-
-```bash
-echo "export PATH=$PATH:$HOME/gcc-arm/bin" >> .bashrc
-```
-Just restart terminal and you can go to step 2!
-
-</details>
-
-<details>
-
-<summary>With WSL 2</summary>
-
-You need a windows version >= 1903.
-
-#### WSL Installation
-
-1. Use simultaneously win + X keys and then click on "admin powershell".
-```powershell
-dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux all /norestart
-```
-This command activate WSL functionalities.
-
-```powershell
-dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart
-```
-This one allows virtual machines developed by Microsoft.
-
-2. Restart your computer.
-
-3. Download [this file](https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi) and follow instructions.
-
-4. Now open powershell admin like before and type:
-```powershell
-wsl --set-default-version 2
-        ```
-5. Download [Ubuntu](https://www.microsoft.com/store/apps/9n6svws3rx71) from Microsoft store.
-
-WSL is now installed.
-
-### Usbipd installation to connect your calculator
-If you want to connect to the calculator, you have to connect to install this [tool](https://github.com/dorssel/usbipd-win/releases/download/v1.3.0/usbipd-win_1.3.0.msi). This will allow you toconnect WSL to the calculator through internet. Follow the on screen information to install.
-#### Ubuntu
-1. In a WSL Ubuntu command prompt, type:
-```bash
-sudo apt install linux-tools-5.4.0-77-generic hwdata
-```
-2. Edit /etc/sudoers so that root can find the usbip command. On Ubuntu, run this command.
-```bash
-sudo visudo
-```
-3. Add `/usr/lib/linux-tools/5.4.0-77-generic` to the beginning of secure_path. After editing, the line should look similar to this.
-`Defaults secure_path="/usr/lib/linux-tools/5.4.0-77-generic:/usr/local/sbin:..."`
-
-#### Debian
-
-1. If you use debian for your WSL distro, use this command instead:
-```bash
-sudo apt install usbip hwdata usbutils
-```
-And that's all for installation and set up.
-
-### To connect your calculator
-1. Open an Admin powershell and type:
-```powershell
-  usbipd wsl list
-```
-This will list your usb devices connected. Look at the BUSID column and remember the one for your calculator (it should be called "Numworks Calculator").
-2. Now run this command replacing <BUSID> by your calculator's usb port id:
-```powershell
-usbipd wsl attach --busid <BUSID>
-```
-It will ask you to type your wsl's password and will connect your calculator to WSL.
-
-You can now go to step 2!
-
-</details>
-
-</details>
-
-<br>
-
-
-### 2. Set up repo
-
-
-Clone repo and use 'upsilon-dev' branch by pasting these two commands:
-
-```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout upsilon-dev
-```
-<br>
-
-
-### 3. Choose the target
-
-
-<details>
-
-<summary><b>Model n0100</b></summary>
+  <summary><b>Model n0100</b></summary>
 
 (note: you can change the `EPSILON_I18N=en` flag to `fr`, `nl`, `pt`, `it`, `de`, `es` or `hu`).
 
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make MODEL=n0100 clean
 make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Your name, max 15 characters}" -j4
-```
-
-Now, run either:
-
-```bash
 make MODEL=n0100 epsilon_flash
 ```
-to directly flash the calculator after pressing simultaneously `reset` and `6` buttons and plugging in.
-
-<br>
-
-or:
-
-```bash
-make MODEL=n0100 OMEGA_USERNAME="" binpack -j4
-```
-to make binpack which you can flash to the calculator from [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0100/). Binpacks are a great way to share a custom build of Upsilonto friends.
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+  
 </details>
 
 <details>
-
-<summary><b>Model n0110</b></summary>
-
+  <summary><b>Model n0110</b></summary>
 
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make clean
 make OMEGA_USERNAME="{Your name, max 15 characters}" -j4
-```
-
-Now, run either:
-
-```bash
 make epsilon_flash
 ```
-to directly flash the calculator after pressing simultaneously `reset` and `6` buttons and plugging in.
-
-<br>
-
-or:
-
-```bash
-make OMEGA_USERNAME="" binpack -j4
-```
-to make binpack witch you can flash to the calculator from [Ti-planet's webDFU](https://ti-planet.github.io/webdfu_numworks/n0110/). Binpacks are a great way to share a custom build of Upsilon to friends.
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+  
 </details>
 
 <details>
+  <summary><b>Bin files</b></summary>
+  
+These can be used to distribute Omega (so that it can be flashed by anyone with [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
 
-<summary><b>Web simulator</b></summary>
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make MODEL=n0100 OMEGA_USERNAME="" -j8
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
+make OMEGA_USERNAME="" -j8
+make OMEGA_USERNAME="" binpack -j8
+```
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+  
+</details>
+
+<details>
+  <summary><b>Web simulator</b></summary>
+  
 First, install emsdk :
 
 ```bash
@@ -310,27 +102,32 @@ cd emsdk
 source emsdk_env.sh
 ```
 
-Then, compile Upsilon :
+Then, compile Omega :
 
 ```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
 make clean
 make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Your name, max 15 characters}" -j4
 ```
 
 The simulator is now in `output/release/simulator/web/simulator.zip`
 
+Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
+Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
+
 </details>
 
 <details>
-
-<summary><b>3DS Simulator</b></summary>
-
+  <summary><b>3DS Simulator</b></summary>
+  
 You need devkitPro and devkitARM installed and in your path (instructions [here](https://devkitpro.org/wiki/Getting_Started))
 
 ```bash
-git clone --recursive https://github.com/Lauryy06/Upsilon.git
-cd Upsilon
-git checkout --recursive upsilon-dev
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout --recursive omega-dev
 make PLATFORM=simulator TARGET=3ds -j
 ```
 You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink to launch it over the network:
@@ -341,34 +138,21 @@ You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink
 
 </details>
 
-<br>
+If you need help, you can join our Discord server here : https://discord.gg/X2TWhh9
 
-Important: Don't forget the `--recursive` tag, because Upsilon relies on submodules.
-Also, you can change the number of processes that run in parallel during the build by changing the value of the `-j` flag.
-Don't forget to put your pseudo instead of `{your pseudo, max 15 char}`. If you don't want one, just remove the `OMEGA_USERNAME=""` argument.
-
-<br>
-
-If you need help, you can join our Discord server here : https://discord.gg/NFvzdCBTQn
-
-<a href="https://discord.gg/NFvzdCBTQn"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
+<a href="https://discord.gg/X2TWhh9"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
 ---
-## Useful links
-* [Upsilon external (to install additional apps and wallpapers)](https://lauryy06.github.io/Upsilon-External/)
-* [Ulab documentation](https://micropython-ulab.readthedocs.io/en/latest/)
 
 ## Contributing
 
-To contribute, please refer to [Omega's Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing), the same rules apply here.
+To contribute, please refer to the [Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing)
 
 ## Related repositories
 
-Here are the main links toward Omega's different websites and repositories, that have been used for the creation of Upsilon.
-
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
+* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
 * [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
@@ -376,8 +160,6 @@ Here are the main links toward Omega's different websites and repositories, that
 
 ## About Epsilon
 
-Upsilon is a fork of Omega, after the project's discontinuation.
-
 Omega is a fork of Epsilon, a high-performance graphing calculator operating system. It includes eight apps that cover the high school mathematics curriculum.
 
 You can try Epsilon straight from your browser in the [online simulator](https://www.numworks.com/simulator/).
@@ -390,4 +172,3 @@ NumWorks SAS and Nintendo of America Inc aren't associated in any shape or form
 
 * NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
 * Omega is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
-* Upsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

apps/Makefile

@@ -11,25 +11,6 @@ apps =
 # (path to the apps header).
 $(foreach i,${apps_list},${eval include apps/$(i)/Makefile})
 
-app_equals = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
-# We list all the apps that are missing
-apps_missing = $(foreach i, ${apps_list}, $(if $(call app_equals, apps/$(i)/Makefile, $(wildcard apps/$(i)/Makefile)),, $(i) ) )
-
-# If the two doesn't match, we got an error.
-ifneq ($(strip $(apps_missing)),)
-    miss_modules = 0
-
-    # Check if the missing apps are one that are supposed to be submodules
-    $(foreach i, $(SUBMODULES_APPS), $(if $(call app_equals, $(filter $(i), $(apps_missing)), $(i)), $(eval miss_modules=1)))
-
-    ifeq ($(miss_modules), 1)
-        PLS_IGNORE := $(shell >&2 printf "\nSome submodules apps seem to be missing. To download them, assuming you git clone'd the repo, do\n")
-        PLS_IGNORE := $(shell >&2 printf "  git submodule init\n")
-        PLS_IGNORE := $(shell >&2 printf "  git submodule update\n\n")
-    endif
-    $(error Missing apps: $(strip $(apps_missing)))
-endif
-
 apps_src += $(addprefix apps/,\
   alternate_empty_nested_menu_controller.cpp \
   apps_container.cpp \
@@ -62,7 +43,7 @@ apps_src += $(addprefix apps/,\
 )
 
 tests_src += $(addprefix apps/,\
-  exam_mode_configuration_non_official.cpp \
+  exam_mode_configuration_official.cpp \
 )
 
 
@@ -81,10 +62,13 @@ $(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/m
 country_preferences = apps/country_preferences.csv
 language_preferences = apps/language_preferences.csv
 
-# The header is referred to as <apps/i18n.h> so make sure it's findable this way
+# The header is refered to as <apps/i18n.h> so make sure it's findable this way
 SFLAGS += -I$(BUILD_DIR)
 
 i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N)))
+ifeq ($(EPSILON_GETOPT),1)
+i18n_files += $(addprefix apps/language_,$(addsuffix _iso6391.universal.i18n, $(EPSILON_I18N)))
+endif
 
 i18n_files += $(call i18n_with_universal_for,shared)
 i18n_files += $(call i18n_with_universal_for,toolbox)
@@ -94,7 +78,7 @@ $(eval $(call rule_for, \
   I18N, \
   apps/i18n.cpp, \
   $(i18n_files), \
-  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^, \
+  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
   global \
 ))
 
@@ -107,11 +91,8 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
 
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
-$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
-$(call object_for,$(apps_src)): $(BUILD_DIR)/apps/home/apps_layout.h
-
 apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
 
 apps_tests_src += $(addprefix apps/,\

apps/apps_container.cpp

@@ -8,8 +8,6 @@
 #include <ion/backlight.h>
 #include <poincare/preferences.h>
 
-#include <algorithm>
-
 extern "C" {
 #include <assert.h>
 }
@@ -29,7 +27,7 @@ AppsContainer::AppsContainer() :
   m_globalContext(),
   m_variableBoxController(),
   m_examPopUpController(this),
-  m_promptController(k_promptMessages, k_promptFGColors, k_promptBGColors, k_promptNumberOfMessages),
+  m_promptController(k_promptMessages, k_promptColors, k_promptNumberOfMessages),
   m_batteryTimer(),
   m_suspendTimer(),
   m_backlightDimmingTimer(),
@@ -47,7 +45,7 @@ AppsContainer::AppsContainer() :
    * poincareCircuitBreaker is run. This means either whitelisting all Epsilon
    * (which makes bigger files to download and slower execution), or
    * whitelisting all the symbols (that's a big amount of symbols to find and
-   * quite paint to maintain).
+   * quite painy to maintain).
    * We just remove the circuit breaker for now.
    * TODO: Put the Poincare circuit breaker back on epsilon's web emulator */
 
@@ -147,7 +145,7 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
        * pictogram. */
       updateBatteryState();
       if (switchTo(usbConnectedAppSnapshot())) {
-        Ion::USB::DFU(true);
+        Ion::USB::DFU();
         // Update LED when exiting DFU mode
         Ion::LED::updateColorWithPlugAndCharge();
         bool switched = switchTo(activeSnapshot);
@@ -198,7 +196,7 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
       }
       if (changedZoom) {
         KDIonContext::sharedContext()->updatePostProcessingEffects();
-        redrawWindow(true);
+        redrawWindow();
         return true;
       }
     }
@@ -220,13 +218,6 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
   return didProcessEvent || alphaLockWantsRedraw;
 }
 
-static constexpr Ion::Events::Event switch_events[] = {
-    Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
-    Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
-    Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
-    Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
-};
-
 bool AppsContainer::processEvent(Ion::Events::Event event) {
   // Warning: if the window is dirtied, you need to call window()->redraw()
   if (event == Ion::Events::USBPlug) {
@@ -243,40 +234,21 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
     }
     return true;
   }
-  // If key home or key back is pressed, we switch to the home app.
   if (event == Ion::Events::Home || event == Ion::Events::Back) {
     switchTo(appSnapshotAtIndex(0));
     return true;
   }
-  // If shift + Home are pressed, we switch to the first app.
   if (event == Ion::Events::ShiftHome) {
     switchTo(appSnapshotAtIndex(1));
     return true;
   }
-
-  // Iterate through the switch events to find the one that matches the event, if one match, switch to the app at the index of the switch event.
-  for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
-    if (event == switch_events[i]) {
-      m_window.redraw(true);
-      switchTo(appSnapshotAtIndex(i+1));
-      return true;
-    }
-  }
-
-  // Add EE shortcut to go to the settings (app number 12)
-  if (event == Ion::Events::EE) {
-    switchTo(appSnapshotAtIndex(12));
-    return true;
-  }
-
   if (event == Ion::Events::OnOff) {
     suspend(true);
     return true;
   }
   if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus) {
       int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates;
-      int NumberOfStepsPerShortcut = GlobalPreferences::sharedGlobalPreferences()->brightnessShortcut();
-      int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsPerShortcut*delta : -delta*NumberOfStepsPerShortcut;
+      int direction = (event == Ion::Events::BrightnessPlus) ? Ion::Backlight::NumberOfStepsPerShortcut*delta : -delta*Ion::Backlight::NumberOfStepsPerShortcut;
       GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction);
   }
   return false;
@@ -329,7 +301,7 @@ void AppsContainer::run() {
        * destroyed from the pool. To avoid using them before packing the app
        * (in App::willBecomeInactive for instance), we tidy them early on. */
       s_activeApp->snapshot()->tidy();
-      /* When an app encountered an exception due to a full pool, the next time
+      /* When an app encoutered an exception due to a full pool, the next time
        * the user enters the app, the same exception could happen again which
        * would prevent from reopening the app. To avoid being stuck outside the
        * app causing the issue, we reset its snapshot when leaving it due to
@@ -363,8 +335,6 @@ bool AppsContainer::updateBatteryState() {
 }
 
 void AppsContainer::refreshPreferences() {
-  m_suspendTimer.reset(GlobalPreferences::sharedGlobalPreferences()->idleBeforeSuspendSeconds()*1000/Timer::TickDuration);
-  m_backlightDimmingTimer.reset(GlobalPreferences::sharedGlobalPreferences()->idleBeforeDimmingSeconds()*1000/Timer::TickDuration);
   m_window.refreshPreferences();
 }
 

apps/apps_container.h

@@ -66,8 +66,7 @@ private:
   bool updateAlphaLock();
 
   static I18n::Message k_promptMessages[];
-  static KDColor k_promptFGColors[];
-  static KDColor k_promptBGColors[];
+  static KDColor k_promptColors[];
   static int k_promptNumberOfMessages;
   AppsWindow m_window;
   EmptyBatteryWindow m_emptyBatteryWindow;

apps/apps_container_prompt_beta.cpp

@@ -10,7 +10,7 @@ I18n::Message AppsContainer::k_promptMessages[] = {
   I18n::Message::BetaVersionMessage5,
   I18n::Message::BetaVersionMessage6};
 
-KDColor AppsContainer::k_promptFGColors[] = {
+KDColor AppsContainer::k_promptColors[] = {
   KDColorBlack,
   KDColorBlack,
   KDColorBlack,
@@ -20,14 +20,4 @@ KDColor AppsContainer::k_promptFGColors[] = {
   KDColorBlack,
   Palette::AccentText};
 
-KDColor AppsContainer::k_promptBGColors[] = {
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite};
-
 int AppsContainer::k_promptNumberOfMessages = 8;

apps/apps_container_prompt_none.cpp

@@ -2,8 +2,7 @@
 
 I18n::Message AppsContainer::k_promptMessages[] = {};
 
-KDColor AppsContainer::k_promptFGColors[] = {};
-KDColor AppsContainer::k_promptBGColors[] = {};
+KDColor AppsContainer::k_promptColors[] = {};
 
 int AppsContainer::k_promptNumberOfMessages = 0;
 

apps/apps_container_prompt_update.cpp

@@ -8,7 +8,7 @@ I18n::Message AppsContainer::k_promptMessages[] = {
   I18n::Message::UpdateMessage3,
   I18n::Message::UpdateMessage4};
 
-KDColor AppsContainer::k_promptFGColors[] = {
+KDColor AppsContainer::k_promptColors[] = {
   KDColorBlack,
   KDColorBlack,
   KDColorBlack,
@@ -16,12 +16,4 @@ KDColor AppsContainer::k_promptFGColors[] = {
   KDColorBlack,
   Palette::AccentText};
 
-KDColor AppsContainer::k_promptBGColors[] = {
-    KDColorWhite,
-    KDColorWhite,
-    KDColorWhite,
-    KDColorBlack,
-    KDColorWhite,
-    KDColorBlack};
-
 int AppsContainer::k_promptNumberOfMessages = 6;

apps/backlight_dimming_timer.cpp

@@ -1,26 +1,11 @@
 #include "backlight_dimming_timer.h"
-#include "global_preferences.h"
-#include <ion/backlight.h>
-#include <ion/events.h>
-#include <apps/apps_container.h>
 
 BacklightDimmingTimer::BacklightDimmingTimer() :
-  Timer(GlobalPreferences::sharedGlobalPreferences()->idleBeforeDimmingSeconds()*1000/Timer::TickDuration)
+  Timer(k_idleBeforeDimmingDuration/Timer::TickDuration)
 {
 }
 
-bool BacklightDimmingTimer::fire(){
-  int i = Ion::Backlight::brightness();
-  while (i > 0){
-    int t = 20;
-    Ion::Events::Event e = Ion::Events::getEvent(&t);
-    AppsContainer::sharedAppsContainer()->dispatchEvent(e);
-    if (e.isKeyboardEvent()){
-      return false;
-    }
-
-    Ion::Backlight::setBrightness(i);
-    i -= 15;
-  }
+bool BacklightDimmingTimer::fire() {
+  Ion::Backlight::setBrightness(k_dimBacklightBrightness);
   return false;
 }

apps/backlight_dimming_timer.h

@@ -7,6 +7,8 @@ class BacklightDimmingTimer : public Timer {
 public:
   BacklightDimmingTimer();
 private:
+  constexpr static int k_idleBeforeDimmingDuration = 30*1000; // In miliseconds
+  constexpr static int k_dimBacklightBrightness = 0;
   bool fire() override;
 };
 

apps/battery_view.cpp

@@ -60,36 +60,32 @@ void BatteryView::drawRect(KDContext * ctx, KDRect rect) const {
    *'content' depends on the charge */
 
   // Draw the left part
-  ctx->fillRect(KDRect(0, 1, k_elementWidth, k_batteryHeight - 2), Palette::Battery);
-
-  // Draw top and bottom part
-  ctx->fillRect(KDRect(1, 0, k_batteryWidth-3, 1), Palette::Battery);
-  ctx->fillRect(KDRect(1, k_batteryHeight-1, k_batteryWidth-3, 1), Palette::Battery);
+  ctx->fillRect(KDRect(0, 0, k_elementWidth, k_batteryHeight), Palette::Battery);
 
   // Draw the middle part
   constexpr KDCoordinate batteryInsideX = k_elementWidth+k_separatorThickness;
   constexpr KDCoordinate batteryInsideWidth = k_batteryWidth-3*k_elementWidth-2*k_separatorThickness;
   if (m_isCharging) {
     // Charging: Yellow background with flash
-    ctx->fillRect(KDRect(batteryInsideX, 2, batteryInsideWidth, k_batteryHeight-4), Palette::BatteryInCharge);
+    ctx->fillRect(KDRect(batteryInsideX, 0, batteryInsideWidth, k_batteryHeight), Palette::BatteryInCharge);
     KDRect frame((k_batteryWidth-k_flashWidth)/2, 0, k_flashWidth, k_flashHeight);
     KDColor flashWorkingBuffer[BatteryView::k_flashHeight*BatteryView::k_flashWidth];
     ctx->blendRectWithMask(frame, Palette::Battery, (const uint8_t *)flashMask, flashWorkingBuffer);
   } else if (m_chargeState == Ion::Battery::Charge::LOW) {
     assert(!m_isPlugged);
     // Low: Quite empty battery
-    ctx->fillRect(KDRect(batteryInsideX, 2, 2*k_elementWidth, k_batteryHeight-4), Palette::BatteryLow);
-    ctx->fillRect(KDRect(3*k_elementWidth+k_separatorThickness, 2, k_batteryWidth-5*k_elementWidth-2*k_separatorThickness, k_batteryHeight-4), KDColor::blend(Palette::Toolbar, Palette::Battery, 128));
+    ctx->fillRect(KDRect(batteryInsideX, 0, 2*k_elementWidth, k_batteryHeight), Palette::BatteryLow);
+    ctx->fillRect(KDRect(3*k_elementWidth+k_separatorThickness, 0, k_batteryWidth-5*k_elementWidth-2*k_separatorThickness, k_batteryHeight), Palette::BatteryInCharge);
   } else if (m_chargeState == Ion::Battery::Charge::SOMEWHERE_INBETWEEN) {
     assert(!m_isPlugged);
     // Middle: Half full battery
     constexpr KDCoordinate middleChargeWidth = batteryInsideWidth/2;
-    ctx->fillRect(KDRect(batteryInsideX, 2, middleChargeWidth, k_batteryHeight-4), Palette::Battery);
-    ctx->fillRect(KDRect(batteryInsideX+middleChargeWidth, 2, middleChargeWidth+1, k_batteryHeight-4), KDColor::blend(Palette::Toolbar, Palette::Battery, 128));
+    ctx->fillRect(KDRect(batteryInsideX, 0, middleChargeWidth, k_batteryHeight), Palette::Battery);
+    ctx->fillRect(KDRect(batteryInsideX+middleChargeWidth, 0, middleChargeWidth, k_batteryHeight), Palette::BatteryInCharge);
   } else {
     assert(m_chargeState == Ion::Battery::Charge::FULL);
     // Full but not plugged: Full battery
-    ctx->fillRect(KDRect(batteryInsideX, 2, batteryInsideWidth, k_batteryHeight-4), Palette::Battery);
+    ctx->fillRect(KDRect(batteryInsideX, 0, batteryInsideWidth, k_batteryHeight), Palette::Battery);
     if (m_isPlugged) {
       // Plugged and full: Full battery with tick
       KDRect frame((k_batteryWidth-k_tickWidth)/2, (k_batteryHeight-k_tickHeight)/2, k_tickWidth, k_tickHeight);
@@ -99,7 +95,7 @@ void BatteryView::drawRect(KDContext * ctx, KDRect rect) const {
   }
 
   // Draw the right part
-  ctx->fillRect(KDRect(k_batteryWidth-2*k_elementWidth, 1, k_elementWidth, k_batteryHeight-2), Palette::Battery);
+  ctx->fillRect(KDRect(k_batteryWidth-2*k_elementWidth, 0, k_elementWidth, k_batteryHeight), Palette::Battery);
   ctx->fillRect(KDRect(k_batteryWidth-k_elementWidth, (k_batteryHeight-k_capHeight)/2, k_elementWidth, k_capHeight), Palette::Battery);
 }
 

apps/battery_view.h

@@ -20,10 +20,10 @@ public:
   constexpr static int k_tickHeight = 6;
   constexpr static int k_tickWidth = 8;
 private:
-  constexpr static KDCoordinate k_batteryHeight = 9;
-  constexpr static KDCoordinate k_batteryWidth = 16;
+  constexpr static KDCoordinate k_batteryHeight = 8;
+  constexpr static KDCoordinate k_batteryWidth = 15;
   constexpr static KDCoordinate k_elementWidth = 1;
-  constexpr static KDCoordinate k_capHeight = 3;
+  constexpr static KDCoordinate k_capHeight = 4;
   constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   Ion::Battery::Charge m_chargeState;
   bool m_isCharging;

apps/calculation/Makefile

@@ -19,7 +19,6 @@ app_calculation_src = $(addprefix apps/calculation/,\
   additional_outputs/list_controller.cpp \
   additional_outputs/matrix_list_controller.cpp \
   additional_outputs/rational_list_controller.cpp \
-  additional_outputs/second_degree_list_controller.cpp \
   additional_outputs/trigonometry_graph_cell.cpp \
   additional_outputs/trigonometry_list_controller.cpp \
   additional_outputs/trigonometry_model.cpp \

apps/calculation/additional_outputs/second_degree_list_controller.cpp

@@ -1,320 +0,0 @@
-#include "../app.h"
-#include <apps/global_preferences.h>
-#include "../../shared/poincare_helpers.h"
-#include <poincare/layout_helper.h>
-#include <poincare/code_point_layout.h>
-#include <poincare/rational.h>
-#include <poincare/opposite.h>
-#include <poincare/addition.h>
-#include <poincare/parenthesis.h>
-#include <poincare/equal.h>
-#include <poincare/subtraction.h>
-#include <poincare/multiplication.h>
-#include <poincare/division.h>
-#include <poincare/square_root.h>
-#include <poincare/symbol.h>
-#include <poincare/power.h>
-#include "second_degree_list_controller.h"
-
-using namespace Poincare;
-using namespace Shared;
-
-namespace Calculation {
-
-void SecondDegreeListController::setExpression(Poincare::Expression e) {
-  ExpressionsListController::setExpression(e);
-  assert(!m_expression.isUninitialized());
-
-  Expression polynomialCoefficients[Expression::k_maxNumberOfPolynomialCoefficients];
-
-  Context * context = App::app()->localContext();
-  Preferences * preferences = Preferences::sharedPreferences();
-  Poincare::ExpressionNode::ReductionContext reductionContext = Poincare::ExpressionNode::ReductionContext(context,
-          preferences->complexFormat(), preferences->angleUnit(),
-          GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
-          ExpressionNode::ReductionTarget::SystemForApproximation,
-          ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition,
-          Poincare::ExpressionNode::UnitConversion::Default);
-
-  PoincareHelpers::Reduce(&m_expression, context, ExpressionNode::ReductionTarget::SystemForAnalysis);
-
-  int degree = m_expression.getPolynomialReducedCoefficients(
-          "x",
-          polynomialCoefficients,
-          context,
-          Expression::UpdatedComplexFormatWithExpressionInput(preferences->complexFormat(), m_expression, context),
-          preferences->angleUnit(),
-          GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
-          ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition);
-
-  assert(degree == 2);
-
-  Expression a = polynomialCoefficients[2];
-  Expression b = polynomialCoefficients[1];
-  Expression c = polynomialCoefficients[0];
-
-  Expression delta = Subtraction::Builder(Power::Builder(b.clone(), Rational::Builder(2)), Multiplication::Builder(Rational::Builder(4), a.clone(), c.clone()));
-  PoincareHelpers::Simplify(&delta, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  // Alpha is -b/2a, but because after we use -α, we immediately store -α=-(-b/2a)=b/2a.
-  Expression minusAlpha = Division::Builder(b.clone(), Multiplication::Builder(Rational::Builder(2), a.clone()));
-  PoincareHelpers::Reduce(&minusAlpha, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  // Same thing for β
-  Expression minusBeta = Division::Builder(delta.clone(), Multiplication::Builder(Rational::Builder(4), a.clone()));
-  PoincareHelpers::Reduce(&minusBeta, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-
-  enum MultiplicationTypeForA {
-    Nothing,
-    Minus,
-    Parenthesis,
-    Normal
-  };
-
-  MultiplicationTypeForA multiplicationTypeForA;
-
-  if (a.type() == ExpressionNode::Type::Rational && static_cast<const Rational &>(a).isOne()) {
-    multiplicationTypeForA = MultiplicationTypeForA::Nothing;
-  } else if(a.type() == ExpressionNode::Type::Rational &&  static_cast<const Rational &>(a).isMinusOne()){
-    multiplicationTypeForA = MultiplicationTypeForA::Minus;
-  } else if (a.type() == ExpressionNode::Type::Addition) {
-    multiplicationTypeForA = MultiplicationTypeForA::Parenthesis;
-  } else {
-    multiplicationTypeForA = MultiplicationTypeForA::Normal;
-  }
-
-  PoincareHelpers::Simplify(&a, context, ExpressionNode::ReductionTarget::User);
-
-  /*
-   * Because when can't apply reduce or simplify to keep the
-   * canonized form we must beautify the expression manually
-  */
-
-  Expression xMinusAlphaPowerTwo;
-  Expression alpha = getOppositeIfExists(minusAlpha, &reductionContext);
-
-  if (alpha.isUninitialized()) {
-    PoincareHelpers::Simplify(&minusAlpha, context, ExpressionNode::ReductionTarget::User);
-    xMinusAlphaPowerTwo = Power::Builder(Parenthesis::Builder(Addition::Builder(Symbol::Builder("x", strlen("x")), minusAlpha)), Rational::Builder(2));
-  } else {
-    PoincareHelpers::Simplify(&alpha, context, ExpressionNode::ReductionTarget::User);
-    xMinusAlphaPowerTwo = Power::Builder(Parenthesis::Builder(Subtraction::Builder(Symbol::Builder("x", strlen("x")), alpha)), Rational::Builder(2));
-  }
-
-  Expression xMinusAlphaPowerTwoWithFactor;
-
-  switch (multiplicationTypeForA)
-  {
-    case MultiplicationTypeForA::Nothing:
-      xMinusAlphaPowerTwoWithFactor = xMinusAlphaPowerTwo;
-      break;
-    case MultiplicationTypeForA::Minus:
-      xMinusAlphaPowerTwoWithFactor = Opposite::Builder(xMinusAlphaPowerTwo);
-      break;
-    case MultiplicationTypeForA::Parenthesis:
-      xMinusAlphaPowerTwoWithFactor = Multiplication::Builder(Parenthesis::Builder(a.clone()), xMinusAlphaPowerTwo);
-      break;
-    case MultiplicationTypeForA::Normal:
-      xMinusAlphaPowerTwoWithFactor = Multiplication::Builder(a.clone(), xMinusAlphaPowerTwo);
-      break;
-    default:
-      assert(false);
-      break;
-  }
-
-  Expression canonized;
-  PoincareHelpers::Simplify(&minusBeta, context, ExpressionNode::ReductionTarget::User);
-  Expression beta = getOppositeIfExists(minusBeta, &reductionContext);
-  if (beta.isUninitialized()) {
-    if (minusBeta.type() == ExpressionNode::Type::Addition || minusBeta.type() == ExpressionNode::Type::Subtraction) {
-      canonized = Subtraction::Builder(xMinusAlphaPowerTwoWithFactor, Parenthesis::Builder(minusBeta));
-    } else {
-      canonized = Subtraction::Builder(xMinusAlphaPowerTwoWithFactor, minusBeta);
-    }
-  } else {
-    PoincareHelpers::Simplify(&beta, context, ExpressionNode::ReductionTarget::User);
-    canonized = Addition::Builder(xMinusAlphaPowerTwoWithFactor, beta);
-  }
-
-  Expression x0;
-  Expression x1;
-
-  if (delta.nullStatus(context) == ExpressionNode::NullStatus::Null) {
-    // x0 = x1 = -b/(2a)
-    x0 = Division::Builder(Opposite::Builder(b.clone()), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    m_numberOfSolutions = 1;
-    PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-  } else {
-    // x0 = (-b-sqrt(delta))/(2a)
-    x0 = Division::Builder(Subtraction::Builder(Opposite::Builder(b.clone()), SquareRoot::Builder(delta.clone())), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    // x1 = (-b+sqrt(delta))/(2a)
-    x1 = Division::Builder(Addition::Builder(Opposite::Builder(b.clone()), SquareRoot::Builder(delta.clone())), Multiplication::Builder(Rational::Builder(2), a.clone()));
-    m_numberOfSolutions = 2;
-    PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-    PoincareHelpers::Simplify(&x1, context, ExpressionNode::ReductionTarget::SystemForApproximation);
-    if (x0.type() == ExpressionNode::Type::Unreal) {
-      assert(x1.type() == ExpressionNode::Type::Unreal);
-      m_numberOfSolutions = 0;
-    }
-  }
-
-  Expression factorized;
-
-  if (m_numberOfSolutions == 2) {
-    Expression firstFactor;
-    Expression secondFactor;
-
-    Expression x0Opposite = getOppositeIfExists(x0, &reductionContext);
-    if (x0Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::User);
-      if (x0.type() == ExpressionNode::Type::Addition || x0.type() == ExpressionNode::Type::Subtraction) {
-        firstFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), Parenthesis::Builder(x0.clone()));
-      } else {
-        firstFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x0.clone());
-      }
-    } else {
-      if (x0Opposite.type() == ExpressionNode::Type::Addition || x0Opposite.type() == ExpressionNode::Type::Subtraction) {
-        x0Opposite = Parenthesis::Builder(x0Opposite.clone());
-      }
-      firstFactor = Addition::Builder(Symbol::Builder("x", strlen("x")), x0Opposite.clone());
-    }
-
-    Expression x1Opposite = getOppositeIfExists(x1, &reductionContext);
-    if (x1Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x1, context, ExpressionNode::ReductionTarget::User);
-      if (x1.type() == ExpressionNode::Type::Addition || x1.type() == ExpressionNode::Type::Subtraction) {
-        secondFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), Parenthesis::Builder(x1.clone()));
-      } else {
-        secondFactor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x1.clone());
-      }
-    } else {
-      PoincareHelpers::Simplify(&x1Opposite, context, ExpressionNode::ReductionTarget::User);
-      if (x1Opposite.type() == ExpressionNode::Type::Addition || x1Opposite.type() == ExpressionNode::Type::Subtraction) {
-        x1Opposite = Parenthesis::Builder(x1Opposite.clone());
-      }
-      secondFactor = Addition::Builder(Symbol::Builder("x", strlen("x")), x1Opposite.clone());
-    }
-
-    Expression solutionProduct = Multiplication::Builder(Parenthesis::Builder(firstFactor), Parenthesis::Builder(secondFactor));
-    switch (multiplicationTypeForA)
-    {
-      case MultiplicationTypeForA::Nothing:
-        factorized = solutionProduct;
-        break;
-      case MultiplicationTypeForA::Minus:
-        factorized = Opposite::Builder(solutionProduct);
-        break;
-      case MultiplicationTypeForA::Parenthesis:
-        factorized = Multiplication::Builder(Parenthesis::Builder(a.clone()), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Normal:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      default:
-        assert(false);
-        break;
-    }
-  } else if (m_numberOfSolutions == 1) {
-    Expression x0Opposite = getOppositeIfExists(x0, &reductionContext);
-    Expression factor;
-
-    if (x0Opposite.isUninitialized()) {
-      PoincareHelpers::Simplify(&x0, context, ExpressionNode::ReductionTarget::User);
-      if (x0.type() == ExpressionNode::Type::Addition || x0.type() == ExpressionNode::Type::Subtraction) {
-        factor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), Parenthesis::Builder(x0.clone()));
-      } else {
-        factor = Subtraction::Builder(Symbol::Builder("x", strlen("x")), x0.clone());
-      }
-    } else {
-      PoincareHelpers::Simplify(&x0Opposite, context, ExpressionNode::ReductionTarget::User);
-      factor = Addition::Builder(Symbol::Builder("x", strlen("x")), x0Opposite.clone());
-    }
-
-    Expression solutionProduct = Power::Builder(Parenthesis::Builder(factor), Rational::Builder(2));
-    switch (multiplicationTypeForA)
-    {
-      case MultiplicationTypeForA::Nothing:
-        factorized = solutionProduct;
-        break;
-      case MultiplicationTypeForA::Minus:
-        factorized = Opposite::Builder(solutionProduct);
-        break;
-      case MultiplicationTypeForA::Parenthesis:
-        factorized = Multiplication::Builder(Parenthesis::Builder(a.clone()), solutionProduct);
-        break;
-      case MultiplicationTypeForA::Normal:
-        factorized = Multiplication::Builder(a.clone(), solutionProduct);
-        break;
-      default:
-        assert(false);
-        break;
-    }
-  }
-
-  PoincareHelpers::Simplify(&delta, context, ExpressionNode::ReductionTarget::User);
-
-  m_layouts[0] = PoincareHelpers::CreateLayout(canonized);
-  if (m_numberOfSolutions > 0) {
-    m_layouts[1] = PoincareHelpers::CreateLayout(factorized);
-    m_layouts[2] = PoincareHelpers::CreateLayout(delta);
-    m_layouts[3] = PoincareHelpers::CreateLayout(x0);
-    if (m_numberOfSolutions > 1) {
-      m_layouts[4] = PoincareHelpers::CreateLayout(x1);
-    }
-  } else {
-    m_layouts[1] = PoincareHelpers::CreateLayout(delta);
-  }
-}
-
-Expression SecondDegreeListController::getOppositeIfExists(Expression e, Poincare::ExpressionNode::ReductionContext * reductionContext) {
-  if (e.isNumber() && e.sign(reductionContext->context()) == ExpressionNode::Sign::Negative) {
-    Number n = static_cast<Number&>(e);
-    return std::move(n.setSign(ExpressionNode::Sign::Positive));
-  } else if(e.type() == ExpressionNode::Type::Opposite) {
-    return std::move(e.childAtIndex(0).clone());
-  } else if (e.type() == ExpressionNode::Type::Multiplication && e.numberOfChildren() > 0 && e.childAtIndex(0).isNumber() && e.childAtIndex(0).sign(reductionContext->context()) == ExpressionNode::Sign::Negative) {
-    Multiplication m = static_cast<Multiplication&>(e);
-    if (m.childAtIndex(0).type() == ExpressionNode::Type::Rational && static_cast<Rational&>(e).isMinusOne()) {
-      // The negative numeral factor is -1, we just remove it
-      m.removeChildAtIndexInPlace(0);
-    } else {
-      Expression firstChild = m.childAtIndex(0);
-      Number n = static_cast<Number&>(firstChild);
-      m.childAtIndex(0).setChildrenInPlace(n.setSign(ExpressionNode::Sign::Positive));
-    }
-    PoincareHelpers::Simplify(&m, reductionContext->context(), ExpressionNode::ReductionTarget::User);
-    return std::move(m);
-  }
-  return Expression();
-}
-
-I18n::Message SecondDegreeListController::messageAtIndex(int index) {
-  if (m_numberOfSolutions > 0) {
-    if (index == 0) {
-      return I18n::Message::CanonicalForm;
-    }
-    if (index == 1) {
-      return I18n::Message::FactorizedForm;
-    }
-    if (index == 2) {
-      return I18n::Message::Discriminant;
-    }
-    if (index == 3) {
-      if (m_numberOfSolutions == 1) {
-        return I18n::Message::OnlyRoot;
-      } else {
-        return I18n::Message::FirstRoot;
-      }
-    }
-    return I18n::Message::SecondRoot;
-  } else {
-    switch (index) {
-      case 0:
-        return I18n::Message::CanonicalForm;
-      default:
-        return I18n::Message::Discriminant;
-    }
-  }
-}
-
-}

apps/calculation/additional_outputs/second_degree_list_controller.h

@@ -1,26 +0,0 @@
-#ifndef CALCULATION_ADDITIONAL_OUTPUTS_SECOND_DEGREE_CONTROLLER_H
-#define CALCULATION_ADDITIONAL_OUTPUTS_SECOND_DEGREE_CONTROLLER_H
-
-#include "expressions_list_controller.h"
-
-namespace Calculation {
-
-class SecondDegreeListController : public ExpressionsListController {
-public:
-  SecondDegreeListController(EditExpressionController * editExpressionController) :
-    ExpressionsListController(editExpressionController),
-    m_numberOfSolutions(0) {}
-
-  void setExpression(Poincare::Expression e) override;
-
-private:
-  Poincare::Expression getOppositeIfExists(Poincare::Expression e, Poincare::ExpressionNode::ReductionContext * reductionContext);
-  I18n::Message messageAtIndex(int index) override;
-  int m_numberOfSolutions;
-};
-
-}
-
-#endif
-
-

apps/calculation/additional_outputs/trigonometry_list_controller.cpp

@@ -1,63 +1,16 @@
 #include "trigonometry_list_controller.h"
 #include "../app.h"
-#include <poincare_nodes.h>
-#include "../../shared/poincare_helpers.h"
 
 using namespace Poincare;
 
 namespace Calculation {
 
-static constexpr int s_fullCircle[] = {
-  360,
-  2,
-  400
-};
-
-Poincare::Constant toConstant(Expression e) {
-  return static_cast<Poincare::Constant &>(e);
-}
-
-void TrigonometryListController::setExpression(Expression e) {
+void TrigonometryListController::setExpression(Poincare::Expression e) {
   assert(e.type() == ExpressionNode::Type::Cosine || e.type() == ExpressionNode::Type::Sine);
-
-  Poincare::Context * context = App::app()->localContext();
-  Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
-  Preferences::AngleUnit angleUnit = preferences->angleUnit();
-
-  Expression angleExpression = e.childAtIndex(0);
-
-  Shared::PoincareHelpers::Reduce(&angleExpression, context, Poincare::ExpressionNode::ReductionTarget::SystemForAnalysis);
-
-  if ((angleUnit == Preferences::AngleUnit::Radian
-        && angleExpression.type() == ExpressionNode::Type::Multiplication
-        && angleExpression.numberOfChildren() == 2
-        && angleExpression.childAtIndex(1).type() == ExpressionNode::Type::Constant
-        && toConstant(angleExpression.childAtIndex(1)).isPi()
-        && angleExpression.childAtIndex(0).type() == ExpressionNode::Type::Rational)
-      || ((angleUnit == Preferences::AngleUnit::Degree || angleUnit == Preferences::AngleUnit::Gradian)
-        && angleExpression.type() == ExpressionNode::Type::Rational)) {
-
-    Expression extracted = angleUnit == Preferences::AngleUnit::Radian ? angleExpression.childAtIndex(0) : angleExpression;
-    Rational r = static_cast<Rational &>(extracted);
-
-    Integer denominator = Integer::Multiplication(r.integerDenominator(), Integer(s_fullCircle[(int) angleUnit]));
-    IntegerDivision division = Integer::Division(r.signedIntegerNumerator(), denominator);
-
-    Integer remainder = division.remainder;
-
-    Expression newAngle;
-    Integer rDenominator = r.integerDenominator();
-    Rational newCoefficient = Rational::Builder(remainder, rDenominator);
-    if (angleUnit == Preferences::AngleUnit::Radian) {
-      angleExpression = Multiplication::Builder(newCoefficient, angleExpression.childAtIndex(1));
-    } else {
-      angleExpression = newCoefficient;
-    }
-  }
-
-  IllustratedListController::setExpression(angleExpression);
+  IllustratedListController::setExpression(e.childAtIndex(0));
 
   // Fill calculation store
+  Poincare::Context * context = App::app()->localContext();
   m_calculationStore.push("sin(θ)", context, CalculationHeight);
   m_calculationStore.push("cos(θ)", context, CalculationHeight);
   m_calculationStore.push("θ", context, CalculationHeight);

apps/calculation/app.cpp

@@ -72,7 +72,7 @@ bool App::isAcceptableExpression(const Poincare::Expression expression) {
       return false;
     }
   }
-  return !expression.isUninitialized();
+  return !(expression.isUninitialized() || expression.type() == ExpressionNode::Type::Equal);
 }
 
 void App::didBecomeActive(Window * window) {

apps/calculation/base.de.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Stufenform"
 AdditionalReducedRowEchelonForm = "Reduzierte Stufenform"
-AdditionalTrace = "Spur"
-CanonicalForm = "Kanonische Form"
-FactorizedForm = "Factorisierte Form"
-Discriminant = "Diskriminante"
-OnlyRoot = "Wurzel"
-FirstRoot = "Erste Wurzel"
-SecondRoot = "Zweite Wurzel"
+AdditionalTrace = "Spur"

apps/calculation/base.en.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Row echelon form"
 AdditionalReducedRowEchelonForm = "Reduced row echelon form"
-AdditionalTrace = "Trace"
-CanonicalForm = "Canonical form"
-FactorizedForm = "Factorized form"
-Discriminant = "Discriminant"
-OnlyRoot = "Root"
-FirstRoot = "First root"
-SecondRoot = "Second root"
+AdditionalTrace = "Trace"

apps/calculation/base.es.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inversa"
 AdditionalRowEchelonForm = "Matriz escalonada"
 AdditionalReducedRowEchelonForm = "Matriz escalonada reducida"
-AdditionalTrace = "Traza"
-CanonicalForm = "Forma canónica"
-FactorizedForm = "Forma factorizada"
-Discriminant = "Discriminante"
-OnlyRoot = "Raíz"
-FirstRoot = "Primera raíz"
-SecondRoot = "Segunda raíz"
+AdditionalTrace = "Traza"

apps/calculation/base.fr.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Déterminant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Forme échelonnée"
 AdditionalReducedRowEchelonForm = "Forme échelonnée réduite"
-AdditionalTrace = "Trace"
-CanonicalForm = "Forme canonique"
-FactorizedForm = "Forme factorisée"
-Discriminant = "Discriminant"
-OnlyRoot = "Racine"
-FirstRoot = "Première racine"
-SecondRoot = "Seconde racine"
+AdditionalTrace = "Trace"

apps/calculation/base.hu.i18n

@@ -3,18 +3,7 @@ CalculAppCapital = "SZÁMOLÁS"
 AdditionalResults = "További eredmények"
 DecimalBase = "Decimális"
 HexadecimalBase = "Hexadecimális"
-BinaryBase = "Bináris"
+BinaryBase = "Kétkomponensü"
 PrimeFactors = "Alapvetö tényezök"
 MixedFraction = "Vegyes frakció"
 EuclideanDivision = "Euklideszi osztás"
-AdditionalDeterminant = "Meghatározó"
-AdditionalInverse = "inverz"
-AdditionalRowEchelonForm = "Sor echelon forma"
-AdditionalReducedRowEchelonForm = "Csökkentett sorú Echelon forma"
-AdditionalTrace = "Nyomkövetés"
-CanonicalForm = "Kanonikus forma"
-FactorizedForm = "Factorizált forma"
-Discriminant = "Discriminant"
-OnlyRoot = "Gyökér"
-FirstRoot = "Első gyökér"
-SecondRoot = "Második gyökér"

apps/calculation/base.it.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Inversa"
 AdditionalRowEchelonForm = "Matrice a scalini"
 AdditionalReducedRowEchelonForm = "Matrice ridotta a scalini"
-AdditionalTrace = "Traccia"
-CanonicalForm = "Forma canonica"
-FactorizedForm = "Forma fattorizzata"
-Discriminant = "Discriminante"
-OnlyRoot = "Radice"
-FirstRoot = "Prima radice"
-SecondRoot = "Seconda radice"
+AdditionalTrace = "Traccia"

apps/calculation/base.nl.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinant"
 AdditionalInverse = "Inverse"
 AdditionalRowEchelonForm = "Echelonvorm"
 AdditionalReducedRowEchelonForm = "Gereduceerde echelonvorm"
-AdditionalTrace = "Spoor"
-CanonicalForm = "Canonische vorm"
-FactorizedForm = "Factorized vorm"
-Discriminant = "Discriminant"
-OnlyRoot = "Wortel"
-FirstRoot = "Eerste wortel"
-SecondRoot = "Tweede wortel"
+AdditionalTrace = "Spoor"

apps/calculation/base.pt.i18n

@@ -11,10 +11,4 @@ AdditionalDeterminant = "Determinante"
 AdditionalInverse = "Matriz inversa"
 AdditionalRowEchelonForm = "Matriz escalonada"
 AdditionalReducedRowEchelonForm = "Matriz escalonada reduzida"
-AdditionalTrace = "Traço"
-CanonicalForm = "Forma canónica"
-FactorizedForm = "Factorized form"
-Discriminant = "Discriminante"
-OnlyRoot = "Raiz"
-FirstRoot = "Primeira raiz"
-SecondRoot = "Segunda raiz"
+AdditionalTrace = "Traço"

apps/calculation/calculation.cpp

@@ -8,7 +8,6 @@
 #include <poincare/undefined.h>
 #include <poincare/unit.h>
 #include <poincare/unreal.h>
-#include <poincare/symbol_abstract.h>
 #include <string.h>
 #include <cmath>
 #include <algorithm>
@@ -273,9 +272,6 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
   if (o.type() == ExpressionNode::Type::Matrix) {
     return AdditionalInformationType::Matrix;
   }
-  if (o.polynomialDegree(context, "x") == 2) {
-    return AdditionalInformationType::SecondDegree;
-  }
   return AdditionalInformationType::None;
 }
 

apps/calculation/calculation.h

@@ -39,7 +39,6 @@ public:
     None = 0,
     Integer,
     Rational,
-    SecondDegree,
     Trigonometry,
     Unit,
     Matrix,

apps/calculation/calculation_store.cpp

@@ -16,26 +16,16 @@ CalculationStore::CalculationStore(char * buffer, int size) :
   m_buffer(buffer),
   m_bufferSize(size),
   m_calculationAreaEnd(m_buffer),
-  m_numberOfCalculations(0),
-  m_trashIndex(-1)
+  m_numberOfCalculations(0)
 {
   assert(m_buffer != nullptr);
   assert(m_bufferSize > 0);
 }
 
-// Returns an expiring pointer to the calculation of index i, and ignore the trash
+// Returns an expiring pointer to the calculation of index i
 ExpiringPointer<Calculation> CalculationStore::calculationAtIndex(int i) {
-  if (m_trashIndex == -1 || i < m_trashIndex) {
-    return realCalculationAtIndex(i);
-  } else {
-    return realCalculationAtIndex(i + 1);
-  }
-}
-
-// Returns an expiring pointer to the real calculation of index i
-ExpiringPointer<Calculation> CalculationStore::realCalculationAtIndex(int i) {
   assert(i >= 0 && i < m_numberOfCalculations);
-  // m_buffer is the address of the oldest calculation in calculation store
+  // m_buffer is the adress of the oldest calculation in calculation store
   Calculation * c = (Calculation *) m_buffer;
   if (i != m_numberOfCalculations-1) {
     // The calculation we want is not the oldest one so we get its pointer
@@ -46,13 +36,12 @@ ExpiringPointer<Calculation> CalculationStore::realCalculationAtIndex(int i) {
 
 // Pushes an expression in the store
 ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context * context, HeightComputer heightComputer) {
-  emptyTrash();
   /* Compute ans now, before the buffer is updated and before the calculation
    * might be deleted */
   Expression ans = ansExpression(context);
 
   /* Prepare the buffer for the new calculation
-   * The minimal size to store the new calculation is the minimal size of a calculation plus the pointer to its end */
+   *The minimal size to store the new calculation is the minimal size of a calculation plus the pointer to its end */
   int minSize = Calculation::MinimalSize() + sizeof(Calculation *);
   assert(m_bufferSize > minSize);
   while (remainingBufferSize() < minSize) {
@@ -111,9 +100,9 @@ ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context *
         numberOfSignificantDigits = Poincare::Preferences::sharedPreferences()->numberOfSignificantDigits();
       }
       if (!pushSerializeExpression(outputs[i], beginingOfFreeSpace, &endOfFreeSpace, numberOfSignificantDigits)) {
-        /* If the exact/approximate output does not fit in the store (event if the
+        /* If the exat/approximate output does not fit in the store (event if the
          * current calculation is the only calculation), replace the output with
-         * undef if it fits, else replace the whole calculation with undef. */
+         * undef if it fits, else replace the whole calcualtion with undef. */
         Expression undef = Undefined::Builder();
         if (!pushSerializeExpression(undef, beginingOfFreeSpace, &endOfFreeSpace)) {
           return emptyStoreAndPushUndef(context, heightComputer);
@@ -143,23 +132,15 @@ ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context *
 
 // Delete the calculation of index i
 void CalculationStore::deleteCalculationAtIndex(int i) {
-  if (m_trashIndex != -1) {
-    emptyTrash();
-  }
-  m_trashIndex = i;
-}
-
-// Delete the calculation of index i, internal algorithm
-void CalculationStore::realDeleteCalculationAtIndex(int i) {
   assert(i >= 0 && i < m_numberOfCalculations);
   if (i == 0) {
-    ExpiringPointer<Calculation> lastCalculationPointer = realCalculationAtIndex(0);
+    ExpiringPointer<Calculation> lastCalculationPointer = calculationAtIndex(0);
     m_calculationAreaEnd = (char *)(lastCalculationPointer.pointer());
     m_numberOfCalculations--;
     return;
   }
-  char * calcI = (char *)realCalculationAtIndex(i).pointer();
-  char * nextCalc = (char *) realCalculationAtIndex(i-1).pointer();
+  char * calcI = (char *)calculationAtIndex(i).pointer();
+  char * nextCalc = (char *) calculationAtIndex(i-1).pointer();
   assert(m_calculationAreaEnd >= nextCalc);
   size_t slidingSize = m_calculationAreaEnd - nextCalc;
   // Slide the i-1 most recent calculations right after the i+1'th
@@ -173,14 +154,13 @@ void CalculationStore::realDeleteCalculationAtIndex(int i) {
 // Delete the oldest calculation in the store and returns the amount of space freed by the operation
 size_t CalculationStore::deleteOldestCalculation() {
   char * oldBufferEnd = (char *) m_calculationAreaEnd;
-  realDeleteCalculationAtIndex(numberOfCalculations()-1);
+  deleteCalculationAtIndex(numberOfCalculations()-1);
   char * newBufferEnd = (char *) m_calculationAreaEnd;
   return oldBufferEnd - newBufferEnd;
 }
 
 // Delete all calculations
 void CalculationStore::deleteAll() {
-  m_trashIndex = -1;
   m_calculationAreaEnd = m_buffer;
   m_numberOfCalculations = 0;
 }
@@ -197,8 +177,8 @@ Expression CalculationStore::ansExpression(Context * context) {
    * parsed), ans is replaced by the approximation output when any Store or
    * Equal expression appears. */
   Expression e = mostRecentCalculation->exactOutput();
-  bool exactOutputInvolvesStoreEqual = e.type() == ExpressionNode::Type::Store || e.type() == ExpressionNode::Type::Equal;
-  if (mostRecentCalculation->input().recursivelyMatches(Expression::IsApproximate, context) || exactOutputInvolvesStoreEqual) {
+  bool exactOuptutInvolvesStoreEqual = e.type() == ExpressionNode::Type::Store || e.type() == ExpressionNode::Type::Equal;
+  if (mostRecentCalculation->input().recursivelyMatches(Expression::IsApproximate, context) || exactOuptutInvolvesStoreEqual) {
     return mostRecentCalculation->approximateOutput(context, Calculation::NumberOfSignificantDigits::Maximal);
   }
   return mostRecentCalculation->exactOutput();
@@ -220,12 +200,6 @@ bool CalculationStore::pushSerializeExpression(Expression e, char * location, ch
   return expressionIsPushed;
 }
 
-void CalculationStore::emptyTrash() {
-  if (m_trashIndex != -1) {
-    realDeleteCalculationAtIndex(m_trashIndex);
-    m_trashIndex = -1;
-  }
-}
 
 
 Shared::ExpiringPointer<Calculation> CalculationStore::emptyStoreAndPushUndef(Context * context, HeightComputer heightComputer) {
@@ -239,7 +213,7 @@ Shared::ExpiringPointer<Calculation> CalculationStore::emptyStoreAndPushUndef(Co
 void CalculationStore::recomputeMemoizedPointersAfterCalculationIndex(int index) {
   assert(index < m_numberOfCalculations);
   // Clear pointer and recompute new ones
-  Calculation * c = realCalculationAtIndex(index).pointer();
+  Calculation * c = calculationAtIndex(index).pointer();
   Calculation * nextCalc;
   while (index != 0) {
     nextCalc = c->next();

apps/calculation/calculation_store.h

@@ -41,15 +41,11 @@ public:
   void deleteCalculationAtIndex(int i);
   void deleteAll();
   int remainingBufferSize() const { assert(m_calculationAreaEnd >= m_buffer); return m_bufferSize - (m_calculationAreaEnd - m_buffer) - m_numberOfCalculations*sizeof(Calculation*); }
-  int numberOfCalculations() const { return m_numberOfCalculations - (m_trashIndex != -1); }
+  int numberOfCalculations() const { return m_numberOfCalculations; }
   Poincare::Expression ansExpression(Poincare::Context * context);
   int bufferSize() { return m_bufferSize; }
-  void reinsertTrash() { m_trashIndex = -1; }
 
 private:
-  void emptyTrash();
-  Shared::ExpiringPointer<Calculation> realCalculationAtIndex(int i);
-  void realDeleteCalculationAtIndex(int i);
 
   class CalculationIterator {
   public:
@@ -74,7 +70,6 @@ private:
   int m_bufferSize;
   const char * m_calculationAreaEnd;
   int m_numberOfCalculations;
-  int m_trashIndex;
 
   size_t deleteOldestCalculation();
   char * addressOfPointerToCalculationOfIndex(int i) {return m_buffer + m_bufferSize - (m_numberOfCalculations - i)*sizeof(Calculation *);}

apps/calculation/edit_expression_controller.cpp

@@ -68,15 +68,6 @@ void EditExpressionController::memoizeInput() {
   *m_cacheBufferInformation = m_contentView.expressionField()->moveCursorAndDumpContent(m_cacheBuffer, k_cacheBufferSize);
 }
 
-bool EditExpressionController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::ShiftBack) {
-    m_historyController->reinsertTrash();
-    m_historyController->reload();
-    return true;
-  }
-  return false;
-}
-
 void EditExpressionController::viewWillAppear() {
   m_historyController->viewWillAppear();
 }

apps/calculation/edit_expression_controller.h

@@ -31,7 +31,6 @@ public:
   void insertTextBody(const char * text);
   void restoreInput();
   void memoizeInput();
-  bool handleEvent(Ion::Events::Event event) override;
 
   /* TextFieldDelegate */
   bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override;

apps/calculation/expression_field.cpp

@@ -17,8 +17,7 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
        event == Ion::Events::Power ||
        event == Ion::Events::Square ||
        event == Ion::Events::Division ||
-       event == Ion::Events::Sto ||
-       event == Ion::Events::EE)) {
+       event == Ion::Events::Sto)) {
     handleEventWithText(Poincare::Symbol::k_ans);
   }
   return(::ExpressionField::handleEvent(event));

apps/calculation/history_controller.cpp

@@ -16,7 +16,6 @@ HistoryController::HistoryController(EditExpressionController * editExpressionCo
   m_complexController(editExpressionController),
   m_integerController(editExpressionController),
   m_rationalController(editExpressionController),
-  m_secondDegreeController(editExpressionController),
   m_trigonometryController(editExpressionController),
   m_unitController(editExpressionController),
   m_matrixController(editExpressionController)
@@ -101,8 +100,6 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
       Expression e = calculationAtIndex(focusRow)->exactOutput();
       if (additionalInfoType == Calculation::AdditionalInformationType::Complex) {
         vc = &m_complexController;
-      } else if (additionalInfoType == Calculation::AdditionalInformationType::SecondDegree) {
-        vc = &m_secondDegreeController;
       } else if (additionalInfoType == Calculation::AdditionalInformationType::Trigonometry) {
         vc = &m_trigonometryController;
         // Find which of the input or output is the cosine/sine

apps/calculation/history_controller.h

@@ -8,7 +8,6 @@
 #include "additional_outputs/complex_list_controller.h"
 #include "additional_outputs/integer_list_controller.h"
 #include "additional_outputs/rational_list_controller.h"
-#include "additional_outputs/second_degree_list_controller.h"
 #include "additional_outputs/trigonometry_list_controller.h"
 #include "additional_outputs/unit_list_controller.h"
 #include "additional_outputs/matrix_list_controller.h"
@@ -35,7 +34,6 @@ public:
   int typeAtLocation(int i, int j) override;
   void setSelectedSubviewType(SubviewType subviewType, bool sameCell, int previousSelectedX = -1, int previousSelectedY = -1) override;
   void tableViewDidChangeSelectionAndDidScroll(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection = false) override;
-  void reinsertTrash() { m_calculationStore->reinsertTrash(); }
 private:
   int storeIndex(int i) { return numberOfRows() - i - 1; }
   Shared::ExpiringPointer<Calculation> calculationAtIndex(int i);
@@ -49,7 +47,6 @@ private:
   ComplexListController m_complexController;
   IntegerListController m_integerController;
   RationalListController m_rationalController;
-  SecondDegreeListController m_secondDegreeController;
   TrigonometryListController m_trigonometryController;
   UnitListController m_unitController;
   MatrixListController m_matrixController;

apps/calculation/history_view_cell.cpp

@@ -81,7 +81,7 @@ void HistoryViewCell::reloadSubviewHighlight() {
   m_ellipsis.setHighlighted(false);
   if (isHighlighted()) {
     if (m_dataSource->selectedSubviewType() == HistoryViewCellDataSource::SubviewType::Input) {
-      m_inputView.setExpressionBackgroundColor(Palette::Select);
+      m_inputView.setExpressionBackgroundColor(Palette::ListCellBackgroundSelected);
     } else if (m_dataSource->selectedSubviewType() == HistoryViewCellDataSource::SubviewType::Output) {
       m_scrollableOutputView.evenOddCell()->setHighlighted(true);
     } else {

apps/calculation/test/calculation_store.cpp

@@ -114,10 +114,10 @@ QUIZ_CASE(calculation_display_exact_approximate) {
 
   assertCalculationIs("1/2", DisplayOutput::ExactAndApproximate, EqualSign::Equal, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1/3", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1/0", DisplayOutput::ExactOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("2x-x", DisplayOutput::ExactOnly, EqualSign::Unknown, "x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("1/0", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("2x-x", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("[[1,2,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("[[1,x,3]]", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, "[[1,undef,3]]", "[[1,undef,3]]", &globalContext, &store);
+  assertCalculationIs("[[1,x,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "undef", "undef", &globalContext, &store);
   assertCalculationIs("28^7", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("3+√(2)→a", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(2)+3", nullptr, nullptr, &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
@@ -130,9 +130,9 @@ QUIZ_CASE(calculation_display_exact_approximate) {
   assertCalculationIs("1+1+random()", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("1+1+round(1.343,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3.34", "3.34", &globalContext, &store);
   assertCalculationIs("randint(2,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "5", "5", "5", &globalContext, &store);
-  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
 
 }
 
@@ -140,10 +140,10 @@ QUIZ_CASE(calculation_symbolic_computation) {
   Shared::GlobalContext globalContext;
   CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ExactOnly, EqualSign::Unknown, "2×x+√(π)+4", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "f×x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("1+x→f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
   assertCalculationIs("f(2)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", "3", "3", &globalContext, &store);
   assertCalculationIs("2→x", DisplayOutput::ApproximateOnly, EqualSign::Equal, "2", nullptr, nullptr, &globalContext, &store);
   assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", nullptr, nullptr, &globalContext, &store);

apps/code/Makefile

@@ -1,8 +1,6 @@
 apps += Code::App
 app_headers += apps/code/app.h
 
-SFLAGS += -DHAS_CODE
-
 app_code_src = $(addprefix apps/code/,\
   app.cpp \
   console_controller.cpp \
@@ -17,7 +15,6 @@ app_code_src = $(addprefix apps/code/,\
   sandbox_controller.cpp \
   script_name_cell.cpp \
   script_parameter_controller.cpp \
-  toolbox_ion_keys.cpp \
 )
 
 app_code_test_src = $(addprefix apps/code/,\
@@ -32,7 +29,6 @@ app_code_test_src = $(addprefix apps/code/,\
 
 tests_src += $(addprefix apps/code/test/,\
   variable_box_controller.cpp\
-  toolbox_ion_keys_dummy.cpp \
 )
 
 app_code_src += $(app_code_test_src)

apps/code/app.h

@@ -75,7 +75,7 @@ public:
 
   VariableBoxController * variableBoxController() { return &m_variableBoxController; }
 
-  static constexpr int k_pythonHeapSize = 70000;
+  static constexpr int k_pythonHeapSize = 100000;
 
 private:
   /* Python delegate:

apps/code/base.de.i18n

@@ -1,15 +1,15 @@
 AddScript = "Skript hinzufügen"
 AllowedCharactersaz09 = "Erlaubte Zeichen: a-z, 0-9, _"
 Autocomplete = "Autovervollständigung"
-AutoImportScript = "Automatischer Import in die Konsole"
-BuiltinsAndKeywords = "Native Funktionen & Schlüsselwörter"
+AutoImportScript = "Automatischer Import in Konsole"
+BuiltinsAndKeywords = "Native Funktionen und Schlüsselwörter"
 Console = "Interaktive Konsole"
 DeleteScript = "Skript löschen"
 DuplicateScript = "Skript duplizieren"
 ExecuteScript = "Skript ausführen"
 FunctionsAndVariables = "Funktionen und Variablen"
 ImportedModulesAndScripts = "Importierte Module und Skripte"
-NoWordAvailableHere = "Hier ist kein Wort verfügbar."
-ScriptInProgress = "Aktuelles Skript"
+NoWordAvailableHere = "Kein Wort ist hier verfübar."
+ScriptInProgress = "Aktuelle Skript"
 ScriptOptions = "Skriptoptionen"
-ScriptSize = "Skriptgröße"
+ScriptSize = "Script size"

apps/code/base.fr.i18n

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Modules et scripts importés"
 NoWordAvailableHere = "Aucun mot disponible à cet endroit."
 ScriptInProgress = "Script en cours"
 ScriptOptions = "Options de script"
-ScriptSize = "Taille du script"
+ScriptSize = "Script size"

apps/code/base.hu.i18n

@@ -1,15 +1,15 @@
-AddScript = "Script hozzáadása"
+AddScript = "Script hozzadáadása"
 AllowedCharactersaz09 = "Engedélyezett karakterek: a-z, 0-9, _"
-Autocomplete = "Önkiegészítés"
+Autocomplete = "Autocomplete"
 AutoImportScript = "Script automata importálása"
-BuiltinsAndKeywords = "Beépített fonkciók és szókincs"
+BuiltinsAndKeywords = "Builtins and keywords"
 Console = "Konzol"
 DeleteScript = "Script törlése"
 DuplicateScript = "Script másolása"
 ExecuteScript = "Script indítása"
-FunctionsAndVariables = "Fonktiók és változók"
-ImportedModulesAndScripts = "Importált scriptek és modulok"
-NoWordAvailableHere = "Nincs rendelkezésre álló szó."
-ScriptInProgress = "Script müködésben"
+FunctionsAndVariables = "Függvények és változók"
+ImportedModulesAndScripts = "Imported modules and scripts"
+NoWordAvailableHere = "No word available here."
+ScriptInProgress = "Script in progress"
 ScriptOptions = "Script beállítások"
-ScriptSize = "Script mérete"
+ScriptSize = "Script size"

apps/code/base.universal.i18n

@@ -1,2 +1,3 @@
 CodeAppCapital = "PYTHON"
 ConsolePrompt = ">>> "
+ScriptParameters = "..."

apps/code/catalog.de.i18n

@@ -3,254 +3,220 @@ PythonPercent = "Modulo"
 Python1J = "Imaginäres i"
 PythonLF = "Zeilenvorschub"
 PythonTab = "Tabulator"
-PythonAmpersand = "Bitweises und"
-PythonSymbolExp = "Bitweises exklusives oder"
-PythonVerticalBar = "Bitweises oder"
+PythonAmpersand = "Bitweise und"
+PythonSymbolExp = "Bitweise exklusiv oder"
+PythonVerticalBar = "Bitweise oder"
 PythonImag = "Imaginärteil von z"
 PythonReal = "Realteil von z"
 PythonSingleQuote = "Einfaches Anführungszeichen"
-PythonAbs = "Absoluter Wert/Absolute Größe"
-PythonAcos = "Bogenkosinus"
-PythonAcosh = "Bogenhyperbolischer Kosinus"
-PythonAppend = "x an das Ende der Liste anfügen"
-PythonArrow = "Pfeil von (x,y) nach (x+dx,y+dy)"
-PythonAsin = "Sinusbogen"
-PythonAsinh = "Kreisbogen hyperbolischer Sinus"
+PythonAbs = "Absolute/r Wert/Größe"
+PythonAcos = "Arkuskosinus"
+PythonAcosh = "Hyperbelkosinus"
+PythonAppend = "Hängt x an das Ende der Liste"
+PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
+PythonAsin = "Arkussinus"
+PythonAsinh = "Hyperbelsinus"
 PythonAtan = "Arkustangens"
-PythonAtan2 = "Rückgabe atan(y/x)"
+PythonAtan2 = "Gib atan(y/x)"
 PythonAtanh = "Hyperbeltangens"
-PythonAxis = "Achsen auf (xmin,xmax,ymin,ymax)"
-PythonBar = "Balkendiagramm mit x-Werten"
-PythonBin = "Ganzzahl in Binärwert umwandeln"
-PythonCeil = "Aufrunden"
-PythonChoice = "Zufällige Zahl in der Liste"
-PythonClear = "Liste leeren"
+PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
+PythonBar = "Draw a bar plot with x values"
+PythonBin = "Ganzzahl nach binär konvertieren"
+PythonCeil = "Aufrundung"
+PythonChoice = "Zufallszahl aus der Liste"
+PythonClear = "Leere die Liste"
 PythonCmathFunction = "cmath-Modul-Funktionspräfix"
-PythonColor = "Eine RGB-Farbe definieren"
-PythonColorBlack = "Farbe Schwarz"
-PythonColorBlue = "Farbe Blau"
-PythonColorBrown = "Farbe Braun"
-PythonColorGray = "Farbe Grau"
-PythonColorGreen = "Farbe Grün"
-PythonColorOrange = "Farbe Orange"
-PythonColorPink = "Farbe Rosa"
-PythonColorPurple = "Farbe Violett"
-PythonColorRed = "Farbe Rot"
-PythonColorWhite = "Farbe Weiß"
-PythonColorYellow = "Farbe Gelb"
-PythonComplex = "Gib a+ib zurück"
-PythonCopySign = "Gib x mit Vorzeichen von y zurück"
+PythonColor = "Definiere eine RGB-Farbe"
+PythonColorBlack = "Black color"
+PythonColorBlue = "Blue color"
+PythonColorBrown = "Brown color"
+PythonColorGray = "Gray color"
+PythonColorGreen = "Green color"
+PythonColorOrange = "Orange color"
+PythonColorPink = "Pink color"
+PythonColorPurple = "Purple color"
+PythonColorRed = "Red color"
+PythonColorWhite = "White color"
+PythonColorYellow = "Yellow color"
+PythonComplex = "a+ib zurückgeben"
+PythonCopySign = "x mit dem Vorzeichen von y"
 PythonCos = "Kosinus"
-PythonCosh = "Hyperbolischer Kosinus"
-PythonCount = "Zählt die Vorkommen von x"
-PythonDegrees = "x von Bogenmaß in Grad umrechnen"
+PythonCosh = "Hyperbolic cosine"
+PythonCount = "Zählt wie oft x vorkommt"
+PythonDegrees = "x von Radian zu Grad umwandeln"
 PythonDivMod = "Quotient und Rest"
-PythonDrawCircle = "Zeichne einen Kreis"
-PythonDrawLine = "Eine Linie zeichnen"
-PythonDrawString = "Text bei Pixel (x,y) darstellen"
+PythonDrawString = "Schreibt Text bei (x,y)"
 PythonErf = "Fehlerfunktion"
-PythonErfc = "Komplementäre Fehlerfunktion"
-PythonEval = "Rückgabe ausgewerteter Ausdruck"
+PythonErfc = "Complementary error function"
+PythonEval = "Return the evaluated expression"
 PythonExp = "Exponentialfunktion"
 PythonExpm1 = "Berechne exp(x)-1"
-PythonFactorial = "Fakultät von x"
 PythonFabs = "Absoluter Wert"
-PythonFillRect = "Gefülltes Rechteck bei Pixel (x,y)"
-PythonFillCircle = "Füllt einen Kreis"
-PythonFillPolygon = "Füllt ein Polygon"
-PythonFloat = "x in einen Fließkommawert umwandeln"
-PythonFloor = "Abrunden"
+PythonFillRect = "Malt ein Rechteck bei Pixel (x,y)"
+PythonFloat = "Wandelt x zu float um"
+PythonFloor = "Floor"
 PythonFmod = "a modulo b"
-PythonFrExp = "Mantisse und Exponent von x: (m,e)"
-PythonGamma = "Gamma-Funktion"
-PythonGetKeys = "Gedrückte Tasten erhalten"
-PythonGetPalette = "Themenpalette erhalten"
-PythonGetPixel = "Farbe von Pixel (x,y) zurückgeben"
-PythonGetrandbits = "Ganzzahl mit k Zufallsbits"
-PythonGrid = "Sichtbarkeit des Gitters umschalten"
-PythonHex = "Ganzzahl in Hexadezimal umwandeln"
-PythonHist = "Zeichnet das Histogramm von x"
-PythonImportCmath = "cmath-Modul importieren"
-PythonImportIon = "Ion-Modul importieren"
-PythonImportKandinsky = "Kandinsky-Modul importieren"
-PythonImportRandom = "Random-Modul importieren"
-PythonImportMath = "Math-Modul importieren"
-PythonImportMatplotlibPyplot = "Matplotlib.pyplot-Modul importieren"
-PythonImportNumpy = "Ulab.numpy-Modul importieren"
-PythonImportScipy = "Ulab.scipy-Modul importieren"
-PythonImportOs = "OS-Modul importieren"
-PythonImportSys = "SYS-Modul importieren"
-PythonOsUname = "Informationen über das System holen"
-PythonOsGetlogin = "Benutzernamen holen"
+PythonFrExp = "Mantissa and exponent of x: (m,e)"
+PythonGamma = "Gamma function"
+PythonGetPixel = "Return pixel (x,y) color"
+PythonGetrandbits = "Integer with k random bits"
+PythonGrid = "Toggle the visibility of the grid"
+PythonHex = "Ganzzahl zu Hexadecimal"
+PythonHist = "Draw the histogram of x"
+PythonImportCmath = "cmath Modul importieren"
+PythonImportIon = "ion Modul importieren"
+PythonImportKandinsky = "kandinsky Modul importieren"
+PythonImportRandom = "random Modul importieren"
+PythonImportMath = "math Modul importieren"
+PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportOs = "os Modul importieren"
+PythonOsUname = "Informieren Sie sich über das System"
 PythonOsRemove = "Datei namens Dateiname entfernen"
-PythonOsRename = "Datei umbenennen von Alt nach Neu"
+PythonOsRename = "Datei mit altem Namen in neuen Namen umbenennen"
 PythonOsListdir = "Dateien im Speicher auflisten"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
-PythonImportTime = "Time-Modul importieren"
-PythonImportTurtle = "Turtle-Modul importieren"
-PythonIndex = "Index des ersten x-Vorkommens"
-PythonInput = "Einen Wert abfragen"
-PythonInsert = "x an Index i in die Liste einfügen"
-PythonInt = "x in eine ganze Zahl umwandeln"
-PythonIonFunction = "Ion-Modul-Funktionspräfix"
-PythonIsFinite = "Prüfen, ob x endlich ist"
-PythonIsInfinite = "Prüfen, ob x unendlich ist"
-PythonIsNaN = "Prüfen, ob x keine Zahl ist"
-PythonIsKeyDown = "Wahr, wenn die Taste k gedrückt ist"
-PythonBattery = "Rückgabe der Batteriespannung"
-PythonBatteryLevel = "Gibt den Batteriestand zurück"
-PythonBatteryIscharging = "Gibt zurück, ob die Batterie geladen wird"
-PythonSetBrightness = "Helligkeitsstufe festlegen"
-PythonGetBrightness = "Helligkeitsstufe abrufen"
-PythonKandinskyFunction = "Kandinsky-Modul Funktionspräfix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
+PythonImportTime = "time Modul importieren"
+PythonImportTurtle = "turtle Modul importieren"
+PythonIndex = "Index, bei dem x zuerst vorkommt"
+PythonInput = "Eingabeaufforderung"
+PythonInsert = "x bei index i in der Liste einsetzen"
+PythonInt = "x zu Ganzzahl"
+PythonIonFunction = "ion module function prefix"
+PythonIsFinite = "Prüft ob x endlich ist"
+PythonIsInfinite = "Prüft ob x unendlich ist"
+PythonIsNaN = "Prüft ob x NaN ist"
+PythonIsKeyDown = "true wenn k gedrückt ist"
+PythonKandinskyFunction = "kandinsky module function prefix"
+PythonKeyLeft = "Linke Pfeiltaste"
+PythonKeyUp = "Pfeiltaste nach oben"
+PythonKeyDown = "Pfeiltaste nach unten"
+PythonKeyRight = "Rechte Pfeiltaste"
+PythonKeyOk = "OK Taste"
+PythonKeyBack = "ZURÜCK Taste"
+PythonKeyHome = "HOME Taste"
+PythonKeyOnOff = "AN/AUS Taste"
+PythonKeyShift = "SHIFT Taste"
+PythonKeyAlpha = "ALPHA Taste"
+PythonKeyXnt = "X,N,T Taste"
+PythonKeyVar = "VAR Taste"
+PythonKeyToolbox = "WERKZEUGBOX Taste"
+PythonKeyBackspace = "LÖSCHEN Taste"
+PythonKeyExp = "EXPONENTIAL Taste"
+PythonKeyLn = "NATURAL LOGARITHM Taste"
+PythonKeyLog = "DECIMAL LOGARITHM Taste"
+PythonKeyImaginary = "IMAGINÄRES I Taste"
+PythonKeyComma = "KOMMA Taste"
+PythonKeyPower = "HOCH Taste"
+PythonKeySine = "SINUS Taste"
+PythonKeyCosine = "COSINUS Taste"
+PythonKeyTangent = "TANGENZ Taste"
+PythonKeyPi = "PI Taste"
+PythonKeySqrt = "WURZEL Taste"
+PythonKeySquare = "QUADRAT Taste"
+PythonKeySeven = "7 Taste"
+PythonKeyEight = "8 Taste"
+PythonKeyNine = "9 Taste"
 PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
 PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
-PythonLdexp = "Liefert x*(2**i), Inverse von frexp"
-PythonLength = "Länge eines Objekts"
-PythonLgamma = "Log-Gamma-Funktion"
-PythonLog = "Logarithmus zur Basis a"
-PythonLog10 = "Logarithmus zur Basis 10"
-PythonLog2 = "Logarithmus zur Basis 2"
-PythonMathFunction = "Funktionspräfix des Math-Moduls"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot Modul-Präfix"
+PythonKeyFour = "4 Taste"
+PythonKeyFive = "5 Taste"
+PythonKeySix = "6 Taste"
+PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
+PythonKeyDivision = "DIVISIONSTASTE"
+PythonKeyOne = "1 Taste"
+PythonKeyTwo = "2 Taste"
+PythonKeyThree = "3 Taste"
+PythonKeyPlus = "PLUS Taste"
+PythonKeyMinus = "MINUS Taste"
+PythonKeyZero = "0 Taste"
+PythonKeyDot = "PUNKT Taste"
+PythonKeyEe = "10 HOCH X Taste"
+PythonKeyAns = "ANS Taste"
+PythonKeyExe = "EXE Taste"
+PythonLdexp = "Return x*(2**i), inverse of frexp"
+PythonLength = "Length of an object"
+PythonLgamma = "Log-gamma function"
+PythonLog = "Logarithm to base a"
+PythonLog10 = "Logarithm to base 10"
+PythonLog2 = "Logarithm to base 2"
+PythonMathFunction = "math module function prefix"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
 PythonMax = "Maximum"
 PythonMin = "Minimum"
-PythonModf = "Bruch- und Ganzzahl-Anteile von x"
-PythonMonotonic = "Wert einer monotonen Uhr"
-PythonNumpyFunction = "numpy Modul-Präfix"
-PythonNumpyFftFunction = "numpy.fft Modul-Präfix"
-PythonNumpyLinalgFunction = "numpy.linalg Modul-Präfix"
-PythonScipyFunction = "scipy Modul-Präfix"
-PythonScipyLinalgFunction = "scipy.linalg Modul-Präfix"
-PythonScipyOptimizeFunction = "scipy.optimize Modul-Präfix"
-PythonScipySignalFunction = "scipy.signal Modul-Präfix"
-PythonScipySpecialFunction = "scipy.special Modul-Präfix"
-PythonOct = "Ganzzahl in Oktal umwandeln"
-PythonPhase = "Phase von z"
-PythonPlot = "Plotten von y gegen x als Linien"
-PythonPolar = "z in Polarkoordinaten"
-PythonPop = "Letztes Element abnehmen"
-PythonPower = "x erhöht mit der Potenz y"
-PythonPrint = "Objekt drucken"
-PythonRadians = "x von Grad in Bogenmaß umrechnen"
-PythonRandint = "Zufällige Ganzzahl in [a,b]"
-PythonRandom = "Fließkommazahl in [0,1]"
-PythonRandomFunction = "Random-Modul Funktionspräfix"
-PythonRandrange = "Zufallszahl im Bereich(start,stop)"
-PythonRangeStartStop = "Liste von Start bis Stop-1"
-PythonRangeStop = "Liste von 0 bis Stop-1"
-PythonRect = "In kartesische Koordinaten"
-PythonRemove = "Entferne das erste Vorkommen von x"
-PythonReverse = "Kehrt die Elemente der Liste um"
-PythonRound = "Runden auf n Stellen"
-PythonScatter = "Streudiagramm von y gg. x zeichnen"
-PythonSeed = "Zufallszahlengenerator initiieren"
-PythonSetPixel = "Pixel (x,y) einfärben"
-PythonShow = "Figur anzeigen"
-PythonSin = "Sinus"
-PythonSinh = "Hyperbolischer Sinus"
-PythonSleep = "Ausführung aussetzen für t Sekunden"
-PythonLocalTime = "Zeit in Tupel umwandeln"
-PythonMktime = "Tupel in Zeit umwandeln"
-PythonTime = "Abrufen des aktuellen Zeitstempels"
-PythonSetLocaltime = "Zeit aus einem Tupel einstellen"
-PythonRTCmode = "Aktuellen RTC-Modus abrufen"
-PythonSetRTCmode = "RTC-Modus festlegen"
-PythonSort = "Die Liste sortieren"
-PythonSqrt = "Quadratwurzel"
-PythonSum = "Summe der Elemente einer Liste"
+PythonModf = "Fractional and integer parts of x"
+PythonMonotonic = "Value of a monotonic clock"
+PythonOct = "Convert integer to octal"
+PythonPhase = "Phase of z"
+PythonPlot = "Plot y versus x as lines"
+PythonPolar = "z in polar coordinates"
+PythonPop = "Remove and return the last item"
+PythonPower = "x raised to the power y"
+PythonPrint = "Print object"
+PythonRadians = "Convert x from degrees to radians"
+PythonRandint = "Random integer in [a,b]"
+PythonRandom = "Floating point number in [0,1["
+PythonRandomFunction = "random module function prefix"
+PythonRandrange = "Random number in range(start,stop)"
+PythonRangeStartStop = "List from start to stop-1"
+PythonRangeStop = "List from 0 to stop-1"
+PythonRect = "Convert to cartesian coordinates"
+PythonRemove = "Remove the first occurrence of x"
+PythonReverse = "Reverse the elements of the list"
+PythonRound = "Round to n digits"
+PythonScatter = "Draw a scatter plot of y versus x"
+PythonSeed = "Initialize random number generator"
+PythonSetPixel = "Color pixel (x,y)"
+PythonShow = "Display the figure"
+PythonSin = "Sine"
+PythonSinh = "Hyperbolic sine"
+PythonSleep = "Suspend the execution for t seconds"
+PythonSort = "Sort the list"
+PythonSqrt = "Wurzel"
+PythonSum = "Sum the items of a list"
 PythonTan = "Tangens"
-PythonTanh = "Hyperbolischer Tangens"
-PythonText = "Text an (x,y) Koordinaten anzeigen"
-PythonTimeFunction = "Time-Modul-Funktionspräfix"
-PythonTrunc = "x abgeschnitten auf eine ganze Zahl"
-PythonTurtleBackward = "Um x Pixel rückwärts bewegen"
-PythonTurtleCircle = "Kreis mit Radius r Pixel"
-PythonTurtleColor = "Setzt die Stiftfarbe"
-PythonTurtleColorMode = "Setzt Farbmodus auf 1.0 oder 255"
-PythonTurtleForward = "Um x Pixel vorwärts bewegen"
-PythonTurtleFunction = "Turtle-Modul-Funktionspräfix"
-PythonTurtleGoto = "Bewegen zu (x,y) Koordinaten"
-PythonTurtleHeading = "Liefert den aktuellen Kurs"
-PythonTurtleHideturtle = "Versteckt den Igel"
-PythonTurtleIsdown = "Wahr, wenn der Stift unten ist"
-PythonTurtleLeft = "Nach links um ein Grad drehen"
-PythonTurtlePendown = "Den Stift nach unten ziehen"
-PythonTurtlePensize = "Linienstärke auf x Pixel setzen"
-PythonTurtlePenup = "Den Stift nach oben ziehen"
-PythonTurtlePosition = "Aktuelle (x,y) Position zurückgeben"
-PythonTurtleReset = "Die Zeichnung zurücksetzen"
-PythonTurtleRight = "Um ein Grad nach rechts drehen"
-PythonTurtleSetheading = "Ausrichtung auf einen Grad setzen"
-PythonTurtleShowturtle = "Den Igel anzeigen"
-PythonTurtleSpeed = "Zeichengeschwindigkeit von 0 bis 10"
-PythonTurtleWrite = "Einen Text anzeigen"
-PythonUniform = "Fließkommazahl in [a,b]"
-PythonImportTime = "Time-Modul importieren"
-PythonMonotonic = "Monotone Zeit zurückgeben"
+PythonTanh = "Hyperbolic tangent"
+PythonText = "Display a text at (x,y) coordinates"
+PythonTimeFunction = "time module function prefix"
+PythonTrunc = "x truncated to an integer"
+PythonTurtleBackward = "Move backward by x pixels"
+PythonTurtleCircle = "Circle of radius r pixels"
+PythonTurtleColor = "Stiftfarbe setzen"
+PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
+PythonTurtleForward = "Move forward by x pixels"
+PythonTurtleFunction = "turtle module function prefix"
+PythonTurtleGoto = "Move to (x,y) coordinates"
+PythonTurtleHeading = "Return the current heading"
+PythonTurtleHideturtle = "Hide the turtle"
+PythonTurtleIsdown = "Return True if the pen is down"
+PythonTurtleLeft = "Turn left by a degrees"
+PythonTurtlePendown = "Pull the pen down"
+PythonTurtlePensize = "Set the line thickness to x pixels"
+PythonTurtlePenup = "Pull the pen up"
+PythonTurtlePosition = "Return the current (x,y) location"
+PythonTurtleReset = "Reset the drawing"
+PythonTurtleRight = "Turn right by a degrees"
+PythonTurtleSetheading = "Set the orientation to a degrees"
+PythonTurtleSetposition = "Positionne la tortue"
+PythonTurtleShowturtle = "Show the turtle"
+PythonTurtleSpeed = "Drawing speed between 0 and 10"
+PythonTurtleWrite = "Display a text"
+PythonUniform = "Floating point number in [a,b]"
+PythonImportTime = "Import time module"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
+PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Öffnet eine Datei"
-PythonFileSeekable = "Kann Datei durchsucht werden?"
-PythonFileSeek = "Bewegt den Cursor einer Datei"
-PythonFileTell = "Position des Cursors ermitteln"
+PythonFileSeekable = "Ist eine Datei durchsuchbar?"
+PythonFileSeek = "Dateicursor verschieben"
+PythonFileTell = "Cursorposition der Datei abrufen"
 PythonFileClose = "Schließt eine Datei"
-PythonFileClosed = "Wahr, wenn Datei geschlossen wurde"
-PythonFileRead = "Lesen bis zu einer Größe von Bytes"
-PythonFileWrite = "Schreibe b in Datei"
-PythonFileReadline = "Liest Zeile oder Anzahl Bytes"
+PythonFileClosed = "Wenn Datei geschlossen wurde"
+PythonFileRead = "Bis zu size Bytes lesen"
+PythonFileWrite = "Schreibe b in die Datei"
+PythonFileReadline = "Lies eine Zeile"
 PythonFileReadlines = "Liest eine Liste von Zeilen"
-PythonFileTruncate = "Verkleinert die Datei auf Größe"
+PythonFileTruncate = "Größe der Datei ändern"
 PythonFileWritelines = "Schreibt eine Liste von Zeilen"
-PythonFileName = "Enthält den Namen der Datei"
-PythonFileMode = "Enthält den Öffnungsmodus der Datei"
-PythonFileReadable = "Kann Datei gelesen werden?"
-PythonFileWritable = "Kann Datei geschrieben werden?"
+PythonFileName = "Dateiname"
+PythonFileMode = "Dateiöffnungsmodus"
+PythonFileReadable = "Ist die Datei lesbar?"
+PythonFileWritable = "Ist die Datei beschreibbar?"

apps/code/catalog.en.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
-PythonDrawCircle = "Draw a circle"
-PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
 PythonEval = "Return the evaluated expression"
 PythonExp = "Exponential function"
 PythonExpm1 = "Compute exp(x)-1"
-PythonFactorial = "Factorial of x"
 PythonFabs = "Absolute value"
-PythonFillCircle = "Fill a circle"
-PythonFillPolygon = "Fill a polygon"
 PythonFillRect = "Fill a rectangle at pixel (x,y)"
 PythonFloat = "Convert x to a float"
 PythonFloor = "Floor"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa and exponent of x: (m,e)"
 PythonGamma = "Gamma function"
-PythonGetKeys = "Get keys pressed"
-PythonGetPalette = "Get theme palette"
 PythonGetPixel = "Return pixel (x,y) color"
 PythonGetrandbits = "Integer with k random bits"
 PythonGrid = "Toggle the visibility of the grid"
@@ -76,8 +69,6 @@ PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportNumpy = "Import ulab.numpy module"
-PythonImportScipy = "Import ulab.scipy module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
 PythonIndex = "Index of the first x occurrence"
@@ -88,11 +79,6 @@ PythonIonFunction = "ion module function prefix"
 PythonIsFinite = "Check if x is finite"
 PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
-PythonBattery = "Return battery voltage"
-PythonBatteryLevel = "Return battery level"
-PythonBatteryIscharging = "Return if battery is charging"
-PythonSetBrightness = "Set brightness level"
-PythonGetBrightness = "Get brightness level"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
 PythonKeyLeft = "LEFT ARROW key"
@@ -153,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractional and integer parts of x"
 PythonMonotonic = "Value of a monotonic clock"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Convert integer to octal"
 PythonPhase = "Phase of z"
 PythonPlot = "Plot y versus x as lines"
@@ -170,7 +148,7 @@ PythonPower = "x raised to the power y"
 PythonPrint = "Print object"
 PythonRadians = "Convert x from degrees to radians"
 PythonRandint = "Random integer in [a,b]"
-PythonRandom = "Floating point number in [0,1]"
+PythonRandom = "Floating point number in [0,1["
 PythonRandomFunction = "random module function prefix"
 PythonRandrange = "Random number in range(start,stop)"
 PythonRangeStartStop = "List from start to stop-1"
@@ -186,12 +164,6 @@ PythonShow = "Display the figure"
 PythonSin = "Sine"
 PythonSinh = "Hyperbolic sine"
 PythonSleep = "Suspend the execution for t seconds"
-PythonLocalTime = "Convert time into tuple"
-PythonMktime = "Convert tuple into time"
-PythonTime = "Get the current timestamp"
-PythonSetLocaltime = "Set time from a tuple"
-PythonRTCmode = "Get current RTC mode"
-PythonSetRTCmode = "Set RTC mode"
 PythonSort = "Sort the list"
 PythonSqrt = "Square root"
 PythonSum = "Sum the items of a list"
@@ -218,25 +190,19 @@ PythonTurtlePosition = "Return the current (x,y) location"
 PythonTurtleReset = "Reset the drawing"
 PythonTurtleRight = "Turn right by a degrees"
 PythonTurtleSetheading = "Set the orientation to a degrees"
+PythonTurtleSetposition = "Positionne la tortue"
 PythonTurtleShowturtle = "Show the turtle"
 PythonTurtleSpeed = "Drawing speed between 0 and 10"
 PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
-PythonImportSys = "Import sys module"
 PythonOsUname = "Get infos about the system"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Remove file named filename"
 PythonOsRename = "Rename file oldname to newname"
 PythonOsListdir = "List files in memory"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Opens a file"
 PythonFileSeekable = "Tells if seek can be used on a file"

apps/code/catalog.es.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
-PythonDrawCircle = "Draw a circle"
-PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
 PythonEval = "Return the evaluated expression"
 PythonExp = "Exponential function"
 PythonExpm1 = "Compute exp(x)-1"
-PythonFactorial = "factorial de x"
 PythonFabs = "Absolute value"
-PythonFillCircle = "Fill a circle"
-PythonFillPolygon = "Fill a polygon"
 PythonFillRect = "Fill a rectangle at pixel (x,y)"
 PythonFloat = "Convert x to a float"
 PythonFloor = "Floor"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa and exponent of x: (m,e)"
 PythonGamma = "Gamma function"
-PythonGetKeys = "Obtener teclas presionadas"
-PythonGetPalette = "Get theme palette"
 PythonGetPixel = "Return pixel (x,y) color"
 PythonGetrandbits = "Integer with k random bits"
 PythonGrid = "Toggle the visibility of the grid"
@@ -76,8 +69,6 @@ PythonImportKandinsky = "Import kandinsky module"
 PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportNumpy = "Import ulab.numpy module"
-PythonImportScipy = "Import ulab.scipy module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
 PythonIndex = "Index of the first x occurrence"
@@ -88,11 +79,6 @@ PythonIonFunction = "ion module function prefix"
 PythonIsFinite = "Check if x is finite"
 PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
-PythonBattery = "Rückgabe der Batteriespannung"
-PythonBatteryLevel = "Gibt den Batteriestand zurück"
-PythonBatteryIscharging = "Gibt zurück, ob die Batterie geladen wird"
-PythonSetBrightness = "Establecer nivel de brillo"
-PythonGetBrightness = "Obtener nivel de brillo"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
 PythonKeyLeft = "LEFT ARROW key"
@@ -153,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractional and integer parts of x"
 PythonMonotonic = "Value of a monotonic clock"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Convert integer to octal"
 PythonPhase = "Phase of z"
 PythonPlot = "Plot y versus x as lines"
@@ -186,12 +164,6 @@ PythonShow = "Display the figure"
 PythonSin = "Sine"
 PythonSinh = "Hyperbolic sine"
 PythonSleep = "Suspend the execution for t seconds"
-PythonLocalTime = "Convertir el tiempo en tupla"
-PythonMktime = "Convertir tupla en tiempo"
-PythonTime = "Obtener la marca de tiempo actual"
-PythonSetLocaltime = "Establecer tiempo desde una tupla"
-PythonRTCmode = "Obtener el modo RTC actual"
-PythonSetRTCmode = "Establecer modo RTC"
 PythonSort = "Sort the list"
 PythonSqrt = "Square root"
 PythonSum = "Sum the items of a list"
@@ -218,25 +190,19 @@ PythonTurtlePosition = "Return the current (x,y) location"
 PythonTurtleReset = "Reset the drawing"
 PythonTurtleRight = "Turn right by a degrees"
 PythonTurtleSetheading = "Set the orientation to a degrees"
+PythonTurtleSetposition = "Positionne la tortue"
 PythonTurtleShowturtle = "Show the turtle"
 PythonTurtleSpeed = "Drawing speed between 0 and 10"
 PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
-PythonImportSys = "Import sys module"
 PythonOsUname = " Información del sistema "
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Eliminar un archivo"
 PythonOsRename = "Renombrar archivo"
 PythonOsListdir = "Archivos de la lista"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Esperar n segundos"
 PythonMonotonic = "Tiempo monótono de retorno"
 PythonFileOpen = "Opens a file"
 PythonFileSeekable = "Tells if seek can be used on a file"

apps/code/catalog.fr.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Cosinus hyperbolique"
 PythonCount = "Compte les occurrences de x"
 PythonDegrees = "Conversion de radians en degrés"
 PythonDivMod = "Quotient et reste"
-PythonDrawCircle = "Trace un cercle"
-PythonDrawLine = "Trace une ligne"
 PythonDrawString = "Affiche un texte au pixel (x,y)"
 PythonErf = "Fonction d'erreur"
 PythonErfc = "Fonction d'erreur complémentaire"
 PythonEval = "Evalue l'expression en argument "
 PythonExp = "Fonction exponentielle"
 PythonExpm1 = "Calcul de exp(x)-1"
-PythonFactorial = "Factorielle de x"
 PythonFabs = "Valeur absolue"
-PythonFillCircle = "Remplit un cercle"
-PythonFillPolygon = "Remplit un polygone"
 PythonFillRect = "Remplit un rectangle"
 PythonFloat = "Conversion en flottant"
 PythonFloor = "Partie entière"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantisse et exposant de x : (m,e)"
 PythonGamma = "Fonction gamma"
-PythonGetKeys = "Obtenir les touches pressées"
-PythonGetPalette = "Obtient la palette du thème"
 PythonGetPixel = "Renvoie la couleur du pixel (x,y)"
 PythonGetrandbits = "Nombre aléatoire sur k bits"
 PythonGrid = "Affiche ou masque la grille"
@@ -76,8 +69,6 @@ PythonImportKandinsky = "Importation du module kandinsky"
 PythonImportRandom = "Importation du module random"
 PythonImportMath = "Importation du module math"
 PythonImportMatplotlibPyplot = "Importation de matplotlib.pyplot"
-PythonImportNumpy = "Importation de ulab.numpy"
-PythonImportScipy = "Importation de ulab.scipy"
 PythonImportTurtle = "Importation du module turtle"
 PythonImportTime = "Importation du module time"
 PythonIndex = "Indice première occurrence de x"
@@ -88,11 +79,6 @@ PythonIonFunction = "Préfixe fonction module ion"
 PythonIsFinite = "Teste si x est fini"
 PythonIsInfinite = "Teste si x est infini"
 PythonIsKeyDown = "Renvoie True si touche k enfoncée"
-PythonBattery = "Renvoie le voltage de la batterie"
-PythonBatteryLevel = "Renvoie le niveau de la batterie"
-PythonBatteryIscharging = "Chargement en cours"
-PythonSetBrightness = "Définir le niveau de luminosité"
-PythonGetBrightness = "Obtenir le niveau de luminosité"
 PythonIsNaN = "Teste si x est NaN"
 PythonKandinskyFunction = "Préfixe fonction module kandinsky"
 PythonKeyLeft = "Touche FLECHE GAUCHE"
@@ -153,14 +139,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Parties fractionnaire et entière"
 PythonMonotonic = "Renvoie la valeur de l'horloge"
-PythonNumpyFunction = "Préfixe fonction du module numpy"
-PythonNumpyFftFunction = "Préfixe fonction du module numpy.fft"
-PythonNumpyLinalgFunction = "Préfixe fonction du module numpy.linalg"
-PythonScipyFunction = "Préfixe fonction du module scipy"
-PythonScipyLinalgFunction = "Préfixe fonction du module scipy.linalg"
-PythonScipyOptimizeFunction = "Préfixe fonction du module scipy.optimize"
-PythonScipySignalFunction = "Préfixe fonction du module scipy.signal"
-PythonScipySpecialFunction = "Préfixe fonction du module scipy.special"
 PythonOct = "Conversion en octal"
 PythonPhase = "Argument de z"
 PythonPlot = "Trace y en fonction de x"
@@ -176,7 +154,7 @@ PythonRandrange = "Nombre dans range(start,stop)"
 PythonRangeStartStop = "Liste de start à stop-1"
 PythonRangeStop = "Liste de 0 à stop-1"
 PythonRect = "Conversion en algébrique"
-PythonRemove = "Supprime le premier x de la liste"
+PythonRemove =  "Supprime le premier x de la liste"
 PythonReverse = "Inverse les éléments de la liste"
 PythonRound = "Arrondi à n décimales"
 PythonScatter = "Nuage des points (x,y)"
@@ -186,12 +164,6 @@ PythonShow = "Affiche la figure"
 PythonSin = "Sinus"
 PythonSinh = "Sinus hyperbolique"
 PythonSleep = "Suspend l'exécution t secondes"
-PythonLocalTime = "Convertir le temps en tuple"
-PythonMktime = "Convertir le tuple en temps"
-PythonTime = "Obtenir l'horodatage actuel"
-PythonSetLocaltime = "Définir l'heure à partir d'un tuple"
-PythonRTCmode = "Obtenir le mode RTC actuel"
-PythonSetRTCmode = "Définir le mode RTC"
 PythonSort = "Trie la liste"
 PythonSqrt = "Racine carrée"
 PythonSum = "Somme des éléments de la liste"
@@ -218,38 +190,32 @@ PythonTurtlePosition = "Renvoie la position (x,y)"
 PythonTurtleReset = "Réinitialise le dessin"
 PythonTurtleRight = "Pivote de a degrés vers la droite"
 PythonTurtleSetheading = "Met un cap de a degrés"
+PythonTurtleSetposition = "Positionne la tortue"
 PythonTurtleShowturtle = "Affiche la tortue"
 PythonTurtleSpeed = "Vitesse du tracé entre 0 et 10"
 PythonTurtleWrite = "Affiche un texte"
 PythonUniform = "Nombre décimal dans [a,b]"
 PythonImportTime = "Importation du module temps"
 PythonImportOs = "Importation du module os"
-PythonImportSys = "Importation du module sys"
 PythonOsUname = "Donne des infos sur le système"
-PythonOsGetlogin = "Donne le nom d'utilisateur"
 PythonOsRemove = "Supprime le fichier nommé filename"
 PythonOsRename = "Renomme oldname en newname"
 PythonOsListdir = "Liste les fichiers"
-PythonSysExit = "Termine le programme"
-PythonSysPrintexception = "Imprime une exception"
-PythonSysByteorder = "L'ordre des octets du système"
-PythonSysImplementation = "Information sur Python"
-PythonSysModules = "Dictionnaire des modules chargés"
-PythonSysVersion = "Version du langage Python (string)"
-PythonSysVersioninfo = "Version du langage Python (tuple)"
-PythonMonotonic = "Retourne le temps monotone"
+PythonTimePrefix = "Préfixe fonction du module temps"
+PythonTimeSleep = "Attendre n secondes"
+PythonMonotonic = "Retourne le temps monotonic"
 PythonFileOpen = "Ouvre un fichier"
 PythonFileSeekable = "Indique si seek peut être utilisé"
 PythonFileSeek = "Déplace le curseur interne"
 PythonFileTell = "Donne la posititon du curseur"
 PythonFileClose = "Ferme un fichier"
 PythonFileClosed = "True si le fichier a été fermé"
-PythonFileRead = "Lit jusqu'à size bytes"
-PythonFileWrite = "Écrit b dans le fichier"
-PythonFileReadline = "Lit une ligne ou jusqu'à size bytes"
-PythonFileReadlines = "Lit une liste de lignes"
+PythonFileRead = "Lis jusqu'à size bytes"
+PythonFileWrite = "Écris b dans le fichier"
+PythonFileReadline = "Lis une ligne ou jusqu'à size bytes"
+PythonFileReadlines = "Lis une liste de lignes"
 PythonFileTruncate = "Redimensionne le fichier"
-PythonFileWritelines = "Écrit une liste de lignes"
+PythonFileWritelines = "Écris une liste de lignes"
 PythonFileName = "Nom du fichier"
 PythonFileMode = "Mode d'ouverture du fichier"
 PythonFileReadable = "Indique si read peut être utilisé"

apps/code/catalog.hu.i18n

@@ -1,256 +1,222 @@
-PythonPound = "Megjegyzés"
-PythonPercent = "Modulo"
-Python1J = "Képzeletbeli i"
-PythonLF = "Enter"
-PythonTab = "Táblázat"
-PythonAmpersand = "Logikus és"
-PythonSymbolExp = "logikus exkluzív vagy pedig"
-PythonVerticalBar = "logikus vagy pedig"
-PythonImag = "z képzeletbeli része"
-PythonReal = "z valódi része"
-PythonSingleQuote = "apostróf"
-PythonAbs = "Abszolút érték/nagyság"
-PythonAcos = "Ív (arc) koszinusz"
-PythonAcosh = "Hiperbolikus arc koszinusz"
-PythonAppend = "Lista végére hozzáadni x-et"
-PythonArrow = "(x,y) nyíla (x+dx,y+dy) nyílához"
-PythonAsin = "Ív (arc) szinusz"
-PythonAsinh = "Hiperbolikus ív (arc) szinusz"
-PythonAtan = "Ív (arc) érintö (tan)"
-PythonAtan2 = "atan(y/x) sámolása"
-PythonAtanh = "Hiperbolikus ív (arc) érintö (atan)"
-PythonAxis = "Tengelyeket (xmin,xmax,ymin,ymax)-ra állitani"
-PythonBar = "Az x lista oszlopdiagramja"
-PythonBin = "Egész szám konvertálása binárisra"
-PythonCeil = "Mennyezet"
-PythonChoice = "Véletlenszerü szám a listában"
-PythonClear = "A lista ürítése"
-PythonCmathFunction = "cmath modul funkció elötag"
-PythonColor = "Rgb (pzk) szín allítása"
-PythonColorBlack = "Fekete szín"
-PythonColorBlue = "Kék szín"
-PythonColorBrown = "Barna szín"
-PythonColorGreen = "Zöld szín"
-PythonColorGray = "Szürke szín"
-PythonColorOrange = "Narancssárga szín"
-PythonColorPink = "Rózsaszín szín"
-PythonColorPurple = "Lila szín"
-PythonColorRed = "Piros szín"
-PythonColorWhite = "Fehér szín"
-PythonColorYellow = "Sárga szín"
-PythonComplex = "A + ib visszaadása"
-PythonCopySign = "X visszaadása y jelével"
-PythonCos = "Koszinusz"
-PythonCosh = "Hiperbolikus koszinusz"
-PythonCount = "Számolja az x elöfordulását"
-PythonDegrees = "x konvertálása radiánokrol fokokra"
-PythonDivMod = "Hányados és maradék"
-PythonDrawCircle = "Rajzolj egy kört"
-PythonDrawLine = "Húzzon egy vonalat "
-PythonDrawString = "Szöveg megjelenítése (x, y)-en"
-PythonErf = "Hiba funkció"
-PythonErfc = "Kiegészítö hiba funkció"
-PythonEval = "Visszaadja az értékelt kifejezést"
-PythonExp = "Exponenciális függvény"
-PythonExpm1 = "exp(x)-1 sámitása"
-PythonFactorial = "x faktorál"
-PythonFabs = "Abszolút érték"
-PythonFillRect = "Téglalap töltése"
-PythonFillCircle = "Kitölti a kört"
-PythonFillPolygon = "Kitölti a poligont"
-PythonFloat = "Konvertálása tizedes számra"
-PythonFloor = "Egész része"
-PythonFmod = "a modulo b"
-PythonFrExp = "X mantissája és kiállítója"
-PythonGamma = "Gamma funkció"
-PythonGetKeys = "Billentyűk lenyomva"
-PythonGetPalette = "Téma paletta beszerzése"
-PythonGetPixel = "Visszatéríti (x,y) színét"
-PythonGetrandbits = "Váletlenszám visszatérítése k biten"
-PythonGrid = "Rács megjelenítése/elrejtése"
-PythonHex = "Decimális szám konvertálása hexadecimális számra"
-PythonHist = "x hisztográmiája"
-PythonImportCmath = "cmath modul importálása"
-PythonImportIon = "Ion modul importálása"
-PythonImportKandinsky = "Kandinsky modul importálása"
-PythonImportRandom = "Véletlenszerü modul importálása"
-PythonImportMath = "math modul importálása"
-PythonImportMatplotlibPyplot = "matplotlib.pyplot modul importálása"
-PythonImportNumpy = "ulab.numpy modul importálása"
-PythonImportScipy = "ulab.scipy modul importálása"
-PythonImportTurtle = "turtle modul importálása"
-PythonImportTime = "time modul importálása"
-PythonIndex = "Az elsö x esemény indexe"
-PythonInput = "Irjon egy értéket (számot)"
-PythonInsert = "x-et i. pozícióra helyezze a listában"
-PythonInt = "egész számra konvertálás"
-PythonIonFunction = "ion modul funkció elötag"
-PythonIsFinite = "x véges-e"
-PythonIsInfinite = "x végtelen-e"
-PythonIsKeyDown = "True-t válaszol ha a k gomb le van nyomva"
-PythonBattery = "Az akkumulátor feszültségének visszaadása"
-PythonBatteryLevel = "Az akkumulátor töltöttségi szintjének visszaadása"
-PythonBatteryIscharging = "Visszaadja, ha az akkumulátor töltődik"
-PythonSetBrightness = "Fényerőszint beállítása"
-PythonGetBrightness = "Get brightness level"
-PythonIsNaN = "Ellenörizze hogy x nem NaN"
-PythonKandinskyFunction = "kandinsky modul funkció elötag"
-PythonLdexp = "frexp ellentéte : x*(2**i)"
-PythonLength = "Egy targy hossza"
-PythonLgamma = "Gamma funkció logaritmusa"
-PythonLog = "a alapú logaritmus"
-PythonLog10 = "Decimális logaritmus"
-PythonLog2 = "Bináris logaritmus"
-PythonMathFunction = "math modul funkció elötag"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot elötag"
-PythonMax = "Maximum"
-PythonMin = "Minimum"
-PythonModf = "x-nek tört és egész részei"
-PythonMonotonic = "Az óra értékét adja vissza"
-PythonNumpyFunction = "numpy elötag"
-PythonNumpyFftFunction = "numpy.fft elötag"
-PythonNumpyLinalgFunction = "numpy.linalg elötag"
-PythonScipyFunction = "scipy elötag"
-PythonScipyLinalgFunction = "scipy.linalg elötag"
-PythonScipyOptimizeFunction = "scipy.optimize elötag"
-PythonScipySignalFunction = "scipy.signal elötag"
-PythonScipySpecialFunction = "scipy.special elötag"
-PythonOct = "Decimális szám konvertálása octális számra"
-PythonPhase = "z fázisa"
-PythonPlot = "y-t jelöli x függvényében"
-PythonPolar = "Verctorizálni"
-PythonPop = "Az utolsó elemet el törölni"
-PythonPower = "x y. kitevö"
-PythonPrint = "Ki irni a elemeket"
-PythonRadians = "Fokról radiánra konvertálni"
-PythonRandint = "Véletlen egész szám [a;b] -ban"
-PythonRandom = "Decimális szám [0;1] -ban"
-PythonRandomFunction = "random modul funkció elötag"
-PythonRandrange = "Véletlen szám range(start,stop)-ban"
-PythonRangeStartStop = "start-tol stop-ig listája"
-PythonRangeStop = "0 tol stop-ig lista"
-PythonRect = "Algebrai számra konvertálni"
-PythonRemove = "Elsö x elöfordulását törolni"
-PythonReverse = "A lista elemeit megfordítani (másik irány)"
-PythonRound = "N számjegyre kerekítni"
-PythonScatter = "(x,y) halmaza"
-PythonSeed = "Inicializálni a véletlenszám-választót"
-PythonSetPixel = "Az (x,y) pixel-t ki szinezni"
-PythonShow = "Mutassa az ábrát"
-PythonSin = "Szinusz"
-PythonSinh = "Hiperbolikus szinusz"
-PythonSleep = "t másodpercre meg állitani a programmot"
-PythonLocalTime = "Idő konvertálása csomóvá"
-PythonMktime = "A tuple konvertálása az időben"
-PythonTime = "Az aktuális időbélyeg letöltése"
-PythonSetLocaltime = "Idő beállítása egy csomóból"
-PythonRTCmode = "Aktuális RTC mód"
-PythonSetRTCmode = "RTC mód beállítása"
-PythonSort = "A listát rendezni"
-PythonSqrt = "Négyzetgyök"
-PythonSum = "Összeadni a lista elemeit"
-PythonTan = "Érintö (tan)"
-PythonTanh = "Hiperbolikus érintö (tan)"
-PythonText = "(x,y) nél egy szöveget irni"
-PythonTimeFunction = "time funkció elötag"
-PythonTrunc = "Egész csonka (?)"
-PythonTurtleBackward = "x pixelt hátra"
-PythonTurtleCircle = "r pixel sugarú kört rajzolni"
-PythonTurtleColor = "Toll szinét beállitani"
-PythonTurtleColorMode = "Szin módot 1.0-ra vagy 255-ra állitani"
-PythonTurtleForward = "x pixelt elölre"
-PythonTurtleFunction = "turtle modul funkció elötag"
-PythonTurtleGoto = "Menjen a (x,y) koordinátákra"
-PythonTurtleHeading = "Visszaadja az aktuális irányt"
-PythonTurtleHideturtle = "A teknös elrejtése"
-PythonTurtleIsdown = "True-t válaszol ha a toll irás pozícióban van"
-PythonTurtleLeft = "a fokkot forduljon balra"
-PythonTurtlePendown = "Húzza le a tollat"
-PythonTurtlePensize = "Állítsa a vonalvastagságot x pixelre"
-PythonTurtlePenup = "Húzza fel a tollat"
-PythonTurtlePosition = "Az aktuális (x,y) pozíciót visszaadása"
-PythonTurtleReset = "Visszaállitani a rajzot (torléssel)"
-PythonTurtleRight = "a fokkot forduljon jobbra"
-PythonTurtleSetheading = "a fokokra állítja be az irányt"
-PythonTurtleShowturtle = "A teknöst meg mutatni"
-PythonTurtleSpeed = "Rajzolási sebesség 0 és 10 között"
-PythonTurtleWrite = "Szöveg irás"
-PythonUniform = "Lebegöpontos szám [a,b] -ban"
-PythonImportTime = "time modul importálása"
-PythonMonotonic = "Meg fordítani a monoton idö"
-PythonFileOpen = "Fájl megnyitása"
-PythonFileSeekable = "Seek-et lehete használni"
-PythonFileSeek = "A kurzort áthelyezni"
-PythonFileTell = "Visszaadja a kurzor helye"
-PythonFileClose = "Bezárni egy fájlt"
-PythonFileClosed = "True ha a fájl bezárva"
-PythonFileRead = "Olvas 16 bájtig"
-PythonFileWrite = "b-t irjon a fájlba"
-PythonFileReadline = "Olvas egy sort vagy 16 bájtig"
-PythonFileReadlines = "Olvas több sort"
-PythonFileTruncate = "A fájl átméretezése"
-PythonFileWritelines = "Irjon több sort"
-PythonFileName = "A fájl neve"
-PythonFileMode = "A fájl nyitott módja"
-PythonFileReadable = "read-et lehete használni"
-PythonFileWritable = "write-ot lehete használni"
-PythonImportOs = "os modul importálása"
-PythonOsUname = "Rendszer informaciók"
-PythonOsGetlogin = "Get username"
-PythonOsRemove = "Fájl törlése"
-PythonOsRename = "Fájl átnevezése"
-PythonOsListdir = "Fájlok listája"
-PythonImportSys = "sys modul importálása"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
-PythonKeyLeft = "BALRA NYÍL billentyű"
-PythonKeyUp = "FEL NYÍL billentyű"
-PythonKeyDown = "LE NYÍL billentyű"
-PythonKeyRight = "JOBBRA NYÍL billentyű"
-PythonKeyOk = "OK gomb"
-PythonKeyBack = "VISSZA gomb"
-PythonKeyHome = "Lakáskulcs"
-PythonKeyOnOff = "BE/KI gomb"
-PythonKeyShift = "SHIFT billentyű"
-PythonKeyAlpha = "ALPHA kulcs"
-PythonKeyXnt = "X,N,T gomb"
-PythonKeyVar = "VAR gomb"
-PythonKeyToolbox = "TOOLBOX gomb"
-PythonKeyBackspace = "BACKSPACE billentyű"
-PythonKeyExp = "EXPONENTIÁLIS kulcs"
-PythonKeyLn = "TERMÉSZETES LOGARITMUS kulcs"
-PythonKeyLog = "DECIMÁLIS LOGARITMUS billentyű"
-PythonKeyImaginary = "KÉPZELETES I kulcs"
-PythonKeyComma = "VESZSŰ gomb"
-PythonKeyPower = "POWER gomb"
-PythonKeySine = "SINE gomb"
-PythonKeyCosine = "KOSINUS kulcs"
-PythonKeyTangent = "ÉRINTŐ gomb"
-PythonKeyPi = "PI kulcs"
-PythonKeySqrt = "NÉGYGYÖK kulcs"
-PythonKeySquare = "SZÖGZET billentyű"
-PythonKeySeven = "7 kulcs"
-PythonKeyEight = "8 kulcs"
-PythonKeyNine = "9 kulcs"
-PythonKeyLeftParenthesis = "BAL ZÁRÓZELŐ gomb"
-PythonKeyRightParenthesis = "JOBB ZÁRÓZELŐ billentyű"
-PythonKeyFour = "4 kulcs"
-PythonKeyFive = "5 kulcs"
-PythonKeySix = "6 kulcs"
-PythonKeyMultiplication = "SZORZAT gomb"
-PythonKeyDivision = "OSZTÁS kulcs"
-PythonKeyOne = "1 kulcs"
-PythonKeyTwo = "2 kulcs"
-PythonKeyThree = "3 kulcs"
-PythonKeyPlus = "PLUSZ kulcs"
-PythonKeyMinus = "MÍNUS gomb"
-PythonKeyZero = "0 kulcs"
-PythonKeyDot = "DOT gomb"
-PythonKeyEe = "10 POWER X gomb"
-PythonKeyAns = "ANS kulcs"
-PythonKeyExe = "EXE kulcs"
+PythonPound = "Megjegyzés"
+PythonPercent = "Modulo"
+Python1J = "Képzeletbeli i"
+PythonLF = "Line feed"
+PythonTab = "Táblázat"
+PythonAmpersand = "Bitwise és"
+PythonSymbolExp = "Bitwise exkluzív vagy"
+PythonVerticalBar = "Bitwise vagy"
+PythonImag = "z képzeletbeli része"
+PythonReal = "z valódi része"
+PythonSingleQuote = "Egyetlen idézet"
+PythonAbs = "Abszolút érték / nagyság"
+PythonAcos = "Arc koszinusz"
+PythonAcosh = "Íves hiperbolikus koszinusz"
+PythonAppend = "x hozzáadása a lista végéhez"
+PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
+PythonAsin = "Arc szinusz"
+PythonAsinh = "Íves hiperbolikus szinusz"
+PythonAtan = "Arc érintö"
+PythonAtan2 = "Visszatérés atan (y / x)"
+PythonAtanh = "Arc hiperbolikus érintö"
+PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
+PythonBar = "Draw a bar plot with x values"
+PythonBin = "Egész szám konvertálása binárisra"
+PythonCeil = "Mennyezet"
+PythonChoice = "Véletlenszerü szám a listában"
+PythonClear = "A lista ürítése"
+PythonCmathFunction = "cmath modul funkció elötag"
+PythonColor = "Rgb szín meghatározása"
+PythonColorBlack = "Fekete szín"
+PythonColorBlue = "Kék szín"
+PythonColorBrown = "Barna szín"
+PythonColorGreen = "Zöld szín"
+PythonColorGrey = "Szürke szín"
+PythonColorOrange = "Narancssárga szín"
+PythonColorPink = "Rózsaszín szín"
+PythonColorPurple = "Lila szín"
+PythonColorRed = "Piros szín"
+PythonColorWhite = "White color"
+PythonColorYellow = "Sárga szín"
+PythonComplex = "A + ib visszaadása"
+PythonCopySign = "Visszatérés x-val y jelével"
+PythonCos = "Koszinusz"
+PythonCosh = "Hiperbolikus koszinusz"
+PythonCount = "Számolja az x elöfordulását"
+PythonDegrees = "x konvertálása x-röl radiánokra fokokra"
+PythonDivMod = "Hányados és maradék"
+PythonDrawString = "Szöveg megjelenítése pixelböl (x, y)"
+PythonErf = "Hiba funkció"
+PythonErfc = "Kiegészítö hibafunkció"
+PythonEval = "Visszaadja az értékelt kifejezést"
+PythonExp = "Exponenciális függvény"
+PythonExpm1 = "Számítsuk ki az exp (x) -1-et"
+PythonFabs = "Abszolút érték"
+PythonFillRect = "Töltsön meg egy téglalapot pixelnél (x, y)"
+PythonFloat = "x konvertálása float-ra"
+PythonFloor = "Emelet"
+PythonFmod = "a modulo b"
+PythonFrExp = "Mantissa és az x exponense"
+PythonGamma = "Gamma funkció"
+PythonGetPixel = "Visszatérési pixel (x, y) szín"
+PythonGetrandbits = "Egész szám k véletlen bittel"
+PythonGrid = "Toggle the visibility of the grid"
+PythonHex = "Egész szám konvertálása hexadecimálisra"
+PythonHist = "Draw the histogram of x"
+PythonImportCmath = "cmath modul importálása"
+PythonImportIon = "Ion modul importálása"
+PythonImportKandinsky = "Kandinsky modul importálása"
+PythonImportRandom = "Véletlenszerü modul importálása"
+PythonImportMath = "Import matematikai modul"
+PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportTime = "Idömodul importálása"
+PythonImportOs = "Os modul importálása"
+PythonOsUname = "Információ a rendszerről"
+PythonOsRemove = "Fájl eltávolítása"
+PythonOsRename = "Fájl átnevezése"
+PythonOsListdir = "Fájlok listázása"
+PythonImportTurtle = "Import teknös modul"
+PythonIndex = "Az elsö x esemény indexe"
+PythonInput = "Érték kérése"
+PythonInsert = "Helyezzen x-t az i indexbe a listában"
+PythonInt = "x konvertálása egész számra"
+PythonIonFunction = "ion modul funkció elötag"
+PythonIsFinite = "Ellenörizze, hogy x véges-e"
+PythonIsInfinite = "Ellenörizze, hogy x végtelen-e"
+PythonIsKeyDown = "True true, ha a k gomb le van nyomva"
+PythonIsNaN = "Ellenörizze, hogy x nem NaN"
+PythonKandinskyFunction = "kandinsky modul function prefix"
+PythonKeyLeft = "Balra nyíl gomb"
+PythonKeyUp = "FEL NYÍL gomb"
+PythonKeyDown = "LE nyíl gomb"
+PythonKeyRight = "JOBB NYÍL gomb"
+PythonKeyOk = "OK gomb"
+PythonKeyBack = "VISSZA kulcs"
+PythonKeyHome = "HOME kulcs"
+PythonKeyOnOff = "BE / KI gomb"
+PythonKeyShift = "SHIFT kulcs"
+PythonKeyAlpha = "ALPHA kulcs"
+PythonKeyXnt = "X, N, T kulcs"
+PythonKeyVar = "VAR kulcs"
+PythonKeyToolbox = "TOOLBOX kulcs"
+PythonKeyBackspace = "BACKSPACE kulcs"
+PythonKeyExp = "EXPONENTIAL kulcs"
+PythonKeyLn = "NATURAL LOGARITHM kulcs"
+PythonKeyLog = "DECIMAL LOGARITHM kulcs"
+PythonKeyImaginary = "IMAGINÁRIS I kulcs"
+PythonKeyComma = "COMMA kulcs"
+PythonKeyPower = "POWER kulcs"
+PythonKeySine = "SINE kulcs"
+PythonKeyCosine = "KOSZIN kulcs"
+PythonKeyTangent = "TANGENT kulcs"
+PythonKeyPi = "PI kulcs"
+PythonKeySqrt = "SQUARE ROOT kulcs"
+PythonKeySquare = "SQUARE kulcs"
+PythonKeySeven = "7 kulcs"
+PythonKeyEight = "8 kulcs"
+PythonKeyNine = "9 kulcs"
+PythonKeyLeftParenthesis = "Bal oldali PARENTHESIS kulcs"
+PythonKeyRightParenthesis = "JOGOS SZÜLETÉS kulcs"
+PythonKeyFour = "4 kulcs"
+PythonKeyFive = "5 kulcs"
+PythonKeySix = "6 kulcs"
+PythonKeyMultiplication = "TÖBB MüKÖDÉS kulcs"
+PythonKeyDivision = "DIVISION kulcs"
+PythonKeyOne = "1 kulcs"
+PythonKeyTwo = "2 kulcs"
+PythonKeyThree = "3 kulcs"
+PythonKeyPlus = "PLUS kulcs"
+PythonKeyMinus = "MINUS kulcs"
+PythonKeyZero = "0 kulcs"
+PythonKeyDot = "DOT kulcs"
+PythonKeyEe = "10 POWER X kulcs"
+PythonKeyAns = "ANS kulcs"
+PythonKeyExe = "EXE kulcs"
+PythonLdexp = "Visszatérés x * (2 ** i), inverz a frexp értékhez"
+PythonLength = "Objektum hossza"
+PythonLgamma = "Log-gamma funkció"
+PythonLog = "Logaritmus az alap"
+PythonLog10 = "Logaritmus az alaphoz 10"
+PythonLog2 = "Logaritmus az alaphoz 2"
+PythonMathFunction = "matematikai modul funkció elötag"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
+PythonMax = "Maximum"
+PythonMin = "Minimum"
+PythonModf = "Az x tört és egész részei"
+PythonMonotonic = "A monoton óra értéke"
+PythonOct = "Egész szám konvertálása oktális értékre"
+PythonPhase = "z fázis"
+PythonPlot = "Plot y versus x as lines"
+PythonPolar = "z poláris koordinátákban"
+PythonPop = "Az utolsó elem eltávolítása és visszaküldése"
+PythonPower = "x emelve az y teljesítményre"
+PythonPrint = "Objektum nyomtatása"
+PythonRadians = "x konvertálása x fokról radiánra"
+PythonRandint = "Véletlen egész szám [a, b] -ben"
+PythonRandom = "Lebegöpontos szám [0,1-ben ["
+PythonRandomFunction = "véletlenszerü modul funkció elötag"
+PythonRandrange = "Véletlen szám a tartományban (start, stop)"
+PythonRangeStartStop = "Lista az elejétöl a stop-1-ig"
+PythonRangeStop = "Lista 0-tól stop-1-ig"
+PythonRect = "z derékszögü koordinátákban"
+PythonRemove = "Távolítsa el az x elsö elöfordulását"
+PythonReverse = "A lista elemeinek megfordítása"
+PythonRound = "N számjegyre kerekítve"
+PythonScatter = "Draw a scatter plot of y versus x"
+PythonSeed = "Inicializálja a véletlenszám-generátort"
+PythonSetPixel = "Színes pixel (x, y)"
+PythonShow = "Display the figure"
+PythonSin = "Sine"
+PythonSinh = "Hiperbolikus szinusz"
+PythonSleep = "A végrehajtás felfüggesztése t másodpercre"
+PythonSort = "A lista rendezése"
+PythonSqrt = "Négyzetgyök"
+PythonSum = "Összegzi a lista elemeit"
+PythonTan = "Érintö"
+PythonTanh = "Hiperbolikus érintö"
+PythonText = "Display a text at (x,y) coordinates"
+PythonTimeFunction = "idömodul funkció elötag"
+PythonTrunc = "x egészre csonkítva"
+PythonTurtleBackward = "Visszalépés x pixelrel"
+PythonTurtleCircle = "r pixel sugarú kör"
+PythonTurtleColor = "Állítsa be az toll színét"
+PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
+PythonTurtleForward = "Ugrás x pixelrel"
+PythonTurtleFunction = "teknös modul funkció elötag"
+PythonTurtleGoto = "Mozgatás (x, y) koordinátákra"
+PythonTurtleHeading = "Visszaadja az aktuális címsort"
+PythonTurtleHideturtle = "A teknös elrejtése"
+PythonTurtleIsdown = "Visszatérés igazhoz, ha az toll lefelé"
+PythonTurtleLeft = "Forduljon fokkal balra"
+PythonTurtlePendown = "Húzza le a tollat"
+PythonTurtlePensize = "Állítsa a vonalvastagságot x pixelre"
+PythonTurtlePenup = "Húzza fel a tollat"
+PythonTurtlePosition = "Az aktuális (x, y) hely visszaadása"
+PythonTurtleReset = "A rajz visszaállítása"
+PythonTurtleRight = "Forduljon fokkal jobbra"
+PythonTurtleSetheading = "Állítsa be a tájolást fokokra"
+PythonTurtleSetposition = "A helymeghatározás"
+PythonTurtleShowturtle = "Mutasd a teknösöt"
+PythonTurtleSpeed = "Rajzolási sebesség 0 és 10 között"
+PythonTurtleWrite = "Display a text"
+PythonUniform = "Lebegöpontos szám [a, b] -ben"
+PythonImportTime = "Idömodul importálása"
+PythonTimePrefix = "idömodul funkció elötag"
+PythonTimeSleep = "Várj n másodpercet"
+PythonMonotonic = "Vissza a monoton idö"
+PythonFileOpen = "Fájl megnyitása"
+PythonFileSeekable = "A fájl kereshető?"
+PythonFileSeek = "A fájl kurzorának áthelyezése"
+PythonFileTell = "A fájl kurzorának helye"
+PythonFileClose = "Bezár egy fájlt"
+PythonFileClosed = "Igaz, ha a fájl bezárt"
+PythonFileRead = "Olvasson méretbájtig"
+PythonFileWrite = "B beírása fájlba"
+PythonFileReadline = "Olvas egy sort"
+PythonFileReadlines = "Olvassa a sorok listáját"
+PythonFileTruncate = "A fájl átméretezése méretre"
+PythonFileWritelines = "Sorok listáját írja"
+PythonFileName = "a fájl neve"
+PythonFileMode = "a fájl nyitott módja"
+PythonFileReadable = "A fájl olvasható?"
+PythonFileWritable = "A fájl írható?"

apps/code/catalog.it.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Coseno iperbolico"
 PythonCount = "Conta le ricorrenze di x"
 PythonDegrees = "Conversione di radianti in gradi"
 PythonDivMod = "Quoziente e resto"
-PythonDrawCircle = "Disegnare un cerchio"
-PythonDrawLine = "Disegna una linea"
 PythonDrawString = "Visualizza il testo dal pixel x,y"
 PythonErf = "Funzione d'errore"
 PythonErfc = "Funzione d'errore complementare"
 PythonEval = "Valuta l'espressione nell'argomento "
 PythonExp = "Funzione esponenziale"
 PythonExpm1 = "Calcola exp(x)-1"
-PythonFactorial = "Fattoriale di x"
 PythonFabs = "Valore assoluto"
-PythonFillCircle = "Riempire un cerchio"
-PythonFillPolygon = "Riempire un poligono"
 PythonFillRect = "Riempie un rettangolo"
 PythonFloat = "Conversione in flottanti"
 PythonFloor = "Parte intera"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantissa ed esponente di x : (m,e)"
 PythonGamma = "Funzione gamma"
-PythonGetKeys = "Premere i tasti"
-PythonGetPalette = "Ottieni la tavolozza del tema"
 PythonGetPixel = "Restituisce colore del pixel(x,y)"
 PythonGetrandbits = "Numero aleatorio con k bit"
 PythonGrid = "Attiva la visibilità della griglia"
@@ -76,24 +69,13 @@ PythonImportKandinsky = "Importa modulo kandinsky"
 PythonImportRandom = "Importa modulo random"
 PythonImportMath = "Importa modulo math"
 PythonImportMatplotlibPyplot = "Importa modulo matplotlib.pyplot"
-PythonImportNumpy = "Importa modulo ulab.numpy"
-PythonImportScipy = "Importa modulo ulab.scipy"
 PythonImportTurtle = "Importa del modulo turtle"
 PythonImportTime = "Importa del modulo time"
 PythonImportOs = "Importa modulo os"
 PythonOsUname = "Ottieni informazioni sul sistema"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Rimuovere un file"
 PythonOsRename = "Rinomina file"
 PythonOsListdir = "Elenca file"
-PythonImportSys = "Importa modulo sys"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonIndex = "Indice prima occorrenza di x"
 PythonInput = "Inserire un valore"
 PythonInsert = "Inserire x in posizione i-esima"
@@ -102,11 +84,6 @@ PythonIonFunction = "Prefisso di funzione modulo ion"
 PythonIsFinite = "Testa se x è finito"
 PythonIsInfinite = "Testa se x est infinito"
 PythonIsKeyDown = "Restituisce True premendo tasto k"
-PythonBattery = "Restituisce la tensione della batteria"
-PythonBatteryLevel = "Restituisce il livello della batteria"
-PythonBatteryIscharging = "Restituisce se la batteria è in carica"
-PythonSetBrightness = "Imposta livello di luminosità"
-PythonGetBrightness = "Ottieni livello di luminosità"
 PythonIsNaN = "Testa se x è NaN"
 PythonKandinskyFunction = "Prefisso funzione modulo kandinsky"
 PythonKeyLeft = "Tasto FRECCIA SINISTRA"
@@ -167,14 +144,6 @@ PythonMax = "Massimo"
 PythonMin = "Minimo"
 PythonModf = "Parti frazionarie e intere"
 PythonMonotonic = "Restituisce il valore dell'orologio"
-PythonNumpyFunction = "Prefisso modulo numpy"
-PythonNumpyFftFunction = "Prefisso modulo numpy.fft"
-PythonNumpyLinalgFunction = "Prefisso modulo numpy.linalg"
-PythonScipyFunction = "Prefisso modulo scipy"
-PythonScipyLinalgFunction = "Prefisso modulo scipy.linalg"
-PythonScipyOptimizeFunction = "Prefisso modulo scipy.optimize"
-PythonScipySignalFunction = "Prefisso modulo scipy.signal"
-PythonScipySpecialFunction = "Prefisso modulo scipy.special"
 PythonOct = "Conversione in ottale"
 PythonPhase = "Argomento di z"
 PythonPlot = "Disegna y in f. di x come linee"
@@ -190,7 +159,7 @@ PythonRandrange = "Numero dentro il range(start, stop)"
 PythonRangeStartStop = "Lista da start a stop-1"
 PythonRangeStop = "Lista da 0 a stop-1"
 PythonRect = "Converte in coordinate algebriche"
-PythonRemove = "Cancella la prima x dalla lista"
+PythonRemove =  "Cancella la prima x dalla lista"
 PythonReverse = "Inverte gli elementi della lista"
 PythonRound = "Arrotondato a n cifre decimali"
 PythonScatter = "Diagramma dispersione y in f. di x"
@@ -200,12 +169,6 @@ PythonShow = "Mostra la figura"
 PythonSin = "Seno"
 PythonSinh = "Seno iperbolico"
 PythonSleep = "Sospende l'esecuzione t secondi"
-PythonLocalTime = "Converti il tempo in tuple"
-PythonMktime = "Converti tuple in tempo"
-PythonTime = "Ottieni il timestamp corrente"
-PythonSetLocaltime = "Imposta il tempo da una tupla"
-PythonRTCmode = "Ottieni la modalità RTC corrente"
-PythonSetRTCmode = "Imposta modalità RTC"
 PythonSort = "Ordina l'elenco"
 PythonSqrt = "Radice quadrata"
 PythonSum = "Somma degli elementi della lista"
@@ -232,11 +195,14 @@ PythonTurtlePosition = "Fornisce posizione corrente (x,y)"
 PythonTurtleReset = "Azzera il disegno"
 PythonTurtleRight = "Ruota di a gradi a destra"
 PythonTurtleSetheading = "Imposta l'orientamento per a gradi"
+PythonTurtleSetposition = "Posiziona la tartaruga"
 PythonTurtleShowturtle = "Mostra la tartaruga"
 PythonTurtleSpeed = "Velocità di disegno (x tra 0 e 10)"
 PythonTurtleWrite = "Mostra un testo"
 PythonUniform = "Numero decimale tra [a,b]"
 PythonImportTime = "Import time module"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Opens a file"
 PythonFileSeekable = "Tells if seek can be used on a file"

apps/code/catalog.nl.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Cosinus hyperbolicus"
 PythonCount = "Tel voorkomen van x"
 PythonDegrees = "Zet x om van radialen naar graden"
 PythonDivMod = "Quotiënt en rest"
-PythonDrawCircle = "Teken een cirkel"
-PythonDrawLine = "Teken een lijn"
 PythonDrawString = "Geef een tekst weer van pixel (x,y)"
 PythonErf = "Error functie"
 PythonErfc = "Complementaire error functie"
 PythonEval = "Geef de geëvalueerde uitdrukking"
 PythonExp = "Exponentiële functie"
 PythonExpm1 = "Bereken exp(x)-1"
-PythonFactorial = "faculteit van x"
 PythonFabs = "Absolute waarde"
-PythonFillCircle = "Vul een cirkel"
-PythonFillPolygon = "Vul een veelhoek"
 PythonFillRect = "Vul een rechthoek bij pixel (x,y)"
 PythonFloat = "Zet x om in een float"
 PythonFloor = "Vloer"
 PythonFmod = "a modulo b"
 PythonFrExp = "Mantisse en exponent van x: (m,e)"
 PythonGamma = "Gammafunctie"
-PythonGetKeys = "Get toetsen ingedrukt"
-PythonGetPalette = "Thema palet krijgen"
 PythonGetPixel = "Geef pixel (x,y) kleur (rgb)"
 PythonGetrandbits = "Integer met k willekeurige bits"
 PythonGrid = "Verander zichtbaarheid raster"
@@ -76,24 +69,12 @@ PythonImportKandinsky = "Importeer kandinsky module"
 PythonImportRandom = "Importeer random module"
 PythonImportMath = "Importeer math module"
 PythonImportMatplotlibPyplot = "Importeer matplotlib.pyplot module"
-PythonImportNumpy = "Importeer ulab.numpy module"
-PythonImportScipy = "Importeer ulab.scipy module"
 PythonImportTime = "Importeer time module"
 PythonImportOs = "Importeer os module"
 PythonOsUname = " Krijg systeeminfo"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Een bestand verwijderen"
 PythonOsRename = "Hernoem bestand"
 PythonOsListdir = "Lijstbestanden"
-PythonImportSys = "Importeer sys module"
-PythonImportSys = "Importeer sys module"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
 PythonImportTurtle = "Importeer turtle module"
 PythonIndex = "Index van de eerste x aanwezigheden"
 PythonInput = "Wijs een waarde toe"
@@ -103,11 +84,6 @@ PythonIonFunction = "ion module voorvoegsel"
 PythonIsFinite = "Controleer of x eindig is"
 PythonIsInfinite = "Controleer of x oneindig is"
 PythonIsKeyDown = "Geef True als k toets omlaag is"
-PythonBattery = "Return batterijspanning"
-PythonBatteryLevel = "Batterijniveau teruggeven"
-PythonBatteryIscharging = "Keer terug als de batterij wordt opgeladen"
-PythonSetBrightness = "Set brightness level"
-PythonGetBrightness = "Get brightness level"
 PythonIsNaN = "Controleer of x geen getal is"
 PythonKandinskyFunction = "kandinsky module voorvoegsel"
 PythonKeyLeft = "PIJL NAAR LINKS toets"
@@ -168,14 +144,6 @@ PythonMax = "Maximum"
 PythonMin = "Minimum"
 PythonModf = "Fractionele en gehele delen van x"
 PythonMonotonic = "Waarde van een monotone klok"
-PythonNumpyFunction = "numpy module prefix"
-PythonNumpyFftFunction = "numpy.fft module prefix"
-PythonNumpyLinalgFunction = "numpy.linalg module prefix"
-PythonScipyFunction = "scipy module prefix"
-PythonScipyLinalgFunction = "scipy.linalg module prefix"
-PythonScipyOptimizeFunction = "scipy.optimize module prefix"
-PythonScipySignalFunction = "scipy.signal module prefix"
-PythonScipySpecialFunction = "scipy.special module prefix"
 PythonOct = "Integer omzetten naar octaal"
 PythonPhase = "Fase van z in radialen"
 PythonPlot = "Plot y versus x als lijnen"
@@ -198,15 +166,9 @@ PythonScatter = "Teken scatterplot van y versus x"
 PythonSeed = "Start willek. getallengenerator"
 PythonSetPixel = "Kleur pixel (x,y)"
 PythonShow = "Figuur weergeven"
-PythonSin = "Sinus"
+PythonSin= "Sinus"
 PythonSinh = "Sinus hyperbolicus"
 PythonSleep = "Stel executie voor t seconden uit"
-PythonLocalTime = "Zet tijd om in tuple"
-PythonMktime = "Tuple omzetten in tijd"
-PythonTime = "Haal de huidige tijdstempel"
-PythonSetLocaltime = "Stel de tijd in vanaf een tuple"
-PythonRTCmode = "Huidige RTC-modus kregen"
-PythonSetRTCmode = "RTC-modus instellen"
 PythonSort = "Sorteer de lijst"
 PythonSqrt = "Vierkantswortel"
 PythonSum = "Sommeer de items van een lijst"
@@ -233,11 +195,14 @@ PythonTurtlePosition = "Zet huidige (x,y) locatie terug"
 PythonTurtleReset = "Reset de tekening"
 PythonTurtleRight = "Ga rechtsaf met a graden"
 PythonTurtleSetheading = "Zet de oriëntatie op a graden"
+PythonTurtleSetposition = "Plaats de schildpad"
 PythonTurtleShowturtle = "Laat de schildpad zien"
 PythonTurtleSpeed = "Tekensnelheid tussen 0 and 10"
 PythonTurtleWrite = "Display a text"
 PythonUniform = "Decimaal getal in [a,b]"
 PythonImportTime = "Import time module"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Opens a file"
 PythonFileSeekable = "Tells if seek can be used on a file"

apps/code/catalog.pt.i18n

@@ -45,26 +45,19 @@ PythonCosh = "Cosseno hiperbólico"
 PythonCount = "Contar as ocorrências de x"
 PythonDegrees = "Converter x de radianos para graus"
 PythonDivMod = "Quociente e resto"
-PythonDrawCircle = "Desenha um círculo"
-PythonDrawLine = "Desenhe uma linha"
 PythonDrawString = "Mostrar o texto do pixel (x,y)"
 PythonErf = "Função erro"
 PythonErfc = "Função erro complementar"
 PythonEval = "Devolve a expressão avaliada"
 PythonExp = "Função exponencial"
 PythonExpm1 = "Calcular exp(x)-1"
-PythonFactorial = "Fatorial de x"
 PythonFabs = "Valor absoluto"
-PythonFillCircle = "Preencher um círculo"
-PythonFillPolygon = "Preencher um polígono"
 PythonFillRect = "Preencher um retângulo em (x,y)"
 PythonFloat = "Converter x num flutuante"
 PythonFloor = "Parte inteira"
 PythonFmod = "a módulo b"
 PythonFrExp = "Coeficiente e expoente de x: (m, e)"
 PythonGamma = "Função gama"
-PythonGetKeys = "Obter teclas pressionadas"
-PythonGetPalette = "Obter paleta temática"
 PythonGetPixel = "Devolve a cor do pixel (x,y)"
 PythonGetrandbits = "Número inteiro aleatório com k bits"
 PythonGrid = "Alterar visibilidade da grelha"
@@ -76,8 +69,6 @@ PythonImportKandinsky = "Importar módulo kandinsky"
 PythonImportRandom = "Importar módulo random"
 PythonImportMath = "Importar módulo math"
 PythonImportMatplotlibPyplot = "Importar módulo matplotlib.pyplot"
-PythonImportNumpy = "Importar módulo ulab.numpy"
-PythonImportScipy = "Importar módulo ulab.scipy"
 PythonImportTime = "Importar módulo time"
 PythonImportTurtle = "Importar módulo turtle"
 PythonIndex = "Índice da primeira ocorrência de x"
@@ -88,11 +79,6 @@ PythonIonFunction = "Prefixo da função do módulo ion"
 PythonIsFinite = "Verificar se x é finito"
 PythonIsInfinite = "Verificar se x é infinito"
 PythonIsKeyDown = "Devolve True se tecla k pressionada"
-PythonBattery = "Retornar a voltagem da bateria"
-PythonBatteryLevel = "Retornar nível de bateria"
-PythonBatteryIscharging = "Retorne se a bateria estiver carregando"
-PythonSetBrightness = "Definir nível de brilho"
-PythonGetBrightness = "Obter nível de brilho"
 PythonIsNaN = "Verificar se x é um NaN"
 PythonKandinskyFunction = "Prefixo da função do módulo kandinsky"
 PythonKeyLeft = "tecla SETA ESQUERDA"
@@ -153,14 +139,6 @@ PythonMax = "Máximo"
 PythonMin = "Mínimo"
 PythonModf = "Partes inteira e frácionária de x"
 PythonMonotonic = "Devolve o valor do relógio"
-PythonNumpyFunction = "Prefixo do módulo numpy"
-PythonNumpyFftFunction = "Prefixo do módulo numpy.fft"
-PythonNumpyLinalgFunction = "Prefixo do módulo numpy.linalg"
-PythonScipyFunction = "Prefixo do módulo scipy"
-PythonScipyLinalgFunction = "Prefixo do módulo scipy.linalg"
-PythonScipyOptimizeFunction = "Prefixo do módulo scipy.optimize"
-PythonScipySignalFunction = "Prefixo do módulo scipy.signal"
-PythonScipySpecialFunction = "Prefixo do módulo scipy.special"
 PythonOct = "Converter número inteiro em octal"
 PythonPhase = "Argumento de z"
 PythonPlot = "Desenhar y em função de x"
@@ -186,12 +164,6 @@ PythonShow = "Mostrar a figura"
 PythonSin = "Seno"
 PythonSinh = "Seno hiperbólico"
 PythonSleep = "Suspender a execução por t segundos"
-PythonLocalTime = "Convert o tempo em tupla"
-PythonMktime = "Convert tuple em tempo"
-PythonTime = "Obter o estamp de tempo atual"
-PythonSetLocaltime = "Definir tempo a partir de uma tupla"
-PythonRTCmode = "Obter o modo RTC atual"
-PythonSetRTCmode = "Definir o modo RTC"
 PythonSort = "Ordenar a lista"
 PythonSqrt = "Raiz quadrada"
 PythonSum = "Soma dos itens da lista"
@@ -218,6 +190,7 @@ PythonTurtlePosition = "Devolve a posição atual (x,y)"
 PythonTurtleReset = "Reiniciar o desenho"
 PythonTurtleRight = "Virar à esquerda por a graus"
 PythonTurtleSetheading = "Definir a orientação por a graus"
+PythonTurtleSetposition = "Positionne la tortue"
 PythonTurtleShowturtle = "Mostrar o turtle"
 PythonTurtleSpeed = "Velocidade do desenho entre 0 e 10"
 PythonTurtleWrite = "Mostrar um texto"
@@ -225,18 +198,11 @@ PythonUniform = "Número decimal em [a,b]"
 PythonImportTime = "Import time module"
 PythonImportOs = "Import os module"
 PythonOsUname = " Obter informações do sistema"
-PythonOsGetlogin = "Get username"
 PythonOsRemove = "Remover um ficheiro"
 PythonOsRename = "Renomear ficheiro"
 PythonOsListdir = "Listar ficheiros"
-PythonImportSys = "Import sys module"
-PythonSysExit = "Terminate current program"
-PythonSysPrintexception = "Print exception"
-PythonSysByteorder = "The byte order of the system"
-PythonSysImplementation = "Information about Python"
-PythonSysModules = "Dictionary of loaded modules"
-PythonSysVersion = "Python language version (string)"
-PythonSysVersioninfo = "Python language version (tuple)"
+PythonTimePrefix = "time module function prefix"
+PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"
 PythonFileOpen = "Opens a file"
 PythonFileSeekable = "Tells if seek can be used on a file"

apps/code/catalog.universal.i18n

@@ -50,8 +50,6 @@ PythonCommandCount = "list.count(x)"
 PythonCommandCountWithoutArg = ".count(\x11)"
 PythonCommandDegrees = "degrees(x)"
 PythonCommandDivMod = "divmod(a,b)"
-PythonCommandDrawCircle = "draw_circle(x,y,r,color)"
-PythonCommandDrawLine = "draw_line(x1,y1,x2,y2,color)"
 PythonCommandDrawString = "draw_string(\"text\",x,y)"
 PythonCommandConstantE = "e"
 PythonCommandErf = "erf(x)"
@@ -60,18 +58,13 @@ PythonCommandEval = "eval(\"expression\")"
 PythonCommandExp = "exp(x)"
 PythonCommandExpComplex = "exp(z)"
 PythonCommandExpm1 = "expm1(x)"
-PythonCommandFactorial = "factorial(x)"
 PythonCommandFabs = "fabs(x)"
-PythonCommandFillCircle = "fill_circle(x,y,r,color)"
-PythonCommandFillPolygon = "fill_polygon([(x1,y1),...],color)"
 PythonCommandFillRect = "fill_rect(x,y,width,height,color)"
 PythonCommandFloat = "float(x)"
 PythonCommandFloor = "floor(x)"
 PythonCommandFmod = "fmod(a,b)"
 PythonCommandFrExp = "frexp(x)"
 PythonCommandGamma = "gamma(x)"
-PythonCommandGetKeys = "get_keys()"
-PythonCommandGetPalette = "get_palette()"
 PythonCommandGetPixel = "get_pixel(x,y)"
 PythonCommandGetrandbits = "getrandbits(k)"
 PythonCommandGrid = "grid()"
@@ -92,13 +85,9 @@ PythonCommandImportIon = "import ion"
 PythonCommandImportKandinsky = "import kandinsky"
 PythonCommandImportMath = "import math"
 PythonCommandImportMatplotlibPyplot = "import matplotlib.pyplot"
-PythonCommandImportFromNumpy = "from ulab import numpy as np"
-PythonCommandImportFromScipy = "from ulab import scipy as spy"
 PythonCommandImportRandom = "import random"
 PythonCommandImportOs = "import os"
 PythonCommandImportFromOs = "from os import *"
-PythonCommandImportSys = "import sys"
-PythonCommandImportFromSys = "from sys import *"
 PythonCommandImportTime = "import time"
 PythonCommandImportTurtle = "import turtle"
 PythonCommandIndex = "list.index(x)"
@@ -161,11 +150,6 @@ PythonCommandKeyEe = "KEY_EE"
 PythonCommandKeyAns = "KEY_ANS"
 PythonCommandKeyExe = "KEY_EXE"
 PythonCommandIsKeyDown = "keydown(k)"
-PythonCommandBattery = "battery()"
-PythonCommandBatteryLevel = "battery_level()"
-PythonCommandBatteryIscharging = "battery_ischarging()"
-PythonCommandSetBrightness = "set_brightness()"
-PythonCommandGetBrightness = "get_brightness()"
 PythonCommandLdexp = "ldexp(x,i)"
 PythonCommandLength = "len(object)"
 PythonCommandLgamma = "lgamma(x)"
@@ -181,120 +165,6 @@ PythonCommandMax = "max(list)"
 PythonCommandMin = "min(list)"
 PythonCommandModf = "modf(x)"
 PythonCommandMonotonic = "monotonic()"
-PythonCommandNumpyArray = "np.array(a)"
-PythonCommandNumpyArange = "np.arange(i)"
-PythonCommandNumpyConcatenate = "np.concatenate(a,b)"
-PythonCommandNumpyDiag = "np.diag(a)"
-PythonCommandNumpyZeros = "np.zeros(s)"
-PythonCommandNumpyOnes = "np.ones(s)"
-PythonCommandNumpyEmpty = "np.empty(s)"
-PythonCommandNumpyEye = "np.eye(n, m)"
-PythonCommandNumpyFull = "np.full(s, v)"
-PythonCommandNumpyLinspace = "np.linspace(s, e)"
-PythonCommandNumpyLogspace = "np.logspace(s, e)"
-PythonCommandNumpyCopy = "ndarray.copy()"
-PythonCommandNumpyCopyWithoutArg = ".copy()"
-PythonCommandNumpyDtype = "ndarray.dtype"
-PythonCommandNumpyDtypeWithoutArg = ".dtype"
-PythonCommandNumpyFlat = "ndarray.flat"
-PythonCommandNumpyFlatWithoutArg = ".flat"
-PythonCommandNumpyFlatten = "ndarray.flatten()"
-PythonCommandNumpyFlattenWithoutArg = ".flatten()"
-PythonCommandNumpyShape = "ndarray.shape"
-PythonCommandNumpyShapeWithoutArg = ".shape"
-PythonCommandNumpyReshape = "ndarray.reshape(s)"
-PythonCommandNumpyReshapeWithoutArg = ".reshape(\x11)"
-PythonCommandNumpySize = "ndarray.size"
-PythonCommandNumpySizeWithoutArg = ".size"
-PythonCommandNumpyTranspose = "ndarray.transpose()"
-PythonCommandNumpyTransposeWithoutArg = ".transpose()"
-PythonCommandNumpySort = "ndarray.sort()"
-PythonCommandNumpySortWithoutArg = ".sort()"
-PythonCommandNumpyFromBuffer = "ndarray.frombuffer(b)"
-PythonCommandNumpyToBytes = "ndarray.tobytes()"
-PythonCommandNumpyToBytesWithoutArg = ".tobytes()"
-PythonCommandNumpySetPrintOptions = "np.set_printoptions()"
-PythonCommandNumpyGetPrintOptions = "np.get_printoptions()"
-PythonCommandNumpyNdinfo = "np.ndinfo(a)"
-PythonCommandNumpyAll = "np.all(a)"
-PythonCommandNumpyAny = "np.any(a)"
-PythonCommandNumpyArgmax = "np.argmax(a)"
-PythonCommandNumpyArgmin = "np.argmin(a)"
-PythonCommandNumpyArgsort = "np.argsort(a)"
-PythonCommandNumpyClip = "np.clip(a, min, max)"
-PythonCommandNumpyConvolve = "np.convolve(a, b)"
-PythonCommandNumpyDiff = "np.diff(a)"
-PythonCommandNumpyInterp = "np.interp(a)"
-PythonCommandNumpyDot = "np.dot(a, b)"
-PythonCommandNumpyCross = "np.cross(a, b)"
-PythonCommandNumpyEqual = "np.equal(a, b)"
-PythonCommandNumpyNot_equal = "np.not_equal(a, b)"
-PythonCommandNumpyFlip = "np.flip(a)"
-PythonCommandNumpyIsfinite = "np.isfinite(a)"
-PythonCommandNumpyIsinf = "np.isinf(a)"
-PythonCommandNumpyMean = "np.mean(a)"
-PythonCommandNumpyMin = "np.min(a)"
-PythonCommandNumpyMax = "np.max(a)"
-PythonCommandNumpyMedian = "np.median(a)"
-PythonCommandNumpyMinimum = "np.minimum(a, b)"
-PythonCommandNumpyMaximum = "np.maximum(a, b)"
-PythonCommandNumpyPolyfit = "np.polyfit(a, b, y)"
-PythonCommandNumpyPolyval = "np.polyval(p, x)"
-PythonCommandNumpyRoll = "np.roll(a, n)"
-PythonCommandNumpySortWithArguments = "np.sort(a)"
-PythonCommandNumpyStd = "np.std(a)"
-PythonCommandNumpySum = "np.sum(a)"
-PythonCommandNumpyTrace = "np.trace(a)"
-PythonCommandNumpyTrapz = "np.trapz(y)"
-PythonCommandNumpyWhere = "np.where(c, x, y)"
-PythonCommandNumpyVectorize = "np.vectorize(f)"
-PythonCommandNumpyAcos = "np.acos(a)"
-PythonCommandNumpyAcosh = "np.acosh(a)"
-PythonCommandNumpyArctan2 = "np.arctan2(a)"
-PythonCommandNumpyAround = "np.around(a)"
-PythonCommandNumpyAsin = "np.asin(a)"
-PythonCommandNumpyAsinh = "np.asinh(a)"
-PythonCommandNumpyAtan = "np.atan(a)"
-PythonCommandNumpyAtanh = "np.atanh(a)"
-PythonCommandNumpyCeil = "np.ceil(a)"
-PythonCommandNumpyCos = "np.cos(a)"
-PythonCommandNumpyCosh = "np.cosh(a)"
-PythonCommandNumpyDegrees = "np.degrees(a)"
-PythonCommandNumpyExp = "np.exp(a)"
-PythonCommandNumpyExpm1 = "np.expm1(a)"
-PythonCommandNumpyFloor = "np.floor(a)"
-PythonCommandNumpyLog = "np.log(a)"
-PythonCommandNumpyLog10 = "np.log10(a)"
-PythonCommandNumpyLog2 = "np.log2(a)"
-PythonCommandNumpyRadians = "np.radians(a)"
-PythonCommandNumpySin = "np.sin(a)"
-PythonCommandNumpySinh = "np.sinh(a)"
-PythonCommandNumpySqrt = "np.sqrt(a)"
-PythonCommandNumpyTan = "np.tan(a)"
-PythonCommandNumpyTanh = "np.tanh(a)"
-PythonCommandNumpyBool = "np.bool"
-PythonCommandNumpyFloat = "np.float"
-PythonCommandNumpyUint8 = "np.uint8"
-PythonCommandNumpyInt8 = "np.int8"
-PythonCommandNumpyUint16 = "np.uint16"
-PythonCommandNumpyInt16 = "np.int16"
-PythonCommandNumpyNan = "np.nan"
-PythonCommandNumpyInf = "np.inf"
-PythonCommandNumpyE = "np.e"
-PythonCommandNumpyPi = "np.pi"
-PythonCommandNumpyFft = "np.fft.fft(a)"
-PythonCommandNumpyIfft = "np.fft.ifft(a)"
-PythonCommandNumpyDet = "np.linalg.det(a)"
-PythonCommandNumpyEig = "np.linalg.eig(a)"
-PythonCommandNumpyCholesky = "np.linalg.cholesky(a)"
-PythonCommandNumpyInv = "np.linalg.inv(a)"
-PythonCommandNumpyNorm = "np.linalg.norm(a)"
-PythonCommandNumpyFunction = "np.function"
-PythonCommandNumpyFunctionWithoutArg = "np.\x11"
-PythonCommandNumpyFftFunction = "np.fft.function"
-PythonCommandNumpyFftFunctionWithoutArg = "np.fft.\x11"
-PythonCommandNumpyLinalgFunction = "np.linalg.function"
-PythonCommandNumpyLinalgFunctionWithoutArg = "np.linalg.\x11"
 PythonCommandOct = "oct(x)"
 PythonCommandPhase = "phase(z)"
 PythonCommandPlot = "plot(x,y,color)"
@@ -321,39 +191,12 @@ PythonCommandReverseWithoutArg = ".reverse()"
 PythonCommandRound = "round(x,n)"
 PythonCommandScatter = "scatter(x,y)"
 PythonCommandSeed = "seed(x)"
-PythonCommandScipyFunction = "spy.function"
-PythonCommandScipyFunctionWithoutArg = "spy.\x11"
-PythonCommandScipyLinalgFunction = "spy.linalg.function"
-PythonCommandScipyLinalgFunctionWithoutArg = "spy.linalg.\x11"
-PythonCommandScipyOptimizeFunction = "spy.optimize.function"
-PythonCommandScipyOptimizeFunctionWithoutArg = "spy.optimize.\x11"
-PythonCommandScipySignalFunction = "spy.signal.function"
-PythonCommandScipySignalFunctionWithoutArg = "spy.signal.\x11"
-PythonCommandScipySpecialFunction = "spy.special.function"
-PythonCommandScipySpecialFunctionWithoutArg = "spy.special.\x11"
-PythonCommandScipyLinalgChoSolve = "spy.linalg.cho_solve(a, b)"
-PythonCommandScipyLinalgSolveTriangular = "spy.linalg.solve_triangular(a, b)"
-PythonCommandScipyOptimizeBisect = "spy.optimize.bisect(f, a, b)"
-PythonCommandScipyOptimizeFmin = "spy.optimize.fmin(f, x0)"
-PythonCommandScipyOptimizeNewton = "spy.optimize.newton(f, x0)"
-PythonCommandScipySignalSosfilt = "spy.signal.sosfilt(sos, x)"
-PythonCommandScipySignalSpectrogram = "spy.signal.spectrogram(y)"
-PythonCommandScipySpecialErf = "spy.erf(a)"
-PythonCommandScipySpecialErfc = "spy.erfc(a)"
-PythonCommandScipySpecialGamma = "spy.gamma(a)"
-PythonCommandScipySpecialGammaln = "spy.gammaln(a)"
 PythonCommandSetPixel = "set_pixel(x,y,color)"
 PythonCommandShow = "show()"
 PythonCommandSin = "sin(x)"
 PythonCommandSinComplex = "sin(z)"
 PythonCommandSinh = "sinh(x)"
 PythonCommandSleep = "sleep(t)"
-PythonCommandLocalTime = "localtime([timestamp])"
-PythonCommandMktime = "mktime(tm)"
-PythonCommandTime = "time()"
-PythonCommandSetLocaltime = "setlocaltime(tm)"
-PythonCommandRTCmode = "rtcmode()"
-PythonCommandSetRTCmode = "setrtcmode(mode)"
 PythonCommandSort = "list.sort()"
 PythonCommandSortWithoutArg = ".sort()"
 PythonCommandSorted = "sorted(list)"
@@ -372,20 +215,11 @@ PythonCommandUniform = "uniform(a,b)"
 PythonConstantE = "2.718281828459045"
 PythonConstantPi = "3.141592653589793"
 PythonOsCommandUname = "uname()"
-PythonOsCommandGetlogin = "getlogin()"
 PythonOsCommandRemove = "remove(filename)"
 PythonOsCommandRename = "rename(oldname, newname)"
 PythonOsCommandRemoveWithoutArg = "remove(\x11)"
 PythonOsCommandRenameWithoutArg = "rename(\x11,)"
 PythonOsCommandListdir = "listdir()"
-PythonSysCommandExit = "exit()"
-PythonSysCommandPrintexception = "print_exception(exc)"
-PythonSysCommandPrintexceptionWithoutArg = "print_exception(\x11)"
-PythonSysCommandByteorder = "byteorder"
-PythonSysCommandImplementation = "implementation"
-PythonSysCommandModules = "modules"
-PythonSysCommandVersion = "version"
-PythonSysCommandVersioninfo = "version_info"
 PythonTurtleCommandBackward = "backward(x)"
 PythonTurtleCommandCircle = "circle(r)"
 PythonTurtleCommandColor = "color('c')"
@@ -403,8 +237,16 @@ PythonTurtleCommandPosition = "position()"
 PythonTurtleCommandReset = "reset()"
 PythonTurtleCommandRight = "right(a)"
 PythonTurtleCommandSetheading = "setheading(a)"
+PythonTurtleCommandSetposition = "setposition(x,[y])"
 PythonTurtleCommandShowturtle = "showturtle()"
 PythonTurtleCommandSpeed = "speed(x)"
+PythonTurtleCommandWhite = "'white'"
+PythonTurtleCommandYellow = "'yellow'"
+PythonTimeModule = "time"
+PythonTimeCommandImportFrom = "from time import *"
+PythonTimeCommandSleep = "sleep()"
+PythonTimeCommandSleepDemo = "sleep(n)"
+PythonTimeCommandMonotonic = "monotonic()"
 PythonCommandFileOpen = "open(name, [mode])"
 PythonCommandFileOpenWithoutArg = "open(\x11)"
 PythonCommandFileSeek = "file.seek(offset, [whence])"

apps/code/editor_controller.cpp

@@ -4,7 +4,6 @@
 #include "app.h"
 #include <escher/metric.h>
 #include <ion.h>
-#include "../global_preferences.h"
 
 using namespace Shared;
 
@@ -64,20 +63,10 @@ void EditorController::didBecomeFirstResponder() {
 void EditorController::viewWillAppear() {
   ViewController::viewWillAppear();
   m_editorView.loadSyntaxHighlighter();
-  if(GlobalPreferences::sharedGlobalPreferences()->cursorSaving()) {
-    int offset = m_script.cursorOffset();
-    if (offset != -1) {
-      m_editorView.setCursorLocation(m_editorView.text() + offset);
-    } else {
-      m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text()));
-    }
-  } else {
-    m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text()));
-  }
+  m_editorView.setCursorLocation(m_editorView.text() + strlen(m_editorView.text()));
 }
 
 void EditorController::viewDidDisappear() {
-  m_script.setCursorOffset(m_editorView.cursorLocation() - m_script.content());
   m_editorView.resetSelection();
   m_menuController->scriptContentEditionDidFinish();
 }

apps/code/editor_view.cpp

@@ -26,9 +26,7 @@ void EditorView::resetSelection() {
 }
 
 void EditorView::scrollViewDidChangeOffset(ScrollViewDataSource * scrollViewDataSource) {
-  if (m_gutterView.setOffsetAndNeedResize(scrollViewDataSource->offset().y())) {
-    internalLayoutSubviews(true);
-  }
+  m_gutterView.setOffset(scrollViewDataSource->offset().y());
 }
 
 View * EditorView::subviewAtIndex(int index) {
@@ -44,12 +42,8 @@ void EditorView::didBecomeFirstResponder() {
 }
 
 void EditorView::layoutSubviews(bool force) {
-  m_gutterView.setOffsetAndNeedResize(0); // Whatever the return is, we layout the editor view
-  internalLayoutSubviews(force);
-}
-
-void EditorView::internalLayoutSubviews(bool force) {
-  KDCoordinate gutterWidth = m_gutterView.computeWidth();
+  m_gutterView.setOffset(0);
+  KDCoordinate gutterWidth = m_gutterView.minimalSizeForOptimalDisplay().width();
   m_gutterView.setFrame(KDRect(0, 0, gutterWidth, bounds().height()), force);
 
   m_textArea.setFrame(KDRect(
@@ -73,23 +67,23 @@ void EditorView::GutterView::drawRect(KDContext * ctx, KDRect rect) const {
   KDCoordinate firstLine = m_offset / glyphSize.height();
   KDCoordinate firstLinePixelOffset = m_offset - firstLine * glyphSize.height();
 
-  char lineNumberBuffer[m_numberOfDigits + 1];
+  char lineNumber[k_lineNumberCharLength];
   int numberOfLines = bounds().height() / glyphSize.height() + 1;
   for (int i=0; i<numberOfLines; i++) {
-    int lineNumberValue = (i + firstLine + 1);
+    // Only the first two digits are displayed
+    int lineNumberValue = (i + firstLine + 1) % 100;
     Poincare::Integer line(lineNumberValue);
-
-    int lineDigits = computeNumberOfDigitsFor(lineNumberValue);
-
-    for (int j=0; j < m_numberOfDigits - lineDigits; j++) {
-      lineNumberBuffer[j] = ' ';
+    if (firstLine < 10 || lineNumberValue >= 10) {
+      line.serialize(lineNumber, k_lineNumberCharLength);
+    } else {
+      // Add a leading "0"
+      lineNumber[0] = '0';
+      line.serialize(lineNumber + 1, k_lineNumberCharLength - 1);
     }
-
-    line.serialize(lineNumberBuffer + (m_numberOfDigits - lineDigits), m_numberOfDigits + 1);
-
+    KDCoordinate leftPadding = (2 - strlen(lineNumber)) * glyphSize.width();
     ctx->drawString(
-      lineNumberBuffer,
-      KDPoint(k_margin, i*glyphSize.height() - firstLinePixelOffset),
+      lineNumber,
+      KDPoint(k_margin + leftPadding, i*glyphSize.height() - firstLinePixelOffset),
       m_font,
       textColor,
       backgroundColor
@@ -97,36 +91,18 @@ void EditorView::GutterView::drawRect(KDContext * ctx, KDRect rect) const {
   }
 }
 
-bool EditorView::GutterView::setOffsetAndNeedResize(KDCoordinate offset) {
+void EditorView::GutterView::setOffset(KDCoordinate offset) {
   if (m_offset == offset) {
-    return false;
+    return;
   }
   m_offset = offset;
-
-  int numberOfDigits = computeMaxNumberOfDigits();
-  if (numberOfDigits != m_numberOfDigits) {
-    m_numberOfDigits = numberOfDigits;
-    return true;
-  }
-
   markRectAsDirty(bounds());
-  return false;
 }
 
-int EditorView::GutterView::computeWidth() {
-  return 2 * k_margin + (m_numberOfDigits) * m_font->glyphSize().width();
-}
 
-int EditorView::GutterView::computeMaxNumberOfDigits() {
-  return computeNumberOfDigitsFor((bounds().height() / m_font->glyphSize().height() + 1) + (m_offset / m_font->glyphSize().height()));
-}
-
-int EditorView::GutterView::computeNumberOfDigitsFor(int value) {
-  int digits = 1;
-  while (value >= pow(10, digits)) {
-    digits++;
-  }
-  return digits;
+KDSize EditorView::GutterView::minimalSizeForOptimalDisplay() const {
+  int numberOfChars = 2; // TODO: Could be computed
+  return KDSize(2 * k_margin + numberOfChars * Poincare::Preferences::sharedPreferences()->KDPythonFont()->glyphSize().width(), 0);
 }
 
 }

apps/code/editor_view.h

@@ -29,7 +29,6 @@ public:
   void unloadSyntaxHighlighter() { m_textArea.unloadSyntaxHighlighter(); };
   void scrollViewDidChangeOffset(ScrollViewDataSource * scrollViewDataSource) override;
   void didBecomeFirstResponder() override;
-  void internalLayoutSubviews(bool force);
 private:
   int numberOfSubviews() const override { return 2; }
   View * subviewAtIndex(int index) override;
@@ -37,21 +36,15 @@ private:
 
   class GutterView : public View {
   public:
-    GutterView(const KDFont * font) : View(), m_font(font), m_offset(0), m_numberOfDigits(2) {}
-
+    GutterView(const KDFont * font) : View(), m_font(font), m_offset(0) {}
     void drawRect(KDContext * ctx, KDRect rect) const override;
-    bool setOffsetAndNeedResize(KDCoordinate offset); // Return true if the gutter view need to be resized
-
-    int computeWidth();
-    int computeMaxNumberOfDigits();
-    static int computeNumberOfDigitsFor(int value);
-
+    void setOffset(KDCoordinate offset);
+    KDSize minimalSizeForOptimalDisplay() const override;
   private:
     static constexpr KDCoordinate k_margin = 2;
-
+    static constexpr int k_lineNumberCharLength = 3;
     const KDFont * m_font;
     KDCoordinate m_offset;
-    int m_numberOfDigits;
   };
 
   PythonTextArea m_textArea;

apps/code/menu_controller.cpp

@@ -90,11 +90,6 @@ bool MenuController::handleEvent(Ion::Events::Event event) {
     footer()->setSelectedButton(0);
     return true;
   }
-  if (event == Ion::Events::ShiftBack) {
-    Ion::Storage::sharedStorage()->reinsertTrash("py");
-    m_selectableTableView.reloadData();
-    return true;
-  }
   if (event == Ion::Events::Up) {
     if (footer()->selectedButton() == 0) {
       footer()->setSelectedButton(-1);

apps/code/python_text_area.cpp

@@ -3,7 +3,6 @@
 #include <escher/palette.h>
 #include <ion/unicode/utf8_helper.h>
 #include <python/port/port.h>
-#include "../global_preferences.h"
 
 extern "C" {
 #include "py/nlr.h"
@@ -25,9 +24,6 @@ constexpr KDColor HighlightColor = Palette::CodeBackgroundSelected;
 constexpr KDColor AutocompleteColor = KDColor::RGB24(0xC6C6C6); // TODO Palette change
 
 static inline KDColor TokenColor(mp_token_kind_t tokenKind) {
-  if (!GlobalPreferences::sharedGlobalPreferences()->syntaxhighlighting()) {
-    return Palette::CodeText;
-  }
   if (tokenKind == MP_TOKEN_STRING) {
     return StringColor;
   }
@@ -69,8 +65,7 @@ static inline KDColor TokenColor(mp_token_kind_t tokenKind) {
       && MP_TOKEN_KW_TRY        + 1 == MP_TOKEN_KW_WHILE
       && MP_TOKEN_KW_WHILE      + 1 == MP_TOKEN_KW_WITH
       && MP_TOKEN_KW_WITH       + 1 == MP_TOKEN_KW_YIELD
-      && MP_TOKEN_KW_YIELD      + 1 == MP_TOKEN_OP_ASSIGN
-      && MP_TOKEN_OP_ASSIGN     + 1 == MP_TOKEN_OP_TILDE,
+      && MP_TOKEN_KW_YIELD      + 1 == MP_TOKEN_OP_TILDE,
     "MP_TOKEN order changed, so Code::PythonTextArea::TokenColor might need to change too.");
   if (tokenKind >= MP_TOKEN_KW_FALSE && tokenKind <= MP_TOKEN_KW_YIELD) {
     return KeywordColor;
@@ -123,8 +118,7 @@ static inline KDColor TokenColor(mp_token_kind_t tokenKind) {
 
   if ((tokenKind >= MP_TOKEN_OP_TILDE && tokenKind <= MP_TOKEN_DEL_DBL_STAR_EQUAL)
       || tokenKind == MP_TOKEN_DEL_EQUAL
-      || tokenKind == MP_TOKEN_DEL_MINUS_MORE
-      || tokenKind == MP_TOKEN_OP_ASSIGN)
+      || tokenKind == MP_TOKEN_DEL_MINUS_MORE)
   {
     return OperatorColor;
   }
@@ -162,7 +156,7 @@ PythonTextArea::AutocompletionType PythonTextArea::autocompletionType(const char
     const char * tokenEnd;
     _mp_token_kind_t currentTokenKind = lex->tok_kind;
 
-    while (currentTokenKind != MP_TOKEN_NEWLINE && currentTokenKind != MP_TOKEN_END && currentTokenKind != MP_TOKEN_FSTRING_RAW) {
+    while (currentTokenKind != MP_TOKEN_NEWLINE && currentTokenKind != MP_TOKEN_END) {
       tokenStart = firstNonSpace + lex->tok_column - 1;
       tokenEnd = tokenStart + TokenLength(lex, tokenStart);
 
@@ -271,7 +265,7 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
     const char * tokenFrom = firstNonSpace;
     size_t tokenLength = 0;
     const char * tokenEnd = firstNonSpace;
-    while (lex->tok_kind != MP_TOKEN_NEWLINE && lex->tok_kind != MP_TOKEN_END && lex->tok_kind != MP_TOKEN_FSTRING_RAW) {
+    while (lex->tok_kind != MP_TOKEN_NEWLINE && lex->tok_kind != MP_TOKEN_END) {
       tokenFrom = firstNonSpace + lex->tok_column - 1;
       if (tokenFrom != tokenEnd) {
         // We passed over white spaces, we need to color them
@@ -310,10 +304,6 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
 
     tokenFrom += tokenLength;
 
-    KDColor color = CommentColor;
-    if (!GlobalPreferences::sharedGlobalPreferences()->syntaxhighlighting()) {
-      color = Palette::CodeText;
-    }
     // Even if the token is being autocompleted, use CommentColor
     if (tokenFrom < text + byteLength) {
       LOG_DRAW("Draw comment \"%.*s\" from %d\n", byteLength - (tokenFrom - text), firstNonSpace, tokenFrom);
@@ -321,7 +311,7 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
           UTF8Helper::GlyphOffsetAtCodePoint(text, tokenFrom),
           tokenFrom,
           text + byteLength - tokenFrom,
-          color,
+          CommentColor,
           BackgroundColor,
           selectionStart,
           selectionEnd,
@@ -454,11 +444,6 @@ void PythonTextArea::addAutocompletion() {
 }
 
 bool PythonTextArea::addAutocompletionTextAtIndex(int nextIndex, int * currentIndexToUpdate) {
-  // If Autocomplete disable, skip this step
-  if(!GlobalPreferences::sharedGlobalPreferences()->autocomplete()) {
-    return false;
-  }
-
   // The variable box should be loaded at this point
   const char * autocompletionTokenBeginning = nullptr;
   const char * autocompletionLocation = const_cast<char *>(cursorLocation());

apps/code/python_text_area.h

@@ -30,7 +30,7 @@ public:
    * - MiddleOfIdentifier is the cursor is in the middle of an identifier,
    * - No identifier otherwise.
    * The autocompletionLocation can be provided with autocompletionLocation, or
-   * retrieved with autocompletionLocationBeginning and autocompletionLocationEnd. */
+   * retreived with autocompletionLocationBeginning and autocompletionLocationEnd. */
   AutocompletionType autocompletionType(const char * autocompletionLocation = nullptr, const char ** autocompletionLocationBeginning = nullptr, const char ** autocompletionLocationEnd = nullptr) const;
   bool isAutocompleting() const { return m_contentView.isAutocompleting(); }
 protected:

apps/code/python_toolbox.cpp

@@ -5,7 +5,6 @@ extern "C" {
 #include <string.h>
 #include <ctype.h>
 }
-#include "app.h"
 
 namespace Code {
 
@@ -75,7 +74,6 @@ const ToolboxMessageTree MathModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandAtan2, I18n::Message::PythonAtan2),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCeil, I18n::Message::PythonCeil),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCopySign, I18n::Message::PythonCopySign),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFactorial, I18n::Message::PythonFactorial),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFabs, I18n::Message::PythonFabs),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFloor, I18n::Message::PythonFloor),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFmod, I18n::Message::PythonFmod),
@@ -136,173 +134,6 @@ const ToolboxMessageTree MatplotlibPyplotModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGray, I18n::Message::PythonColorGray, false)
 };
 
-#if defined(INCLUDE_ULAB)
-
-const ToolboxMessageTree NumpyNdarrayModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArray),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArange),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyConcatenate),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDiag),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyZeros),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyOnes),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEmpty),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEye),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFull),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLinspace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLogspace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFromBuffer),  
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCopy, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyCopyWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDtype, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyDtypeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlat, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlatWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlatten, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlattenWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyShape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyShapeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyReshape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyReshapeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySize, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySizeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTranspose, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyTransposeWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySort, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySortWithoutArg),  
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyToBytes, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyToBytesWithoutArg)
-};
-
-const ToolboxMessageTree NumpyFunctionsModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNdinfo),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAll),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAny),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgmax),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgmin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArgsort),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyClip),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyConvolve),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDiff),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInterp),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDot),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCross),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEqual),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNot_equal),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlip),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIsfinite),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIsinf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMean),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMax),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMedian),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMinimum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyMaximum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPolyfit),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPolyval),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyRoll),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySortWithArguments),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyStd),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySum),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTrace),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTrapz),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyWhere),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyVectorize),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAcos),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAcosh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyArctan2),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAround),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAsin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAsinh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAtan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyAtanh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCeil),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCos),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCosh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDegrees),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyExp),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyExpm1),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFloor),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog10),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLog2),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyRadians),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySinh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySqrt),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTanh),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyBool),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFloat),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyUint8),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInt8),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyUint16),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInt16),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNan),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyE),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyPi),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySetPrintOptions),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyGetPrintOptions)
-};
-
-const ToolboxMessageTree NumpyFftModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFftFunction, I18n::Message::PythonNumpyFftFunction, false, I18n::Message::PythonCommandNumpyFftFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFft),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyIfft)
-};
-
-const ToolboxMessageTree NumpyLinalgModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLinalgFunction, I18n::Message::PythonNumpyLinalgFunction, false, I18n::Message::PythonCommandNumpyLinalgFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDet),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyEig),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCholesky),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyInv),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyNorm)
-};
-
-const ToolboxMessageTree NumpyModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromNumpy, I18n::Message::PythonImportNumpy, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFunction, I18n::Message::PythonNumpyFunction, false, I18n::Message::PythonCommandNumpyFunctionWithoutArg),
-  ToolboxMessageTree::Node(I18n::Message::NumpyNdarray, NumpyNdarrayModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::Functions, NumpyFunctionsModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::NumpyFftModule, NumpyFftModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::NumpyLinalgModule, NumpyLinalgModuleChildren)
-};
-
-const ToolboxMessageTree ScipyLinalgModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgFunction, I18n::Message::PythonScipyLinalgFunction, false, I18n::Message::PythonCommandScipyLinalgFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgChoSolve),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyLinalgSolveTriangular)
-};
-
-const ToolboxMessageTree ScipyOptimizeModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeFunction, I18n::Message::PythonScipyOptimizeFunction, false, I18n::Message::PythonCommandScipyOptimizeFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeBisect),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeFmin),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyOptimizeNewton)
-};
-
-const ToolboxMessageTree ScipySignalModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalFunction, I18n::Message::PythonScipySignalFunction, false, I18n::Message::PythonCommandScipySignalFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalSosfilt),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySignalSpectrogram)
-};
-
-const ToolboxMessageTree ScipySpecialModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialFunction, I18n::Message::PythonScipySpecialFunction, false, I18n::Message::PythonCommandScipySpecialFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialErf),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialErfc),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialGamma),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipySpecialGammaln),
-};
-
-const ToolboxMessageTree ScipyModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromScipy, I18n::Message::PythonImportScipy, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandScipyFunction, I18n::Message::PythonScipyFunction, false, I18n::Message::PythonCommandScipyFunctionWithoutArg),
-  ToolboxMessageTree::Node(I18n::Message::ScipyLinalgModule, ScipyLinalgModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipyOptimizeModule, ScipyOptimizeModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipySignalModule, ScipySignalModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipySpecialModule, ScipySpecialModuleChildren),
-};
-
-const ToolboxMessageTree UlabModuleChildren[] = {
-  ToolboxMessageTree::Node(I18n::Message::NumpyModule, NumpyModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::ScipyModule, ScipyModuleChildren),
-  ToolboxMessageTree::Leaf(I18n::Message::UlabDocumentation, I18n::Message::UlabDocumentationLink)
-};
-
-#endif
-
 const ToolboxMessageTree TurtleModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportTurtle, I18n::Message::PythonImportTurtle, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportTurtle, false),
@@ -361,15 +192,14 @@ const ToolboxMessageTree KandinskyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColor, I18n::Message::PythonColor),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawCircle, I18n::Message::PythonDrawCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillCircle, I18n::Message::PythonFillCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillPolygon, I18n::Message::PythonFillPolygon),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetPalette, I18n::Message::PythonGetPalette)
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect)
 };
 
-const ToolboxMessageTree IonKeyModuleChildren[] = {
+const ToolboxMessageTree IonModuleChildren[] = {
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportIon, I18n::Message::PythonImportIon, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIonFunction, I18n::Message::PythonIonFunction, false, I18n::Message::PythonCommandIonFunctionWithoutArg),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeft, I18n::Message::PythonKeyLeft, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyUp, I18n::Message::PythonKeyUp, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDown, I18n::Message::PythonKeyDown, false),
@@ -418,75 +248,32 @@ const ToolboxMessageTree IonKeyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExe, I18n::Message::PythonKeyExe, false)
 };
 
-const ToolboxMessageTree IonModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportIon, I18n::Message::PythonImportIon, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIonFunction, I18n::Message::PythonIonFunction, false, I18n::Message::PythonCommandIonFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetKeys, I18n::Message::PythonGetKeys),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBattery, I18n::Message::PythonBattery),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBatteryLevel, I18n::Message::PythonBatteryLevel),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBatteryIscharging, I18n::Message::PythonBatteryIscharging),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetBrightness, I18n::Message::PythonSetBrightness),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetBrightness, I18n::Message::PythonGetBrightness),
-  // This is a special case, because it is handled separately, so the sub-tree is unused.
-  ToolboxMessageTree::Node(I18n::Message::IonSelector, IonKeyModuleChildren),
-  ToolboxMessageTree::Node(I18n::Message::IonKeyList, IonKeyModuleChildren)
-};
-
 const ToolboxMessageTree TimeModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportTime, I18n::Message::PythonImportTime, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTime, I18n::Message::PythonImportTime, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandTimeFunction, I18n::Message::PythonTimeFunction, false, I18n::Message::PythonCommandTimeFunctionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandTime, I18n::Message::PythonTime),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandMonotonic, I18n::Message::PythonMonotonic, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSleep, I18n::Message::PythonSleep),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLocalTime, I18n::Message::PythonLocalTime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandMktime, I18n::Message::PythonMktime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetLocaltime, I18n::Message::PythonSetLocaltime),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandRTCmode, I18n::Message::PythonRTCmode),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetRTCmode, I18n::Message::PythonSetRTCmode),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSleep, I18n::Message::PythonSleep)
 };
 
 const ToolboxMessageTree OsModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportOs, I18n::Message::PythonImportOs, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromOs, I18n::Message::PythonImportOs, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandUname, I18n::Message::PythonOsUname, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandGetlogin, I18n::Message::PythonOsGetlogin, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRemove, I18n::Message::PythonOsRemove, false, I18n::Message::PythonOsCommandRemoveWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRename, I18n::Message::PythonOsRename, false, I18n::Message::PythonOsCommandRenameWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandListdir, I18n::Message::PythonOsListdir, false)
 };
 
-#if MICROPY_PY_SYS
-const ToolboxMessageTree SysModuleChildren[] = {
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportSys, I18n::Message::PythonImportSys, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromSys, I18n::Message::PythonImportSys, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandExit, I18n::Message::PythonSysExit, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandPrintexception, I18n::Message::PythonSysPrintexception, false, I18n::Message::PythonSysCommandPrintexceptionWithoutArg),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandByteorder, I18n::Message::PythonSysByteorder, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandImplementation, I18n::Message::PythonSysImplementation, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandModules, I18n::Message::PythonSysModules, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandVersion, I18n::Message::PythonSysVersion, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonSysCommandVersioninfo, I18n::Message::PythonSysVersioninfo, false)
-};
-#endif
-
 const ToolboxMessageTree modulesChildren[] = {
   ToolboxMessageTree::Node(I18n::Message::MathModule, MathModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::CmathModule, CMathModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::MatplotlibPyplotModule, MatplotlibPyplotModuleChildren),
-#if defined(INCLUDE_ULAB)
-  ToolboxMessageTree::Node(I18n::Message::UlabModule, UlabModuleChildren),
-#endif
   ToolboxMessageTree::Node(I18n::Message::TurtleModule, TurtleModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::RandomModule, RandomModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::KandinskyModule, KandinskyModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::IonModule, IonModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::OsModule, OsModuleChildren),
-#if MICROPY_PY_SYS
-  ToolboxMessageTree::Node(I18n::Message::SysModule, SysModuleChildren),
-#endif
   ToolboxMessageTree::Node(I18n::Message::TimeModule, TimeModuleChildren)
 };
 
@@ -528,8 +315,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCosh, I18n::Message::PythonCosh),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDegrees, I18n::Message::PythonDegrees),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDivMod, I18n::Message::PythonDivMod),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawCircle, I18n::Message::PythonDrawCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandErf, I18n::Message::PythonErf),
@@ -538,8 +323,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandExp, I18n::Message::PythonExp),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandExpm1, I18n::Message::PythonExpm1),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFabs, I18n::Message::PythonFabs),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillCircle, I18n::Message::PythonFillCircle),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillPolygon, I18n::Message::PythonFillPolygon),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFloat, I18n::Message::PythonFloat),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFloor, I18n::Message::PythonFloor),
@@ -582,7 +365,6 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsNaN, I18n::Message::PythonIsNaN),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKandinskyFunction, I18n::Message::PythonKandinskyFunction, false, I18n::Message::PythonCommandKandinskyFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandBattery, I18n::Message::PythonBattery),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLdexp, I18n::Message::PythonLdexp),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandLeft, I18n::Message::PythonTurtleLeft),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandLength, I18n::Message::PythonLength),
@@ -751,13 +533,9 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
   return Toolbox::rowHeight(j);
 }
 
-bool PythonToolbox::selectLeaf(int selectedRow, bool quitToolbox) {
+bool PythonToolbox::selectLeaf(int selectedRow) {
+  m_selectableTableView.deselectTable();
   ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
-#if defined(INCLUDE_ULAB)
-  if(node->text() == I18n::Message::UlabDocumentationLink){
-    return true;
-  }
-#endif
   const char * editedText = I18n::translate(node->insertedText());
   // strippedEditedText array needs to be in the same scope as editedText
   char strippedEditedText[k_maxMessageSize];
@@ -768,25 +546,10 @@ bool PythonToolbox::selectLeaf(int selectedRow, bool quitToolbox) {
     editedText = strippedEditedText;
   }
   sender()->handleEventWithText(editedText, true);
-  if (quitToolbox) {
-    m_selectableTableView.deselectTable();
-    Container::activeApp()->dismissModalViewController();
-  }
+  Container::activeApp()->dismissModalViewController();
   return true;
 }
 
-// This is the same function as in the Toolbox class, but we need to override it because we need to handle the Key selector differently.
-bool PythonToolbox::selectSubMenu(int selectedRow) {
-  // If the selected row is a is the Key selector, we display the IonKeySelectorViewController
-  if (m_messageTreeModel->childAtIndex(selectedRow)->label() == I18n::Message::IonSelector) {
-    m_ionKeys.setSender(sender());
-    Container::activeApp()->displayModalViewController(static_cast<ViewController*>(&m_ionKeys), 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
-    return true;
-  }
-  return Toolbox::selectSubMenu(selectedRow);
-}
-
-
 const ToolboxMessageTree * PythonToolbox::rootModel() const {
   return &toolboxModel;
 }

apps/code/python_toolbox.h

@@ -5,7 +5,6 @@
 #include <escher.h>
 #include <ion/events.h>
 #include <kandinsky/font.h>
-#include "toolbox_ion_keys.h"
 
 namespace Code {
 
@@ -20,12 +19,10 @@ public:
   const ToolboxMessageTree * rootModel() const override;
 protected:
   KDCoordinate rowHeight(int j) override;
-  bool selectLeaf(int selectedRow, bool quitToolbox) override;
-  bool selectSubMenu(int selectedRow) override;
+  bool selectLeaf(int selectedRow) override;
   MessageTableCellWithMessage * leafCellAtIndex(int index) override;
   MessageTableCellWithChevron* nodeCellAtIndex(int index) override;
   int maxNumberOfDisplayedRows() override;
-  bool canStayInMenu() override { return true; }
   constexpr static int k_maxNumberOfDisplayedRows = 13; // = 240/(13+2*3)
   // 13 = minimal string height size
   // 3 = vertical margins
@@ -35,7 +32,6 @@ private:
   void scrollToAndSelectChild(int i);
   MessageTableCellWithMessage m_leafCells[k_maxNumberOfDisplayedRows];
   MessageTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows];
-  ToolboxIonKeys m_ionKeys;
 };
 
 }

apps/code/script.cpp

@@ -65,21 +65,6 @@ bool Script::nameCompliant(const char * name) {
   return false;
 }
 
-uint16_t Script::cursorOffset() {
-  assert(!isNull());
-  Ion::Storage::MetadataRowHeader * metadataForRecord = Ion::Storage::sharedStorage()->metadataForRecord(*this);
-  if (metadataForRecord != nullptr) {
-    assert(metadataForRecord->metadataSize == 2);
-    return *((uint16_t*) metadataForRecord->data());
-  }
-
-  return -1;
-}
-void Script::setCursorOffset(uint16_t position) {
-  assert(!isNull());
-  Ion::Storage::sharedStorage()->setMetadataForRecord(*this, sizeof(uint16_t), &position);
-}
-
 uint8_t * StatusFromData(Script::Data d) {
   return const_cast<uint8_t *>(static_cast<const uint8_t *>(d.buffer));
 }

apps/code/script.h

@@ -50,8 +50,6 @@ public:
   void toggleAutoimportationStatus();
   const char * content() const;
   size_t contentSize() { return value().size - k_statusSize; }
-  void setCursorOffset(uint16_t position); // -1 if no metadata
-  uint16_t cursorOffset();
 
   /* Fetched status */
   bool fetchedFromConsole() const;

apps/code/script_node_cell.cpp

@@ -21,10 +21,10 @@ void ScriptNodeCell::ScriptNodeView::drawRect(KDContext * ctx, KDRect rect) cons
   const int nodeNameLength = m_scriptNode->nameLength();
   KDSize nameSize = k_font->stringSize(nodeName, nodeNameLength);
   const KDCoordinate nodeNameY = k_topMargin;
-  ctx->drawString(nodeName, KDPoint(0, nodeNameY), k_font, Palette::PrimaryText, backgroundColor, nodeNameLength);
+  ctx->drawString(nodeName, KDPoint(0, nodeNameY), k_font, KDColorBlack, backgroundColor, nodeNameLength);
   // If it is needed, draw the parentheses
   if (m_scriptNode->type() == ScriptNode::Type::WithParentheses) {
-    ctx->drawString(ScriptNodeCell::k_parentheses, KDPoint(nameSize.width(), nodeNameY), k_font, Palette::PrimaryText, backgroundColor);
+    ctx->drawString(ScriptNodeCell::k_parentheses, KDPoint(nameSize.width(), nodeNameY), k_font, KDColorBlack, backgroundColor);
   }
 
   /* If it exists, draw the source name. If it did not fit, we would have put

apps/code/script_store.cpp

@@ -8,9 +8,11 @@ bool ScriptStore::ScriptNameIsFree(const char * baseName) {
   return ScriptBaseNamed(baseName).isNull();
 }
 
-// Here we add "base" script
 ScriptStore::ScriptStore() {
-  
+  addScriptFromTemplate(ScriptTemplate::Squares());
+  addScriptFromTemplate(ScriptTemplate::Parabola());
+  addScriptFromTemplate(ScriptTemplate::Mandelbrot());
+  addScriptFromTemplate(ScriptTemplate::Polynomial());
 }
 
 void ScriptStore::deleteAllScripts() {

apps/code/script_store.h

@@ -49,7 +49,7 @@ private:
    * k_fullFreeSpaceSizeLimit, we consider the script store as full.
    * To be able to add a new empty record, the available space should at least
    * be able to store a Script with default name and its extension, the
-   * importation status (1 char), the cursor (2 char), the default content "from math import *\n"
+   * importation status (1 char), the default content "from math import *\n"
    * (20 char) and 10 char of free space. */
   static constexpr int k_fullFreeSpaceSizeLimit = sizeof(Ion::Storage::record_size_t)+Script::k_defaultScriptNameMaxSize+k_scriptExtensionLength+1+20+10;
 };

apps/code/script_template.cpp

@@ -5,9 +5,103 @@ namespace Code {
 constexpr ScriptTemplate emptyScriptTemplate(".py", "\x01" R"(from math import *
 )");
 
+constexpr ScriptTemplate squaresScriptTemplate("squares.py", "\x01" R"(from math import *
+from turtle import *
+def squares(angle=0.5):
+  reset()
+  L=330
+  speed(10)
+  penup()
+  goto(-L/2,-L/2)
+  pendown()
+  for i in range(660):
+    forward(L)
+    left(90+angle)
+    L=L-L*sin(angle*pi/180)
+  hideturtle())");
+
+constexpr ScriptTemplate mandelbrotScriptTemplate("mandelbrot.py", "\x01" R"(# This script draws a Mandelbrot fractal set
+# N_iteration: degree of precision
+import kandinsky
+def mandelbrot(N_iteration):
+  for x in range(320):
+    for y in range(222):
+# Compute the mandelbrot sequence for the point c = (c_r, c_i) with start value z = (z_r, z_i)
+      z = complex(0,0)
+# Rescale to fit the drawing screen 320x222
+      c = complex(3.5*x/319-2.5, -2.5*y/221+1.25)
+      i = 0
+      while (i < N_iteration) and abs(z) < 2:
+        i = i + 1
+        z = z*z+c
+# Choose the color of the dot from the Mandelbrot sequence
+      rgb = int(255*i/N_iteration)
+      col = kandinsky.color(int(rgb*0.82),int(rgb*0.13),int(rgb*0.18))
+# Draw a pixel colored in 'col' at position (x,y)
+      kandinsky.set_pixel(x,y,col))");
+
+constexpr ScriptTemplate polynomialScriptTemplate("polynomial.py", "\x01" R"(from math import *
+# roots(a,b,c) computes the solutions of the equation a*x**2+b*x+c=0
+def roots(a,b,c):
+  delta = b*b-4*a*c
+  if delta == 0:
+    return -b/(2*a)
+  elif delta > 0:
+    x_1 = (-b-sqrt(delta))/(2*a)
+    x_2 = (-b+sqrt(delta))/(2*a)
+    return x_1, x_2
+  else:
+    return None)");
+
+constexpr ScriptTemplate parabolaScriptTemplate("parabola.py", "\x01" R"(from matplotlib.pyplot import *
+from math import *
+
+g=9.81
+
+def x(t,v_0,alpha):
+  return v_0*cos(alpha)*t
+def y(t,v_0,alpha,h_0):
+  return -0.5*g*t**2+v_0*sin(alpha)*t+h_0
+
+def vx(v_0,alpha):
+  return v_0*cos(alpha)
+def vy(t,v_0,alpha):
+  return -g*t+v_0*sin(alpha)
+
+def t_max(v_0,alpha,h_0):
+  return (v_0*sin(alpha)+sqrt((v_0**2)*(sin(alpha)**2)+2*g*h_0))/g
+
+def simulation(v_0=15,alpha=pi/4,h_0=2):
+  tMax=t_max(v_0,alpha,h_0)
+  accuracy=1/10**(floor(log10(tMax))-1)
+  T_MAX=floor(tMax*accuracy)+1
+  X=[x(t/accuracy,v_0,alpha) for t in range(T_MAX)]
+  Y=[y(t/accuracy,v_0,alpha,h_0) for t in range(T_MAX)]
+  VX=[vx(v_0,alpha) for t in range(T_MAX)]
+  VY=[vy(t/accuracy,v_0,alpha) for t in range(T_MAX)]
+  for i in range(T_MAX):
+    arrow(X[i],Y[i],VX[i]/accuracy,VY[i]/accuracy)
+  grid()
+  show())");
 
 const ScriptTemplate * ScriptTemplate::Empty() {
   return &emptyScriptTemplate;
 }
 
+const ScriptTemplate * ScriptTemplate::Squares() {
+  return &squaresScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Mandelbrot() {
+  return &mandelbrotScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Polynomial() {
+  return &polynomialScriptTemplate;
+}
+
+const ScriptTemplate * ScriptTemplate::Parabola() {
+  return &parabolaScriptTemplate;
+}
+
 }

apps/code/script_template.h

@@ -9,8 +9,12 @@ class ScriptTemplate {
 public:
   constexpr ScriptTemplate(const char * name, const char * value) : m_name(name), m_value(value) {}
   static const ScriptTemplate * Empty();
+  static const ScriptTemplate * Squares();
+  static const ScriptTemplate * Mandelbrot();
+  static const ScriptTemplate * Polynomial();
+  static const ScriptTemplate * Parabola();
   const char * name() const { return m_name; }
-  const char * content() const { return m_value; + Script::StatusSize();}
+  const char * content() const { return m_value + Script::StatusSize(); }
   const char * value() const { return m_value; }
 private:
   const char * m_name;

apps/code/test/toolbox_ion_keys_dummy.cpp

@@ -1,27 +0,0 @@
-#include "../toolbox_ion_keys.h"
-
-namespace Code {
-  ToolboxIonKeys::ToolboxIonKeys() :
-  ViewController(nullptr),
-  m_view()
-  {
-  }
-
-  bool ToolboxIonKeys::handleEvent(Ion::Events::Event e) {
-    return false;
-  }
-
-  ToolboxIonKeys::toolboxIonView::toolboxIonView():
-    View()
-    {
-    }
-
-  void ToolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
-    return;
-  }
-
-  View * ToolboxIonKeys::view(){
-    return &m_view;
-  }
-
-}

apps/code/test/variable_box_controller.cpp

@@ -40,7 +40,7 @@ void assert_variables_are(const char * script, const char * nameToComplete, cons
         &addParentheses,
         i,
         &index);
-    quiz_assert(i == index); // If false, the autocompletion has cycled: there are not as many results as expected
+    quiz_assert(i == index); // If false, the autompletion has cycled: there are not as many results as expected
     quiz_assert(strncmp(*(expectedVariables + i), autocompletionI - nameToCompleteLength, textToInsertLength + nameToCompleteLength) == 0);
     index++;
   }
@@ -63,7 +63,7 @@ QUIZ_CASE(variable_box_controller) {
   };
   // FIXME This test does not load imported variables for now
   assert_variables_are(
-      "\x01\x01\x01 from math import *\nfroo=3",
+      "\x01 from math import *\nfroo=3",
       "fr",
       expectedVariables,
       sizeof(expectedVariables) / sizeof(const char *));

apps/code/toolbox.de.i18n

@@ -4,7 +4,3 @@ Modules = "Module"
 LoopsAndTests = "Schleifen und Tests"
 Files = "Dateien"
 Exceptions = "Ausnahmen"
-UlabDocumentation = "Dokumentation"
-IonSelector = "Schlüsselauswahl"
-PressAKey = "drücke eine Taste"
-IonKeyList = "Liste der Schlüssel"

apps/code/toolbox.en.i18n

@@ -4,7 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Loops and tests"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentation"
-IonSelector = "Key selector"
-PressAKey = "Press a key"
-IonKeyList = "List of keys"

apps/code/toolbox.es.i18n

@@ -4,7 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Loops and tests"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentación"
-IonSelector = "Selector de llave"
-PressAKey = "presione una tecla"
-IonKeyList = "Lista de llaves"

apps/code/toolbox.fr.i18n

@@ -4,7 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Boucles et tests"
 Files = "Fichiers"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentation"
-IonSelector = "Sélecteur de touche"
-PressAKey = "Appuyez sur une touche"
-IonKeyList = "Liste des touches"

apps/code/toolbox.hu.i18n

@@ -4,7 +4,3 @@ Modules = "Modulok"
 LoopsAndTests = "Hurkok és tesztek"
 Files = "Fájlok"
 Exceptions = "Kivételek"
-UlabDocumentation = "Dokumentáció"
-IonSelector = "Kulcsválasztó"
-PressAKey = "Nyomj meg egy gombot"
-IonKeyList = "A kulcsok listája"

apps/code/toolbox.it.i18n

@@ -4,7 +4,3 @@ Modules = "Moduli"
 LoopsAndTests = "Cicli e test"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentazione"
-IonSelector = "Selettore a chiave"
-PressAKey = "Premi un tasto"
-IonKeyList = "Elenco delle chiavi"

apps/code/toolbox.nl.i18n

@@ -4,7 +4,3 @@ Modules = "Modules"
 LoopsAndTests = "Herhalingen en testen"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentatie"
-IonSelector = "Toetsenkiezer"
-PressAKey = "druk op een knop"
-IonKeyList = "Lijst met sleutels"

apps/code/toolbox.pt.i18n

@@ -4,7 +4,3 @@ Modules = "Módulos"
 LoopsAndTests = "Laços e testes"
 Files = "Files"
 Exceptions = "Exceptions"
-UlabDocumentation = "Documentação"
-IonSelector = "Seletor de chave"
-PressAKey = "Pressione uma tecla"
-IonKeyList = "Lista de chaves"

apps/code/toolbox.universal.i18n

@@ -3,20 +3,9 @@ IonModule = "ion"
 KandinskyModule = "kandinsky"
 MathModule = "math"
 MatplotlibPyplotModule = "matplotlib.pyplot"
-NumpyModule = "numpy"
-NumpyFftModule = "fft"
-NumpyLinalgModule = "linalg"
-ScipyModule = "scipy"
-ScipyLinalgModule = "linalg"
-ScipyOptimizeModule = "optimize"
-ScipySignalModule = "signal"
-ScipySpecialModule = "special"
-NumpyNdarray = "ndarray"
 OsModule = "os"
-SysModule = "sys"
 TimeModule = "time"
 TurtleModule = "turtle"
-UlabModule = "ulab"
 ForLoopMenu = "For"
 IfStatementMenu = "If"
 WhileLoopMenu = "While"
@@ -68,4 +57,3 @@ PythonCommandDef = "def \x11():\n  "
 PythonCommandDefWithArg = "def function(x):"
 PythonCommandReturn = "return "
 RandomModule = "random"
-UlabDocumentationLink = "micropython-ulab.readthedocs.io"

apps/code/toolbox_ion_keys.cpp

@@ -1,57 +0,0 @@
-#include "toolbox_ion_keys.h"
-#include <apps/apps_container.h>
-#include <assert.h>
-#include <ion.h>
-extern "C" {
-#include <py/obj.h>
-#include <py/objfun.h>
-}
-extern "C" const mp_rom_map_elem_t modion_module_globals_table[52];
-
-namespace Code {
-ToolboxIonKeys::ToolboxIonKeys() :
-  ViewController(nullptr),
-  m_view()
-{
-}
-
-bool ToolboxIonKeys::handleEvent(Ion::Events::Event e) {
-  // FIXME: Use event data to get the pressed key and fix the EXE key.
-  Ion::Keyboard::State state = Ion::Keyboard::scan();
-  for (uint16_t i = 0; i < sizeof(modion_module_globals_table) / sizeof(_mp_rom_map_elem_t); i++) {
-    _mp_rom_map_elem_t element = modion_module_globals_table[i];
-    if (mp_obj_is_small_int(element.value)) {
-      int key = mp_obj_get_int(element.value);
-      if (state.keyDown(static_cast<Ion::Keyboard::Key>(key))) {
-        m_sender->handleEventWithText(qstr_str(MP_OBJ_QSTR_VALUE(element.key)), true);
-      }
-    }
-  }
-  Container::activeApp()->dismissModalViewController();
-  AppsContainer::sharedAppsContainer()->redrawWindow();
-  return true;
-}
-
-ToolboxIonKeys::toolboxIonView::toolboxIonView() :
-  View()
-{
-}
-
-void ToolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->fillRect(rect, Palette::WallScreen);
-  ctx->strokeRect(rect, Palette::ListCellBorder);
-  KDSize fontSize = KDFont::LargeFont->glyphSize();
-  const char * message = I18n::translate(I18n::Message::PressAKey);
-  // Get the starting position of the text to center it.
-  KDPoint textPosition = KDPoint(rect.size().width() / 2 - strlen(message) * fontSize.width() / 2,
-                                 rect.size().height() / 2 - fontSize.height() / 2);
-
-  ctx->drawString(message, textPosition, KDFont::LargeFont, Palette::PrimaryText, Palette::WallScreen);
-
-}
-
-View * ToolboxIonKeys::view() {
-  return &m_view;
-}
-
-}

apps/code/toolbox_ion_keys.h

@@ -1,21 +0,0 @@
-#include <escher.h>
-
-namespace Code {
-
-  class ToolboxIonKeys : public ViewController {
-    public :
-      ToolboxIonKeys();
-      View * view() override;
-      bool handleEvent(Ion::Events::Event e) override;
-      void setSender(InputEventHandler * sender) { m_sender = sender; }
-    private :
-      class toolboxIonView : public View {
-        public :
-          toolboxIonView();
-          void drawRect(KDContext * ctx, KDRect rect) const override;
-      };
-      toolboxIonView m_view;
-      InputEventHandler * m_sender;
-  };
-
-}

apps/code/variable_box_controller.cpp

@@ -365,7 +365,7 @@ int VariableBoxController::typeAndOriginAtLocation(int i, NodeOrigin * resultOri
 
 }
 
-bool VariableBoxController::selectLeaf(int rowIndex, bool quitToolbox) {
+bool VariableBoxController::selectLeaf(int rowIndex) {
   assert(rowIndex >= 0 && rowIndex < numberOfRows());
   m_selectableTableView.deselectTable();
 
@@ -516,7 +516,7 @@ void VariableBoxController::loadBuiltinNodes(const char * textToAutocomplete, in
   assert(sizeof(builtinNames) / sizeof(builtinNames[0]) == k_totalBuiltinNodesCount);
   for (int i = 0; i < k_totalBuiltinNodesCount; i++) {
     if (addNodeIfMatches(textToAutocomplete, textToAutocompleteLength, builtinNames[i].type, NodeOrigin::Builtins, builtinNames[i].name)) {
-      /* We can leverage on the fact that builtin nodes are stored in
+      /* We can leverage on the fact that buitin nodes are stored in
        * alphabetical order. */
       return;
     }
@@ -575,7 +575,7 @@ void VariableBoxController::loadImportedVariablesInScript(const char * scriptCon
 }
 
 void VariableBoxController::loadCurrentVariablesInScript(const char * scriptContent, const char * textToAutocomplete, int textToAutocompleteLength) {
-  /* To find variable and function names: we lex the script and keep all
+  /* To find variable and funtion names: we lex the script and keep all
    * MP_TOKEN_NAME that complete the text to autocomplete and are not already in
    * the builtins or imported scripts. */
 
@@ -653,7 +653,7 @@ void VariableBoxController::loadGlobalAndImportedVariablesInScriptAsImported(Scr
         /* At this point, if the script node is not of type "file_input_2", it
          * will not have main structures of the wanted type.
          * We look for structures at first level (not inside nested scopes) that
-         * are either function definitions, variables statements or imports. */
+         * are either dunction definitions, variables statements or imports. */
         size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
         for (size_t i = 0; i < n; i++) {
           mp_parse_node_t child = pns->nodes[i];
@@ -826,15 +826,15 @@ bool VariableBoxController::importationSourceIsModule(const char * sourceName, c
   return mp_module_get(qstr_from_str(sourceName)) != MP_OBJ_NULL;
 }
 
-bool VariableBoxController::importationSourceIsScript(const char * sourceName, const char * * scriptFullName, Script * retrievedScript) {
+bool VariableBoxController::importationSourceIsScript(const char * sourceName, const char * * scriptFullName, Script * retreivedScript) {
    // Try fetching the nodes from a script
    Script importedScript = ScriptStore::ScriptBaseNamed(sourceName);
    if (importedScript.isNull()) {
      return false;
    }
    *scriptFullName = importedScript.fullName();
-   if (retrievedScript != nullptr) {
-      *retrievedScript = importedScript;
+   if (retreivedScript != nullptr) {
+      *retreivedScript = importedScript;
    }
    return true;
 }

apps/code/variable_box_controller.h

@@ -43,9 +43,9 @@ public:
 
 private:
   constexpr static size_t k_maxNumberOfDisplayedItems = (Ion::Display::Height - Metric::TitleBarHeight - Metric::PopUpTopMargin) / ScriptNodeCell::k_simpleItemHeight + 2; // +2 if the cells are cropped on top and at the bottom
-  constexpr static size_t k_maxScriptNodesCount = 64; // Chosen without particular reasons (Number of functions in the variables box)
+  constexpr static size_t k_maxScriptNodesCount = 32; // Chosen without particular reasons
   constexpr static int k_totalBuiltinNodesCount = 107;
-  constexpr static uint8_t k_scriptOriginsCount = 8; // Number of scripts loaded in the variable box
+  constexpr static uint8_t k_scriptOriginsCount = 3;
   constexpr static uint8_t k_subtitleCellType = NodeCellType; // We don't care as it is not selectable
   constexpr static uint8_t k_itemCellType = LeafCellType; // So that upper class NestedMenuController knows it's a leaf
   constexpr static KDCoordinate k_subtitleRowHeight = 23;
@@ -80,7 +80,7 @@ private:
   // NestedMenuController
   HighlightCell * leafCellAtIndex(int index) override { assert(false); return nullptr; }
   HighlightCell * nodeCellAtIndex(int index) override { assert(false); return nullptr; }
-  bool selectLeaf(int rowIndex, bool quitToolbox) override;
+  bool selectLeaf(int rowIndex) override;
   void insertTextInCaller(const char * text, int textLength = -1);
 
   // Loading
@@ -92,7 +92,7 @@ private:
   bool addNodesFromImportMaybe(mp_parse_node_struct_t * parseNode, const char * textToAutocomplete, int textToAutocompleteLength, bool importFromModules = true);
   const char * importationSourceNameFromNode(mp_parse_node_t & node);
   bool importationSourceIsModule(const char * sourceName, const ToolboxMessageTree * * moduleChildren = nullptr, int * numberOfModuleChildren = nullptr);
-  bool importationSourceIsScript(const char * sourceName, const char * * scriptFullName, Script * retrievedScript = nullptr);
+  bool importationSourceIsScript(const char * sourceName, const char * * scriptFullName, Script * retreivedScript = nullptr);
   bool addImportStructFromScript(mp_parse_node_struct_t * pns, uint structKind, const char * scriptName, const char * textToAutocomplete, int textToAutocompleteLength);
   /* Add a node if it completes the text to autocomplete and if it is not
    * already contained in the variable box. The returned boolean means we

apps/external/app.h

@@ -29,7 +29,7 @@ private:
   MainController m_mainController;
   StackViewController m_stackViewController;
   Window * m_window;
-  static constexpr int k_externalHeapSize = 99000;
+  static constexpr int k_externalHeapSize = 100000;
   char m_externalHeap[k_externalHeapSize];
 };
 

apps/external/archive.cpp

@@ -40,10 +40,9 @@ bool isExamModeAndFileNotExecutable(const TarHeader* tar) {
 }
 
 bool fileAtIndex(size_t index, File &entry) {
-  if (index == -1) {
+  if (index == -1)
     return false;
-  }
-
+  
   const TarHeader* tar = reinterpret_cast<const TarHeader*>(0x90200000);
   unsigned size = 0;
 
@@ -56,45 +55,29 @@ bool fileAtIndex(size_t index, File &entry) {
    * TAR files are comprised of a set of records aligned to 512 bytes boundary
    * followed by data.
    */
-  
-  for(;;) {
-    // Calculate the size
+  while (index-- > 0) {
     size = 0;
     for (int i = 0; i < 11; i++)
       size = size * 8 + (tar->size[i] - '0');
-    
-    // Check if we found our file.
-    if (index == 0) {
-      // If yes, check for sanity and for exam mode stuff
-      if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
-        return false;
-      }
 
-      // File entry found, copy data out.
-      entry.name = tar->name;
-      entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
-      entry.dataLength = size;
-      entry.isExecutable = (tar->mode[4] & 0x01) == 1;
-      // TODO: Handle the trash
-      entry.readable = true;
+    // Move to the next TAR header.
+    unsigned stride = (sizeof(TarHeader) + size + 511);
+    stride = (stride >> 9) << 9;
+    tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
 
-      return true;
-    } else {
-      // move to the next TAR header.
-      unsigned stride = (sizeof(TarHeader) + size + 511);
-      stride = (stride >> 9) << 9;
-      tar = reinterpret_cast<const TarHeader*>(reinterpret_cast<const char*>(tar) + stride);
-
-      // Sanity check.
-      if (!isSane(tar)) {
-        return false;
-      }
+    // Sanity check.
+    if (!isSane(tar) || isExamModeAndFileNotExecutable(tar)) {
+      return false;
     }
-    index--;
   }
-  
-  // Achievement unlock: How did we get there ?
-  return false;
+
+  // File entry found, copy data out.
+  entry.name = tar->name;
+  entry.data = reinterpret_cast<const uint8_t*>(tar) + sizeof(TarHeader);
+  entry.dataLength = size;
+  entry.isExecutable = (tar->mode[4] & 0x01) == 1;
+
+  return true;
 }
 
 extern "C" void (* const apiPointers[])(void);
@@ -114,31 +97,18 @@ uint32_t executeFile(const char *name, void * heap, const uint32_t heapSize) {
   return -1;
 }
 
+int indexFromName(const char *name) {
+  File entry;
 
-#else
-
-bool fileAtIndex(size_t index, File &entry) {
-  if (index != 0) {
-    return false;
+  for (int i = 0; fileAtIndex(i, entry); i++) {
+    if (strcmp(name, entry.name) == 0) {
+      return i;
+    }
   }
 
-  entry.name = "Built-in";
-  entry.data = NULL;
-  entry.dataLength = 0;
-  entry.isExecutable = true;
-  entry.readable = true;
-  return true;
+  return -1;
 }
 
-extern "C" void extapp_main(void);
-
-uint32_t executeFile(const char *name, void * heap, const uint32_t heapSize) {
-  extapp_main();
-  return 0;
-}
-
-#endif
-
 size_t numberOfFiles() {
   File dummy;
   size_t count;
@@ -148,18 +118,6 @@ size_t numberOfFiles() {
   return count;
 }
 
-int indexFromName(const char *name) {
-  File entry;
-
-  for (int i = 0; fileAtIndex(i, entry); i++) {
-    if (entry.readable && strcmp(name, entry.name) == 0) {
-      return i;
-    }
-  }
-
-  return -1;
-}
-
 bool executableAtIndex(size_t index, File &entry) {
   File dummy;
   size_t count;
@@ -172,19 +130,16 @@ bool executableAtIndex(size_t index, File &entry) {
         entry.data = dummy.data;
         entry.dataLength = dummy.dataLength;
         entry.isExecutable = dummy.isExecutable;
-        entry.readable = dummy.readable;
         return true;
       }
       final_count++;
     }
   }
+  
   return false;
 }
 
 size_t numberOfExecutables() {
-  if (!GlobalPreferences::sharedGlobalPreferences()->externalAppShown()) {
-    return false;
-  }
   File dummy;
   size_t count;
   size_t final_count = 0;
@@ -196,5 +151,48 @@ size_t numberOfExecutables() {
   return final_count;
 }
 
+
+
+#else
+
+bool fileAtIndex(size_t index, File &entry) {
+  if (index != 0)
+    return false;
+  
+  entry.name = "Built-in";
+  entry.data = NULL;
+  entry.dataLength = 0;
+  entry.isExecutable = true;
+  return true;
+}
+
+bool executableAtIndex(size_t index, File &entry) {
+  return fileAtIndex(index, entry);
+}
+
+size_t numberOfExecutables() {
+  return 1;
+}
+
+extern "C" void extapp_main(void);
+
+uint32_t executeFile(const char *name, void * heap, const uint32_t heapSize) {
+  extapp_main();
+  return 0;
+}
+
+int indexFromName(const char *name) {
+  if (strcmp(name, "Built-in") == 0)
+    return 0;
+  else
+    return -1;
+}
+
+size_t numberOfFiles() {
+  return 1;
+}
+
+#endif
+
 }
 }

apps/external/archive.h

@@ -14,7 +14,6 @@ struct File {
     const uint8_t *data;
     size_t dataLength;
     bool isExecutable;
-    bool readable;
 };
 
 bool fileAtIndex(size_t index, File &entry);

apps/external/base.de.i18n

@@ -1,9 +1,9 @@
 ExternalApp = "External"
 ExternalAppCapital = "EXTERNAL"
-ExternalAppApiMismatch = "API stimmt nicht überein"
-ExternalAppExecError = "Datei kann nicht ausgeführt werden"
-ExternalNotCompatible = "Externe App ist nicht kompatibel"
+ExternalAppApiMismatch = "API mismatch"
+ExternalAppExecError = "Cannot execute file"
+ExternalNotCompatible = "External ist nicht kompatibel"
 WithSimulator = "mit dem Simulator"
-WithN0100 = "mit N0100"
-GetMoreAppsAt = "Weitere Apps abrufen bei"
-NoAppsInstalled = "Keine Apps installiert"
+WithN0100 = "mit n0100"
+GetMoreAppsAt = "Weitere Apps erhalten Sie auf"
+NoAppsInstalled = "Keine Apps installiert"

apps/external/base.fr.i18n

@@ -1,7 +1,7 @@
 ExternalApp = "External"
 ExternalAppCapital = "EXTERNAL"
-ExternalAppApiMismatch = "Décalage API"
-ExternalAppExecError = "Le fichier ne peut pas être exécuté"
+ExternalAppApiMismatch = "API mismatch"
+ExternalAppExecError = "Cannot execute file"
 ExternalNotCompatible = "External n'est pas compatible"
 WithSimulator = "avec le simulateur"
 WithN0100 = "avec n0100"

apps/external/base.hu.i18n

@@ -1,9 +1,9 @@
 ExternalApp = "Külsö"
-ExternalAppCapital = "KÜLSÖ"
+ExternalAppCapital = "KÜLSö"
 ExternalAppApiMismatch = "API eltérés"
 ExternalAppExecError = "A fájl nem futtatható"
-ExternalNotCompatible = "Externál nem kompatibilis"
+ExternalNotCompatible = "Ez az alkalmazás nem kompatibilis a "
 WithSimulator = "Szimulátorral"
-WithN0100 = "n0100-al"
-GetMoreAppsAt = "Mégtöbb alkalmazás itt :"
-NoAppsInstalled = "Nincs letöltött externál"
+WithN0100 = "a n0100-el"
+GetMoreAppsAt = "Mégtöbb alkalmazás a"
+NoAppsInstalled = "Nincs letöltött alkalmazás"