[sword-svn] r510 - in branches/BCB5: . TNGImage apps/InstallMgr apps/prototype clucene/src/CLucene/debug stage
scribe at crosswire.org
scribe at crosswire.org
Mon Jul 18 05:08:07 MST 2011
Author: scribe
Date: 2011-07-18 05:08:07 -0700 (Mon, 18 Jul 2011)
New Revision: 510
Modified:
branches/BCB5/AboutBoxfrm.dfm
branches/BCB5/PrintFrm.cpp
branches/BCB5/PrintFrm.dfm
branches/BCB5/PrintFrm.h
branches/BCB5/RangeMaintFrm.cpp
branches/BCB5/RangeMaintFrm.dfm
branches/BCB5/RxRichEditX.cpp
branches/BCB5/RxRichEditX.h
branches/BCB5/TNGImage/TNGImage.bpk
branches/BCB5/apps/InstallMgr/InstallManager.bpr
branches/BCB5/apps/InstallMgr/InstallManager.cpp
branches/BCB5/apps/InstallMgr/InstallManager.res
branches/BCB5/apps/InstallMgr/MainFrm.cpp
branches/BCB5/apps/InstallMgr/MainFrm.dfm
branches/BCB5/apps/InstallMgr/libcurl.bpr
branches/BCB5/apps/prototype/BookMarkPanel.cpp
branches/BCB5/apps/prototype/bookmarkfrm.cpp
branches/BCB5/apps/prototype/bookmarkfrm.dfm
branches/BCB5/apps/prototype/mainfrm.cpp
branches/BCB5/apps/prototype/mainfrm.dfm
branches/BCB5/biblecsmgr.cpp
branches/BCB5/bookmarkfrm.cpp
branches/BCB5/bookmarkfrm.dfm
branches/BCB5/clucene/src/CLucene/debug/condition.cpp
branches/BCB5/mainfrm.cpp
branches/BCB5/mainfrm.dfm
branches/BCB5/mainfrm.h
branches/BCB5/optionfrm.cpp
branches/BCB5/optionfrm.dfm
branches/BCB5/optionfrm.h
branches/BCB5/searchfrm.cpp
branches/BCB5/searchfrm.dfm
branches/BCB5/stage/layout.conf
branches/BCB5/stage/options.conf
branches/BCB5/sword.bpr
branches/BCB5/sword.res
branches/BCB5/swordprj.bpg
branches/BCB5/vrslstfrm.dfm
Log:
Latest work on a 1.6.x release.
Modified: branches/BCB5/AboutBoxfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/PrintFrm.cpp
===================================================================
--- branches/BCB5/PrintFrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/PrintFrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -359,24 +359,21 @@
StrKey testKey;
SavePrintPrefs();
ListKey lstKey;
- lstKey.Persist(1);
if(!radLD->Checked){
- VerseKey *vk = Form1->getActiveVerseKey();
- if (vk) {
+ VerseKey *vk = Form1->getActiveVerseKey();
+ if (vk) {
lstKey = vk->ParseVerseList(editStart->Text.c_str(),*vk, true);
- module->setKey(&lstKey);
rtfPrint->type = "PrintedPage";
- rtfPrint->RenderModule(module);
+ rtfPrint->RenderModule(module, lstKey);
module->setKey(vk);
- }
+ }
}
else{
testKey.setText(WideStringToUTF8(editStart->Text).c_str());
lstKey << testKey;
- module->setKey(&lstKey);
rtfPrint->type = "PrintedPage";
- rtfPrint->RenderModule(module);
+ rtfPrint->RenderModule(module, lstKey);
module->setKey(Form1->DefaultStrKey);
}
}
@@ -424,85 +421,85 @@
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "ChHead")];
if (tempVal == "")
ckChHead->Checked = true;
- else ckChHead->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckChHead->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Print Book Name? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType +"BkName")];
if (tempVal == "")
ckBookHead->Checked = true;
- else ckBookHead->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckBookHead->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Prefix Each Verse? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType +"PreFixTag")];
if (tempVal == "")
- ckPrefix->Checked = true;
- else ckPrefix->Checked = (atoi(tempVal.c_str())) ? true : false;
+ ckPrefix->Checked = false;
+ else ckPrefix->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Postfix Each Verse? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType +"PostFixTag")];
if (tempVal == "")
ckPostfix->Checked = true;
- else ckPostfix->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckPostfix->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Print the verse number? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "VSNum")];
if (tempVal == "")
ckVSNum->Checked = true;
- else ckVSNum->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckVSNum->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Superscript the verse number? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "SuperVS")];
if (tempVal == "")
ckSuperVS->Checked = true;
- else ckSuperVS->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckSuperVS->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Print as a paragraph? ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "Paragraph")];
if (tempVal == "")
ckParagraph->Checked = true;
- else ckParagraph->Checked = (atoi(tempVal.c_str())) ? true : false;
+ else ckParagraph->Checked = (strtol(tempVal.c_str(), 0, 10)) ? true : false;
//**** Chapter Heading Size ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "ChHeadSize")];
if (tempVal != "")
- spnHeading->Position = (atoi(tempVal.c_str()));
+ spnHeading->Position = (strtol(tempVal.c_str(), 0, 10));
//**** Body Text Size ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "FontSize")];
if (tempVal != "")
- spnBody->Position = (atoi(tempVal.c_str()));
+ spnBody->Position = (strtol(tempVal.c_str(), 0, 10));
//**** Verse Number Size ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][(modType + "VSNumSize")];
if (tempVal != "")
- spnNumbers->Position = (atoi(tempVal.c_str()));
+ spnNumbers->Position = (strtol(tempVal.c_str(), 0, 10));
//**** Left Margin ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][("LeftMargin")];
if (tempVal != ""){
- spnLeft->Position = GetSpinPos(atof(tempVal.c_str()));
- editLeft->Text = roundMargin(atof(tempVal.c_str()));
- }
+ spnLeft->Position = GetSpinPos(strtod(tempVal.c_str(), 0));
+ editLeft->Text = roundMargin(strtod(tempVal.c_str(), 0));
+ }
- //**** Right Margin ****//
+ //**** Right Margin ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][("RightMargin")];
if (tempVal != ""){
- spnRight->Position = GetSpinPos(atof(tempVal.c_str()));
- editRight->Text = roundMargin(atof(tempVal.c_str()));
+ spnRight->Position = GetSpinPos(strtod(tempVal.c_str(), 0));
+ editRight->Text = roundMargin(strtod(tempVal.c_str(), 0));
}
//**** Top Margin ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][("TopMargin")];
if (tempVal != ""){
- spnTop->Position = GetSpinPos(atof(tempVal.c_str()));
- editTop->Text = roundMargin(atof(tempVal.c_str()));
+ spnTop->Position = GetSpinPos(strtod(tempVal.c_str(), 0));
+ editTop->Text = roundMargin(strtod(tempVal.c_str(), 0));
}
//**** Bottom Margin ****//
tempVal = Form1->optionsconf->Sections["PrintedPage"][("BottomMargin")];
if (tempVal != ""){
- spnBottom->Position = GetSpinPos(atof(tempVal.c_str()));
- editBottom->Text = roundMargin(atof(tempVal.c_str()));
+ spnBottom->Position = GetSpinPos(strtod(tempVal.c_str(), 0));
+ editBottom->Text = roundMargin(strtod(tempVal.c_str(), 0));
}
//**** Font Name ****//
@@ -582,14 +579,18 @@
int inline TPrintForm::GetSpinPos(const float & value)
{
- return ((int)(roundMargin(value) / .05));
+ double rounded = roundMargin(value);
+ rounded = rounded / .05;
+ return ((int) rounded);
}
-float TPrintForm::roundMargin(float value)
+double TPrintForm::roundMargin(float value)
{
value *= 100; // Move the decimal right two positions
- int nVal = Ceil(value); // Round up
+ int nVal = Ceil(value); // Round up
if(nVal % 5)
- nVal = nVal - (nVal % 5) + 5;
- return nVal / 100.00; // Move decimal left two positions
+ nVal = nVal - (nVal % 5) + 5;
+ double retVal = nVal;
+ retVal = retVal / 100.00; // Move decimal left two positions
+ return retVal;
}
Modified: branches/BCB5/PrintFrm.dfm
===================================================================
--- branches/BCB5/PrintFrm.dfm 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/PrintFrm.dfm 2011-07-18 12:08:07 UTC (rev 510)
@@ -1,6 +1,6 @@
object PrintForm: TPrintForm
- Left = 253
- Top = 207
+ Left = 247
+ Top = 152
Width = 550
Height = 310
AutoSize = True
@@ -18,10 +18,10 @@
PixelsPerInch = 96
TextHeight = 13
object Panel1: TPanel
- Left = 450
+ Left = 442
Top = 0
Width = 92
- Height = 283
+ Height = 272
Align = alRight
BevelOuter = bvNone
TabOrder = 0
@@ -121,9 +121,9 @@
object PageControl1: TPageControl
Left = 0
Top = 0
- Width = 450
- Height = 283
- ActivePage = shtSelection
+ Width = 442
+ Height = 272
+ ActivePage = shtFormat
Align = alClient
TabOrder = 1
object shtSelection: TTabSheet
@@ -176,7 +176,7 @@
Top = 91
Width = 264
Height = 21
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 3
end
end
Modified: branches/BCB5/PrintFrm.h
===================================================================
--- branches/BCB5/PrintFrm.h 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/PrintFrm.h 2011-07-18 12:08:07 UTC (rev 510)
@@ -103,7 +103,7 @@
private:
void SavePrintPrefs();
int inline GetSpinPos(const float & value);
- float roundMargin(float value); // User declarations
+ double roundMargin(float value); // User declarations
public: // User declarations
TFontComboBox *cmbFont;
TRxRichEditX* rtfPrint;
Modified: branches/BCB5/RangeMaintFrm.cpp
===================================================================
--- branches/BCB5/RangeMaintFrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/RangeMaintFrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -6,6 +6,7 @@
#include "RangeMaintFrm.h"
#include <versekey.h>
#include <listkey.h>
+#include "mainfrm.h"
//---------------------------------------------------------------------------
#pragma package(smart_init)
#pragma resource "*.dfm"
@@ -20,7 +21,7 @@
void __fastcall TRangeMaintForm::FormShow(TObject *Sender)
{
ConfigEntMap::iterator loop, end;
- config = new SWConfig("./options.conf");
+ config = new SWConfig(TForm1::getDataRootPath()+"/BibleCS/options.conf");
ListBox1->Clear();
loop = config->Sections["CustomRanges"].begin();
end = config->Sections["CustomRanges"].end();
Modified: branches/BCB5/RangeMaintFrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/RxRichEditX.cpp
===================================================================
--- branches/BCB5/RxRichEditX.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/RxRichEditX.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -29,7 +29,7 @@
type = "Default";
}
-void TRxRichEditX::RenderModule(SWModule* module/*, RTF_FORMAT format*/)
+void TRxRichEditX::RenderModule(SWModule* module, SWKey &key/*, RTF_FORMAT format*/)
{
//format_ops = format;
this->module = module;
@@ -37,7 +37,7 @@
recalcAppearance();
AnsiString rtfText = RTFHeader;
rtfText += RTFHeadMargin;
- rtfText += GetFormattedText(module);
+ rtfText += GetFormattedText(module, key);
rtfText += RTFTrailer;
RTFStream->Clear();
RTFStream->WriteBuffer(rtfText.c_str(), rtfText.Length());
@@ -49,45 +49,47 @@
-AnsiString TRxRichEditX::GetFormattedText(SWModule* module)
+// TODO: This method seems to be build only for VerseKey modules. FIX
+AnsiString TRxRichEditX::GetFormattedText(SWModule* module, SWKey &key)
{
AnsiString rtfText = "";
- VerseKey key;
- int lastChap, lastBook;
- AnsiString bookName;
-
- key = (VerseKey)module->Key();
- lastChap = key.Chapter();
- lastBook = key.Book();
- bookName = (AnsiString)key.getText();
- bookName = bookName.SubString(0,bookName.Pos(lastChap) - 2);
-
+ VerseKey *vkey = 0;
+ int lastChap = 0, lastBook = 0;
+ AnsiString bookName = "";
+ module->setKey(key);
+ vkey = dynamic_cast<VerseKey *>(module->getKey());
+ if (vkey) {
+ lastChap = vkey->getChapter();
+ lastBook = vkey->getBook();
+ bookName = vkey->getBookName();
+ }
if(dispAttribs.prBookHeadings)
rtfText += BookHeading(module, bookName);
if(dispAttribs.prChHeadings)
rtfText += ChapterHeading(module, lastChap);
- for ((*module) = TOP; !module->Error(); (*module)++){
- key = (VerseKey)module->Key();
- if(key.Book() != lastBook){
+ for (key = TOP; !key.Error() && !module->Error(); key++) {
+ module->setKey(key);
+ vkey = dynamic_cast<VerseKey *>(module->getKey());
+ if (vkey && vkey->getBook() != lastBook) {
rtfText += "\\par\\par";
- bookName = (AnsiString)key.getText();
- bookName = bookName.SubString(0,bookName.Pos(key.Chapter()) - 2);
- if(dispAttribs.prBookHeadings)
+ bookName = vkey->getBookName();
+ if (dispAttribs.prBookHeadings) {
rtfText += BookHeading(module, bookName);
- lastBook = key.Book();
- lastChap = -1; // Reset the last Chapter since we could jump from Jude 1 to Revelation 1
+ }
+ lastBook = vkey->getBook();
+ lastChap = -1; // Reset the last Chapter since we could jump from Jude 1 to Revelation 1
}
- if(key.Chapter() != lastChap){
+ if (vkey && vkey->getChapter() != lastChap){
rtfText += "\\par";
- if(dispAttribs.prChHeadings)
- rtfText += ChapterHeading(module, key.Chapter());
- lastChap = key.Chapter();
+ if (dispAttribs.prChHeadings) {
+ rtfText += ChapterHeading(module, vkey->getChapter());
+ }
+ lastChap = vkey->getChapter();
}
- rtfText += PrintEntry(module, key.Verse());
+ rtfText += PrintEntry(module, (vkey) ? vkey->getVerse() : 0);
}
-
return rtfText;
}
@@ -312,13 +314,8 @@
newtext += "\\rtlpar ";
}
- verses->Persist(1);
(*verses) = TOP;
- SWKey *saveKey = (SWKey *)(*module);
- SWKey origKeyValue = *saveKey;
- if (!saveKey->Persist())
- saveKey = 0;
- module->setKey(verses);
+ SWKey origKeyValue = module->getKeyText();
if (introText) {
newtext += RTFHeadingPre;
@@ -329,9 +326,11 @@
SWKey *lastKey = 0;
bool first = true;
SWKey *testKey = module->CreateKey();
- while (verses->Count() && !module->Error() && newtext.Length() < 40000 ) {
+ bool isVerseKeyModule = (SWDYNAMIC_CAST(VerseKey, testKey));
+ while (verses->Count() && !module->Error() && !verses->Error() && newtext.Length() < 40000 ) {
+ module->setKey(*verses);
if (heading) {
- if (SWDYNAMIC_CAST(VerseKey, testKey)) {
+ if (isVerseKeyModule) {
if (lastKey != verses->GetElement()) {
if (!first)
newtext += "{\\par\\par}";
@@ -436,23 +435,25 @@
if (tmptext.Length() > 3) { // make sure we have an entry
if (module->Direction() == DIRECTION_RTL && (SWDispRTFChap::platformID == WIN9X || (module->Lang() && strnicmp(module->Lang(), "he", 2) && strnicmp(module->Lang(), "ar", 2) && strnicmp(module->Lang(), "fa", 2)))) {
newtext = newtext + RTFVersePre + tmptext + RTFVersePost;
- if (verseNum)
- newtext = newtext + RTFVerseMarkPre + IntToStr(VerseKey(module->KeyText()).Verse()) + RTFVerseMarkPost;
+ if (verseNum) {
+ int vnum = (isVerseKeyModule) ? ((VerseKey *)module->getKey())->getVerse() : VerseKey(module->KeyText()).getVerse();
+ newtext = newtext + RTFVerseMarkPre + IntToStr(vnum) + RTFVerseMarkPost;
+ }
newtext = newtext + "{\\par}";
}
else {
- if (verseNum)
- newtext = newtext + RTFVerseMarkPre + IntToStr(VerseKey(module->KeyText()).Verse()) + RTFVerseMarkPost;
+ if (verseNum) {
+ int vnum = (isVerseKeyModule) ? ((VerseKey *)module->getKey())->getVerse() : VerseKey(module->KeyText()).getVerse();
+ newtext = newtext + RTFVerseMarkPre + IntToStr(vnum) + RTFVerseMarkPost;
+ }
newtext = newtext + RTFVersePre + tmptext + RTFVersePost;
}
}
newtext = newtext + "}";
- (*module)++;
+ (*verses)++;
}
delete testKey;
- if (saveKey)
- module->setKey(saveKey);
- else module->setKey(origKeyValue); //remove our persist key
+ module->setKey(origKeyValue); //remove our persist key
newtext += RTFTrailer;
@@ -707,9 +708,9 @@
// build headers with proportional font sizes to single user selected
// font size.
- double fontBase = dispAttribs.fontSize;
- fontBase /= (double)4.0;
-
+ float fontBase = dispAttribs.fontSize;
+ fontBase /= 4.0f;
+
sprintf(buf,
"{\\fs%d \\par }}",
(int)(fontBase * 8));
Modified: branches/BCB5/RxRichEditX.h
===================================================================
--- branches/BCB5/RxRichEditX.h 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/RxRichEditX.h 2011-07-18 12:08:07 UTC (rev 510)
@@ -63,7 +63,7 @@
*/
class TRxRichEditX : public TRxRichEdit {
private:
- AnsiString GetFormattedText(SWModule* module);
+ AnsiString GetFormattedText(SWModule* module, SWKey &range);
AnsiString ChapterHeading(SWModule* module, int nChapter);
AnsiString BookHeading(SWModule* module, AnsiString name);
AnsiString PrintEntry(SWModule* module, int nVerse);
@@ -109,7 +109,7 @@
void fillWithRTFString(SWModule *module, const char *text, const char *type = "Default");
void getDisplayPrefs(DISP_ATTRIBS *attribs, SWModule *module);
void drawTo(HDC dc) { PaintControls(dc, 0); }
- void RenderModule(SWModule* module);
+ void RenderModule(SWModule* module, SWKey &range);
SWModule *module;
AnsiString type;
void recalcAppearance();
Modified: branches/BCB5/TNGImage/TNGImage.bpk
===================================================================
--- branches/BCB5/TNGImage/TNGImage.bpk 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/TNGImage/TNGImage.bpk 2011-07-18 12:08:07 UTC (rev 510)
@@ -21,7 +21,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TNGImage.cpp"/>
<INCLUDEPATH value="Package;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,11 +30,12 @@
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-IPackage -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c
+ -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -aa -Tpp -x -Gn -Gl -Gi"/>
+ <AFLAGS value="/mx /w2 /zi"/>
+ <LFLAGS value="-D"" -aa -Tpp -x -Gn -Gl -Gi -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
@@ -105,4 +106,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: branches/BCB5/apps/InstallMgr/InstallManager.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.bpr 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/InstallMgr/InstallManager.bpr 2011-07-18 12:08:07 UTC (rev 510)
@@ -6,15 +6,15 @@
<PROJECT value="..\..\stage\InstallManager.exe"/>
<OBJFILES value="InstallManager.obj MainFrm.obj StatusFrm.obj RemoteMntFrm.obj InfoFrm.obj
cipherfrm.obj UninstallFrm.obj ..\..\swwinlog.obj
- ..\..\..\sword\src\mgr\installmgr.obj UnsuFrm.obj"/>
+ ..\..\..\sword\src\mgr\installmgr.obj UnsuFrm.obj
+ ..\..\..\sword\src\mgr\ftplibftpt.obj ..\..\..\sword\src\utilfuns\ftplib.obj"/>
<RESFILES value="InstallManager.res"/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm
cipherfrm.dfm UninstallFrm.dfm UnsuFrm.dfm"/>
- <LIBFILES value="libcurl.lib curl\lib\ws2_32.lib
- ..\..\..\icu-sword\as_is\borland\icudatab.lib
+ <LIBFILES value="..\..\..\icu-sword\as_is\borland\icudatab.lib
..\..\..\sword\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib
..\..\..\icu-sword\as_is\borland\icuin.lib ..\..\clucene\clucene.lib"/>
<LIBRARIES value="NMFast50.lib vclx50.lib vcl50.lib"/>
@@ -22,18 +22,18 @@
<PACKAGES value="vcl50.bpi vclx50.bpi vcljpg50.bpi bcbsmp50.bpi qrpt50.bpi vcldb50.bpi
vclbde50.bpi ibsmp50.bpi vcldbx50.bpi teeui50.bpi teedb50.bpi tee50.bpi
nmfast50.bpi dclocx50.bpi"/>
- <PATHCPP value=".;..\..;..\..\..\sword\src\mgr"/>
+ <PATHCPP value=".;..\..;..\..\..\sword\src\mgr;..\..\..\sword\src\utilfuns"/>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY"/>
+ <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="InstallManager.cpp"/>
- <INCLUDEPATH value="curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="curl\lib;..\..\..\sword\src\mgr;..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\..\..\sword\src\utilfuns;curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\..\..\sword\src\utilfuns;curl\lib;..\..\..\sword\src\mgr;..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par -w-8027 -w-8026"/>
<WARNOPTSTR value=""/>
</MACROS>
@@ -41,17 +41,17 @@
<IDLCFLAGS value="-Icurl\lib -I..\..\..\sword\src\mgr -I..\.. -I..\..\..\sword\include
-Icurl\include -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -DVCL
-D_ICU_ -D_ICUSWORD_ -DCURLAVAILABLE -DUSBINARY -boa"/>
- <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8
- -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx
+ -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D"" -aa -Tpe -x -Gn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
+ <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
<ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+ <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -82,35 +82,37 @@
Comments=Seek Jesus who exchanges temporary for eternal
[HistoryLists\hlIncludePath]
-Count=14
-Item0=curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl
-Item1=curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;$(BCB)\include;$(BCB)\include\vcl
-Item2=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
-Item3=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
-Item4=curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
-Item5=..\..\..\mgr;..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item6=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item7=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item8=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item9=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Count=15
+Item0=..\..\..\sword\src\utilfuns;curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;curl\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=curl\lib;..\..\..\sword\src\mgr;..\..;..\..\..\sword\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item4=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item5=curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item6=..\..\..\mgr;..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item7=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item8=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item9=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item10=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item11=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item12=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item13=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item13=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item14=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
[HistoryLists\hlLibraryPath]
-Count=11
-Item0=curl\lib;..\..\..\sword\src\mgr;..\..;$(BCB)\lib\obj;$(BCB)\lib
-Item1=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\..\..\mgr;..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Count=12
+Item0=..\..\..\sword\src\utilfuns;curl\lib;..\..\..\sword\src\mgr;..\..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=curl\lib;..\..\..\sword\src\mgr;..\..;$(BCB)\lib\obj;$(BCB)\lib
+Item2=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\..\mgr;..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item7=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item8=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item9=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item10=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item10=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item11=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
Count=1
@@ -118,8 +120,8 @@
[HistoryLists\hlConditionals]
Count=12
-Item0=VCL;_ICU_;_ICUSWORD_;USBINARY
-Item1=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item0=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item1=VCL;_ICU_;_ICUSWORD_;USBINARY
Item2=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
Item3=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
Item4=VCL
@@ -152,7 +154,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
[Language]
ActiveLang=
Modified: branches/BCB5/apps/InstallMgr/InstallManager.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/InstallMgr/InstallManager.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -8,8 +8,6 @@
USEFORM("InfoFrm.cpp", InfoForm);
USEFORM("cipherfrm.cpp", CipherForm);
USEFORM("UninstallFrm.cpp", UninstallForm);
-USELIB("libcurl.lib");
-USELIB("curl\lib\ws2_32.lib");
USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
USEUNIT("..\..\swwinlog.cpp");
USEUNIT("..\..\..\sword\src\mgr\installmgr.cpp");
@@ -18,6 +16,8 @@
USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
USELIB("..\..\clucene\clucene.lib");
USEFORM("UnsuFrm.cpp", UnsuForm);
+USEUNIT("..\..\..\sword\src\mgr\ftplibftpt.cpp");
+USEUNIT("..\..\..\sword\src\utilfuns\ftplib.c");
//---------------------------------------------------------------------------
WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
{
Modified: branches/BCB5/apps/InstallMgr/InstallManager.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/InstallMgr/MainFrm.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/MainFrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/InstallMgr/MainFrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -852,6 +852,36 @@
// this still doesn't work because subdirs exist, but mods.d is the important one.
RemoveDirectory("./modules");
}
+
+
+// BibleCS Specific Stuff
+ if (FileMgr::existsDir("./bookmarks")) {
+ FileMgr::copyDir("./bookmarks", dataRootPath+"/bookmarks");
+ FileMgr::removeDir("./bookmarks");
+ RemoveDirectory("./bookmarks");
+ }
+ if (FileMgr::existsDir("./BibleCS")) {
+ FileMgr::copyDir("./BibleCS", dataRootPath+"/BibleCS");
+ FileMgr::removeDir("./BibleCS");
+ RemoveDirectory("./BibleCS");
+ }
+ if (FileMgr::existsFile("./options.conf")) {
+ FileMgr::copyFile("./options.conf", dataRootPath+"/BibleCS/options.conf");
+ FileMgr::removeFile("./options.conf");
+ }
+ if (FileMgr::existsFile("./layout.conf")) {
+ FileMgr::copyFile("./layout.conf", dataRootPath+"/BibleCS/layout.conf");
+ FileMgr::removeFile("./layout.conf");
+ }
+ if (FileMgr::existsFile("./userprefs.conf")) {
+ FileMgr::copyFile("./userprefs.conf", dataRootPath+"/BibleCS/userprefs.conf");
+ FileMgr::removeFile("./userprefs.conf");
+ }
+
+// --------------------------
+
+
+
manager = new SWMgr();
dataRootPath = manager->prefixPath;
Modified: branches/BCB5/apps/InstallMgr/MainFrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/InstallMgr/libcurl.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/libcurl.bpr 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/InstallMgr/libcurl.bpr 2011-07-18 12:08:07 UTC (rev 510)
@@ -31,7 +31,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="libcurl.bpf"/>
<INCLUDEPATH value="curl\curlcpp;curl\lib;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -42,9 +42,10 @@
<OPTIONS>
<IDLCFLAGS value="-Icurl\curlcpp -Icurl\lib -Icurl\include -I$(BCB)\include
-I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b-
+ -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P32"/>
</OPTIONS>
<LINKER>
@@ -119,7 +120,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
[Language]
ActiveLang=
Modified: branches/BCB5/apps/prototype/BookMarkPanel.cpp
===================================================================
--- branches/BCB5/apps/prototype/BookMarkPanel.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/prototype/BookMarkPanel.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -70,7 +70,7 @@
struct dirent *ent;
string conffile;
bmdir = "";
- SWConfig optionsconf("./options.conf");
+ SWConfig optionsconf(TForm1::getDataRootPath()+"/BibleCS/options.conf");
this->DragMode = dmAutomatic;
this->DragKind = dkDock;
@@ -88,8 +88,9 @@
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
// --------------------------------------------------------------------------
- if (bmdir == "")
- bmdir = "./bookmarks/";
+ if (bmdir == "") {
+ bmdir = TForm1::getDataRootPath() + "/bookmarks/";
+ }
if (access(bmdir.c_str(), 0)) { // directory does not exist
_mkdir(bmdir.c_str());
@@ -136,7 +137,7 @@
struct dirent *ent;
string conffile;
bmdir = "";
- SWConfig optionsconf("./options.conf");
+ SWConfig optionsconf(TForm1::getDataRootPath()+"/BibleCS/options.conf");
this->DragMode = dmAutomatic;
this->DragKind = dkDock;
@@ -163,8 +164,9 @@
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
// --------------------------------------------------------------------------
- if (bmdir == "")
- bmdir = "./bookmarks/";
+ if (bmdir == "") {
+ bmdir = Form1->getDataRootPath() + "/bookmarks/";
+ }
if (access(bmdir.c_str(), 0)) { // directory does not exist
_mkdir(bmdir.c_str());
@@ -284,7 +286,7 @@
bool personal, other;
list <String *>::iterator it;
string persfile;
- SWConfig optionsconf("./options.conf");
+ SWConfig optionsconf(TForm1::getDataRootPath()+"/BibleCS/options.conf");
if (bmtree->Items->Count)
tree = bmtree->Items->Item[0];
Modified: branches/BCB5/apps/prototype/bookmarkfrm.cpp
===================================================================
--- branches/BCB5/apps/prototype/bookmarkfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/prototype/bookmarkfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -35,8 +35,9 @@
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
// --------------------------------------------------------------------------
- if (bmdir == "")
- bmdir = "./bookmarks/";
+ if (bmdir == "") {
+ bmdir = Form1->getDataRootPath() + "/bookmarks/";
+ }
if (access(bmdir.c_str(), 0)) { // directory does not exist
_mkdir(bmdir.c_str());
Modified: branches/BCB5/apps/prototype/bookmarkfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/prototype/mainfrm.cpp
===================================================================
--- branches/BCB5/apps/prototype/mainfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/apps/prototype/mainfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -29,7 +29,7 @@
__fastcall TForm1::TForm1(TComponent* Owner)
: TForm(Owner)
{
- optionsconf = new SWConfig("./options.conf");
+ optionsconf = new SWConfig(TForm1::getDataRootPath()+"/BibleCS/options.conf");
Lookup->Text = "[ SWORD DDE Lookup ]";
Search->Text = "[ SWORD DDE Search ]";
@@ -337,7 +337,7 @@
if (SWLog::systemlog)
delete SWLog::systemlog;
SWLog::systemlog = new SWWinLog(this->Handle); // set the system logger to our MSWindows specific SWLog class
- layoutconf = new SWConfig("./layout.conf");
+ layoutconf = new SWConfig(getDataRootPath()+"/layout.conf");
if ((sit = layoutconf->Sections.find("Screen")) != layoutconf->Sections.end()) {
if (val = atoi((*sit).second["MainTop"].c_str()))
Modified: branches/BCB5/apps/prototype/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/biblecsmgr.cpp
===================================================================
--- branches/BCB5/biblecsmgr.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/biblecsmgr.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -8,6 +8,7 @@
#include <utf8bidireorder.h>
#include <utf8transliterator.h>
#endif
+#include "mainfrm.h"
using namespace std;
//---------------------------------------------------------------------------
BibleCSMGR::BibleCSMGR(TModInstFrm *iModInstFrm) : SWMgr(0, 0, false, new MarkupFilterMgr(FMT_RTF, ENC_RTF))
@@ -94,13 +95,13 @@
return retval;
}
-signed char BibleCSMGR::Load () {
+signed char BibleCSMGR::Load() {
signed char retval = SWMgr::Load();
#ifdef _ICU_
// optionFilters.insert(FilterMap::value_type("UTF8Transliterator", transliterator));
// options.push_back(transliterator->getOptionName());
#endif
- userPrefs = new SWConfig("./userprefs.conf");
+ userPrefs = new SWConfig(TForm1::getDataRootPath()+"/BibleCS/userprefs.conf");
applyUserPrefs();
return retval;
};
@@ -110,9 +111,9 @@
(*config) += (*userPrefs);
}
-void BibleCSMGR::AddGlobalOptions (SWModule * module, ConfigEntMap & section,
- ConfigEntMap::iterator start,
- ConfigEntMap::iterator end) {
+void BibleCSMGR::AddGlobalOptions(SWModule * module, ConfigEntMap & section,
+ ConfigEntMap::iterator start,
+ ConfigEntMap::iterator end) {
SWMgr::AddGlobalOptions(module, section, start, end);
#ifdef _ICU_
Modified: branches/BCB5/bookmarkfrm.cpp
===================================================================
--- branches/BCB5/bookmarkfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/bookmarkfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -35,8 +35,9 @@
// Add Personal Bookmarks first, or if they don't exist, ADD A BLANK BRANCH first in the tree
// --------------------------------------------------------------------------
- if (bmdir == "")
- bmdir = "./bookmarks/";
+ if (bmdir == "") {
+ bmdir = Form1->getDataRootPath() + "/bookmarks/";
+ }
if (access(bmdir.c_str(), 0)) { // directory does not exist
_mkdir(bmdir.c_str());
Modified: branches/BCB5/bookmarkfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/clucene/src/CLucene/debug/condition.cpp
===================================================================
--- branches/BCB5/clucene/src/CLucene/debug/condition.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/clucene/src/CLucene/debug/condition.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -76,5 +76,8 @@
_Cnd_OutDebug(M, StrTitle, File, Line, Title, Mes2, fatal);
}
+#else
+void __cnd_FormatDebug( const char* File, int32_t Line, int32_t Title, const char* Mes2, int32_t fatal ) {
+}
#endif
Modified: branches/BCB5/mainfrm.cpp
===================================================================
--- branches/BCB5/mainfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/mainfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -141,7 +141,7 @@
__fastcall TForm1::TForm1(TComponent* Owner)
: TForm(Owner)
{
- optionsconf = new SWConfig("./options.conf");
+ optionsconf = new SWConfig(TForm1::getDataRootPath()+"/BibleCS/options.conf");
// add our ui locale info to sword's system localemgr
LocaleMgr::getSystemLocaleMgr()->loadConfigDir("./uilocales.d");
@@ -457,26 +457,32 @@
else {
module = mainmgr->getModule(targetpc->ActivePage->Caption.c_str());
}
- return module;
+ return module;
}
VerseKey *TForm1::getActiveVerseKey(bool checkFocusChange) {
- static VerseKey *retVal = 0;
- if (checkFocusChange) {
- SWModule *module = getFocusedModule();
- SWKey *key = module->getKey();
- VerseKey *vk = SWDYNAMIC_CAST(VerseKey, key);
- if (vk) retVal = vk;
- }
- return retVal;
+
+ static VerseKey stupidKJVDefault;
+ static SWModule *lastVKMod = 0;
+ if (checkFocusChange) {
+ SWModule *module = getFocusedModule();
+ if (module) {
+ SWKey *key = module->getKey();
+ VerseKey *vk = SWDYNAMIC_CAST(VerseKey, key);
+ if (vk) {
+ lastVKMod = module;
+ }
+ }
+ }
+ return (lastVKMod) ? (VerseKey *)lastVKMod->getKey() : &stupidKJVDefault;
}
void TForm1::TextKeyChanged(VerseKey *vk)
{
if (!vk) vk = getActiveVerseKey();
- if (vk) {
+ if (vk) {
cbBook->ItemIndex = cbBook->Items->IndexOf(UTF8ToWideString(vk->getBookName()));
CHBox->Text = vk->Chapter();
VSBox->Text = vk->Verse();
@@ -492,7 +498,7 @@
void __fastcall TForm1::btnLookupClick(TObject *Sender)
{
VerseKey *vk = getActiveVerseKey();
- if (vk) {
+ if (vk) {
if (!(StrToInt(CHBox->Text)) || (!StrToInt(VSBox->Text)))
vk->AutoNormalize(0);
@@ -503,17 +509,16 @@
(*vk) = WideStringToUTF8((cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text)).c_str();
- if (vk->getVerse() < 1) {
- vk->setChapter(vk->getChapter()-1);
- if (vk->getChapter()) *vk = MAXVERSE;
- }
+ if (vk->getVerse() < 1) {
+ vk->setChapter(vk->getChapter()-1);
+ if (vk->getChapter()) *vk = MAXVERSE;
+ }
if (vk->getChapter() < 1) {
- vk->setBook(vk->getBook()-1);
- *vk = MAXCHAPTER;
- *vk = MAXVERSE;
- }
-
+ vk->setBook(vk->getBook()-1);
+ *vk = MAXCHAPTER;
+ *vk = MAXVERSE;
+ }
TextKeyChanged();
vk->AutoNormalize(1);
}
@@ -1102,7 +1107,7 @@
showLocked = false;
}
*/
- layoutconf = new SWConfig("./layout.conf");
+ layoutconf = new SWConfig(getDataRootPath()+"/BibleCS/layout.conf");
logmodstate = true;
freshdict = true;
@@ -1300,6 +1305,9 @@
}
}
}
+ else {
+ TextPageControl->ActivePageIndex = TextPageControl->PageCount - 1;
+ }
if ((eit = (*sit).second.find("LastComModule")) != (*sit).second.end()) {
for (int i = 0; i < CommentaryPageControl->PageCount; i++) {
if (!strcmp(CommentaryPageControl->Pages[i]->Caption.c_str(), (*eit).second.c_str())) {
@@ -1376,6 +1384,10 @@
refreshAppearance(vk);
}
}
+ else {
+ SWBuf locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
+ i12ize(locale.c_str());
+ }
}
void TForm1::updateModuleOptions(TMenuItem *parentItem, int staticMenuItemsCount) {
@@ -2341,10 +2353,9 @@
void TForm1::refreshAppearance(VerseKey *vk) {
ModMap::iterator it;
- SWBuf locale;
SWBuf tmpval;
- locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
+ SWBuf locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
/* TODO 5 -oDavid -cLocale : Just a note: Something weird happens here when there are no .conf files and it crashes. This is since Daniel added the TNT stuff. Maybe should look more into this later */
const char *loc = locale.c_str();
i12ize(loc);
@@ -2371,7 +2382,7 @@
DictKeyEdit->Color = fieldColor;
Form1->ShowHint = (optionsconf->Sections["Hints"].getWithDefault("Hints", "true") != "false");
- if (!vk) vk = getActiveVerseKey();
+ if (!vk) vk = getActiveVerseKey();
vk->setLocale(locale.c_str());
fillVKeySelector(vk);
TextKeyChanged(vk);
@@ -2650,7 +2661,7 @@
}
if (!link && (i >= strongsWord.Length()) && (i-1)) {
- VerseKey *vk = getActiveVerseKey();
+ VerseKey *vk = getActiveVerseKey();
String feature = (vk && (vk->Testament() == 1))?"Hebrew":"Greek";
feature += (preChar == '(')?"Parse":"Def";
if (!strncmp(HintInfo.HintControl->Name.c_str(), "TextRTFLXX", 10))
@@ -3087,4 +3098,20 @@
}
+SWBuf TForm1::getDataRootPath() {
+ SWBuf dataRootPath = ".";
+ if (!FileMgr::existsDir("./mods.d")) {
+ SWBuf envallusersdir = getenv("ALLUSERSPROFILE");
+ if (envallusersdir.length()) {
+ dataRootPath = envallusersdir;
+ if ((!dataRootPath.endsWith("\\")) && (!dataRootPath.endsWith("/")))
+ dataRootPath += "/";
+ dataRootPath += "Application Data/sword";
+ }
+ dataRootPath.replaceBytes("\\", '/');
+ }
+ // Let's be sure our app-specific folder exists
+ if (!FileMgr::existsDir(dataRootPath+"/BibleCS")) FileMgr::createParent(dataRootPath+"/BibleCS/layout.conf");
+ return dataRootPath;
+}
Modified: branches/BCB5/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/mainfrm.h
===================================================================
--- branches/BCB5/mainfrm.h 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/mainfrm.h 2011-07-18 12:08:07 UTC (rev 510)
@@ -406,6 +406,7 @@
SWDispRTF *currentRTF;
__fastcall TForm1(TComponent* Owner);
__fastcall ~TForm1();
+ static SWBuf getDataRootPath();
void __fastcall DisplayHint(TObject* Sender);
void RefreshActiveSheet(TPageControl *ts);
void TextKeyChanged(VerseKey *vk = 0); // updates dependents on TextKeyChanged
Modified: branches/BCB5/optionfrm.cpp
===================================================================
--- branches/BCB5/optionfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/optionfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -13,8 +13,12 @@
#include "mainfrm.h"
#include "TntSystem.hpp"
+namespace {
+ const SWBuf COLOR_DIR = TForm1::getDataRootPath()+"/BibleCS/colors/";
+ const SWBuf COLOR_EXT = ".sch";
+
+}
-
//---------------------------------------------------------------------------
#pragma link "TntButtons"
#pragma link "TntComCtrls"
@@ -173,7 +177,7 @@
void __fastcall TOptionsfrm::cmbSchemeSelectChange(TObject *Sender)
{
- AnsiString tempName = ExtractFilePath(Application->ExeName) + COLOR_DIR + cmbSchemeSelect->Text + COLOR_EXT;
+ SWBuf tempName = COLOR_DIR + cmbSchemeSelect->Text.c_str() + COLOR_EXT;
SWConfig schemesconf(tempName.c_str());
LoadDispSettings(&schemesconf);
UpdatePreview();
@@ -186,7 +190,7 @@
char buffTemp[512], buffFinal[512], font[64];
char* verse = "Why, my beloved brothers, let every man be swift to hear, slow to speak, slow to wrath";
int vsColorRed, vsColorGreen, vsColorBlue, numColorRed, numColorGreen, numColorBlue;
- int fontSize;
+ int fontSize = 20;
TMemoryStream * RTFStream = new TMemoryStream;
strcpy(buffFinal, "{\\rtf1\\ansi");
@@ -286,7 +290,7 @@
&& !strName.Pos("<") && !strName.Pos(">")
&& !strName.Pos("|")) {
- AnsiString strName = COLOR_DIR + cmbSchemeSelect->Text + COLOR_EXT;
+ SWBuf strName = COLOR_DIR + cmbSchemeSelect->Text.c_str() + COLOR_EXT;
SWConfig schemeconf(strName.c_str());
emap = schemeconf.Sections["Appearance"];
@@ -343,7 +347,7 @@
struct dirent *ent;
SWBuf conffile;
AnsiString strName;
- AnsiString strPath = COLOR_DIR;
+ SWBuf strPath = COLOR_DIR;
TStringList *schemeNames = new TStringList;
cmbSchemeSelect->Clear();
@@ -368,12 +372,12 @@
void __fastcall TOptionsfrm::ExportClick(TObject *Sender)
{
- AnsiString name = cmbSchemeSelect->Text;
- AnsiString newFileName;
- AnsiString exName;
- AnsiString subdir = ExtractFilePath(Application->ExeName) + COLOR_DIR;
+ SWBuf name = cmbSchemeSelect->Text.c_str();
+ SWBuf newFileName;
+ SWBuf exName;
+ SWBuf subdir = COLOR_DIR;
if(name != ""){
- SaveSchDlg->FileName = name;
+ SaveSchDlg->FileName = name.c_str();
if(SaveSchDlg->Execute()){
exName = subdir + name + COLOR_EXT;
newFileName = SaveSchDlg->FileName.c_str();
@@ -389,12 +393,12 @@
void __fastcall TOptionsfrm::ImportClick(TObject *Sender)
{
- AnsiString newFileName;
- AnsiString exName, newPath;
- AnsiString subdir = ExtractFilePath(Application->ExeName) + COLOR_DIR;
+ SWBuf newFileName;
+ SWBuf exName, newPath;
+ SWBuf subdir = COLOR_DIR;
if(OpenSchDlg->Execute()){
exName = OpenSchDlg->FileName.c_str();
- newFileName = ExtractFileName(exName);
+ newFileName = ExtractFileName(exName.c_str()).c_str();
newPath = subdir + newFileName;
if(!CopyFileA(exName.c_str(), newPath.c_str(),1))
MessageBoxW(0, _tr("Import Failed.") , _tr("Oops"), MB_OK);
@@ -406,8 +410,8 @@
void __fastcall TOptionsfrm::DeleteClick(TObject *Sender)
{
- AnsiString name = cmbSchemeSelect->Text;
- AnsiString fullName = ExtractFilePath(Application->ExeName) + COLOR_DIR + name + COLOR_EXT;
+ SWBuf name = cmbSchemeSelect->Text.c_str();
+ SWBuf fullName = COLOR_DIR + name + COLOR_EXT;
if(name != ""){
DeleteFile(fullName);
}else{
@@ -422,14 +426,14 @@
void TOptionsfrm::GetCurrentScheme()
{
- AnsiString tempName;
+ SWBuf tempName;
SWConfig *schemesconf;
SectionMap::iterator sit, oit;
SWConfig *optionsconf = dynamic_cast<TForm1*>(Application->MainForm)->optionsconf;
for(int count = 0; count < cmbSchemeSelect->Items->Count; count++)
{
- tempName = ExtractFilePath(Application->ExeName) + COLOR_DIR + cmbSchemeSelect->Items->Strings[count] + COLOR_EXT;
+ tempName = COLOR_DIR + cmbSchemeSelect->Items->Strings[count].c_str() + COLOR_EXT;
schemesconf = new SWConfig(tempName.c_str());
if( schemesconf->Sections["Appearance"]["CurrentVSColor"] == optionsconf->Sections["Appearance"]["CurrentVSColor"] &&
schemesconf->Sections["Appearance"]["VSNumberColor"] == optionsconf->Sections["Appearance"]["VSNumberColor"] &&
@@ -554,7 +558,7 @@
ColorDialogStrongs->Color = shpStrongClr->Brush->Color;
}
else {
- shpStrongClr->Brush->Color = TColor(16711935); // Magenta
+ shpStrongClr->Brush->Color = TColor(clNavy); //TColor(16711935); // Magenta
ColorDialogStrongs->Color = shpStrongClr->Brush->Color;
}
// Morph Color
Modified: branches/BCB5/optionfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/optionfrm.h
===================================================================
--- branches/BCB5/optionfrm.h 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/optionfrm.h 2011-07-18 12:08:07 UTC (rev 510)
@@ -18,9 +18,8 @@
#include "TntExtCtrls.hpp"
#include "TntMenus.hpp"
#include "TntStdCtrls.hpp"
+#include "mainfrm.h"
-const AnsiString COLOR_DIR = "colors\\";
-const AnsiString COLOR_EXT = ".sch";
//---------------------------------------------------------------------------
class TOptionsfrm : public TForm
Modified: branches/BCB5/searchfrm.cpp
===================================================================
--- branches/BCB5/searchfrm.cpp 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/searchfrm.cpp 2011-07-18 12:08:07 UTC (rev 510)
@@ -184,24 +184,16 @@
{
TListItem *pItem;
- SWKey *savekey = (SWKey *)*(parent->target);
- SWKey origKeyVal = *savekey;
- if (!savekey->Persist()) {
- savekey = 0;
- }
+ SWKey origKeyVal = parent->target->getKeyText();
for (results = TOP; !results.Error(); results++) {
parent->target->setKey(results);
pItem = parent->resultsLV->Items->Add();
pItem->Caption = UTF8Decode((const char *)results);
pItem->SubItems->Add("");
-// pItem->SubItems->Add((*parent->target).second->StripText());
-// pItem = resultsLV->Items->Add(
}
- if (savekey)
- parent->target->setKey(*savekey);
- else parent->target->setKey(origKeyVal); //remove our persist key
-
+ parent->target->setKey(origKeyVal);
+ Form1->getActiveVerseKey(true); // this is important; this clears the hold on our target's versekey which we just replaced in the lines above
// ListBox1->Items->Pack(); // so Count is set correctly (per helpfile)
AnsiString cap = ((AnsiString)parent->resultsLV->Items->Count + (AnsiString)" " + (AnsiString)((parent->resultsLV->Items->Count == 1) ? _tr("match") : _tr("matches"))) + (AnsiString)" from [ " + (AnsiString)parent->target->Description() + (AnsiString)" (" + (AnsiString)parent->target->Name() + (AnsiString)") ]";
parent->Caption = UTF8Decode(cap);
@@ -213,7 +205,7 @@
void __fastcall TsearchForm::TSearchThread::Execute()
{
results = parent->target->search(searchText.c_str(), searchType, searchOptions, scope, 0, searchProgressCallback, this);
-
+
// let's make some intuitive decisions on when to sort by score for clucene searches
bool sortByScore
= ((searchType == -4) // lucene
@@ -251,7 +243,7 @@
void TsearchForm::populateRanges() {
ConfigEntMap::iterator loop, end;
- SWConfig config("./options.conf");
+ SWConfig config(TForm1::getDataRootPath()+"/BibleCS/options.conf");
ComboBox1->Clear();
loop = config.Sections["CustomRanges"].begin();
end = config.Sections["CustomRanges"].end();
@@ -522,16 +514,26 @@
void __fastcall TsearchForm::toggleIndexBtnClick(TObject *Sender)
{
if (usingSearchFramework) {
- if (MessageBoxW(this->WindowHandle, _tr("Delete Index? Are you sure?"), _tr("Delete Index"), MB_YESNO) == IDYES)
+ if (MessageBoxW(this->WindowHandle, _tr("Delete Index? Are you sure?"), _tr("Delete Index"), MB_YESNO) == IDYES) {
target->deleteSearchFramework();
+ if (SearchText->Text.Length() > 6 && SearchText->Text.SubString(1, 6) == (WideString)"lemma:") {
+ SearchText->Text = (String)"<" + SearchText->Text.SubString(7, SearchText->Text.Length() - 6) + (String)">";
+ }
+ }
}
else {
progressBar->Hint = "Creating Search Framework";
target->createSearchFramework(searchFrameworkCreateCallback, this);
progressBar->Hint = "";
progressBar->Position = 0;
+ if (SearchText->Text.Length() > 3 && SearchText->Text.SubString(1, 1) == (WideString)"<" && SearchText->Text.SubString(SearchText->Text.Length(), 1) == (WideString)">") {
+ SearchText->Text = (String)"lemma:" + SearchText->Text.SubString(2, SearchText->Text.Length() - 2);
+ }
}
- setTarget(target);
+ // clear target before setting so default values for search option are setup
+ SWModule *itarget = target;
+ target = 0;
+ setTarget(itarget);
}
//---------------------------------------------------------------------------
Modified: branches/BCB5/searchfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/stage/layout.conf
===================================================================
--- branches/BCB5/stage/layout.conf 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/stage/layout.conf 2011-07-18 12:08:07 UTC (rev 510)
@@ -1,343 +1,80 @@
[CommentView]
-ABS_Essay_GoodSam_SWB=
-Abbott=
-Barnes=
-Clarke=
-DTN=
-DutKant=
-Family=
-Finney=
-Geneva=
-GerAugustinus=
-GerLutherpredigten=
-Heretics=
-Institutes=
JFB=
-Josephus=
Jub=
-Lightfoot=
-Luther=
-MAK=
-MHC=
-MHCC=
NETnotes=
NETnotesfree=
-NeeNormal=
-Orthodoxy=
-PNT=
Personal=
-Pilgrim=
-Practice=
RWP=
-Rieger=
-Scofield=
-Spurious=
-TDavid=
-TFG=
-TSK=
-Wesley=
[History]
-LastComModule=RWP
-LastLDKey=DAVID
-LastLDModule=ImageSampler
-LastParaMod01=ESV
-LastParaMod02=ASV
-LastParaMod03=NETtext
-LastTextModule=KJV
-LastVerse=Matthew 1:1
+LastComModule=JFB
+LastLDKey=
+LastLDModule=CBC
+LastParaMod01=
+LastParaMod02=
+LastParaMod03=
+LastTextModule=NASB
+LastVerse=Genesis 1:1
LookupSaveCount=5
-LookupText=Genesis 1:1
-LookupText=James 4:8
-LookupText=James 4:4
-LookupText=James 4.4
-LookupText=James 1:1
SearchSaveCount=5
-SearchText=God love* world
-SearchText=God love world
-SearchText=the sword
-SearchText=God love +world
-SearchText=kingdom
[LDView]
-2BabDict=
-AmTract=
CBC=
-ERaf_en=
-ERang_en=
-ERca_en=
-ERcy_en=
-ERda_en=
-ERde_en=
-ERen_af=
-ERen_ang=
-ERen_bs=
-ERen_ca=
-ERen_cs=
-ERen_da=
-ERen_de=
-ERen_el=
-ERen_es=
-ERen_fi=
-ERen_fr=
-ERen_fy=
-ERen_ga=
-ERen_gd=
-ERen_grc=
-ERen_haw=
-ERen_he=
-ERen_id=
-ERen_is=
-ERen_it=
-ERen_ja=
-ERen_ku=
-ERen_la=
-ERen_mi=
-ERen_ms=
-ERen_mt=
-ERen_nl=
-ERen_no=
-ERen_pap=
-ERen_po=
-ERen_pt=
-ERen_ro=
-ERen_ru=
-ERen_sk=
-ERen_sq=
-ERen_sv=
-ERen_sw=
-ERen_tl=
-ERen_tn=
-ERen_ty=
-ERen_xEBAR=
-ERen_xEITZ=
-ERen_xELMO=
-ERen_xESRN=
-ERen_yo=
-ERen_zh=
-ERen_zu=
-EReo_en=
-ERes_en=
-ERfi_en=
-ERfr_en=
-ERfy_en=
-ERga_en=
-ERgd_en=
-ERhu_en=
-ERid_en=
-ERis_en=
-ERit_en=
-ERja_en=
-ERku_en=
-ERla_en=
-ERms_en=
-ERnl_en=
-ERno_en=
-ERpap_en=
-ERpo_en=
-ERpt_en=
-ERro_en=
-ERru_en=
-ERsq_en=
-ERsv_en=
-ERsw_en=
-ERtl_en=
-ERtr_en=
-ERty_en=
-ERyo_en=
-ERzu_en=
-Easton=
-FDaf_en=
-FDda_en=
-FDen_af=
-FDen_da=
-FDen_de=
-FDen_es=
-FDen_fi=
-FDen_fr=
-FDen_it=
-FDen_nl=
-FDen_no=
-FDen_pt=
-FDen_sv=
-FDfi_en=
-FDla_en=
-FDpt_en=
-FDsv_en=
-GreekHebrew=
-HebrewGreek=
-Hitchcock=
ISBE=
ImageSampler=
-KJVD=
NasbGreek=
NasbHebrew=
-Nave=
-Packard=
Robinson=
-SAOA=
-SME=
-Smith=
StrongsGreek=
StrongsHebrew=
-TCR=
-Torrey=
-WebstersDict=
-ZhEnglish=
-ZhHanzi=
-ZhPinyin=
-br_en=
-en_eu=
-la_en=
[ModuleOptions]
-Cross-references=Off
+Cross-references=On
Footnotes=Off
-Headings=On
+Headings=Off
Hebrew Cantillation=Off
Hebrew Vowel Points=On
Morphological Tags=Off
Strong's Numbers=Off
Textual Variants=Primary Reading
Transliteration=Off
-Words of Christ in Red=On
+Words of Christ in Red=Off
[Screen]
-MainHeight=863
-MainLeft=30
-MainTop=94
-MainWidth=1092
+MainHeight=850
+MainLeft=175
+MainTop=175
+MainWidth=1440
Maximized=false
-SearchHeight=701
-SearchLeft=549
+SearchHeight=589
+SearchLeft=852
SearchMaximized=false
SearchResCol0Width=175
-SearchTop=51
-SearchWidth=809
-TextComHeight=529
-TextWidth=687
+SearchTop=139
+SearchWidth=562
+TextComHeight=320
+TextWidth=474
[TextView]
-AB=
-ACV=
-AKJV=
-ALT=
-ASV=true
-Afr1953=
-Alb=
-Aleppo=
+ASV=
AraSVD=
-BBE=
-BWE=
-Bulgarian=
-Byz=
-ChiNCVs=true
-ChiNCVt=true
-ChiUn=true
-ChiUns=true
-Common=
-Cro=
-CzeBKR=
-CzeCEP=
-CzeKMS=
-CzeNKB=
-DRA=
-DRC=
-Dan=
-Darby=
-Diaglott=
-DutSVV=
-EMTV=
-ESV=true
-Esperanto=
-Est=
+ChiNCVs=
+ChiNCVt=
+ChiUn=
+ChiUns=
+ESV=
FarTV=
FarsiOPV=
-FinBiblia=
-FinPR=
-FinPR92=
-FreCrl=
-FreLSG=
-GerElb=
-GerElb1871=
-GerLut=
-GerLut1545=
-GerNEU=true
-GerSch=
-GodsWord=
-GothicA=
-GothicB=
-HNV=
-HebModern=
-HunKar=
-ISV=
-Icelandic=
-ItaDio=
-ItaRive=
-JPS=
-JST=
-Jub=
-Jubilee2000=
-KJV=true
-KJVraw=true
-KLV=
-Kekchi=
-Korean=
-LITV=
-LO=
-LXX=
-Latvian=
+GerNEU=
+KJV=
LeningradV11N=
-Lithuanian=
-MKJV=
-ManxGaelic=
-Maori=
-Montgomery=
-Murdock=
-NASB=true
-NET=true
-NETfree=true
-NETtext=true
-Norsk=
-OrthJBC=
-PARALLEL=true
-Peshitta=
-PorAA=
-RKJNT=
-RNKJV=
-RST=
-RWebster=
-RomCor=
-Rotherham=
-RusMakarij=
-RusVZh=
-ScotsGaelic=
-SpaRV=
-SpaSEV=
-SpaVNT=
-Swahili=
-Swe1917=
-TR=true
-Tagalog=
-ThaiKJV=
-Tisch=
-Turkish=
-Twenty=
-Tyndale=
-UMGreek=
-Ukrainian=
-Uma=
-Viet=
-Vulgate=
-Vulgate_HebPs=
-WEB=
-WHNU=true
-WLC=true
-Webster=
-Weymouth=
-Wulfila=
-Wycliffe=
-Xhosa=
-YLT=
+NASB=
+NET=
+NETfree=
+NETtext=
+PARALLEL=
+TR=
+WHNU=
+WLC=
Modified: branches/BCB5/stage/options.conf
===================================================================
--- branches/BCB5/stage/options.conf 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/stage/options.conf 2011-07-18 12:08:07 UTC (rev 510)
@@ -1,20 +1,20 @@
[Appearance]
-AutoVSColor=1
-CommentBackColor=16777215
+AutoVSColor=
+CommentBackColor=
CommentBkName=
CommentChHead=
CommentChHeadSize=
-CommentFontColor=0
-CommentFontName=Times New Roman
-CommentFontSize=14
+CommentFontColor=
+CommentFontName=
+CommentFontSize=
CommentParagraph=
CommentPostFixTag=
CommentPreFixTag=
CommentSuperVS=
CommentVSNum=
CommentVSNumSize=
-CurrentVSColor=16711680
+CurrentVSColor=
DefaultBackColor=
DefaultBkName=
DefaultChHead=
@@ -28,139 +28,49 @@
DefaultSuperVS=
DefaultVSNum=
DefaultVSNumSize=
-FieldColor=16776960
-LDBackColor=16777215
+FieldColor=
+LDBackColor=
LDBkName=
LDChHead=
LDChHeadSize=
-LDFontColor=0
-LDFontName=Times New Roman
-LDFontSize=14
+LDFontColor=
+LDFontName=
+LDFontSize=
LDParagraph=
LDPostFixTag=
LDPreFixTag=
LDSuperVS=
LDVSNum=
LDVSNumSize=
-MorphColor=60534
-PopupBackColor=16777215
-PopupBkName=
-PopupChHead=
-PopupChHeadSize=
-PopupFontColor=0
-PopupFontName=Times New Roman
-PopupFontSize=14
-PopupParagraph=
-PopupPostFixTag=
-PopupPreFixTag=
-PopupSuperVS=
-PopupVSNum=
-PopupVSNumSize=
-SearchBackColor=16777215
-SearchBkName=
-SearchChHead=
-SearchChHeadSize=
-SearchFontColor=0
-SearchFontName=Times New Roman
-SearchFontSize=10
-SearchParagraph=
-SearchPostFixTag=
-SearchPreFixTag=
-SearchSuperVS=
-SearchVSNum=
-SearchVSNumSize=
-StrongsColor=16711935
-TextBackColor=16777215
+MorphColor=
+StrongsColor=
+TextBackColor=
TextBkName=
TextChHead=
TextChHeadSize=
-TextFontColor=0
-TextFontName=Times New Roman
-TextFontSize=14
+TextFontColor=
+TextFontName=
+TextFontSize=
TextParagraph=
TextPostFixTag=
TextPreFixTag=
TextSuperVS=
TextVSNum=
TextVSNumSize=
-UIBackColor=16777215
-UIFontColor=0
-UIFontName=Times New Roman
-UIFontSize=14
-VSNumberColor=16711680
-VerseNewLine=0
-locale=en_us
+VSNumberColor=
+VerseNewLine=
-[Bookmarks]
-AutoSaveOther=0
-AutoSavePersonal=1
-
-[CustomRanges]
-Gospels=Mat-John
-History=Jos-Est
-Letters/Epistles=Rom-Jude
-Moses/Pentateuch/Torah=Gen-Deu
-New Testament=mat-rev
-Old Testament=gen-mal
-Paul's Epistles=Rom-Phile;Heb
-Poetry and Wisdom=Job-Song; Lam
-Prophets=Isa-Mal
-
[General]
-DevsAsDicts=false
-GlosAsDicts=true
-TipOfTheDay=
+DevsAsDicts=
+GlosAsDicts=
-[Hints]
-Hints=true
-Strongs=true
-VLists=true
-Words=true
-
-[Layout]
-AutoSaveLayout=1
-
[ModDefaults]
-DailyDevotion=SME
-GenDict=ZhHanzi
-GreekDef=StrongsGreek
+GenDict=CBC
+GreekDef=NasbGreek
GreekParse=Robinson
-HebrewDef=StrongsHebrew
+HebrewDef=NasbHebrew
StrongsNumbers=ChiUn
-[PrintedPage]
-AutoVSColor=
-BottomMargin=0.75
-CurrentVSColor=
-FieldColor=
-Footer=Sivu &p/&t
-Header=&d
-LeftMargin=0.5
-MorphColor=
-PrnFooter=0
-PrnHeader=0
-RightMargin=0.5
-StrongsColor=
-TextBackColor=
-TextBkName=1
-TextChHead=1
-TextChHeadSize=16
-TextFontColor=
-TextFontName=Arial
-TextFontSize=12
-TextParagraph=1
-TextPostFixTag=1
-TextPreFixTag=1
-TextSuperVS=1
-TextVSNum=1
-TextVSNumSize=10
-TopMargin=0.5
-VSNumberColor=
-VerseNewLine=
-
-[Printing]
-Notice=1
-
[System]
-MaxFiles=30
+MaxFiles=
Modified: branches/BCB5/sword.bpr
===================================================================
--- branches/BCB5/sword.bpr 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/sword.bpr 2011-07-18 12:08:07 UTC (rev 510)
@@ -46,7 +46,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG;CURLAVAILABLE"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="..\sword\src\modules\filters;TntUnicodeControls.attic;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;..\sword\include\internal\regex;rxlib;TNGImage\Package;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -80,7 +80,7 @@
MajorVer=1
MinorVer=5
Release=11
-Build=12
+Build=19
Debug=0
PreRelease=0
Special=0
@@ -92,7 +92,7 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.5.11.12
+FileVersion=1.5.11.19
InternalName=biblecs
LegalCopyright=(c) 1990-2008 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
@@ -148,30 +148,33 @@
Item17=..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
-Count=3
-Item0=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\;D:\src\biblecs\clucene\src\CLucene\util\
-Item1=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\
-Item2=$(BCB)\source\vcl
+Count=4
+Item0=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\;D:\src\biblecs\clucene\src\CLucene\util\;E:\src\biblecs\clucene\src\CLucene\util\
+Item1=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\;D:\src\biblecs\clucene\src\CLucene\util\
+Item2=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\
+Item3=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=17
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG;CURLAVAILABLE
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
-Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
-Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
-Item5=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
-Item6=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
-Item7=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
-Item8=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
-Item9=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item10=_ICU_;_ICUSWORD_;USBINARY
-Item11=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
-Item12=_ICU_;_ICUSWORD_;_DEBUG
-Item13=_ICU_;_ICUSWORD_
-Item14=_ICU_
-Item15=_ICU_;_DEBUG
-Item16=_DEBUG
+Count=19
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
+Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG;CURLAVAILABLE
+Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item5=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
+Item6=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
+Item7=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
+Item8=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item9=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
+Item10=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
+Item11=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item12=_ICU_;_ICUSWORD_;USBINARY
+Item13=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
+Item14=_ICU_;_ICUSWORD_;_DEBUG
+Item15=_ICU_;_ICUSWORD_
+Item16=_ICU_
+Item17=_ICU_;_DEBUG
+Item18=_DEBUG
[HistoryLists\hlIntOutputDir]
Count=2
@@ -186,7 +189,7 @@
Item3=C:\sword\apps\windoze\CBuilder5\BibleCS\stage
[Debugging]
-DebugSourceDirs=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\;D:\src\biblecs\clucene\src\CLucene\util\
+DebugSourceDirs=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\;D:\src\biblecs\clucene\src\CLucene\util\;E:\src\biblecs\clucene\src\CLucene\util\
[Parameters]
RunParams=
Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/swordprj.bpg
===================================================================
--- branches/BCB5/swordprj.bpg 2010-11-02 18:01:09 UTC (rev 509)
+++ branches/BCB5/swordprj.bpg 2011-07-18 12:08:07 UTC (rev 510)
@@ -10,7 +10,7 @@
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
PROJECTS = icuuc.lib icuin.lib clucene.lib libsword.lib TntLibR.bpl \
- TNGImage.bpl sword.exe libcurl.lib InstallManager.exe
+ TNGImage.bpl sword.exe
#------------------------------------------------------------------------------
default: sword
#------------------------------------------------------------------------------
@@ -39,14 +39,6 @@
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-libcurl.lib: apps\InstallMgr\libcurl.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-InstallManager.exe: apps\InstallMgr\InstallManager.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
TNGImage.bpl: TNGImage\TNGImage.bpk
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
Modified: branches/BCB5/vrslstfrm.dfm
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list