author | drw <drw> | 2005-08-09 22:24:10 (UTC) |
---|---|---|
committer | drw <drw> | 2005-08-09 22:24:10 (UTC) |
commit | 0c362cbc72dfbff246c0f11417d364b45b50ec94 (patch) (unidiff) | |
tree | 6e1fcdc99ff40752343d7b4c99822eba591a2f15 /noncore | |
parent | 873a383cfc4f9184adfe9257500df8c03648b0fd (diff) | |
download | opie-0c362cbc72dfbff246c0f11417d364b45b50ec94.zip opie-0c362cbc72dfbff246c0f11417d364b45b50ec94.tar.gz opie-0c362cbc72dfbff246c0f11417d364b45b50ec94.tar.bz2 |
Several updates to Dagger, see /noncore/apps/dagger/ChangeLog for more information
-rw-r--r-- | noncore/apps/dagger/ChangeLog | 8 | ||||
-rw-r--r-- | noncore/apps/dagger/README | 8 | ||||
-rw-r--r-- | noncore/apps/dagger/TODO | 7 | ||||
-rw-r--r-- | noncore/apps/dagger/mainwindow.cpp | 62 | ||||
-rw-r--r-- | noncore/apps/dagger/opie-dagger.control | 2 | ||||
-rw-r--r-- | noncore/apps/dagger/searchbar.cpp | 2 |
6 files changed, 48 insertions, 41 deletions
diff --git a/noncore/apps/dagger/ChangeLog b/noncore/apps/dagger/ChangeLog index 108419e..22b20d4 100644 --- a/noncore/apps/dagger/ChangeLog +++ b/noncore/apps/dagger/ChangeLog | |||
@@ -1 +1,9 @@ | |||
1 | 2005-08-09 Dan Williams <drw@handhelds.org> | ||
2 | |||
3 | * Released version 0.9.2 | ||
4 | * Added support for Sword v1.5.8 | ||
5 | * Implemented morph tag cross-referencing | ||
6 | * Fix crash when last module is closed | ||
7 | * Fix display of key when module is opened | ||
8 | |||
1 | 2004-04-22 Dan Williams <drw@handhelds.org> | 9 | 2004-04-22 Dan Williams <drw@handhelds.org> |
diff --git a/noncore/apps/dagger/README b/noncore/apps/dagger/README index 00e9eed..47b8eee 100644 --- a/noncore/apps/dagger/README +++ b/noncore/apps/dagger/README | |||
@@ -4,3 +4,3 @@ | |||
4 | /* =============== | 4 | /* =============== |
5 | /* Version 0.9.1 | 5 | /* Version 0.9.2 |
6 | /* | 6 | /* |
@@ -11,3 +11,3 @@ | |||
11 | --------------------------------------------- | 11 | --------------------------------------------- |
12 | Release Notes for Opie-Dagger - April, 2004 | 12 | Release Notes for Opie-Dagger - August, 2005 |
13 | --------------------------------------------- | 13 | --------------------------------------------- |
@@ -27,3 +27,3 @@ the build system along with the appropriate headers. | |||
27 | 27 | ||
28 | - libsword source (best to use version 1.5.x or greater): | 28 | - libsword source (requires version 1.5.8 or greater): |
29 | - http://www.crosswire.org/sword/ | 29 | - http://www.crosswire.org/sword/ |
@@ -50,3 +50,3 @@ the build system along with the appropriate headers. | |||
50 | 50 | ||
51 | - Opie-Dagger is (C) 2004 Dan Williams | 51 | - Opie-Dagger is (C) 2004, 2005 Dan Williams |
52 | 52 | ||
diff --git a/noncore/apps/dagger/TODO b/noncore/apps/dagger/TODO index 1530bd6..21426aa 100644 --- a/noncore/apps/dagger/TODO +++ b/noncore/apps/dagger/TODO | |||
@@ -4,3 +4,3 @@ | |||
4 | /* =============== | 4 | /* =============== |
5 | /* Version 0.9.1 | 5 | /* Version 0.9.2 |
6 | /* | 6 | /* |
@@ -11,3 +11,3 @@ | |||
11 | ------------------------------------ | 11 | ------------------------------------ |
12 | To-do for Opie-Dagger - April, 2004 | 12 | To-do for Opie-Dagger - August, 2005 |
13 | ------------------------------------ | 13 | ------------------------------------ |
@@ -19,2 +19,5 @@ To-do for Opie-Dagger - April, 2004 | |||
19 | 1. Implement module installation | 19 | 1. Implement module installation |
20 | 2. Fix support for other languages | ||
21 | 3. Fix display sleep prevention | ||
22 | 4. Implement footnote cross-referencing | ||
20 | 23 | ||
diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp index 1f2d521..f61df68 100644 --- a/noncore/apps/dagger/mainwindow.cpp +++ b/noncore/apps/dagger/mainwindow.cpp | |||
@@ -327,2 +327,4 @@ void MainWindow::openModule( const QString &modulename, const QString &key ) | |||
327 | tw->setKey( key ); | 327 | tw->setKey( key ); |
328 | setCaption( QString( "%1 - Dagger" ).arg( tw->getFullKey() ) ); | ||
329 | m_navToolbar->setKey( tw->getAbbrevKey() ); | ||
328 | } | 330 | } |
@@ -636,5 +638,2 @@ void MainWindow::slotNavKeyChanged( const QString &newKey ) | |||
636 | { | 638 | { |
637 | QString key = newKey; | ||
638 | key.replace( QRegExp( "[-=.]" ), ":" ); | ||
639 | |||
640 | TextWidget *text = reinterpret_cast<TextWidget *>(m_tabs.currentWidget()); | 639 | TextWidget *text = reinterpret_cast<TextWidget *>(m_tabs.currentWidget()); |
@@ -642,2 +641,6 @@ void MainWindow::slotNavKeyChanged( const QString &newKey ) | |||
642 | { | 641 | { |
642 | QString key = newKey; | ||
643 | if ( text->isBibleText() ) | ||
644 | key.replace( QRegExp( "[-=.]" ), ":" ); | ||
645 | |||
643 | text->setKey( key ); | 646 | text->setKey( key ); |
@@ -701,6 +704,6 @@ void MainWindow::slotTextRefClicked( const QString &ref ) | |||
701 | /* | 704 | /* |
702 | Ref clicked: 'type=Strongs value=G3482' | 705 | Ref clicked: 'passagestudy.jsp?action=showStrongs&type=Hebrew&value=07225' |
703 | Ref clicked: 'type=Strongs value=H07225' | 706 | Ref clicked: 'passagestudy.jsp?action=showStrongs&type=Greek&value=602' |
704 | Ref clicked: 'type=morph class=x-Robinson:N-PRI value=N-PRI' | 707 | Ref clicked: 'passagestudy.jsp?action=showMorph&type=x-Robinson%3AN-NSF&value=N-NSF' |
705 | Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804' | 708 | Ref clicked: 'passagestudy.jsp?action=showNote&type=n&value=1&module=KJV&passage=Genesis+1%3A5' |
706 | */ | 709 | */ |
@@ -712,15 +715,9 @@ Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804' | |||
712 | { | 715 | { |
713 | // Parse type | 716 | // Parse action |
714 | int pos = ref.find( "type=", 0, false ) + 5; | 717 | int pos = ref.find( '&', 28 ); |
715 | QString typeStr = ref.mid( pos, ref.find( ' ', pos ) - pos ); | 718 | QString actionStr = ref.mid( 28, pos - 28 ); |
716 | |||
717 | // Parse class (for morph. only) | ||
718 | QString classStr; | ||
719 | if ( typeStr == "morph" ) | ||
720 | { | ||
721 | pos = ref.find( "class=", 0, false ) + 5; | ||
722 | QString classStr = ref.mid( pos, ref.find( ' ', pos ) - pos ); | ||
723 | 719 | ||
724 | // TODO - need to strip 'x-' from beginning and ':key' at end? | 720 | // Parse type |
725 | } | 721 | pos = ref.find( "type=", pos, false ) + 5; |
722 | QString typeStr = ref.mid( pos, ref.find( '&', pos ) - pos ); | ||
726 | 723 | ||
@@ -730,21 +727,20 @@ Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804' | |||
730 | 727 | ||
731 | if ( typeStr == "Strongs" ) | 728 | if ( actionStr == "Strongs" ) |
732 | { | 729 | { |
733 | //Determine if is a Hebrew or Greek reference | 730 | QString module = actionStr; |
734 | QString module; | 731 | module.append( typeStr ); |
735 | if ( valueStr.at( 0 ) == 'H' ) | ||
736 | module = "StrongsHebrew"; | ||
737 | else | ||
738 | module = "StrongsGreek"; | ||
739 | 732 | ||
740 | // Get key | ||
741 | QString key( valueStr ); | ||
742 | key.remove( 0, 1 ); | ||
743 | // Open reference | 733 | // Open reference |
744 | openModule( module, key ); | 734 | openModule( module, valueStr ); |
735 | } | ||
736 | else if ( actionStr == "Morph" ) | ||
737 | { | ||
738 | QString module = typeStr.mid( 2, typeStr.find( '%', 2 ) - 2 ); | ||
739 | |||
740 | // Open reference | ||
741 | openModule( module, valueStr ); | ||
745 | } | 742 | } |
746 | else if ( typeStr == "morph" ) | 743 | else if ( actionStr == "Note" ) |
747 | { | 744 | { |
748 | QMessageBox::information( this, tr( "Morphological Tags" ), | 745 | // TODO |
749 | tr( "Morphological tag cross-referencing not implemented yet." ) ); | ||
750 | } | 746 | } |
diff --git a/noncore/apps/dagger/opie-dagger.control b/noncore/apps/dagger/opie-dagger.control index 4ded1f2..e613ddb 100644 --- a/noncore/apps/dagger/opie-dagger.control +++ b/noncore/apps/dagger/opie-dagger.control | |||
@@ -8,2 +8,2 @@ 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.1$EXTRAVERSION | 9 | Version: 0.9.2$EXTRAVERSION |
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp index b195f67..463a19f 100644 --- a/noncore/apps/dagger/searchbar.cpp +++ b/noncore/apps/dagger/searchbar.cpp | |||
@@ -93,3 +93,3 @@ void SearchBar::setCurrModule( TextWidget *currText ) | |||
93 | 93 | ||
94 | if ( !m_currText || ( currText->getModuleName() != m_currText->getModuleName() ) ) | 94 | if ( !m_currText || !currText || ( currText->getModuleName() != m_currText->getModuleName() ) ) |
95 | { | 95 | { |