[sword-cvs] swordreader/src/gui NavChap.cpp,NONE,1.1 NavChap.h,NONE,1.1 NavVerse.cpp,NONE,1.1 NavVerse.h,NONE,1.1 NavBooks.cpp,1.3,1.4 NavBooks.h,1.3,1.4 NavNumbers.cpp,1.3,1.4 NavNumbers.h,1.3,1.4 NavPage.h,1.1,1.2 NavRenderText.cpp,1.8,1.9 Navigator.cpp,1.7,1.8 Navigator.h,1.6,1.7 gui.vcl,1.18,1.19 gui.vcp,1.7,1.8 NavPage.cpp,1.1,NONE
sword@www.crosswire.org
sword@www.crosswire.org
Sat, 28 Feb 2004 06:40:17 -0700
Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv736
Modified Files:
NavBooks.cpp NavBooks.h NavNumbers.cpp NavNumbers.h NavPage.h
NavRenderText.cpp Navigator.cpp Navigator.h gui.vcl gui.vcp
Added Files:
NavChap.cpp NavChap.h NavVerse.cpp NavVerse.h
Removed Files:
NavPage.cpp
Log Message:
Made pages generic in navigator
--- NEW FILE: NavChap.cpp ---
#include "NavChap.h"
#include "ApplicationInterface.h"
#include "NavFind.h"
#include "Navigator.h"
NavChap::NavChap(Navigator* navigator):NavNumbers(navigator){
command=L"Select a chapter";
}
NavChap::~NavChap(){
}
void NavChap::show() {
maxNumber=navigator->chapCount();
NavNumbers::show();
}
void NavChap::userTap(int x, int y) {
int number=numberAt(x,y);
if (number>0) {
navigator->setChap(number);
navigator->setMode(MODE_VERSE);
}
}
--- NEW FILE: NavChap.h ---
#ifndef NAVCHAP_H
#define NAVCHAP_H
class Navigator;
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#include "utils.h"
#include "NavPage.h"
#include "NavNumbers.h"
class Navigator;
class NavChap : public NavNumbers {
public:
NavChap(Navigator* navigator);
virtual ~NavChap();
void show();
void userTap(int x, int y);
};
#endif
--- NEW FILE: NavVerse.cpp ---
#include "NavVerse.h"
#include "ApplicationInterface.h"
#include "NavFind.h"
#include "Navigator.h"
NavVerse::NavVerse(Navigator* navigator):NavNumbers(navigator){
command=L"Select a verse";
}
NavVerse::~NavVerse(){
}
void NavVerse::show() {
NavNumbers::show();
maxNumber=navigator->verseCount();
}
void NavVerse::userTap(int x, int y) {
int number=numberAt(x,y);
if (number>0) {
navigator->setVerse(number);
navigator->setMode(MODE_TEXT);
}
}
--- NEW FILE: NavVerse.h ---
#ifndef NAVVERSE_H
#define NAVVERSE_H
class Navigator;
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#include "utils.h"
#include "NavPage.h"
#include "NavNumbers.h"
class Navigator;
class NavVerse : public NavNumbers
{
public:
NavVerse(Navigator* navigator);
virtual ~NavVerse();
void show();
void userTap(int x, int y);
};
#endif
Index: NavBooks.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavBooks.cpp 22 Feb 2004 16:12:27 -0000 1.3
+++ NavBooks.cpp 28 Feb 2004 13:40:15 -0000 1.4
@@ -96,7 +96,7 @@
setFont();
}
-int NavBooks::userTap(int x, int y) {
+int NavBooks::numberAt(int x, int y) {
if ((y>=ROW2)&&(y<STARTNTROW)) {
y=y-ROW2;
int vertical=(y/(PADDING_HEIGHT+BUTTON_HEIGHT));
@@ -126,4 +126,12 @@
}
}
return -1;
-}
+}
+
+void NavBooks::userTap(int x, int y) {
+ int number=numberAt(x,y);
+ if (number>0) {
+ navigator->setBook(number);
+ navigator->setMode(MODE_CHAP);
+ }
+}
Index: NavBooks.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavBooks.h 22 Feb 2004 16:12:27 -0000 1.3
+++ NavBooks.h 28 Feb 2004 13:40:15 -0000 1.4
@@ -19,8 +19,9 @@
void paint();
// signals that the user has tapped somewhere.
// returns: the number that the user has tapped. -1 if no number
- int userTap(int x, int y);
-private:
+ void userTap(int x, int y);
+private:
+ int numberAt(int x, int y);
SwordIndex* position;
UString command;
int maxNumber, maxOTNumber;
Index: NavNumbers.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavNumbers.cpp 22 Feb 2004 16:12:27 -0000 1.3
+++ NavNumbers.cpp 28 Feb 2004 13:40:15 -0000 1.4
@@ -27,8 +27,6 @@
}
void NavNumbers::show() {
- this->maxNumber=navigator->numbersMax;
- this->command=navigator->numbersTitle;
start=1;
}
@@ -98,7 +96,7 @@
setFont();
}
-int NavNumbers::userTap(int x, int y) {
+int NavNumbers::numberAt(int x, int y) {
y=y-ROW2;
if (y>0) {
int vertical=(y/(PADDING_HEIGHT+BUTTON_HEIGHT));
Index: NavNumbers.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavNumbers.h 22 Feb 2004 16:12:27 -0000 1.3
+++ NavNumbers.h 28 Feb 2004 13:40:15 -0000 1.4
@@ -11,7 +11,7 @@
class Navigator;
class NavNumbers: public NavPage {
-public:
+public:
NavNumbers(Navigator* navigator);
virtual ~NavNumbers();
@@ -21,8 +21,8 @@
void paint();
// signals that the user has tapped somewhere.
// returns: the number that the user has tapped. -1 if no number
- int userTap(int x, int y);
-private:
+ int numberAt(int x, int y);
+protected:
int maxNumber;
UString command;
int start;
Index: NavPage.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavPage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NavPage.h 22 Feb 2004 16:12:27 -0000 1.1
+++ NavPage.h 28 Feb 2004 13:40:15 -0000 1.2
@@ -12,14 +12,49 @@
class NavPage
{
public:
- NavPage(Navigator* navigator);
- ~NavPage();
- virtual void show();
- virtual void paint();
- virtual void hide();
- virtual void buttonClicked(int id);
- virtual int userTap(int x, int y);
- virtual void keyDown(WPARAM id, LPARAM lparam);
+ // In a derived class, use this constructor to instantiate visual
+ // components using CreateWindow. For example:
+ //
+ // anEdit = CreateWindow(_T("edit"), NULL,
+ // WS_CHILD | WS_BORDER,
+ // RECT_SCREEN.left, RECT_SCREEN.top, 30, 20,
+ // g_hWnd, NULL, g_hInst, NULL);
+ //
+ // In order to listen to button clicks, they first need to be
+ // registered here in the navigator like this:
+ //
+ // aButtonID=navigator->getID();
+ //
+ // aButton = CreateWindow(_T("button"), L"Go",
+ // WS_CHILD | BS_PUSHBUTTON,
+ // RECT_SCREEN.right-30, RECT_SCREEN.top, 30, 20,
+ // g_hWnd, registerID(goButtonID), g_hInst, NULL);
+ NavPage(Navigator* navigator) {this->navigator=navigator;};
+ // Destructor
+ ~NavPage() {};
+ // In the derived class, show all visual components here using
+ // ShowWindow. For example:
+ //
+ // ShowWindow(anEdit,SW_SHOW);
+ virtual void show() {};
+ // In the derived class, hide all visual components here using
+ // ShowWindow. For example:
+ //
+ // ShowWindow(anEdit,SW_HIDE);
+ virtual void hide() {};
+ // In the derived class, use this method to do all custom
+ // painting, using methods from ApplicationInterface.cpp. Example:
+ //
+ // drawText(&RECT_SCREEN, L"Under construction");
+ virtual void paint() {};
+ // In the derived class, use this method to listen to buttons being
+ // clicked. See the comment in the constructor on how to obtain the id
+ virtual void buttonClicked(int id) {};
+ // In the derived class, use this method to listen to 'mouse clicks'
+ // that do not occur inside visual components.
+ virtual void userTap(int x, int y) {};
+ // In the derived class, use this method to listen to keys being pressed
+ virtual void keyDown(WPARAM id, LPARAM lparam) {};
protected:
Navigator* navigator;
};
Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NavRenderText.cpp 22 Feb 2004 16:12:27 -0000 1.8
+++ NavRenderText.cpp 28 Feb 2004 13:40:15 -0000 1.9
@@ -45,7 +45,7 @@
}
void NavRenderText::showText() {
- int verse=navigator->position.getVerse();
+ int verse=navigator->getVerse();
if (!(navigator->chapterCache)) {
clearHtml(htmlControl);
ShowWindow(htmlControl,SW_HIDE);
@@ -115,7 +115,7 @@
ShowWindow(htmlControl,SW_HIDE);
}
-void NavRenderText::paint() {
+void NavRenderText::paint() {
}
UString NavRenderText::getVerseHeader() {
Index: Navigator.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Navigator.cpp 22 Feb 2004 16:12:27 -0000 1.7
+++ Navigator.cpp 28 Feb 2004 13:40:15 -0000 1.8
@@ -1,6 +1,7 @@
#include "ApplicationInterface.h"
#include "Navigator.h"
-#include "NavNumbers.h"
+#include "NavChap.h"
+#include "NavVerse.h"
#include "NavBooks.h"
#include "NavRenderText.h"
@@ -26,10 +27,16 @@
mode=-1;
nextID = 1;
chapterCache=false;
- numbers=new NavNumbers(this);
- books=new NavBooks(this);
- text=new NavRenderText(this);
- find=new NavFind(this);
+ books=pages[MODE_BOOK]=new NavBooks(this);
+ chapters=pages[MODE_CHAP]=new NavChap(this);
+ verses=pages[MODE_VERSE]=new NavVerse(this);
+ text=pages[MODE_TEXT]=new NavRenderText(this);
+ find=pages[MODE_FIND]=new NavFind(this);
+ menus[MODE_BOOK]=MENU_BOOK;
+ menus[MODE_CHAP]=MENU_CHAP;
+ menus[MODE_VERSE]=MENU_VERSE;
+ menus[MODE_TEXT]=MENU_TEXT;
+ menus[MODE_FIND]=MENU_FIND;
optStartID = 0;
optEndID = 0;
transStartID = 0;
@@ -39,10 +46,10 @@
}
Navigator::~Navigator() {
- delete numbers;
- delete books;
+ delete books;
+ delete chapters;
+ delete verses;
delete text;
-
delete find;
if (options)
delete options;
@@ -52,52 +59,17 @@
refreshScreen();
}
-void Navigator::setMode(int mode) {
- switch (this->mode) {
-
- case MODE_TEXT: text->hide(); break;
-
- case MODE_FIND: find->hide(); break;
-
- }
+void Navigator::setMode(int mode) {
+ if (this->mode>=0) pages[this->mode]->hide();
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); find->show();break;
- };
+ selectMenu(menus[this->mode]);
+ pages[this->mode]->show();
updateTitle();
refresh();
}
-void Navigator::paint() {
- if (mode==MODE_BOOK) {
- books->paint();
- }
- if ((mode==MODE_CHAP)||(mode==MODE_VERSE)) {
- numbers->paint();
- }
- if (mode==MODE_TEXT) {
- text->paint();
- }
- if (mode==MODE_FIND) {
-
- find->paint();
- }
-}
-
-void Navigator::showChap() {
- numbersMax=position.chapCount();
- numbersTitle=L"Select a chapter:";
- numbers->show();
-}
-
-void Navigator::showVerse() {
- numbersMax=position.verseCount();
- numbersTitle=L"Select a verse:";
- numbers->show();
+void Navigator::paint() {
+ pages[mode]->paint();
}
void Navigator::updateTitle() {
@@ -105,62 +77,45 @@
setTitle(title);
}
-/* a menu-item is selected (one of the translations) */
+/* a menu-item is selected (maybe one of the translations) */
void Navigator::buttonClicked(int id) {
if ((id >= transStartID) && (id <= transEndID)) {
setModule(id);
checkModuleMenu(id);
chapterCache=false;
- text->show();
+ setMode(mode);
}
else if ((id >= optStartID) && (id <= optEndID)) {
toggleOptionMenu(id);
- setMode(MODE_TEXT);
chapterCache=false;
- text->show();
+ setMode(mode);
}
- else if (mode==MODE_FIND)
-
- find->buttonClicked(id);
+ else
+ pages[mode]->buttonClicked(id);
}
-void Navigator::keyDown(WPARAM id, LPARAM lparam) {
- switch (mode) {
- case MODE_TEXT:
- text->keyDown(id,lparam);
- break;
- }
+void Navigator::keyDown(WPARAM id, LPARAM lparam) {
+ pages[mode]->keyDown(id,lparam);
}
-void Navigator::mouseDown(int x, int y) {
- int number;
- switch (mode) {
- case MODE_BOOK:
- number=books->userTap(x,y);
- if (number>0) {
- position.setBook(number);
- chapterCache=false;
- setMode(MODE_CHAP);
- }
- break;
- case MODE_CHAP:
- number=numbers->userTap(x,y);
- if (number>0) {
- position.setChap(number);
- chapterCache=false;
- setMode(MODE_VERSE);
- }
- break;
- case MODE_VERSE:
- number=numbers->userTap(x,y);
- if (number>0) {
- position.setVerse(number);
- setMode(MODE_TEXT);
- }
- break;
- }
+void Navigator::mouseDown(int x, int y) {
+ pages[mode]->userTap(x,y);
+}
+
+void Navigator::setBook(int number) {
+ position.setBook(number);
+ chapterCache=false;
+}
+
+void Navigator::setChap(int number) {
+ position.setChap(number);
+ chapterCache=false;
}
+
+void Navigator::setVerse(int number) {
+ position.setVerse(number);
+}
void Navigator::fillTranslationsMenu(HMENU menuTranslations) {
transStartID = nextID;
@@ -170,7 +125,7 @@
addMenu(menuTranslations, nextID++, toUString(String(i->first)));
}
}
- checkModuleMenu(1);
+ checkModuleMenu(transStartID);
transEndID = nextID - 1;
}
@@ -227,7 +182,6 @@
};
if (i!=position.lastModule()) {
position.setModule(i->second);
- setMode(MODE_TEXT);
}
}
Index: Navigator.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Navigator.h 22 Feb 2004 16:12:27 -0000 1.6
+++ Navigator.h 28 Feb 2004 13:40:15 -0000 1.7
@@ -9,7 +9,8 @@
#include "utils.h"
#include "SwordIndex.h"
#include "NavPage.h"
-#include <swbuf.h>
+#include <swbuf.h>
+#include <map>
using namespace sword;
@@ -32,7 +33,9 @@
class Navigator
{
-private:
+private:
+ std::map<int,NavPage*> pages;
+ std::map<int,int> menus;
int mode;
HMENU menuTranslations;
@@ -47,15 +50,13 @@
int opCount;
UString getVerseHeader();
- void showChap();
- void showVerse();
-
void setModule(int id);
void checkModuleMenu(int id);
public:
SwordIndex position;
- NavPage* numbers;
+ NavPage* chapters;
+ NavPage* verses;
NavPage* books;
NavPage* text;
NavPage* find;
@@ -66,7 +67,18 @@
UString numbersTitle;
Navigator(RECT* screen);
- virtual ~Navigator();
+ virtual ~Navigator();
+
+ void setBook(int number);
+ void setChap(int number);
+ void setVerse(int number);
+
+ int getBook() {return position.getBook();};
+ int getChap() {return position.verse->Chapter();};
+ int getVerse() {return position.verse->Verse();};
+
+ int chapCount() {return position.chapCount();}
+ int verseCount() {return position.verseCount();}
void updateTitle();
void fillTranslationsMenu(HMENU menuTranslations);
Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gui.vcl 22 Feb 2004 16:12:27 -0000 1.18
+++ gui.vcl 28 Feb 2004 13:40:15 -0000 1.19
@@ -6,13 +6,14 @@
--------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP37.tmp" with contents
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12C.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:\SwordReader\swordreader\src\gui\Navigator.cpp"
"D:\SwordReader\swordreader\src\gui\NavRenderText.cpp"
]
-Creating command line "clarm.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP37.tmp"
-Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP38.tmp" with contents
+Creating command line "clarm.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12C.tmp"
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12D.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
@@ -21,15 +22,17 @@
.\ARMRel\NavFind.obj
.\ARMRel\Navigator.obj
.\ARMRel\NavNumbers.obj
-.\ARMRel\NavPage.obj
.\ARMRel\NavRenderText.obj
.\ARMRel\SwordIndex.obj
.\ARMRel\Utils.obj
.\ARMRel\BibleReader.res
+.\ARMRel\NavChap.obj
+.\ARMRel\NavVerse.obj
]
-Creating command line "link.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP38.tmp"
+Creating command line "link.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12D.tmp"
<h3>Output Window</h3>
Compiling...
+Navigator.cpp
NavRenderText.cpp
D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(112) : warning C4509: nonstandard extension used: 'load' uses SEH and 'heading' has destructor
D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(73) : see declaration of 'heading'
Index: gui.vcp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gui.vcp 22 Feb 2004 16:12:27 -0000 1.7
+++ gui.vcp 28 Feb 2004 13:40:15 -0000 1.8
@@ -264,6 +264,7 @@
".\ApplicationInterface.h"\
".\Main.h"\
".\Navigator.h"\
+ ".\NavPage.h"\
".\SwordIndex.h"\
".\Utils.h"\
{$(INCLUDE)}"aygshell.h"\
@@ -457,6 +458,7 @@
".\ApplicationInterface.h"\
".\NavBooks.h"\
".\Navigator.h"\
+ ".\NavPage.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -592,6 +594,193 @@
# End Source File
# Begin Source File
+SOURCE=.\NavChap.cpp
+
+!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
+
+DEP_CPP_NAVCH=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
+
+DEP_CPP_NAVCH=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
+
+DEP_CPP_NAVCH=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
+
+DEP_CPP_NAVCH=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\NavFind.cpp
!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
@@ -632,6 +821,7 @@
".\ApplicationInterface.h"\
".\NavFind.h"\
".\Navigator.h"\
+ ".\NavPage.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -807,9 +997,11 @@
"..\Dll1\winceSword\include\swordce.h"\
".\ApplicationInterface.h"\
".\NavBooks.h"\
+ ".\NavChap.h"\
".\NavFind.h"\
".\Navigator.h"\
".\NavNumbers.h"\
+ ".\NavPage.h"\
".\NavRenderText.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -998,6 +1190,7 @@
".\ApplicationInterface.h"\
".\Navigator.h"\
".\NavNumbers.h"\
+ ".\NavPage.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -1133,46 +1326,198 @@
# End Source File
# Begin Source File
-SOURCE=.\NavPage.cpp
+SOURCE=.\NavRenderText.cpp
!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
-DEP_CPP_NAVPA=\
+DEP_CPP_NAVRE=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ "..\Dll1\winceSword\include\swordce.h"\
+ ".\ApplicationInterface.h"\
+ ".\Navigator.h"\
".\NavPage.h"\
+ ".\NavRenderText.h"\
+ ".\SwordIndex.h"\
".\Utils.h"\
+ {$(INCLUDE)}"htmlctrl.h"\
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
-DEP_CPP_NAVPA=\
- ".\NavPage.h"\
+DEP_CPP_NAVRE=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\Navigator.h"\
+ ".\NavRenderText.h"\
+ ".\SwordIndex.h"\
".\Utils.h"\
+NODEP_CPP_NAVRE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
-DEP_CPP_NAVPA=\
- ".\NavPage.h"\
+DEP_CPP_NAVRE=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\Navigator.h"\
+ ".\NavRenderText.h"\
+ ".\SwordIndex.h"\
".\Utils.h"\
+NODEP_CPP_NAVRE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
-DEP_CPP_NAVPA=\
- ".\NavPage.h"\
+DEP_CPP_NAVRE=\
+ "..\..\..\sword\include\defs.h"\
+ "..\..\..\sword\include\filemgr.h"\
+ "..\..\..\sword\include\listkey.h"\
+ "..\..\..\sword\include\multimapwdef.h"\
+ "..\..\..\sword\include\rawstr.h"\
+ "..\..\..\sword\include\rawverse.h"\
+ "..\..\..\sword\include\swbasicfilter.h"\
+ "..\..\..\sword\include\swbuf.h"\
+ "..\..\..\sword\include\swcacher.h"\
+ "..\..\..\sword\include\swcomprs.h"\
+ "..\..\..\sword\include\swconfig.h"\
+ "..\..\..\sword\include\swdisp.h"\
+ "..\..\..\sword\include\swfilter.h"\
+ "..\..\..\sword\include\swfiltermgr.h"\
+ "..\..\..\sword\include\swkey.h"\
+ "..\..\..\sword\include\swlog.h"\
+ "..\..\..\sword\include\swmacs.h"\
+ "..\..\..\sword\include\swmgr.h"\
+ "..\..\..\sword\include\swmodule.h"\
+ "..\..\..\sword\include\swobject.h"\
+ "..\..\..\sword\include\swsearchable.h"\
+ "..\..\..\sword\include\swtext.h"\
+ "..\..\..\sword\include\thmlhtml.h"\
+ "..\..\..\sword\include\thmlvariants.h"\
+ "..\..\..\sword\include\unixstr.h"\
+ "..\..\..\sword\include\utilconf.h"\
+ "..\..\..\sword\include\utilfuns.h"\
+ "..\..\..\sword\include\utilstr.h"\
+ "..\..\..\sword\include\utilweb.h"\
+ "..\..\..\sword\include\versekey.h"\
+ "..\..\..\sword\include\ztext.h"\
+ "..\..\..\sword\include\zverse.h"\
+ ".\ApplicationInterface.h"\
+ ".\Navigator.h"\
+ ".\NavRenderText.h"\
+ ".\SwordIndex.h"\
".\Utils.h"\
+NODEP_CPP_NAVRE=\
+ ".\tmlctrl.h"\
+
!ENDIF
# End Source File
# Begin Source File
-SOURCE=.\NavRenderText.cpp
+SOURCE=.\NavVerse.cpp
!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
-DEP_CPP_NAVRE=\
+DEP_CPP_NAVVE=\
"..\..\..\sword\include\defs.h"\
"..\..\..\sword\include\filemgr.h"\
"..\..\..\sword\include\listkey.h"\
@@ -1205,18 +1550,19 @@
"..\..\..\sword\include\versekey.h"\
"..\..\..\sword\include\ztext.h"\
"..\..\..\sword\include\zverse.h"\
- "..\Dll1\winceSword\include\swordce.h"\
".\ApplicationInterface.h"\
+ ".\NavFind.h"\
".\Navigator.h"\
- ".\NavRenderText.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavVerse.h"\
".\SwordIndex.h"\
".\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
-DEP_CPP_NAVRE=\
+DEP_CPP_NAVVE=\
"..\..\..\sword\include\defs.h"\
"..\..\..\sword\include\filemgr.h"\
"..\..\..\sword\include\listkey.h"\
@@ -1250,18 +1596,18 @@
"..\..\..\sword\include\ztext.h"\
"..\..\..\sword\include\zverse.h"\
".\ApplicationInterface.h"\
+ ".\NavFind.h"\
".\Navigator.h"\
- ".\NavRenderText.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavVerse.h"\
".\SwordIndex.h"\
".\Utils.h"\
-NODEP_CPP_NAVRE=\
- ".\tmlctrl.h"\
-
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
-DEP_CPP_NAVRE=\
+DEP_CPP_NAVVE=\
"..\..\..\sword\include\defs.h"\
"..\..\..\sword\include\filemgr.h"\
"..\..\..\sword\include\listkey.h"\
@@ -1295,18 +1641,18 @@
"..\..\..\sword\include\ztext.h"\
"..\..\..\sword\include\zverse.h"\
".\ApplicationInterface.h"\
+ ".\NavFind.h"\
".\Navigator.h"\
- ".\NavRenderText.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavVerse.h"\
".\SwordIndex.h"\
".\Utils.h"\
-NODEP_CPP_NAVRE=\
- ".\tmlctrl.h"\
-
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
-DEP_CPP_NAVRE=\
+DEP_CPP_NAVVE=\
"..\..\..\sword\include\defs.h"\
"..\..\..\sword\include\filemgr.h"\
"..\..\..\sword\include\listkey.h"\
@@ -1340,14 +1686,14 @@
"..\..\..\sword\include\ztext.h"\
"..\..\..\sword\include\zverse.h"\
".\ApplicationInterface.h"\
+ ".\NavFind.h"\
".\Navigator.h"\
- ".\NavRenderText.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavVerse.h"\
".\SwordIndex.h"\
".\Utils.h"\
-NODEP_CPP_NAVRE=\
- ".\tmlctrl.h"\
-
!ENDIF
@@ -1584,6 +1930,10 @@
# End Source File
# Begin Source File
+SOURCE=.\NavChap.h
+# End Source File
+# Begin Source File
+
SOURCE=.\NavFind.h
# End Source File
# Begin Source File
@@ -1601,6 +1951,10 @@
# Begin Source File
SOURCE=.\NavRenderText.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NavVerse.h
# End Source File
# Begin Source File
--- NavPage.cpp DELETED ---