[sword-svn] r430 - in trunk: . TntUnicodeControls/BCB5 clucene stage
scribe at crosswire.org
scribe at crosswire.org
Tue Jun 27 04:03:41 MST 2006
Author: scribe
Date: 2006-06-27 04:03:36 -0700 (Tue, 27 Jun 2006)
New Revision: 430
Added:
trunk/lemma.bmp
trunk/morph.bmp
trunk/notes.bmp
trunk/xref.bmp
Modified:
trunk/AboutBoxfrm.cpp
trunk/AboutBoxfrm.dfm
trunk/TntUnicodeControls/BCB5/TntLibR.bpk
trunk/clucene/clucene.bpr
trunk/mainfrm.cpp
trunk/mainfrm.dfm
trunk/mainfrm.h
trunk/stage/layout.conf
trunk/sword.bpr
trunk/sword.res
Log:
added smart strongs search help
added speedbuttons
Modified: trunk/AboutBoxfrm.cpp
===================================================================
--- trunk/AboutBoxfrm.cpp 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/AboutBoxfrm.cpp 2006-06-27 11:03:36 UTC (rev 430)
@@ -72,9 +72,9 @@
newtext += "\t\tThe SWORD Project Development Team \\par ";
newtext += "_________________________________________ \\par ";
newtext += "Thanks be to God for all the wonderful people who have contributed in so many ways to make this project possible. These are just a few (I could not possibly name them all) who have directly contributed an abundance of their time and talents: \\par\\par ";
- newtext += "Chris Little (the module-making machine!); All the people at The Source in Scottsdale for testing and suggestions; ";
+ newtext += "Chris Little (the module-making machine!); All the people at Praxis for testing and suggestions; ";
newtext += "The Bible Foundation: Jerry Kingery, Jerry Hastings; Geoffrey W. Hastings; ";
- newtext += "William Dicks; Everyone on b-greek at franklin.oit.unc.edu; Michael Paul Johnson; ";
+ newtext += "Joe Walker, DM Smith, and the JSword Team; Will Thimbleby and MacSword; Jason Turner and Suite-C; Lynn Allan and LcdBible; William Dicks; Everyone on b-greek at franklin.oit.unc.edu; Michael Paul Johnson; ";
newtext += "Roland Nygren; Bayu Gunawan; Bill Kincaid; Mark Fuller; Larry Pierce; Franklin Bratcher; ";
newtext += "Gregory Hall; Luis Cortes; Steve Hiner; Kristof Petr; Paul Gear and OpenBible; Chris Bitmead (go Scheme!); ";
newtext += "Brook Humphrey; Torsten Uhlmann, Joachim Ansorg, Darwin Gregory, Martin Gruner and the BibleTime Team; ";
Modified: trunk/AboutBoxfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/TntUnicodeControls/BCB5/TntLibR.bpk
===================================================================
--- trunk/TntUnicodeControls/BCB5/TntLibR.bpk 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/TntUnicodeControls/BCB5/TntLibR.bpk 2006-06-27 11:03:36 UTC (rev 430)
@@ -24,7 +24,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
<INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -34,18 +34,17 @@
<OPTIONS>
<IDLCFLAGS value="-I..\. -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG
-boa"/>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -c -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="-l. -D"Tnt Unicode VCL Components for BCB5 (Runtime)" -aa -Tpp -Gpr -x -Gn
- -Gl -Gi -v"/>
+ -Gl -Gi"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
<ALLRES value="$(RESFILES)"/>
- <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -112,7 +111,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Modified: trunk/clucene/clucene.bpr
===================================================================
--- trunk/clucene/clucene.bpr 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/clucene/clucene.bpr 2006-06-27 11:03:36 UTC (rev 430)
@@ -18,7 +18,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
+ <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="clucene.bpf"/>
<INCLUDEPATH value="src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -29,9 +29,9 @@
<OPTIONS>
<IDLCFLAGS value="-Isrc\CLucene -Isrc -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp
-DUNICODE -D_WIN32 -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-vGc -vGt -vGd -Od -Q -w- -Vx -VF -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <CFLAG1 value="-O2 -Q -w- -Vx -VF -X- -a8 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P256"/>
</OPTIONS>
<LINKER>
@@ -95,8 +95,8 @@
[HistoryLists\hlConditionals]
Count=15
-Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
Item2=UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
Item3=_WIN32;_CL_DISABLE_MULTITHREADING
Item4=_WIN32;HAVE_DIRENT;_CL_DISABLE_MULTITHREADING
@@ -135,7 +135,7 @@
[Compiler]
ShowInfoMsgs=1
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Added: trunk/lemma.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/lemma.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/mainfrm.cpp 2006-06-27 11:03:36 UTC (rev 430)
@@ -619,7 +619,7 @@
WideString lookupKey;
ConfigEntMap::iterator eit;
char preChar = 0;
-
+
if (!rtf->SelLength) {
preChar = (rtf->WordAtCursor().Length()) ? rtf->WordAtCursor()[1] : 0;
lookupKey = rtf->WordAtCursor();
@@ -661,7 +661,7 @@
}
}
}
-
+
DictKeyEdit->Text = lookupKey;
}
@@ -750,15 +750,15 @@
Graphics::TBitmap *bitmap = 0;
TPicture *pic = new TPicture();
- ImageList1->Clear();
-
+ ImageList1->Clear();
+
tmp = WideStringToUTF8(_tr("BackBtnImage")).c_str();
if (strcmp("BackBtnImage", tmp.c_str())) {
pic->LoadFromFile(tmp);
bitmap = pic->Bitmap;
}
else bitmap = BackBtnImage->Picture->Bitmap;
-
+
TColor transColor = bitmap->Canvas->Pixels[0][0];
ImageList1->AddMasked(bitmap, transColor);
@@ -768,10 +768,55 @@
bitmap = pic->Bitmap;
}
else bitmap = SearchBtnImage->Picture->Bitmap;
-
+
transColor = bitmap->Canvas->Pixels[0][0];
ImageList1->AddMasked(bitmap, transColor);
-
+
+ // Lemma Speed Button
+ tmp = WideStringToUTF8(_tr("LemmaBtnImage")).c_str();
+ if (strcmp("LemmaBtnImage", tmp.c_str())) {
+ pic->LoadFromFile(tmp);
+ bitmap = pic->Bitmap;
+ }
+ else bitmap = LemmaBtnImage->Picture->Bitmap;
+
+ transColor = bitmap->Canvas->Pixels[0][0];
+ ImageList3->AddMasked(bitmap, transColor);
+
+ // Morph Speed Button
+ tmp = WideStringToUTF8(_tr("MorphBtnImage")).c_str();
+ if (strcmp("MorphBtnImage", tmp.c_str())) {
+ pic->LoadFromFile(tmp);
+ bitmap = pic->Bitmap;
+ }
+ else bitmap = MorphBtnImage->Picture->Bitmap;
+
+ transColor = bitmap->Canvas->Pixels[0][0];
+ ImageList3->AddMasked(bitmap, transColor);
+
+ // Footnotes Speed Button
+ tmp = WideStringToUTF8(_tr("FootnoteBtnImage")).c_str();
+ if (strcmp("FootnoteBtnImage", tmp.c_str())) {
+ pic->LoadFromFile(tmp);
+ bitmap = pic->Bitmap;
+ }
+ else bitmap = FootnoteBtnImage->Picture->Bitmap;
+
+ transColor = bitmap->Canvas->Pixels[0][0];
+ ImageList3->AddMasked(bitmap, transColor);
+
+ // Cross-refs Speed Button
+ tmp = WideStringToUTF8(_tr("XRefBtnImage")).c_str();
+ if (strcmp("XRefBtnImage", tmp.c_str())) {
+ pic->LoadFromFile(tmp);
+ bitmap = pic->Bitmap;
+ }
+ else bitmap = XRefBtnImage->Picture->Bitmap;
+
+ transColor = bitmap->Canvas->Pixels[0][0];
+ ImageList3->AddMasked(bitmap, transColor);
+
+ // Bookmarks speed button
bitmap = BookmarkBtnImage->Picture->Bitmap;
transColor = bitmap->Canvas->Pixels[0][0];
ImageList2->AddMasked(bitmap, transColor);
@@ -780,7 +825,7 @@
TFont *UIFont = new TFont();
UIFont->Name = optionsconf->Sections["Appearance"]["UIFontName"].c_str();
-
+
tmp = optionsconf->Sections["Appearance"]["UIFontColor"].c_str();
if (tmp.Length() > 0)
UIFont->Color = StrToInt(tmp);
@@ -828,6 +873,11 @@
CommentaryPageControl->Hint = _tr("Commentaries");
LexDictPageControl->Hint = _tr("Lexicons / Dictionaries");
+ LemmaBtn->Hint = _tr("Lemma");
+ MorphBtn->Hint = _tr("Morphology");
+ NotesBtn->Hint = _tr("Footnotes");
+ XRefBtn->Hint = _tr("Cross-references");
+
cbBook->Font = UIFont;
freeHandLookup->Font = UIFont;
DictKeyEditOld->Font = UIFont;
@@ -1230,7 +1280,7 @@
if ((eit = sit->second.find(it->c_str())) != sit->second.end())
mainmgr->setGlobalOption(it->c_str(), eit->second.c_str());
}
- StringList values = mainmgr->getGlobalOptionValues(it->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();
@@ -1242,6 +1292,8 @@
Options2->Add(newitem);
}
+ syncSpeedButtons();
+
if ((sit = layoutconf->Sections.find("History")) != layoutconf->Sections.end()) {
eitend = (*sit).second.upper_bound("SearchText");
@@ -1955,47 +2007,73 @@
//---------------------------------------------------------------------------
+void TForm1::syncSpeedButtons()
+{
+ LemmaBtn->Down = (String("On") == mainmgr->getGlobalOption("Strong's Numbers"));
+ MorphBtn->Down = (String("On") == mainmgr->getGlobalOption("Morphological Tags"));
+ NotesBtn->Down = (String("On") == mainmgr->getGlobalOption("Footnotes"));
+ XRefBtn->Down = (String("On") == mainmgr->getGlobalOption("Cross-references"));
+}
+
+
void __fastcall TForm1::GlobalOptionChange(TObject *Sender)
{
// ModMap::iterator it;
// SectionMap::iterator sit;
// ConfigEntMap::iterator eit, eitend;
ConfigEntMap::iterator eit;
- TMenuItem *menuchoice = (TMenuItem *)Sender;
- const char *source = menuchoice->Caption.c_str();
- char *value = new char [strlen(source) + 1];
- int k = 0;
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- value[k++] = source[j];
- }
- value[k] = 0;
- source = menuchoice->Parent->Caption.c_str();
- char *option = new char [strlen(source) + 1];
- k = 0;
- for (unsigned int j = 0; j < strlen(source); j++) {
- if (source[j] != '&')
- option[k++] = source[j];
- }
- option[k] = 0;
- mainmgr->setGlobalOption(option, value);
-
- if ((!::stricmp(option, "Strong's Numbers")) && (!::stricmp(value, "On"))) {
- SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
- if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
- SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
- for (int i = 0; i < TextPageControl->PageCount; i++) {
- if (!::stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
- TextPageControl->ActivePageIndex = i;
- break;
- }
- }
- }
- }
-
- delete [] option;
- delete [] value;
+ TMenuItem *menuchoice = dynamic_cast<TMenuItem *>(Sender);
+ if (!menuchoice) {
+ if (Sender == LemmaBtn) {
+ mainmgr->setGlobalOption("Strong's Numbers", (LemmaBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == MorphBtn) {
+ mainmgr->setGlobalOption("Morphological Tags", (MorphBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == NotesBtn) {
+ mainmgr->setGlobalOption("Footnotes", (NotesBtn->Down)? "On" : "Off");
+ }
+ else if (Sender == XRefBtn) {
+ mainmgr->setGlobalOption("Cross-references", (XRefBtn->Down)? "On" : "Off");
+ }
+ }
+ else {
+ const char *source = menuchoice->Caption.c_str();
+ char *value = new char [strlen(source) + 1];
+ int k = 0;
+ for (unsigned int j = 0; j < strlen(source); j++) {
+ if (source[j] != '&')
+ value[k++] = source[j];
+ }
+ value[k] = 0;
+ source = menuchoice->Parent->Caption.c_str();
+ char *option = new char [strlen(source) + 1];
+ k = 0;
+ for (unsigned int j = 0; j < strlen(source); j++) {
+ if (source[j] != '&')
+ option[k++] = source[j];
+ }
+ option[k] = 0;
+ mainmgr->setGlobalOption(option, value);
+
+ if ((!::stricmp(option, "Strong's Numbers")) && (!::stricmp(value, "On"))) {
+ SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
+ if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
+ SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
+ for (int i = 0; i < TextPageControl->PageCount; i++) {
+ if (!::stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
+ TextPageControl->ActivePageIndex = i;
+ break;
+ }
+ }
+ }
+ }
+
+ delete [] option;
+ delete [] value;
+ syncSpeedButtons();
+ }
TextKeyChanged();
}
//---------------------------------------------------------------------------
@@ -2787,6 +2865,7 @@
int saveSelStart = rtf->SelStart;
WideString lookupKey;
ConfigEntMap::iterator eit;
+ bool lemma = false;
if (!rtf->SelLength) {
lookupKey = rtf->WordAtCursor();
@@ -2796,17 +2875,26 @@
WideString entrytext = rtf->GetText();
int selstart = rtf->SelStart;
int versestart, verseend;
+
+ // check for upper and - to keep backing up for morph like N-GSM
for (versestart = selstart; versestart; versestart--) {
+ // only might break if we're not a digit
if (!isdigit(entrytext[versestart])
- && (toupper(entrytext[versestart]) != entrytext[versestart])
- && !strchr("-", entrytext[versestart]))
- break;
+ && ((toupper(entrytext[versestart]) != entrytext[versestart])
+ || (strchr(",\"'.!?<>()", entrytext[versestart]))))
+ break;
}
+
+
if ((entrytext[versestart] == '<') ||
(entrytext[versestart] == '(')) {
+ bool suffix = false;
for (verseend = versestart+1; (verseend < entrylen); verseend++) {
- if (!isdigit(entrytext[verseend]))
- break;
+ if (!isdigit(entrytext[verseend])) {
+ if (!suffix && strchr("abcdefghijkl", entrytext[verseend]))
+ suffix = true;
+ else break;
+ }
}
if ((entrytext[verseend] == '>') ||
(entrytext[verseend] == ')')) {
@@ -2820,9 +2908,19 @@
else {
lookupKey = TRxRichEditX::Trim(rtf->GetTextRange(rtf->SelStart, rtf->SelStart + rtf->SelLength));
}
-
- searchForm->SearchText->Text = lookupKey;
- searchForm->Show();
+
+ // must show first so we can set target and see if we're using indexing
+ searchForm->Show();
+
+ if ((lookupKey.Length() > 1) && (lookupKey[1] == '<') && (lookupKey[lookupKey.Length()] == '>')) {
+ if (searchForm->usingSearchFramework) {
+ lookupKey = (String)"lemma:"+((DefaultVSKey->Testament())?"G":"H")+lookupKey.SubString(2,lookupKey.Length()-2);
+ }
+ else {
+ lookupKey = (String)"<"+((DefaultVSKey->Testament())?"G":"H")+lookupKey.SubString(2,lookupKey.Length()-2)+">";
+ }
+ }
+ searchForm->SearchText->Text = lookupKey;
}
//---------------------------------------------------------------------------
@@ -2964,3 +3062,5 @@
delete [] value;
}
+
+
Modified: trunk/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/mainfrm.h
===================================================================
--- trunk/mainfrm.h 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/mainfrm.h 2006-06-27 11:03:36 UTC (rev 430)
@@ -246,7 +246,6 @@
TSpeedButton *btnLookup;
TToolBar *ToolBar1;
TImageList *ImageList2;
- TImage *BookmarkBtnImage;
TSpeedButton *Bookmarkbtn;
TPopupMenu *PopupMenu3;
TMenuItem *Copy4;
@@ -283,6 +282,17 @@
TMenuItem *MenuItem3;
TMenuItem *MenuItem4;
TMenuItem *N4;
+ TImage *BookmarkBtnImage;
+ TToolBar *ToolBar3;
+ TToolButton *LemmaBtn;
+ TToolButton *MorphBtn;
+ TToolButton *NotesBtn;
+ TToolButton *XRefBtn;
+ TImageList *ImageList3;
+ TImage *LemmaBtnImage;
+ TImage *MorphBtnImage;
+ TImage *FootnoteBtnImage;
+ TImage *XRefBtnImage;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
void __fastcall CommentaryPageControlChange(TObject *Sender);
@@ -367,6 +377,7 @@
bool freshdict;
String clickText;
+ void syncSpeedButtons();
char CreateTextPane(SWModule *mod);
char CreateParallelPane(SWMgr **mgr);
char CreateCommentPane(SWModule *mod);
Added: trunk/morph.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/morph.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/notes.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/notes.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/stage/layout.conf 2006-06-27 11:03:36 UTC (rev 430)
@@ -12,15 +12,20 @@
LastParaMod01=
LastParaMod02=
LastParaMod03=
-LastTextModule=WLC
-LastVerse=Genesis 1:1
+LastTextModule=TR
+LastVerse=Romans 3:17
LookupSaveCount=5
+LookupText=Romans 3:17
+LookupText=James 1:1
+LookupText=I John 1:1
LookupText=James 1:19
-LookupText=John 1:1
+LookupText=Genesis 1:1
SearchSaveCount=5
-SearchText=物*
-SearchText=各*
-SearchText=我*
+SearchText=<G1578>
+SearchText=εξεκλιναν
+SearchText=lemma:G1578
+SearchText=<G5544>
+SearchText=<5544>
[LDView]
CBC=
@@ -32,31 +37,31 @@
StrongsHebrew=
[ModuleOptions]
-Cross-references=On
-Footnotes=On
+Cross-references=Off
+Footnotes=Off
Headings=Off
Hebrew Cantillation=Off
Hebrew Vowel Points=On
-Morphological Tags=Off
-Strong's Numbers=Off
+Morphological Tags=On
+Strong's Numbers=On
Textual Variants=Primary Reading
Transliteration=Off
Words of Christ in Red=Off
[Screen]
MainHeight=749
-MainLeft=254
-MainTop=252
+MainLeft=46
+MainTop=246
MainWidth=1050
Maximized=false
SearchHeight=566
-SearchLeft=224
+SearchLeft=411
SearchMaximized=false
SearchResCol0Width=175
-SearchTop=351
+SearchTop=337
SearchWidth=759
-TextComHeight=195
-TextWidth=368
+TextComHeight=284
+TextWidth=502
[TextView]
ASV=
Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr 2006-06-26 01:33:27 UTC (rev 429)
+++ trunk/sword.bpr 2006-06-27 11:03:36 UTC (rev 430)
@@ -43,7 +43,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -57,16 +57,16 @@
-I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_
-D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
-D_CL_DISABLE_MULTITHREADING"/>
- <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
+ <CFLAG1 value="-O2 -Vx -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 /zi"/>
- <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/>
+ <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="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -75,7 +75,7 @@
MajorVer=1
MinorVer=5
Release=8
-Build=3
+Build=7
Debug=0
PreRelease=0
Special=0
@@ -87,13 +87,13 @@
[Version Info Keys]
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.8.3
+FileVersion=1.5.8.7
InternalName=biblecs
LegalCopyright=(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.8
+ProductVersion=1.5.8RC3
Comments=Seek Him and you will find Him
[HistoryLists\hlIncludePath]
@@ -141,8 +141,8 @@
[HistoryLists\hlConditionals]
Count=16
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
@@ -183,7 +183,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Modified: trunk/sword.res
===================================================================
(Binary files differ)
Added: trunk/xref.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/xref.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the sword-cvs
mailing list