[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS AboutBoxfrm.cpp,1.11,1.12 AboutBoxfrm.dfm,1.47,1.48 AboutBoxfrm.h,1.4,1.5 ModInstForm.cpp,1.2,1.3 ModInstForm.dfm,1.8,1.9 ModInstForm.h,1.3,1.4 RxRichEditX.cpp,1.41,1.42 biblecsmgr.cpp,1.20,1.21 sword.bpr,1.108,1.109 sword.res,1.96,1.97

sword@www.crosswire.org sword@www.crosswire.org
Wed, 30 Apr 2003 01:18:47 -0700


Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv30964/apps/windoze/CBuilder5/BibleCS

Modified Files:
	AboutBoxfrm.cpp AboutBoxfrm.dfm AboutBoxfrm.h ModInstForm.cpp 
	ModInstForm.dfm ModInstForm.h RxRichEditX.cpp biblecsmgr.cpp 
	sword.bpr sword.res 
Log Message:
no message

Index: AboutBoxfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AboutBoxfrm.cpp	11 Dec 2002 07:03:45 -0000	1.11
--- AboutBoxfrm.cpp	30 Apr 2003 08:18:45 -0000	1.12
***************
*** 24,29 ****
  	TMemoryStream *RTFStream = new TMemoryStream();
  	
! 	newtext  = "{\\rtf1\\ansi{\\fonttbl{\\f4\\froman\\fcharset0\\fprq2 Times New Roman;}}{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
! 	newtext += "\\pard\\qc\\cf2\\nowidctlpar{\\fs30\\b Installed Modules } \\par \\pard \\nowidctlpar \\cf0 ";
  
  	for (i = 0; i < 4; i++) {
--- 24,29 ----
  	TMemoryStream *RTFStream = new TMemoryStream();
  	
! //	newtext  = "{\\rtf1{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
! //	newtext += "\\pard\\qc\\cf2\\nowidctlpar{\\fs30\\b Installed Modules } \\par \\pard \\nowidctlpar \\cf0 ";
  
  	for (i = 0; i < 4; i++) {
***************
*** 45,52 ****
  	}
  	newtext += "{\\fs24 \\par }}";
! 	RTFStream->Clear();
! 	RTFStream->WriteBuffer(newtext.c_str(), newtext.length());
! 	RTFStream->Position = 0;
! 	ModulesAbout->Lines->LoadFromStream(RTFStream);
  
  	newtext  = "{\\rtf1\\ansi{\\fonttbl{\\f4\\froman\\fcharset0\\fprq2 Times New Roman;}}{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
--- 45,53 ----
  	}
  	newtext += "{\\fs24 \\par }}";
! //	RTFStream->Clear();
! //	RTFStream->WriteBuffer(newtext.c_str(), newtext.length());
! //	RTFStream->Position = 0;
! //	ModulesAbout->Lines->LoadFromStream(RTFStream);
! 	ModulesAbout->fillWithRTFString(0, newtext.c_str());
  
  	newtext  = "{\\rtf1\\ansi{\\fonttbl{\\f4\\froman\\fcharset0\\fprq2 Times New Roman;}}{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
***************
*** 105,109 ****
  	if ((Shift.Contains(ssCtrl)) && (!Shift.Contains(ssAlt)) && (Button == mbRight)) {
  		TMemoryStream *RTFStream = new TMemoryStream();
! 		string newtext = "{\\rtf1\\ansi{\\fonttbl{\\f4\\froman\\fcharset0\\fprq2 Times New Roman;}}{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
  		newtext += "\\fs20 mainmgr->config: \\par\\par ";
  
--- 106,110 ----
  	if ((Shift.Contains(ssCtrl)) && (!Shift.Contains(ssAlt)) && (Button == mbRight)) {
  		TMemoryStream *RTFStream = new TMemoryStream();
! 		string newtext = "{\\rtf1{\\colortbl;\\red0\\green0\\blue255;\\red0\\green200\\blue50;}";
  		newtext += "\\fs20 mainmgr->config: \\par\\par ";
  
***************
*** 127,130 ****
--- 128,148 ----
  		delete RTFStream;
  	}
+ }
+ //---------------------------------------------------------------------------
+ 
+ 
+ void __fastcall TAboutBox::FormCreate(TObject *Sender)
+ {
+ 	ModulesAbout = new TRxRichEditX(this);
+ 	CreditAbout = new TRxRichEditX(this);
+ 	ModulesAbout->Parent = ModAboutPnl;
+ 	ModulesAbout->Align = alClient;
+ 	ModulesAbout->ScrollBars = ssVertical;
+ 	ModulesAbout->ReadOnly = true;
+ 	CreditAbout->Parent = CreditAboutPnl;
+ 	CreditAbout->Align = alClient;
+ 	CreditAbout->ScrollBars = ssVertical;
+ 	CreditAbout->ReadOnly = true;
+ 	
  }
  //---------------------------------------------------------------------------

Index: AboutBoxfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** AboutBoxfrm.dfm	8 Jan 2003 20:46:03 -0000	1.47
--- AboutBoxfrm.dfm	30 Apr 2003 08:18:45 -0000	1.48
***************
*** 4,9 ****
    BorderStyle = bsDialog
    Caption = 'About The SWORD Project'
!   ClientHeight = 448
!   ClientWidth = 447
    Color = clBtnFace
    Font.Charset = DEFAULT_CHARSET
--- 4,9 ----
    BorderStyle = bsDialog
    Caption = 'About The SWORD Project'
!   ClientHeight = 508
!   ClientWidth = 498
    Color = clBtnFace
    Font.Charset = DEFAULT_CHARSET
***************
*** 40,43 ****
--- 40,44 ----
    Position = poScreenCenter
    Scaled = False
+   OnCreate = FormCreate
    OnShow = FormShow
    PixelsPerInch = 96
***************
*** 46,51 ****
      Left = 0
      Top = 0
!     Width = 447
!     Height = 407
      Align = alClient
      BevelInner = bvRaised
--- 47,52 ----
      Left = 0
      Top = 0
!     Width = 498
!     Height = 467
      Align = alClient
      BevelInner = bvRaised
***************
*** 103,107 ****
        Height = 21
        AutoSize = False
!       Caption = 'v1.5.5a'
        IsControl = True
      end
--- 104,108 ----
        Height = 21
        AutoSize = False
!       Caption = 'v1.5.6pre'
        IsControl = True
      end
***************
*** 109,113 ****
        Left = 8
        Top = 48
!       Width = 428
        Height = 17
        Anchors = [akLeft, akTop, akRight]
--- 110,114 ----
        Left = 8
        Top = 48
!       Width = 479
        Height = 17
        Anchors = [akLeft, akTop, akRight]
***************
*** 119,142 ****
        IsControl = True
      end
!     object CreditAbout: TRichEdit
        Left = 8
!       Top = 245
!       Width = 431
!       Height = 155
        Anchors = [akLeft, akTop, akRight, akBottom]
!       Color = clBtnFace
!       ReadOnly = True
!       ScrollBars = ssVertical
        TabOrder = 0
      end
!     object ModulesAbout: TRichEdit
        Left = 8
!       Top = 68
!       Width = 431
        Height = 169
!       Anchors = [akLeft, akTop, akRight]
!       Color = clBtnFace
!       ReadOnly = True
!       ScrollBars = ssVertical
        TabOrder = 1
      end
--- 120,139 ----
        IsControl = True
      end
!     object ModAboutPnl: TPanel
        Left = 8
!       Top = 84
!       Width = 483
!       Height = 200
        Anchors = [akLeft, akTop, akRight, akBottom]
!       Caption = 'ModAboutPnl'
        TabOrder = 0
      end
!     object CreditAboutPnl: TPanel
        Left = 8
!       Top = 291
!       Width = 483
        Height = 169
!       Anchors = [akLeft, akRight, akBottom]
!       Caption = 'CreditAboutPnl'
        TabOrder = 1
      end
***************
*** 144,154 ****
    object Panel2: TPanel
      Left = 0
!     Top = 407
!     Width = 447
      Height = 41
      Align = alBottom
      TabOrder = 1
      object OKButton: TButton
!       Left = 348
        Top = 8
        Width = 93
--- 141,151 ----
    object Panel2: TPanel
      Left = 0
!     Top = 467
!     Width = 498
      Height = 41
      Align = alBottom
      TabOrder = 1
      object OKButton: TButton
!       Left = 399
        Top = 8
        Width = 93

Index: AboutBoxfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AboutBoxfrm.h	17 Jul 2002 07:49:57 -0000	1.4
--- AboutBoxfrm.h	30 Apr 2003 08:18:45 -0000	1.5
***************
*** 14,17 ****
--- 14,19 ----
  #include <vcl\ExtCtrls.hpp>
  #include <vcl\ComCtrls.hpp>
+ 
+ #include "rxricheditx.h"
  //----------------------------------------------------------------------------
  class TAboutBox : public TForm
***************
*** 23,34 ****
  	TLabel *Version;
  	TLabel *Copyright;
- 	TRichEdit *CreditAbout;
- 	TRichEdit *ModulesAbout;
  	TPanel *Panel2;
  	TButton *OKButton;
  	void __fastcall FormShow(TObject *Sender);
  	void __fastcall ProgramIconMouseDown(TObject *Sender, TMouseButton Button,
            TShiftState Shift, int X, int Y);
  private:
  public:
  	virtual __fastcall TAboutBox(TComponent* AOwner);
--- 25,39 ----
  	TLabel *Version;
  	TLabel *Copyright;
  	TPanel *Panel2;
  	TButton *OKButton;
+ 	TPanel *ModAboutPnl;
+ 	TPanel *CreditAboutPnl;
  	void __fastcall FormShow(TObject *Sender);
  	void __fastcall ProgramIconMouseDown(TObject *Sender, TMouseButton Button,
            TShiftState Shift, int X, int Y);
+ 	void __fastcall FormCreate(TObject *Sender);
  private:
+ 	TRxRichEditX *ModulesAbout;
+ 	TRxRichEditX *CreditAbout;
  public:
  	virtual __fastcall TAboutBox(TComponent* AOwner);

Index: ModInstForm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/ModInstForm.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModInstForm.cpp	5 Apr 2000 05:43:13 -0000	1.2
--- ModInstForm.cpp	30 Apr 2003 08:18:45 -0000	1.3
***************
*** 12,14 ****
  {
  }
! //--------------------------------------------------------------------------- 
\ No newline at end of file
--- 12,23 ----
  {
  }
! //---------------------------------------------------------------------------
! void __fastcall TModInstFrm::FormCreate(TObject *Sender)
! {
! 	AboutText = new TRxRichEditX(this);
! 	AboutText->Parent = Panel2;
! 	AboutText->Align = alClient;
! 	AboutText->ScrollBars = ssVertical;
! 	AboutText->ReadOnly = true;	
! }
! //---------------------------------------------------------------------------

Index: ModInstForm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/ModInstForm.dfm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModInstForm.dfm	17 Jul 2002 07:49:57 -0000	1.8
--- ModInstForm.dfm	30 Apr 2003 08:18:45 -0000	1.9
***************
*** 41,57 ****
    Position = poScreenCenter
    Scaled = False
    PixelsPerInch = 96
    TextHeight = 13
-   object AboutText: TRichEdit
-     Left = 0
-     Top = 65
-     Width = 441
-     Height = 161
-     Align = alClient
-     Color = clBtnFace
-     ReadOnly = True
-     ScrollBars = ssVertical
-     TabOrder = 0
-   end
    object Panel1: TPanel
      Left = 0
--- 41,47 ----
    Position = poScreenCenter
    Scaled = False
+   OnCreate = FormCreate
    PixelsPerInch = 96
    TextHeight = 13
    object Panel1: TPanel
      Left = 0
***************
*** 60,64 ****
      Height = 65
      Align = alTop
!     TabOrder = 1
      object ModText: TLabel
        Left = 8
--- 50,54 ----
      Height = 65
      Align = alTop
!     TabOrder = 0
      object ModText: TLabel
        Left = 8
***************
*** 80,83 ****
--- 70,82 ----
        TabOrder = 0
      end
+   end
+   object Panel2: TPanel
+     Left = 0
+     Top = 65
+     Width = 441
+     Height = 161
+     Align = alClient
+     Caption = 'Panel2'
+     TabOrder = 1
    end
  end

Index: ModInstForm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/ModInstForm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ModInstForm.h	25 Jun 2002 08:13:02 -0000	1.3
--- ModInstForm.h	30 Apr 2003 08:18:45 -0000	1.4
***************
*** 9,23 ****
  #include <vcl\ComCtrls.hpp>
  #include <vcl\ExtCtrls.hpp>
  //---------------------------------------------------------------------------
  class TModInstFrm : public TForm
  {
  __published:	// IDE-managed Components
- 	TRichEdit *AboutText;
  	TPanel *Panel1;
  	TButton *OkBtn;
  	TLabel *ModText;
  private:	// User declarations
  public:		// User declarations
  	__fastcall TModInstFrm(TComponent* Owner);
  };
  //---------------------------------------------------------------------------
--- 9,26 ----
  #include <vcl\ComCtrls.hpp>
  #include <vcl\ExtCtrls.hpp>
+ #include "rxricheditx.h"
  //---------------------------------------------------------------------------
  class TModInstFrm : public TForm
  {
  __published:	// IDE-managed Components
  	TPanel *Panel1;
  	TButton *OkBtn;
  	TLabel *ModText;
+ 	TPanel *Panel2;
+ 	void __fastcall FormCreate(TObject *Sender);
  private:	// User declarations
  public:		// User declarations
  	__fastcall TModInstFrm(TComponent* Owner);
+ 	TRxRichEditX *AboutText;
  };
  //---------------------------------------------------------------------------

Index: RxRichEditX.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** RxRichEditX.cpp	26 Mar 2003 22:07:12 -0000	1.41
--- RxRichEditX.cpp	30 Apr 2003 08:18:45 -0000	1.42
***************
*** 490,499 ****
  	// If the module uses it's own font load that else we will try the config file
  	// else we will use the default
! 	eit = module->getConfig().find("Font");
! 	if (eit != module->getConfig().end())
! 		attribs->fontName = (*eit).second.c_str();
! 	else {
  		keyFontName = modType + "FontName";
  		attribs->fontName = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontName].c_str();
  	}
  	// If we still have no name we will set it to a default value
