sync with crosswire 20020823-1300

12 files changed, 265 insertions, 279 deletions

diff --git a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
index 463e72a..102fb75 100644
--- a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
@@ -25,7 +25,7 @@ object DevOfTheDay2: TDevOfTheDay2
     Left = 0
     Top = 69
     Width = 419
-    Height = 230
+    Height = 231
     Align = alClient
     AutoSize = True
     BevelOuter = bvNone
@@ -35,7 +35,7 @@ object DevOfTheDay2: TDevOfTheDay2
       Left = 0
       Top = 0
       Width = 419
-      Height = 230
+      Height = 231
       Align = alClient
       BorderStyle = bsNone
       PlainText = True
@@ -46,15 +46,12 @@ object DevOfTheDay2: TDevOfTheDay2
   end
   object Panel3: TPanel
     Left = 0
-    Top = 299
+    Top = 300
     Width = 419
     Height = 41
     Align = alBottom
     BevelOuter = bvNone
     TabOrder = 1
-    DesignSize = (
-      419
-      41)
     object ckShowTip: TCheckBox
       Left = 8
       Top = 12
diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.bpr b/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.bpr
index 1059c12..cc61083 100644
--- a/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.bpr
@@ -51,7 +51,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=1
 MinorVer=5
-Release=3
+Release=4
 Build=0
 Debug=0
 PreRelease=0
@@ -64,13 +64,13 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=CrossWire Software & Bible Society
 FileDescription=The SWORD Project CD Installer
-FileVersion=1.5.3.0
+FileVersion=1.5.4.0
 InternalName=cdstartup
 LegalCopyright=(c) 2002 CrossWire Software under the GNU General Public License
 LegalTrademarks=
 OriginalFilename=
 ProductName=The SWORD Project
-ProductVersion=1.5.3
+ProductVersion=1.5.4
 Comments=Seek Him and you will find Him
 
 [HistoryLists\hlIncludePath]
@@ -100,11 +100,6 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
-[CORBA]
-AddServerUnit=1
-AddClientUnit=1
-PrecompiledHeaders=1
-
 [Language]
 ActiveLang=
 ProjectLang=
diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.res b/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.res
index e6b3991..9ff311a 100644
--- a/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.res
+++ b/apps/windoze/CBuilder5/BibleCS/cdstartup/cdstartup.res
diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp
index 843adef..1f51c39 100644
--- a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp
@@ -48,7 +48,7 @@ void __fastcall TForm1::BitBtn2Click(TObject *Sender)
 //---------------------------------------------------------------------------
 void __fastcall TForm1::FormShow(TObject *Sender)
 {
-//	AddFontResource("\\sword\\modules\\texts\\rawtext\\nu\\greek.ttf");
+	ShellExecute(this->Handle, "open", "fourlaws.html", NULL, NULL, SW_SHOWMAXIMIZED);
 }
 //---------------------------------------------------------------------------
 void __fastcall TForm1::BitBtn3Click(TObject *Sender)
diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm
index 6bb62ad..f79c4ae 100644
--- a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.dfm
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index efbe6f7..3f709f8 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -781,7 +781,9 @@ void TForm1::i12ize(const char *lang) {
 	Optionsfrm->HintPopups->Caption = _tr("Show Hint Pop-ups");
 	Optionsfrm->Label4->Caption = _tr("Language");
 	Optionsfrm->AutoLayout->Caption = _tr("Autosave Screen Layout");
-	Optionsfrm->HintStrongs->Caption = _tr("Show Hint Over Strongs Numbers");
+	Optionsfrm->HintStrongs->Caption = _tr("Show Lexicon Lookup Over Strongs Numbers");
+	Optionsfrm->HintVLists->Caption = _tr("Show Preview Over Verse Lists");
+	Optionsfrm->HintWords->Caption = _tr("Show Glossary Lookup Over Words");
 	Optionsfrm->OkBtn->Caption = _tr("OK");
 	Optionsfrm->CancelBtn->Caption = _tr("Cancel");
 	Optionsfrm->gbDefModules->Caption = _tr("Original Language Support - Default Modules");
@@ -792,9 +794,10 @@ void TForm1::i12ize(const char *lang) {
 	Optionsfrm->Label10->Caption = _tr("Strong's Numbered Text");
 	Optionsfrm->gbDevos->Caption = _tr("Daily Devotionals");
 	Optionsfrm->Label9->Caption = _tr("Default Devotional");
+	Optionsfrm->Label17->Caption = _tr("Default General Dictionary");
 	Optionsfrm->devSplashCB->Caption = _tr("Show Devotional Splash Screen on Startup");
 	Optionsfrm->devsAsDictsCB->Caption = _tr("Show Devotionals as Dictionaries");
-	Optionsfrm->gbGloss->Caption = _tr("Glossaries");
+	Optionsfrm->gbGloss->Caption = _tr("Glossaries / General Dictionaries");
 	Optionsfrm->glosAsDictsCB->Caption = _tr("Show Glossaries as Dictionaries");
 	Optionsfrm->gbColors->Caption = _tr("Display Colors");
 	Optionsfrm->Label2->Caption = _tr("Preview");
@@ -1981,7 +1984,7 @@ void TForm1::refreshAppearance() {
 	freeHandLookup->Color = fieldColor;
 	DictKeyEdit->Color    = fieldColor;
 
-	Form1->ShowHint = (optionsconf->Sections["Hints"].getWithDefault("On", "1") == "1");
+	Form1->ShowHint = (optionsconf->Sections["Hints"].getWithDefault("Hints", "true") != "false");
 	DefaultVSKey->setLocale(tmpval.c_str());
 	fillVKeySelector(DefaultVSKey);
 	TextKeyChanged();
@@ -2031,139 +2034,131 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
 	if (!Form1->Active)
 		return;
 		
-	ConfigEntMap::iterator eit;
-	string tmpval = optionsconf->Sections["HintStrongs"].getWithDefault("On", "1");
+	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");
 			
 	SWDispRTF *rtf = 0;
-	if (atoi(tmpval.c_str())) {
-		do {
-			ConfigEntMap::iterator eit;
+	do {
+		ConfigEntMap::iterator eit;
 
-			HintInfo.HideTimeout = 32000;
-			HintInfo.HintWindowClass = __classid(TRTFHintWindow);
-			HintInfo.CursorRect = lastRect;
-			HintStr = "";
+		HintInfo.HideTimeout = 32000;
+		HintInfo.HintWindowClass = __classid(TRTFHintWindow);
+		HintInfo.CursorRect = lastRect;
+		HintStr = "";
+
+		rtf = (SWDispRTF *)HintInfo.HintControl;
 
-			rtf = (SWDispRTF *)HintInfo.HintControl;
-
-			renderingHint = true;
-//			HintTimer->Enabled = false;
-//			HintTimer->Enabled = true;
-
-			if (!rtf->SelLength) {
-				SendMessage(rtf->Handle, WM_LBUTTONDOWN, MK_LBUTTON, MAKELONG(HintInfo.CursorPos.x, HintInfo.CursorPos.y));
-				selected = false;
-				targetWord = rtf->WordAtCursor();
-
-				int entrylen = strlen(rtf->Text.c_str());
-				char *entrytext = new char [ entrylen + 1 ];
-				int selstart = rtf->SelStart;
-				int versestart, verseend;
-				strcpy(entrytext, rtf->Text.c_str());
-		//		for (versestart = rtf->SelStart; ((versestart)&&(rtf->Text[versestart] != '#')); versestart--);
-				for (versestart = selstart; ((versestart)&&(entrytext[versestart] != '#')); versestart--);
-				if (versestart) {
-					for (verseend = versestart; ((verseend < entrylen) && (entrytext[verseend] != '|')); verseend++);
-					if ((verseend < entrylen) && (verseend > selstart)) {
-						int len = (verseend - versestart) + 1;
-						char *buf = new char [ len + 1 ];
-						memset(buf, 0 , len + 1);
-						strncpy(buf, &entrytext[versestart+1], len - 2);	// strip the # and | from the string
-						int buflen = strlen(buf);
-						for (int i = 0; i < buflen; i++) {
-							if ((buf[i] == 10) || (buf[i] == 13))
-								buf[i] = ' ';
-						}
-						verseList = buf;
-						delete [] buf;
+		renderingHint = true;
+
+		if (!rtf->SelLength) {
+			SendMessage(rtf->Handle, WM_LBUTTONDOWN, MK_LBUTTON, MAKELONG(HintInfo.CursorPos.x, HintInfo.CursorPos.y));
+			selected = false;
+			targetWord = rtf->WordAtCursor();
+
+			int entrylen = strlen(rtf->Text.c_str());
+			char *entrytext = new char [ entrylen + 1 ];
+			int selstart = rtf->SelStart;
+			int versestart, verseend;
+			strcpy(entrytext, rtf->Text.c_str());
+			for (versestart = selstart; ((versestart)&&(entrytext[versestart] != '#')); versestart--);
+			if (versestart) {
+				for (verseend = versestart; ((verseend < entrylen) && (entrytext[verseend] != '|')); verseend++);
+				if ((verseend < entrylen) && (verseend > selstart)) {
+					int len = (verseend - versestart) + 1;
+					char *buf = new char [ len + 1 ];
+					memset(buf, 0 , len + 1);
+					strncpy(buf, &entrytext[versestart+1], len - 2);	// strip the # and | from the string
+					int buflen = strlen(buf);
+					for (int i = 0; i < buflen; i++) {
+						if ((buf[i] == 10) || (buf[i] == 13))
+							buf[i] = ' ';
 					}
+					verseList = buf;
+					delete [] buf;
 				}
-				delete [] entrytext;
-			}
-			else {
-				selected = true;
-				targetWord = rtf->SelText;
 			}
+			delete [] entrytext;
+		}
+		else {
+			selected = true;
+			targetWord = rtf->SelText;
+		}
 			
 //			TPoint currentChar = rtf->GetCharPos(rtf->SelStart);
-			TPoint currentChar = rtf->ScreenToClient(Mouse->CursorPos);
-			HintInfo.CursorRect = TRect(TPoint(currentChar.x-15, currentChar.y-15), TPoint(currentChar.x+15, currentChar.y+15));
-			lastRect = HintInfo.CursorRect;
-
-		
-//				HintInfo.CursorRect = TRect(TPoint(currentChar.x-12, currentChar.y-12), TPoint(currentChar.x+12, currentChar.y+12));
-//				HintInfo.HideTimeout = 65000;
-//				HintInfo.ReshowTimeout = 2000;
-//				if (!rtf->SelLength) {
-//					rtf->SelLength = 1;
-			if (!selected) {
+		TPoint currentChar = rtf->ScreenToClient(Mouse->CursorPos);
+		HintInfo.CursorRect = TRect(TPoint(currentChar.x-15, currentChar.y-15), TPoint(currentChar.x+15, currentChar.y+15));
+		lastRect = HintInfo.CursorRect;
+
+		if (!selected) {
+			rtf->SelLength = 1;
+			if (rtf->SelAttributes->Link) {
+				link = true;
+				int saveStart = rtf->SelStart;
+				int last = -1;
+				while ((rtf->SelStart != last) && (rtf->SelAttributes->Link)) {
+					last = rtf->SelStart;
+					rtf->SelStart -= 1;
+					rtf->SelLength = 1;
+				}
+				int start = rtf->SelStart + 1;
+				rtf->SelStart++;
 				rtf->SelLength = 1;
-				if (rtf->SelAttributes->Link) {
-					link = true;
-					int saveStart = rtf->SelStart;
-					int last = -1;
-					while ((rtf->SelStart != last) && (rtf->SelAttributes->Link)) {
-						last = rtf->SelStart;
-						rtf->SelStart -= 1;
-						rtf->SelLength = 1;
-					}
-					int start = rtf->SelStart + 1;
-					rtf->SelStart++;
+				last = -1;
+				while ((rtf->SelStart != last) && (rtf->SelAttributes->Link)) {
+					last = rtf->SelStart;
+					rtf->SelStart += 1;
 					rtf->SelLength = 1;
-					last = -1;
-					while ((rtf->SelStart != last) && (rtf->SelAttributes->Link)) {
-						last = rtf->SelStart;
-						rtf->SelStart += 1;
-						rtf->SelLength = 1;
-					}
-					int len = (rtf->SelStart - start);
-					rtf->SelStart = saveStart;
-					verseList = rtf->GetTextRange(start, start+len);
 				}
-				rtf->SelLength = 0;
+				int len = (rtf->SelStart - start);
+				rtf->SelStart = saveStart;
+				verseList = rtf->GetTextRange(start, start+len);
 			}
-			else {
-				if (rtf->SelAttributes->Link) {
-					link = true;
-				}
+			rtf->SelLength = 0;
+		}
+		else {
+			if (rtf->SelAttributes->Link) {
+				link = true;
 			}
+		}
 
-			// use cache if same word
-			if (targetWord.Length() && (targetWord == lastWord) && (currentRTF == rtf)) {
-				HintStr = "reshow same text";
-				break;
-			}
-			currentRTF = rtf;
-			lastWord = targetWord;
+		// use cache if same word
+		if (targetWord.Length() && (targetWord == lastWord) && (currentRTF == rtf)) {
+			HintStr = "reshow same text";
+			break;
+		}
+		currentRTF = rtf;
+		lastWord = targetWord;
 			
-			// currently assume all links are verselists
-			if (verseList.Length()) {
-				ModMap::iterator it;
-				it = mainmgr->Modules.find(TextPageControl->ActivePage->Caption.c_str());
-				if (it != mainmgr->Modules.end()) {
-					SWModule *module = it->second;
-					ListKey verses = DefaultVSKey->ParseVerseList(verseList.c_str(), *DefaultVSKey, true);
-					if (verses.Count()) {
-						RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, true, true, "Popup");
-						HintStr = "show rtf";
-					}
-					else HintStr = "";
-					break;
+		// currently assume all links are verselists
+		if (verseList.Length() && hintVLists) {
+			ModMap::iterator it;
+			it = mainmgr->Modules.find(TextPageControl->ActivePage->Caption.c_str());
+			if (it != mainmgr->Modules.end()) {
+				SWModule *module = it->second;
+				ListKey verses = DefaultVSKey->ParseVerseList(verseList.c_str(), *DefaultVSKey, true);
+				if (verses.Count()) {
+					RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, true, true, "Popup");
+					HintStr = "show rtf";
 				}
+				else HintStr = "";
+				break;
 			}
+		}
 
-			// see if strongs number
+		// see if strongs number
+		if (hintStrongs) {
 			char preChar = (targetWord.Length()) ? targetWord[1] : 0;
-			targetWord = TrimJunk(targetWord);
+			WideString strongsWord = TrimJunk(targetWord);
 
 			// check if all digits (strongs)
 			int i;
-			for (i = 1; i <= targetWord.Length(); i++) {
-				if (!isdigit(targetWord[i]))
+			for (i = 1; i <= strongsWord.Length(); i++) {
+				if (!isdigit(strongsWord[i]))
 					break;
 			}
 
-			if ((i == targetWord.Length()+1) && (i-1)) {
+			if ((i == strongsWord.Length()+1) && (i-1)) {
 				String feature = (DefaultVSKey->Testament() == 1)?"Hebrew":"Greek";
 				feature += (preChar == '(')?"Parse":"Def";
 				if (!strncmp(HintInfo.HintControl->Name.c_str(), "TextRTFLXX", 10))
@@ -2175,54 +2170,43 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
 						HintStr = "";
 						break;
 					}
-					defMod->setKey(WideStringToUTF8(targetWord).c_str());
-					HintStr = defMod->RenderText();
-					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
-					RTFHintForm->rtfDrawer->module = defMod;
-					RTFHintForm->rtfDrawer->type = "Popup";
-					RTFHintForm->rtfDrawer->recalcAppearance();
-
-					if (HintStr.Length()) {
-						TMemoryStream *RTFStream = new TMemoryStream();
-						System::AnsiString newtext, tmptext;
-
-						newtext = RTFHintForm->rtfDrawer->RTFHeader;
-						newtext += RTFHintForm->rtfDrawer->RTFHeadMargin;
-						newtext += "\\pard \\nowidctlpar \\cf7\\f0 ";
-
-						tmptext = HintStr.c_str();
-						newtext += RTFHintForm->rtfDrawer->RTFVersePre + " " + tmptext + RTFHintForm->rtfDrawer->RTFVersePost;
-						newtext += RTFHintForm->rtfDrawer->RTFTrailer;
-						RTFStream->Clear();
-						RTFStream->WriteBuffer(newtext.c_str(), newtext.Length());
-						RTFStream->Position = 0;
-						RTFHintForm->rtfDrawer->Lines->LoadFromStream(RTFStream);
-						RTFHintForm->rtfDrawer->Repaint();
-	
-						delete RTFStream;
-						HintStr = "show rtf";
-						break;
-					}
+					ListKey key;
+					key << WideStringToUTF8(strongsWord).c_str();
+					RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, true, false, "Popup");
+					HintStr = "show rtf";
+					break;
 				}
 			}
-			HintStr = "";
-		} while (false);
-		if (!HintStr.Length()) {
+		}
+
+		// try looking up the word in a general dictionary
+		if (hintWords) {
+			string tmpval = optionsconf->Sections["ModDefaults"]["GeneralDict"];
+			if (tmpval.size()) {
+				SWModule *defMod = mainmgr->Modules[tmpval];
+				if (!defMod)
+					break;
+				ListKey key;
+				key << WideStringToUTF8(targetWord).c_str();
+				RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, true, false, "Popup");
+				HintStr = "show rtf";
+			}
+		}
+		HintStr = "";
+	} while (false);
+
+	if (!HintStr.Length()) {
 //			HintInfo = saveHintInfo;
-			HintInfo.HintWindowClass = __classid(THintWindow);
+		HintInfo.HintWindowClass = __classid(THintWindow);
 				
-			if (module)
-				HintStr = module->Description();
-			if (lastHint == HintStr)
-				HintStr = "";
-			lastHint = HintStr;
-			lastWord = "";
-		}
+		if (module)
+			HintStr = module->Description();
+		if (lastHint == HintStr)
+			HintStr = "";
 		lastHint = HintStr;
+		lastWord = "";
 	}
+	lastHint = HintStr;
 }
 //---------------------------------------------------------------------------
 
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
index ac5c69d..b1ebf3a 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
@@ -453,22 +453,14 @@ void __fastcall TOptionsfrm::btnModFontsClick(TObject *Sender)
 
 
 // TODO 1  -cOptions: add hint verselist preview toggle
-void __fastcall TOptionsfrm::HintStrongsClick(TObject *Sender)
-{
-	//In order for HintStrongs to work HintPopups has to be on
-	if(HintStrongs->Checked){
-    	HintPopups->Checked = true;
-    }
-
-}
-//---------------------------------------------------------------------------
 
 void __fastcall TOptionsfrm::HintPopupsClick(TObject *Sender)
 {
  	// If we turn off HintPopups we have to turn off HintStrongs
     // because HintStrongs will not work if hints are off
-	if(!HintPopups->Checked)
-    	HintStrongs->Checked = false;
+	HintStrongs->Enabled = HintPopups->Checked;
+	HintWords->Enabled   = HintPopups->Checked;
+	HintVLists->Enabled  = HintPopups->Checked;
 }
 //---------------------------------------------------------------------------
 
@@ -700,15 +692,18 @@ void TOptionsfrm::LoadMiscSettings(SWConfig* config) {
 
 	}
 
-	Optionsfrm->HintStrongs->Checked = true;
-	tmpval = ((eit = config->Sections["HintStrongs"].find("On")) != config->Sections["HintStrongs"].end())? (*eit).second : (string)"1";
-	if (!atoi(tmpval.c_str()))
-		Optionsfrm->HintStrongs->Checked = false;
+	tmpval = config->Sections["Hints"].getWithDefault("Hints", "true");
+	Optionsfrm->HintPopups->Checked = (tmpval != "false");
+
+	tmpval = config->Sections["Hints"].getWithDefault("Strongs", "true");
+	Optionsfrm->HintStrongs->Checked = (tmpval != "false");
+
+	tmpval = config->Sections["Hints"].getWithDefault("VLists", "true");
+	Optionsfrm->HintVLists->Checked = (tmpval != "false");
+
+	tmpval = config->Sections["Hints"].getWithDefault("Words", "true");
+	Optionsfrm->HintWords->Checked = (tmpval != "false");
 
-    Optionsfrm->HintPopups->Checked = true;
-	tmpval = ((eit = config->Sections["Hints"].find("On")) != config->Sections["Hints"].end())? (*eit).second : (string)"1";
-	if (!atoi(tmpval.c_str()))
-		Optionsfrm->HintPopups->Checked = false;
 
 	Optionsfrm->devsAsDictsCB->Checked = false;
 	tmpval = ((eit = config->Sections["General"].find("DevsAsDicts")) != config->Sections["General"].end())? (*eit).second : (string)"false";
@@ -835,9 +830,10 @@ void TOptionsfrm::extractSettings(SWConfig* config) {
 
 	config->Sections["Layout"]["AutoSaveLayout"] = IntToStr((Optionsfrm->AutoLayout->Checked)?1:0).c_str();
 
-	config->Sections["Hints"]["On"] = IntToStr((Optionsfrm->HintPopups->Checked)?1:0).c_str();
-
-	config->Sections["HintStrongs"]["On"] = IntToStr((Optionsfrm->HintStrongs->Checked)?1:0).c_str();
+	config->Sections["Hints"]["Hints"]   = (Optionsfrm->HintPopups->Checked) ? "true" : "false";
+	config->Sections["Hints"]["Strongs"] = (Optionsfrm->HintStrongs->Checked)? "true" : "false";
+	config->Sections["Hints"]["VLists"]  = (Optionsfrm->HintVLists->Checked) ? "true" : "false";
+	config->Sections["Hints"]["Words"]   = (Optionsfrm->HintWords->Checked)  ? "true" : "false";
 
 	emap = config->Sections["General"];
 	emap["TipOfTheDay"] = (Optionsfrm->devSplashCB->Checked)?"Devotional":"";
@@ -856,3 +852,4 @@ void __fastcall TOptionsfrm::shpNumClrMouseDown(TObject *Sender,
 //---------------------------------------------------------------------------
 
 
+
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
index 79b8fca..d10653b 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
@@ -1,10 +1,10 @@
 object Optionsfrm: TOptionsfrm

-  Left = 272

-  Top = 126

+  Left = 280

+  Top = 99

   BorderStyle = bsDialog

   Caption = 'Preferences'

   ClientHeight = 325

-  ClientWidth = 531

+  ClientWidth = 527

   Color = clBtnFace

   Font.Charset = DEFAULT_CHARSET

   Font.Color = clWindowText

@@ -46,16 +46,13 @@ object Optionsfrm: TOptionsfrm
   object Panel2: TPanel

     Left = 0

     Top = 284

-    Width = 531

+    Width = 527

     Height = 41

     Align = alBottom

     BevelOuter = bvNone

     TabOrder = 0

-    DesignSize = (

-      531

-      41)

     object OkBtn: TBitBtn

-      Left = 338

+      Left = 334

       Top = 9

       Width = 89

       Height = 25

@@ -64,7 +61,7 @@ object Optionsfrm: TOptionsfrm
       Kind = bkOK

     end

     object CancelBtn: TBitBtn

-      Left = 436

+      Left = 432

       Top = 9

       Width = 89

       Height = 25

@@ -76,18 +73,17 @@ object Optionsfrm: TOptionsfrm
   object PageControl1: TPageControl

     Left = 0

     Top = 0

-    Width = 531

+    Width = 527

     Height = 284

     ActivePage = TabSheet1

     Align = alClient

-    TabIndex = 0

     TabOrder = 1

     object TabSheet1: TTabSheet

       Caption = 'General'

       object Panel1: TPanel

         Left = 0

         Top = 0

-        Width = 523

+        Width = 519

         Height = 163

         Align = alTop

         BevelOuter = bvNone

@@ -95,17 +91,14 @@ object Optionsfrm: TOptionsfrm
         object gbPersonalize: TGroupBox

           Left = 0

           Top = 0

-          Width = 523

+          Width = 519

           Height = 163

           Align = alClient

           Caption = 'Personalize'

           TabOrder = 0

-          DesignSize = (

-            523

-            163)

           object Label4: TLabel

             Left = 7

-            Top = 79

+            Top = 103

             Width = 48

             Height = 13

             Caption = 'Language'

@@ -131,7 +124,7 @@ object Optionsfrm: TOptionsfrm
           end

           object HintPopups: TCheckBox

             Left = 248

-            Top = 36

+            Top = 12

             Width = 245

             Height = 13

             Hint = 

@@ -143,7 +136,7 @@ object Optionsfrm: TOptionsfrm
           end

           object localeCB: TComboBox

             Left = 94

-            Top = 76

+            Top = 100

             Width = 207

             Height = 21

             Hint = 

@@ -156,7 +149,7 @@ object Optionsfrm: TOptionsfrm
           object AutoLayout: TCheckBox

             Left = 7

             Top = 55

-            Width = 210

+            Width = 206

             Height = 17

             Hint = 'Saves the screen layout when the program exits'

             Anchors = [akLeft, akTop, akRight]

@@ -164,14 +157,29 @@ object Optionsfrm: TOptionsfrm
             TabOrder = 4

           end

           object HintStrongs: TCheckBox

-            Left = 248

-            Top = 17

-            Width = 245

+            Left = 268

+            Top = 29

+            Width = 241

             Height = 17

             Anchors = [akLeft, akTop, akRight]

-            Caption = 'Show Hint Over Strongs Numbers'

+            Caption = 'Show Lexicon Lookup Over Strongs Numbers'

             TabOrder = 5

-            OnClick = HintStrongsClick

+          end

+          object HintWords: TCheckBox

+            Left = 268

+            Top = 68

+            Width = 241

+            Height = 17

+            Caption = 'Show Glossary Lookup Over Words'

+            TabOrder = 6

+          end

+          object HintVLists: TCheckBox

+            Left = 268

+            Top = 48

+            Width = 241

+            Height = 17

+            Caption = 'Show Preview Over Verse Lists'

+            TabOrder = 7

           end

         end

       end

@@ -182,7 +190,7 @@ object Optionsfrm: TOptionsfrm
       object gbDefModules: TGroupBox

         Left = 0

         Top = 0

-        Width = 523

+        Width = 519

         Height = 105

         Align = alTop

         Caption = 'Original Language Support - Default Modules'

@@ -271,27 +279,24 @@ object Optionsfrm: TOptionsfrm
       object gbDevos: TGroupBox

         Left = 0

         Top = 105

-        Width = 301

+        Width = 277

         Height = 151

         Align = alLeft

         Anchors = [akLeft, akTop, akRight, akBottom]

         Caption = 'Daily Devotionals'

         TabOrder = 1

-        DesignSize = (

-          301

-          151)

         object Label9: TLabel

           Left = 8

           Top = 24

-          Width = 107

+          Width = 257

           Height = 21

           AutoSize = False

           Caption = 'Default Devotional'

         end

         object dailyDefaultCB: TComboBox

-          Left = 115

-          Top = 18

-          Width = 166

+          Left = 8

+          Top = 42

+          Width = 257

           Height = 21

           Style = csDropDownList

           ItemHeight = 13

@@ -299,8 +304,8 @@ object Optionsfrm: TOptionsfrm
         end

         object devSplashCB: TCheckBox

           Left = 8

-          Top = 48

-          Width = 283

+          Top = 72

+          Width = 259

           Height = 21

           Anchors = [akLeft, akTop, akRight]

           Caption = 'Show Devotional Splash Screen on Startup'

@@ -308,8 +313,8 @@ object Optionsfrm: TOptionsfrm
         end

         object devsAsDictsCB: TCheckBox

           Left = 8

-          Top = 64

-          Width = 283

+          Top = 88

+          Width = 259

           Height = 22

           Anchors = [akLeft, akTop, akRight]

           Caption = 'Show Devotionals as Dictionaries'

@@ -317,21 +322,38 @@ object Optionsfrm: TOptionsfrm
         end

       end

       object gbGloss: TGroupBox

-        Left = 305

+        Left = 280

         Top = 105

-        Width = 218

+        Width = 239

         Height = 151

         Align = alRight

-        Caption = 'Glossaries'

+        Caption = 'Glossaries / General Dictionaries'

         TabOrder = 2

+        object Label17: TLabel

+          Left = 8

+          Top = 24

+          Width = 221

+          Height = 21

+          AutoSize = False

+          Caption = 'Default General Dictionary'

+        end

         object glosAsDictsCB: TCheckBox

-          Left = 9

-          Top = 19

-          Width = 186

+          Left = 8

+          Top = 75

+          Width = 225

           Height = 13

           Caption = 'Show Glossaries as Dictionaries'

           TabOrder = 0

         end

+        object ComboBox1: TComboBox

+          Left = 8

+          Top = 42

+          Width = 225

+          Height = 21

+          Style = csDropDownList

+          ItemHeight = 13

+          TabOrder = 1

+        end

       end

     end

     object TabSheet3: TTabSheet

@@ -340,7 +362,7 @@ object Optionsfrm: TOptionsfrm
       object Panel3: TPanel

         Left = 0

         Top = 0

-        Width = 523

+        Width = 519

         Height = 256

         Align = alClient

         Anchors = [akLeft, akTop, akRight]

@@ -350,14 +372,11 @@ object Optionsfrm: TOptionsfrm
         object gbColors: TGroupBox

           Left = 0

           Top = 0

-          Width = 523

+          Width = 519

           Height = 256

           Align = alClient

           Caption = 'Display Colors'

           TabOrder = 0

-          DesignSize = (

-            523

-            256)

           object Label2: TLabel

             Left = 7

             Top = 17

@@ -387,7 +406,7 @@ object Optionsfrm: TOptionsfrm
             Caption = 'Entry Number Color'

           end

           object shpCurrVSClr: TShape

-            Left = 391

+            Left = 387

             Top = 114

             Width = 20

             Height = 16

@@ -410,7 +429,7 @@ object Optionsfrm: TOptionsfrm
             Caption = 'Combo/Edit Fields'

           end

           object btnSave: TSpeedButton

-            Left = 491

+            Left = 487

             Top = 27

             Width = 22

             Height = 22

@@ -451,7 +470,7 @@ object Optionsfrm: TOptionsfrm
             Caption = 'Strong'#39's Tense (...)'

           end

           object shpStrongClr: TShape

-            Left = 391

+            Left = 387

             Top = 172

             Width = 20

             Height = 16

@@ -460,7 +479,7 @@ object Optionsfrm: TOptionsfrm
             OnMouseDown = shpStrongClrMouseDown

           end

           object shpMorphClr: TShape

-            Left = 391

+            Left = 387

             Top = 201

             Width = 20

             Height = 16

@@ -469,7 +488,7 @@ object Optionsfrm: TOptionsfrm
             OnMouseDown = shpMorphClrMouseDown

           end

           object shpFieldClr: TShape

-            Left = 391

+            Left = 387

             Top = 143

             Width = 20

             Height = 16

@@ -478,7 +497,7 @@ object Optionsfrm: TOptionsfrm
             OnMouseDown = shpFieldClrMouseDown

           end

           object shpNumClr: TShape

-            Left = 391

+            Left = 387

             Top = 85

             Width = 20

             Height = 16

@@ -487,7 +506,7 @@ object Optionsfrm: TOptionsfrm
             OnMouseDown = shpNumClrMouseDown

           end

           object btnCurrVerse: TButton

-            Left = 421

+            Left = 417

             Top = 111

             Width = 96

             Height = 25

@@ -524,7 +543,7 @@ object Optionsfrm: TOptionsfrm
               'Search Results')

           end

           object btnFont: TButton

-            Left = 421

+            Left = 417

             Top = 54

             Width = 96

             Height = 25

@@ -545,7 +564,7 @@ object Optionsfrm: TOptionsfrm
             TabOrder = 3

           end

           object btnNumClr: TButton

-            Left = 421

+            Left = 417

             Top = 82

             Width = 96

             Height = 25

@@ -569,7 +588,7 @@ object Optionsfrm: TOptionsfrm
               'Midnight')

           end

           object btnFieldClr: TButton

-            Left = 421

+            Left = 417

             Top = 140

             Width = 96

             Height = 25

@@ -579,7 +598,7 @@ object Optionsfrm: TOptionsfrm
             OnClick = btnFieldClrClick

           end

           object btnModFonts: TButton

-            Left = 421

+            Left = 417

             Top = 227

             Width = 96

             Height = 25

@@ -589,7 +608,7 @@ object Optionsfrm: TOptionsfrm
             OnClick = btnModFontsClick

           end

           object btnStrongClr: TButton

-            Left = 421

+            Left = 417

             Top = 169

             Width = 96

             Height = 25

@@ -600,7 +619,7 @@ object Optionsfrm: TOptionsfrm
             OnClick = btnStrongClrClick

           end

           object btnMorphClr: TButton

-            Left = 421

+            Left = 417

             Top = 198

             Width = 96

             Height = 25

diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.h b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
index 8950722..9697758 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.h
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
@@ -95,6 +95,10 @@ __published:	// IDE-managed Components
 	TColorDialog *ColorDialogStrongs;
 	TColorDialog *ColorDialogMorph;
 	TShape *shpNumClr;
+	TCheckBox *HintWords;
+	TComboBox *ComboBox1;
+	TLabel *Label17;
+	TCheckBox *HintVLists;
 	void __fastcall btnCurrVerseClick(TObject *Sender);
 	void __fastcall FormCreate(TObject *Sender);
 	void __fastcall FormShow(TObject *Sender);
@@ -110,7 +114,6 @@ __published:	// IDE-managed Components
 	void __fastcall ImportClick(TObject *Sender);
 	void __fastcall DeleteClick(TObject *Sender);
 	void __fastcall btnModFontsClick(TObject *Sender);
-	void __fastcall HintStrongsClick(TObject *Sender);
 	void __fastcall HintPopupsClick(TObject *Sender);
 	void __fastcall btnStrongClrClick(TObject *Sender);
 	void __fastcall btnMorphClrClick(TObject *Sender);
diff --git a/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm b/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
index 26c21c6..c3b607f 100644
--- a/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
@@ -48,7 +48,7 @@ object searchForm: TsearchForm
     Left = 101

     Top = 0

     Width = 5

-    Height = 424

+    Height = 431

     Cursor = crHSplit

     Visible = False

   end

@@ -56,7 +56,7 @@ object searchForm: TsearchForm
     Left = 0

     Top = 0

     Width = 101

-    Height = 424

+    Height = 431

     Align = alLeft

     TabOrder = 0

     Visible = False

@@ -80,7 +80,7 @@ object searchForm: TsearchForm
       Left = 1

       Top = 25

       Width = 99

-      Height = 398

+      Height = 405

       Align = alClient

       Indent = 19

       TabOrder = 1

@@ -91,7 +91,7 @@ object searchForm: TsearchForm
     Left = 106

     Top = 0

     Width = 380

-    Height = 424

+    Height = 431

     Align = alClient

     BevelOuter = bvNone

     Caption = 'Panel7'

@@ -100,12 +100,12 @@ object searchForm: TsearchForm
       Left = 0

       Top = 204

       Width = 380

-      Height = 220

+      Height = 227

       Align = alClient

       TabOrder = 0

       object Splitter1: TSplitter

         Left = 1

-        Top = 101

+        Top = 108

         Width = 378

         Height = 5

         Cursor = crVSplit

@@ -114,7 +114,7 @@ object searchForm: TsearchForm
       end

       object plPreview: TPanel

         Left = 1

-        Top = 106

+        Top = 113

         Width = 378

         Height = 113

         Align = alBottom

@@ -124,7 +124,7 @@ object searchForm: TsearchForm
         Left = 1

         Top = 1

         Width = 378

-        Height = 100

+        Height = 107

         Hint = 'false'

         Align = alClient

         Columns = <

@@ -175,9 +175,6 @@ object searchForm: TsearchForm
         BevelOuter = bvNone

         Caption = 'Panel3'

         TabOrder = 0

-        DesignSize = (

-          380

-          33)

         object SearchTextOld: TComboBox

           Left = 0

           Top = 2

@@ -255,9 +252,6 @@ object searchForm: TsearchForm
           Align = alLeft

           Caption = 'Search Options'

           TabOrder = 1

-          DesignSize = (

-            132

-            70)

           object caseSensitiveCkBx: TCheckBox

             Left = 8

             Top = 16

@@ -348,9 +342,6 @@ object searchForm: TsearchForm
           BevelOuter = bvNone

           Caption = 'Panel11'

           TabOrder = 0

-          DesignSize = (

-            214

-            27)

           object ComboBox1: TComboBox

             Left = 4

             Top = 4

@@ -386,7 +377,7 @@ object searchForm: TsearchForm
   end

   object progressBar: TProgressBar

     Left = 0

-    Top = 424

+    Top = 431

     Width = 486

     Height = 16

     Align = alBottom

diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index a5665b0..15df3da 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,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="-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="-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)"/>
@@ -73,7 +73,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=5
 Release=3
-Build=108
+Build=109
 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.108
+FileVersion=1.5.3.109
 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
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index d5e7e15..54214a2 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res