Menu
▾
▴
[Easycalc-commits] easycalc about.c, 1.1, 1.2 about.h, 1.1, 1.2 calc.c, 1.30, 1.31 calc.rcp.in, 1.105, 1.106 calcrsc.h, 1.56, 1.57
|
From: Ton v. O. <tvo...@us...> - 2006-08-25 00:29:08
|
Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25095 Modified Files: about.c about.h calc.c calc.rcp.in calcrsc.h Log Message: Replace help Tips screens with resizable Help form, sharing code with the About form. Update my own email address in CREDITS. Index: calc.rcp.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.rcp.in,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** calc.rcp.in 23 Aug 2006 17:55:55 -0000 1.105 --- calc.rcp.in 25 Aug 2006 00:29:01 -0000 1.106 *************** *** 349,353 **** FORM ID frmAbout AT (2 2 156 156) MODAL ! DEFAULTBTNID abtOk BEGIN FORMBITMAP AT (11 11) BITMAP abtLogo USABLE --- 349,353 ---- FORM ID frmAbout AT (2 2 156 156) MODAL ! DEFAULTBTNID abthlpOk BEGIN FORMBITMAP AT (11 11) BITMAP abtLogo USABLE *************** *** 355,365 **** 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 --- 355,365 ---- LABEL "Version: VERSION_HERE" ID abtVersion AT (65 15) FONT 1 LABEL "DATE_HERE" ID abtVerdate AT (68 26) FONT 1 ! FIELD ID abthlpText AT (3 37 152 99) LEFTALIGN FONT 0 NONEDITABLE MULTIPLELINES MAXCHARS 1024 ! REPEATBUTTON "\003" ID abthlpUp AT (143 138 12 8) DISABLED NOFRAME FONT 5 ! REPEATBUTTON "\004" ID abthlpDn AT (143 146 12 8) DISABLED NOFRAME FONT 5 ! BUTTON "$$DONE" ID abthlpOk AT (10 140 45 12) END *************** *** 375,382 **** 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 --- 375,411 ---- abtVersion DIA_X_PLUS_1_2_DW 0 abtVerdate DIA_X_PLUS_1_2_DW 0 ! abthlpText DIA_W_PLUS_DW+DIA_H_PLUS_DH+DIA_H_GRANULAR 0 ! abthlpUp DIA_X_RIGHT+DIA_Y_BOTTOM 0 ! abthlpDn DIA_X_RIGHT+DIA_Y_BOTTOM 0 ! abthlpOk DIA_Y_BOTTOM 0 ! END ! #endif ! ! FORM ID frmHelp AT (2 2 156 156) ! MODAL ! DEFAULTBTNID abthlpOk ! BEGIN ! TITLE "" ! FIELD ID abthlpText AT (2 15 154 121) LEFTALIGN FONT 0 ! NONEDITABLE MULTIPLELINES MAXCHARS 1024 ! REPEATBUTTON "\003" ID abthlpUp AT (143 138 12 8) ! DISABLED NOFRAME FONT 5 ! REPEATBUTTON "\004" ID abthlpDn AT (143 146 12 8) ! DISABLED NOFRAME FONT 5 ! BUTTON "$$DONE" ID abthlpOk AT (10 140 45 12) ! END ! ! #ifdef SUPPORT_DIA ! WORDLIST ID frmHelp ! 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 ! abthlpText DIA_W_PLUS_DW+DIA_H_PLUS_DH+DIA_H_GRANULAR 0 ! abthlpUp DIA_X_RIGHT+DIA_Y_BOTTOM 0 ! abthlpDn DIA_X_RIGHT+DIA_Y_BOTTOM 0 ! abthlpOk DIA_Y_BOTTOM 0 END #endif *************** *** 853,867 **** END ! ALERT altAbout ! HELPID hlpMain1 ! INFORMATION ! BEGIN ! TITLE "Easy Calc 1.24-cvs" ! MESSAGE "This was written by Ondrej Palkovsky, on...@pe....\n"\ ! "Send me a note, if you like it ;-)\n\n"\ ! "This is GPL'd software, comes WITHOUT ANY WARRANTY. See info for details. " ! ! BUTTONS "$$OK" ! END ALERT altBadParameter --- 882,896 ---- END ! //ALERT altAbout ! //HELPID hlpMain1 ! //INFORMATION ! //BEGIN ! // TITLE "Easy Calc 1.24-cvs" ! // MESSAGE "This was written by Ondrej Palkovsky, on...@pe....\n"\ ! //"Send me a note, if you like it ;-)\n\n"\ ! //"This is GPL'd software, comes WITHOUT ANY WARRANTY. See info for details. " ! // ! // BUTTONS "$$OK" ! //END ALERT altBadParameter *************** *** 939,947 **** STRING hlpPref "$$PREFHELP" - STRING hlpMain2 "$$BASIC HELP" STRING hlpMain1 "$$GNU NOTICE" STRING hlpFin "$$FINHELP" STRING hlpMemo "$$MEMOHELP" STRING hlpFunc "$$FUNCHELP" STRING hlpSolver "$$SOLVERHELP" --- 968,978 ---- STRING hlpPref "$$PREFHELP" STRING hlpMain1 "$$GNU NOTICE" + STRING hlpMain2 "$$BASIC HELP" + STRING hlpMain2T "$$HELP" STRING hlpFin "$$FINHELP" STRING hlpMemo "$$MEMOHELP" STRING hlpFunc "$$FUNCHELP" + STRING hlpFuncT "$$REFERENCE1" STRING hlpSolver "$$SOLVERHELP" *************** *** 959,962 **** --- 990,994 ---- STRING strLocalSaveAs "$$MNSAVE AS" STRING strCredits FILE "docs/CREDITS" + STRING strCreditsT "Thanks to..." STRING strWorksheet "$$WORKSHEET" STRING strNewWorksheet "$$NEW WORKSHEET" *************** *** 1283,1286 **** --- 1315,1319 ---- frmGraph frmGraph frmAbout frmAbout + frmHelp frmHelp END #endif Index: calcrsc.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/calcrsc.h,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** calcrsc.h 23 Aug 2006 17:55:55 -0000 1.56 --- calcrsc.h 25 Aug 2006 00:29:01 -0000 1.57 *************** *** 11,31 **** #define frmGraph 1004 #define finForm 1005 ! #define frmAbout 1006 ! #define altAbout 1006 ! #define altCompute 1007 ! #define altMathlib 1008 #define altGuessNotFound 1010 ! #define altGraphBadVal 1011 #define altAnsProblem 1013 #define altBadParameter 1015 #define frmListEdit 1016 #define frmMatrix 1017 ! #define frmBasicS 1018 ! #define slvForm 1019 ! #define slvTitleForm 1020 ! #define slvOptionsForm 1021 ! #define slvNoteForm 1022 ! #define slvExportOK 1023 ! #define slvExportError 1024 #define tdMenu 1000 --- 11,31 ---- #define frmGraph 1004 #define finForm 1005 ! #define frmAbout 1006 ! #define altCompute 1007 ! #define altMathlib 1008 ! #define frmHelp 1009 #define altGuessNotFound 1010 ! #define altGraphBadVal 1011 #define altAnsProblem 1013 #define altBadParameter 1015 #define frmListEdit 1016 #define frmMatrix 1017 ! #define frmBasicS 1018 ! #define slvForm 1019 ! #define slvTitleForm 1020 ! #define slvOptionsForm 1021 ! #define slvNoteForm 1022 ! #define slvExportOK 1023 ! #define slvExportError 1024 #define tdMenu 1000 *************** *** 46,56 **** #define hlpMain1 1100 #define hlpMain2 1101 ! #define hlpPref 1102 ! #define hlpFin 1103 ! #define hlpMemo 1104 ! #define hlpFunc 1105 ! #define hlpGrPref 1106 ! #define hlpGrSetup 1107 ! #define hlpSolver 1108 #define btnMain0 2000 --- 46,58 ---- #define hlpMain1 1100 #define hlpMain2 1101 ! #define hlpMain2T 1102 ! #define hlpPref 1103 ! #define hlpFin 1104 ! #define hlpMemo 1105 ! #define hlpFunc 1106 ! #define hlpFuncT 1107 ! #define hlpGrPref 1108 ! #define hlpGrSetup 1109 ! #define hlpSolver 1110 #define btnMain0 2000 *************** *** 401,408 **** #define abtVersion 6003 #define abtVerdate 6004 ! #define abtText 6005 ! #define abtOk 6006 ! #define abtUp 6007 ! #define abtDn 6008 #define bmpLArrow 7001 --- 403,410 ---- #define abtVersion 6003 #define abtVerdate 6004 ! #define abthlpText 6005 ! #define abthlpOk 6006 ! #define abthlpUp 6007 ! #define abthlpDn 6008 #define bmpLArrow 7001 *************** *** 430,437 **** #define strLocalSaveAs 8005 #define strCredits 8006 ! #define strWorksheet 8007 ! #define strNewWorksheet 8008 ! #define strDescriptionVar 8009 ! #define strUndefined 8010 #define mitAbout 8500 --- 432,440 ---- #define strLocalSaveAs 8005 #define strCredits 8006 ! #define strCreditsT 8007 ! #define strWorksheet 8008 ! #define strNewWorksheet 8009 ! #define strDescriptionVar 8010 ! #define strUndefined 8011 #define mitAbout 8500 Index: about.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/about.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** about.c 23 Aug 2006 17:50:44 -0000 1.1 --- about.c 25 Aug 2006 00:29:01 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- static UInt16 returnFormID = frmBasic; + static Char *emptyTitle = ""; static void updateScrollers(FormType *form, FieldType *fld) *************** *** 33,38 **** enableUp = FldScrollable(fld, winUp); enableDown = FldScrollable(fld, winDown); ! upix = FrmGetObjectIndex(form, abtUp); ! downix = FrmGetObjectIndex(form, abtDn); FrmUpdateScrollers(form, upix, downix, enableUp, enableDown); } --- 34,39 ---- enableUp = FldScrollable(fld, winUp); enableDown = FldScrollable(fld, winDown); ! upix = FrmGetObjectIndex(form, abthlpUp); ! downix = FrmGetObjectIndex(form, abthlpDn); FrmUpdateScrollers(form, upix, downix, enableUp, enableDown); } *************** *** 43,47 **** FieldType *fld; ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abtText)); linestoscroll = FldGetVisibleLines(fld) - 1; FldScrollField(fld, linestoscroll, dir); --- 44,48 ---- FieldType *fld; ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abthlpText)); linestoscroll = FldGetVisibleLines(fld) - 1; FldScrollField(fld, linestoscroll, dir); *************** *** 52,61 **** { FieldType *fld; ! MemHandle aboutH; ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abtText)); ! aboutH = FldGetTextHandle(fld); FldSetTextHandle(fld, 0); ! DmReleaseResource(aboutH); } --- 53,69 ---- { FieldType *fld; ! MemHandle abthlpH, titleH; ! Char *title; ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abthlpText)); ! abthlpH = FldGetTextHandle(fld); FldSetTextHandle(fld, 0); ! DmReleaseResource(abthlpH); ! if ((title = (Char *)FrmGetTitle(form))) { ! titleH = MemPtrRecoverHandle((MemPtr) title); ! FrmSetTitle(form, emptyTitle); ! MemHandleUnlock(titleH); ! DmReleaseResource(titleH); ! } } *************** *** 76,80 **** case frmUpdateEvent: FrmDrawForm(form); ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abtText)); updateScrollers(form, fld); handled = true; --- 84,88 ---- case frmUpdateEvent: FrmDrawForm(form); ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abthlpText)); updateScrollers(form, fld); handled = true; *************** *** 82,86 **** case ctlSelectEvent: ! if (event->data.ctlEnter.controlID == abtOk) { FrmGotoForm(returnFormID); handled = true; --- 90,94 ---- case ctlSelectEvent: ! if (event->data.ctlEnter.controlID == abthlpOk) { FrmGotoForm(returnFormID); handled = true; *************** *** 93,104 **** case ctlRepeatEvent: ! if (event->data.ctlRepeat.controlID == abtUp) { helpScroll(form, winUp); } ! else if (event->data.ctlRepeat.controlID == abtDn) { helpScroll(form, winDown); } break; default: break; --- 101,128 ---- case ctlRepeatEvent: ! if (event->data.ctlRepeat.controlID == abthlpUp) { helpScroll(form, winUp); } ! else if (event->data.ctlRepeat.controlID == abthlpDn) { helpScroll(form, winDown); } break; + case keyDownEvent: + if (EvtKeydownIsVirtual(event)) { + switch (event->data.keyDown.chr) { + case vchrPageUp: + case vchrRockerUp: + helpScroll(form, winUp); + break; + + case vchrPageDown: + case vchrRockerDown: + helpScroll(form, winDown); + break; + } + } + break; + default: break; *************** *** 116,120 **** aboutH = DmGetResource(strRsc, aboutStringID); form = FrmInitForm(frmAbout); ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abtText)); FldSetTextHandle(fld, aboutH); FldSetInsertionPoint(fld, 0); --- 140,144 ---- aboutH = DmGetResource(strRsc, aboutStringID); form = FrmInitForm(frmAbout); ! fld = FrmGetObjectPtr(form, FrmGetObjectIndex(form, abthlpText)); FldSetTextHandle(fld, aboutH); FldSetInsertionPoint(fld, 0); *************** *** 124,125 **** --- 148,166 ---- FrmGotoForm(frmAbout); } + + void doHelp(UInt16 hlpTitleID, UInt16 hlpTextID) + { + MemHandle titleH, helpH; + FormType *frm; + FieldType *fld; + + titleH = DmGetResource(strRsc, hlpTitleID); + helpH = DmGetResource(strRsc, hlpTextID); + frm = FrmInitForm(frmHelp); + FrmSetTitle(frm, MemHandleLock(titleH)); + fld = FrmGetObjectPtr(frm, FrmGetObjectIndex(frm, abthlpText)); + FldSetTextHandle(fld, helpH); + FldSetInsertionPoint(fld, 0); + returnFormID = FrmGetActiveFormID(); + FrmGotoForm(frmHelp); + } Index: calc.c =================================================================== RCS file: /cvsroot/easycalc/easycalc/calc.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** calc.c 23 Aug 2006 17:55:54 -0000 1.30 --- calc.c 25 Aug 2006 00:29:01 -0000 1.31 *************** *** 159,172 **** switch (button) { case hlpMain2: ! FrmHelp(hlpMain2); break; case hlpFunc: ! FrmHelp(hlpFunc); break; case mitCredits: ! FrmHelp(strCredits); break; case mitAbout: - /* FrmAlert(altAbout); */ doAbout(hlpMain1); break; --- 159,171 ---- switch (button) { case hlpMain2: ! doHelp(hlpMain2T, hlpMain2); break; case hlpFunc: ! doHelp(hlpFuncT, hlpFunc); break; case mitCredits: ! doHelp(strCreditsT, strCredits); break; case mitAbout: doAbout(hlpMain1); break; *************** *** 381,390 **** if (event->eType == frmLoadEvent) { - //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 --- 380,390 ---- if (event->eType == frmLoadEvent) { formId = event->data.frmLoad.formID; ! // Load the form resource specified in the event then activate it, ! // except for the About and Help forms which are already loaded. ! if (formId != frmAbout && formId != frmHelp) frm = FrmInitForm(formId); else ! frm = FrmGetFormPtr(formId); FrmSetActiveForm(frm); // Set the event handler for the form. The handler of the currently *************** *** 412,415 **** --- 412,416 ---- #endif /* GRAPHS_ENABLED */ case frmAbout: + case frmHelp: #ifdef SUPPORT_DIA SetResizePolicy(formId); Index: about.h =================================================================== RCS file: /cvsroot/easycalc/easycalc/about.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** about.h 23 Aug 2006 17:50:44 -0000 1.1 --- about.h 25 Aug 2006 00:29:01 -0000 1.2 *************** *** 20,21 **** --- 20,22 ---- Boolean aboutEventHandler(EventPtr event); void doAbout(UInt16 aboutStringID); + void doHelp(UInt16 hlpTitleID, UInt16 hlpTextID); |
