From 0c362cbc72dfbff246c0f11417d364b45b50ec94 Mon Sep 17 00:00:00 2001 From: drw Date: Tue, 09 Aug 2005 22:24:10 +0000 Subject: Several updates to Dagger, see /noncore/apps/dagger/ChangeLog for more information --- 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,3 +1,11 @@ +2005-08-09 Dan Williams + + * Released version 0.9.2 + * Added support for Sword v1.5.8 + * Implemented morph tag cross-referencing + * Fix crash when last module is closed + * Fix display of key when module is opened + 2004-04-22 Dan Williams * Released version 0.9.1 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 @@ -2,14 +2,14 @@ /* /* Opie - Dagger /* =============== -/* Version 0.9.1 +/* Version 0.9.2 /* /* A Bible study/reader application /* /************************************************************************ --------------------------------------------- - Release Notes for Opie-Dagger - April, 2004 + Release Notes for Opie-Dagger - August, 2005 --------------------------------------------- ====================== @@ -25,7 +25,7 @@ In order to build opie-dagger, libsword needs to be present on the build system along with the appropriate headers. -- libsword source (best to use version 1.5.x or greater): +- libsword source (requires version 1.5.8 or greater): - http://www.crosswire.org/sword/ - the Sword library headers need to be located in an appropriate @@ -48,7 +48,7 @@ the build system along with the appropriate headers. = Credits = ====================== -- Opie-Dagger is (C) 2004 Dan Williams +- Opie-Dagger is (C) 2004, 2005 Dan Williams ====================== = Links = 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 @@ -2,14 +2,14 @@ /* /* Opie - Dagger /* =============== -/* Version 0.9.1 +/* Version 0.9.2 /* /* A Bible study/reader application /* /************************************************************************ ------------------------------------ -To-do for Opie-Dagger - April, 2004 +To-do for Opie-Dagger - August, 2005 ------------------------------------ ====================== @@ -17,6 +17,9 @@ To-do for Opie-Dagger - April, 2004 ====================== 1. Implement module installation +2. Fix support for other languages +3. Fix display sleep prevention +4. Implement footnote cross-referencing ====================== = Future releases = 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 @@ -325,6 +325,8 @@ void MainWindow::openModule( const QString &modulename, const QString &key ) // Set key if one is present if ( !key.isNull() ) tw->setKey( key ); + setCaption( QString( "%1 - Dagger" ).arg( tw->getFullKey() ) ); + m_navToolbar->setKey( tw->getAbbrevKey() ); } } } @@ -634,12 +636,13 @@ void MainWindow::slotNavPrevVerse() void MainWindow::slotNavKeyChanged( const QString &newKey ) { - QString key = newKey; - key.replace( QRegExp( "[-=.]" ), ":" ); - TextWidget *text = reinterpret_cast(m_tabs.currentWidget()); if ( text ) { + QString key = newKey; + if ( text->isBibleText() ) + key.replace( QRegExp( "[-=.]" ), ":" ); + text->setKey( key ); setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) ); } @@ -699,10 +702,10 @@ void MainWindow::slotTextRefClicked( const QString &ref ) { //printf( "Ref clicked: '%s'\n", ref.latin1() ); /* -Ref clicked: 'type=Strongs value=G3482' -Ref clicked: 'type=Strongs value=H07225' -Ref clicked: 'type=morph class=x-Robinson:N-PRI value=N-PRI' -Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804' +Ref clicked: 'passagestudy.jsp?action=showStrongs&type=Hebrew&value=07225' +Ref clicked: 'passagestudy.jsp?action=showStrongs&type=Greek&value=602' +Ref clicked: 'passagestudy.jsp?action=showMorph&type=x-Robinson%3AN-NSF&value=N-NSF' +Ref clicked: 'passagestudy.jsp?action=showNote&type=n&value=1&module=KJV&passage=Genesis+1%3A5' */ //owarn << "Reference: " << ref << oendl; if ( !ref.isNull() ) @@ -710,43 +713,36 @@ Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804' TextWidget *text = reinterpret_cast(m_tabs.currentWidget()); if ( text ) { + // Parse action + int pos = ref.find( '&', 28 ); + QString actionStr = ref.mid( 28, pos - 28 ); + // Parse type - int pos = ref.find( "type=", 0, false ) + 5; - QString typeStr = ref.mid( pos, ref.find( ' ', pos ) - pos ); - - // Parse class (for morph. only) - QString classStr; - if ( typeStr == "morph" ) - { - pos = ref.find( "class=", 0, false ) + 5; - QString classStr = ref.mid( pos, ref.find( ' ', pos ) - pos ); - - // TODO - need to strip 'x-' from beginning and ':key' at end? - } - + pos = ref.find( "type=", pos, false ) + 5; + QString typeStr = ref.mid( pos, ref.find( '&', pos ) - pos ); + // Parse value pos = ref.find( "value=", 0, false ) + 6; QString valueStr = ref.mid( pos, ref.find( ' ', pos ) - pos ); - - if ( typeStr == "Strongs" ) + + if ( actionStr == "Strongs" ) + { + QString module = actionStr; + module.append( typeStr ); + + // Open reference + openModule( module, valueStr ); + } + else if ( actionStr == "Morph" ) { - //Determine if is a Hebrew or Greek reference - QString module; - if ( valueStr.at( 0 ) == 'H' ) - module = "StrongsHebrew"; - else - module = "StrongsGreek"; - - // Get key - QString key( valueStr ); - key.remove( 0, 1 ); + QString module = typeStr.mid( 2, typeStr.find( '%', 2 ) - 2 ); + // Open reference - openModule( module, key ); + openModule( module, valueStr ); } - else if ( typeStr == "morph" ) + else if ( actionStr == "Note" ) { - QMessageBox::information( this, tr( "Morphological Tags" ), - tr( "Morphological tag cross-referencing not implemented yet." ) ); + // TODO } } } 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 @@ -6,4 +6,4 @@ Depends: task-opie-minimal, libopiecore2, libopieui2 Architecture: arm Maintainer: Dan Williams (drw@handhelds.org) Description: A Bible study program utilizing the Sword library. -Version: 0.9.1$EXTRAVERSION +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 @@ -91,7 +91,7 @@ void SearchBar::setCurrModule( TextWidget *currText ) { m_actionFind->setEnabled( ( m_searchText->text() != "" ) && currText ); - if ( !m_currText || ( currText->getModuleName() != m_currText->getModuleName() ) ) + if ( !m_currText || !currText || ( currText->getModuleName() != m_currText->getModuleName() ) ) { m_actionPrev->setEnabled( false ); m_resultList->clear(); -- cgit v0.9.0.2