[sword-cvs] swordreader/src/gui ApplicationInterface.cpp,1.1.1.1,1.2 ApplicationInterface.h,1.1.1.1,1.2 Main.cpp,1.4,1.5 NavBooks.cpp,1.1.1.1,1.2 NavBooks.h,1.1.1.1,1.2 NavNumbers.cpp,1.1.1.1,1.2 NavNumbers.h,1.1.1.1,1.2 NavRenderText.cpp,1.5,1.6 Navigator.cpp,1.4,1.5 Navigator.h,1.4,1.5 SwordIndex.cpp,1.8,1.9 SwordIndex.h,1.4,1.5 Utils.h,1.1.1.1,1.2 gui.vcl,1.14,1.15 gui.vcp,1.4,1.5
sword@www.crosswire.org
sword@www.crosswire.org
Sat, 31 Jan 2004 15:43:35 -0700
Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv28144/src/gui
Modified Files:
ApplicationInterface.cpp ApplicationInterface.h Main.cpp
NavBooks.cpp NavBooks.h NavNumbers.cpp NavNumbers.h
NavRenderText.cpp Navigator.cpp Navigator.h SwordIndex.cpp
SwordIndex.h Utils.h gui.vcl gui.vcp
Log Message:
- Some cosmetic changes
- Added first steps of the find-page
Index: ApplicationInterface.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/ApplicationInterface.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ApplicationInterface.cpp 16 Jan 2004 17:34:08 -0000 1.1.1.1
+++ ApplicationInterface.cpp 31 Jan 2004 22:43:32 -0000 1.2
@@ -87,10 +87,21 @@
setMenuSelected(g_hwndCB,MENU_FIND,(mode==MENU_FIND));
}
-void addMenu(HMENU menu, int id, UString text) {
- AppendMenu(menu,0,USERBUTTONS+id,text.c_str());
-}
-
+void addMenu(HMENU menu, int id, UString text) {
+ AppendMenu(menu,0,USERBUTTONS+id,text.c_str());
+}
+
+HMENU registerID(int id) {
+ return (HMENU) (USERBUTTONS+id);
+}
+
void checkMenu(HMENU menu, int id, bool checked) {
CheckMenuItem(menu,USERBUTTONS+id,checked?MF_CHECKED:MF_UNCHECKED);
}
+
+UString getText(HWND edit) {
+ TCHAR chars[MAX_LOADSTRING];
+ SendMessage(edit,WM_GETTEXT,(WPARAM)MAX_LOADSTRING,(LPARAM)chars);
+ chars[MAX_LOADSTRING-1]=0; // in case the buffer was exceeded
+ return UString(chars);
+}
\ No newline at end of file
Index: ApplicationInterface.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/ApplicationInterface.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ApplicationInterface.h 16 Jan 2004 17:34:08 -0000 1.1.1.1
+++ ApplicationInterface.h 31 Jan 2004 22:43:32 -0000 1.2
@@ -86,6 +86,11 @@
void addMenu(HMENU menu, int id, UString text);
-void checkMenu(HMENU menu, int id, bool checked);
+void checkMenu(HMENU menu, int id, bool checked);
+
+// Get an id to give to the CreateWindow as hMenu
+HMENU registerID(int id);
+
+UString getText(HWND edit);
#endif
Index: Main.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Main.cpp 29 Jan 2004 06:47:55 -0000 1.4
+++ Main.cpp 31 Jan 2004 22:43:32 -0000 1.5
@@ -135,8 +135,7 @@
g_navigator->mouseDown(LOWORD(lParam),HIWORD(lParam));//x,y
break;
case WM_KEYDOWN:
-/* case WM_HOTKEY:
-*/ g_navigator->keyDown(wParam, lParam);
+ g_navigator->keyDown(wParam, lParam);
break;
@@ -201,16 +200,7 @@
PostQuitMessage(0);
break;
case WM_ACTIVATE:
- // UGLIEST HACK: we need to receive these messages when the HTML-control is active
-/* if (wParam==WA_INACTIVE) {
- UnregisterHotKey(g_hWnd,VK_LEFT);
- UnregisterHotKey(g_hWnd,VK_RIGHT);
- }
- else {
- RegisterHotKey(g_hWnd,VK_LEFT,0,VK_LEFT);
- RegisterHotKey(g_hWnd,VK_RIGHT,0,VK_RIGHT);
- }
- */ // Notify shell of our activate message
+ // Notify shell of our activate message
SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE);
break;
case WM_SETTINGCHANGE:
Index: NavBooks.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NavBooks.cpp 16 Jan 2004 17:34:19 -0000 1.1.1.1
+++ NavBooks.cpp 31 Jan 2004 22:43:32 -0000 1.2
@@ -1,7 +1,3 @@
-// NavBooks.cpp: implementation of the NavBooks class.
-//
-//////////////////////////////////////////////////////////////////////
-
#include "ApplicationInterface.h"
#include "NavBooks.h"
Index: NavBooks.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NavBooks.h 16 Jan 2004 17:34:19 -0000 1.1.1.1
+++ NavBooks.h 31 Jan 2004 22:43:32 -0000 1.2
@@ -1,9 +1,5 @@
-// NavBooks.h: interface for the NavBooks class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_NAVBOOKS_H__35FAA458_FB75_451F_ABA4_FEE4D5D24BFC__INCLUDED_)
-#define AFX_NAVBOOKS_H__35FAA458_FB75_451F_ABA4_FEE4D5D24BFC__INCLUDED_
+#ifndef NAVBOOKS_H
+#define NAVBOOKS_H
#if _MSC_VER > 1000
#pragma once
@@ -19,7 +15,7 @@
public:
NavBooks(Navigator* navigator);
virtual ~NavBooks();
- // redraw the screen. This should use methods in BibleReader.h to do the drawing
+ // redraw the screen. This should use methods in ApplicationInterface.h to do the drawing
void paint();
// signals that the user has tapped somewhere.
// returns: the number that the user has tapped. -1 if no number
@@ -31,4 +27,4 @@
int maxNumber, maxOTNumber;
};
-#endif // !defined(AFX_NAVBOOKS_H__35FAA458_FB75_451F_ABA4_FEE4D5D24BFC__INCLUDED_)
+#endif
Index: NavNumbers.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NavNumbers.cpp 16 Jan 2004 17:34:19 -0000 1.1.1.1
+++ NavNumbers.cpp 31 Jan 2004 22:43:32 -0000 1.2
@@ -1,15 +1,7 @@
-// NavNumbers.cpp: implementation of the NavNumbers class.
-//
-//////////////////////////////////////////////////////////////////////
-
#include "ApplicationInterface.h"
#include "NavNumbers.h"
#include "Navigator.h"
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
//RECT RECT_SCREEN = {0,0,240,294};
Index: NavNumbers.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NavNumbers.h 16 Jan 2004 17:34:19 -0000 1.1.1.1
+++ NavNumbers.h 31 Jan 2004 22:43:32 -0000 1.2
@@ -17,7 +17,7 @@
// initialize with this maximum number
void show(int maxNumber, UString command);
- // redraw the screen. This should use methods in BibleReader.h to do the drawing
+ // redraw the screen. This should use methods in ApplicationInterface.h to do the drawing
void paint();
// signals that the user has tapped somewhere.
// returns: the number that the user has tapped. -1 if no number
Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NavRenderText.cpp 24 Jan 2004 22:29:59 -0000 1.5
+++ NavRenderText.cpp 31 Jan 2004 22:43:32 -0000 1.6
@@ -1,22 +1,13 @@
-// NavRenderText.cpp: implementation of the NavRenderText class.
-//
-//////////////////////////////////////////////////////////////////////
-
#include "ApplicationInterface.h"
#include "NavRenderText.h"
#include "Navigator.h"
-
//#define NOHTML
-
#ifndef NOHTML
-
#include <htmlctrl.h>
-#define scrollTick 1
-
//#define debugfile
#ifdef debugfile
@@ -78,11 +69,9 @@
currentBook=navigator->position.getBook();
currentChapter=navigator->position.getChap();
UString text = L"";
-// text += L"<?xml version=\"1.0\" encoding=\"UTF-16\"?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">";
- text += L"<html><head><title>c</title>";
- text += L"<style type=\"text/css\">small:{display:none}";
-// text += L"html, body {Font-family: code2000;}";
- text += L"</style></head><body>";
+// text += L"<?xml version=\"1.0\" encoding=\"UTF-16\"?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"; // This is not recognized properly
+ text += L"<html><head><title>c</title>"; // a <style> section presumably gets skipped
+ text += L"</head><body>";
UString s;
UString heading;
while (true) {
@@ -157,9 +146,8 @@
#else //ifndef NOHTML
-
-
-//simpeler graphical representation not using the HTML component
+// A simpeler graphical representation not using the HTML component
+
NavRenderText::NavRenderText(Navigator* navigator) {
this->navigator=navigator;
}
@@ -197,7 +185,7 @@
while ((textRect.top<textRect.bottom)&&(!ready)) {
__try {
- s = navigator->position.verseText();
+ s = noMarkup(navigator->position.verseText());
if (s.length() > 0) {
heading = getVerseHeader();
textRect.top += drawVerseText(&textRect,heading+s);
@@ -219,17 +207,17 @@
UString NavRenderText::getVerseHeader() {
- String result;
+ UString result;
if (navigator->position.getVerse()==1) {
- result+=toCString(navigator->position.getChap());
+ result+=toUString(navigator->position.getChap());
result+=":";
}
- result+=toCString(navigator->position.getVerse());
+ result+=toUString(navigator->position.getVerse());
result+=" ";
- return toUString(result);
+ return result;
}
@@ -259,7 +247,5 @@
navigator->updateTitle();
}
-
-
#endif
Index: Navigator.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Navigator.cpp 29 Jan 2004 06:47:55 -0000 1.4
+++ Navigator.cpp 31 Jan 2004 22:43:32 -0000 1.5
@@ -1,19 +1,13 @@
-// Navigator.cpp: implementation of the Navigator class.
-//
-//////////////////////////////////////////////////////////////////////
-
#include "ApplicationInterface.h"
#include "Navigator.h"
#include "NavNumbers.h"
#include "NavBooks.h"
-#include "NavRenderText.h"
+#include "NavRenderText.h"
+#include "NavFind.h"
#include <swordce.h>
#include <swmgr.h>
using namespace sword;
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
#define WIDTH 240
#define HEIGHT 294
@@ -26,13 +20,13 @@
RECT RECT_FIELD = {6,24,240,250};
-
Navigator::Navigator(RECT* screen) {
RECT_SCREEN=*screen;
mode=-1;
numbers=new NavNumbers(this);
books=new NavBooks(this);
- text=new NavRenderText(this);
+ text=new NavRenderText(this);
+ find=new NavFind(this);
nextID = 1;
optStartID = 0;
optEndID = 0;
@@ -45,7 +39,8 @@
Navigator::~Navigator() {
delete numbers;
delete books;
- delete text;
+ delete text;
+ delete find;
if (options)
delete options;
}
@@ -55,14 +50,17 @@
}
void Navigator::setMode(int mode) {
- if (this->mode==MODE_TEXT) text->hide();
+ switch (this->mode) {
+ case MODE_TEXT: text->hide(); break;
+ case MODE_FIND: find->hide(); break;
+ }
this->mode=mode;
switch (mode) {
case MODE_BOOK: selectMenu(MENU_BOOK); break;
case MODE_CHAP: selectMenu(MENU_CHAP); showChap(); break;
case MODE_VERSE: selectMenu(MENU_VERSE); showVerse(); break;
case MODE_TEXT: selectMenu(MENU_TEXT); text->show(); break;
- case MODE_FIND: selectMenu(MENU_FIND); break;
+ case MODE_FIND: selectMenu(MENU_FIND); find->show();break;
};
updateTitle();
refresh();
@@ -78,13 +76,11 @@
if (mode==MODE_TEXT) {
text->paint();
}
- if (mode==MODE_FIND) {
- clearRect(&RECT_SCREEN);
- drawText(&RECT_SELECTLABEL, UString(L"Not yet implemented."));
+ if (mode==MODE_FIND) {
+ find->paint();
}
}
-
void Navigator::showChap() {
numbers->show(position.chapCount(),UString(L"Select a chapter:"));
}
@@ -109,7 +105,9 @@
toggleOptionMenu(id);
setMode(MODE_TEXT);
text->show(true);
- }
+ }
+ else if (mode==MODE_FIND)
+ find->buttonClicked(id);
}
void Navigator::keyDown(WPARAM id, LPARAM lparam) {
@@ -294,3 +292,6 @@
else MessageBox(0, target, L"url clicked", MB_OK);
}
+int Navigator::getID() {
+ return nextID++;
+}
\ No newline at end of file
Index: Navigator.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Navigator.h 29 Jan 2004 06:47:55 -0000 1.4
+++ Navigator.h 31 Jan 2004 22:43:32 -0000 1.5
@@ -1,9 +1,5 @@
-// Navigator.h: interface for the Navigator class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_NAVIGATOR_H__3F8DCC07_29A2_46F6_B31C_897A653319E5__INCLUDED_)
-#define AFX_NAVIGATOR_H__3F8DCC07_29A2_46F6_B31C_897A653319E5__INCLUDED_
+#ifndef NAVIGATOR_H
+#define NAVIGATOR_H
#if _MSC_VER > 1000
#pragma once
@@ -30,7 +26,8 @@
class NavNumbers;
class NavBooks;
-class NavRenderText;
+class NavRenderText;
+class NavFind;
class Navigator
{
@@ -59,14 +56,16 @@
SwordIndex position;
NavNumbers* numbers;
NavBooks* books;
- NavRenderText* text;
+ NavRenderText* text;
+ NavFind* find;
Navigator(RECT* screen);
virtual ~Navigator();
void updateTitle();
void fillTranslationsMenu(HMENU menuTranslations);
- void fillGlobalOptionsMenu(HMENU menuTranslations);
+ void fillGlobalOptionsMenu(HMENU menuTranslations);
+ int getID();
void toggleOptionMenu(int id);
void refresh();
void setMode(int mode);
@@ -78,4 +77,4 @@
bool initialized() {return position.initialized();}
};
-#endif // !defined(AFX_NAVIGATOR_H__3F8DCC07_29A2_46F6_B31C_897A653319E5__INCLUDED_)
+#endif
Index: SwordIndex.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SwordIndex.cpp 31 Jan 2004 13:00:07 -0000 1.8
+++ SwordIndex.cpp 31 Jan 2004 22:43:32 -0000 1.9
@@ -1,22 +1,10 @@
-// SwordIndex.cpp: implementation of the SwordIndex class.
-//
-//////////////////////////////////////////////////////////////////////
-
#include "ApplicationInterface.h"
#include "SwordIndex.h"
#include <markupfiltmgr.h>
#include <swordce.h>
#include "swwinlog.h"
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-const WCHAR* configDir=L"\\Program Files\\sword\\books";
const CHAR* swordConfigDir="/Program Files/sword/books";
-//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",
@@ -59,28 +47,9 @@
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);
-// }
texts=new ModuleMap();
__try {
- manager=new sword::SWMgr(swordConfigDir,true,new sword::MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16));
-// manager->augmentModules("/SD Card");
- //get the available bibles out of here
-
-// manager=new sword::SWMgr(swordConfigDir,true, new sword::SWFilterMgr());
-
+ manager=new sword::SWMgr(new sword::MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16));
sword::ModMap::iterator it;
sword::SWModule* curMod = 0;
@@ -195,4 +164,4 @@
void SwordIndex::setModule(Module m) {
bible=m;
bible->setKey(verse);
-}
+}
Index: SwordIndex.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SwordIndex.h 29 Jan 2004 06:47:55 -0000 1.4
+++ SwordIndex.h 31 Jan 2004 22:43:32 -0000 1.5
@@ -1,9 +1,5 @@
-// SwordIndex.h: interface for the SwordIndex class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_SWORDINDEX_H__C86FE833_2BA2_4D9F_9CAD_2499BD8CA686__INCLUDED_)
-#define AFX_SWORDINDEX_H__C86FE833_2BA2_4D9F_9CAD_2499BD8CA686__INCLUDED_
+#ifndef SWORDINDEX_H
+#define SWORDINDEX_H
#if _MSC_VER > 1000
#pragma once
@@ -98,4 +94,4 @@
void operator-=(int count) {verse->decrement(count);};
};
-#endif // !defined(AFX_SWORDINDEX_H__C86FE833_2BA2_4D9F_9CAD_2499BD8CA686__INCLUDED_)
+#endif
Index: Utils.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Utils.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Utils.h 16 Jan 2004 17:34:20 -0000 1.1.1.1
+++ Utils.h 31 Jan 2004 22:43:32 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef LIB_H
-#define LIB_H
+#ifndef UTILS_H
+#define UTILS_H
#if _MSC_VER > 1000
#pragma once
Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gui.vcl 29 Jan 2004 06:47:55 -0000 1.14
+++ gui.vcl 31 Jan 2004 22:43:32 -0000 1.15
@@ -1,41 +1,79 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP1576.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" /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\RSP1576.tmp"
-Creating temporary file "C:\DOCUME~1\scribe\LOCALS~1\Temp\RSP1577.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\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\RSP1577.tmp"
-<h3>Output Window</h3>
-Compiling...
-Navigator.cpp
-Linking...
-
-
-
-
-<h3>Results</h3>
-gui.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating command line "rc.exe /l 0x409 /fo"ARMRel/BibleReader.res" /i "..\dll1\sword\include" /i "..\dll1\wincesword\include" /i "..\STL_eVC" /d UNDER_CE=300 /d _WIN32_WCE=300 /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "WIN32_PLATFORM_PSPC=310" /d "ARM" /d "_ARM_" /r "D:\SwordReader\swordreader\src\gui\BibleReader.rc""
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP194.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" /Fp"ARMRel/gui.pch" /YX /Fo"ARMRel/" /Oxs /MC /c
+"D:\SwordReader\swordreader\src\gui\ApplicationInterface.cpp"
+"D:\SwordReader\swordreader\src\gui\Main.cpp"
+"D:\SwordReader\swordreader\src\gui\NavBooks.cpp"
+"D:\SwordReader\swordreader\src\gui\NavFind.cpp"
+"D:\SwordReader\swordreader\src\gui\Navigator.cpp"
+"D:\SwordReader\swordreader\src\gui\NavNumbers.cpp"
+"D:\SwordReader\swordreader\src\gui\NavRenderText.cpp"
+"D:\SwordReader\swordreader\src\gui\SwordIndex.cpp"
+"D:\SwordReader\swordreader\src\gui\Utils.cpp"
+]
+Creating command line "clarm.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP194.tmp"
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP195.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 @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP195.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)
+NavFind.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)
+D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(103) : warning C4509: nonstandard extension used: 'load' uses SEH and 'heading' has destructor
+ D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(76) : see declaration of 'heading'
+D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(103) : warning C4509: nonstandard extension used: 'load' uses SEH and 's' has destructor
+ D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(75) : see declaration of 's'
+D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(103) : warning C4509: nonstandard extension used: 'load' uses SEH and 'text' has destructor
+ D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(71) : see declaration of 'text'
+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), 17 warning(s)
+</pre>
+</body>
+</html>
Index: gui.vcp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gui.vcp 21 Jan 2004 06:15:33 -0000 1.4
+++ gui.vcp 31 Jan 2004 22:43:32 -0000 1.5
@@ -1,1008 +1,1384 @@
-# Microsoft eMbedded Visual Tools Project File - Name="gui" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86) Application" 0x8301
-# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
-
-CFG=gui - Win32 (WCE ARM) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
[...2361 lines suppressed...]
+SOURCE=.\BibleReader.ICO
+# End Source File
+# Begin Source File
+
+SOURCE=.\BibleReader.rc
+
+!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project