Menu
▾
▴
[Easycalc-commits] easycalc Makefile.in, 1.31, 1.32 calc.c, 1.29, 1.30 calc.rcp.in, 1.104, 1.105 calcrsc.h, 1.55, 1.56 graph.rcp.in, 1.29, 1.30 prefs.c, 1.13, 1.14
|
From: Ton v. O. <tvo...@us...> - 2006-08-23 17:55:58
|
Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1535 Modified Files: Makefile.in calc.c calc.rcp.in calcrsc.h graph.rcp.in prefs.c Log Message: Replace about alert with separate about form. Index: calc.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** calc.rcp.in 19 Aug 2006 04:15:03 -0000 1.104 --- calc.rcp.in 23 Aug 2006 17:55:55 -0000 1.105 *************** *** 2,14 **** // $Id$ // - // 2001-09-23 - John Hodapp <bi...@em...> - // Minor adjustment to placement of selection boxes. - // 2001-09-31 - John Hodapp - repeating edit buttons, added Deg/Rad/Grd - // indication and selection on Basic, Scientific and Graph - // screens. - // #include "calcrsc.h" #include "lang.h" //Handera support --- 2,11 ---- // $Id$ // #include "calcrsc.h" #include "lang.h" + #ifdef SUPPORT_DIA + #include "resizeconsts.h" + #endif //Handera support *************** *** 350,353 **** --- 347,385 ---- END + FORM ID frmAbout AT (2 2 156 156) + MODAL + DEFAULTBTNID abtOk + BEGIN + FORMBITMAP AT (11 11) BITMAP abtLogo USABLE + LABEL "Easy Calc" ID abtTitle AT (75 4) FONT 1 + LABEL "Version: VERSION_HERE" ID abtVersion AT (65 15) FONT 1 + LABEL "DATE_HERE" ID abtVerdate AT (68 26) FONT 1 + FIELD ID abtText AT (3 37 152 99) LEFTALIGN FONT 0 + NONEDITABLE MULTIPLELINES MAXCHARS 1024 + REPEATBUTTON "\003" ID abtUp AT (143 138 12 8) + DISABLED NOFRAME FONT 5 + REPEATBUTTON "\004" ID abtDn AT (143 146 12 8) + DISABLED NOFRAME FONT 5 + BUTTON "$$DONE" ID abtOk AT (10 140 45 12) + END + + #ifdef SUPPORT_DIA + WORDLIST ID frmAbout + BEGIN + DIA_FORM_USE_BIN // formFlags + 0 // bin + DIA_STATE_MAX // preferred state + // Object data + 0 DIA_H_PLUS_DH+DIA_W_PLUS_DW 0 // the form itself + abtTitle DIA_X_PLUS_1_2_DW 0 + abtVersion DIA_X_PLUS_1_2_DW 0 + abtVerdate DIA_X_PLUS_1_2_DW 0 + abtText DIA_W_PLUS_DW+DIA_H_PLUS_DH 0 + abtUp DIA_X_RIGHT+DIA_Y_PLUS_DH 0 + abtDn DIA_X_RIGHT+DIA_Y_PLUS_DH 0 + abtOk DIA_Y_PLUS_DH 0 + END + #endif + FORM ID frmInteger AT (0 0 160 160) MENUID tdMenu *************** *** 1227,1229 **** --- 1259,1286 ---- #endif + #endif // SPECFUN_ENABLED + + #ifdef OS5HIRES + BITMAP ID abtLogo + COMPRESS + BEGIN + BITMAP "calc.bmp" BPP 1 DENSITY 72 TRANSPARENTINDEX 0 + BITMAP "calc-8.bmp" BPP 8 DENSITY 72 TRANSPARENTINDEX 0 + BITMAP "calc-8-hi.bmp" BPP 8 DENSITY 144 TRANSPARENTINDEX 0 + END + #else + BITMAP ID abtLogo + COMPRESS + BEGIN + BITMAP "calc.bmp" BPP 1 DENSITY 72 TRANSPARENTINDEX 0 + BITMAP "calc-8.bmp" BPP 8 DENSITY 72 TRANSPARENTINDEX 0 + END + #endif + + #ifdef SUPPORT_DIA + WORDLIST ID resize_index + BEGIN + frmGraph frmGraph + frmAbout frmAbout + END #endif Index: Makefile.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/Makefile.in,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile.in 19 Aug 2006 04:15:03 -0000 1.31 --- Makefile.in 23 Aug 2006 17:55:54 -0000 1.32 *************** *** 36,40 **** ROFILE = $(TARGET).ro ! CALC_OBJS = calc.o clie.o clie-util.o \ mlib/calcDB.o mlib/fl_num.o mlib/fp.o mlib/funcs.o \ mlib/guess.o mlib/konvert.o mlib/mathem.o mlib/stack.o prefs.o \ --- 36,40 ---- ROFILE = $(TARGET).ro ! CALC_OBJS = calc.o about.o clie.o clie-util.o \ mlib/calcDB.o mlib/fl_num.o mlib/fp.o mlib/funcs.o \ mlib/guess.o mlib/konvert.o mlib/mathem.o mlib/stack.o prefs.o \ *************** *** 103,109 **** $(BUILDPRC) -o $@ -n 'Easy Calc' -c 'OpCl' $(TARGET).def $(ROFILE) $(TARGET) ! $(RCPFILE): $(RSRCS) $(LANGDIR)/*.rcp docs/CREDITS ! cat $(LANGRCP) > $@; ! cat $(RSRCS) >> $@ %.stamp: $(RCPFILE) calcrsc.h $(LANGDIR)/%.h --- 103,110 ---- $(BUILDPRC) -o $@ -n 'Easy Calc' -c 'OpCl' $(TARGET).def $(ROFILE) $(TARGET) ! $(RCPFILE): $(RSRCS) $(LANGDIR)/*.rcp docs/CREDITS VERSION ! cat $(LANGRCP) $(RSRCS) | \ ! sed -e "s/DATE_HERE/`date +'%Y-%m-%d'`/g" | \ ! sed -e "s/VERSION_HERE/`cat VERSION`/g" > $(RCPFILE) %.stamp: $(RCPFILE) calcrsc.h $(LANGDIR)/%.h Index: graph.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/graph.rcp.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** graph.rcp.in 6 Aug 2006 01:09:15 -0000 1.29 --- graph.rcp.in 23 Aug 2006 17:55:55 -0000 1.30 *************** *** 4,9 **** #ifdef SUPPORT_DIA - #include "resizeconsts.h" - //Dana AlphaSmart support HEX "wTap" ID 1000 --- 4,7 ---- *************** *** 280,288 **** STRINGTABLE strGrcDescription "" "$$GRZERO" "$$GRVALUE" "$$GRMIN" "$$GRMAX" "$$GRDDX" "d2/dx" "$$GRINTEG" "$$GRINTERSECT" "dy/dx" "dy/dt" "dx/dt" "dr/dfi" - - #ifdef SUPPORT_DIA - WORDLIST ID resize_index - BEGIN - frmGraph frmGraph - END - #endif --- 278,279 ---- Index: calcrsc.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/calcrsc.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** calcrsc.h 2 Aug 2006 16:34:12 -0000 1.55 --- calcrsc.h 23 Aug 2006 17:55:55 -0000 1.56 *************** *** 11,14 **** --- 11,15 ---- #define frmGraph 1004 #define finForm 1005 + #define frmAbout 1006 #define altAbout 1006 #define altCompute 1007 *************** *** 396,399 **** --- 397,409 ---- #define defPopup 5008 + #define abtLogo 6001 + #define abtTitle 6002 + #define abtVersion 6003 + #define abtVerdate 6004 + #define abtText 6005 + #define abtOk 6006 + #define abtUp 6007 + #define abtDn 6008 + #define bmpLArrow 7001 #define bmpRArrow 7002 Index: prefs.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/prefs.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** prefs.c 2 Aug 2006 17:51:41 -0000 1.13 --- prefs.c 23 Aug 2006 17:55:55 -0000 1.14 *************** *** 29,32 **** --- 29,33 ---- #include "calcDB.h" #include "fp.h" + #include "about.h" #ifdef SUPPORT_DIA *************** *** 66,74 **** --- 67,80 ---- calcPrefs.dispScien = false; + #if 0 FrmAlert(altAbout); FrmHelp(hlpMain2); + #endif dispPrefs = calcPrefs.dispPrefs; /* db_recompile needs dispPrefs */ db_recompile_all(); + doAbout(hlpMain1); /* calls FrmGotoForm(frmABout) */ } + else + FrmGotoForm(calcPrefs.form); fp_set_prefs(calcPrefs.dispPrefs); } Index: calc.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** calc.c 6 Aug 2006 01:09:15 -0000 1.29 --- calc.c 23 Aug 2006 17:55:54 -0000 1.30 *************** *** 30,33 **** --- 30,34 ---- #include <StringMgr.h> #include <stdio.h> + #include "about.h" #ifdef SONY_SDK #include <SonyCLIE.h> *************** *** 167,171 **** break; case mitAbout: ! FrmAlert(altAbout); break; case btnInteger: --- 168,173 ---- break; case mitAbout: ! /* FrmAlert(altAbout); */ ! doAbout(hlpMain1); break; case btnInteger: *************** *** 272,276 **** ErrFatalDisplayIf(error, "Can't open History DB"); ! calc_init_application(); fp_setup_flpoint(); --- 274,278 ---- ErrFatalDisplayIf(error, "Can't open History DB"); ! calc_init_application(); /* also calls FrmGotoForm */ fp_setup_flpoint(); *************** *** 280,285 **** #endif - FrmGotoForm(calcPrefs.form); - return 0; } --- 282,285 ---- *************** *** 383,387 **** //Load the form resource specified in the event then activate it formId = event->data.frmLoad.formID; ! frm = FrmInitForm(formId); FrmSetActiveForm(frm); // Set the event handler for the form. The handler of the currently --- 383,390 ---- //Load the form resource specified in the event then activate it formId = event->data.frmLoad.formID; ! if (formId != frmAbout) ! frm = FrmInitForm(formId); ! else ! frm = FrmGetFormPtr(frmAbout); FrmSetActiveForm(frm); // Set the event handler for the form. The handler of the currently *************** *** 408,411 **** --- 411,420 ---- break; #endif /* GRAPHS_ENABLED */ + case frmAbout: + #ifdef SUPPORT_DIA + SetResizePolicy(formId); + #endif + FrmSetEventHandler(frm,aboutEventHandler); + break; case prefForm: FrmSetEventHandler(frm,PreferencesHandleEvent); |
