diff options
Diffstat (limited to 'apps/windoze')
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp | 5 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/mainfrm.cpp | 2 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.bpr | 6 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.cpp | 6 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.res | bin | 1976 -> 1976 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/swordprj.bpg | 4 |
6 files changed, 13 insertions, 10 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp index 5e53439..6907cc4 100644 --- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp +++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp @@ -470,8 +470,10 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin else { char *buf2 = 0; stdstr(&buf2, (const char *)*verses); + toupperstr_utf8(buf2); module->getRawEntry(); strcpy(buf, module->KeyText()); + toupperstr_utf8(buf); int i; for (i = 0; i < strlen(buf); i++) { if ((buf[i] == buf2[i]) || (buf[i] != '0')) @@ -479,7 +481,8 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin } char *buf3 = buf+i; for (i = 0; i < strlen(buf2) && (i < strlen(buf3)); i++) { - if (buf3[i] != buf2[i]) + if ((buf3[i] != buf2[i]) && + (SW_toupper(buf3[i]) != SW_toupper(buf2[i]))) break; } if (!i || i < (strlen(buf2)/2)) { diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp index 8d79c1d..511d501 100644 --- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp +++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp @@ -787,7 +787,7 @@ void TForm1::i12ize(const char *lang) { Optionsfrm->AutoLayout->Caption = _tr("Autosave Screen Layout"); Optionsfrm->HintStrongs->Caption = _tr("Show Lexicon Lookup Over Strongs Numbers"); Optionsfrm->HintVLists->Caption = _tr("Show Preview Over Verse Lists"); - Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words (ALT-W)"); + Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words (CTRL-W)"); Optionsfrm->OkBtn->Caption = _tr("OK"); Optionsfrm->CancelBtn->Caption = _tr("Cancel"); Optionsfrm->gbDefModules->Caption = _tr("Original Language Support - Default Modules"); diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index 25de7c2..cab9be4 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -25,9 +25,9 @@ versesel.dfm RangeMaintFrm.dfm ModVisFrm.dfm DevOfTheDay.dfm SplashPage.dfm FontSel.dfm StudyProfessor.dfm rtfhintfrm.dfm PreviewForm.dfm PrintFrm.dfm"/> - <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib - ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib - ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib"/> + <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\win32\borland\icudatab.lib + ..\..\..\..\..\icu-sword\as_is\win32\borland\icucommon.lib + ..\..\..\..\..\icu-sword\as_is\win32\borland\icui18n.lib"/> <LIBRARIES value="bcbie50.lib vcljpg50.lib nmfast50.lib vclbde50.lib vcldb50.lib vclx50.lib vcl50.lib"/> <SPARELIBS value="vcl50.lib vclx50.lib vcldb50.lib vclbde50.lib nmfast50.lib vcljpg50.lib diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp index a36edd1..a79b38b 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.cpp +++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp @@ -31,7 +31,7 @@ USEOBJ("rxlib\Vclutils.obj"); USEOBJ("rxlib\Rxcconst.obj"); USEOBJ("rxlib\Rxconst.obj"); USEFORM("StudyProfessor.cpp", Form3); -USELIB("..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib"); +USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icudatab.lib"); USEOBJ("rxlib\RxRichEd.obj"); USEOBJ("rxlib\Maxmin.obj"); USEUNIT("TModuleFonts.cpp"); @@ -44,8 +44,8 @@ USEOBJ("TntUnicodeControls\TntControls.obj"); USEOBJ("TntUnicodeControls\TntForms.obj"); USEOBJ("TntUnicodeControls\TntStdCtrls.obj"); USEOBJ("TntUnicodeControls\TntClasses.obj"); -USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib"); -USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib"); +USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icucommon.lib"); +USELIB("..\..\..\..\..\icu-sword\as_is\win32\borland\icui18n.lib"); //--------------------------------------------------------------------------- WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res Binary files differindex cc86a9a..b5c659e 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.res +++ b/apps/windoze/CBuilder5/BibleCS/sword.res diff --git a/apps/windoze/CBuilder5/BibleCS/swordprj.bpg b/apps/windoze/CBuilder5/BibleCS/swordprj.bpg index c5e4dab..87cc874 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordprj.bpg +++ b/apps/windoze/CBuilder5/BibleCS/swordprj.bpg @@ -21,11 +21,11 @@ swordlib.lib: swordlib.bpr sword.exe: sword.bpr $(MAKE) -icui18n.lib: ..\..\..\..\..\icu-sword\as_is\borland\i18n.bpr +icui18n.lib: ..\..\..\..\..\icu-sword\as_is\win32\borland\i18n.bpr $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak -icucommon.lib: ..\..\..\..\..\icu-sword\as_is\borland\common.bpr +icucommon.lib: ..\..\..\..\..\icu-sword\as_is\win32\borland\common.bpr $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak |