>>910

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1178 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index 5fbb2e6..6f2d3ef 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -777,6 +777,7 @@ bool DatInfo::getDomElement(
     if(!parseDat(num)) return FALSE;
 
     QString tmpstr;
+    QString status = "normal";
     DOM::Element bodynode, titlenode, tmpelm;
     bool showAddr = KitaConfig::showMailAddress();
     bool showAA = KitaConfig::showAA();
@@ -814,10 +815,12 @@ bool DatInfo::getDomElement(
        if(abone){ /* "abone" node */
            namestr = ParseMisc::utf8ToUnicode( KITAUTF8_ABONE );
            bodystr = ParseMisc::utf8ToUnicode( KITAUTF8_ABONE );
+           status = "abone";
        }
        else{ /* "broken" node */
            namestr = ParseMisc::utf8ToUnicode( KITAUTF8_NAME );
            bodystr = ParseMisc::utf8ToUnicode( KITAUTF8_KOWARE );
+           status = "broken";
        }
 
        /* title node */
@@ -843,6 +846,7 @@ bool DatInfo::getDomElement(
     retelm = hdoc.createElement( "DIV" );
     {
         retelm.setAttribute( "kita_type", "res" );
+        retelm.setAttribute( "kita_status", status );  
         retelm.setAttribute( "id", QString().setNum( num ) );
         retelm.setAttribute( "kita_rname", resdat.name );
         retelm.setAttribute( "kita_rid", resdat.id );

diff --git a/kita/src/libkita/datmanager.cpp b/kita/src/libkita/datmanager.cpp
index c7a72d6..c96d273 100644 (file)
--- a/kita/src/libkita/datmanager.cpp
+++ b/kita/src/libkita/datmanager.cpp
@@ -300,6 +300,43 @@ const QString& DatManager::getDat( const KURL& url, int num )
 
 
 /* public */
+const QString& DatManager::getId( const KURL& url, int num )
+{
+    QMutexLocker locker( &m_mutex );
+    
+    DatInfo * datInfo = getDatInfo( url );
+    if ( datInfo == NULL ) return QString::null;
+
+    return datInfo->getId( num );
+}
+
+
+/* public */
+const QString& DatManager::getName( const KURL& url, int num )
+{
+    QMutexLocker locker( &m_mutex );
+    
+    DatInfo * datInfo = getDatInfo( url );
+    if ( datInfo == NULL ) return QString::null;
+
+    return datInfo->getName( num );
+}
+
+
+/* public */
+const QString& DatManager::getBody( const KURL& url, int num )
+{
+    QMutexLocker locker( &m_mutex );
+    
+    DatInfo * datInfo = getDatInfo( url );
+    if ( datInfo == NULL ) return QString::null;
+
+    return datInfo->getBody( num );
+}
+
+
+
+/* public */
 QString DatManager::getPlainBody( const KURL& url, int num )
 {
     QMutexLocker locker( &m_mutex );

diff --git a/kita/src/libkita/datmanager.h b/kita/src/libkita/datmanager.h
index 4cffe65..96ca8f3 100644 (file)
--- a/kita/src/libkita/datmanager.h
+++ b/kita/src/libkita/datmanager.h
@@ -57,6 +57,9 @@ class DatManager
        static const QString& getSubject( const KURL& url );
        static const QString& getRawDat( const KURL& url );     
        static const QString& getDat( const KURL& url, int num );
+       static const QString& getId( const KURL& url, int num );
+       static const QString& getName( const KURL& url, int num );
+       static const QString& getBody( const KURL& url, int num );      
        static QString getPlainBody( const KURL& url, int num );
        static QString getPlainTitle( const KURL& url, int num );
 

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index ced8cce..75fefc6 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -49,6 +49,9 @@ namespace Kita
        /* from: KitaHTMLPart                              */
        /* to  : KitaMainWindow, KitaNavi, KitaWriteDialog */
        void isKitaActive();
+
+       /* to : KitaHTMLPart */
+       void redrawScreen( const KURL& url );
     };
 
 }