Menu
▾
▴
[Easycalc-commits] easycalc calc.c, 1.35, 1.36 calc.rcp.in, 1.110, 1.111 calcrsc.h, 1.61, 1.62 graph.c, 1.50, 1.51 graph.rcp.in, 1.34, 1.35 grprefs.c, 1.23, 1.24 grsetup.c, 1.27, 1.28 grsetup.h, 1.6, 1.7 prefs.c, 1.16, 1.17
Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5308 Modified Files: calc.c calc.rcp.in calcrsc.h graph.c graph.rcp.in grprefs.c grsetup.c grsetup.h prefs.c Log Message: Try to make UI elements more consistent: Use selectortriggers (dotted border) for pop-up lists and buttons (solid border) for toggles (e.g. Rad/Deg/Grd) and actions. Remove grayscale color selection form. Use system Pick Color dialog for both grayscale and color devices. Remove color selection button on graph form (grayscale only). Add color selection buttons for functions, axes, grid and background to graph setup form. Index: calc.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** calc.rcp.in 1 Oct 2006 22:42:05 -0000 1.110 --- calc.rcp.in 16 Oct 2006 18:58:37 -0000 1.111 *************** *** 287,293 **** FIELD ID varEditParam AT (120 15 30 12) EDITABLE UNDERLINED MAXCHARS 10 NONUSABLE ! BUTTON "Rcl" ID varListButton AT (102 58 15 12) NOFRAME ! BUTTON "F" ID varFuncListButton AT (PREVRIGHT PREVTOP 15 12) NOFRAME ! BUTTON "f" ID varBuiltinListButton AT (PREVRIGHT PREVTOP 15 12) NOFRAME LIST "" ID varList AT (30 10 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 --- 287,293 ---- FIELD ID varEditParam AT (120 15 30 12) EDITABLE UNDERLINED MAXCHARS 10 NONUSABLE ! SELECTORTRIGGER "Rcl" ID varListButton AT (102 58 15 11) ! SELECTORTRIGGER "F" ID varFuncListButton AT (PREVRIGHT+1 PREVTOP 9 11) ! SELECTORTRIGGER "f" ID varBuiltinListButton AT (PREVRIGHT+1 PREVTOP 9 11) LIST "" ID varList AT (30 10 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 *************** *** 413,490 **** MENUID tdMenu BEGIN ! TITLE "$$INTEGER" ! ! PUSHBUTTON "B" ID btnBasic AT (106 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif - - GADGET ID resultGadget AT (5 16 138 16) - FIELD ID tdInput AT (0 32 145 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE - - POPUPTRIGGER "" ID btnHistory AT (147 25 15 AUTO) ! BUTTON "M" ID calcResPopupBut AT (148 15 13 12) NOFRAME ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! ! BUTTON "Rcl" ID varListButton AT (75 1 15 12) NOFRAME ! BUTTON "F" ID varFuncListButton AT (PREVRIGHT 1 15 12) NOFRAME ! BUTTON "f" ID varBuiltinListButton AT (150 1 10 12) NOFRAME ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (PREVLEFT 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (PREVLEFT 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (PREVLEFT 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (PREVLEFT 120 22 14) FONT 1 ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! BUTTON "7" ID btnMain7 AT (55 60 20 15) ! BUTTON "8" ID btnMain8 AT (80 60 20 15) ! BUTTON "9" ID btnMain9 AT (105 60 20 15) ! BUTTON "4" ID btnMain4 AT (55 80 20 15) ! BUTTON "5" ID btnMain5 AT (80 80 20 15) ! BUTTON "6" ID btnMain6 AT (105 80 20 15) ! BUTTON "1" ID btnMain1 AT (55 100 20 15) ! BUTTON "2" ID btnMain2 AT (80 100 20 15) ! BUTTON "3" ID btnMain3 AT (105 100 20 15) ! BUTTON "0" ID btnMain0 AT (55 120 20 15) ! BUTTON "&" ID btnMainAnd AT (80 120 20 15) ! BUTTON "|" ID btnMainOr AT (105 120 20 15) ! BUTTON "¥" ID btnMainXor AT (55 140 20 15) ! BUTTON "<<" ID btnMainShl AT (80 140 20 15) ! BUTTON ">>" ID btnMainShr AT (105 140 20 15) ! BUTTON "A" ID btnMainA AT (5 60 20 15) ! BUTTON "B" ID btnMainB AT (30 60 20 15) ! BUTTON "C" ID btnMainC AT (5 80 20 15) ! BUTTON "D" ID btnMainD AT (30 80 20 15) ! BUTTON "E" ID btnMainE AT (5 100 20 15) ! BUTTON "F" ID btnMainF AT (30 100 20 15) ! ! PUSHBUTTON "Bin" ID tdIntBin AT (5 120 20 15) GROUP 3 ! PUSHBUTTON "Oct" ID tdIntOct AT (30 120 20 15) GROUP 3 ! PUSHBUTTON "Dec" ID tdIntDec AT (5 140 20 15) GROUP 3 ! PUSHBUTTON "Hex" ID tdIntHex AT (30 140 20 15) GROUP 3 ! GRAFFITISTATEINDICATOR AT (149 47) END --- 413,489 ---- MENUID tdMenu BEGIN ! TITLE "$$INTEGER" ! ! SELECTORTRIGGER "Rcl" ID varListButton AT (76 1 15 11) ! SELECTORTRIGGER "F" ID varFuncListButton AT (PREVRIGHT+1 1 9 11) ! SELECTORTRIGGER "f" ID varBuiltinListButton AT (PREVRIGHT+1 1 9 11) ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! ! PUSHBUTTON "B" ID btnBasic AT (116 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 137 16) ! FIELD ID tdInput AT (1 32 136 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! GRAFFITISTATEINDICATOR AT (138 37) ! SELECTORTRIGGER "M" ID calcResPopupBut AT (148 17 11 10) ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! SELECTORTRIGGER "H" ID btnHistory AT (148 32 11 10) ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (PREVLEFT 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (PREVLEFT 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (PREVLEFT 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (PREVLEFT 120 22 14) FONT 1 ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! ! BUTTON "7" ID btnMain7 AT (55 60 20 15) ! BUTTON "8" ID btnMain8 AT (80 60 20 15) ! BUTTON "9" ID btnMain9 AT (105 60 20 15) ! BUTTON "4" ID btnMain4 AT (55 80 20 15) ! BUTTON "5" ID btnMain5 AT (80 80 20 15) ! BUTTON "6" ID btnMain6 AT (105 80 20 15) ! BUTTON "1" ID btnMain1 AT (55 100 20 15) ! BUTTON "2" ID btnMain2 AT (80 100 20 15) ! BUTTON "3" ID btnMain3 AT (105 100 20 15) ! BUTTON "0" ID btnMain0 AT (55 120 20 15) ! BUTTON "&" ID btnMainAnd AT (80 120 20 15) ! BUTTON "|" ID btnMainOr AT (105 120 20 15) ! BUTTON "¥" ID btnMainXor AT (55 140 20 15) ! BUTTON "<<" ID btnMainShl AT (80 140 20 15) ! BUTTON ">>" ID btnMainShr AT (105 140 20 15) ! BUTTON "A" ID btnMainA AT (5 60 20 15) ! BUTTON "B" ID btnMainB AT (30 60 20 15) ! BUTTON "C" ID btnMainC AT (5 80 20 15) ! BUTTON "D" ID btnMainD AT (30 80 20 15) ! BUTTON "E" ID btnMainE AT (5 100 20 15) ! BUTTON "F" ID btnMainF AT (30 100 20 15) ! PUSHBUTTON "Bin" ID tdIntBin AT (5 120 20 15) GROUP 3 ! PUSHBUTTON "Oct" ID tdIntOct AT (30 120 20 15) GROUP 3 ! PUSHBUTTON "Dec" ID tdIntDec AT (5 140 20 15) GROUP 3 ! PUSHBUTTON "Hex" ID tdIntHex AT (30 140 20 15) GROUP 3 END *************** *** 492,602 **** MENUID tdMenu BEGIN ! TITLE "$$SCIENTIFIC" ! ! PUSHBUTTON "B" ID btnBasic AT (106 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 138 16) ! FIELD ID tdInput AT (0 32 145 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! ! POPUPTRIGGER "" ID btnHistory AT (147 25 15 AUTO) ! BUTTON "M" ID calcResPopupBut AT (148 15 13 12) NOFRAME ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! BUTTON " " ID btnRadixMode AT (37 1 16 12) NOFRAME ! BUTTON " " ID btnPrefMode AT (57 1 15 12) NOFRAME ! BUTTON "Rcl" ID varListButton AT (PREVRIGHT+3 1 15 12) NOFRAME ! BUTTON "F" ID varFuncListButton AT (PREVRIGHT 1 15 12) NOFRAME ! BUTTON "f" ID varBuiltinListButton AT (150 1 10 12) NOFRAME ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! BUTTON "S" ID btnMainSel AT (148 36 13 11) NOFRAME ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (PREVLEFT 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (PREVLEFT 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (PREVLEFT 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (PREVLEFT 120 22 14) FONT 1 ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! BUTTON "7" ID btnMain7 AT (75 60 18 17) ! BUTTON "8" ID btnMain8 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "9" ID btnMain9 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "4" ID btnMain4 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "5" ID btnMain5 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "6" ID btnMain6 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "1" ID btnMain1 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "2" ID btnMain2 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "3" ID btnMain3 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "0" ID btnMain0 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "." ID btnMainDot AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "Exp" ID btnMainEE AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "ANS" ID btnMainAns AT (75 PREVBOTTOM+2 PREVWIDTH 12) ! BUTTON "(" ID btnMainOpBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON ")" ID btnMainClBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "<-" ID btnMainBksp AT (75 PREVBOTTOM+2 PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "" ID btnMainDel AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+4 PREVTOP+2) BITMAP bmpLdel USABLE ! REPEATBUTTON "->" ID btnMainFwsp AT (113 PREVTOP 18 12) ! BUTTON "" ID btnMainS1 AT (2 60 20 15) NONUSABLE ! BUTTON "" ID btnMainS4 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS7 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS10 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS13 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS2 AT (PREVRIGHT+4 60 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS5 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS8 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS11 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS14 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS3 AT (PREVRIGHT+4 60 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS6 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS9 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS12 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS15 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW1 AT (2 60 32 15) NONUSABLE ! BUTTON "" ID btnMainW3 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW5 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW7 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW9 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW2 AT (PREVRIGHT+4 60 32 15) NONUSABLE ! BUTTON "" ID btnMainW4 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW6 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW8 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW10 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE #ifdef SPECFUN_ENABLED ! LIST "$$TRIGONOMETRICS" "$$EXPONENTIAL" "$$COMBINATORICS" "$$COMPLEX" "$$FUNCTION SOLVING" "$$LIST FUNCTIONS" "$$MATRIX FUNCTIONS" "$$UPPER TAIL PROBAB" "$$SIGNAL PROCESSING" "$$DISCRETE MATH" "$$SPECIAL FUNCTIONS" "$$SPECIAL FUNCTIONS2" ID lstMainBtnRow AT (55 25 89 44) NONUSABLE VISIBLEITEMS 12 DISABLED #else ! LIST "$$TRIGONOMETRICS" "$$EXPONENTIAL" "$$COMBINATORICS" "$$COMPLEX" ID lstMainBtnRow AT (55 25 89 44) NONUSABLE VISIBLEITEMS 4 DISABLED #endif ! POPUPLIST ID popMainBtnRow lstMainBtnRow ! ! GRAFFITISTATEINDICATOR AT (149 47) END --- 491,599 ---- MENUID tdMenu BEGIN ! TITLE "$$SCIENTIFIC" ! ! BUTTON " " ID btnRadixMode AT (35 1 18 12) RECTFRAME ! BUTTON " " ID btnPrefMode AT (56 1 17 12) RECTFRAME ! ! SELECTORTRIGGER "Rcl" ID varListButton AT (PREVRIGHT+4 1 15 11) ! SELECTORTRIGGER "F" ID varFuncListButton AT (PREVRIGHT+1 1 9 11) ! SELECTORTRIGGER "f" ID varBuiltinListButton AT (PREVRIGHT+1 1 9 11) ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! ! PUSHBUTTON "B" ID btnBasic AT (116 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 137 16) ! FIELD ID tdInput AT (1 32 136 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! GRAFFITISTATEINDICATOR AT (138 37) ! SELECTORTRIGGER "M" ID calcResPopupBut AT (148 17 11 10) ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! SELECTORTRIGGER "H" ID btnHistory AT (148 32 11 10) ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! SELECTORTRIGGER "S" ID btnMainSel AT (148 43 11 10) ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (PREVLEFT 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (PREVLEFT 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (PREVLEFT 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (PREVLEFT 120 22 14) FONT 1 ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! BUTTON "7" ID btnMain7 AT (75 60 18 17) ! BUTTON "8" ID btnMain8 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "9" ID btnMain9 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "4" ID btnMain4 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "5" ID btnMain5 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "6" ID btnMain6 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "1" ID btnMain1 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "2" ID btnMain2 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "3" ID btnMain3 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "0" ID btnMain0 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "." ID btnMainDot AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "Exp" ID btnMainEE AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "ans" ID btnMainAns AT (75 PREVBOTTOM+2 PREVWIDTH 12) ! BUTTON "(" ID btnMainOpBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON ")" ID btnMainClBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "<-" ID btnMainBksp AT (75 PREVBOTTOM+2 PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "" ID btnMainDel AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+4 PREVTOP+2) BITMAP bmpLdel USABLE ! REPEATBUTTON "->" ID btnMainFwsp AT (113 PREVTOP 18 12) ! BUTTON "" ID btnMainS1 AT (2 60 20 15) NONUSABLE ! BUTTON "" ID btnMainS4 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS7 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS10 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS13 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS2 AT (PREVRIGHT+4 60 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS5 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS8 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS11 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS14 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS3 AT (PREVRIGHT+4 60 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS6 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS9 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS12 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainS15 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW1 AT (2 60 32 15) NONUSABLE ! BUTTON "" ID btnMainW3 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW5 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW7 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW9 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW2 AT (PREVRIGHT+4 60 32 15) NONUSABLE ! BUTTON "" ID btnMainW4 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW6 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW8 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE ! BUTTON "" ID btnMainW10 AT (PREVLEFT PREVBOTTOM+5 PREVWIDTH PREVHEIGHT) NONUSABLE #ifdef SPECFUN_ENABLED ! LIST "$$TRIGONOMETRICS" "$$EXPONENTIAL" "$$COMBINATORICS" "$$COMPLEX" "$$FUNCTION SOLVING" "$$LIST FUNCTIONS" "$$MATRIX FUNCTIONS" "$$UPPER TAIL PROBAB" "$$SIGNAL PROCESSING" "$$DISCRETE MATH" "$$SPECIAL FUNCTIONS" "$$SPECIAL FUNCTIONS2" ID lstMainBtnRow AT (55 25 89 44) NONUSABLE VISIBLEITEMS 12 DISABLED #else ! LIST "$$TRIGONOMETRICS" "$$EXPONENTIAL" "$$COMBINATORICS" "$$COMPLEX" ID lstMainBtnRow AT (55 25 89 44) NONUSABLE VISIBLEITEMS 4 DISABLED #endif ! POPUPLIST ID popMainBtnRow lstMainBtnRow END *************** *** 605,708 **** MENUID tdMenu BEGIN ! TITLE "$$BASIC" ! ! PUSHBUTTON "B" ID btnBasic AT (106 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 138 16) ! FIELD ID tdInput AT (0 32 145 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! ! POPUPTRIGGER "" ID btnHistory AT (147 25 15 AUTO) ! ! BUTTON "M" ID calcResPopupBut AT (148 15 13 12) NOFRAME ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! BUTTON " " ID btnRadixMode AT (37 1 16 12) NOFRAME ! BUTTON " " ID btnPrefMode AT (57 1 15 12) NOFRAME ! BUTTON "Rcl" ID varListButton AT (PREVRIGHT+3 1 15 12) NOFRAME ! BUTTON "F" ID varFuncListButton AT (PREVRIGHT 1 15 12) NOFRAME ! BUTTON "f" ID varBuiltinListButton AT (150 1 10 12) NOFRAME ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! BUTTON "log" ID btnMainLog AT (5 60 20 14) ! BUTTON "ln" ID btnMainLn AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "" ID btnMainExp AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpExpon USABLE ! BUTTON "sin" ID btnMainSin AT (5 77 20 14) ! BUTTON "cos" ID btnMainCos AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "tan" ID btnMainTan AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "" ID btnMainSqr AT (5 94 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquare USABLE ! BUTTON "" ID btnMainSqrt AT (28 94 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquareRoot USABLE ! BUTTON "x!" ID btnMainFact AT (51 94 20 14) ! BUTTON "" ID btnMainInv AT (5 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpInverse USABLE ! BUTTON "" ID btnMainPow AT (28 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpPower USABLE ! BUTTON "" ID btnMainSq1 AT (51 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpRootX USABLE ! BUTTON "pi" ID btnMainPi AT (5 128 20 14) ! BUTTON "°" btnMainDeg AT (PREVRIGHT+3 128 8 14) ! BUTTON "'" ID btnMainMin AT (PREVRIGHT+4 128 8 14) ! BUTTON "(-)" ID btnMainNeg AT (PREVRIGHT+3 128 20 14) ! BUTTON "abs" ID btnMainMagn AT (5 145 20 14) ! BUTTON "Ang" ID btnMainAngl AT (PREVRIGHT+3 145 20 14) ! BUTTON "i" ID btnMain_i AT (PREVRIGHT+3 145 8 14) ! BUTTON ":" ID btnMainColn AT (PREVRIGHT+4 145 8 14) ! ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (134 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (134 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (134 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (134 120 22 14) FONT 1 ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "7" ID btnMain7 AT (75 60 18 17) ! BUTTON "8" ID btnMain8 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "9" ID btnMain9 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "4" ID btnMain4 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "5" ID btnMain5 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "6" ID btnMain6 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "1" ID btnMain1 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "2" ID btnMain2 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "3" ID btnMain3 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "0" ID btnMain0 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "." ID btnMainDot AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "Exp" ID btnMainEE AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "ANS" ID btnMainAns AT (75 PREVBOTTOM+2 PREVWIDTH 12) ! BUTTON "(" ID btnMainOpBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON ")" ID btnMainClBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "<-" ID btnMainBksp AT (75 PREVBOTTOM+2 PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "" ID btnMainDel AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+4 PREVTOP+2) BITMAP bmpLdel USABLE ! REPEATBUTTON "->" ID btnMainFwsp AT (113 PREVTOP 18 12) ! GRAFFITISTATEINDICATOR AT (149 47) END --- 602,703 ---- MENUID tdMenu BEGIN ! TITLE "$$BASIC" ! ! BUTTON " " ID btnRadixMode AT (35 1 18 12) RECTFRAME ! BUTTON " " ID btnPrefMode AT (56 1 17 12) RECTFRAME ! ! SELECTORTRIGGER "Rcl" ID varListButton AT (PREVRIGHT+4 1 15 11) ! SELECTORTRIGGER "F" ID varFuncListButton AT (PREVRIGHT+1 1 9 11) ! SELECTORTRIGGER "f" ID varBuiltinListButton AT (PREVRIGHT+1 1 9 11) ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! ! PUSHBUTTON "B" ID btnBasic AT (116 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 137 16) ! FIELD ID tdInput AT (1 32 136 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! GRAFFITISTATEINDICATOR AT (138 37) ! ! SELECTORTRIGGER "M" ID calcResPopupBut AT (148 17 11 10) ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! SELECTORTRIGGER "H" ID btnHistory AT (148 32 11 10) ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! BUTTON "log" ID btnMainLog AT (5 60 20 14) ! BUTTON "ln" ID btnMainLn AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "" ID btnMainExp AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpExpon USABLE ! BUTTON "sin" ID btnMainSin AT (5 77 20 14) ! BUTTON "cos" ID btnMainCos AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "tan" ID btnMainTan AT (PREVRIGHT+3 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "" ID btnMainSqr AT (5 94 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquare USABLE ! BUTTON "" ID btnMainSqrt AT (28 94 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquareRoot USABLE ! BUTTON "x!" ID btnMainFact AT (51 94 20 14) ! BUTTON "" ID btnMainInv AT (5 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpInverse USABLE ! BUTTON "" ID btnMainPow AT (28 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpPower USABLE ! BUTTON "" ID btnMainSq1 AT (51 111 20 14) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpRootX USABLE ! BUTTON "pi" ID btnMainPi AT (5 128 20 14) ! BUTTON "°" btnMainDeg AT (PREVRIGHT+3 128 8 14) ! BUTTON "'" ID btnMainMin AT (PREVRIGHT+4 128 8 14) ! BUTTON "(-)" ID btnMainNeg AT (PREVRIGHT+3 128 20 14) ! BUTTON "abs" ID btnMainMagn AT (5 145 20 14) ! BUTTON "Ang" ID btnMainAngl AT (PREVRIGHT+3 145 20 14) ! BUTTON "i" ID btnMain_i AT (PREVRIGHT+3 145 8 14) ! BUTTON ":" ID btnMainColn AT (PREVRIGHT+4 145 8 14) ! BUTTON "Clr" ID btnMainClear AT (134 60 22 14) ! BUTTON "/" ID btnMainDivide AT (134 75 22 14) FONT 1 ! BUTTON "*" ID btnMainMult AT (134 90 22 14) FONT 1 ! BUTTON "-" ID btnMainMinus AT (134 105 22 14) FONT 1 ! BUTTON "+" ID btnMainPlus AT (134 120 22 14) FONT 1 ! BUTTON "EXE" ID tdDoit AT (135 138 20 20) FONT 1 BOLDFRAME ! //FORMBITMAP AT (134 137) BITMAP bmpExe USABLE ! BUTTON "7" ID btnMain7 AT (75 60 18 17) ! BUTTON "8" ID btnMain8 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "9" ID btnMain9 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "4" ID btnMain4 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "5" ID btnMain5 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "6" ID btnMain6 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! ! BUTTON "1" ID btnMain1 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "2" ID btnMain2 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "3" ID btnMain3 AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "0" ID btnMain0 AT (75 PREVBOTTOM+1 PREVWIDTH PREVHEIGHT) ! BUTTON "." ID btnMainDot AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "Exp" ID btnMainEE AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON "ans" ID btnMainAns AT (75 PREVBOTTOM+2 PREVWIDTH 12) ! BUTTON "(" ID btnMainOpBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! BUTTON ")" ID btnMainClBr AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "<-" ID btnMainBksp AT (75 PREVBOTTOM+2 PREVWIDTH PREVHEIGHT) ! REPEATBUTTON "" ID btnMainDel AT (PREVRIGHT+1 PREVTOP PREVWIDTH PREVHEIGHT) ! //FORMBITMAP AT (PREVLEFT+4 PREVTOP+2) BITMAP bmpLdel USABLE ! REPEATBUTTON "->" ID btnMainFwsp AT (113 PREVTOP 18 12) END *************** *** 710,781 **** MENUID tdMenu BEGIN ! TITLE "$$BASIC" ! ! PUSHBUTTON "B" ID btnBasic AT (106 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 138 16) ! FIELD ID tdInput AT (0 32 145 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! ! POPUPTRIGGER "" ID btnHistory AT (147 25 15 AUTO) ! BUTTON "M" ID calcResPopupBut AT (148 15 13 12) NOFRAME ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! BUTTON " " ID btnRadixMode AT (37 1 16 12) NOFRAME ! BUTTON " " ID btnPrefMode AT (57 1 15 12) NOFRAME ! BUTTON "Rcl" ID varListButton AT (PREVRIGHT+3 1 15 12) NOFRAME ! BUTTON "F" ID varFuncListButton AT (PREVRIGHT 1 15 12) NOFRAME ! BUTTON "f" ID varBuiltinListButton AT (150 1 10 12) NOFRAME ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! BUTTON "C" ID btnMainClear AT (5 60 20 15) ! BUTTON "ANS" ID btnMainAns AT (30 60 20 15) ! BUTTON "(" ID btnMainOpBr AT (5 80 20 15) ! BUTTON ")" ID btnMainClBr AT (30 80 20 15) ! BUTTON "EE" ID btnMainEE AT (5 100 20 15) ! BUTTON "" ID btnMainPow AT (30 100 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpPower USABLE ! BUTTON "ln" ID btnMainLn AT (5 120 20 15) ! BUTTON "" ID btnMainSq1 AT (30 120 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpRootX USABLE ! BUTTON "" ID btnMainSqr AT (5 140 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquare USABLE ! BUTTON "" ID btnMainSqrt AT (30 140 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquareRoot USABLE ! BUTTON "7" ID btnMain7 AT (55 60 20 20) FONT 1 ! BUTTON "8" ID btnMain8 AT (80 60 20 20) FONT 1 ! BUTTON "9" ID btnMain9 AT (105 60 20 20) FONT 1 ! BUTTON "4" ID btnMain4 AT (55 85 20 20) FONT 1 ! BUTTON "5" ID btnMain5 AT (80 85 20 20) FONT 1 ! BUTTON "6" ID btnMain6 AT (105 85 20 20) FONT 1 ! BUTTON "1" ID btnMain1 AT (55 110 20 20) FONT 1 ! BUTTON "2" ID btnMain2 AT (80 110 20 20) FONT 1 ! BUTTON "3" ID btnMain3 AT (105 110 20 20) FONT 1 ! BUTTON "0" ID btnMain0 AT (55 135 20 20) FONT 1 ! BUTTON "." ID btnMainDot AT (80 135 20 20) FONT 1 ! BUTTON "EXE" ID tdDoit AT (105 135 20 20) FONT 1 BOLDFRAME ! ! BUTTON "+" ID btnMainPlus AT (130 120 20 15) FONT 1 ! BUTTON "-" ID btnMainMinus AT (130 100 20 15) FONT 1 ! BUTTON "*" ID btnMainMult AT (130 80 20 15) FONT 1 ! BUTTON "/" ID btnMainDivide AT (130 60 20 15) FONT 1 ! ! GRAFFITISTATEINDICATOR AT (140 150) END --- 705,774 ---- MENUID tdMenu BEGIN ! TITLE "$$BASIC" ! ! BUTTON " " ID btnRadixMode AT (35 1 18 12) RECTFRAME ! BUTTON " " ID btnPrefMode AT (56 1 17 12) RECTFRAME ! ! SELECTORTRIGGER "Rcl" ID varListButton AT (PREVRIGHT+4 1 15 11) ! SELECTORTRIGGER "F" ID varFuncListButton AT (PREVRIGHT+1 1 9 11) ! SELECTORTRIGGER "f" ID varBuiltinListButton AT (PREVRIGHT+1 1 9 11) ! ! LIST "" ID varList AT (30 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID varListPopup varList ! ! LIST "" ID varBuiltinList AT (80 20 65 132) NONUSABLE DISABLED VISIBLEITEMS 12 ! POPUPLIST ID varBuiltinListPopup varBuiltinList ! ! PUSHBUTTON "B" ID btnBasic AT (116 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 #ifdef GRAPHS_ENABLED ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 #endif ! GADGET ID resultGadget AT (5 16 137 16) ! FIELD ID tdInput AT (1 32 136 25) EDITABLE MULTIPLELINES UNDERLINED MAXCHARS MAX_INPUT_LENGTH USABLE ! GRAFFITISTATEINDICATOR AT (138 37) ! SELECTORTRIGGER "M" ID calcResPopupBut AT (148 17 11 10) ! LIST "" ID calcResList AT (70 20 70 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID calcResPopup calcResList ! SELECTORTRIGGER "H" ID btnHistory AT (148 32 11 10) ! LIST "" ID histList AT (25 20 110 20) NONUSABLE DISABLED VISIBLEITEMS 2 ! POPUPLIST ID histListPopup histList ! BUTTON "Clr" ID btnMainClear AT (5 60 20 15) ! BUTTON "ans" ID btnMainAns AT (30 60 20 15) ! BUTTON "(" ID btnMainOpBr AT (5 80 20 15) ! BUTTON ")" ID btnMainClBr AT (30 80 20 15) ! BUTTON "Exp" ID btnMainEE AT (5 100 20 15) ! BUTTON "" ID btnMainPow AT (30 100 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpPower USABLE ! BUTTON "ln" ID btnMainLn AT (5 120 20 15) ! BUTTON "" ID btnMainSq1 AT (30 120 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpRootX USABLE ! BUTTON "" ID btnMainSqr AT (5 140 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquare USABLE ! BUTTON "" ID btnMainSqrt AT (30 140 20 15) ! //FORMBITMAP AT (PREVLEFT+1 PREVTOP+1) BITMAP bmpSquareRoot USABLE ! BUTTON "7" ID btnMain7 AT (55 60 20 20) ! BUTTON "8" ID btnMain8 AT (80 60 20 20) ! BUTTON "9" ID btnMain9 AT (105 60 20 20) ! BUTTON "4" ID btnMain4 AT (55 85 20 20) ! BUTTON "5" ID btnMain5 AT (80 85 20 20) ! BUTTON "6" ID btnMain6 AT (105 85 20 20) ! BUTTON "1" ID btnMain1 AT (55 110 20 20) ! BUTTON "2" ID btnMain2 AT (80 110 20 20) ! BUTTON "3" ID btnMain3 AT (105 110 20 20) ! BUTTON "0" ID btnMain0 AT (55 135 20 20) ! BUTTON "." ID btnMainDot AT (80 135 20 20) ! BUTTON "EXE" ID tdDoit AT (105 135 20 20) FONT 1 BOLDFRAME + BUTTON "+" ID btnMainPlus AT (130 120 20 15) FONT 1 + BUTTON "-" ID btnMainMinus AT (130 100 20 15) FONT 1 + BUTTON "*" ID btnMainMult AT (130 80 20 15) FONT 1 + BUTTON "/" ID btnMainDivide AT (130 60 20 15) FONT 1 END Index: calc.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** calc.c 1 Oct 2006 22:40:27 -0000 1.35 --- calc.c 16 Oct 2006 18:58:37 -0000 1.36 *************** *** 414,420 **** FrmSetEventHandler(frm,GraphPrefsHandleEvent); break; - case grColorForm: - FrmSetEventHandler(frm,GraphColorHandleEvent); - break; case grTableForm: FrmSetEventHandler(frm,GraphTableHandleEvent); --- 414,417 ---- Index: calcrsc.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/calcrsc.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** calcrsc.h 10 Oct 2006 00:58:36 -0000 1.61 --- calcrsc.h 16 Oct 2006 18:58:37 -0000 1.62 *************** *** 305,313 **** #define lstGraphSpeed 4113 - #define btnGraphColor 4120 - #define grColorForm 4121 - #define grColorElem 4122 - #define grColorPopup 4123 - #define graphMenu 4200 #define btnGraphPref 4201 --- 305,308 ---- *************** *** 335,339 **** #define ckbGrPrefLogX 4219 #define ckbGrPrefLogY 4220 - #define ckbGrPrefGrid 4221 #define grPrefLabel1u 4222 #define grPrefLabel2u 4223 --- 330,333 ---- *************** *** 376,379 **** --- 370,386 ---- #define grType5 4515 #define grType6 4516 + #define grColor1 4517 + #define grColor2 4518 + #define grColor3 4519 + #define grColor4 4520 + #define grColor5 4521 + #define grColor6 4522 + #define grBgnd 4523 + #define grAxes 4524 + #define grGrid 4525 + #define grBgndLbl 4526 + #define ckbGrAxes 4527 + #define ckbGrGrid 4528 + #define grColorElem 4529 #define grTableForm 4600 Index: grsetup.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** grsetup.c 10 Oct 2006 00:58:36 -0000 1.27 --- grsetup.c 16 Oct 2006 18:58:37 -0000 1.28 *************** *** 41,47 **** #endif - static Boolean kk; - static Int16 colors[10]; - static Int16 firstVisible = 0; static Int16 selectedRow; --- 41,44 ---- *************** *** 278,288 **** if (palmOS35) WinPushDrawState(); ! if (colorDisplay) { ! if (graphPrefs.functype==graph_param) ! WinSetTextColor(graphColors[(row+firstVisible)/2]); ! else ! WinSetTextColor(graphColors[row+firstVisible]); ! } ! if (grayDisplay) { if (graphPrefs.functype==graph_param) WinSetTextColor(graphPrefs.colors[(row+firstVisible)/2]); --- 275,279 ---- if (palmOS35) WinPushDrawState(); ! if (grayDisplay || colorDisplay) { if (graphPrefs.functype==graph_param) WinSetTextColor(graphPrefs.colors[(row+firstVisible)/2]); *************** *** 292,298 **** x = bounds->topLeft.x+bounds->extent.x-FntCharsWidth(text,StrLen(text))-2; WinDrawChars(text,StrLen(text),x,bounds->topLeft.y); - if (palmOS35) ! WinPopDrawState(); } --- 283,288 ---- x = bounds->topLeft.x+bounds->extent.x-FntCharsWidth(text,StrLen(text))-2; WinDrawChars(text,StrLen(text),x,bounds->topLeft.y); if (palmOS35) ! WinPopDrawState(); } *************** *** 323,327 **** table = GetObjectPtr(grSetupTable); rows = TblGetNumberOfRows(table); ! for (i=0;i<rows;i++) { TblSetRowHeight(table,i,height); --- 313,317 ---- table = GetObjectPtr(grSetupTable); rows = TblGetNumberOfRows(table); ! for (i=0;i<rows;i++) { TblSetRowHeight(table,i,height); *************** *** 331,351 **** TblSetColumnUsable(table,0,true); TblSetColumnUsable(table,1,true); ! TblSetCustomDrawProcedure(table,0,grsetup_tbl_name); TblSetCustomDrawProcedure(table,1,grsetup_tbl_contents); ! /* We will effectively remember the last state of graph_param */ /* because others do not have scrolling table */ if (graphPrefs.functype != graph_param) firstVisible = 0; ! ! /* Setup the up/down pointers & grType buttons*/ if (graphPrefs.functype == graph_param) { FrmShowObject(frm,FrmGetObjectIndex(frm,grSetupDown)); FrmShowObject(frm,FrmGetObjectIndex(frm,grSetupUp)); ! }else{ ! FrmShowObject(frm,FrmGetObjectIndex(frm,grType2)); ! FrmShowObject(frm,FrmGetObjectIndex(frm,grType4)); ! FrmShowObject(frm,FrmGetObjectIndex(frm,grType6)); } } --- 321,350 ---- TblSetColumnUsable(table,0,true); TblSetColumnUsable(table,1,true); ! TblSetCustomDrawProcedure(table,0,grsetup_tbl_name); TblSetCustomDrawProcedure(table,1,grsetup_tbl_contents); ! /* We will effectively remember the last state of graph_param */ /* because others do not have scrolling table */ if (graphPrefs.functype != graph_param) firstVisible = 0; ! ! CtlSetValue(GetObjectPtr(ckbGrGrid), graphPrefs.grid); ! ! /* Setup the up/down pointers, grType and grColor buttons*/ ! if (grayDisplay || colorDisplay) { ! for (i = grColor1; i <= grBgndLbl; i++) ! FrmShowObject(frm, FrmGetObjectIndex(frm, i)); ! } if (graphPrefs.functype == graph_param) { FrmShowObject(frm,FrmGetObjectIndex(frm,grSetupDown)); FrmShowObject(frm,FrmGetObjectIndex(frm,grSetupUp)); ! if (grayDisplay || colorDisplay) { ! for (i = grColor2; i <= grColor6; i += 2) ! FrmHideObject(frm, FrmGetObjectIndex(frm, i)); ! } ! } else { ! for (i = grType2; i <= grType6; i += 2) ! FrmShowObject(frm, FrmGetObjectIndex(frm, i)); } } *************** *** 576,587 **** graph_setcolor(-1); WinEraseRectangle(&bounds, 0); - WinDrawRectangleFrame(roundFrame, &bounds); graph_unsetcolor(); x = bounds.topLeft.x; y = bounds.topLeft.y + bounds.extent.y - 1; ! x1 = x + HanderaCoord(3); ! x2 = x + HanderaCoord(6); ! x3 = x + HanderaCoord(9); y1 = y - HanderaCoord(1); y2 = y - HanderaCoord(3); --- 575,585 ---- graph_setcolor(-1); WinEraseRectangle(&bounds, 0); graph_unsetcolor(); x = bounds.topLeft.x; y = bounds.topLeft.y + bounds.extent.y - 1; ! x1 = x + HanderaCoord(1); ! x2 = x + HanderaCoord(3); ! x3 = x + HanderaCoord(5); y1 = y - HanderaCoord(1); y2 = y - HanderaCoord(3); *************** *** 608,611 **** --- 606,626 ---- break; } + if (grayDisplay || colorDisplay) { + /* Paint the line color button */ + FrmGetObjectBounds(frm, FrmGetObjectIndex(frm,grColor1+i), &bounds); + WinDrawRectangle(&bounds, 0); + } + graph_unsetcolor(); + } + } + for (i=0; i<3; i++) { + if (grayDisplay || colorDisplay) { + graph_setcolor(i < 2 ? -1 : -2); + FrmGetObjectBounds(frm, FrmGetObjectIndex(frm,grBgnd+i), &bounds); + if (i == 0 ) { + WinEraseRectangle(&bounds, 0); + } else { + WinDrawRectangle(&bounds, 0); + } graph_unsetcolor(); } *************** *** 680,685 **** switch (controlId) { case grSetupDone: FrmReturnToForm(0); ! FrmUpdateForm(frmGraph,frmUpdateVars); handled = true; break; --- 695,701 ---- switch (controlId) { case grSetupDone: + graphPrefs.grid = CtlGetValue(GetObjectPtr(ckbGrGrid)); FrmReturnToForm(0); ! FrmUpdateForm(frmGraph, frmUpdateVars); handled = true; break; *************** *** 695,724 **** break; case grType1: if(graphPrefs.functype == graph_param) ! row=firstVisible/2; ! else row=0; break; case grType2: ! row=1; break; case grType3: ! if(graphPrefs.functype == graph_param) ! row=firstVisible/2+1; ! else row=2; break; case grType4: ! row=3; break; case grType5: ! if(graphPrefs.functype == graph_param) ! row=firstVisible/2+2; ! else row=4; break; case grType6: ! row=5; break; } ! if(!handled){ graphPrefs.grType[row]++; if(graphPrefs.grType[row]>2) --- 711,754 ---- break; case grType1: + case grColor1: if(graphPrefs.functype == graph_param) ! row = firstVisible / 2; ! else ! row = 0; break; case grType2: ! case grColor2: ! row = 1; break; case grType3: ! case grColor3: ! if (graphPrefs.functype == graph_param) ! row = firstVisible / 2 + 1; ! else ! row = 2; break; case grType4: ! case grColor4: ! row = 3; break; case grType5: ! case grColor5: ! if (graphPrefs.functype == graph_param) ! row = firstVisible / 2 + 2; ! else ! row = 4; break; case grType6: ! case grColor6: ! row = 5; ! break; ! case grBgnd: ! case grAxes: ! case grGrid: ! row = controlId - grColor1; break; } ! if (controlId >= grType1 && controlId <= grType6) { graphPrefs.grType[row]++; if(graphPrefs.grType[row]>2) *************** *** 727,730 **** --- 757,776 ---- handled=true; } + else if (controlId >= grColor1 && controlId <= grGrid) { + IndexedColorType col = graphPrefs.colors[row]; + RGBColorType rgb; + Char *picktitle; + + picktitle = MemPtrNew(MAX_RSCLEN); + SysStringByIndex(grColorElem, row, picktitle, MAX_RSCLEN); + if (UIPickColor(&col, (colorDisplay? &rgb : NULL), + UIPickColorStartPalette, picktitle, NULL)) { + graphPrefs.colors[row] = col; + } + FrmDrawForm(frm); + draw_grType(frm); + MemPtrFree(picktitle); + handled = true; + } break; *************** *** 752,847 **** return handled; } - - static void - draw_palette(void) - { - Int8 i,j; - Int8 c=0; - - RectangleType bounds; - - ListPtr list=GetObjectPtr(grColorElem); - - Int16 x,y; - Boolean pressed; - - EvtGetPen(&x,&y,&pressed); - if (kk && x>6 && x<6+144 && y>20 && y<20+36) - colors[LstGetSelection(list)]=WinGetPixel(x,y); - else kk=true; - - WinPushDrawState(); - for(i=0;i<2;i++) - for(j=0;j<8;j++) { - WinSetForeColor(c); - RctSetRectangle(&bounds,6+j*18,20+i*18,18,18); - WinDrawRectangle(&bounds,0); - if (c==colors[LstGetSelection(list)]){ - if (c<8) WinSetForeColor(15); else WinSetForeColor(0); - bounds.topLeft.x += 2; - bounds.topLeft.y += 2; - bounds.extent.x -= 4; - bounds.extent.y -= 4; - WinDrawRectangleFrame(roundFrame,&bounds); - } - c++; - }; - WinPopDrawState(); - RctSetRectangle(&bounds,6,20,144,36); - WinDrawRectangleFrame(roundFrame,&bounds); - } - - /*********************************************************************** - * - * FUNCTION: GraphColorHandleEvent - * - ***********************************************************************/ - Boolean - GraphColorHandleEvent(EventPtr event) - { - Boolean handled = false; - FormPtr frm=FrmGetActiveForm(); - Int16 controlId, i; - - ListPtr list=GetObjectPtr(grColorElem); - - #ifdef SUPPORT_DIA - if (ResizeHandleEvent(event)) { - return true; - } - #endif - switch (event->eType) { - case keyDownEvent: - handled = true; - break; - case ctlSelectEvent: - controlId=event->data.ctlSelect.controlID; - switch (controlId) { - case grSetupDone: - colors[9]=LstGetSelection(list); - for(i=0;i<10;i++) graphPrefs.colors[i]=colors[i]; - FrmReturnToForm(0); - FrmUpdateForm(frmGraph,frmUpdateVars); - handled = true; - break; - case btnGrcSelCancel: - FrmReturnToForm(0); - handled = true; - break; - } - case popSelectEvent: - kk=false; - break; - case penUpEvent: - draw_palette(); - break; - case frmOpenEvent: - FrmDrawForm(frm); - for(i=0;i<10;i++) colors[i]=graphPrefs.colors[i]; - LstSetSelection(list,colors[9]); - CtlSetLabel(GetObjectPtr(grColorPopup),LstGetSelectionText(list,LstGetSelection(list))); - handled=true; - break; - } - return handled; - } --- 798,799 ---- Index: prefs.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/prefs.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** prefs.c 12 Sep 2006 19:40:55 -0000 1.16 --- prefs.c 16 Oct 2006 18:58:37 -0000 1.17 *************** *** 69,76 **** calcPrefs.dispScien = false; - #if 0 - FrmAlert(altAbout); - FrmHelp(hlpMain2); - #endif dispPrefs = calcPrefs.dispPrefs; /* db_recompile needs dispPrefs */ db_recompile_all(); --- 69,72 ---- Index: grsetup.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/grsetup.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** grsetup.h 12 Sep 2006 19:40:55 -0000 1.6 --- grsetup.h 16 Oct 2006 18:58:37 -0000 1.7 *************** *** 28,32 **** char * grsetup_get_fname(Int16 row) IFACE; const char * grsetup_fn_descr(Int16 i) IFACE; - Boolean GraphColorHandleEvent(EventPtr event) IFACE; Boolean GraphSetupHandleEvent(EventPtr event); Int16 grsetup_fn_descr_arr(char **descr, Int16 *nums); --- 28,31 ---- Index: graph.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/graph.c,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** graph.c 10 Oct 2006 00:58:36 -0000 1.50 --- graph.c 16 Oct 2006 18:58:37 -0000 1.51 *************** *** 91,116 **** WinPushDrawState(); ! if (grayDisplay){ ! if (funcnum == -1){ ! WinSetBackColor(graphPrefs.colors[6]); /* fondo */ ! WinSetForeColor(graphPrefs.colors[7]); /* ejes */ ! } ! else if (funcnum == -2) WinSetForeColor(graphPrefs.colors[8]); /* Grid */ ! else WinSetForeColor(graphPrefs.colors[funcnum]); /* Graph color */ ! } ! ! if (colorDisplay) { ! RGBColorType rgb; ! ! rgb.r=rgb.g=rgb.b=255; /* White */ ! WinSetBackColor(WinRGBToIndex(&rgb)); if (funcnum == -1) { ! rgb.r=rgb.g=rgb.b=0; /* Black */ ! WinSetForeColor(WinRGBToIndex(&rgb)); ! } else if (funcnum == -2) { /* Grid */ ! rgb.r=rgb.g=rgb.b=128; ! WinSetForeColor(WinRGBToIndex(&rgb)); ! } else /* Graph color */ ! WinSetForeColor(graphColors[funcnum]); } } --- 91,103 ---- WinPushDrawState(); ! if (grayDisplay || colorDisplay) { if (funcnum == -1) { ! WinSetBackColor(graphPrefs.colors[6]); /* background */ ! WinSetForeColor(graphPrefs.colors[7]); /* axis */ ! } ! else if (funcnum == -2) ! WinSetForeColor(graphPrefs.colors[8]); /* grid */ ! else ! WinSetForeColor(graphPrefs.colors[funcnum]); /* graph */ } } *************** *** 149,154 **** graph_is_onscreen(double x,double y) { - // if (!finite(x) || !finite(y)) - // return false; if (x>=graphPrefs.xmin && x<=graphPrefs.xmax && y>=graphPrefs.ymin && y<=graphPrefs.ymax) --- 136,139 ---- *************** *** 475,494 **** WinResetClip(); - if(grayDisplay){ - Int8 i; - UInt16 btnindex; - - btnindex = FrmGetObjectIndex(frm,btnGraphColor); - FrmShowObject(frm, btnindex); - WinPushDrawState(); - i=graphPrefs.colors[9]; - /* RctSetRectangle(&bounds,148,146,8,8); */ - FrmGetObjectBounds(frm, btnindex, &bounds); - WinSetForeColor(graphPrefs.colors[i]); - WinDrawRectangle(&bounds,0); - WinPopDrawState(); - WinDrawRectangleFrame(roundFrame,&bounds); - } - /* Check, if the bounds are correct */ gadget_bounds(frm, graphId, &bounds); --- 460,463 ---- *************** *** 963,969 **** graph_select_speed(); break; - case btnGraphColor: - FrmPopupForm(grColorForm); - break; case btnGraphCalc: grcalc_control(); --- 932,935 ---- *************** *** 984,991 **** else grtaps_track_start(); ! } else {/* User unchecked the button */ ! grtaps_track_pause(); ! /* Cancel the numeric input, if there was any*/ ! grcalc_init(); } graph_draw_resume(); --- 950,956 ---- else grtaps_track_start(); ! } else { ! /* User unchecked the button */ ! FrmUpdateForm(frmGraph, frmUpdateVars); } graph_draw_resume(); *************** *** 1110,1116 **** FrmPopupForm(grTableForm); break; - case btnGraphColor: - FrmPopupForm(grColorForm); - break; case btnGraphSetup: FrmPopupForm(grSetupForm); --- 1075,1078 ---- Index: graph.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/graph.rcp.in,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** graph.rcp.in 10 Oct 2006 00:58:36 -0000 1.34 --- graph.rcp.in 16 Oct 2006 18:58:37 -0000 1.35 *************** *** 34,57 **** END ! FORM ID grSetupForm AT (2 55 156 103) MODAL HELPID hlpGrSetup BEGIN TITLE "$$SETUP GRAPHS" ! TABLE ID grSetupTable AT (5 15 132 70) ROWS 6 COLUMNS 2 COLUMNWIDTHS 20 112 ! BUTTON " " ID grType1 AT (139 17 13 7) NOFRAME ! BUTTON " " ID grType2 AT (139 28 13 7) NOFRAME NONUSABLE ! BUTTON " " ID grType3 AT (139 39 13 7) NOFRAME ! BUTTON " " ID grType4 AT (139 50 13 7) NOFRAME NONUSABLE ! BUTTON " " ID grType5 AT (139 61 13 7) NOFRAME ! BUTTON " " ID grType6 AT (139 72 13 7) NOFRAME NONUSABLE ! BUTTON "$$DONE" ID grSetupDone AT (5 88 40 12) ! BUTTON "\001" ID grSetupUp AT (140 84 12 8) FONT 5 NONUSABLE NOFRAME ! BUTTON "\002" ID grSetupDown AT (140 92 12 8) FONT 5 NONUSABLE NOFRAME ! LIST "" ID grSetupList AT (1 1 50 10) VISIBLEITEMS 10 NONUSABLE DISABLED POPUPLIST ID grSetupPopup grSetupList END --- 34,70 ---- END ! FORM ID grSetupForm AT (2 43 156 115) MODAL HELPID hlpGrSetup BEGIN TITLE "$$SETUP GRAPHS" + + BUTTON " " ID grAxes AT (3 16 6 6) RECTFRAME NONUSABLE + CHECKBOX "Axes" ID ckbGrAxes AT (10 13 AUTO AUTO) + BUTTON " " ID grGrid AT (63 16 6 6) RECTFRAME NONUSABLE + CHECKBOX "Grid" ID ckbGrGrid AT (70 13 AUTO AUTO) + BUTTON " " ID grBgnd AT (121 16 6 6) RECTFRAME NONUSABLE + LABEL "Bgnd" ID grBgndLbl AT (135 13) NONUSABLE ! TABLE ID grSetupTable AT (5 27 132 70) ROWS 6 COLUMNS 2 COLUMNWIDTHS 20 112 ! BUTTON " " ID grType1 AT (139 29 7 7) RECTFRAME ! BUTTON " " ID grColor1 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grType2 AT (139 40 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grColor2 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grType3 AT (139 51 7 7) RECTFRAME ! BUTTON " " ID grColor3 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grType4 AT (139 62 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grColor4 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grType5 AT (139 73 7 7) RECTFRAME ! BUTTON " " ID grColor5 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grType6 AT (139 84 7 7) RECTFRAME NONUSABLE ! BUTTON " " ID grColor6 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE ! BUTTON "$$DONE" ID grSetupDone AT (5 100 40 12) ! BUTTON "\001" ID grSetupUp AT (140 98 12 8) FONT 5 NONUSABLE NOFRAME ! BUTTON "\002" ID grSetupDown AT (140 106 12 8) FONT 5 NONUSABLE NOFRAME ! LIST "" ID grSetupList AT (1 1 62 10) VISIBLEITEMS 10 NONUSABLE DISABLED POPUPLIST ID grSetupPopup grSetupList END *************** *** 99,153 **** CHECKBOX "Log X" ckbGrPrefLogX AT (PREVLEFT+13 PREVBOTTOM+16 AUTO AUTO) CHECKBOX "Log Y" ckbGrPrefLogY AT (PREVLEFT PREVBOTTOM AUTO AUTO) - CHECKBOX "Grid" ckbGrPrefGrid AT (PREVLEFT PREVBOTTOM AUTO AUTO) GRAFFITISTATEINDICATOR AT (143 PREVBOTTOM+2) END ! FORM ID grColorForm AT (2 80 156 78) ! MODAL ! BEGIN ! TITLE "$$GRAPH COLORS" ! ! BUTTON "$$DONE" ID grSetupDone AT (5 63 40 12) ! BUTTON "$$CANCEL" ID btnGrcSelCancel AT (PREVRIGHT+5 PREVTOP AUTO 12) ! ! POPUPTRIGGER "" ID grColorPopup AT (110 63 20 12) LEFTANCHOR ! LIST "fun1" "fun2" "fun3" "fun4" "fun5" "fun6" "$$BACKGRND" "$$AXIS" "$$GRID" ID grColorElem AT (PREVLEFT+3 40 32 0) VISIBLEITEMS 9 NONUSABLE ! POPUPLIST ID grColorPopup grColorElem ! ! END FORM ID frmGraph AT (0 0 160 160) MENUID graphMenu BEGIN ! TITLE "$$GRAPH" ! ! PUSHBUTTON "B" ID btnBasic AT (106 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 ! ! GADGET ID graphGadget AT (2 17 140+1 140+1) ! ! PUSHBUTTON "+" ID btnGraphZoomIn AT (147 90 10 12) ! BUTTON "-" ID btnGraphZoomOut AT (147 105 10 12) ! BUTTON " " ID btnPrefMode AT (57 1 15 12) NOFRAME ! BUTTON "P" ID btnGraphPref AT (PREVRIGHT+3 1 15 12) NOFRAME ! BUTTON "S" ID btnGraphSetup AT (PREVRIGHT 1 15 12) NOFRAME ! PUSHBUTTON "T" ID btnGraphTrack AT (147 50 10 12) ! BUTTON "$$GO" ID btnGraphTrackGoto AT (145 69 14 12) NONUSABLE ! LIST "" ID graphTrackList AT (120 50 30 50) NONUSABLE DISABLED VISIBLEITEMS 3 ! POPUPLIST ID graphTrackPopup graphTrackList ! BUTTON "C " ID btnGraphCalc AT (144 20 16 18) NOFRAME ! LIST "$$GRZERO" "$$GRVALUE" "$$GRMIN" "$$GRMAX" "$$GRDDX" "d2/dx" "$$GRINTEG" "$$GRINTERSECT" ID lstGraphCalcFunc AT (100 20 55 50) NONUSABLE DISABLED VISIBLEITEMS 8 ! POPUPLIST AUTOID lstGraphCalcFunc ! LIST "dy/dx" "dy/dt" "dx/dt" ID lstGraphCalcParam AT (PREVLEFT PREVTOP PREVWIDTH PREVHEIGHT) NONUSABLE DISABLED VISIBLEITEMS 3 ! POPUPLIST AUTOID lstGraphCalcParam ! LIST "dr/dfi" ID lstGraphCalcPolar AT (PREVLEFT PREVTOP PREVWIDTH PREVHEIGHT) NONUSABLE DISABLED VISIBLEITEMS 1 ! POPUPLIST AUTOID lstGraphCalcPolar ! BUTTON "Sp" ID btnGraphSpeed AT (144 120 16 18) NOFRAME ! LIST "1x" "2x" "4x" "7x" lstGraphSpeed AT (140 100 15 44) VISIBLEITEMS 4 NONUSABLE DISABLED ! BUTTON "" ID btnGraphColor AT (148 146 8 8) NOFRAME NONUSABLE END --- 112,158 ---- CHECKBOX "Log X" ckbGrPrefLogX AT (PREVLEFT+13 PREVBOTTOM+16 AUTO AUTO) CHECKBOX "Log Y" ckbGrPrefLogY AT (PREVLEFT PREVBOTTOM AUTO AUTO) GRAFFITISTATEINDICATOR AT (143 PREVBOTTOM+2) END ! STRINGTABLE grColorElem "Pick color for " "fun1" "fun2" "fun3" "fun4" "fun5" "fun6" "$$BACKGRND" "$$AXIS" "$$GRID" FORM ID frmGraph AT (0 0 160 160) MENUID graphMenu BEGIN ! TITLE "$$GRAPH" ! BUTTON " " ID btnPrefMode AT (56 1 17 12) RECTFRAME ! SELECTORTRIGGER "P" ID btnGraphPref AT (PREVRIGHT+11 1 10 11) ! SELECTORTRIGGER "S" ID btnGraphSetup AT (PREVRIGHT+1 1 10 11) ! ! PUSHBUTTON "B" ID btnBasic AT (116 1 10 12) GROUP 1 ! PUSHBUTTON "S" ID btnScientific AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "I" ID btnInteger AT (PREVRIGHT+1 1 10 12) GROUP 1 ! PUSHBUTTON "G" ID btnGraph AT (PREVRIGHT+1 1 10 12) GROUP 1 ! ! GADGET ID graphGadget AT (1 16 140+2 140+3) ! ! SELECTORTRIGGER "C " ID btnGraphCalc AT (147 22 10 12) ! LIST "$$GRZERO" "$$GRVALUE" "$$GRMIN" "$$GRMAX" "$$GRDDX" "d2/dx" "$$GRINTEG" "$$GRINTERSECT" ID lstGraphCalcFunc AT (100 22 55 50) NONUSABLE DISABLED VISIBLEITEMS 8 ! POPUPLIST AUTOID lstGraphCalcFunc ! LIST "dy/dx" "dy/dt" "dx/dt" ID lstGraphCalcParam AT (PREVLEFT PREVTOP PREVWIDTH PREVHEIGHT) NONUSABLE DISABLED VISIBLEITEMS 3 ! POPUPLIST AUTOID lstGraphCalcParam ! LIST "dr/dfi" ID lstGraphCalcPolar AT (PREVLEFT PREVTOP PREVWIDTH PREVHEIGHT) NONUSABLE DISABLED VISIBLEITEMS 1 ! POPUPLIST AUTOID lstGraphCalcPolar ! ! PUSHBUTTON "T" ID btnGraphTrack AT (147 50 10 12) ! LIST "" ID graphTrackList AT (120 50 30 50) NONUSABLE DISABLED VISIBLEITEMS 3 ! POPUPLIST ID graphTrackPopup graphTrackList ! BUTTON "$$GO" ID btnGraphTrackGoto AT (145 65 14 12) NONUSABLE ! ! PUSHBUTTON "+" ID btnGraphZoomIn AT (147 90 10 12) ! ! BUTTON "-" ID btnGraphZoomOut AT (147 105 10 12) ! ! SELE... [truncated message content] |
