summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/dagger/ChangeLog5
-rw-r--r--noncore/apps/dagger/README2
-rw-r--r--noncore/apps/dagger/TODO7
-rw-r--r--noncore/apps/dagger/opie-dagger.control2
-rw-r--r--noncore/apps/dagger/textwidget.cpp2
5 files changed, 11 insertions, 7 deletions
diff --git a/noncore/apps/dagger/ChangeLog b/noncore/apps/dagger/ChangeLog
index 22b20d4..804a899 100644
--- a/noncore/apps/dagger/ChangeLog
+++ b/noncore/apps/dagger/ChangeLog
@@ -1,8 +1,13 @@
12005-08-31 Dan Williams <drw@handhelds.org>
2
3 * Released version 0.9.3
4 * Fix support for non-English languages
5
12005-08-09 Dan Williams <drw@handhelds.org> 62005-08-09 Dan Williams <drw@handhelds.org>
2 7
3 * Released version 0.9.2 8 * Released version 0.9.2
4 * Added support for Sword v1.5.8 9 * Added support for Sword v1.5.8
5 * Implemented morph tag cross-referencing 10 * Implemented morph tag cross-referencing
6 * Fix crash when last module is closed 11 * Fix crash when last module is closed
7 * Fix display of key when module is opened 12 * Fix display of key when module is opened
8 13
diff --git a/noncore/apps/dagger/README b/noncore/apps/dagger/README
index 47b8eee..9ca0d8c 100644
--- a/noncore/apps/dagger/README
+++ b/noncore/apps/dagger/README
@@ -1,13 +1,13 @@
1/************************************************************************ 1/************************************************************************
2/* 2/*
3/* Opie - Dagger 3/* Opie - Dagger
4/* =============== 4/* ===============
5/* Version 0.9.2 5/* Version 0.9.3
6/* 6/*
7/* A Bible study/reader application 7/* A Bible study/reader application
8/* 8/*
9/************************************************************************ 9/************************************************************************
10 10
11--------------------------------------------- 11---------------------------------------------
12 Release Notes for Opie-Dagger - August, 2005 12 Release Notes for Opie-Dagger - August, 2005
13--------------------------------------------- 13---------------------------------------------
diff --git a/noncore/apps/dagger/TODO b/noncore/apps/dagger/TODO
index 21426aa..28bda6f 100644
--- a/noncore/apps/dagger/TODO
+++ b/noncore/apps/dagger/TODO
@@ -1,28 +1,27 @@
1/************************************************************************ 1/************************************************************************
2/* 2/*
3/* Opie - Dagger 3/* Opie - Dagger
4/* =============== 4/* ===============
5/* Version 0.9.2 5/* Version 0.9.3
6/* 6/*
7/* A Bible study/reader application 7/* A Bible study/reader application
8/* 8/*
9/************************************************************************ 9/************************************************************************
10 10
11------------------------------------ 11------------------------------------
12To-do for Opie-Dagger - August, 2005 12To-do for Opie-Dagger - August, 2005
13------------------------------------ 13------------------------------------
14 14
15====================== 15======================
16= Current release = 16= Current release =
17====================== 17======================
18 18
191. Implement module installation 191. Implement module installation
202. Fix support for other languages 202. Fix display sleep prevention
213. Fix display sleep prevention 213. Implement footnote cross-referencing
224. Implement footnote cross-referencing
23 22
24====================== 23======================
25= Future releases = 24= Future releases =
26====================== 25======================
27 26
281. Margin notes \ No newline at end of file 271. Margin notes \ No newline at end of file
diff --git a/noncore/apps/dagger/opie-dagger.control b/noncore/apps/dagger/opie-dagger.control
index e613ddb..dde696a 100644
--- a/noncore/apps/dagger/opie-dagger.control
+++ b/noncore/apps/dagger/opie-dagger.control
@@ -1,9 +1,9 @@
1Package: opie-dagger 1Package: opie-dagger
2Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop 2Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop
3Priority: optional 3Priority: optional
4Section: opie/applications 4Section: opie/applications
5Depends: task-opie-minimal, libopiecore2, libopieui2 5Depends: task-opie-minimal, libopiecore2, libopieui2
6Architecture: arm 6Architecture: arm
7Maintainer: Dan Williams (drw@handhelds.org) 7Maintainer: Dan Williams (drw@handhelds.org)
8Description: A Bible study program utilizing the Sword library. 8Description: A Bible study program utilizing the Sword library.
9Version: 0.9.2$EXTRAVERSION 9Version: 0.9.3$EXTRAVERSION
diff --git a/noncore/apps/dagger/textwidget.cpp b/noncore/apps/dagger/textwidget.cpp
index 9f7de66..2df6455 100644
--- a/noncore/apps/dagger/textwidget.cpp
+++ b/noncore/apps/dagger/textwidget.cpp
@@ -140,17 +140,17 @@ void TextWidget::setText()
140 140
141 m_abbrevKey = m_key->getShortText(); 141 m_abbrevKey = m_key->getShortText();
142 142
143 QString fullText; 143 QString fullText;
144 144
145 for ( int i = 0; i < m_numVerses; i++ ) 145 for ( int i = 0; i < m_numVerses; i++ )
146 { 146 {
147 QString key = ( QString ) m_module->KeyText(); 147 QString key = ( QString ) m_module->KeyText();
148 QString verseStr = ( QString ) *m_module; 148 QString verseStr = QString::fromUtf8( *m_module );
149 149
150 // Format current verse (adding chapter and/or book headings if necessary) 150 // Format current verse (adding chapter and/or book headings if necessary)
151 int verse = static_cast<sword::VerseKey>(m_module->Key()).Verse(); 151 int verse = static_cast<sword::VerseKey>(m_module->Key()).Verse();
152 if ( verse == 1 ) 152 if ( verse == 1 )
153 { 153 {
154 int chapter = static_cast<sword::VerseKey>(m_module->Key()).Chapter(); 154 int chapter = static_cast<sword::VerseKey>(m_module->Key()).Chapter();
155 if ( chapter == 1 ) 155 if ( chapter == 1 )
156 { 156 {