[sword-svn] r433 - in trunk: . stage
scribe at crosswire.org
scribe at crosswire.org
Tue Jul 25 11:17:15 MST 2006
Author: scribe
Date: 2006-07-25 11:17:11 -0700 (Tue, 25 Jul 2006)
New Revision: 433
Modified:
trunk/AboutBoxfrm.dfm
trunk/RxRichEditX.cpp
trunk/mainfrm.cpp
trunk/searchfrm.cpp
trunk/stage/layout.conf
trunk/stage/options.conf
trunk/sword.bpr
trunk/sword.res
Log:
Updated with DM Smith patch to fix contiguous /par and \n with ' '
Prep for RC6
Modified: trunk/AboutBoxfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/RxRichEditX.cpp 2006-07-25 18:17:11 UTC (rev 433)
@@ -403,19 +403,30 @@
newtext = newtext + "{";
tmptext = "";
+ // When stripNewlines == true, replace multiple sequences of "newlines" with a single space
+ boolean handleNL = true;
for (const char *loop = module->RenderText(); *loop; loop++) {
if (stripNewlines) {
if (!strnicmp(loop, "\\par", 4)) {
loop += (loop[4] == 'd') ? 4 : 3;
- continue;
+ if (handleNL)
+ tmptext += " ";
+ handleNL = false;
}
+ else if (*loop == '\n') {
+ if (handleNL)
+ tmptext += " ";
+ handleNL = false;
+ }
+ else {
+ tmptext += *loop;
+ handleNL = true;
+ }
}
- if (*loop == '\n') {
- if (!stripNewlines)
- tmptext += "{\\par}";
+ else if (*loop == '\n') {
+ tmptext += "{\\par}";
}
else tmptext += *loop;
-
}
if (tmptext.Length() > 3) { // make sure we have an entry
Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/mainfrm.cpp 2006-07-25 18:17:11 UTC (rev 433)
@@ -1332,7 +1332,7 @@
}
if ((eit = (*sit).second.find("LastLDKey")) != (*sit).second.end()) {
//DictKeyEdit->Text = UTF8ToWideString((*eit).second.c_str());
- DictKeyEdit->Text = (*eit).second.c_str();
+ DictKeyEdit->Text = UTF8ToWideString((*eit).second.c_str());
}
}
@@ -1714,7 +1714,7 @@
return;
SWBuf clickText = buf;
- SWBuf origText = Trim(clickText.c_str()).c_str();
+ SWBuf origText = Trim(AnsiString(clickText.c_str())).c_str();
if (clickText.c_str()[0] == '*') { // '*' = NOTE
ModMap::iterator it;
Modified: trunk/searchfrm.cpp
===================================================================
--- trunk/searchfrm.cpp 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/searchfrm.cpp 2006-07-25 18:17:11 UTC (rev 433)
@@ -372,6 +372,7 @@
}
void TsearchForm::setTarget(SWModule *itarget) {
+ bool diffTarget = target != itarget;
target = itarget;
AnsiString cap = target->Description() + (AnsiString) " (" + target->Name() + ")";
moduleName->Caption = UTF8ToWideString(cap);
@@ -383,7 +384,11 @@
// search framework stuff
if (target->hasSearchFramework() && target->isSearchOptimallySupported("God", -4, 0, 0)) {
searchTypeGroup->Items->CommaText = _tr("\"Multi Word\",\"Phrase\",\"Regular Expression\",\"Optimized Search\"");
- searchTypeGroup->ItemIndex = 3;
+
+ if (diffTarget) {
+ searchTypeGroup->ItemIndex = 3;
+ }
+
toggleIndexBtn->Caption = _tr("Delete Index");
indexStatus->Caption = _tr("Using Indexed Searching Framework For This Book");
toggleIndexBtn->Enabled = true;
@@ -393,7 +398,11 @@
else {
usingSearchFramework = false;
searchTypeGroup->Items->CommaText = _tr("\"Multi Word\",\"Phrase\",\"Regular Expression\"");
- searchTypeGroup->ItemIndex = 0;
+
+ if (diffTarget) {
+ searchTypeGroup->ItemIndex = 0;
+ }
+
toggleIndexBtn->Caption = _tr("Create Index");
indexStatus->Caption = _tr("Not Using Indexed Searching Framework For This Book");
if (!target->isSearchOptimallySupported("God", -4, 0, 0)) {
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/stage/layout.conf 2006-07-25 18:17:11 UTC (rev 433)
@@ -7,19 +7,19 @@
[History]
LastComModule=JFB
-LastLDKey=ABRAM
+LastLDKey=CREATION
LastLDModule=CBC
LastParaMod01=
LastParaMod02=
LastParaMod03=
-LastTextModule=KJVraw
-LastVerse=Matthew 19:28
+LastTextModule=NASB
+LastVerse=Matthew 19:1
LookupSaveCount=5
+LookupText=Matthew 19:1
+LookupText=Matthew 19:27
LookupText=Matthew 19:28
LookupText=Genesis 1:1
LookupText=I Corinthians 16:1
-LookupText=1 cor 16
-LookupText=Psalms 4:1
SearchSaveCount=5
SearchText=God love +world
SearchText=God love world
@@ -37,7 +37,7 @@
StrongsHebrew=
[ModuleOptions]
-Cross-references=Off
+Cross-references=On
Footnotes=Off
Headings=On
Hebrew Cantillation=Off
@@ -49,10 +49,10 @@
Words of Christ in Red=On
[Screen]
-MainHeight=749
-MainLeft=68
-MainTop=221
-MainWidth=1050
+MainHeight=776
+MainLeft=295
+MainTop=177
+MainWidth=1029
Maximized=false
SearchHeight=566
SearchLeft=599
@@ -60,8 +60,8 @@
SearchResCol0Width=175
SearchTop=51
SearchWidth=759
-TextComHeight=499
-TextWidth=667
+TextComHeight=511
+TextWidth=563
[TextView]
ASV=true
Modified: trunk/stage/options.conf
===================================================================
--- trunk/stage/options.conf 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/stage/options.conf 2006-07-25 18:17:11 UTC (rev 433)
@@ -128,6 +128,30 @@
HebrewDef=NasbHebrew
StrongsNumbers=ChiUn
+[PrintedPage]
+BottomMargin=0.75
+Footer=Page &p of &t
+Header=&d
+LeftMargin=0.50
+PrnFooter=0
+PrnHeader=0
+RightMargin=0.50
+TextBkName=1
+TextChHead=1
+TextChHeadSize=16
+TextFontName=Arial
+TextFontSize=12
+TextParagraph=1
+TextPostFixTag=1
+TextPreFixTag=1
+TextSuperVS=1
+TextVSNum=1
+TextVSNumSize=10
+TopMargin=0.50
+
+[Printing]
+Notice=1
+
[System]
MaxFiles=30
Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr 2006-07-01 21:45:55 UTC (rev 432)
+++ trunk/sword.bpr 2006-07-25 18:17:11 UTC (rev 433)
@@ -75,7 +75,7 @@
MajorVer=1
MinorVer=5
Release=8
-Build=9
+Build=10
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.9
+FileVersion=1.5.8.10
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.8rc4
+ProductVersion=1.5.8rc5
Comments=Seek Him and you will find Him
[HistoryLists\hlIncludePath]
Modified: trunk/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list