[sword-svn] r44 - in trunk: . src/gui
bdrake at www.crosswire.org
bdrake at www.crosswire.org
Mon Nov 26 08:19:15 MST 2007
Author: bdrake
Date: 2007-11-26 08:19:14 -0700 (Mon, 26 Nov 2007)
New Revision: 44
Added:
trunk/INSTALL.TXT
trunk/MS_GetFreeIDE.txt
Modified:
trunk/Getting started.txt
trunk/INSTALL
trunk/src/gui/Main.cpp
trunk/src/gui/NavBooks.cpp
trunk/src/gui/NavFind.cpp
Log:
Modified: trunk/Getting started.txt
===================================================================
--- trunk/Getting started.txt 2007-11-25 17:57:37 UTC (rev 43)
+++ trunk/Getting started.txt 2007-11-26 15:19:14 UTC (rev 44)
@@ -5,7 +5,7 @@
BUILDING THE APPLICATION
To build the application, do the following
-- check out the main sword library in a 'sword' directory next to this ('swordreader') directory.
+- check out the main sword library (http://crosswire.org/svn/sword/trunk) in a 'sword' directory next to this ('swordreader') directory.
- Use Microsoft eMbedded Visual C++ (freely downloadable from microsoft) to open the workspace in the src directory.
- This will result in the gui.exe, simplegui.exe and the sword.dll
- For other files needed to run the application, see the instructions in the INSTALL file.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2007-11-25 17:57:37 UTC (rev 43)
+++ trunk/INSTALL 2007-11-26 15:19:14 UTC (rev 44)
@@ -1,10 +1,23 @@
-To install the 'sword reader' program on your IPAQ do the following:
+To install the 'sword reader' program on your pocket PC do the following:
-- Copy the contents of this package to your iPaq under \Program Files (making the directory '\Program files\sword' on your iPaq).
+- Build the ARM release version of sword.dll and the ARM release version of simplegui.exe
-- Move the 'SwordReader(.lnk)' file to the \windows\Start Menu\Programs directory
+- Copy both files to your Pocket PC under \Program Files (making the directory '\Program files\sword' on your system memory).
+- OR copy both files to a directory called 'sword' on your Storage Card.
-You may then unzip SWORD books to \Program Files\sword\books or to the root of your SD/MMC card
-If you'd like to change this configuration information, see: \Program Files\sword\sword.conf
+The directory into which they are placed is your Sword Home directory
+You may then unzip any of the SWORD bibles or commentaries to your Sword home directory. This will produce two sub-directories : mods.d and modules which will contain the books you have unzipped. If you are installing to system memory rather than to a Storage Card, you will first need to place all the files and modules in a directory (called 'sword' for convenience) transport this entire directory via active-sync explore. You can simple copy the directory to 'Program Files' on your dveice and then use the device's own file manager to create the link.
+
+NOTE that the application will fail with an error message if you do not have the correct configuration of files in the Sword home directory; that is to say you need a valid module with a valid .conf file in mods.d and a module in the path pointed to by the module's .conf file.
+
+If you'd like to change this configuration information, write a text file called 'sword.conf' and place it in your Sword home directory.
+
+- make a link to start the program using the Windows Mobile file manager (Start/Programs/File Explorer). To do this, first browse to your Sword home directory. Use the cursor keys to highlight simplegui.exe (don't tap on it). Then do menu/edit/copy. Next, browse to My Device/Windows/Start Menu/Programs and do Menu/Edit/Paste Shortcut (NOT Paste!). This will produce a link that you can use to fire up the application.
+
+Known problems: We need a means of installation that will run on a PC and do all of the above automatically using Sword Install Manager to get the modules. This is work in progress. Also, GUI.exe is intended to have two text window so that two different versions or a version and a commentary can be looked at. Currently, simplegui.exe is the same as GUI.exe but without the extra button which currently does nothing useful!
+Also, currently the footnotes do not display correctly nor do the Strongs numbers in versions that use them.
+
+Any offers of help appreciated.
+
May God bless you as you seek to serve Him!
Added: trunk/INSTALL.TXT
===================================================================
--- trunk/INSTALL.TXT (rev 0)
+++ trunk/INSTALL.TXT 2007-11-26 15:19:14 UTC (rev 44)
@@ -0,0 +1,23 @@
+To install the 'sword reader' program on your pocket PC do the following:
+
+- Build the ARM release version of sword.dll and the ARM release version of simplegui.exe
+
+- Copy both files to your Pocket PC under \Program Files (making the directory '\Program files\sword' on your system memory).
+- OR copy both files to a directory called 'sword' on your Storage Card.
+
+The directory into which they are placed is your Sword Home directory
+
+You may then unzip any of the SWORD bibles or commentaries to your Sword home directory. This will produce two sub-directories : mods.d and modules which will contain the books you have unzipped. If you are installing to system memory rather than to a Storage Card, you will first need to place all the files and modules in a directory (called 'sword' for convenience) transport this entire directory via active-sync explore. You can simple copy the directory to 'Program Files' on your dveice and then use the device's own file manager to create the link.
+
+NOTE that the application will fail with an error message if you do not have the correct configuration of files in the Sword home directory; that is to say you need a valid module with a valid .conf file in mods.d and a module in the path pointed to by the module's .conf file.
+
+If you'd like to change this configuration information, write a text file called 'sword.conf' and place it in your Sword home directory.
+
+- make a link to start the program using the Windows Mobile file manager (Start/Programs/File Explorer). To do this, first browse to your Sword home directory. Use the cursor keys to highlight simplegui.exe (don't tap on it). Then do menu/edit/copy. Next, browse to My Device/Windows/Start Menu/Programs and do Menu/Edit/Paste Shortcut (NOT Paste!). This will produce a link that you can use to fire up the application.
+
+Known problems: We need a means of installation that will run on a PC and do all of the above automatically using Sword Install Manager to get the modules. This is work in progress. Also, GUI.exe is intended to have two text window so that two different versions or a version and a commentary can be looked at. Currently, simplegui.exe is the same as GUI.exe but without the extra button which currently does nothing useful!
+Also, currently the footnotes do not display correctly nor do the Strongs numbers in versions that use them.
+
+Any offers of help appreciated.
+
+ May God bless you as you seek to serve Him!
Added: trunk/MS_GetFreeIDE.txt
===================================================================
--- trunk/MS_GetFreeIDE.txt (rev 0)
+++ trunk/MS_GetFreeIDE.txt 2007-11-26 15:19:14 UTC (rev 44)
@@ -0,0 +1,45 @@
+Download from MS
+http://www.microsoft.com/downloads/details.aspx?familyid=f663bf48-31ee-4cbe-aac5-0affd5fb27dd&displaylang=en
+
+Overview
+eMbedded Visual Tools 3.0 - 2002 Edition
+The Microsoft® eMbedded Visual Tools 3.0 2002 Edition deliver a complete desktop development environment for creating applications and system components for Windows® Powered devices, including the Pocket PC and Smartphone.
+This refresh of the eMbedded Visual Tools 3.0 contains Microsoft eMbedded Visual C++® 3.0; Microsoft eMbedded Visual Basic 3.0®, and now includes the Software Development Kits (SDKs) for Pocket PC 2002 and Smartphone 2002. This download does not contain the SDKs for Palm Size PC or Handheld PC. These are available as separate downloads on MSDN:
+
+ * Palm-size PC 1.2 SDK
+ * Handheld PC Professional Edition 3.0 SDK
+ * Handheld PC 2000 SDK
+
+
+
+System Requirements
+
+ * Supported Operating Systems: Windows 2000; Windows NT
+
+Before downloading the eMbedded Visual Tools 3.0 2002 Edition, make sure you have the appropriate system requirements:
+
+
+ * PC with Pentium processor; Pentium 150MHz or higher processor recommended
+
+ * Microsoft® Windows NT Workstation operating system version 4.0 with Service Pack 5 or later (Service Pack 5 included) or Microsoft Windows 2000 operating system (Windows NT 4.0 or Windows 2000 required for emulation)
+
+ * 32 MB for Windows NT Workstation 4.0 or Windows 2000 (48 MB recommended)
+
+ * Hard-disk space required: Minimum installation: 360 MB; Complete installation: 720 MB
+
+ * CD-ROM drive compatible with multimedia PC specification
+
+ * VGA or higher-resolution monitor required; Super VGA recommended
+
+ * Microsoft Mouse or compatible pointing device
+
+ * Please be sure to read the specific system requirements for the individual SDKs as well
+
+ Top of page
+Instructions
+
+ 1. Click the Download button on this page to start the download.
+ 2. Do one of the following:
+ * To start the installation immediately, click Open or Run this program from its current location
+ * .To copy the download to your computer for installation at a later time, click Save or Save this program to disk.
+ 3. When prompted for the CD Key, please enter TRT7H-KD36T-FRH8D-6QH8P-VFJHQ.
\ No newline at end of file
Modified: trunk/src/gui/Main.cpp
===================================================================
--- trunk/src/gui/Main.cpp 2007-11-25 17:57:37 UTC (rev 43)
+++ trunk/src/gui/Main.cpp 2007-11-26 15:19:14 UTC (rev 44)
@@ -156,7 +156,7 @@
SendMessage (hWnd, WM_CLOSE, 0, 0);
break;
case MENU_ABOUT:
- MessageBox(0, L"Sword reader program for IPAQ\n\nsee: http://www.crosswire.org/sword/swordreader/\n\nGUI by Johan Gorter, 2004\nProverbs 16:3", L"About", MB_OK);
+ MessageBox(0, L"Sword reader program for Pocket PC\n\nsee: http://www.crosswire.org/sword/swordreader/\n\nGUI by Johan Gorter, 2004\nNow being maintained by B. Drake and Robin Randall\nProverbs 16:3", L"About", MB_OK);
break;
case MENU_SHUTDOWN:
SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd);
Modified: trunk/src/gui/NavBooks.cpp
===================================================================
--- trunk/src/gui/NavBooks.cpp 2007-11-25 17:57:37 UTC (rev 43)
+++ trunk/src/gui/NavBooks.cpp 2007-11-26 15:19:14 UTC (rev 44)
@@ -5,6 +5,7 @@
//RECT RECT_SCREEN = {0,0,240,294};
+
#define BUTTON_WIDTH 26
#define BUTTON_HEIGHT 17
@@ -21,12 +22,14 @@
// #define ROW2 45
// all uses of ROW1 and ROW2 removed BD Nov 2007 to make buttons fit on landscape
-// the message "Select a book:" does not now display but may not really be important
+// the message "Select a book:" will only show in portrait display as it is now
+// re-sited below the buttons - but it's not really that important anyway
+
#define ROW0 5
NavBooks::NavBooks(SimpleNavigator* navigator): NavPage(navigator) {
this->position=&(navigator->position);
- this->command=UString(L"Select a book:");
+ this->command=UString(L"Select a book from the above:");
this->maxOTNumber=position->otBookCount();
this->maxNumber=position->bookCount();
}
@@ -37,6 +40,8 @@
void NavBooks::paint() {
RECT rt;
memset(&rt,0,sizeof(rt));
+ RECT_SCREEN.bottom = 320; // portrait or landscape for clearing (Big square area)
+ RECT_SCREEN.right = 320;
rt.right=RECT_SCREEN.right;
// to see if the whole screen gets filled
@@ -53,7 +58,7 @@
// rt.top=ROW1; rt.bottom=ROW2;
// clearRect(&rt);
- // all references below to ROW0 were formerly ROW2 - amended BD Nov 07
+ // all references below changed to ROW0 :some were formerly ROW2 - amended BD Nov 07
setBackground(BUTTON_BACKGROUND);
setFont(FONT_NAVIGATION);
@@ -69,7 +74,6 @@
while (current<=maxTNumber) {
int colStart=current;
rt.left=rt.right; rt.right=rt.left+BUTTON_WIDTH; rt.bottom=ROW0;
- // rt.left=rt.right; rt.right=rt.left+BUTTON_WIDTH; rt.bottom=ROW0;
while ((current<=maxTNumber)&&(current-colStart<MAXVERTICAL)) {
//padding top of button
rt.top=rt.bottom;rt.bottom=rt.top+PADDING_HEIGHT;
@@ -79,6 +83,7 @@
drawText(&rt,bookNames[current-1],3);
current++;
}
+
// padding below buttons
rt.top=rt.bottom;rt.bottom=RECT_SCREEN.bottom;
clearRect(&rt);
@@ -86,6 +91,7 @@
// rt.top=ROW2; rt.left=rt.right; rt.right=rt.left+PADDING_WIDTH;
rt.top=ROW0; rt.left=rt.right; rt.right=rt.left+PADDING_WIDTH;
clearRect(&rt);
+ // six lines above commented out while testing BD
}
if (current<maxNumber) {
//space between testaments
@@ -99,7 +105,12 @@
//space right of the buttons
rt.left=rt.right; rt.right=RECT_SCREEN.right; rt.bottom=RECT_SCREEN.bottom;
clearRect(&rt);
-
+ // next three lines draw text which will only be seen in portrait mode
+ setBackground(0xFFFFFFFF); // white
+ rt.left=0;
+ rt.top=ROW0+20+MAXVERTICAL*(BUTTON_HEIGHT+PADDING_HEIGHT);
+ rt.bottom=ROW0+20+BUTTON_HEIGHT+MAXVERTICAL*(BUTTON_HEIGHT+PADDING_HEIGHT);
+ drawText(&rt,command);
setBackground();
setFont();
}
Modified: trunk/src/gui/NavFind.cpp
===================================================================
--- trunk/src/gui/NavFind.cpp 2007-11-25 17:57:37 UTC (rev 43)
+++ trunk/src/gui/NavFind.cpp 2007-11-26 15:19:14 UTC (rev 44)
@@ -7,7 +7,7 @@
#define check(checkButtonHWND) SendMessage(checkButtonHWND,BM_SETCHECK,BST_CHECKED,0);
#define uncheck(checkButtonHWND) SendMessage(checkButtonHWND,BM_SETCHECK,BST_UNCHECKED,0);
-// added Nov 2007 to check mode before painting find listbox - BD
+// added Nov 2007 to check mode before painting 'find' listbox - BD
// this was written as a separate function in case we want to call it from elsewhere
int IsPortrait() {
if (GetSystemMetrics(SM_CYSCREEN) > GetSystemMetrics(SM_CXSCREEN)) return(100);
@@ -74,7 +74,7 @@
// 0,96,80,173, g_hWnd, registerID(resultsID), g_hInst, NULL); //bottom row of screen
// above was original setting for portrait mode
0,96,80,scrHeight, g_hWnd, registerID(resultsID), g_hInst, NULL); //bottom row of screen
- // the last figure in above line needs to be 100 for landscape or 173 for portrait
+ // the last figure in above line needs to be 100 for landscape or 173 for portrait (scrHeight)
progressBar = CreateWindow(PROGRESS_CLASS, L"",
WS_CHILD | WS_BORDER | PBS_SMOOTH,
More information about the sword-cvs
mailing list