[sword-cvs] swordreader/src/gui NavRenderText.cpp,1.6,1.7 gui.vcl,1.16,1.17

Sun, 8 Feb 2004 11:25:26 -0700

Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv3244/src/gui

Modified Files:
	NavRenderText.cpp gui.vcl 
Log Message:
Added support for preverse headers

Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7

--- NavRenderText.cpp	31 Jan 2004 22:43:32 -0000	1.6
+++ NavRenderText.cpp	8 Feb 2004 18:25:23 -0000	1.7
@@ -1,6 +1,7 @@
 #include "ApplicationInterface.h"
 #include "NavRenderText.h"
 #include "Navigator.h"
+#include <swordce.h>
 
 //#define NOHTML
 
@@ -74,7 +75,19 @@
 	text += L"</head><body>";
 	UString s;
 	UString heading;
+	char buf[10];
 	while (true) {
+			int pvHeading = 0;
+			do {
+				sprintf(buf, "%i", pvHeading++);
+				SWBuf preverseHeading = navigator->position.bible->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
+				if (preverseHeading.length()) {
+					text += L"<br><br><b>";
+					text += (WCHAR *)navigator->position.bible->RenderText(preverseHeading); // do any tag conversions for our requested markup
+					text += L"</b><br><br>";
+				}
+				else break;
+			} while (true);
 			s = navigator->position.verseText();
 			if (s.length() > 0) {
 				heading = getVerseHeader();
@@ -147,7 +160,8 @@
 #else //ifndef NOHTML
 
 // A simpeler graphical representation not using the HTML component
-
+
+
 NavRenderText::NavRenderText(Navigator* navigator) {
 	this->navigator=navigator;
 }

Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gui.vcl	3 Feb 2004 18:45:35 -0000	1.16
+++ gui.vcl	8 Feb 2004 18:25:23 -0000	1.17
@@ -3,45 +3,15 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
+--------------------Configuration: gui - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP5F.tmp" with contents
-[
-/nologo /W3 /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "ARM" /D "_ARM_" /D UNDER_CE=300 /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /FR"ARMRel/" /Fp"ARMRel/gui.pch" /YX /Fo"ARMRel/" /Oxs /MC /c 
-"D:\src\swordreader\src\gui\Navigator.cpp"
-]
-Creating command line "clarm.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP5F.tmp" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP60.tmp" with contents
-[
-..\Dll1\ARMRel\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib ..\Dll1\ARMRel\sword.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"ARMRel/gui.pdb" /nodefaultlib:"libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib" /out:"ARMRel/gui.exe" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:windowsce,3.00 /align:"4096" /MACHINE:ARM 
-.\ARMRel\ApplicationInterface.obj
-.\ARMRel\Main.obj
-.\ARMRel\NavBooks.obj
-.\ARMRel\NavFind.obj
-.\ARMRel\Navigator.obj
-.\ARMRel\NavNumbers.obj
-.\ARMRel\NavRenderText.obj
-.\ARMRel\SwordIndex.obj
-.\ARMRel\Utils.obj
-.\ARMRel\BibleReader.res
-]
-Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP60.tmp"
-<h3>Output Window</h3>
-Compiling...
-Navigator.cpp
-..\..\..\sword\include\swbuf.h(206) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-..\..\..\sword\include\swbuf.h(213) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-Linking...
-Creating command line "bscmake.exe /nologo /o"ARMRel/gui.bsc"  .\ARMRel\ApplicationInterface.sbr .\ARMRel\Main.sbr .\ARMRel\NavBooks.sbr .\ARMRel\NavFind.sbr .\ARMRel\Navigator.sbr .\ARMRel\NavNumbers.sbr .\ARMRel\NavRenderText.sbr .\ARMRel\SwordIndex.sbr .\ARMRel\Utils.sbr"
-Creating browse info file...
-<h3>Output Window</h3>
 
 
 
 
 <h3>Results</h3>
-gui.exe - 0 error(s), 2 warning(s)
+gui.exe - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>



