[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS AboutBoxfrm.cpp,1.13,1.14 AboutBoxfrm.dfm,1.52,1.53 AboutBoxfrm.h,1.5,1.6 mainfrm.cpp,1.125,1.126 sword.bpr,1.119,1.120 sword.res,1.106,1.107

sword@www.crosswire.org sword@www.crosswire.org
Sun, 6 Jul 2003 19:04:43 -0700


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

Modified Files:
	AboutBoxfrm.cpp AboutBoxfrm.dfm AboutBoxfrm.h mainfrm.cpp 
	sword.bpr sword.res 
Log Message:
1.5.6pre7


Index: AboutBoxfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AboutBoxfrm.cpp	27 Jun 2003 11:31:41 -0000	1.13
--- AboutBoxfrm.cpp	7 Jul 2003 02:04:41 -0000	1.14
***************
*** 144,149 ****
--- 144,155 ----
  	CreditAbout->ScrollBars = ssVertical;
  	CreditAbout->ReadOnly = true;
+ 	ModulesAbout->OnURLClick = RTFURLClick;
+ 	CreditAbout->OnURLClick = RTFURLClick;
  	
  }
  //---------------------------------------------------------------------------
+ 
+ void __fastcall TAboutBox::RTFURLClick(TObject *Sender, const AnsiString URLText, TMouseButton Button) {
+ 	ShellExecute(this->Handle, "open", URLText.c_str(), NULL, NULL, SW_SHOWNORMAL);
+ }
  

Index: AboutBoxfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** AboutBoxfrm.dfm	28 Jun 2003 19:04:32 -0000	1.52
--- AboutBoxfrm.dfm	7 Jul 2003 02:04:41 -0000	1.53
***************
*** 104,108 ****
        Height = 21
        AutoSize = False
!       Caption = 'v1.5.6pre6'
        IsControl = True
      end
--- 104,108 ----
        Height = 21
        AutoSize = False
!       Caption = 'v1.5.6pre7'
        IsControl = True
      end

Index: AboutBoxfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AboutBoxfrm.h	30 Apr 2003 08:18:45 -0000	1.5
--- AboutBoxfrm.h	7 Jul 2003 02:04:41 -0000	1.6
***************
*** 37,40 ****
--- 37,41 ----
  	TRxRichEditX *CreditAbout;
  public:
+ 	void __fastcall RTFURLClick(TObject *Sender, const AnsiString URLText, TMouseButton Button);
  	virtual __fastcall TAboutBox(TComponent* AOwner);
  };

Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** mainfrm.cpp	5 Jul 2003 01:16:46 -0000	1.125
--- mainfrm.cpp	7 Jul 2003 02:04:41 -0000	1.126
***************
*** 693,698 ****
  	}
  
! 	OptionsList options = mainmgr->getGlobalOptions();
! 	for (OptionsList::iterator it = options.begin(); it != options.end(); it++) {
  		SWBuf value = mainmgr->getGlobalOption(it->c_str());
  		(*layoutconf)["ModuleOptions"][it->c_str()] = value;
--- 693,698 ----
  	}
  
! 	StringList options = mainmgr->getGlobalOptions();
! 	for (StringList::iterator it = options.begin(); it != options.end(); it++) {
  		SWBuf value = mainmgr->getGlobalOption(it->c_str());
  		(*layoutconf)["ModuleOptions"][it->c_str()] = value;
***************
*** 1190,1195 ****
  	// Add options to Options Main Menu choice
  	sit = layoutconf->Sections.find("ModuleOptions");
! 	OptionsList options = mainmgr->getGlobalOptions();
! 	for (OptionsList::iterator it = options.begin(); it != options.end(); it++) {
  		TMenuItem *newitem = new TMenuItem(MainMenu1);
  		newitem->Caption = it->c_str();
--- 1190,1195 ----
  	// Add options to Options Main Menu choice
  	sit = layoutconf->Sections.find("ModuleOptions");
! 	StringList options = mainmgr->getGlobalOptions();
! 	for (StringList::iterator it = options.begin(); it != options.end(); it++) {
  		TMenuItem *newitem = new TMenuItem(MainMenu1);
  		newitem->Caption = it->c_str();
***************
*** 1201,1206 ****
  				mainmgr->setGlobalOption(it->c_str(), eit->second.c_str());
  		}
! 		OptionsList values = mainmgr->getGlobalOptionValues(it->c_str());    
! 		for (OptionsList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
  			TMenuItem *newitem2 = new TMenuItem(MainMenu1);
  			newitem2->Caption = it2->c_str();
--- 1201,1206 ----
  				mainmgr->setGlobalOption(it->c_str(), eit->second.c_str());
  		}
! 		StringList values = mainmgr->getGlobalOptionValues(it->c_str());    
! 		for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
  			TMenuItem *newitem2 = new TMenuItem(MainMenu1);
  			newitem2->Caption = it2->c_str();

Index: sword.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** sword.bpr	28 Jun 2003 21:31:19 -0000	1.119
--- sword.bpr	7 Jul 2003 02:04:41 -0000	1.120
***************
*** 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,66 ****
        -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"/>
      <RFLAGS value=""/>
!     <AFLAGS value="/mx /w2 /zi"/>
!     <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
    </OPTIONS>
    <LINKER>
--- 58,66 ----
        -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>
***************
*** 76,80 ****
  MinorVer=5
  Release=5
! Build=52
  Debug=0
  PreRelease=0
--- 76,80 ----
  MinorVer=5
  Release=5
! Build=54
  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.52
  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.54
  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.6pre6
  Comments=Seek Him and you will find Him
  
--- 94,98 ----
  OriginalFilename=
  ProductName=The SWORD Project
! ProductVersion=1.5.6pre7
  Comments=Seek Him and you will find Him
  
***************
*** 133,138 ****
  [HistoryLists\hlConditionals]
  Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
! Item1=_ICU_;_ICUSWORD_;USBINARY
  Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
  Item3=_ICU_;_ICUSWORD_;_DEBUG
--- 133,138 ----
  [HistoryLists\hlConditionals]
  Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY
! Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
  Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
  Item3=_ICU_;_ICUSWORD_;_DEBUG

Index: sword.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
Binary files /tmp/cvsJknfrB and /tmp/cvssw26tW differ