[sword-svn] r412 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2005-02-11 12:52:52 -0700 (Fri, 11 Feb 2005)
New Revision: 412

Modified:
   trunk/AboutBoxfrm.dfm
   trunk/optionfrm.cpp
   trunk/swdisprtfchap.cpp
   trunk/sword.bpr
   trunk/sword.res
Log:
Fixed Each Verse On A New Line optionfrm.cpp

Modified: trunk/AboutBoxfrm.dfm
===================================================================
(Binary files differ)

Modified: trunk/optionfrm.cpp
===================================================================
--- trunk/optionfrm.cpp	2005-02-10 14:47:18 UTC (rev 411)
+++ trunk/optionfrm.cpp	2005-02-11 19:52:52 UTC (rev 412)
@@ -32,7 +32,7 @@
 	FontDialogLD = new TFontSelFrm(this);
 	FontDialogPopup = new TFontSelFrm(this);
 	FontDialogSearch = new TFontSelFrm(this);
-        FontDialogUI = new TFontSelFrm(this);
+	FontDialogUI = new TFontSelFrm(this);
 }
 //--------------------------------------------------------------------------- 
 void __fastcall TOptionsfrm::btnCurrVerseClick(TObject *Sender)
@@ -88,7 +88,7 @@
 			CopyFontDlg(FontDialogComment, FontDialogText);
 			CopyFontDlg(FontDialogLD, FontDialogText);
 			CopyFontDlg(FontDialogPopup, FontDialogText);
-                        CopyFontDlg(FontDialogUI, FontDialogText);
+				    CopyFontDlg(FontDialogUI, FontDialogText);
 			UpdatePreview();
 		}else CopyFontDlg(FontDialogText, tempFrm);
 		break;
@@ -122,7 +122,7 @@
 			UpdatePreview();
 		else	CopyFontDlg(FontDialogSearch, tempFrm);
 		break;
-        case 6: // User Interface
+	   case 6: // User Interface
 		CopyFontDlg(tempFrm, FontDialogUI);
 		if(FontDialogUI->ShowModal() == mrOk)
 			UpdatePreview();
@@ -298,7 +298,7 @@
 		emap.erase("LDBackColor"); emap.insert(ConfigEntMap::value_type("LDBackColor", IntToStr(FontDialogLD->BackColor).c_str()));
 		emap.erase("PopupBackColor"); emap.insert(ConfigEntMap::value_type("PopupBackColor", IntToStr(FontDialogPopup->BackColor).c_str()));
 		emap.erase("SearchBackColor"); emap.insert(ConfigEntMap::value_type("SearchBackColor", IntToStr(FontDialogSearch->BackColor).c_str()));
-                emap.erase("UIBackColor"); emap.insert(ConfigEntMap::value_type("UIBackColor", IntToStr(FontDialogUI->BackColor).c_str()));
+			 emap.erase("UIBackColor"); emap.insert(ConfigEntMap::value_type("UIBackColor", IntToStr(FontDialogUI->BackColor).c_str()));
 
 		emap.erase("TextFontName"); emap.insert(ConfigEntMap::value_type("TextFontName", (FontDialogText->Font->Name).c_str()));
 		emap.erase("CommentFontName"); emap.insert(ConfigEntMap::value_type("CommentFontName", (FontDialogComment->Font->Name).c_str()));

Modified: trunk/swdisprtfchap.cpp
===================================================================
--- trunk/swdisprtfchap.cpp	2005-02-10 14:47:18 UTC (rev 411)
+++ trunk/swdisprtfchap.cpp	2005-02-11 19:52:52 UTC (rev 412)
@@ -106,9 +106,6 @@
 				}
 				else break;
 			} while (true);
-			if ((verse > 1) && (dispAttribs.verseNewLine)) {
-				newtext += "\\par ";
-			}
 			if (Module.Direction() == DIRECTION_RTL && (platformID == VER_PLATFORM_WIN32_WINDOWS	 || (Module.Lang() && strnicmp(Module.Lang(), "he", 2) && strnicmp(Module.Lang(), "ar", 2)))) {
 				newtext = newtext + RTFVersePre;
 				if ((key->Verse() == verse) && (dispAttribs.markCurrentVerse)) {
@@ -127,6 +124,9 @@
 				}
 				newtext += tmptext + RTFVersePost;
 			}
+			if (dispAttribs.verseNewLine) {
+				newtext += "\\par ";
+			}
 		}
 		if (key->Verse() == verse) {
 			tmptext = newtext + RTFTrailer + "}";

Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr	2005-02-10 14:47:18 UTC (rev 411)
+++ trunk/sword.bpr	2005-02-11 19:52:52 UTC (rev 412)
@@ -74,7 +74,7 @@
 MajorVer=1
 MinorVer=5
 Release=6
-Build=21
+Build=24
 Debug=0
 PreRelease=0
 Special=0
@@ -86,13 +86,13 @@
 [Version Info Keys]
 CompanyName=CrossWire Software & Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.6.21
+FileVersion=1.5.6.24
 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.8pre2
+ProductVersion=1.5.8pre3
 Comments=Seek Him and you will find Him
 
 [HistoryLists\hlIncludePath]

Modified: trunk/sword.res
===================================================================
(Binary files differ)