[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS AboutBoxfrm.cpp,1.12,1.13 AboutBoxfrm.dfm,1.50,1.51 DevOfTheDay.cpp,1.2,1.3 ModVisFrm.cpp,1.3,1.4 PrintFrm.cpp,1.12,1.13 RangeMaintFrm.cpp,1.3,1.4 RangeMaintFrm.h,1.3,1.4 RxRichEditX.cpp,1.46,1.47 TModuleFonts.cpp,1.8,1.9 biblecsmgr.cpp,1.21,1.22 bookmarkfrm.cpp,1.6,1.7 bookmarkfrm.h,1.4,1.5 mainfrm.cpp,1.123,1.124 mainfrm.h,1.46,1.47 optionfrm.cpp,1.34,1.35 paraldisp.cpp,1.4,1.5 paraldisp.h,1.2,1.3 searchfrm.cpp,1.42,1.43 searchfrm.h,1.18,1.19 sword.bpr,1.115,1.116 sword.res,1.102,1.103
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 27 Jun 2003 04:31:44 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv6823/apps/windoze/CBuilder5/BibleCS
Modified Files:
AboutBoxfrm.cpp AboutBoxfrm.dfm DevOfTheDay.cpp ModVisFrm.cpp
PrintFrm.cpp RangeMaintFrm.cpp RangeMaintFrm.h RxRichEditX.cpp
TModuleFonts.cpp biblecsmgr.cpp bookmarkfrm.cpp bookmarkfrm.h
mainfrm.cpp mainfrm.h optionfrm.cpp paraldisp.cpp paraldisp.h
searchfrm.cpp searchfrm.h sword.bpr sword.res
Log Message:
no message
Index: AboutBoxfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AboutBoxfrm.cpp 30 Apr 2003 08:18:45 -0000 1.12
--- AboutBoxfrm.cpp 27 Jun 2003 11:31:41 -0000 1.13
***************
*** 18,22 ****
static char *modtypes[] = {"Biblical Texts", "Commentaries", "Lexicons / Dictionaries", "Generic Books"};
! string newtext, tmptext;
ModMap::iterator it;
SectionMap::iterator it2;
--- 18,22 ----
static char *modtypes[] = {"Biblical Texts", "Commentaries", "Lexicons / Dictionaries", "Generic Books"};
! SWBuf newtext, tmptext;
ModMap::iterator it;
SectionMap::iterator it2;
***************
*** 106,110 ****
if ((Shift.Contains(ssCtrl)) && (!Shift.Contains(ssAlt)) && (Button == mbRight)) {
TMemoryStream *RTFStream = new TMemoryStream();
! string newtext = "{\\rtf1{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
newtext += "\\fs20 mainmgr->config: \\par\\par ";
--- 106,110 ----
if ((Shift.Contains(ssCtrl)) && (!Shift.Contains(ssAlt)) && (Button == mbRight)) {
TMemoryStream *RTFStream = new TMemoryStream();
! SWBuf newtext = "{\\rtf1{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
newtext += "\\fs20 mainmgr->config: \\par\\par ";
Index: AboutBoxfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** AboutBoxfrm.dfm 26 Jun 2003 04:33:31 -0000 1.50
--- AboutBoxfrm.dfm 27 Jun 2003 11:31:41 -0000 1.51
***************
*** 104,108 ****
Height = 21
AutoSize = False
! Caption = 'v1.5.6pre4'
IsControl = True
end
--- 104,108 ----
Height = 21
AutoSize = False
! Caption = 'v1.5.6pre5'
IsControl = True
end
Index: DevOfTheDay.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DevOfTheDay.cpp 14 Aug 2002 09:23:17 -0000 1.2
--- DevOfTheDay.cpp 27 Jun 2003 11:31:41 -0000 1.3
***************
*** 42,46 ****
String devoKey = TDateTime::CurrentDate().FormatString("mm.dd");
key << devoKey.c_str();
! string tmpval = Form1->optionsconf->Sections["ModDefaults"]["DailyDevotion"];
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
RichTip->fillWithVerses(it->second, &key, false, false);
--- 42,46 ----
String devoKey = TDateTime::CurrentDate().FormatString("mm.dd");
key << devoKey.c_str();
! SWBuf tmpval = Form1->optionsconf->Sections["ModDefaults"]["DailyDevotion"];
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
RichTip->fillWithVerses(it->second, &key, false, false);
Index: ModVisFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/ModVisFrm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ModVisFrm.cpp 3 Oct 2002 04:26:46 -0000 1.3
--- ModVisFrm.cpp 27 Jun 2003 11:31:41 -0000 1.4
***************
*** 45,49 ****
if (this->ModalResult == mrOk) {
for (int i = 0; i < modList->Items->Count; i++) {
! string name = modList->Items->Item[i]->Caption.c_str();
(*section)[name] = (modList->Items->Item[i]->Checked) ? "true" : "false";
}
--- 45,49 ----
if (this->ModalResult == mrOk) {
for (int i = 0; i < modList->Items->Count; i++) {
! SWBuf name = modList->Items->Item[i]->Caption.c_str();
(*section)[name] = (modList->Items->Item[i]->Checked) ? "true" : "false";
}
Index: PrintFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PrintFrm.cpp 11 Feb 2003 20:15:22 -0000 1.12
--- PrintFrm.cpp 27 Jun 2003 11:31:41 -0000 1.13
***************
*** 408,412 ****
void TPrintForm::SetDefaultOps()
{
! string modType = "",
tempVal = "";
if(radText->Checked)
--- 408,412 ----
void TPrintForm::SetDefaultOps()
{
! SWBuf modType = "",
tempVal = "";
if(radText->Checked)
***************
*** 541,545 ****
ConfigEntMap emap;
SWConfig* config = Form1->optionsconf;
! string type;
if(radText->Checked){
type = "Text";
--- 541,545 ----
ConfigEntMap emap;
SWConfig* config = Form1->optionsconf;
! SWBuf type;
if(radText->Checked){
type = "Text";
Index: RangeMaintFrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RangeMaintFrm.cpp 4 Mar 2001 11:32:23 -0000 1.3
--- RangeMaintFrm.cpp 27 Jun 2003 11:31:41 -0000 1.4
***************
*** 122,126 ****
VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i));
if (element) {
! ListBox2->Items->Add((string(element->LowerBound()) + " - " + string(element->UpperBound())).c_str());
}
else ListBox2->Items->Add((const char *)*verses.GetElement(i));
--- 122,126 ----
VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i));
if (element) {
! ListBox2->Items->Add((SWBuf(element->LowerBound()) + " - " + SWBuf(element->UpperBound())).c_str());
}
else ListBox2->Items->Add((const char *)*verses.GetElement(i));
Index: RangeMaintFrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RangeMaintFrm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RangeMaintFrm.h 3 Oct 2002 04:26:46 -0000 1.3
--- RangeMaintFrm.h 27 Jun 2003 11:31:41 -0000 1.4
***************
*** 53,58 ****
class TCustomRange : public TObject {
public:
! string name;
! string text;
TCustomRange(const char *name, const char *text) {
this->name = name;
--- 53,58 ----
class TCustomRange : public TObject {
public:
! SWBuf name;
! SWBuf text;
TCustomRange(const char *name, const char *text) {
this->name = name;
Index: RxRichEditX.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** RxRichEditX.cpp 26 Jun 2003 04:33:31 -0000 1.46
--- RxRichEditX.cpp 27 Jun 2003 11:31:41 -0000 1.47
***************
*** 281,285 ****
bool TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool heading, bool verseNum, const char *type, bool stripNewlines) {
! string fontname;
TMemoryStream *RTFStream = new TMemoryStream();
System::AnsiString newtext, tmptext;
--- 281,285 ----
bool TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool heading, bool verseNum, const char *type, bool stripNewlines) {
! SWBuf fontname;
TMemoryStream *RTFStream = new TMemoryStream();
System::AnsiString newtext, tmptext;
***************
*** 460,471 ****
{
AnsiString fontSize;
! string keyFontName,
keyFontSize;
ConfigEntMap::const_iterator eit;
! string modType = (string)getType().c_str();
// If we are printing to a page rather than the screen we want to grab the
// correct settings from that section of the conf file.
! string dispType = (type == "PrintedPage") ? "PrintedPage" : "Appearance";
//**** Font Name ****//
--- 460,471 ----
{
AnsiString fontSize;
! SWBuf keyFontName,
keyFontSize;
ConfigEntMap::const_iterator eit;
! SWBuf modType = (SWBuf)getType().c_str();
// If we are printing to a page rather than the screen we want to grab the
// correct settings from that section of the conf file.
! SWBuf dispType = (type == "PrintedPage") ? "PrintedPage" : "Appearance";
//**** Font Name ****//
***************
*** 549,554 ****
//**** Main Background Color ****//
! string keyBackColor = modType + "BackColor";
! string backColor = Form1->optionsconf->Sections[dispType][keyBackColor];
// This portion of the code sets the default values (If needed) of the background
// for either typical windows or for popup windows
--- 549,554 ----
//**** Main Background Color ****//
! SWBuf keyBackColor = modType + "BackColor";
! SWBuf backColor = Form1->optionsconf->Sections[dispType][keyBackColor];
// This portion of the code sets the default values (If needed) of the background
// for either typical windows or for popup windows
***************
*** 562,567 ****
//**** Main Font Color ****//
! string keyFontColor = modType + "FontColor";
! string fontColor = Form1->optionsconf->Sections[dispType][keyFontColor];
// This portion of the code sets the default values (If needed) of the background
// for either typical windows or for popup windows
--- 562,567 ----
//**** Main Font Color ****//
! SWBuf keyFontColor = modType + "FontColor";
! SWBuf fontColor = Form1->optionsconf->Sections[dispType][keyFontColor];
// This portion of the code sets the default values (If needed) of the background
// for either typical windows or for popup windows
***************
*** 572,576 ****
//**** EntryKey Color ****//
! string entryColor = Form1->optionsconf->Sections[dispType]["VSNumberColor"];
if (entryColor == "")
attribs->entryKeyColor = clBlue;
--- 572,576 ----
//**** EntryKey Color ****//
! SWBuf entryColor = Form1->optionsconf->Sections[dispType]["VSNumberColor"];
if (entryColor == "")
attribs->entryKeyColor = clBlue;
***************
*** 578,582 ****
//**** Current Verse Color ****//
! string currentVSColor = Form1->optionsconf->Sections[dispType]["CurrentVSColor"];
if (currentVSColor == "")
attribs->currentVSColor = clBlue;
--- 578,582 ----
//**** Current Verse Color ****//
! SWBuf currentVSColor = Form1->optionsconf->Sections[dispType]["CurrentVSColor"];
if (currentVSColor == "")
attribs->currentVSColor = clBlue;
***************
*** 584,588 ****
//**** Morphological Numbers Color ****//
! string morphColor = Form1->optionsconf->Sections[dispType]["MorphColor"];
if (morphColor == "")
attribs->morphColor = clBlue;
--- 584,588 ----
//**** Morphological Numbers Color ****//
! SWBuf morphColor = Form1->optionsconf->Sections[dispType]["MorphColor"];
if (morphColor == "")
attribs->morphColor = clBlue;
***************
*** 590,594 ****
//**** Strongs Numbers Color ****//
! string strongColor = Form1->optionsconf->Sections[dispType]["StrongsColor"];
if (strongColor == "")
attribs->strongsColor = clBlue;
--- 590,594 ----
//**** Strongs Numbers Color ****//
! SWBuf strongColor = Form1->optionsconf->Sections[dispType]["StrongsColor"];
if (strongColor == "")
attribs->strongsColor = clBlue;
***************
*** 596,600 ****
//**** Field Lookup Color ****//
! string fieldColor = Form1->optionsconf->Sections[dispType]["FieldColor"];
if (fieldColor == "")
attribs->lookupFieldColor = clBlue;
--- 596,600 ----
//**** Field Lookup Color ****//
! SWBuf fieldColor = Form1->optionsconf->Sections[dispType]["FieldColor"];
if (fieldColor == "")
attribs->lookupFieldColor = clBlue;
***************
*** 602,606 ****
//**** Mark Current Verse? ****//
! string autoVSColor = Form1->optionsconf->Sections[dispType]["AutoVSColor"];
if (autoVSColor == "")
attribs->markCurrentVerse = true;
--- 602,606 ----
//**** Mark Current Verse? ****//
! SWBuf autoVSColor = Form1->optionsconf->Sections[dispType]["AutoVSColor"];
if (autoVSColor == "")
attribs->markCurrentVerse = true;
***************
*** 608,612 ****
//**** Print Chapter Headings? ****//
! string prChHeadings = Form1->optionsconf->Sections[dispType][(modType + "ChHead")];
if (prChHeadings == "")
attribs->prChHeadings = true;
--- 608,612 ----
//**** Print Chapter Headings? ****//
! SWBuf prChHeadings = Form1->optionsconf->Sections[dispType][(modType + "ChHead")];
if (prChHeadings == "")
attribs->prChHeadings = true;
***************
*** 614,618 ****
//**** Print Book Name? ****//
! string prBookHeadings = Form1->optionsconf->Sections[dispType][(modType +"BkName")];
if (prBookHeadings == "")
attribs->prBookHeadings = true;
--- 614,618 ----
//**** Print Book Name? ****//
! SWBuf prBookHeadings = Form1->optionsconf->Sections[dispType][(modType +"BkName")];
if (prBookHeadings == "")
attribs->prBookHeadings = true;
***************
*** 620,624 ****
//**** Prefix Each Verse? ****//
! string prPreFix = Form1->optionsconf->Sections[dispType][(modType +"PreFixTag")];
if (prPreFix == "")
attribs->prPreFix = true;
--- 620,624 ----
//**** Prefix Each Verse? ****//
! SWBuf prPreFix = Form1->optionsconf->Sections[dispType][(modType +"PreFixTag")];
if (prPreFix == "")
attribs->prPreFix = true;
***************
*** 626,630 ****
//**** Postfix Each Verse? ****//
! string prPostFix = Form1->optionsconf->Sections[dispType][(modType +"PostFixTag")];
if (prPostFix == "")
attribs->prPostFix = true;
--- 626,630 ----
//**** Postfix Each Verse? ****//
! SWBuf prPostFix = Form1->optionsconf->Sections[dispType][(modType +"PostFixTag")];
if (prPostFix == "")
attribs->prPostFix = true;
***************
*** 632,636 ****
//**** Print the verse number? ****//
! string prVerseNum = Form1->optionsconf->Sections[dispType][(modType + "VSNum")];
if (prVerseNum == "")
attribs->prVerseNum = true;
--- 632,636 ----
//**** Print the verse number? ****//
! SWBuf prVerseNum = Form1->optionsconf->Sections[dispType][(modType + "VSNum")];
if (prVerseNum == "")
attribs->prVerseNum = true;
***************
*** 638,642 ****
//**** Superscript the verse number? ****//
! string superVSNum = Form1->optionsconf->Sections[dispType][(modType + "SuperVS")];
if (superVSNum == "")
attribs->superVSNum = true;
--- 638,642 ----
//**** Superscript the verse number? ****//
! SWBuf superVSNum = Form1->optionsconf->Sections[dispType][(modType + "SuperVS")];
if (superVSNum == "")
attribs->superVSNum = true;
***************
*** 644,648 ****
//**** Print as a paragraph? ****//
! string paragraph = Form1->optionsconf->Sections[dispType][(modType + "Paragraph")];
if (paragraph == "")
attribs->paragraph = true;
--- 644,648 ----
//**** Print as a paragraph? ****//
! SWBuf paragraph = Form1->optionsconf->Sections[dispType][(modType + "Paragraph")];
if (paragraph == "")
attribs->paragraph = true;
***************
*** 718,724 ****
char buf1[1024], buf2[1024];
SectionMap::iterator sit;
! string value;
ConfigEntMap::iterator entry;
! string tmpval;
int CurrVSRed, CurrVSGreen, CurrVSBlue, BodyRed, BodyGreen, BodyBlue,
VSNumRed, VSNumGreen, VSNumBlue, MorphRed, MorphGreen, MorphBlue,
--- 718,724 ----
char buf1[1024], buf2[1024];
SectionMap::iterator sit;
! SWBuf value;
ConfigEntMap::iterator entry;
! SWBuf tmpval;
int CurrVSRed, CurrVSGreen, CurrVSBlue, BodyRed, BodyGreen, BodyBlue,
VSNumRed, VSNumGreen, VSNumBlue, MorphRed, MorphGreen, MorphBlue,
Index: TModuleFonts.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TModuleFonts.cpp 19 Aug 2002 07:10:50 -0000 1.8
--- TModuleFonts.cpp 27 Jun 2003 11:31:41 -0000 1.9
***************
*** 51,55 ****
ModMap::iterator mods;
TTreeNode *node;
! string nodeName;
manager = Form1->mainmgr;
--- 51,55 ----
ModMap::iterator mods;
TTreeNode *node;
! SWBuf nodeName;
manager = Form1->mainmgr;
Index: biblecsmgr.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** biblecsmgr.cpp 30 Apr 2003 08:18:45 -0000 1.21
--- biblecsmgr.cpp 27 Jun 2003 11:31:41 -0000 1.22
***************
*** 48,55 ****
void BibleCSMGR::AddRenderFilters(SWModule *module, ConfigEntMap §ion)
{
! string lang;
ConfigEntMap::iterator entry;
! lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (string)"en";
if (module->Direction() == DIRECTION_RTL) {
--- 48,55 ----
void BibleCSMGR::AddRenderFilters(SWModule *module, ConfigEntMap §ion)
{
! SWBuf lang;
ConfigEntMap::iterator entry;
! lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (SWBuf)"en";
if (module->Direction() == DIRECTION_RTL) {
Index: bookmarkfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bookmarkfrm.cpp 26 Sep 2002 07:50:45 -0000 1.6
--- bookmarkfrm.cpp 27 Jun 2003 11:31:41 -0000 1.7
***************
*** 25,29 ****
DIR *dir;
struct dirent *ent;
! string conffile;
bmdir = "";
--- 25,29 ----
DIR *dir;
struct dirent *ent;
! SWBuf conffile;
bmdir = "";
***************
*** 31,35 ****
if ((sit = Form1->optionsconf->Sections.find("Bookmarks")) != Form1->optionsconf->Sections.end())
! bmdir = ((eit = (*sit).second.find("Directory")) != (*sit).second.end()) ? (*eit).second : (string)"";
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
--- 31,35 ----
if ((sit = Form1->optionsconf->Sections.find("Bookmarks")) != Form1->optionsconf->Sections.end())
! bmdir = ((eit = (*sit).second.find("Directory")) != (*sit).second.end()) ? (*eit).second : (SWBuf)"";
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
***************
*** 167,171 ****
bool personal = true, other = false;
list <String *>::iterator it;
! string persfile;
if (bmtree->Items->Count)
--- 167,171 ----
bool personal = true, other = false;
list <String *>::iterator it;
! SWBuf persfile;
if (bmtree->Items->Count)
Index: bookmarkfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bookmarkfrm.h 3 Oct 2002 04:26:46 -0000 1.4
--- bookmarkfrm.h 27 Jun 2003 11:31:41 -0000 1.5
***************
*** 40,44 ****
public: // User declarations
! string bmdir;
__fastcall TbookmarkForm(TComponent* Owner);
__fastcall ~TbookmarkForm();
--- 40,44 ----
public: // User declarations
! SWBuf bmdir;
__fastcall TbookmarkForm(TComponent* Owner);
__fastcall ~TbookmarkForm();
Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** mainfrm.cpp 22 Jun 2003 23:50:23 -0000 1.123
--- mainfrm.cpp 27 Jun 2003 11:31:41 -0000 1.124
***************
*** 499,503 ****
SWKey saveKey;
ConfigEntMap::const_iterator const_eit;
! string fontname;
if (mainmgr) {
--- 499,503 ----
SWKey saveKey;
ConfigEntMap::const_iterator const_eit;
! SWBuf fontname;
if (mainmgr) {
***************
*** 631,635 ****
feature = "GreekDef";
if (!hasFeature(mainmgr, curLex.c_str(), feature.c_str())) {
! string tmpval = optionsconf->Sections["ModDefaults"][feature.c_str()];
for (int i = 0; i < LexDictPageControl->PageCount; i++) {
if (!stricmp(LexDictPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
--- 631,635 ----
feature = "GreekDef";
if (!hasFeature(mainmgr, curLex.c_str(), feature.c_str())) {
! SWBuf tmpval = optionsconf->Sections["ModDefaults"][feature.c_str()];
for (int i = 0; i < LexDictPageControl->PageCount; i++) {
if (!stricmp(LexDictPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
***************
*** 695,699 ****
OptionsList options = mainmgr->getGlobalOptions();
for (OptionsList::iterator it = options.begin(); it != options.end(); it++) {
! string value = mainmgr->getGlobalOption(it->c_str());
(*layoutconf)["ModuleOptions"][it->c_str()] = value;
}
--- 695,699 ----
OptionsList options = mainmgr->getGlobalOptions();
for (OptionsList::iterator it = options.begin(); it != options.end(); it++) {
! SWBuf value = mainmgr->getGlobalOption(it->c_str());
(*layoutconf)["ModuleOptions"][it->c_str()] = value;
}
***************
*** 1001,1005 ****
int maxFiles;
TColor fieldColor;
! string tmpval;
bool showDevos;
bool showGlos;
--- 1001,1005 ----
int maxFiles;
TColor fieldColor;
! SWBuf tmpval;
bool showDevos;
bool showGlos;
***************
*** 1276,1280 ****
for (int i = 0; i < pc->PageCount; i++) {
! string heading = pc->Pages[i]->Caption.c_str();
pc->Pages[i]->TabVisible = !((*section)[heading.c_str()] == "false"); // !false allows default to be true
}
--- 1276,1280 ----
for (int i = 0; i < pc->PageCount; i++) {
! SWBuf heading = pc->Pages[i]->Caption.c_str();
pc->Pages[i]->TabVisible = !((*section)[heading.c_str()] == "false"); // !false allows default to be true
}
***************
*** 1584,1588 ****
ConfigEntMap emap;
int color;
! string tmpval;
//*********************************
--- 1584,1588 ----
ConfigEntMap emap;
int color;
! SWBuf tmpval;
//*********************************
***************
*** 1686,1690 ****
SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
if (clickText.Length()) {
! string highlight = Trim(clickText).c_str();
if (clickText.c_str()[0] == '*') { // '*' = NOTE
--- 1686,1690 ----
SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
if (clickText.Length()) {
! SWBuf highlight = Trim(clickText).c_str();
if (clickText.c_str()[0] == '*') { // '*' = NOTE
***************
*** 1776,1780 ****
}
else {
! string highlight = Trim(rtf->SelText).c_str();
tmpVerseList = DefaultVSKey->ParseVerseList((char *)highlight.c_str(), *DefaultVSKey);
if (tmpVerseList.Count())
--- 1776,1780 ----
}
else {
! SWBuf highlight = Trim(rtf->SelText).c_str();
tmpVerseList = DefaultVSKey->ParseVerseList((char *)highlight.c_str(), *DefaultVSKey);
if (tmpVerseList.Count())
***************
*** 1942,1948 ****
if ((!stricmp(option, "Strong's Numbers")) && (!stricmp(value, "On"))) {
! string curText = TextPageControl->ActivePage->Caption.c_str();
if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
! string tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
for (int i = 0; i < TextPageControl->PageCount; i++) {
if (!stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
--- 1942,1948 ----
if ((!stricmp(option, "Strong's Numbers")) && (!stricmp(value, "On"))) {
! SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
! SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
for (int i = 0; i < TextPageControl->PageCount; i++) {
if (!stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
***************
*** 1967,1971 ****
TMenuItem *menuChoice = (TMenuItem *)Sender;
! string option = menuChoice->Caption.c_str();
int k = 0;
const char *source = option.c_str();
--- 1967,1971 ----
TMenuItem *menuChoice = (TMenuItem *)Sender;
! SWBuf option = menuChoice->Caption.c_str();
int k = 0;
const char *source = option.c_str();
***************
*** 1977,1981 ****
caption[k] = 0;
! string value = mainmgr->getGlobalOption(caption);
delete [] caption;
for (int i = 0; i < menuChoice->Count; i++) {
--- 1977,1981 ----
caption[k] = 0;
! SWBuf value = mainmgr->getGlobalOption(caption);
delete [] caption;
for (int i = 0; i < menuChoice->Count; i++) {
***************
*** 1998,2003 ****
void __fastcall TForm1::Contents1Click(TObject *Sender)
{
! string helpDir = optionsconf->Sections["Help"].getWithDefault("Directory", ".\\help");
! string helpExe = helpDir + "\\sword.chm";
if ((int)ShellExecute(this->Handle, "open", helpExe.c_str(), NULL, NULL, SW_SHOWNORMAL) < 33) {
--- 1998,2003 ----
void __fastcall TForm1::Contents1Click(TObject *Sender)
{
! SWBuf helpDir = optionsconf->Sections["Help"].getWithDefault("Directory", ".\\help");
! SWBuf helpExe = helpDir + "\\sword.chm";
if ((int)ShellExecute(this->Handle, "open", helpExe.c_str(), NULL, NULL, SW_SHOWNORMAL) < 33) {
***************
*** 2089,2093 ****
for (int i = 0; i < pc->PageCount; i++) {
! string heading = pc->Pages[i]->Caption.c_str();
(*section)[heading.c_str()] = ((pc->Pages[i]->TabVisible) ? "true" : "false");
}
--- 2089,2093 ----
for (int i = 0; i < pc->PageCount; i++) {
! SWBuf heading = pc->Pages[i]->Caption.c_str();
(*section)[heading.c_str()] = ((pc->Pages[i]->TabVisible) ? "true" : "false");
}
***************
*** 2096,2100 ****
if (ModVisForm->ShowModal() == mrOk) {
for (int i = 0; i < pc->PageCount; i++) {
! string heading = pc->Pages[i]->Caption.c_str();
pc->Pages[i]->TabVisible = ((*section)[heading.c_str()] == "true");
}
--- 2096,2100 ----
if (ModVisForm->ShowModal() == mrOk) {
for (int i = 0; i < pc->PageCount; i++) {
! SWBuf heading = pc->Pages[i]->Caption.c_str();
pc->Pages[i]->TabVisible = ((*section)[heading.c_str()] == "true");
}
***************
*** 2137,2144 ****
{
AnsiString url = *URL;
! string stuff = url.c_str();
char *offset = strstr(url.c_str(), "passage");
if (offset > 0) {
! string verse = (offset+8);
char * buf = new char [ verse.length() + 1 ];
strcpy(buf, verse.c_str());
--- 2137,2144 ----
{
AnsiString url = *URL;
! SWBuf stuff = url.c_str();
char *offset = strstr(url.c_str(), "passage");
if (offset > 0) {
! SWBuf verse = (offset+8);
char * buf = new char [ verse.length() + 1 ];
strcpy(buf, verse.c_str());
***************
*** 2161,2166 ****
void TForm1::refreshAppearance() {
ModMap::iterator it;
! string locale;
! string tmpval;
locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
--- 2161,2166 ----
void TForm1::refreshAppearance() {
ModMap::iterator it;
! SWBuf locale;
! SWBuf tmpval;
locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
***************
*** 2210,2214 ****
{
ConfigEntMap::const_iterator const_eit;
! string fontname;
char buf[1024];
static TRect lastRect(0,0,0,0);
--- 2210,2214 ----
{
ConfigEntMap::const_iterator const_eit;
! SWBuf fontname;
char buf[1024];
static TRect lastRect(0,0,0,0);
***************
*** 2469,2473 ****
if (!strncmp(HintInfo.HintControl->Name.c_str(), "TextRTFLXX", 10))
feature = "GreekDef";
! string tmpval = optionsconf->Sections["ModDefaults"][feature.c_str()];
if (tmpval.size()) {
SWModule *defMod = 0;
--- 2469,2473 ----
if (!strncmp(HintInfo.HintControl->Name.c_str(), "TextRTFLXX", 10))
feature = "GreekDef";
! SWBuf tmpval = optionsconf->Sections["ModDefaults"][feature.c_str()];
if (tmpval.size()) {
SWModule *defMod = 0;
***************
*** 2490,2494 ****
// try looking up the word in a general dictionary
if (!link && hintWords) {
! string tmpval = optionsconf->Sections["ModDefaults"]["GenDict"];
if (tmpval.size()) {
SWModule *defMod = 0;
--- 2490,2494 ----
// try looking up the word in a general dictionary
if (!link && hintWords) {
! SWBuf tmpval = optionsconf->Sections["ModDefaults"]["GenDict"];
if (tmpval.size()) {
SWModule *defMod = 0;
***************
*** 2559,2563 ****
TColor penColor;
! string strColor;
strColor = Form1->optionsconf->Sections["Appearance"]["PopupFontColor"];
if(strColor == "")
--- 2559,2563 ----
TColor penColor;
! SWBuf strColor;
strColor = Form1->optionsconf->Sections["Appearance"]["PopupFontColor"];
if(strColor == "")
Index: mainfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** mainfrm.h 19 Jun 2003 16:58:30 -0000 1.46
--- mainfrm.h 27 Jun 2003 11:31:41 -0000 1.47
***************
*** 115,119 ****
stm->Clear();
! string modText = (string)"<HTML><BODY>" + (string)imodule.RenderText() + (string)"</BODY></HTML>";
stm->WriteBuffer(modText.c_str(), modText.length());
--- 115,119 ----
stm->Clear();
! SWBuf modText = (SWBuf)"<HTML><BODY>" + (SWBuf)imodule.RenderText() + (SWBuf)"</BODY></HTML>";
stm->WriteBuffer(modText.c_str(), modText.length());
Index: optionfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** optionfrm.cpp 26 Mar 2003 22:07:12 -0000 1.34
--- optionfrm.cpp 27 Jun 2003 11:31:41 -0000 1.35
***************
*** 5,9 ****
#include <localemgr.h>
#include <list>
- #include <string>
#include <dirent.h>
#include <io.h>
--- 5,8 ----
***************
*** 51,55 ****
void __fastcall TOptionsfrm::FormCreate(TObject *Sender)
{
! list<string> locales;
localeCB->Clear();
--- 50,54 ----
void __fastcall TOptionsfrm::FormCreate(TObject *Sender)
{
! list<SWBuf> locales;
localeCB->Clear();
***************
*** 58,62 ****
locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();
! for (list<string>::iterator it = locales.begin(); it != locales.end(); it++) {
const char *name = LocaleMgr::systemLocaleMgr.getLocale(it->c_str())->getName();
const char *description = LocaleMgr::systemLocaleMgr.getLocale(it->c_str())->getDescription();
--- 57,61 ----
locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();
! for (list<SWBuf>::iterator it = locales.begin(); it != locales.end(); it++) {
const char *name = LocaleMgr::systemLocaleMgr.getLocale(it->c_str())->getName();
const char *description = LocaleMgr::systemLocaleMgr.getLocale(it->c_str())->getDescription();
***************
*** 337,341 ****
DIR *dir;
struct dirent *ent;
! string conffile;
AnsiString strName;
AnsiString strPath = COLOR_DIR;
--- 336,340 ----
DIR *dir;
struct dirent *ent;
! SWBuf conffile;
AnsiString strName;
AnsiString strPath = COLOR_DIR;
***************
*** 529,533 ****
void TOptionsfrm::LoadDispSettings(SWConfig* config) {
SectionMap::iterator sit;
! string tmpval;
if((tmpval = config->Sections["Appearance"]["AutoVSColor"]) == "0"){
--- 528,532 ----
void TOptionsfrm::LoadDispSettings(SWConfig* config) {
SectionMap::iterator sit;
! SWBuf tmpval;
if((tmpval = config->Sections["Appearance"]["AutoVSColor"]) == "0"){
***************
*** 700,704 ****
ConfigEntMap emap;
int color;
! string tmpval;
Optionsfrm->AutoBMPersonal->Checked = true;
--- 699,703 ----
ConfigEntMap emap;
int color;
! SWBuf tmpval;
Optionsfrm->AutoBMPersonal->Checked = true;
***************
*** 727,731 ****
Optionsfrm->devsAsDictsCB->Checked = false;
! tmpval = ((eit = config->Sections["General"].find("DevsAsDicts")) != config->Sections["General"].end())? (*eit).second : (string)"false";
if (!stricmp(tmpval.c_str(), "true"))
Optionsfrm->devsAsDictsCB->Checked = true;
--- 726,730 ----
Optionsfrm->devsAsDictsCB->Checked = false;
! tmpval = ((eit = config->Sections["General"].find("DevsAsDicts")) != config->Sections["General"].end())? (*eit).second : (SWBuf)"false";
if (!stricmp(tmpval.c_str(), "true"))
Optionsfrm->devsAsDictsCB->Checked = true;
***************
*** 737,741 ****
Optionsfrm->devSplashCB->Checked = false;
! tmpval = ((eit = config->Sections["General"].find("TipOfTheDay")) != config->Sections["General"].end())? (*eit).second : (string)"";
if (!stricmp(tmpval.c_str(), "Devotional"))
Optionsfrm->devSplashCB->Checked = true;
--- 736,740 ----
Optionsfrm->devSplashCB->Checked = false;
! tmpval = ((eit = config->Sections["General"].find("TipOfTheDay")) != config->Sections["General"].end())? (*eit).second : (SWBuf)"";
if (!stricmp(tmpval.c_str(), "Devotional"))
Optionsfrm->devSplashCB->Checked = true;
***************
*** 745,779 ****
Optionsfrm->localeCB->ItemIndex = Optionsfrm->localeCB->Items->IndexOf((defLocale)?defLocale->getDescription():"English (US)");
! tmpval = ((eit = config->Sections["ModDefaults"].find("GreekDef")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->greekDefCB->ItemIndex = Optionsfrm->greekDefCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("GreekParse")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->greekParseCB->ItemIndex = Optionsfrm->greekParseCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("HebrewDef")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->hebrewDefCB->ItemIndex = Optionsfrm->hebrewDefCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("HebrewParse")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->hebrewParseCB->ItemIndex = Optionsfrm->hebrewParseCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("DailyDevotion")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->dailyDefaultCB->ItemIndex = Optionsfrm->dailyDefaultCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("GenDict")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->genDictCB->ItemIndex = Optionsfrm->genDictCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("StrongsNumbers")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->strongsNumsCB->ItemIndex = Optionsfrm->strongsNumsCB->Items->IndexOf(it->second->Description());
--- 744,778 ----
Optionsfrm->localeCB->ItemIndex = Optionsfrm->localeCB->Items->IndexOf((defLocale)?defLocale->getDescription():"English (US)");
! tmpval = ((eit = config->Sections["ModDefaults"].find("GreekDef")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->greekDefCB->ItemIndex = Optionsfrm->greekDefCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("GreekParse")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->greekParseCB->ItemIndex = Optionsfrm->greekParseCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("HebrewDef")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->hebrewDefCB->ItemIndex = Optionsfrm->hebrewDefCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("HebrewParse")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->hebrewParseCB->ItemIndex = Optionsfrm->hebrewParseCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("DailyDevotion")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->dailyDefaultCB->ItemIndex = Optionsfrm->dailyDefaultCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("GenDict")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->genDictCB->ItemIndex = Optionsfrm->genDictCB->Items->IndexOf(it->second->Description());
}
! tmpval = ((eit = config->Sections["ModDefaults"].find("StrongsNumbers")) != config->Sections["ModDefaults"].end())? (*eit).second : (SWBuf)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->strongsNumsCB->ItemIndex = Optionsfrm->strongsNumsCB->Items->IndexOf(it->second->Description());
***************
*** 788,792 ****
ConfigEntMap emap;
int color;
! string tmpval;
emap = config->Sections["Appearance"];
--- 787,791 ----
ConfigEntMap emap;
int color;
! SWBuf tmpval;
emap = config->Sections["Appearance"];
Index: paraldisp.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/paraldisp.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** paraldisp.cpp 19 Jun 2003 21:00:31 -0000 1.4
--- paraldisp.cpp 27 Jun 2003 11:31:41 -0000 1.5
***************
*** 129,136 ****
newtext += "\\cell\\row\\pard ";
*/
! string lastEntry = "something the first entry will never be";
// bool firstRow = true;
while ((key->Book() == book) && (key->Chapter() == chap) && (mods[0]->Error() == 0)) {
! if (lastEntry == (string)mods[0]->getRawEntry()) {
(*mods[0])++;
continue;
--- 129,136 ----
newtext += "\\cell\\row\\pard ";
*/
! SWBuf lastEntry = "something the first entry will never be";
// bool firstRow = true;
while ((key->Book() == book) && (key->Chapter() == chap) && (mods[0]->Error() == 0)) {
! if (lastEntry == (SWBuf)mods[0]->getRawEntry()) {
(*mods[0])++;
continue;
Index: paraldisp.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/paraldisp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** paraldisp.h 19 Jun 2003 16:58:30 -0000 1.2
--- paraldisp.h 27 Jun 2003 11:31:41 -0000 1.3
***************
*** 33,38 ****
#include <swmgr.h>
#include <swdisprtfchap.h>
- #include <string>
- using std::string;
//---------------------------------------------------------------------------
class ParallelDisp : public SWDispRTFChap {
--- 33,36 ----
***************
*** 43,47 ****
int modCount;
! string mod[3];
__fastcall ParallelDisp(TWinControl *Owner);
--- 41,45 ----
int modCount;
! SWBuf mod[3];
__fastcall ParallelDisp(TWinControl *Owner);
Index: searchfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** searchfrm.cpp 19 Jun 2003 16:58:30 -0000 1.42
--- searchfrm.cpp 27 Jun 2003 11:31:41 -0000 1.43
***************
*** 147,151 ****
//---------------------------------------------------------------------------
! __fastcall TsearchForm::TSearchThread::TSearchThread(TsearchForm *parent, string searchText, int searchType, int searchOptions, SWKey *scope, bool CreateSuspended)
: TThread(CreateSuspended)
{
--- 147,151 ----
//---------------------------------------------------------------------------
! __fastcall TsearchForm::TSearchThread::TSearchThread(TsearchForm *parent, SWBuf searchText, int searchType, int searchOptions, SWKey *scope, bool CreateSuspended)
: TThread(CreateSuspended)
{
***************
*** 370,374 ****
ModMap::iterator mods;
TTreeNode *node;
! string nodeName;
manager = Form1->mainmgr;
--- 370,374 ----
ModMap::iterator mods;
TTreeNode *node;
! SWBuf nodeName;
manager = Form1->mainmgr;
***************
*** 407,411 ****
ModMap::iterator mods;
TTreeNode *node;
! string nodeName;
manager = Form1->mainmgr;
TTreeNode* currNode = modTreeView->Selected;
--- 407,411 ----
ModMap::iterator mods;
TTreeNode *node;
! SWBuf nodeName;
manager = Form1->mainmgr;
TTreeNode* currNode = modTreeView->Selected;
***************
*** 423,427 ****
void __fastcall TsearchForm::Button2Click(TObject *Sender)
{
! string helpDir;
ConfigEntMap::iterator it = Form1->optionsconf->Sections["Help"].find("Directory");
if (it != Form1->optionsconf->Sections["Help"].end())
--- 423,427 ----
void __fastcall TsearchForm::Button2Click(TObject *Sender)
{
! SWBuf helpDir;
ConfigEntMap::iterator it = Form1->optionsconf->Sections["Help"].find("Directory");
if (it != Form1->optionsconf->Sections["Help"].end())
***************
*** 429,433 ****
else helpDir = ".\\help";
! string helpExe = helpDir + "\\Sword.chm::searchh.html";
if ((int)ShellExecute(this->Handle, "open", "hh", helpExe.c_str(), NULL, SW_SHOWNORMAL) < 33) {
helpExe = helpDir + "\\searchh.html";
--- 429,433 ----
else helpDir = ".\\help";
! SWBuf helpExe = helpDir + "\\Sword.chm::searchh.html";
if ((int)ShellExecute(this->Handle, "open", "hh", helpExe.c_str(), NULL, SW_SHOWNORMAL) < 33) {
helpExe = helpDir + "\\searchh.html";
Index: searchfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/searchfrm.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** searchfrm.h 14 Sep 2002 20:51:39 -0000 1.18
--- searchfrm.h 27 Jun 2003 11:31:41 -0000 1.19
***************
*** 76,80 ****
class TSearchThread : public TThread {
ListKey results;
! string searchText;
int searchType;
int searchOptions;
--- 76,80 ----
class TSearchThread : public TThread {
ListKey results;
! SWBuf searchText;
int searchType;
int searchOptions;
***************
*** 84,88 ****
void __fastcall Execute();
public:
! __fastcall TSearchThread(TsearchForm *parent, string searchText, int searchType, int searchOptions, SWKey *scope = 0, bool CreateSuspended = false);
void __fastcall FillListBox(void);
static void searchProgressCallback(char status, void *searchFrm);
--- 84,88 ----
void __fastcall Execute();
public:
! __fastcall TSearchThread(TsearchForm *parent, SWBuf searchText, int searchType, int searchOptions, SWKey *scope = 0, bool CreateSuspended = false);
void __fastcall FillListBox(void);
static void searchProgressCallback(char status, void *searchFrm);
Index: sword.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** sword.bpr 26 Jun 2003 04:33:31 -0000 1.115
--- sword.bpr 27 Jun 2003 11:31:41 -0000 1.116
***************
*** 76,80 ****
MinorVer=5
Release=5
! Build=43
Debug=0
PreRelease=0
--- 76,80 ----
MinorVer=5
Release=5
! Build=48
Debug=0
PreRelease=0
***************
*** 88,92 ****
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
! FileVersion=1.5.5.43
InternalName=biblecs
LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
--- 88,92 ----
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
! FileVersion=1.5.5.48
InternalName=biblecs
LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
***************
*** 94,98 ****
OriginalFilename=
ProductName=The SWORD Project
! ProductVersion=1.5.6pre4
Comments=Seek Him and you will find Him
--- 94,98 ----
OriginalFilename=
ProductName=The SWORD Project
! ProductVersion=1.5.6pre5
Comments=Seek Him and you will find Him
Index: sword.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
Binary files /tmp/cvsowMbVE and /tmp/cvsYYeR4L differ