Calc+ v1.0 (#189)

- Bigger fonts
- System colors
- Code refactoring to make UI flexible and more readable
- Move from ISO to IMG
- Add to main menu, add to desktop instead of Calc, remove from App+
- Localization to all system languages
- Source code file is now UTF-8

Co-authored-by: Burer <burer@kolibrios.org>
Reviewed-on: #189
Reviewed-by: Max Logaev <maxlogaev@proton.me>
Co-authored-by: Kiril Lipatov <lipatov.kiril@gmail.com>
Co-committed-by: Kiril Lipatov <lipatov.kiril@gmail.com>

data/Tupfile.lua

@@ -410,6 +410,7 @@ tup.append_table(img_files, {
  {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"},
  {"APM", VAR_PROGS .. "/system/apm/apm"},
  {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"},
+ {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
  {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
@@ -626,7 +627,6 @@ tup.append_table(extra_files, {
  {"kolibrios/media/zsea/plugins/rotate.obj", VAR_PROGS .. "/media/zsea/plugins/rotate/rotate.obj"},
  {"kolibrios/media/zsea/plugins/scaling.obj", VAR_PROGS .. "/media/zsea/plugins/scaling/scaling.obj"},
  {"kolibrios/utils/AMDtemp", VAR_PROGS .. "/system/amd_temp_view/AMDtemp"},
- {"kolibrios/utils/calcplus", VAR_PROGS .. "/other/calcplus/calcplus"},
  {"kolibrios/utils/kfm/kfm", VAR_PROGS .. "/fs/kfm/trunk/kfm"},
  {"kolibrios/utils/tedit/t_edit", VAR_PROGS .. "/other/t_edit/t_edit"},
  {"kolibrios/3D/blocks/block.bin", VAR_PROGS .. "/bcc32/games/blocks/block.bin"}

data/common/settings/app_plus.ini

@@ -29,7 +29,6 @@ Dicty=/k/utils/DICTY.KEX,79
 fNav=/k/utils/fNav/fNav,93
 CncEditor=/k/utils/cnc_editor/cnc_editor,15
 Life=/k/demos/life2,13
-Calc+=/k/utils/calcplus,4
 TinyBasic=/k/develop/TinyBasic/TinyBasic,91
 THashView=/k/utils/thashview,124
 Notes=/k/utils/notes,117

data/en_US/settings/icon.ini

@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
+name=CALC+
-path=CALC
+path=CALCPLUS
 param=
 ico=4
 x=204

data/en_US/settings/menu.dat

@@ -92,6 +92,7 @@
 59 Screen keyboard      |zkey
 #10 **** DATA PROCESSING
 16 Calculator           |calc
+16 Calculator+          |calcplus
 03 Tinypad              |tinypad
 28 CodeEdit             |develop/cedit
 21 Table processor      |table

data/es_ES/settings/icon.ini

@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
+name=CALC+
-path=CALC
+path=CALCPLUS
 param=
 ico=4
 x=204

data/es_ES/settings/menu.dat

@@ -96,6 +96,7 @@
 24 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** PROCESO DE DATOS
 16 Calculadora           |calc
+16 Calculadora+          |calcplus
 16 Tinypad               |tinypad
 16 CodeEdit              |develop/cedit
 16 Procesador de tablas  |table

data/et_EE/settings/icon.ini

@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
+name=CALC+
-path=CALC
+path=CALCPLUS
 param=
 ico=4
 x=204

data/et_EE/settings/menu.dat

@@ -80,6 +80,7 @@
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING ****
 16 Kalkulaator           |calc
+16 Kalkulaator+          |calcplus
 16 Teksti redaktor       |tinypad
 16 CodeEdit              |develop/cedit
 16 Tabelarvutus          |table

data/it_IT/settings/icon.ini

@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
+name=CALC+
-path=CALC
+path=CALCPLUS
 param=
 ico=4
 x=204

data/it_IT/settings/menu.dat

@@ -79,6 +79,7 @@
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING
 16 Calcolatrice          |calc
+16 Calcolatrice+         |calcplus
 16 Tinypad               |tinypad
 16 CodeEdit              |develop/cedit
 16 Table Processor       |table

data/ru_RU/settings/icon.ini

@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
+name=CALC+
-path=CALC
+path=CALCPLUS
 param=
 ico=4
 x=204

data/ru_RU/settings/menu.dat

@@ -90,6 +90,7 @@
 59 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |zkey
 #10 **** <20><><EFBFBD><EFBFBD>
 16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>          |calc
+16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>+         |calcplus
 03 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Tinypad     |tinypad
 28 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CodeEdit    |develop/cedit
 21 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |table

programs/other/calcplus/Tupfile.lua

@@ -1,2 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("calcplus.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "calcplus")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
+tup.include(HELPERDIR .. "/use_fasm.lua")
+tup.rule("calcplus.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B")
+

programs/other/calcplus/build.bat

@@ -1,2 +0,0 @@
-@fasm calcplus.asm calc+
-@pause