1 files changed, 29 insertions, 33 deletions

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 )
                 tw->setKey( key );
+            setCaption( QString( "%1 - Dagger" ).arg( tw->getFullKey() ) );
+            m_navToolbar->setKey( tw->getAbbrevKey() );
         }
@@ -636,5 +638,2 @@ void MainWindow::slotNavKeyChanged( const QString &newKey )
 {
-    QString key = newKey;
-    key.replace( QRegExp( "[-=.]" ), ":" );
-
     TextWidget *text = reinterpret_cast<TextWidget *>(m_tabs.currentWidget());
@@ -642,2 +641,6 @@ void MainWindow::slotNavKeyChanged( const QString &newKey )
     {
+        QString key = newKey;
+        if ( text->isBibleText() )
+            key.replace( QRegExp( "[-=.]" ), ":" );
+
         text->setKey( key );
@@ -701,6 +704,6 @@ void MainWindow::slotTextRefClicked( const QString &ref )
 /*
-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'
 */
@@ -712,15 +715,9 @@ Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804'
         {
-            // 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 );
+            // Parse action
+            int pos = ref.find( '&', 28 );
+            QString actionStr = ref.mid( 28, pos - 28 );
                 
-                // TODO - need to strip 'x-' from beginning and ':key' at end?
-            }
+            // Parse type
+            pos = ref.find( "type=", pos, false ) + 5;
+            QString typeStr = ref.mid( pos, ref.find( '&', pos ) - pos );
             
@@ -730,21 +727,20 @@ Ref clicked: 'type=morph class=x-StrongsMorph:TH8804 value=TH8804'
             
-            if ( typeStr == "Strongs" )
+            if ( actionStr == "Strongs" )
             {
-                //Determine if is a Hebrew or Greek reference
-                QString module;
-                if ( valueStr.at( 0 ) == 'H' )
-                    module = "StrongsHebrew";
-                else
-                    module = "StrongsGreek";
+                QString module = actionStr;
+                module.append( typeStr );
                 
-                // Get key
-                QString key( valueStr );
-                key.remove( 0, 1 );
                 // Open reference
-                 openModule( module, key );
+                 openModule( module, valueStr );
+            }
+            else if ( actionStr == "Morph" )
+            {
+                QString module = typeStr.mid( 2, typeStr.find( '%', 2 ) - 2 );
+
+                // Open reference
+                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
             }