aboutsummaryrefslogtreecommitdiffstats
path: root/apps/windoze
diff options
context:
space:
mode:
Diffstat (limited to 'apps/windoze')
-rw-r--r--apps/windoze/CBuilder1/mainform.cpp2
-rw-r--r--apps/windoze/CBuilder4/BibleCS/vrslstfrm.cpp2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm4
-rw-r--r--apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp42
-rw-r--r--apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm3
-rw-r--r--apps/windoze/CBuilder5/BibleCS/DevOfTheDay.h12
-rw-r--r--apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp8
-rw-r--r--apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp5
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.cpp85
-rw-r--r--apps/windoze/CBuilder5/BibleCS/searchfrm.cpp6
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.bpr22
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.resbin1980 -> 1980 bytes
-rw-r--r--apps/windoze/CBuilder5/BibleCS/swordlib.bpr16
-rw-r--r--apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp4
-rw-r--r--apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp4
-rw-r--r--apps/windoze/CBuilder5/prototype/mainfrm.cpp8
16 files changed, 123 insertions, 100 deletions
diff --git a/apps/windoze/CBuilder1/mainform.cpp b/apps/windoze/CBuilder1/mainform.cpp
index 0118d7b..1216329 100644
--- a/apps/windoze/CBuilder1/mainform.cpp
+++ b/apps/windoze/CBuilder1/mainform.cpp
@@ -14,7 +14,7 @@ __fastcall TForm1::TForm1(TComponent* Owner)
//---------------------------------------------------------------------------
void __fastcall TForm1::Button1Click(TObject *Sender)
{
- webster->SetKey(Edit1->Text.c_str());
+ webster->setKey(Edit1->Text.c_str());
Memo1->Text = webster->operator char*();
}
diff --git a/apps/windoze/CBuilder4/BibleCS/vrslstfrm.cpp b/apps/windoze/CBuilder4/BibleCS/vrslstfrm.cpp
index 0528c7f..77399c4 100644
--- a/apps/windoze/CBuilder4/BibleCS/vrslstfrm.cpp
+++ b/apps/windoze/CBuilder4/BibleCS/vrslstfrm.cpp
@@ -24,7 +24,7 @@ void __fastcall TVerseListFrm::ListBox1Click(TObject *Sender) {
target = Form1->mainmgr->Modules.find(Form1->PageControl1->ActivePage->Caption.c_str());
if (target != Form1->mainmgr->Modules.end()) {
SWKey *savekey = *(*target).second;
- (*target).second->SetKey(ListBox1->Items->Strings[ListBox1->ItemIndex].c_str());
+ (*target).second->setKey(ListBox1->Items->Strings[ListBox1->ItemIndex].c_str());
pvrtf->Display(*(*target).second);
(*target).second->SetKey(*savekey);
}
diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index 07cecd8..c0b9b7e 100644
--- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
@@ -1,6 +1,6 @@
object AboutBox: TAboutBox
- Left = 291
- Top = 107
+ Left = 283
+ Top = 112
BorderStyle = bsDialog
Caption = 'About The SWORD Project'
ClientHeight = 448
diff --git a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp
index d336056..e26f6ff 100644
--- a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp
@@ -3,6 +3,8 @@
#include <vcl.h>
#pragma hdrstop
+#include <swmgr.h>
+#include <listkey.h>
#include "DevOfTheDay.h"
#include "mainfrm.h"
//---------------------------------------------------------------------------
@@ -13,25 +15,41 @@ TDevOfTheDay2 *DevOfTheDay2;
__fastcall TDevOfTheDay2::TDevOfTheDay2(TComponent* Owner)
: TForm(Owner)
{
+ RichTipOld->Visible = false;
+ RichTip = new TRxRichEditX(this);
+ RichTip->Parent = Panel1;
+ RichTip->Align = alClient;
+ RichTip->ScrollBars = ssVertical;
+ RichTip->ReadOnly = true;
}
//---------------------------------------------------------------------------
void __fastcall TDevOfTheDay2::btnOKClick(TObject *Sender)
{
- DevOfTheDay2->Hide();
- ConfigEntMap emap;
- SWConfig * optionsconf;
- optionsconf = dynamic_cast<TForm1*>(Application->MainForm)->optionsconf;
- if(optionsconf)
- {
- emap = optionsconf->Sections["General"];
- emap.erase("TipOfTheDay");
- emap.insert(ConfigEntMap::value_type("TipOfTheDay", (DevOfTheDay2->ckShowTip->Checked) ? "Devotional" : ""));
- optionsconf->Sections["General"] = emap;
- optionsconf->Save();
- }
+ DevOfTheDay2->Hide();
+ if (Form1->optionsconf) {
+ Form1->optionsconf->Sections["General"]["TipOfTheDay"] = (DevOfTheDay2->ckShowTip->Checked) ? "Devotional" : "";
+ Form1->optionsconf->Save();
+ }
+}
+//---------------------------------------------------------------------------
+void __fastcall TDevOfTheDay2::FormShow(TObject *Sender)
+{
+ ModMap::iterator it;
+ ListKey key;
+ 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);
+ }
+ else DevOfTheDay2->RichTip->Text = "A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day.\n\nTo configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".\n\nVisit our website at www.crosswire.org for more information.";
+ // If no devotional text is shown then a general how-to is diplayed.
+
+ tmpval = Form1->optionsconf->Sections["General"]["TipOfTheDay"];
+ ckShowTip->Checked = (!stricmp(tmpval.c_str(), "Devotional"));
}
//---------------------------------------------------------------------------
diff --git a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
index 9c3f8b9..ac688d6 100644
--- a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
@@ -18,6 +18,7 @@ object DevOfTheDay2: TDevOfTheDay2
ParentBiDiMode = False
Position = poScreenCenter
Scaled = False
+ OnShow = FormShow
PixelsPerInch = 96
TextHeight = 13
object Panel1: TPanel
@@ -30,7 +31,7 @@ object DevOfTheDay2: TDevOfTheDay2
BevelOuter = bvNone
Caption = 'Panel1'
TabOrder = 0
- object RichTip: TRichEdit
+ object RichTipOld: TRichEdit
Left = 0
Top = 0
Width = 419
diff --git a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.h b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.h
index 267330a..4999813 100644
--- a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.h
+++ b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.h
@@ -10,22 +10,26 @@
#include <ComCtrls.hpp>
#include <ExtCtrls.hpp>
#include <Graphics.hpp>
+#include "rxricheditx.h"
+
//---------------------------------------------------------------------------
class TDevOfTheDay2 : public TForm
{
__published: // IDE-managed Components
- TRichEdit *RichTip;
- TPanel *Panel1;
+ TRichEdit *RichTipOld;
+ TPanel *Panel1;
TPanel *Panel3;
TCheckBox *ckShowTip;
TButton *btnOK;
TPanel *Panel4;
TImage *bmpDev;
TLabel *Label1;
- void __fastcall btnOKClick(TObject *Sender);
+ void __fastcall btnOKClick(TObject *Sender);
+ void __fastcall FormShow(TObject *Sender);
private: // User declarations
public: // User declarations
- __fastcall TDevOfTheDay2(TComponent* Owner);
+ TRxRichEditX *RichTip;
+ __fastcall TDevOfTheDay2(TComponent* Owner);
};
//---------------------------------------------------------------------------
extern PACKAGE TDevOfTheDay2 *DevOfTheDay2;
diff --git a/apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp b/apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp
index 9d6b85f..4c2252f 100644
--- a/apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/PrintFrm.cpp
@@ -368,16 +368,16 @@ void TPrintForm::PrepareRTF()
lstKey.Persist(1);
if(!radLD->Checked){
lstKey = VerseKey().ParseVerseList(editStart->Text.c_str(),*(Form1->DefaultVSKey), true);
- module->SetKey(&lstKey);
+ module->setKey(&lstKey);
rtfPrint->RenderModule(module, format);
- module->SetKey(Form1->DefaultVSKey);
+ module->setKey(Form1->DefaultVSKey);
}
else{
testKey.setText(WideStringToUTF8(editStart->Text).c_str());
lstKey << testKey;
- module->SetKey(&lstKey);
+ module->setKey(&lstKey);
rtfPrint->RenderModule(module, format);
- module->SetKey(Form1->DefaultStrKey);
+ module->setKey(Form1->DefaultStrKey);
}
}
diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
index 52876ab..58f0e80 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
@@ -445,7 +445,7 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
SWKey *saveKey = (*module);
if (!saveKey->Persist())
saveKey = 0;
- module->SetKey(verses);
+ module->setKey(verses);
SWKey *lastKey = 0;
bool first = true;
@@ -517,7 +517,8 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
}
if (saveKey)
- module->SetKey(saveKey);
+ module->setKey(saveKey);
+ else module->setKey(SWKey("")); //remove our persist key
newtext += RTFTrailer;
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index 3aee541..5d883ae 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -217,7 +217,7 @@ char TForm1::CreateTextPane(SWModule *mod, char *font) {
SWDisplay *disp = new RTFDisp(newrtf);
mod->Disp(disp);
displays.insert(displays.begin(), disp);
- mod->SetKey(*DefaultVSKey);
+ mod->setKey(*DefaultVSKey);
return 0;
}
@@ -281,7 +281,7 @@ char TForm1::CreateCommentPane(SWModule *mod, char* font) {
((SWDispRTF *)newrtf)->module = mod;
((SWDispRTF *)newrtf)->recalcAppearance();
- mod->SetKey(*DefaultVSKey);
+ mod->setKey(*DefaultVSKey);
return 0;
}
//---------------------------------------------------------------------------
@@ -307,6 +307,7 @@ char TForm1::CreateLDPane(SWModule *mod, char* font) {
newrtf->module = mod;
newrtf->recalcAppearance();
+/*
if ((sit = optionsconf->Sections.find("Appearance")) != optionsconf->Sections.end()) {
if ((*sit).second.find("LDBackColor") != (*sit).second.end()) {
lbDictKeys->Color = TColor((atoi((*(*sit).second.find("LDBackColor")).second.c_str())));
@@ -314,9 +315,10 @@ char TForm1::CreateLDPane(SWModule *mod, char* font) {
if ((*sit).second.find("LDFontColor") != (*sit).second.end())
lbDictKeys->Font->Color = TColor((atoi((*(*sit).second.find("LDFontColor")).second.c_str())));
}
+*/
SWDisplay *disp = new RTFDisp(newrtf);
mod->Disp(*displays.insert(displays.begin(), disp));
- mod->SetKey(*DefaultStrKey);
+ mod->setKey(*DefaultStrKey);
return 0;
}
//---------------------------------------------------------------------------
@@ -377,7 +379,7 @@ char TForm1::CreateBookPane(SWModule *mod, char* font) {
-// mod->SetKey(*DefaultVSKey);
+// mod->setKey(*DefaultVSKey);
return 0;
}
//---------------------------------------------------------------------------
@@ -488,6 +490,7 @@ void TForm1::FillDictKeys() {
index = lbDictKeys->Items->Count-1;
}
lbDictKeys->ItemIndex = index;
+ *DefaultStrKey = saveKey;
}
}
}
@@ -918,7 +921,6 @@ void __fastcall TForm1::FormShow(TObject *Sender)
string tmpval;
bool showDevos;
bool showGlos;
- bool showDevOfDay = false;
/*
showLocked = true;
@@ -981,21 +983,6 @@ void __fastcall TForm1::FormShow(TObject *Sender)
mainmgr = new BibleCSMGR(ModInstFrm);
// Load devotion and show form
- String devoKey = TDateTime::CurrentDate().FormatString("mm.dd");
- tmpval = ((eit = optionsconf->Sections["ModDefaults"].find("DailyDevotion")) != optionsconf->Sections["ModDefaults"].end())? (*eit).second : (string)"";
- if ((it = mainmgr->Modules.find(tmpval)) != mainmgr->Modules.end()) {
- it->second->SetKey(devoKey.c_str());
- DevOfTheDay2->RichTip->Text = it->second->StripText();
- }
- tmpval = ((eit = optionsconf->Sections["General"].find("TipOfTheDay")) != optionsconf->Sections["General"].end())? (*eit).second : (string)"";
- if (!stricmp(tmpval.c_str(), "Devotional")) {
- DevOfTheDay2->ckShowTip->Checked = true;
- showDevOfDay = true;
- }
- // If no devotional text is shown then a general how-to is diplayed.
- if(DevOfTheDay2->RichTip->Text == "")
- DevOfTheDay2->RichTip->Text = "A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day.\n\nTo configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".\n\nVisit our website at www.crosswire.org for more information.";
-
for (it = mainmgr->Modules.begin(); it != mainmgr->Modules.end(); it++) {
bool devotional = false;
@@ -1193,14 +1180,27 @@ void __fastcall TForm1::FormShow(TObject *Sender)
}
}
}
- if (this->Tag) {
+ if (this->Tag) {
NavigateVerseURL((char*)(this->Tag));
- }
+ }
else if ((eit = (*sit).second.find("LastVerse")) != (*sit).second.end()) {
freeHandLookup->Text = (*eit).second.c_str();
char ret = '\r';
freeHandLookupoldKeyPress(0, ret);
}
+
+ if ((eit = (*sit).second.find("LastLDModule")) != (*sit).second.end()) {
+ for (int i = 0; i < LexDictPageControl->PageCount; i++) {
+ if (!strcmp(LexDictPageControl->Pages[i]->Caption.c_str(), (*eit).second.c_str())) {
+ LexDictPageControl->ActivePageIndex = i;
+ break;
+ }
+ }
+ }
+ if ((eit = (*sit).second.find("LastLDKey")) != (*sit).second.end()) {
+ DictKeyEdit->Text = UTF8ToWideString((*eit).second.c_str());
+ }
+
}
ConfigEntMap *section;
@@ -1222,15 +1222,17 @@ void __fastcall TForm1::FormShow(TObject *Sender)
}
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
- }
- }
+ string heading = pc->Pages[i]->Caption.c_str();
+ pc->Pages[i]->TabVisible = !((*section)[heading.c_str()] == "false"); // !false allows default to be true
+ }
+ }
- SplashPg->Hide();
- if(showDevOfDay){
- DevOfTheDay2->Show();
- }
+ SplashPg->Hide();
+
+ tmpval = optionsconf->Sections["General"]["TipOfTheDay"];
+ if(!stricmp(tmpval.c_str(), "Devotional")) {
+ DevOfTheDay2->Show();
+ }
RefreshActiveSheet(LexDictPageControl);
RefreshActiveSheet(CommentaryPageControl);
RefreshActiveSheet(TextPageControl);
@@ -1263,7 +1265,7 @@ void __fastcall TForm1::LookupPokeData(TObject *Sender)
token = strtok(buf, " ");
if ((it = mainmgr->Modules.find(token)) != mainmgr->Modules.end()) {
token = strtok(NULL, "");
- (*it).second->SetKey(token);
+ (*it).second->setKey(token);
Lookup->Text = (const char *)(*(*it).second);
}
else Lookup->Text = "";
@@ -1325,7 +1327,7 @@ void TForm1::RestoreState(ModState *state)
if (it != mainmgr->Modules.end()) {
SWModule *module = it->second;
if (!strcmp(module->Type(0), "Generic Books")) {
- module->SetKey(state->key);
+ module->setKey(state->key);
}
else {
*DefaultVSKey = state->key;
@@ -2135,14 +2137,11 @@ void __fastcall TForm1::FormClose(TObject *Sender, TCloseAction &Action)
for (int loop = 0; ((loop < saveCount) && (loop < freeHandLookup->Items->Count)); loop++)
section.insert(ConfigEntMap::value_type("LookupText", freeHandLookup->Items->Strings[loop].c_str()));
- section.erase("LastVerse");
- section.insert(ConfigEntMap::value_type("LastVerse", (const char *)*DefaultVSKey));
-
- section.erase("LastTextModule");
- section.insert(ConfigEntMap::value_type("LastTextModule", TextPageControl->ActivePage->Caption.c_str()));
-
- section.erase("LastComModule");
- section.insert(ConfigEntMap::value_type("LastComModule", CommentaryPageControl->ActivePage->Caption.c_str()));
+ section["LastVerse"] = (const char *)*DefaultVSKey;
+ section["LastLDKey"] = WideStringToUTF8(DictKeyEdit->Text).c_str();
+ section["LastTextModule"] = TextPageControl->ActivePage->Caption.c_str();
+ section["LastComModule"] = CommentaryPageControl->ActivePage->Caption.c_str();
+ section["LastLDModule"] = LexDictPageControl->ActivePage->Caption.c_str();
layoutconf->Sections["History"] = section;
layoutconf->Save();
@@ -2205,7 +2204,7 @@ void __fastcall TForm1::HideShowModules1Click(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TForm1::DevotionaloftheDay1Click(TObject *Sender) {
- DevOfTheDay2->Show();
+ DevOfTheDay2->Show();
}
//---------------------------------------------------------------------------
@@ -2494,9 +2493,9 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
HintStr = "";
break;
}
- defMod->SetKey(WideStringToUTF8(targetWord).c_str());
+ defMod->setKey(WideStringToUTF8(targetWord).c_str());
HintStr = defMod->RenderText();
- defMod->SetKey(DefaultStrKey);
+ defMod->setKey(DefaultStrKey);
// Color attributes for the strongs portion of the hint are here.
// If the module uses it's own font load that else we will try the config file else we will use the default
diff --git a/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp b/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
index f661f7f..a0591d4 100644
--- a/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
@@ -36,7 +36,7 @@ __fastcall TsearchForm::TsearchForm(TComponent* Owner)
// }
// mod->Disp(*displays.insert(displays.begin(), new RTFDisp(newrtf)));
-// mod->SetKey(DefaultVSKey);
+// mod->setKey(DefaultVSKey);
// return 0;
target = 0;
}
@@ -177,14 +177,14 @@ void __fastcall TsearchForm::TSearchThread::FillListBox(void)
SWKey *savekey = (SWKey *)*(parent->target);
for (results = TOP; !results.Error(); results++) {
- parent->target->SetKey(results);
+ parent->target->setKey(results);
pItem = parent->resultsLV->Items->Add();
pItem->Caption = (const char *)results;
pItem->SubItems->Add("");
// pItem->SubItems->Add((*parent->target).second->StripText());
// pItem = resultsLV->Items->Add(
}
- parent->target->SetKey(*savekey);
+ parent->target->setKey(*savekey);
// ListBox1->Items->Pack(); // so Count is set correctly (per helpfile)
parent->Caption = ((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->searchBtn->Caption = _tr("Search");
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index 8d99df8..25df0e5 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -43,7 +43,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -55,16 +55,16 @@
<IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common
-I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include
-I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/>
- <CFLAG1 value="-O2 -Vx -Ve -RT- -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+ <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
+ <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.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]
@@ -73,7 +73,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=5
Release=3
-Build=103
+Build=104
Debug=0
PreRelease=0
Special=0
@@ -85,7 +85,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=CrossWire Software &amp; Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.3.103
+FileVersion=1.5.3.104
InternalName=biblecs
LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
@@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
Count=5
-Item0=_ICU_;_ICUSWORD_
-Item1=_ICU_;_ICUSWORD_;_DEBUG
+Item0=_ICU_;_ICUSWORD_;_DEBUG
+Item1=_ICU_;_ICUSWORD_
Item2=_ICU_
Item3=_ICU_;_DEBUG
Item4=_DEBUG
@@ -156,7 +156,7 @@ RemoteDebug=0
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
[Language]
ActiveLang=
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index 8aa7e8d..b748394 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
Binary files differ
diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
index 52ae339..7fd20ec 100644
--- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
@@ -78,7 +78,7 @@
<DEBUGLIBPATH value=""/>
<RELEASELIBPATH value=""/>
<LINKER value="TLib"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="swordlib.cpp"/>
<INCLUDEPATH value="..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -107,11 +107,11 @@
-I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr
-I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix
cpp -D_ICU_ -D_DEBUG"/>
- <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8
- -4 -b- -k- -vi -c -g0 -tWM"/>
- <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+ <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 -g0 -tWM"/>
+ <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P512"/>
</OPTIONS>
<LINKER>
@@ -159,8 +159,8 @@ Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..
[HistoryLists\hlConditionals]
Count=5
-Item0=_ICU_;_ICUSWORD_
-Item1=_ICU_;_ICUSWORD_;_DEBUG
+Item0=_ICU_;_ICUSWORD_;_DEBUG
+Item1=_ICU_;_ICUSWORD_
Item2=_ICU_
Item3=_ICU_;_DEBUG
Item4=_DEBUG
@@ -193,7 +193,7 @@ RemoteDebug=0
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=0
+LinkCGLIB=1
[Language]
ActiveLang=
diff --git a/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp b/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
index ac0f3b9..48d0aa0 100644
--- a/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
@@ -24,9 +24,9 @@ void __fastcall TVerseListFrm::ListBox1Click(TObject *Sender) {
target = Form1->mainmgr->Modules.find(Form1->TextPageControl->ActivePage->Caption.c_str());
if (target != Form1->mainmgr->Modules.end()) {
SWKey *savekey = *(*target).second;
- (*target).second->SetKey(ListBox1->Items->Strings[ListBox1->ItemIndex].c_str());
+ target->second->setKey(ListBox1->Items->Strings[ListBox1->ItemIndex].c_str());
pvrtf->Display(*(*target).second);
- (*target).second->SetKey(*savekey);
+ (*target).second->setKey(*savekey);
}
}
//---------------------------------------------------------------------------
diff --git a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
index 5b77797..1e6dd90 100644
--- a/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
+++ b/apps/windoze/CBuilder5/InstallMgr/cipherfrm.cpp
@@ -32,9 +32,9 @@ void __fastcall TCipherForm::Button2Click(TObject *Sender)
modconf = 0;
SWMgr *mgr = new SWMgr();
SWModule *mod = mgr->Modules[modName];
- mod->SetKey("Ipet 2:12");
+ mod->setKey("Ipet 2:12");
tmpBuf = mod->StripText();
- mod->SetKey("gen 1:10");
+ mod->setKey("gen 1:10");
tmpBuf += "\r\n\r\n";
tmpBuf += mod->StripText();
Memo1->Text = tmpBuf.c_str();
diff --git a/apps/windoze/CBuilder5/prototype/mainfrm.cpp b/apps/windoze/CBuilder5/prototype/mainfrm.cpp
index cfe753e..05674cf 100644
--- a/apps/windoze/CBuilder5/prototype/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/prototype/mainfrm.cpp
@@ -112,7 +112,7 @@ char TForm1::CreateTextPane(SWModule *mod, char *font) {
}
mod->Disp(*displays.insert(displays.begin(), new RTFDisp(newrtf)));
- mod->SetKey(DefaultVSKey);
+ mod->setKey(DefaultVSKey);
*/
return 0;
}
@@ -157,7 +157,7 @@ char TForm1::CreateCommentPane(SWModule *mod) {
newrtf->Parent = newtab;
newrtf->Align = alClient;
- mod->SetKey(DefaultVSKey);
+ mod->setKey(DefaultVSKey);
return 0;
}
//---------------------------------------------------------------------------
@@ -176,7 +176,7 @@ char TForm1::CreateLDPane(SWModule *mod) {
newrtf->OnMouseDown = RTFMouseDown;
mod->Disp(*displays.insert(displays.begin(), new RTFDisp(newrtf)));
- mod->SetKey(DefaultStrKey);
+ mod->setKey(DefaultStrKey);
return 0;
}
//---------------------------------------------------------------------------
@@ -398,7 +398,7 @@ void __fastcall TForm1::LookupPokeData(TObject *Sender)
token = strtok(buf, " ");
if ((it = mainmgr->Modules.find(token)) != mainmgr->Modules.end()) {
token = strtok(NULL, "");
- (*it).second->SetKey(token);
+ it->second->setKey(token);
Lookup->Text = (const char *)(*(*it).second);
}
else Lookup->Text = "";
generated by cgit (git 2.34.1) at 2024-09-19 22:20:07 +0000