[sword-svn] r219 - in trunk/src: . SlideBible SlideBible/bin
kalemas at crosswire.org
kalemas at crosswire.org
Mon Nov 2 14:43:41 MST 2009
Author: kalemas
Date: 2009-11-02 14:43:41 -0700 (Mon, 02 Nov 2009)
New Revision: 219
Modified:
trunk/src/SlideBible.sln
trunk/src/SlideBible/SlideBible.vcproj
trunk/src/SlideBible/bin/SlideBible.exe
trunk/src/SlideBible/sbCore.h
trunk/src/SlideBible/sbList.cpp
trunk/src/SlideBible/todo.txt
Log:
some first use issues, see todo, submit release executable
Modified: trunk/src/SlideBible/SlideBible.vcproj
===================================================================
--- trunk/src/SlideBible/SlideBible.vcproj 2009-10-31 21:59:25 UTC (rev 218)
+++ trunk/src/SlideBible/SlideBible.vcproj 2009-11-02 21:43:41 UTC (rev 219)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- AdditionalOptions="/D "KOTIK" /D "NO_VSNPRINTF""
+ AdditionalOptions="/D "NO_VSNPRINTF""
Optimization="0"
AdditionalIncludeDirectories="..\Dll1\winceSword\include\;..\..\..\..\sword\trunk\include\"
PreprocessorDefinitions="DEBUG;ARM;_ARM_;UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);$(CePlatform);UNICODE;SIMPLE"
@@ -213,8 +213,10 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
+ AdditionalOptions="/D "NO_VSNPRINTF""
Optimization="2"
FavorSizeOrSpeed="2"
+ AdditionalIncludeDirectories="..\Dll1\winceSword\include\;..\..\..\..\sword\trunk\include\"
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -236,6 +238,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /subsystem:windowsce,5.01"
+ AdditionalDependencies="aygshell.lib"
OutputFile="$(OutDir)/SlideBible.exe"
LinkIncremental="1"
DelayLoadDLLs="$(NOINHERIT)"
@@ -269,7 +272,7 @@
/>
<DeploymentTool
ForceDirty="-1"
- RemoteDirectory=""
+ RemoteDirectory="\StorageCard\Program Files\SwordReader\"
RegisterOutput="0"
AdditionalFiles=""
/>
Modified: trunk/src/SlideBible/bin/SlideBible.exe
===================================================================
(Binary files differ)
Modified: trunk/src/SlideBible/sbCore.h
===================================================================
--- trunk/src/SlideBible/sbCore.h 2009-10-31 21:59:25 UTC (rev 218)
+++ trunk/src/SlideBible/sbCore.h 2009-11-02 21:43:41 UTC (rev 219)
@@ -26,11 +26,7 @@
void sbMessage(const char *format, ...);
-#ifdef DEBUG
#define sbAssert(condition) ((condition)?(sbMessage("sbAssert : " #condition ". at %s : %d\n", __FILE__, __LINE__), __debugbreak()) : 0)
-#elif
-#define sbAssert(condition)
-#endif
class sbCore
{
Modified: trunk/src/SlideBible/sbList.cpp
===================================================================
--- trunk/src/SlideBible/sbList.cpp 2009-10-31 21:59:25 UTC (rev 218)
+++ trunk/src/SlideBible/sbList.cpp 2009-11-02 21:43:41 UTC (rev 219)
@@ -87,6 +87,8 @@
itemCurrent->attach(new sbItem (sbItem::TYPE_TEXT, vesionText, rect->width()), sbItem::NEXT);
itemCurrent = itemCurrent->next;
itemCurrent->center = true;
+
+ rect = &Core->getSurface(sbCore::SURFACE::TYPE_WHOLE)->rect;
}
break;
@@ -105,7 +107,6 @@
if ((*Core->getOptions())["Bookmarks"]["LastPlace"] != "")
{
itemCurrent->attach(new sbItem (sbItem::TYPE_DESCRIPTION, L"Your Last Place :", rect->width()), sbItem::NEXT);
- itemCurrent->center = true;
itemCurrent = itemCurrent->next;
const char * bookmark = (*Core->getOptions())["Bookmarks"]["LastPlace"];
@@ -121,20 +122,26 @@
delete [] text;
}
+ else
+ {
+ workKey.setText ( "John 1:1" );
+ itemCurrent->attach(new sbItem (sbItem::TYPE_BUTTON_BOOKMARK, L"Read Bible ...", rect->width(), workKey.Index()), sbItem::NEXT);
+ itemCurrent = itemCurrent->next;
+ itemCurrent->center = true;
+ }
for (int i=0; i < Core->getBookmarks()->count(); i++)
{
if (i == 0)
{
itemCurrent->attach(new sbItem (sbItem::TYPE_DESCRIPTION, L"Your Bookmarks :", rect->width()), sbItem::NEXT);
- itemCurrent->center = true;
itemCurrent = itemCurrent->next;
}
- const char* bm = (*Core->getBookmarks())[i].verse.getText();
+ const char * bookmark = (*Core->getBookmarks())[i].verse.getText();
- TCHAR *text = new TCHAR [strlen(bm)+1];
- mbstowcs(text, bm, strlen(bm)+1);
+ TCHAR * text = new TCHAR [strlen(bookmark)+1];
+ mbstowcs ( text, bookmark, strlen(bookmark)+1 );
itemCurrent->attach(new sbItem (sbItem::TYPE_BUTTON_BOOKMARK, text, rect->width(), (*Core->getBookmarks())[i].verse.Index()), sbItem::NEXT);
itemCurrent = itemCurrent->next;
@@ -143,7 +150,7 @@
delete [] text;
}
- addControl(sbControl::TYPE_OPEN_TEXT);
+ addControl ( sbControl::TYPE_OPEN_TEXT );
}
else
{
@@ -151,14 +158,13 @@
itemCurrent = itemCurrent->next;
}
- while (itemCurrent->prev != NULL)
- itemCurrent = itemCurrent->prev;
+ while ( itemCurrent->prev != NULL ) itemCurrent = itemCurrent->prev;
}
break;
default:
- sbAssert(true);
+ sbAssert ( true );
}
}
Modified: trunk/src/SlideBible/todo.txt
===================================================================
--- trunk/src/SlideBible/todo.txt 2009-10-31 21:59:25 UTC (rev 218)
+++ trunk/src/SlideBible/todo.txt 2009-11-02 21:43:41 UTC (rev 219)
@@ -4,12 +4,19 @@
+ show sword version somewhere
+ change versification system in navigation view
+ when mods.d not found - show tip message
-+ sometimes happens something wrong with height of empty verse and verse text line height
-
++ navigation list from last place
++ on first use show "Read Bible ..."
++ fix rect for Options View
++ release congiguration
+~ sometimes happens something wrong with height of empty verse and verse text line height
draw module view description on sbList activate
+ timer to save config
-* navigation list from last place
-
+ bookmarks, history, ratings, verselists
+ dialog: verse actions(favorite|send to list...|send to new list)
+ dialog: select verse(s)
+ dialog: menu verse
+
search
clucence
input text items
@@ -17,11 +24,6 @@
cursor
? copy/paste
- bookmarks, history, ratings, verselists
- dialog: verse actions(favorite|send to list...|send to new list)
- dialog: select verse(s)
- dialog: menu verse
-
? verse features:
readings count (forgotten places/chapters)
bookmarks static/dynamic
Modified: trunk/src/SlideBible.sln
===================================================================
--- trunk/src/SlideBible.sln 2009-10-31 21:59:25 UTC (rev 218)
+++ trunk/src/SlideBible.sln 2009-11-02 21:43:41 UTC (rev 219)
@@ -9,9 +9,9 @@
Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+ {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+ {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+ {F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
{F0CEF277-24C5-45BC-A0D0-56BE5A64AB94}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
More information about the sword-cvs
mailing list