[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS PrintFrm.dfm,1.15,1.16 mainfrm.cpp,1.110,1.111 optionfrm.dfm,1.51,1.52 sword.bpr,1.107,1.108 sword.res,1.95,1.96
sword@www.crosswire.org
sword@www.crosswire.org
Sun, 30 Mar 2003 16:19:22 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv2857/apps/windoze/CBuilder5/BibleCS
Modified Files:
PrintFrm.dfm mainfrm.cpp optionfrm.dfm sword.bpr sword.res
Log Message:
no message
Index: PrintFrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/PrintFrm.dfm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PrintFrm.dfm 11 Feb 2003 20:15:22 -0000 1.15
--- PrintFrm.dfm 30 Mar 2003 23:19:20 -0000 1.16
***************
*** 22,26 ****
Top = 0
Width = 92
! Height = 276
Align = alRight
BevelOuter = bvNone
--- 22,26 ----
Top = 0
Width = 92
! Height = 283
Align = alRight
BevelOuter = bvNone
***************
*** 123,130 ****
Top = 0
Width = 450
! Height = 276
ActivePage = shtSetup
Align = alClient
- TabIndex = 1
TabOrder = 1
object shtSelection: TTabSheet
--- 123,129 ----
Top = 0
Width = 450
! Height = 283
ActivePage = shtSetup
Align = alClient
TabOrder = 1
object shtSelection: TTabSheet
***************
*** 178,182 ****
Width = 264
Height = 21
! ItemHeight = 13
TabOrder = 3
end
--- 177,181 ----
Width = 264
Height = 21
! ItemHeight = 0
TabOrder = 3
end
Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** mainfrm.cpp 26 Mar 2003 22:07:12 -0000 1.110
--- mainfrm.cpp 30 Mar 2003 23:19:20 -0000 1.111
***************
*** 682,686 ****
LocaleMgr::systemLocaleMgr.setDefaultLocaleName(lang);
// TODO 5 -cConfiguration Ops -oScribe: add mainmgr->configpath, or something, to beginning of these image names ???
! const char *tmp;
Graphics::TBitmap *bitmap = 0;
TPicture *pic = new TPicture();
--- 682,686 ----
LocaleMgr::systemLocaleMgr.setDefaultLocaleName(lang);
// TODO 5 -cConfiguration Ops -oScribe: add mainmgr->configpath, or something, to beginning of these image names ???
! AnsiString tmp;
Graphics::TBitmap *bitmap = 0;
TPicture *pic = new TPicture();
***************
*** 689,693 ****
tmp = WideStringToUTF8(_tr("BackBtnImage")).c_str();
! if (strcmp("BackBtnImage", tmp)) {
pic->LoadFromFile(tmp);
bitmap = pic->Bitmap;
--- 689,693 ----
tmp = WideStringToUTF8(_tr("BackBtnImage")).c_str();
! if (strcmp("BackBtnImage", tmp.c_str())) {
pic->LoadFromFile(tmp);
bitmap = pic->Bitmap;
***************
*** 699,703 ****
tmp = WideStringToUTF8(_tr("SearchBtnImage")).c_str();
! if (strcmp("SearchBtnImage", tmp)) {
pic->LoadFromFile(tmp);
bitmap = pic->Bitmap;
--- 699,703 ----
tmp = WideStringToUTF8(_tr("SearchBtnImage")).c_str();
! if (strcmp("SearchBtnImage", tmp.c_str())) {
pic->LoadFromFile(tmp);
bitmap = pic->Bitmap;
***************
*** 716,721 ****
TFont *UIFont = new TFont();
UIFont->Name = optionsconf->Sections["Appearance"]["UIFontName"].c_str();
! UIFont->Color = StrToInt(optionsconf->Sections["Appearance"]["UIFontColor"].c_str());
! UIFont->Size = StrToInt(optionsconf->Sections["Appearance"]["UIFontSize"].c_str());
// MainForm
File1->Caption = _tr("&File");
--- 716,721 ----
TFont *UIFont = new TFont();
UIFont->Name = optionsconf->Sections["Appearance"]["UIFontName"].c_str();
! try {UIFont->Color = StrToInt(optionsconf->Sections["Appearance"]["UIFontColor"].c_str());} catch (...) {}
! try {UIFont->Size = StrToInt(optionsconf->Sections["Appearance"]["UIFontSize"].c_str());} catch (...) {}
// MainForm
File1->Caption = _tr("&File");
***************
*** 2078,2082 ****
locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
/* TODO 5 -oDavid -cLocale : Just a note: Something weird happens here when there are no .conf files and it crashes. This is since Daniel added the TNT stuff. Maybe should look more into this later */
! i12ize(locale.c_str());
// Change the panels attributes here
--- 2078,2083 ----
locale = optionsconf->Sections["Appearance"].getWithDefault("locale", "en_us");
/* TODO 5 -oDavid -cLocale : Just a note: Something weird happens here when there are no .conf files and it crashes. This is since Daniel added the TNT stuff. Maybe should look more into this later */
! const char *loc = locale.c_str();
! i12ize(loc);
// Change the panels attributes here
***************
*** 2405,2409 ****
penColor = clBlack;
else
! penColor = StrToInt((AnsiString)strColor.c_str());
TColor backColor;
--- 2406,2410 ----
penColor = clBlack;
else
! try {penColor = StrToInt((AnsiString)strColor.c_str());} catch (...) {}
TColor backColor;
***************
*** 2412,2416 ****
backColor = 14680063;
else
! backColor = StrToInt((AnsiString)strColor.c_str());
Canvas->Brush->Color = penColor;
--- 2413,2417 ----
backColor = 14680063;
else
! try {backColor = StrToInt((AnsiString)strColor.c_str());} catch (...) {}
Canvas->Brush->Color = penColor;
Index: optionfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** optionfrm.dfm 26 Mar 2003 22:07:12 -0000 1.51
--- optionfrm.dfm 30 Mar 2003 23:19:20 -0000 1.52
***************
*** 52,58 ****
BevelOuter = bvNone
TabOrder = 0
- DesignSize = (
- 554
- 41)
object OkBtn: TBitBtn
Left = 361
--- 52,55 ----
***************
*** 81,85 ****
ActivePage = TabSheet3
Align = alClient
- TabIndex = 2
TabOrder = 1
object TabSheet1: TTabSheet
--- 78,81 ----
***************
*** 101,107 ****
Caption = 'Personalize'
TabOrder = 0
- DesignSize = (
- 546
- 163)
object Label4: TLabel
Left = 7
--- 97,100 ----
***************
*** 295,301 ****
Caption = 'Daily Devotionals'
TabOrder = 1
- DesignSize = (
- 281
- 151)
object Label9: TLabel
Left = 8
--- 288,291 ----
***************
*** 390,396 ****
Caption = 'Display Colors'
TabOrder = 0
- DesignSize = (
- 546
- 256)
object Label2: TLabel
Left = 7
--- 380,383 ----
Index: sword.bpr
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** sword.bpr 26 Jan 2003 12:07:18 -0000 1.107
--- sword.bpr 30 Mar 2003 23:19:20 -0000 1.108
***************
*** 46,50 ****
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
! <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
--- 46,50 ----
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
! <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/>
<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="-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"" -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>
--- 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"" -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>
***************
*** 132,137 ****
[HistoryLists\hlConditionals]
Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY
! Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
Item3=_ICU_;_ICUSWORD_;_DEBUG
--- 132,137 ----
[HistoryLists\hlConditionals]
Count=8
! Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
! Item1=_ICU_;_ICUSWORD_;USBINARY
Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
Item3=_ICU_;_ICUSWORD_;_DEBUG
***************
*** 154,158 ****
[Debugging]
! DebugSourceDirs=$(BCB)\source\vcl
[Parameters]
--- 154,158 ----
[Debugging]
! DebugSourceDirs=d:\program files\borland\cbuilder5\source\vcl;D:\src\sword\include\
[Parameters]
***************
*** 166,170 ****
ShowInfoMsgs=0
LinkDebugVcl=0
! LinkCGLIB=0
[Language]
--- 166,170 ----
ShowInfoMsgs=0
LinkDebugVcl=0
! LinkCGLIB=1
[Language]
Index: sword.res
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
Binary files /tmp/cvsEgPc8q and /tmp/cvsXAB4OK differ