author | drw <drw> | 2005-08-31 19:21:49 (UTC) |
---|---|---|
committer | drw <drw> | 2005-08-31 19:21:49 (UTC) |
commit | 8a74037f6174f187ea3f5583d6c253752792128a (patch) (unidiff) | |
tree | ebe25ecf0a341c01b696904a5245e3f3e9778db7 /noncore/apps | |
parent | 465eb3107bb32ad7ab2d726d8a510538fca56764 (diff) | |
download | opie-8a74037f6174f187ea3f5583d6c253752792128a.zip opie-8a74037f6174f187ea3f5583d6c253752792128a.tar.gz opie-8a74037f6174f187ea3f5583d6c253752792128a.tar.bz2 |
Fix support for non-English language texts
-rw-r--r-- | noncore/apps/dagger/ChangeLog | 5 | ||||
-rw-r--r-- | noncore/apps/dagger/README | 2 | ||||
-rw-r--r-- | noncore/apps/dagger/TODO | 7 | ||||
-rw-r--r-- | noncore/apps/dagger/opie-dagger.control | 2 | ||||
-rw-r--r-- | noncore/apps/dagger/textwidget.cpp | 2 |
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,6 +1,11 @@ | |||
1 | 2005-08-31 Dan Williams <drw@handhelds.org> | ||
2 | |||
3 | * Released version 0.9.3 | ||
4 | * Fix support for non-English languages | ||
5 | |||
1 | 2005-08-09 Dan Williams <drw@handhelds.org> | 6 | 2005-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 |
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,11 +1,11 @@ | |||
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 | --------------------------------------------- |
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,11 +1,11 @@ | |||
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 | ------------------------------------ |
@@ -14,15 +14,14 @@ To-do for Opie-Dagger - August, 2005 | |||
14 | 14 | ||
15 | ====================== | 15 | ====================== |
16 | = Current release = | 16 | = Current release = |
17 | ====================== | 17 | ====================== |
18 | 18 | ||
19 | 1. Implement module installation | 19 | 1. Implement module installation |
20 | 2. Fix support for other languages | 20 | 2. Fix display sleep prevention |
21 | 3. Fix display sleep prevention | 21 | 3. Implement footnote cross-referencing |
22 | 4. Implement footnote cross-referencing | ||
23 | 22 | ||
24 | ====================== | 23 | ====================== |
25 | = Future releases = | 24 | = Future releases = |
26 | ====================== | 25 | ====================== |
27 | 26 | ||
28 | 1. Margin notes \ No newline at end of file | 27 | 1. 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 | |||
@@ -3,7 +3,7 @@ Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Application | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Depends: task-opie-minimal, libopiecore2, libopieui2 | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Maintainer: Dan Williams (drw@handhelds.org) | 7 | Maintainer: Dan Williams (drw@handhelds.org) |
8 | Description: A Bible study program utilizing the Sword library. | 8 | Description: A Bible study program utilizing the Sword library. |
9 | Version: 0.9.2$EXTRAVERSION | 9 | Version: 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 | |||
@@ -142,13 +142,13 @@ void TextWidget::setText() | |||
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(); |