--- 490,504 ----
  	// If the module uses it's own font load that else we will try the config file
  	// else we will use the default
! 	while (true) {
! 		if (module) {
! 			eit = module->getConfig().find("Font");
! 			if (eit != module->getConfig().end()) {
! 				attribs->fontName = (*eit).second.c_str();
! 				break;
! 			}
! 		}
  		keyFontName = modType + "FontName";
  		attribs->fontName = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontName].c_str();
+ 		break;
  	}
  	// If we still have no name we will set it to a default value
***************
*** 504,514 ****
  	// If the module uses it's own font size load that else we will try the config
  	// file else we will use the default
! 	eit = module->getConfig().find("FontSize");
! 	if (eit != module->getConfig().end())
! 		fontSize = (*eit).second.c_str();
! 	else {
  		keyFontSize = modType + "FontSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
  	}
  	// If we still have no size we will set it to a default value
  	if (fontSize == "")
--- 509,525 ----
  	// If the module uses it's own font size load that else we will try the config
  	// file else we will use the default
! 	while (true) {
! 		if (module) {
! 			eit = module->getConfig().find("FontSize");
! 			if (eit != module->getConfig().end()) {
! 				fontSize = (*eit).second.c_str();
! 				break;
! 			}
! 		}
  		keyFontSize = modType + "FontSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
+ 		break;
  	}
