sync with crosswire 20021004-1300

7 files changed, 30 insertions, 5 deletions

diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index 95f51fc..6863fa0 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.4'

+      Caption = 'v1.5.4a'

       IsControl = True

     end

     object Copyright: TLabel

diff --git a/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/cdstartup/mainfrm.cpp
index 1f51c39..614598c 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)
 {
-	ShellExecute(this->Handle, "open", "fourlaws.html", NULL, NULL, SW_SHOWMAXIMIZED);
+	ShellExecute(this->Handle, "open", "tract.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 f79c4ae..db60376 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 79fcb8a..bc54534 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -972,6 +972,25 @@ void __fastcall TForm1::FormShow(TObject *Sender)
 		bool devotional = false;
 		bool glossary = false;
 
+		const char *check;
+		for (check = it->first.c_str(); *check; check++) {
+			if ((*check >= 'a') && (*check <= 'z'))
+				continue;
+			if ((*check >= 'A') && (*check <= 'Z'))
+				continue;
+			if ((*check >= '0') && (*check <= '9'))
+				continue;
+			if ((*check == ' ') || (*check == '_'))
+				continue;
+			break;
+		}
+		if (*check) {
+			char buf[2047];
+			sprintf(buf, "Module Name: (%s) is unsupported and the module must be upgraded or removed.  You may be able to merely modify the [name] line in the modules' .conf file located in the mods.d directory where you installed SWORD.  You should remove any special characters including spaces and symbols.  Send email to sword-support@crosswire.org if you need further assistance.", it->first.c_str());
+			MessageBox(this->Handle, buf, "Module Unsupported", MB_OK|MB_ICONWARNING);
+			continue;
+		}
+ 
 		// leave out enciphered texts with no key
 		if ((sit = mainmgr->config->Sections.find((*it).second->Name())) != mainmgr->config->Sections.end()) {
 			if ((eit = (*sit).second.find("CipherKey")) != (*sit).second.end()) {
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index b9eb01f..5627534 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -73,7 +73,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=5
 Release=4
-Build=127
+Build=129
 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.4.127
+FileVersion=1.5.4.129
 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.4
+ProductVersion=1.5.4a
 Comments=Seek Him and you will find Him
 
 [HistoryLists\hlIncludePath]
@@ -160,5 +160,10 @@ RemoteDebug=0
 ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
   </IDEOPTIONS>
 </PROJECT>
\ No newline at end of file
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp
index 277b859..b6600fc 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp
@@ -196,3 +196,4 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in
 
 
 
+
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index 138d1ab..d1055c4 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res