[sword-cvs] swordreader/src/gui BibleReader.aps,1.3,1.4 BibleReader.rc,1.2,1.3 Main.cpp,1.6,1.7 NavBooks.cpp,1.4,1.5 NavBooks.h,1.4,1.5 NavChap.cpp,1.1,1.2 NavChap.h,1.1,1.2 NavFind.cpp,1.2,1.3 NavFind.h,1.2,1.3 NavNumbers.cpp,1.4,1.5 NavNumbers.h,1.4,1.5 NavPage.h,1.2,1.3 NavRenderText.cpp,1.9,1.10 NavRenderText.h,1.3,1.4 NavVerse.cpp,1.1,1.2 NavVerse.h,1.1,1.2 Navigator.cpp,1.8,1.9 Navigator.h,1.7,1.8 gui.vcl,1.19,1.20 gui.vcp,1.8,1.9 resource.h,1.2,1.3
sword@www.crosswire.org
sword@www.crosswire.org
Sat, 28 Feb 2004 12:43:32 -0700
- Previous message: [sword-cvs] swordreader/src/simplegui newres.h,NONE,1.1 resource.h,NONE,1.1 simplegui.rc,NONE,1.1 simplegui.vcl,NONE,1.1 simplegui.vcp,NONE,1.1
- Next message: [sword-cvs] sword/examples/cmdline lookup.cpp,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv5625/gui
Modified Files:
BibleReader.aps BibleReader.rc Main.cpp NavBooks.cpp
NavBooks.h NavChap.cpp NavChap.h NavFind.cpp NavFind.h
NavNumbers.cpp NavNumbers.h NavPage.h NavRenderText.cpp
NavRenderText.h NavVerse.cpp NavVerse.h Navigator.cpp
Navigator.h gui.vcl gui.vcp resource.h
Log Message:
Finalized making two gui's, one simple one for reading and one to be extended to be a full sword frontend
Index: BibleReader.aps
===================================================================
RCS file: /cvs/core/swordreader/src/gui/BibleReader.aps,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvshlSX5i and /tmp/cvsxNhabI differ
Index: BibleReader.rc
===================================================================
RCS file: /cvs/core/swordreader/src/gui/BibleReader.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BibleReader.rc 3 Feb 2004 18:45:35 -0000 1.2
+++ BibleReader.rc 28 Feb 2004 19:43:29 -0000 1.3
@@ -1,189 +1,197 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "newres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_BIBLEREADER ICON DISCARDABLE "BibleReader.ICO"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""newres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Data
-//
-
-IDM_MENU SHMENUBAR MOVEABLE PURE
-BEGIN
- IDM_MENU, 6,
- I_IMAGENONE, MENU_BOOK, TBSTATE_ENABLED,
- TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_BOOK, 0, NOMENU,
- I_IMAGENONE, MENU_CHAP, TBSTATE_ENABLED,
- TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_CHAP, 0, NOMENU,
- I_IMAGENONE, MENU_VERSE, TBSTATE_ENABLED,
- TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_VERSE, 0, NOMENU,
- I_IMAGENONE, MENU_TEXT, TBSTATE_ENABLED,
- TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_TEXT, MENU_TEXT, NOMENU,
- I_IMAGENONE, MENU_FIND, TBSTATE_ENABLED,
- TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_FIND, 0, NOMENU,
- I_IMAGENONE, MENU_MENU, TBSTATE_ENABLED,
- TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENU, 0, 5,
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menubar
-//
-
-IDM_MENU MENU DISCARDABLE
-BEGIN
- MENUITEM "Book", MENU_BOOK
- MENUITEM "Chap", MENU_CHAP
- MENUITEM "Verse", MENU_VERSE
- MENUITEM "Text", MENU_TEXT
- MENUITEM "Find", MENU_FIND
- POPUP "Menu"
- BEGIN
- MENUITEM "About", MENU_ABOUT
- MENUITEM "Shutdown", MENU_SHUTDOWN
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDC_BIBLEREADER ACCELERATORS DISCARDABLE
-BEGIN
- "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT
- "Q", IDOK, VIRTKEY, CONTROL, NOINVERT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- IDD_ERROR_NOBIBLES, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 243
- TOPMARGIN, 7
- BOTTOMMARGIN, 75
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ERROR_NOBIBLES DIALOG DISCARDABLE 0, 0, 250, 82
-STYLE WS_POPUP
-FONT 8, "MS Sans Serif"
-BEGIN
- LTEXT "ERROR: No bibles were installed",IDC_STATIC,7,31,229,16
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_APP_TITLE "Sword Reader"
- IDC_BIBLEREADER "BIBLEREADER"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CAP_BOOK "Book"
- IDS_CAP_CHAP "Chap"
- IDS_CAP_TEXT "Text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CAP_VERSE "Verse"
- IDS_CAP_BIBLE "Find"
- IDS_SELECTBOOK "Select a book:"
- IDS_SELECTCHAP "Select a chapter:"
- IDS_SELECTBIBLE "Select a bible"
- IDS_CAP_MENU "Menu"
- IDS_CAP_FIND "Find"
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "newres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_BIBLEREADER ICON DISCARDABLE "BibleReader.ICO"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""newres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Data
+//
+
+IDM_MENU SHMENUBAR MOVEABLE PURE
+BEGIN
+ IDM_MENU, 7,
+ I_IMAGENONE, MENU_BOOK, TBSTATE_ENABLED,
+ TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_BOOK, 0, 0,
+ I_IMAGENONE, MENU_CHAP, TBSTATE_ENABLED,
+ TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_CHAP, 0, 1,
+ I_IMAGENONE, MENU_VERSE, TBSTATE_ENABLED,
+ TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_VERSE, 0, 2,
+ I_IMAGENONE, MENU_TEXT, TBSTATE_ENABLED,
+ TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_TEXT, MENU_TEXT, 3,
+ I_IMAGENONE, MENU_FIND, TBSTATE_ENABLED,
+ TBSTYLE_CHECK | TBSTYLE_AUTOSIZE, IDS_CAP_FIND, 0, 4,
+ I_IMAGENONE, MENU_TEXT2, TBSTATE_ENABLED, TBSTYLE_AUTOSIZE, IDS_CAP_TE2,
+ 0, 5,
+ I_IMAGENONE, MENU_MENU, TBSTATE_ENABLED,
+ TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENU, 0, 6,
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDM_MENU MENU DISCARDABLE
+BEGIN
+ MENUITEM "Bo", MENU_BOOK
+ MENUITEM "Ch", MENU_CHAP
+ MENUITEM "Ve", MENU_VERSE
+ MENUITEM "Te", MENU_TEXT
+ MENUITEM "Fi", MENU_FIND
+ MENUITEM "Te2", MENU_TEXT2
+ POPUP "Menu"
+ BEGIN
+ MENUITEM "About", MENU_ABOUT
+ MENUITEM "Shutdown", MENU_SHUTDOWN
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_BIBLEREADER ACCELERATORS DISCARDABLE
+BEGIN
+ "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT
+ "Q", IDOK, VIRTKEY, CONTROL, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
+ IDD_ERROR_NOBIBLES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 243
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 75
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ERROR_NOBIBLES DIALOG DISCARDABLE 0, 0, 250, 82
+STYLE WS_POPUP
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "ERROR: No bibles were installed",IDC_STATIC,7,31,229,16
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_APP_TITLE "Sword Reader"
+ IDC_BIBLEREADER "BIBLEREADER"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CAP_BOOK "Bo"
+ IDS_CAP_CHAP "Ch"
+ IDS_CAP_TEXT "Te"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CAP_VERSE "Ve"
+ IDS_CAP_BIBLE "Find"
+ IDS_SELECTBOOK "Select a book:"
+ IDS_SELECTCHAP "Select a chapter:"
+ IDS_SELECTBIBLE "Select a bible"
+ IDS_CAP_MENU "Menu"
+ IDS_CAP_FIND "Fi"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_CAP_TE2 "Te2"
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Index: Main.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Main.cpp 3 Feb 2004 18:45:35 -0000 1.6
+++ Main.cpp 28 Feb 2004 19:43:29 -0000 1.7
@@ -1,11 +1,18 @@
#include "ApplicationInterface.h"
-#include "Main.h"
-#include "Navigator.h"
+#include "Main.h"
+
+#ifdef SIMPLE
+ #include "SimpleNavigator.h"
+ #define NAVIGATOR SimpleNavigator
+#else
+ #include "Navigator.h"
+ #define NAVIGATOR Navigator
+#endif
#include <aygshell.h>
#include <htmlctrl.h>
-Navigator* g_navigator;
+NAVIGATOR* g_navigator;
static SHACTIVATEINFO s_sai;
int WINAPI WinMain( HINSTANCE hInstance,
@@ -137,28 +144,11 @@
case WM_KEYDOWN:
g_navigator->keyDown(wParam, lParam);
break;
-
case WM_COMMAND:
wmId = LOWORD(wParam);
wmEvent = HIWORD(wParam);
- // Parse the menu selections:
switch (wmId) {
- case MENU_BOOK:
- g_navigator->setMode(MODE_BOOK);
- break;
- case MENU_CHAP:
- g_navigator->setMode(MODE_CHAP);
- break;
- case MENU_VERSE:
- g_navigator->setMode(MODE_VERSE);
- break;
- case MENU_TEXT:
- g_navigator->setMode(MODE_TEXT);
- break;
- case MENU_FIND:
- g_navigator->setMode(MODE_FIND);
- break;
case IDOK:
SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd);
SendMessage (hWnd, WM_CLOSE, 0, 0);
@@ -171,8 +161,12 @@
if ((wmId>=USERBUTTONS)&&(wmId<USERBUTTONS+1000)) {
g_navigator->buttonClicked(wmId-USERBUTTONS);
break;
- }
- return DefWindowProc(hWnd, message, wParam, lParam);
+ }
+ else if (g_navigator->menuClicked(wmId))
+ {}
+ else
+ return DefWindowProc(hWnd, message, wParam, lParam);
+ break;
}
break;
case WM_CREATE:
@@ -180,7 +174,7 @@
RECT clientRect;
GetClientRect(g_hWnd,&clientRect);
clientRect.bottom -= MENU_HEIGHT;
- g_navigator=new Navigator(&clientRect);
+ g_navigator=new NAVIGATOR(&clientRect);
g_hwndCB = CreateRpCommandBar(hWnd);
setMenuSelected(g_hwndCB,MENU_TEXT,1);
// Fill up the translation popup menu
Index: NavBooks.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NavBooks.cpp 28 Feb 2004 13:40:15 -0000 1.4
+++ NavBooks.cpp 28 Feb 2004 19:43:29 -0000 1.5
@@ -19,7 +19,7 @@
#define STARTNTROW 160
#define LASTROW 240
-NavBooks::NavBooks(Navigator* navigator): NavPage(navigator) {
+NavBooks::NavBooks(SimpleNavigator* navigator): NavPage(navigator) {
this->position=&(navigator->position);
this->command=UString(L"Select a book:");
this->maxOTNumber=position->otBookCount();
Index: NavBooks.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NavBooks.h 28 Feb 2004 13:40:15 -0000 1.4
+++ NavBooks.h 28 Feb 2004 19:43:29 -0000 1.5
@@ -8,12 +8,12 @@
#include "utils.h"
#include "NavPage.h"
-class Navigator;
+class SimpleNavigator;
class SwordIndex;
class NavBooks: public NavPage {
public:
- NavBooks(Navigator* navigator);
+ NavBooks(SimpleNavigator* navigator);
virtual ~NavBooks();
// redraw the screen. This should use methods in ApplicationInterface.h to do the drawing
void paint();
Index: NavChap.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavChap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NavChap.cpp 28 Feb 2004 13:40:15 -0000 1.1
+++ NavChap.cpp 28 Feb 2004 19:43:29 -0000 1.2
@@ -3,7 +3,7 @@
#include "NavFind.h"
#include "Navigator.h"
-NavChap::NavChap(Navigator* navigator):NavNumbers(navigator){
+NavChap::NavChap(SimpleNavigator* navigator):NavNumbers(navigator){
command=L"Select a chapter";
}
Index: NavChap.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavChap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NavChap.h 28 Feb 2004 13:40:15 -0000 1.1
+++ NavChap.h 28 Feb 2004 19:43:29 -0000 1.2
@@ -11,11 +11,11 @@
#include "NavPage.h"
#include "NavNumbers.h"
-class Navigator;
+class SimpleNavigator;
class NavChap : public NavNumbers {
public:
- NavChap(Navigator* navigator);
+ NavChap(SimpleNavigator* navigator);
virtual ~NavChap();
void show();
void userTap(int x, int y);
Index: NavFind.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavFind.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavFind.cpp 22 Feb 2004 16:12:27 -0000 1.2
+++ NavFind.cpp 28 Feb 2004 19:43:29 -0000 1.3
@@ -3,7 +3,7 @@
#include "Navigator.h"
#include <winuser.h>
-NavFind::NavFind(Navigator* navigator) : NavPage(navigator) {
+NavFind::NavFind(SimpleNavigator* navigator) : NavPage(navigator) {
//this->navigator=navigator;
goButtonID=navigator->getID();
query=L"Busy implementing, id=";
Index: NavFind.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavFind.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavFind.h 22 Feb 2004 16:12:27 -0000 1.2
+++ NavFind.h 28 Feb 2004 19:43:29 -0000 1.3
@@ -8,11 +8,11 @@
#include "utils.h"
#include "NavPage.h"
-class Navigator;
+class SimpleNavigator;
class NavFind: public NavPage {
public:
- NavFind(Navigator* navigator);
+ NavFind(SimpleNavigator* navigator);
~NavFind();
void show();
void paint();
Index: NavNumbers.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NavNumbers.cpp 28 Feb 2004 13:40:15 -0000 1.4
+++ NavNumbers.cpp 28 Feb 2004 19:43:29 -0000 1.5
@@ -20,7 +20,7 @@
#define ROW2 45
#define LASTROW 240
-NavNumbers::NavNumbers(Navigator* navigator):NavPage(navigator) {
+NavNumbers::NavNumbers(SimpleNavigator* navigator):NavPage(navigator) {
}
NavNumbers::~NavNumbers() {
Index: NavNumbers.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NavNumbers.h 28 Feb 2004 13:40:15 -0000 1.4
+++ NavNumbers.h 28 Feb 2004 19:43:29 -0000 1.5
@@ -8,11 +8,11 @@
#include "utils.h"
#include "NavPage.h"
-class Navigator;
+class SimpleNavigator;
class NavNumbers: public NavPage {
public:
- NavNumbers(Navigator* navigator);
+ NavNumbers(SimpleNavigator* navigator);
virtual ~NavNumbers();
// initialize with this maximum number
Index: NavPage.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavPage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavPage.h 28 Feb 2004 13:40:15 -0000 1.2
+++ NavPage.h 28 Feb 2004 19:43:29 -0000 1.3
@@ -7,7 +7,7 @@
#include "utils.h"
-class Navigator;
+class SimpleNavigator;
class NavPage
{
@@ -29,7 +29,7 @@
// 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;};
+ NavPage(SimpleNavigator* navigator) {this->navigator=navigator;};
// Destructor
~NavPage() {};
// In the derived class, show all visual components here using
@@ -56,7 +56,7 @@
// In the derived class, use this method to listen to keys being pressed
virtual void keyDown(WPARAM id, LPARAM lparam) {};
protected:
- Navigator* navigator;
+ SimpleNavigator* navigator;
};
#endif
Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NavRenderText.cpp 28 Feb 2004 13:40:15 -0000 1.9
+++ NavRenderText.cpp 28 Feb 2004 19:43:29 -0000 1.10
@@ -26,7 +26,7 @@
#define controlToVerse(window,versenr) SendMessage(window, DTM_ANCHORW, FALSE, (LPARAM)(toUString(versenr).c_str()))
-NavRenderText::NavRenderText(Navigator* navigator):NavPage(navigator) {
+NavRenderText::NavRenderText(SimpleNavigator* navigator):NavPage(navigator) {
VERIFY(InitHTMLControl(g_hInst));
htmlControl = CreateWindowEx(WS_EX_NOACTIVATE, WC_HTML, NULL,
WS_CHILD | HS_CLEARTYPE | HS_NOSCRIPTING |
@@ -163,7 +163,7 @@
// A simpeler graphical representation not using the HTML component
-NavRenderText::NavRenderText(Navigator* navigator): NavPage(navigator) {
+NavRenderText::NavRenderText(SimpleNavigator* navigator): NavPage(navigator) {
}
Index: NavRenderText.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavRenderText.h 22 Feb 2004 16:12:27 -0000 1.3
+++ NavRenderText.h 28 Feb 2004 19:43:29 -0000 1.4
@@ -8,13 +8,13 @@
#include "utils.h"
#include "NavPage.h"
-class Navigator;
+class SimpleNavigator;
class NavRenderText: public NavPage {
public:
int verseCount; //number of verses on screen
- NavRenderText(Navigator* navigator);
+ NavRenderText(SimpleNavigator* navigator);
virtual ~NavRenderText();
void show();
Index: NavVerse.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavVerse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NavVerse.cpp 28 Feb 2004 13:40:15 -0000 1.1
+++ NavVerse.cpp 28 Feb 2004 19:43:29 -0000 1.2
@@ -3,7 +3,7 @@
#include "NavFind.h"
#include "Navigator.h"
-NavVerse::NavVerse(Navigator* navigator):NavNumbers(navigator){
+NavVerse::NavVerse(SimpleNavigator* navigator):NavNumbers(navigator){
command=L"Select a verse";
}
Index: NavVerse.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavVerse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NavVerse.h 28 Feb 2004 13:40:15 -0000 1.1
+++ NavVerse.h 28 Feb 2004 19:43:29 -0000 1.2
@@ -11,12 +11,12 @@
#include "NavPage.h"
#include "NavNumbers.h"
-class Navigator;
+class SimpleNavigator;
class NavVerse : public NavNumbers
{
public:
- NavVerse(Navigator* navigator);
+ NavVerse(SimpleNavigator* navigator);
virtual ~NavVerse();
void show();
void userTap(int x, int y);
Index: Navigator.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Navigator.cpp 28 Feb 2004 13:40:15 -0000 1.8
+++ Navigator.cpp 28 Feb 2004 19:43:29 -0000 1.9
@@ -1,287 +1,10 @@
-#include "ApplicationInterface.h"
-#include "Navigator.h"
-#include "NavChap.h"
-#include "NavVerse.h"
-#include "NavBooks.h"
-#include "NavRenderText.h"
-
-#include "NavFind.h"
-#include <swordce.h>
-#include <swmgr.h>
-
-using namespace sword;
-
-#define WIDTH 240
-#define HEIGHT 294
-
-RECT RECT_SCREEN;// = {0,0,240,294};
-
-RECT RECT_SELECTLABEL = {4,4,120,20};
-
-RECT RECT_POSITION = {164,4,236,20};
-
-RECT RECT_FIELD = {6,24,240,250};
-
-Navigator::Navigator(RECT* screen) {
- RECT_SCREEN=*screen;
- mode=-1;
- nextID = 1;
- chapterCache=false;
- 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;
- transEndID = 0;
- options = 0;
- opCount = 0;
-}
-
-Navigator::~Navigator() {
- delete books;
- delete chapters;
- delete verses;
- delete text;
- delete find;
- if (options)
- delete options;
-}
-
-void Navigator::refresh() {
- refreshScreen();
-}
-
-void Navigator::setMode(int mode) {
- if (this->mode>=0) pages[this->mode]->hide();
- this->mode=mode;
- selectMenu(menus[this->mode]);
- pages[this->mode]->show();
- updateTitle();
- refresh();
-}
-
-void Navigator::paint() {
- pages[mode]->paint();
-}
-
-void Navigator::updateTitle() {
- UString title=position.toString()+L" - SwRd";
- setTitle(title);
-}
-
-/* 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;
- setMode(mode);
- }
- else if ((id >= optStartID) && (id <= optEndID)) {
- toggleOptionMenu(id);
- chapterCache=false;
- setMode(mode);
- }
-
- else
- pages[mode]->buttonClicked(id);
-}
-
-void Navigator::keyDown(WPARAM id, LPARAM lparam) {
- pages[mode]->keyDown(id,lparam);
-}
-
-void Navigator::mouseDown(int x, int y) {
- pages[mode]->userTap(x,y);
-}
+#include "Navigator.h"
-void Navigator::setBook(int number) {
- position.setBook(number);
- chapterCache=false;
+Navigator::Navigator(RECT* screen):SimpleNavigator(screen) {
+ text2=pages[MODE_TEXT2]=new ConstructionPage(this);
+ menus[MODE_TEXT2]=MENU_TEXT2;
}
-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;
- this->menuTranslations=menuTranslations;
- if (menuTranslations) {
- for (ModuleMap::iterator i=position.firstModule();i!=position.lastModule();i++) {
- addMenu(menuTranslations, nextID++, toUString(String(i->first)));
- }
- }
- checkModuleMenu(transStartID);
- transEndID = nextID - 1;
-}
-
-void Navigator::fillGlobalOptionsMenu(HMENU menuOptions) {
- if (menuOptions) {
- if (options)
- delete options;
- optStartID = nextID;
- this->menuOptions=menuOptions;
- StringList optionNames = position.manager->getGlobalOptions();
-
- // count options
- opCount = 0;
- for (StringList::iterator i = optionNames.begin(); i != optionNames.end(); i++) {
- StringList values = position.manager->getGlobalOptionValues(*i);
- bool supported = true;
- for (StringList::iterator j = values.begin(); j != values.end(); j++) {
- if ((*j != "On") && (*j != "Off"))
- supported = false;
- }
- if (supported)
- opCount++;
- }
-
- options = new SWBuf[opCount];
-
- // add options;
- for (i = optionNames.begin(); i != optionNames.end(); i++) {
-// HMENU menuOption = CreatePopupMenu();
-// InsertMenu(menuOptions,0,MF_POPUP,(UINT)menuOption, toUString(i->c_str()).c_str());
- StringList values = position.manager->getGlobalOptionValues(*i);
- bool supported = true;
- for (StringList::iterator j = values.begin(); j != values.end(); j++) {
-// addMenu(menuOption, nextID++, toUString(j->c_str()));
- if ((*j != "On") && (*j != "Off"))
- supported = false;
- }
- if (supported) {
- options[nextID - optStartID] = *i;
- addMenu(menuOptions, nextID++, toUString(i->c_str()));
- }
- }
- }
- optEndID = nextID - 1;
-}
-
-void Navigator::setModule(int id) {
- int modulenr = transStartID;
- ModuleMap::iterator i;
- for (i=position.firstModule();
- (i!=position.lastModule())&&(id!=modulenr);
- i++) {
- modulenr++;
- };
- if (i!=position.lastModule()) {
- position.setModule(i->second);
- }
-}
-
-
-void Navigator::checkModuleMenu(int id) {
- int current=transStartID;
- for (ModuleMap::iterator i=position.firstModule();i!=position.lastModule();i++) {
- checkMenu(menuTranslations,current,(current==id));
- current++;
- }
-}
-
-
-void Navigator::toggleOptionMenu(int id) {
- if (options) {
- for (int i = optStartID; i <= optEndID; i++) {
- SWBuf val = position.manager->getGlobalOption(options[i-optStartID]);
- if (i == id) {
- val = (val=="On")?"Off":"On";
- position.manager->setGlobalOption(options[i-optStartID], val);
- }
- checkMenu(menuOptions, i, (val == "On"));
- }
- }
-}
-
-void Navigator::urlClicked(const WCHAR *target) {
- const char * t = wstrtostr(target);
- if (strstr(t, "type=morph")) {
- const char *val = strstr(t, "value=");
- if ((val) && (strlen(val) > 6)) {
- val += 6;
- SWModule *mod = (position.verse->Testament() == 1) ? position.hebrewMorph : position.greekMorph;
- if (mod) {
- mod->SetKey(val);
- MessageBox(0, strtowstr(mod->StripText()), L"Morphology", MB_OK);
- }
- }
- }
- else if (strstr(t, "type=Strongs")) {
- const char *val = strstr(t, "value=G");
- if ((val) && (strlen(val) > 7)) {
- val += 7;
- if (position.greekLex) {
- position.greekLex->SetKey(val);
- MessageBox(0, strtowstr(position.greekLex->StripText()), L"Greek Strong's", MB_OK);
- }
- }
- val = strstr(t, "value=H");
- if ((val) && (strlen(val) > 7)) {
- val += 7;
- if (position.hebrewLex) {
- position.hebrewLex->SetKey(val);
- MessageBox(0, strtowstr(position.hebrewLex->StripText()), L"Hebrew Strong's", MB_OK);
- }
- }
- }
- else if (strstr(t, "noteID=")) {
- const char *val = strstr(t, "noteID=");
- if ((val) && (strlen(val) > 7)) {
- val += 7;
- SWBuf buf = val;
- const char *tmp = buf.c_str();
- val = strstr(tmp, ".n.");
- if (val) {
- buf.setSize(val - tmp);
- SWBuf saveKey = position.verse->getText();
- position.verse->setText(buf.c_str());
- position.bible->StripText(); // force lookup
- const char *n = strstr(t, ".n.");
- if (n) {
- SWBuf body = position.bible->getEntryAttributes()["Footnote"][n+3]["body"];
- body = position.bible->StripText(body.c_str());
- MessageBox(0, strtowstr(body), L"Footnote", MB_OK);
- }
- position.verse->setText(saveKey);
- }
- else {
- val = strstr(tmp, ".x.");
- if (val) {
- buf.setSize(val - tmp);
- SWBuf saveKey = position.verse->getText();
- position.verse->setText(buf.c_str());
- position.bible->StripText(); // force lookup
- const char *n = strstr(t, ".x.");
- if (n) {
- SWBuf body = position.bible->getEntryAttributes()["Footnote"][n+3]["body"];
- body = position.bible->StripText(body.c_str());
- MessageBox(0, strtowstr(body), L"CrossReference", MB_OK);
- }
- position.verse->setText(saveKey);
- }
- }
- }
- }
- else MessageBox(0, target, L"url clicked", MB_OK);
-
-}
-int Navigator::getID() {
-
- return nextID++;
-
+Navigator::~Navigator() {
+ delete text2;
}
Index: Navigator.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Navigator.h 28 Feb 2004 13:40:15 -0000 1.7
+++ Navigator.h 28 Feb 2004 19:43:29 -0000 1.8
@@ -5,94 +5,27 @@
#pragma once
#endif // _MSC_VER > 1000
-
-#include "utils.h"
-#include "SwordIndex.h"
-#include "NavPage.h"
-#include <swbuf.h>
-#include <map>
-
-using namespace sword;
-
-#define NUM_MENUS 5
-
-#define MODE_BOOK 0
-#define MODE_CHAP 1
-#define MODE_VERSE 2
-#define MODE_TEXT 3
-#define MODE_FIND 4
-
-#define BUTTON_BACKGROUND 0x00A0A0A0
-
-extern RECT RECT_SCREEN;
-
-class NavNumbers;
-class NavBooks;
-class NavRenderText;
-class NavFind;
-
-class Navigator
-{
-private:
- std::map<int,NavPage*> pages;
- std::map<int,int> menus;
- int mode;
-
- HMENU menuTranslations;
- HMENU menuOptions;
-
- int nextID;
- int transStartID;
- int transEndID;
- int optStartID;
- int optEndID;
- SWBuf *options;
- int opCount;
- UString getVerseHeader();
-
- void setModule(int id);
- void checkModuleMenu(int id);
-
-public:
- SwordIndex position;
- NavPage* chapters;
- NavPage* verses;
- NavPage* books;
- NavPage* text;
- NavPage* find;
-
- bool chapterCache; // to be set to false if 'text' should reload
- // its chapter
- int numbersMax; // When selecting a number, the maximum number
- UString numbersTitle;
-
- Navigator(RECT* screen);
- virtual ~Navigator();
+#include "SimpleNavigator.h"
+#include "ApplicationInterface.h"
- void setBook(int number);
- void setChap(int number);
- void setVerse(int number);
+#define MODE_TEXT2 5
- int getBook() {return position.getBook();};
- int getChap() {return position.verse->Chapter();};
- int getVerse() {return position.verse->Verse();};
+class NavPage;
- int chapCount() {return position.chapCount();}
- int verseCount() {return position.verseCount();}
+class ConstructionPage: public NavPage {
+ public:
+ ConstructionPage(SimpleNavigator* navigator):NavPage(navigator) {};
+ void paint() {
+ drawText(&RECT_SCREEN, L"Under construction");
+ };
+};
- void updateTitle();
- void fillTranslationsMenu(HMENU menuTranslations);
- void fillGlobalOptionsMenu(HMENU menuTranslations);
- int getID();
- void toggleOptionMenu(int id);
- void refresh();
- void setMode(int mode);
- void paint();
- void buttonClicked(int id);
- void keyDown(WPARAM id, LPARAM lparam);
- void urlClicked(const WCHAR *target);
- void mouseDown(int x, int y);
- bool initialized() {return position.initialized();}
+class Navigator : public SimpleNavigator {
+ private:
+ NavPage* text2;
+ public:
+ Navigator(RECT* screen);
+ virtual ~Navigator();
};
-#endif
+#endif
\ No newline at end of file
Index: gui.vcl
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gui.vcl 28 Feb 2004 13:40:15 -0000 1.19
+++ gui.vcl 28 Feb 2004 19:43:29 -0000 1.20
@@ -6,14 +6,20 @@
--------------------Configuration: gui - Win32 (WCE ARM) Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12C.tmp" with contents
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP25D.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\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\NavChap.cpp"
+"D:\SwordReader\swordreader\src\gui\NavVerse.cpp"
]
-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
+Creating command line "clarm.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP25D.tmp"
+Creating temporary file "E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP25E.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
@@ -28,11 +34,16 @@
.\ARMRel\BibleReader.res
.\ARMRel\NavChap.obj
.\ARMRel\NavVerse.obj
+.\ARMRel\SimpleNavigator.obj
]
-Creating command line "link.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP12D.tmp"
+Creating command line "link.exe @E:\DOCUME~1\Johan\LOCALS~1\Temp\RSP25E.tmp"
<h3>Output Window</h3>
Compiling...
+Main.cpp
+NavBooks.cpp
+NavFind.cpp
Navigator.cpp
+NavNumbers.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'
@@ -40,6 +51,8 @@
D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(72) : see declaration of 's'
D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(112) : warning C4509: nonstandard extension used: 'load' uses SEH and 'text' has destructor
D:\SwordReader\swordreader\src\gui\NavRenderText.cpp(68) : see declaration of 'text'
+NavChap.cpp
+NavVerse.cpp
Linking...
Index: gui.vcp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/gui.vcp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui.vcp 28 Feb 2004 13:40:15 -0000 1.8
+++ gui.vcp 28 Feb 2004 19:43:29 -0000 1.9
@@ -265,6 +265,7 @@
".\Main.h"\
".\Navigator.h"\
".\NavPage.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
{$(INCLUDE)}"aygshell.h"\
@@ -459,6 +460,7 @@
".\NavBooks.h"\
".\Navigator.h"\
".\NavPage.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -637,6 +639,7 @@
".\Navigator.h"\
".\NavNumbers.h"\
".\NavPage.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -822,6 +825,7 @@
".\NavFind.h"\
".\Navigator.h"\
".\NavPage.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -994,15 +998,10 @@
"..\..\..\sword\include\versekey.h"\
"..\..\..\sword\include\ztext.h"\
"..\..\..\sword\include\zverse.h"\
- "..\Dll1\winceSword\include\swordce.h"\
".\ApplicationInterface.h"\
- ".\NavBooks.h"\
- ".\NavChap.h"\
- ".\NavFind.h"\
".\Navigator.h"\
- ".\NavNumbers.h"\
".\NavPage.h"\
- ".\NavRenderText.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -1191,6 +1190,7 @@
".\Navigator.h"\
".\NavNumbers.h"\
".\NavPage.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -1368,6 +1368,7 @@
".\Navigator.h"\
".\NavPage.h"\
".\NavRenderText.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
{$(INCLUDE)}"htmlctrl.h"\
@@ -1556,6 +1557,7 @@
".\NavNumbers.h"\
".\NavPage.h"\
".\NavVerse.h"\
+ ".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
@@ -1700,6 +1702,209 @@
# End Source File
# Begin Source File
+SOURCE=.\SimpleNavigator.cpp
+
+!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
+
+DEP_CPP_SIMPL=\
+ "..\..\..\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"\
+ ".\NavBooks.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavRenderText.h"\
+ ".\NavVerse.h"\
+ ".\SimpleNavigator.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SIMPL=\
+ "..\..\..\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"\
+ ".\NavBooks.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavRenderText.h"\
+ ".\NavVerse.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
+
+DEP_CPP_SIMPL=\
+ "..\..\..\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"\
+ ".\NavBooks.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavRenderText.h"\
+ ".\NavVerse.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
+
+DEP_CPP_SIMPL=\
+ "..\..\..\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"\
+ ".\NavBooks.h"\
+ ".\NavChap.h"\
+ ".\NavFind.h"\
+ ".\Navigator.h"\
+ ".\NavNumbers.h"\
+ ".\NavPage.h"\
+ ".\NavRenderText.h"\
+ ".\NavVerse.h"\
+ ".\SwordIndex.h"\
+ ".\Utils.h"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\SwordIndex.cpp
!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
@@ -1955,6 +2160,10 @@
# Begin Source File
SOURCE=.\NavVerse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SimpleNavigator.h
# End Source File
# Begin Source File
Index: resource.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/resource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resource.h 3 Feb 2004 18:45:35 -0000 1.2
+++ resource.h 28 Feb 2004 19:43:29 -0000 1.3
@@ -1,45 +1,47 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by BibleReader.rc
-//
-#define MENU_ABOUT 0
-#define IDS_APP_TITLE 1
-#define IDS_HELLO 2
-#define IDC_BIBLEREADER 3
-#define IDI_BIBLEREADER 101
-#define IDM_MENU 102
-#define IDD_ERROR_NOBIBLES 103
-#define IDS_HELP 104
-#define IDS_COMMAND1 301
-#define IDM_MAIN_COMMAND1 40001
-#define IDM_HELP_ABOUT 40003
-#define MENU_BOOK 40004
-#define IDS_CAP_BOOK 40006
-#define MENU_CHAP 40007
-#define IDS_CAP_CHAP 40009
-#define MENU_VERSE 40010
-#define IDS_CAP_TEXT 40013
-#define MENU_BIBLE 40014
-#define IDS_CAP_VERSE 40016
-#define IDS_CAP_BIBLE 40018
-#define MENU_TEXT 40019
-#define IDS_SELECTBOOK 40019
-#define IDS_SELECTCHAP 40020
-#define MENU_MENU 40021
-#define IDS_SELECTBIBLE 40022
-#define IDS_CAP_MENU 40023
-#define MENU_FIND 40029
-#define IDS_CAP_FIND 40030
-#define MENU_SHUTDOWN 40031
-#define USERBUTTONS 41000
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40032
-#define _APS_NEXT_CONTROL_VALUE 1002
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by BibleReader.rc
+//
+#define MENU_ABOUT 0
+#define IDS_APP_TITLE 1
+#define IDS_HELLO 2
+#define IDC_BIBLEREADER 3
+#define IDI_BIBLEREADER 101
+#define IDM_MENU 102
+#define IDD_ERROR_NOBIBLES 103
+#define IDS_HELP 104
+#define IDS_COMMAND1 301
+#define IDM_MAIN_COMMAND1 40001
+#define IDM_HELP_ABOUT 40003
+#define MENU_BOOK 40004
+#define IDS_CAP_BOOK 40006
+#define MENU_CHAP 40007
+#define IDS_CAP_CHAP 40009
+#define MENU_VERSE 40010
+#define IDS_CAP_TEXT 40013
+#define MENU_BIBLE 40014
+#define IDS_CAP_VERSE 40016
+#define IDS_CAP_BIBLE 40018
+#define MENU_TEXT 40019
+#define IDS_SELECTBOOK 40019
+#define IDS_SELECTCHAP 40020
+#define MENU_MENU 40021
+#define IDS_SELECTBIBLE 40022
+#define IDS_CAP_MENU 40023
+#define MENU_FIND 40029
+#define IDS_CAP_FIND 40030
+#define MENU_SHUTDOWN 40031
+#define MENU_TEXT2 40032
+#define IDS_CAP_TE2 40034
+#define USERBUTTONS 41000
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 109
+#define _APS_NEXT_COMMAND_VALUE 40035
+#define _APS_NEXT_CONTROL_VALUE 1002
+#define _APS_NEXT_SYMED_VALUE 102
+#endif
+#endif
- Previous message: [sword-cvs] swordreader/src/simplegui newres.h,NONE,1.1 resource.h,NONE,1.1 simplegui.rc,NONE,1.1 simplegui.vcl,NONE,1.1 simplegui.vcp,NONE,1.1
- Next message: [sword-cvs] sword/examples/cmdline lookup.cpp,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]