+ 	
  	// If we still have no size we will set it to a default value
  	if (fontSize == "")
***************
*** 518,528 ****
  	//**** Chapter Heading Font Size ****//
  	fontSize = "";
! 	eit = module->getConfig().find("ChHeadSize");
! 	if (eit != module->getConfig().end())
! 		fontSize = (*eit).second.c_str();
! 	else {
  		keyFontSize = modType + "ChHeadSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
  	}
  	// If we still have no size we will set it to a default value
  	if (fontSize == "")
--- 529,545 ----
  	//**** Chapter Heading Font Size ****//
  	fontSize = "";
! 	while (true) {
! 		if (module) {
! 			eit = module->getConfig().find("ChHeadSize");
! 			if (eit != module->getConfig().end()) {
! 				fontSize = (*eit).second.c_str();
! 				break;
! 			}
! 		}
  		keyFontSize = modType + "ChHeadSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
+ 		break;
  	}
+ 	
  	// If we still have no size we will set it to a default value
  	if (fontSize == "")
***************
*** 532,541 ****
  	//**** Verse Numbering Font Size ****//
  	fontSize = "";
! 	eit = module->getConfig().find("VSNumSize");
! 	if (eit != module->getConfig().end())
! 		fontSize = (*eit).second.c_str();
! 	else {
  		keyFontSize = modType + "VSNumSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
  	}
  	// If we still have no size we will set it to a default value
