Calc+ v1.0 #189
dunkaist
Reference in New Issue
Block a user
Delete Branch "calc-plus-v1.0"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Clac+ v1.0to Calc+ v1.0@@ -1,4 +1,4 @@VERSION equ "0.5"Let's add copyright.
Please add. :3
@@ -1,4 +1,4 @@VERSION equ "0.5"; VERSION equ "v1.0"Why is it not used?
don't wanna
@@ -53,2 +59,2 @@m2m [edb1.focus_border_color], [scn.gui_face]m2m [edb1.text_color], [scn.gui_text]m2m [edb1.color], [scn.gui_face];m2m [edb1.shift_color], [scn.gui_select]Will this be useful in the future? We have Git to track changes
Let it be as is for now.
@@ -119,1 +133,4 @@cmp ah, 250jne @fmcall 70, f70_calcLet's use constants instead of numbers. They are in the documentation and KOSfunc.inc
I'm not in resource anymore to rework this into constants.
I already did a great work on refactoring this shi~ :)
A dozen of constants were added.
Calc+ v1.0to WIP: Calc+ v1.0I will make further code refactoring and UI tweaks later today.
Sorry for commits spam, but I have finally done it.
Refactored code, Spanish localization and properly aligned UI.
WIP: Calc+ v1.0to Calc+ v1.086edd79af4to718a717b9ePS. Since Calc+ now has an updated interface, and since it can call the usual Calc by button, maybe it makes sense to put just Calc+ on the desktop and in the main menu?
@@ -667,2 +721,3 @@memory:f70_calc:dd 7Use
SSF_START_APP@@ -2,0 +3,4 @@; Calc+ - Multifunctional calculator; Copyright (C) 2014-2025 KolibriOS team;; Contributor eAndrew - Main codeIs this really required? We have GIT for this.
Let's standardise headers- to avoid back-and-forth with contributors! 😅
I used the header example you provided and just added lines for contributors.
A few lines of comments won't hurt, I suppose.
Let's add this program to the desktop instead of
calcand to the menu. But we don’t removecalcfrom the menu. Also checkAPP+. I think you will need to removecalc+from there.Please double check whether file encodings have been broken, e.g. for es-ES.
@@ -238,2 +238,2 @@name=CALCpath=CALCname=CALC+path=/sys/calcplusShouldn't CALC become just CALCPLUS?
@@ -3,3 +3,3 @@00 2D Demos > |@100 3D Demos > |@200 Gr ficos > |@300 Gr<EFBFBD>ficos > |@3Was this intentional?
Definitely wasn't, thanks for pointing.
@@ -669,0 +725,4 @@dd 0dd 0dd 0db '/sys/calc', 0This initialized data goes after uninitialized data. Move it somewhere before I_END (which literally means Initialized END)
@@ -635,0 +676,4 @@elseengineering_str db "Engineering calc"engineering_len = 16Hardcoding a string length is error prone. You can write 'engineering_len = $ - engineering_str' here. If you prefer macros, you can also use macros sz or lsz from macros.inc. For example, zsea uses lsz.
@@ -254,2 +288,4 @@; ====================================================================ev_mouse:Please, remove the leading space here.
@@ -361,0 +375,4 @@je .err_5.err_1:mov [ans.buffer + 0], dword "Div."Is the indent meant to be double-wide here?
Yes, as each error is a separate logic branch with jump to redraw at the end.
@@ -635,0 +607,4 @@jmp .next_txt.set_color_to_2_txt:mov ecx, LIST_ITEM_TEXT1Is this doubled indent intentional?
Yes, but now I decided to remove it, as both labels aligns to single program flow.
@@ -90,6 +90,7 @@59 <20><>ΰ ο <20>« Ά¨ βγΰ |zkey#10 **** <20>δ¨α16 <20> «μ<C2AB>γ«οβ®ΰ |calc16 Š «ìª+ |calcplusMaybe
Калькулятор+Let's write it like this for all languages.
@@ -1,2 +1,2 @@@fasm calcplus.asm calc+@fasm -dlang=ru_RU calcplus.asm calc+Leave it alone or delete the batch file altogether. The program is builded literally by one command
@@ -16,0 +64,4 @@WIN_H = LIST_H + 60sz_head db "Calc+", 0btn_clr db ""Is this a сyrillic character?
d143611a51to781f7b0bbbNew commits pushed, approval review dismissed automatically according to repository settings
@@ -16,0 +182,4 @@mov [eax], clinc eaxjmp @bPlease, remove trailing spaces here and below.
@@ -664,3 +727,3 @@}scn system_colors_internalscn system_colors_internalThe line defines initialized data. Please, move it above. This way you can decrease app size from 11921 to 4257 bytes.
New commits pushed, approval review dismissed automatically according to repository settings