[VP, TP] calculator_menu, calculator

further work on both classes
Merge branch 'master' of https://github.com/venjirai/sw14_free_20