[sword-cvs] swordreader/src/gui SwordIndex.cpp,1.1.1.1,1.2 gui.vcl,1.1.1.1,1.2

Fri, 16 Jan 2004 19:57:44 -0700

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

Modified Files:
	SwordIndex.cpp gui.vcl 
Log Message:
wince fixes


Index: SwordIndex.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2

--- SwordIndex.cpp	16 Jan 2004 17:34:19 -0000	1.1.1.1
+++ SwordIndex.cpp	17 Jan 2004 02:57:42 -0000	1.2
@@ -4,6 +4,7 @@
 
 #include "ApplicationInterface.h"
 #include "SwordIndex.h"
+#include <markupfiltmgr.h>
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -11,9 +12,9 @@
 
 const WCHAR* configDir=L"\\Program Files\\sword";
 const CHAR* swordConfigDir="/Program Files/sword/";
-const WCHAR* configFile=L"\\Program Files\\sword\\mods.conf";
-const WCHAR* autoInstallDir=L"\\Program Files\\sword\\newmods";
-const CHAR* swordAutoInstallDir="/Program Files/sword/newmods/";
+//const WCHAR* configFile=L"\\Program Files\\sword\\mods.conf";
+//const WCHAR* autoInstallDir=L"\\Program Files\\sword\\newmods";
+//const CHAR* swordAutoInstallDir="/Program Files/sword/newmods/";
 
 TCHAR* defBookNames[66]={
 L"Gen",L"Exo",L"Lev",L"Num",L"Deu",L"Jos",L"Jud",L"Rut",L"1Sa",
@@ -52,25 +53,23 @@
 void SwordIndex::initManager() {
 	if (indices==0) { //We need a manager
 		//make sure the right files are available
-		CreateDirectory(configDir,NULL);
-		CreateDirectory(autoInstallDir,NULL);
-		HANDLE newConf=CreateFile(configFile,GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
-		if (newConf!=INVALID_HANDLE_VALUE) {
-			DWORD check=0;
-			std::string line1="[Globals]\r\n";
-			std::string line2="AutoInstall=";
-			line2+=String(swordAutoInstallDir);
-			line2+="\r\n";
-			WriteFile(newConf,line1.c_str(),line1.length(),&check,NULL);
-			WriteFile(newConf,line2.c_str(),line2.length(),&check,NULL);
-			CloseHandle(newConf);
-		}
+//		CreateDirectory(configDir,NULL);
+//		CreateDirectory(autoInstallDir,NULL);
+//		HANDLE newConf=CreateFile(configFile,GENERIC_WRITE,0,NULL,CREATE_NEW,0,0);
+//		if (newConf!=INVALID_HANDLE_VALUE) {
+//			DWORD check=0;
+//			std::string line1="[Globals]\r\n";
+//			std::string line2="AutoInstall=";
+//			line2+=String(swordAutoInstallDir);
+//			line2+="\r\n";
+//			WriteFile(newConf,line1.c_str(),line1.length(),&check,NULL);
+//			WriteFile(newConf,line2.c_str(),line2.length(),&check,NULL);
+//			CloseHandle(newConf);
+//		}
 
 		texts=new ModuleMap();
 		__try {
-			manager=new sword::SWMgr(swordConfigDir,true, 
-				new sword::SWFilterMgr()
-			);
+			manager=new sword::SWMgr(new sword::MarkupFilterMgr(sword::FMT_HTMLHREF));
 			//get the available bibles out of here
 			sword::ModMap::iterator it;
 			sword::SWModule* curMod = 0;

Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gui.vcl	16 Jan 2004 17:34:18 -0000	1.1.1.1
+++ gui.vcl	17 Jan 2004 02:57:42 -0000	1.2
@@ -6,64 +6,12 @@
 --------------------Configuration: gui - Win32 (WCE x86) Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"X86Dbg/BibleReader.res" /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "WIN32_PLATFORM_PSPC=310" /d "_X86_" /d "x86" /d "_i386_" /r "D:\src\SwordReader\src\gui\BibleReader.rc"" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPA.tmp" with contents
-[
-/nologo /W3 /Zi /Od /I "..\STL_eVC" /I "..\..\..\sword\include" /I "..\dll1\wincesword\include" /D "DEBUG" /D "_i386_" /D UNDER_CE=300 /D _WIN32_WCE=300 /D "WIN32_PLATFORM_PSPC=310" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Fp"X86Dbg/gui.pch" /YX /Fo"X86Dbg/" /Fd"X86Dbg/" /Gs8192 /GF /c 
-"D:\src\SwordReader\src\gui\ApplicationInterface.cpp"
-"D:\src\SwordReader\src\gui\Main.cpp"
-"D:\src\SwordReader\src\gui\NavBooks.cpp"
-"D:\src\SwordReader\src\gui\Navigator.cpp"
-"D:\src\SwordReader\src\gui\NavNumbers.cpp"
-"D:\src\SwordReader\src\gui\NavRenderText.cpp"
-"D:\src\SwordReader\src\gui\SwordIndex.cpp"
-"D:\src\SwordReader\src\gui\Utils.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPA.tmp" 
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPB.tmp" with contents
-[
-corelibc.lib ..\Dll1\X86Dbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:yes /pdb:"X86Dbg/gui.pdb" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib /nodefaultlib:oldnames.lib /out:"X86Dbg/gui.exe" /subsystem:windowsce,3.00 /MACHINE:IX86 
-.\X86Dbg\ApplicationInterface.obj
-.\X86Dbg\Main.obj
-.\X86Dbg\NavBooks.obj
-.\X86Dbg\Navigator.obj
-.\X86Dbg\NavNumbers.obj
-.\X86Dbg\NavRenderText.obj
-.\X86Dbg\SwordIndex.obj
-.\X86Dbg\Utils.obj
-.\X86Dbg\BibleReader.res
-]
-Creating command line "link.exe @C:\DOCUME~1\scribe\LOCALS~1\Temp\RSPB.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-ApplicationInterface.cpp
-Main.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)
-NavBooks.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)
-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)
-NavNumbers.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)
-NavRenderText.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)
-SwordIndex.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)
-Utils.cpp
-Linking...
 
 
 
 
 <h3>Results</h3>
-gui.exe - 0 error(s), 12 warning(s)
+gui.exe - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>



