[Easycalc-commits] easycalc calc.rcp.in, 1.111, 1.112 main.c, 1.71, 1.72

[Ton v. O. <tvo...@us...>]

Update of /cvsroot/easycalc/easycalc
In directory sc8-pr-cvs17:/tmp/cvs-serv32446

Modified Files:
	calc.rcp.in main.c 
Log Message:
Changed XOR symbold from 0xA5 to 0x88 (a small ^).
Changed the button labels for 'Clr' and 'ans' to 'CLR' and 'ANS' for
better readability.
These changes suggested by Mark (resonat at f-m dot fm).


Index: calc.rcp.in
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** calc.rcp.in	16 Oct 2006 18:58:37 -0000	1.111
--- calc.rcp.in	7 Nov 2007 01:48:59 -0000	1.112
***************
*** 444,448 ****
      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
--- 444,448 ----
      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
***************
*** 469,473 ****
      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)
--- 469,473 ----
      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)
***************
*** 527,531 ****
      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
--- 527,531 ----
      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
***************
*** 551,555 ****
      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)
--- 551,555 ----
      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)
***************
*** 668,672 ****
      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
--- 668,672 ----
      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
***************
*** 692,696 ****
      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)
--- 692,696 ----
      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)
***************
*** 739,744 ****
      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)
--- 739,744 ----
      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)

Index: main.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** main.c	12 Feb 2007 10:00:29 -0000	1.71
--- main.c	7 Nov 2007 01:48:59 -0000	1.72
***************
*** 282,286 ****
  	{btnMainAnd,"&",true},
  	{btnMainOr,"|",true},
! 	{btnMainXor,"¥",true},
  	{btnMainShl,"<<",true},
  	{btnMainShr,">>",true},
--- 282,286 ----
  	{btnMainAnd,"&",true},
  	{btnMainOr,"|",true},
! 	{btnMainXor,"ˆ",true},
  	{btnMainShl,"<<",true},
  	{btnMainShr,">>",true},