aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp48
-rw-r--r--apps/windoze/CBuilder5/BibleCS/RxRichEditX.h1
-rw-r--r--apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm17
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.cpp32
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.dfm12
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.cpp18
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.dfm31
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.h2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.bpr20
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.resbin1980 -> 1980 bytes
-rw-r--r--apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp11
12 files changed, 110 insertions, 84 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index 0422970..c8eb0dd 100644
--- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
@@ -102,7 +102,7 @@ object AboutBox: TAboutBox
Width = 213
Height = 21
AutoSize = False
- Caption = 'v1.5.4betaY'
+ Caption = 'v1.5.4betaZ'
IsControl = True
end
object Copyright: TLabel
diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
index d09bac2..94fdf62 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
@@ -424,6 +424,8 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
string fontname;
TMemoryStream *RTFStream = new TMemoryStream();
System::AnsiString newtext, tmptext;
+ static UnicodeRTF filter;
+ char buf[255];
this->module = module;
this->type = type;
@@ -468,8 +470,14 @@ void TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool headin
if (!first)
newtext += "\\par\\par ";
newtext += RTFHeadingPre;
- newtext += module->KeyText();
- newtext += ":";
+
+ strcpy(buf, module->KeyText());
+ SWKey *key = *module;
+ // VerseKey locales are not yet UTF8, so don't try to convert them.
+ if (!SWDYNAMIC_CAST(VerseKey, key))
+ filter.ProcessText(buf, 253, *module, module);
+ newtext = newtext + RTFHeadingPre + buf + RTFHeadingPost + ":\\par ";
+
newtext += RTFHeadingPost;
newtext += "\\par ";
}
@@ -766,8 +774,8 @@ AnsiString TRxRichEditX::getType() {
}
-WideString __fastcall TRxRichEditX::GetText() {
- int MaxLen;
+long __fastcall TRxRichEditX::TextLen() {
+ long MaxLen;
if (RichEditVersion >= 2) {
TGetTextLengthEx TextLenEx;
@@ -777,6 +785,13 @@ WideString __fastcall TRxRichEditX::GetText() {
MaxLen = Perform(EM_GETTEXTLENGTHEX, (WPARAM)&TextLenEx, 0);
}
else MaxLen = GetTextLen();
+ return MaxLen;
+}
+
+
+WideString __fastcall TRxRichEditX::GetText() {
+ long MaxLen = TextLen();
+
wchar_t *buf = new wchar_t [ MaxLen + 2 ];
GETTEXTEX params;
params.cb = (MaxLen + 1) * sizeof(wchar_t);
@@ -830,16 +845,21 @@ WideString __fastcall TRxRichEditX::WordAtCursor(void) {
WideString Result = "";
if (HandleAllocated()) {
- Range.cpMax = SelStart;
- if (!Range.cpMax)
- Range.cpMin = 0;
- else if (SendMessage(Handle, EM_FINDWORDBREAK, WB_ISDELIMITER, Range.cpMax))
- Range.cpMin = SendMessage(Handle, EM_FINDWORDBREAK, WB_MOVEWORDLEFT, Range.cpMax);
- else Range.cpMin = SendMessage(Handle, EM_FINDWORDBREAK, WB_LEFT, Range.cpMax);
- while (SendMessage(Handle, EM_FINDWORDBREAK, WB_ISDELIMITER, Range.cpMin))
- Range.cpMin++;
- Range.cpMax = SendMessage(Handle, EM_FINDWORDBREAK, WB_RIGHTBREAK, Range.cpMax);
- Result = Trim(GetTextRange(Range.cpMin, Range.cpMax));
+ long max = TextLen() - 1;
+ for (int i = 0; (SelStart + i) < max; i++) {
+ Range.cpMax = SelStart + i;
+ if (!Range.cpMax)
+ Range.cpMin = 0;
+ else if (SendMessage(Handle, EM_FINDWORDBREAK, WB_ISDELIMITER, Range.cpMax))
+ Range.cpMin = SendMessage(Handle, EM_FINDWORDBREAK, WB_MOVEWORDLEFT, Range.cpMax);
+ else Range.cpMin = SendMessage(Handle, EM_FINDWORDBREAK, WB_LEFT, Range.cpMax);
+ while (SendMessage(Handle, EM_FINDWORDBREAK, WB_ISDELIMITER, Range.cpMin))
+ Range.cpMin++;
+ Range.cpMax = SendMessage(Handle, EM_FINDWORDBREAK, WB_RIGHTBREAK, Range.cpMax);
+ Result = Trim(GetTextRange(Range.cpMin, Range.cpMax));
+ if (Range.cpMax - Range.cpMin)
+ break;
+ }
}
return Result;
}
diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h
index 9d117fb..8afb652 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h
@@ -93,6 +93,7 @@ public:
AnsiString getType();
static WideString Trim(WideString &src);
WideString __fastcall GetText();
+ long __fastcall TextLen();
WideString __fastcall GetTextRange(int StartPos, int EndPos);
WideString __fastcall WordAtCursor(void);
};
diff --git a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
index 492df1b..e676f90 100644
--- a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
@@ -22,15 +22,12 @@ object ModuleFonts: TModuleFonts
TextHeight = 13
object Panel1: TPanel
Left = 0
- Top = 305
+ Top = 313
Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
- DesignSize = (
- 292
- 41)
object btnReset: TBitBtn
Left = 82
Top = 8
@@ -73,7 +70,7 @@ object ModuleFonts: TModuleFonts
Left = 0
Top = 0
Width = 292
- Height = 264
+ Height = 272
Align = alClient
BevelOuter = bvNone
Caption = 'Panel2'
@@ -104,7 +101,7 @@ object ModuleFonts: TModuleFonts
Left = 0
Top = 32
Width = 292
- Height = 232
+ Height = 240
Align = alClient
HideSelection = False
Indent = 19
@@ -115,19 +112,16 @@ object ModuleFonts: TModuleFonts
end
object Panel3: TPanel
Left = 0
- Top = 264
+ Top = 272
Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 2
- DesignSize = (
- 292
- 41)
object Label2: TLabel
Left = 7
Top = 8
- Width = 66
+ Width = 52
Height = 13
Anchors = [akLeft, akBottom]
Caption = 'Font Name'
@@ -157,7 +151,6 @@ object ModuleFonts: TModuleFonts
Height = 21
Anchors = [akRight, akBottom]
ItemHeight = 13
- ItemIndex = 4
TabOrder = 1
Text = '12'
OnChange = cmbSizeSelChange
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index 3f709f8..ccbc772 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -228,12 +228,18 @@ char TForm1::CreateCommentPane(SWModule *mod) {
char buf[1024];
SectionMap::iterator sit;
+ newtab->Caption = mod->Name();
+ newtab->Hint = mod->Description();
+ newtab->ParentShowHint = true;
+ newtab->PageControl = CommentaryPageControl;
+
if ((*mainmgr->config->Sections[mod->Name()].find("ModDrv")).second == "HREFCom") {
// if (mainmgr->config->Sections[mod->Name()]["External"] == "1") {
newrtf = new TPanel(this);
((TPanel *)newrtf)->Caption = "Syncronizing to External Viewer";
SWDisplay *disp = new DispExternal();
mod->Disp(*displays.insert(displays.begin(), disp));
+ newrtf->Parent = newtab;
/*
}
else {
@@ -269,17 +275,12 @@ char TForm1::CreateCommentPane(SWModule *mod) {
else ((SWDispRTF *)newrtf)->PopupMenu = PopupMenu2;
((SWDispRTF *)newrtf)->OnMouseDown = RTFMouseDown;
((SWDispRTF *)newrtf)->OnURLClick = RTFURLClick;
+ newrtf->Parent = newtab;
+ ((SWDispRTF *)newrtf)->module = mod;
+ ((SWDispRTF *)newrtf)->recalcAppearance();
}
-
- newtab->Caption = mod->Name();
- newtab->Hint = mod->Description();
- newtab->ParentShowHint = true;
- newtab->PageControl = CommentaryPageControl;
-
- newrtf->Parent = newtab;
newrtf->Align = alClient;
- ((SWDispRTF *)newrtf)->module = mod;
- ((SWDispRTF *)newrtf)->recalcAppearance();
+
mod->setKey(*DefaultVSKey);
return 0;
@@ -770,7 +771,7 @@ void TForm1::i12ize(const char *lang) {
NewBMfrm->CancelBtn->Caption = _tr("Cancel");
// OptionsForm
- /* TODO 2 -cLocalize : Change Module Type to Window Type here and in the localization files and get it updated by our local guys :) */
+ /* DONE 2 -cLocalize : Change Module Type to Window Type here and in the localization files and get it updated by our local guys :) */
Optionsfrm->Caption = _tr("Preferences");
Optionsfrm->TabSheet1->Caption = _tr("General");
Optionsfrm->TabSheet2->Caption = _tr("Special Modules");
@@ -1005,7 +1006,6 @@ void __fastcall TForm1::FormShow(TObject *Sender)
if (!stricmp(feature, "Glossary")) {
glossary = true;
}
- optionsconf->Save();
}
}
@@ -1023,7 +1023,12 @@ void __fastcall TForm1::FormShow(TObject *Sender)
(showDevos && devotional) ||
(showGlos && glossary))
CreateLDPane((*it).second);
+ Optionsfrm->genDictCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
+ if (optionsconf->Sections["ModDefaults"].find("GenDict") == optionsconf->Sections["ModDefaults"].end())
+ (*optionsconf)["ModDefaults"]["GenDict"] = it->second->Name();
}
+ optionsconf->Save();
+
}
layoutconf = new SWConfig("./layout.conf");
@@ -2036,7 +2041,7 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
bool hintStrongs = (optionsconf->Sections["Hints"].getWithDefault("Strongs", "true") != "false");
bool hintVLists = (optionsconf->Sections["Hints"].getWithDefault("VLists", "true") != "false");
- bool hintWords = (optionsconf->Sections["Hints"].getWithDefault("Words", "true") != "false");
+ bool hintWords = (optionsconf->Sections["Hints"].getWithDefault("Words", "false") == "true");
SWDispRTF *rtf = 0;
do {
@@ -2181,7 +2186,7 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
// try looking up the word in a general dictionary
if (hintWords) {
- string tmpval = optionsconf->Sections["ModDefaults"]["GeneralDict"];
+ string tmpval = optionsconf->Sections["ModDefaults"]["GenDict"];
if (tmpval.size()) {
SWModule *defMod = mainmgr->Modules[tmpval];
if (!defMod)
@@ -2190,6 +2195,7 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
key << WideStringToUTF8(targetWord).c_str();
RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, true, false, "Popup");
HintStr = "show rtf";
+ break;
}
}
HintStr = "";
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
index 2f74741..0688f42 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
@@ -142,7 +142,7 @@ object Form1: TForm1
Left = 0
Top = 287
Width = 678
- Height = 154
+ Height = 162
Align = alClient
BevelOuter = bvNone
Constraints.MinHeight = 10
@@ -153,7 +153,7 @@ object Form1: TForm1
Left = 488
Top = 0
Width = 5
- Height = 154
+ Height = 162
Cursor = crHSplit
Align = alRight
end
@@ -161,7 +161,7 @@ object Form1: TForm1
Left = 0
Top = 0
Width = 488
- Height = 154
+ Height = 162
Hint = 'Lexicons / Dictionaries'
Align = alClient
Font.Charset = ANSI_CHARSET
@@ -181,7 +181,7 @@ object Form1: TForm1
Left = 493
Top = 0
Width = 185
- Height = 154
+ Height = 162
Align = alRight
Caption = 'Panel2'
TabOrder = 1
@@ -203,7 +203,7 @@ object Form1: TForm1
Left = 1
Top = 25
Width = 183
- Height = 128
+ Height = 136
Align = alClient
ItemHeight = 13
TabOrder = 1
@@ -213,7 +213,7 @@ object Form1: TForm1
end
object StatusBar1: TStatusBar
Left = 0
- Top = 441
+ Top = 449
Width = 678
Height = 15
Panels = <>
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
index 8810f07..6fc16da 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
@@ -39,8 +39,8 @@ void __fastcall TOptionsfrm::btnCurrVerseClick(TObject *Sender)
//---------------------------------------------------------------------------
//DONE -oDavid 1 -cOptions: add per module font size selection
-//TODO 1 -cOptions: add 'general' dictionary besides strongs for lookups of words
-//TODO 1 -cOptions: add per module 'general' dictionary
+//DONE 1 -cOptions: add 'general' dictionary besides strongs for lookups of words
+//TODO 1 -cOptions: add Individual Modules per module 'general' dictionary selection and support so different dictionaries can be chosen for, say: Chinese and KJV and Thai, etc.
void __fastcall TOptionsfrm::FormCreate(TObject *Sender)
{
@@ -452,7 +452,7 @@ void __fastcall TOptionsfrm::btnModFontsClick(TObject *Sender)
-// TODO 1 -cOptions: add hint verselist preview toggle
+// DONE 1 -cOptions: add hint verselist preview toggle
void __fastcall TOptionsfrm::HintPopupsClick(TObject *Sender)
{
@@ -686,8 +686,8 @@ void TOptionsfrm::LoadMiscSettings(SWConfig* config) {
tmpval = config->Sections["Hints"].getWithDefault("VLists", "true");
Optionsfrm->HintVLists->Checked = (tmpval != "false");
- tmpval = config->Sections["Hints"].getWithDefault("Words", "true");
- Optionsfrm->HintWords->Checked = (tmpval != "false");
+ tmpval = config->Sections["Hints"].getWithDefault("Words", "false");
+ Optionsfrm->HintWords->Checked = (tmpval == "true");
Optionsfrm->devsAsDictsCB->Checked = false;
@@ -734,6 +734,11 @@ void TOptionsfrm::LoadMiscSettings(SWConfig* config) {
Optionsfrm->dailyDefaultCB->ItemIndex = Optionsfrm->dailyDefaultCB->Items->IndexOf(it->second->Description());
}
+ tmpval = ((eit = config->Sections["ModDefaults"].find("GenDict")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
+ if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
+ Optionsfrm->genDictCB->ItemIndex = Optionsfrm->genDictCB->Items->IndexOf(it->second->Description());
+ }
+
tmpval = ((eit = config->Sections["ModDefaults"].find("StrongsNumbers")) != config->Sections["ModDefaults"].end())? (*eit).second : (string)"";
if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) {
Optionsfrm->strongsNumsCB->ItemIndex = Optionsfrm->strongsNumsCB->Items->IndexOf(it->second->Description());
@@ -802,6 +807,9 @@ void TOptionsfrm::extractSettings(SWConfig* config) {
if (Optionsfrm->dailyDefaultCB->ItemIndex > -1) {
emap["DailyDevotion"] = (const char *)Optionsfrm->dailyDefaultCB->Items->Objects[Optionsfrm->dailyDefaultCB->ItemIndex];
}
+ if (Optionsfrm->genDictCB->ItemIndex > -1) {
+ emap["GenDict"] = (const char *)Optionsfrm->genDictCB->Items->Objects[Optionsfrm->genDictCB->ItemIndex];
+ }
if (Optionsfrm->strongsNumsCB->ItemIndex > -1) {
emap["StrongsNumbers"] = (const char *)Optionsfrm->strongsNumsCB->Items->Objects[Optionsfrm->strongsNumsCB->ItemIndex];
}
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
index 4f45b33..4a65636 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
@@ -51,9 +51,6 @@ object Optionsfrm: TOptionsfrm
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
- DesignSize = (
- 527
- 41)
object OkBtn: TBitBtn
Left = 334
Top = 9
@@ -78,9 +75,8 @@ object Optionsfrm: TOptionsfrm
Top = 0
Width = 527
Height = 284
- ActivePage = TabSheet3
+ ActivePage = TabSheet1
Align = alClient
- TabIndex = 2
TabOrder = 1
object TabSheet1: TTabSheet
Caption = 'General'
@@ -100,9 +96,6 @@ object Optionsfrm: TOptionsfrm
Align = alClient
Caption = 'Personalize'
TabOrder = 0
- DesignSize = (
- 519
- 163)
object Label4: TLabel
Left = 7
Top = 103
@@ -243,7 +236,7 @@ object Optionsfrm: TOptionsfrm
Width = 190
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 0
end
object greekDefCB: TComboBox
@@ -252,7 +245,7 @@ object Optionsfrm: TOptionsfrm
Width = 190
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 1
end
object greekParseCB: TComboBox
@@ -261,7 +254,7 @@ object Optionsfrm: TOptionsfrm
Width = 190
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 2
end
object hebrewParseCB: TComboBox
@@ -270,7 +263,7 @@ object Optionsfrm: TOptionsfrm
Width = 190
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 3
end
object strongsNumsCB: TComboBox
@@ -279,7 +272,7 @@ object Optionsfrm: TOptionsfrm
Width = 190
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 4
end
end
@@ -292,9 +285,6 @@ object Optionsfrm: TOptionsfrm
Anchors = [akLeft, akTop, akRight, akBottom]
Caption = 'Daily Devotionals'
TabOrder = 1
- DesignSize = (
- 277
- 151)
object Label9: TLabel
Left = 8
Top = 24
@@ -309,7 +299,7 @@ object Optionsfrm: TOptionsfrm
Width = 257
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 0
end
object devSplashCB: TCheckBox
@@ -355,13 +345,13 @@ object Optionsfrm: TOptionsfrm
Caption = 'Show Glossaries as Dictionaries'
TabOrder = 0
end
- object ComboBox1: TComboBox
+ object genDictCB: TComboBox
Left = 8
Top = 42
Width = 225
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 1
end
end
@@ -387,9 +377,6 @@ object Optionsfrm: TOptionsfrm
Align = alClient
Caption = 'Display Colors'
TabOrder = 0
- DesignSize = (
- 519
- 256)
object Label2: TLabel
Left = 7
Top = 17
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.h b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
index 9697758..b0a5caa 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.h
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
@@ -96,7 +96,7 @@ __published: // IDE-managed Components
TColorDialog *ColorDialogMorph;
TShape *shpNumClr;
TCheckBox *HintWords;
- TComboBox *ComboBox1;
+ TComboBox *genDictCB;
TLabel *Label17;
TCheckBox *HintVLists;
void __fastcall btnCurrVerseClick(TObject *Sender);
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index 15df3da..f9714bb 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_;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_"/>
<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,11 +55,11 @@
<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="-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"/>
+ <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"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -73,7 +73,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=5
Release=3
-Build=109
+Build=110
Debug=0
PreRelease=0
Special=0
@@ -85,13 +85,13 @@ CodePage=1252
[Version Info Keys]
CompanyName=CrossWire Software &amp; Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.3.109
+FileVersion=1.5.3.110
InternalName=biblecs
LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.4betaY
+ProductVersion=1.5.4betaZ
Comments=Seek Him and you will find Him
[HistoryLists\hlIncludePath]
@@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
Count=5
-Item0=_ICU_;_ICUSWORD_;_DEBUG
-Item1=_ICU_;_ICUSWORD_
+Item0=_ICU_;_ICUSWORD_
+Item1=_ICU_;_ICUSWORD_;_DEBUG
Item2=_ICU_
Item3=_ICU_;_DEBUG
Item4=_DEBUG
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index 54214a2..b149b8c 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/vrslstfrm.cpp b/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
index 48d0aa0..2af7961 100644
--- a/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp
@@ -8,6 +8,17 @@
#pragma resource "*.dfm"
TVerseListFrm *VerseListFrm;
//---------------------------------------------------------------------------
+
+//TODO: add toolbar
+//TODO: add print to toolbar that will call up print form and populate print range
+//TODO: add const char *ListKey::rangeToString() to ListKey to allow easy implementation of above
+//TODO: add const char *VerseKey::rangeToString() to VerseKey to allow easy implementation of above
+//TODO: add save to toolbar
+//TODO: add add current verse to toolbar
+//TODO: add edit entry to toolbar
+//TODO: add new verse list to mainfrm
+//TODO: add open verse list to mainfrm
+
__fastcall TVerseListFrm::TVerseListFrm(TComponent* Owner, ListKey &iVerseList)
: TForm(Owner), verseList(iVerseList) {
pvrtf = new SWDispRTF(this);
generated by cgit (git 2.34.1) at 2024-11-09 16:25:11 +0000