[sword-svn] r194 - trunk/src/SwordReader_GUI
dtrotzjr at crosswire.org
dtrotzjr at crosswire.org
Sun Jan 4 21:18:08 MST 2009
Author: dtrotzjr
Date: 2009-01-04 21:18:08 -0700 (Sun, 04 Jan 2009)
New Revision: 194
Modified:
trunk/src/SwordReader_GUI/SRBibleWidget.cpp
trunk/src/SwordReader_GUI/SRBibleWidget.h
trunk/src/SwordReader_GUI/SRLexiWidget.cpp
trunk/src/SwordReader_GUI/SRMainFrame.cpp
trunk/src/SwordReader_GUI/SRTabbedViews.cpp
trunk/src/SwordReader_GUI/SRTabbedViews.h
trunk/src/SwordReader_GUI/SRTextView.cpp
trunk/src/SwordReader_GUI/SwordReader_GUI.rc
trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
trunk/src/SwordReader_GUI/resource.h
Log:
Strongs Lexicon pop-ups and footnote pop ups are 80% done. This revision builds and runs but is quite buggy and not very useful yet.
Modified: trunk/src/SwordReader_GUI/SRBibleWidget.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRBibleWidget.cpp 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRBibleWidget.cpp 2009-01-05 04:18:08 UTC (rev 194)
@@ -6,10 +6,13 @@
SRBibleWidget::SRBibleWidget()
:m_viewBible(NULL)
,m_viewLexi(NULL)
+,m_viewNote(NULL)
,m_modGreekDef(NULL)
,m_modGreekMorph(NULL)
,m_modHebrewDef(NULL)
,m_modHebrewMorph(NULL)
+,m_fLexiVisible(FALSE)
+,m_fNoteVisible(FALSE)
{
m_wcsClassName = "SRBibleWidget";
m_wcsWindowName = "";
@@ -171,6 +174,7 @@
{
RECT clientRect;
RECT lexiRect = {0,0,0,0};
+ RECT notesRect = {0,0,0,0};
GetClientRect(m_hWnd, &clientRect);
m_viewBible = new SRModuleView(BibleView);
@@ -181,6 +185,9 @@
if(!m_viewLexi || !m_viewLexi->Create(this, lexiRect))
return FALSE;
+ m_viewNote = new SRTextView(TRUE);
+ if(!m_viewNote || !m_viewNote->Create(this, notesRect))
+ return FALSE;
return TRUE;
}
@@ -219,7 +226,7 @@
m_modHebrewMorph = pModule;
}
-VOID SRBibleWidget::ShowSubWindow()
+VOID SRBibleWidget::ShowLexiSubWindow()
{
RECT clientRect;
RECT mainRect, subRect;
@@ -230,9 +237,14 @@
GetClientRect(m_hWnd, &clientRect);
mainRect = clientRect;
subRect = clientRect;
-
+
+ if(m_fNoteVisible){
+ m_viewNote->Hide();
+ m_fNoteVisible = FALSE;
+ }
+
m_viewLexi->Show();
- for(int i = 0, j = 1; i < 80;){
+ for(i = 0, j = 1; i < 80;){
Sleep(5);
tmp = 20 - j++;
i += tmp;
@@ -243,4 +255,93 @@
m_viewBible->RefreshWindow();
m_viewLexi->RefreshWindow();
}
+ m_fLexiVisible = TRUE;
+}
+
+VOID SRBibleWidget::ShowNoteSubWindow()
+{
+ RECT clientRect;
+ RECT mainRect, subRect;
+ int i,j,tmp;
+ if(!m_viewNote || !m_viewBible)
+ return;
+
+ GetClientRect(m_hWnd, &clientRect);
+ mainRect = clientRect;
+ subRect = clientRect;
+
+ if(m_fLexiVisible){
+ m_viewLexi->Hide();
+ m_fLexiVisible = FALSE;
+ }
+
+ m_viewNote->Show();
+ for(i = 0, j = 1; i < 80;){
+ Sleep(5);
+ tmp = 20 - j++;
+ i += tmp;
+ mainRect.bottom -= tmp;
+ subRect.top = mainRect.bottom;
+ m_viewBible->MoveWindow(&mainRect);
+ m_viewNote->MoveWindow(&subRect);
+ m_viewBible->RefreshWindow();
+ m_viewNote->RefreshWindow();
+ }
+ m_fNoteVisible = TRUE;
+}
+
+VOID SRBibleWidget::ShowGreekDef(const WCString &key)
+{
+ if(m_modGreekDef)
+ ShowLexiEntry(m_modGreekDef, key);
+ else
+ ::MessageBox(0, L"No Dictionary found - install Strong's Greek module", L"Greek Defs Missing", MB_OK);
+}
+
+VOID SRBibleWidget::ShowHebrewDef(const WCString &key)
+{
+ if(m_modHebrewDef)
+ ShowLexiEntry(m_modHebrewDef, key);
+ else
+ ::MessageBox(0, L"No Dictionary found - install Strong's Hebrew module", L"Hebrew Defs Missing", MB_OK);
+}
+
+VOID SRBibleWidget::ShowGreekMorph(const WCString &key)
+{
+ if(m_modGreekMorph)
+ ShowLexiEntry(m_modGreekMorph, key);
+ else
+ ::MessageBox(0, L"No Dictionary found - install Strong's Greek module", L"Greek Defs Missing", MB_OK);
+}
+
+VOID SRBibleWidget::ShowHebrewMorph(const WCString &key)
+{
+ if(m_modHebrewMorph)
+ ShowLexiEntry(m_modHebrewMorph, key);
+ else
+ ::MessageBox(0, L"No Dictionary found - install Strong's Hebrew module", L"Hebrew Defs Missing", MB_OK);
+}
+
+
+VOID SRBibleWidget::ShowLexiEntry(SWModule *pModule, const WCString &key)
+{
+ if(!pModule || !m_viewLexi)
+ return;
+ m_viewLexi->SetModule(pModule);
+ m_viewLexi->SetKey(key.c_str());
+ if(!m_fLexiVisible){
+ ShowLexiSubWindow();
+ }
+}
+
+VOID SRBibleWidget::ShowBibleNote(const WCString ¬e)
+{
+ if(!m_viewNote)
+ return;
+ m_viewNote->Clear();
+ m_viewNote->AddText(note.w_str(), note.length());
+ m_viewNote->RefreshWindow();
+ if(!m_fNoteVisible){
+ ShowNoteSubWindow();
+ }
}
\ No newline at end of file
Modified: trunk/src/SwordReader_GUI/SRBibleWidget.h
===================================================================
--- trunk/src/SwordReader_GUI/SRBibleWidget.h 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRBibleWidget.h 2009-01-05 04:18:08 UTC (rev 194)
@@ -34,17 +34,28 @@
VOID SetGreekMorphModule(SWModule *pModule);
VOID SetHebrewDefModule(SWModule *pModule);
VOID SetHebrewMorphModule(SWModule *pModule);
+ VOID ShowGreekDef(const WCString &key);
+ VOID ShowHebrewDef(const WCString &key);
+ VOID ShowGreekMorph(const WCString &key);
+ VOID ShowHebrewMorph(const WCString &key);
+ VOID ShowBibleNote(const WCString ¬e);
- VOID ShowSubWindow();
+ VOID ShowLexiSubWindow();
+ VOID ShowNoteSubWindow();
BOOL OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
private:
+ VOID ShowLexiEntry(SWModule *pModule, const WCString &key);
+
static BOOL s_fRegistered;
SRModuleView *m_viewBible;
SRLexiView *m_viewLexi;
+ SRTextView *m_viewNote;
SWModule *m_modGreekDef;
SWModule *m_modGreekMorph;
SWModule *m_modHebrewMorph;
SWModule *m_modHebrewDef;
+ BOOL m_fLexiVisible;
+ BOOL m_fNoteVisible;
VerseKey m_keyDummy;
};
\ No newline at end of file
Modified: trunk/src/SwordReader_GUI/SRLexiWidget.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRLexiWidget.cpp 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRLexiWidget.cpp 2009-01-05 04:18:08 UTC (rev 194)
@@ -100,6 +100,7 @@
return TRUE;
}
+
/*
Partially fills the ComboBox drop down with entries based upon
the current text.
Modified: trunk/src/SwordReader_GUI/SRMainFrame.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRMainFrame.cpp 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRMainFrame.cpp 2009-01-05 04:18:08 UTC (rev 194)
@@ -1,5 +1,6 @@
#include "SRMainFrame.h"
#include <swordce.h>
+#include <swbuf.h>
#include <url.h>
using namespace sword;
@@ -386,17 +387,26 @@
WCString wcsKey = url.getParameterValue("passage");
WCString wcsValue = url.getParameterValue("value");
mod = m_swmgr->getModule(wcsModule.c_str());
- modKey = mod->getKey();
- modKey->setText(wcsKey.c_str());
+ mod->setKey(wcsKey.c_str());
mod->RenderText();
- WCString wcsBody = mod->getEntryAttributes()["Footnote"][wcsValue.c_str()]["body"];
- WCString wcsBodyR = mod->RenderText(wcsBody.c_str());
+ SWBuf bufNote = mod->getEntryAttributes()["Footnote"][wcsValue.c_str()]["body"];
+ WCString wcsNote = (const TCHAR*)mod->RenderText(bufNote.c_str());
+ m_tabViews->ShowBibleNote(wcsNote);
// Send this somewhere and show it...
- return TRUE;
}else if(wcsURL.contains("showStrongs")){
- return TRUE;
+ WCString wcsType = url.getParameterValue("type");
+ WCString wcsValue = url.getParameterValue("value");
+ if(wcsType.contains("Greek"))
+ m_tabViews->ShowGreekDef(wcsValue);
+ if(wcsType.contains("Hebrew"))
+ m_tabViews->ShowHebrewDef(wcsValue);
}else if(wcsURL.contains("showMorph")){
- return TRUE;
+ WCString wcsType = url.getParameterValue("type");
+ WCString wcsValue = url.getParameterValue("value");
+ if(wcsType.contains("Greek"))
+ m_tabViews->ShowGreekMorph(wcsValue);
+ if(wcsType.contains("Hebrew"))
+ m_tabViews->ShowHebrewMorph(wcsValue);
}else if(wcsURL.contains("scriptRef")){
return TRUE;
}
Modified: trunk/src/SwordReader_GUI/SRTabbedViews.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRTabbedViews.cpp 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRTabbedViews.cpp 2009-01-05 04:18:08 UTC (rev 194)
@@ -511,7 +511,39 @@
}
-VOID SRTabbedViews::HyperLinkClicked()
+/*VOID SRTabbedViews::HyperLinkClicked()
{
- m_viewBible->ShowSubWindow();
-}
\ No newline at end of file
+ if(m_viewBible)
+ m_viewBible->ShowSubWindow();
+}*/
+
+
+VOID SRTabbedViews::ShowGreekDef(const WCString &key)
+{
+ if(m_viewBible)
+ m_viewBible->ShowGreekDef(key);
+}
+
+VOID SRTabbedViews::ShowHebrewDef(const WCString &key)
+{
+ if(m_viewBible)
+ m_viewBible->ShowHebrewDef(key);
+}
+
+VOID SRTabbedViews::ShowGreekMorph(const WCString &key)
+{
+ if(m_viewBible)
+ m_viewBible->ShowGreekMorph(key);
+}
+
+VOID SRTabbedViews::ShowHebrewMorph(const WCString &key)
+{
+ if(m_viewBible)
+ m_viewBible->ShowHebrewMorph(key);
+}
+
+VOID SRTabbedViews::ShowBibleNote(const WCString ¬e)
+{
+ if(m_viewBible)
+ m_viewBible->ShowBibleNote(note);
+};
\ No newline at end of file
Modified: trunk/src/SwordReader_GUI/SRTabbedViews.h
===================================================================
--- trunk/src/SwordReader_GUI/SRTabbedViews.h 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRTabbedViews.h 2009-01-05 04:18:08 UTC (rev 194)
@@ -64,8 +64,13 @@
VOID SetGreekMorphModule(SWModule *pModule);
VOID SetHebrewDefModule(SWModule *pModule);
VOID SetHebrewMorphModule(SWModule *pModule);
+ VOID ShowGreekDef(const WCString &key);
+ VOID ShowHebrewDef(const WCString &key);
+ VOID ShowGreekMorph(const WCString &key);
+ VOID ShowHebrewMorph(const WCString &key);
+ VOID ShowBibleNote(const WCString ¬e);
- VOID HyperLinkClicked();
+ //VOID HyperLinkClicked();
WCString GetWindowTitle();
private:
Modified: trunk/src/SwordReader_GUI/SRTextView.cpp
===================================================================
--- trunk/src/SwordReader_GUI/SRTextView.cpp 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SRTextView.cpp 2009-01-05 04:18:08 UTC (rev 194)
@@ -23,6 +23,7 @@
*/
#include "SRTextView.h"
#include "SRFramework/SRApp.h"
+#include "resource.h"
#include <Wingdi.h>
using namespace SRFramework;
@@ -754,6 +755,11 @@
}
}
+ if(m_fIsSubWindow){
+ HICON icoCl = LoadIcon(m_hInstance, MAKEINTRESOURCE(IDI_CLOSE));
+ DrawIcon(hdc, clientRect.right - 18, m_nTop + 2, icoCl);
+ }
+
SetTextColor(hdc, crOldColor);
ClearFontCache(hdc);
RestoreDC(hdc, nSavedDC);
@@ -986,6 +992,7 @@
INT nDragDist = 0;
RECT rectScroll;
GetClientRect(m_hWnd, &rectScroll);
+
rectScroll.bottom -= m_wStatusBarHeight;
if( yPos >= 0){
@@ -998,6 +1005,7 @@
// Invalidate the status bar area as well, otherwise it leaves artifacts.
rectUpdateRect.top -= m_wStatusBarHeight;
InvalidateRect(m_hWnd, &rectUpdateRect, TRUE);
+
::UpdateWindow(m_hWnd);
}
if(fSendMessage)
Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.rc
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.rc 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.rc 2009-01-05 04:18:08 UTC (rev 194)
@@ -1,185 +1,186 @@
-// Microsoft Visual C++ 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 "BibleReader.ICO"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""newres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RCDATA
-//
-
-IDM_MENU RCDATA
-BEGIN
- 0x0066, 0x0006, 0xfffe, 0x9c44, 0x0004, 0x0012, 0x9c46, 0x0000, 0xffff,
- 0xfffe, 0x9c47, 0x0004, 0x0012, 0x9c49, 0x0000, 0xffff, 0xfffe, 0x9c4a,
- 0x0004, 0x0012, 0x9c50, 0x0000, 0xffff, 0xfffe, 0x9c53, 0x0004, 0x0012,
- 0x9c4d, 0x9c53, 0xffff, 0xfffe, 0x9c5d, 0x0004, 0x0012, 0x9c5e, 0x0000,
- 0xffff, 0xfffe, 0x9c55, 0x0004, 0x0018, 0x9c57, 0x0000, 0x0005
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MENU MENU
-BEGIN
- POPUP "Navigate"
- BEGIN
- MENUITEM "Book", MENU_BOOK
- MENUITEM "Chap", MENU_CHAP
- MENUITEM "Verse", MENU_VERSE
- MENUITEM "Text", MENU_TEXT
- MENUITEM SEPARATOR
- MENUITEM "Find", MENU_FIND
- END
- POPUP "Menu"
- BEGIN
- MENUITEM "About", MENU_ABOUT
- MENUITEM "Exit", MENU_SHUTDOWN
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDC_BIBLEREADER ACCELERATORS
-BEGIN
- "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT
- "Q", IDOK, VIRTKEY, CONTROL, NOINVERT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_ERROR_NOBIBLES, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 243
- TOPMARGIN, 7
- BOTTOMMARGIN, 75
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ERROR_NOBIBLES DIALOG 0, 0, 250, 82
-STYLE DS_SETFONT | WS_POPUP
-FONT 8, "MS Sans Serif"
-BEGIN
- LTEXT "ERROR: No bibles were installed",IDC_STATIC,7,31,229,16
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
- IDS_APP_TITLE "Sword Reader"
- IDC_BIBLEREADER "BIBLEREADER"
-END
-
-STRINGTABLE
-BEGIN
- IDS_CAP_BOOK "Book"
- IDS_CAP_CHAP "Chap"
- IDS_CAP_TEXT "Text"
-END
-
-STRINGTABLE
-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 Visual C++ 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 "BibleReader.ICO"
+IDI_CLOSE ICON "close.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""newres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// RCDATA
+//
+
+IDM_MENU RCDATA
+BEGIN
+ 0x0066, 0x0006, 0xfffe, 0x9c44, 0x0004, 0x0012, 0x9c46, 0x0000, 0xffff,
+ 0xfffe, 0x9c47, 0x0004, 0x0012, 0x9c49, 0x0000, 0xffff, 0xfffe, 0x9c4a,
+ 0x0004, 0x0012, 0x9c50, 0x0000, 0xffff, 0xfffe, 0x9c53, 0x0004, 0x0012,
+ 0x9c4d, 0x9c53, 0xffff, 0xfffe, 0x9c5d, 0x0004, 0x0012, 0x9c5e, 0x0000,
+ 0xffff, 0xfffe, 0x9c55, 0x0004, 0x0018, 0x9c57, 0x0000, 0x0005
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDM_MENU MENU
+BEGIN
+ POPUP "Navigate"
+ BEGIN
+ MENUITEM "Book", MENU_BOOK
+ MENUITEM "Chap", MENU_CHAP
+ MENUITEM "Verse", MENU_VERSE
+ MENUITEM "Text", MENU_TEXT
+ MENUITEM SEPARATOR
+ MENUITEM "Find", MENU_FIND
+ END
+ POPUP "Menu"
+ BEGIN
+ MENUITEM "About", MENU_ABOUT
+ MENUITEM "Exit", MENU_SHUTDOWN
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_BIBLEREADER ACCELERATORS
+BEGIN
+ "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT
+ "Q", IDOK, VIRTKEY, CONTROL, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_ERROR_NOBIBLES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 243
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 75
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ERROR_NOBIBLES DIALOG 0, 0, 250, 82
+STYLE DS_SETFONT | WS_POPUP
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "ERROR: No bibles were installed",IDC_STATIC,7,31,229,16
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+ IDS_APP_TITLE "Sword Reader"
+ IDC_BIBLEREADER "BIBLEREADER"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_CAP_BOOK "Book"
+ IDS_CAP_CHAP "Chap"
+ IDS_CAP_TEXT "Text"
+END
+
+STRINGTABLE
+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
+
Modified: trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj
===================================================================
--- trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/SwordReader_GUI.vcproj 2009-01-05 04:18:08 UTC (rev 194)
@@ -338,9 +338,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|Smartphone 2003 (ARMV4)"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -361,7 +361,7 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
@@ -371,18 +371,22 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
- PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
ObjectFile="$(PlatformName)\$(ConfigurationName)/"
ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -390,7 +394,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/r "
- PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
+ PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
Culture="1033"
/>
<Tool
@@ -398,19 +402,19 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
- AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib corelibc.lib"
+ AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) "
+ AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
- LinkIncremental="2"
+ LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
+ AdditionalLibraryDirectories="..\STL_eVC"
IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
- GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
StackReserveSize="65536"
StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
@@ -431,15 +435,15 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory=""
+ RemoteDirectory="\Storage Card\Program Files\Sword\"
RegisterOutput="0"
- AdditionalFiles=""
+ AdditionalFiles="../../sword.dll"
/>
<DebuggerTool
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ Name="Debug|Smartphone 2003 (ARMV4)"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -473,12 +477,10 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
- FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
+ ExceptionHandling="2"
RuntimeLibrary="1"
- BufferSecurityCheck="false"
- RuntimeTypeInfo="true"
PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
ObjectFile="$(PlatformName)\$(ConfigurationName)/"
@@ -501,8 +503,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) "
- AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
+ AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
+ AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib corelibc.lib"
OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -510,9 +512,8 @@
IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
- GenerateMapFile="true"
- StackReserveSize="131072"
- StackCommitSize="8192"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000"
/>
@@ -535,15 +536,15 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory="\Storage Card\Program Files\Sword\"
+ RemoteDirectory=""
RegisterOutput="0"
- AdditionalFiles="../../sword.dll"
+ AdditionalFiles=""
/>
<DebuggerTool
/>
</Configuration>
<Configuration
- Name="Debug|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -577,18 +578,19 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
+ FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
RuntimeLibrary="1"
+ BufferSecurityCheck="false"
RuntimeTypeInfo="true"
PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
ObjectFile="$(PlatformName)\$(ConfigurationName)/"
ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"
- BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="1"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -604,19 +606,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
- AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
+ AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) "
+ AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\STL_eVC"
+ AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
GenerateMapFile="true"
- MapExports="true"
- StackReserveSize="65536"
- StackCommitSize="4096"
+ StackReserveSize="131072"
+ StackCommitSize="8192"
EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000"
/>
@@ -639,7 +640,7 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory="\Storage Card\Program Files\sword\"
+ RemoteDirectory="\Storage Card\Program Files\Sword\"
RegisterOutput="0"
AdditionalFiles="../../sword.dll"
/>
@@ -647,9 +648,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -670,7 +671,7 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
@@ -680,15 +681,11 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\Dll1\winceSword\include;..\..\..\sword\include"
- PreprocessorDefinitions="_WIN32_WCE=$(CEVER);$(CePlatform);ARM;_ARM_;UNDER_CE=$(CEVER);UNICODE;NDEBUG;SIMPLE"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
+ PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
+ RuntimeLibrary="1"
+ RuntimeTypeInfo="true"
PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pch"
AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"
ObjectFile="$(PlatformName)\$(ConfigurationName)/"
@@ -696,6 +693,7 @@
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -703,7 +701,7 @@
<Tool
Name="VCResourceCompilerTool"
AdditionalOptions="/r "
- PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,NDEBUG,$(CePlatform),ARM,_ARM_"
+ PreprocessorDefinitions="UNDER_CE=$(CEVER),_WIN32_WCE=$(CEVER),UNICODE,_UNICODE,DEBUG,$(CePlatform),ARM,_ARM_"
Culture="1033"
/>
<Tool
@@ -711,19 +709,21 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) "
- AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib"
+ AdditionalOptions="/ALIGN:4096 /subsystem:$(CESubsystem) /MACHINE:ARM "
+ AdditionalDependencies="..\Dll1\"$(PlatformName)\$(ConfigurationName)"\sword.lib htmlview.lib commctrl.lib coredll.lib aygshell.lib secchk.lib ccrtrtti.lib"
OutputFile="$(PlatformName)\$(ConfigurationName)/SwordReader.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\STL_eVC"
IgnoreDefaultLibraryNames="$(CENoDefaultLib)"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/SwordReader_GUI.pdb"
+ GenerateMapFile="true"
+ MapExports="true"
StackReserveSize="65536"
StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000"
- TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
@@ -744,7 +744,7 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory="\Storage Card\Program Files\Sword\"
+ RemoteDirectory="\Storage Card\Program Files\sword\"
RegisterOutput="0"
AdditionalFiles="../../sword.dll"
/>
@@ -1112,6 +1112,10 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
+ RelativePath=".\BibleReader.ICO"
+ >
+ </File>
+ <File
RelativePath="..\gui\BibleReader.ICO"
>
</File>
@@ -1120,6 +1124,10 @@
>
</File>
<File
+ RelativePath=".\close.ico"
+ >
+ </File>
+ <File
RelativePath="..\gui\search.bmp"
>
</File>
Modified: trunk/src/SwordReader_GUI/resource.h
===================================================================
--- trunk/src/SwordReader_GUI/resource.h 2009-01-05 01:01:57 UTC (rev 193)
+++ trunk/src/SwordReader_GUI/resource.h 2009-01-05 04:18:08 UTC (rev 194)
@@ -1,5 +1,5 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by SwordReader_GUI.rc
//
#define IDS_APP_TITLE 1
@@ -9,6 +9,8 @@
#define IDM_MENU 102
#define IDD_ERROR_NOBIBLES 103
#define IDS_HELP 104
+#define IDI_ICON1 111
+#define IDI_CLOSE 111
#define IDS_COMMAND1 301
#define IDM_MAIN_COMMAND1 40001
#define IDM_HELP_ABOUT 40003
@@ -37,7 +39,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 109
+#define _APS_NEXT_RESOURCE_VALUE 112
#define _APS_NEXT_COMMAND_VALUE 40033
#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 102
More information about the sword-cvs
mailing list