--- 549,563 ----
  	//**** Verse Numbering Font Size ****//
  	fontSize = "";
! 	while (true) {
! 		if (module) {
! 			eit = module->getConfig().find("VSNumSize");
! 			if (eit != module->getConfig().end()) {
! 				fontSize = (*eit).second.c_str();
! 				break;
! 			}
! 		}
  		keyFontSize = modType + "VSNumSize";
  		fontSize = (AnsiString)Form1->optionsconf->Sections[dispType][keyFontSize].c_str();
+ 		break;
  	}
  	// If we still have no size we will set it to a default value
***************
*** 676,680 ****
  	//chapBuf = WideStringToUTF8(_tr("Chapter")).c_str();
          chapBuf = _tr("Chapter");
! 	filter.processText(chapBuf, *module, module);
  
          sprintf(buf,
--- 698,702 ----
  	//chapBuf = WideStringToUTF8(_tr("Chapter")).c_str();
          chapBuf = _tr("Chapter");
! 	filter.processText(chapBuf);
  
          sprintf(buf,
***************
*** 785,798 ****
  
  AnsiString TRxRichEditX::getType() {
! 	AnsiString retVal;
  	if (!strcmp(type.c_str(), "Default")) {
! 		if (!strcmp(module->Type(), "Biblical Texts"))
! 			retVal = "Text";
! 		else if ((!strcmp(module->Type(), "Commentaries")) ||
! 				(!strcmp(module->Type(), "Generic Books")))
! 			retVal = "Comment";
! 		else if (!strcmp(module->Type(), "Lexicons / Dictionaries"))
! 			retVal = "LD";
! 	}else if(!strcmp(type.c_str(), "PrintedPage")){
  		if(PrintForm->radText->Checked)
  			retVal = "Text";
--- 807,823 ----
  
  AnsiString TRxRichEditX::getType() {
! 	AnsiString retVal = "Default";
  	if (!strcmp(type.c_str(), "Default")) {
! 		if (module) {
! 			if (!strcmp(module->Type(), "Biblical Texts"))
! 				retVal = "Text";
! 			else if ((!strcmp(module->Type(), "Commentaries")) ||
! 					(!strcmp(module->Type(), "Generic Books")))
! 				retVal = "Comment";
! 			else if (!strcmp(module->Type(), "Lexicons / Dictionaries"))
! 				retVal = "LD";
! 		}
! 	}
! 	else if(!strcmp(type.c_str(), "PrintedPage")){
  		if(PrintForm->radText->Checked)
  			retVal = "Text";

Index: biblecsmgr.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/biblecsmgr.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** biblecsmgr.cpp	20 Oct 2002 21:08:02 -0000	1.20
--- biblecsmgr.cpp	30 Apr 2003 08:18:45 -0000	1.21
***************
*** 74,78 ****
  	AnsiString abouttext = "";
  	int logflag;
- 	TMemoryStream *RTFStream = new TMemoryStream();
  	char retval;
  
--- 74,77 ----
***************
*** 83,92 ****
  
  	abouttext = abouttext + "{\\fs20\\cf0 " + (*(*section).second.find("About")).second.c_str() + " }";
! 	RTFStream->Clear();
! 	RTFStream->WriteBuffer(abouttext.c_str(), abouttext.Length());
! 	RTFStream->Position = 0;
! 	ModInstFrm->AboutText->Lines->LoadFromStream(RTFStream);
! 	delete RTFStream;
! 
  	ModInstFrm->ShowModal();
  
--- 82,87 ----
  
  	abouttext = abouttext + "{\\fs20\\cf0 " + (*(*section).second.find("About")).second.c_str() + " }";
! 	ModInstFrm->AboutText->fillWithRTFString(0, abouttext.c_str());
! 	
  	ModInstFrm->ShowModal();
  

Index: sword.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** sword.bpr	30 Mar 2003 23:19:20 -0000	1.108
--- sword.bpr	30 Apr 2003 08:18:45 -0000	1.109
***************
*** 46,50 ****
      <RELEASELIBPATH value="$(BCB)\lib\release"/>
      <LINKER value="ilink32"/>
!     <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
      <SYSDEFINES value="NO_STRICT"/>
      <MAINSOURCE value="sword.cpp"/>
--- 46,50 ----
      <RELEASELIBPATH value="$(BCB)\lib\release"/>
      <LINKER value="ilink32"/>
!     <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
      <SYSDEFINES value="NO_STRICT"/>
      <MAINSOURCE value="sword.cpp"/>
***************
*** 58,71 ****
        -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
        -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/>
!     <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 /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="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
    </LINKER>
    <IDEOPTIONS>
--- 58,71 ----
        -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"/>
      <RFLAGS value=""/>
!     <AFLAGS value="/mx /w2 /zn"/>
!     <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
    </OPTIONS>
    <LINKER>
      <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
      <ALLRES value="$(RESFILES)"/>
!     <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
    </LINKER>
    <IDEOPTIONS>
***************
*** 76,80 ****
  MinorVer=5
  Release=5
! Build=3
  Debug=0
  PreRelease=0
--- 76,80 ----
  MinorVer=5
  Release=5
! Build=23
  Debug=0
  PreRelease=0
***************
*** 88,92 ****
  CompanyName=CrossWire Software &amp; Bible Society
  FileDescription=Windows 32bit User Interface to The SWORD Project
! FileVersion=1.5.5.3
  InternalName=biblecs
  LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
--- 88,92 ----
  CompanyName=CrossWire Software &amp; Bible Society
  FileDescription=Windows 32bit User Interface to The SWORD Project
! FileVersion=1.5.5.23
  InternalName=biblecs
  LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
***************
*** 94,98 ****
  OriginalFilename=
  ProductName=The SWORD Project
! ProductVersion=1.5.5a
  Comments=Seek Him and you will find Him
  
--- 94,98 ----
  OriginalFilename=
  ProductName=The SWORD Project
! ProductVersion=1.5.6pre
  Comments=Seek Him and you will find Him
  
***************
*** 127,137 ****
  
  [HistoryLists\hlDebugSourcePath]
! Count=1
! Item0=$(BCB)\source\vcl
  
  [HistoryLists\hlConditionals]
  Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
! Item1=_ICU_;_ICUSWORD_;USBINARY
  Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
  Item3=_ICU_;_ICUSWORD_;_DEBUG
--- 127,138 ----
  
  [HistoryLists\hlDebugSourcePath]
! Count=2
! Item0=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\
! Item1=$(BCB)\source\vcl
  
  [HistoryLists\hlConditionals]
  Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY
! Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
  Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
  Item3=_ICU_;_ICUSWORD_;_DEBUG
***************
*** 166,170 ****
  ShowInfoMsgs=0
  LinkDebugVcl=0
! LinkCGLIB=1
  
  [Language]
--- 167,171 ----
  ShowInfoMsgs=0
  LinkDebugVcl=0
! LinkCGLIB=0
  
  [Language]

Index: sword.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
Binary files /tmp/cvsV7Crhn and /tmp/cvsDnfeAL differ