[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 81995] Crash with folder selected and switching to combined
From:       Sashmit Bhaduri <smt () vfemail ! net>
Date:       2004-05-24 23:26:52
Message-ID: 20040524232652.10911.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
      
http://bugs.kde.org/show_bug.cgi?id=81995      
smt vfemail net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From smt vfemail net  2004-05-25 01:26 -------
CVS commit by sashmit: 

hopefully beginning of making combined view catch up to the rest

CCMAIL: 81995-done bugs kde org 
 
 


  M +0 -3      akregator.cpp   1.13
  M +3 -3      akregator.h   1.5
  M +1 -1      akregator_part.h   1.16
  M +6 -1      akregator_view.cpp   1.57
  M +29 -6     articleviewer.cpp   1.21
  M +4 -1      articleviewer.h   1.9


--- kdenonbeta/akregator/src/akregator.h  #1.4:1.5
 @ -13,9 +13,9  @
 #endif
 
+#include "akregator_part.h"
+
 #include <kapplication.h>
 #include <kparts/mainwindow.h>
 
-#include "akregator_part.h"
-
 class KToggleAction;
 class KProgress;
 @ -78,5 +78,5  @ private slots:
     void quitProgram();
     void partChanged(KParts::Part *p);
-    void loadingProgress ( int percent );
+    void loadingProgress(int percent);
     
 private:

--- kdenonbeta/akregator/src/akregator_view.cpp  #1.56:1.57
 @ -517,5 +516,9  @ void aKregatorView::slotItemChanged(QLis
         m_articles->setColumnText(0, feed->title());
 
+        if (m_viewMode==CombinedView)
+            m_articleViewer->beginWriting();
         slotUpdateArticleList(feed, false);
+        if (m_viewMode==CombinedView)
+            m_articleViewer->endWriting();
     }
     else
 @ -541,4 +544,6  @ void aKregatorView::slotUpdateArticleLis
     if (!src->isGroup())
     {
+        if (m_viewMode==CombinedView)
+            m_articleViewer->show(static_cast<Feed *>(src), false);
         slotUpdateArticleList(static_cast<Feed *>(src), false, onlyUpdateNew);
     }

--- kdenonbeta/akregator/src/articleviewer.cpp  #1.20:1.21
 @ -170,10 +170,26  @ QString ArticleViewer::formatArticle(Fee
 }
 
-void ArticleViewer::show(Feed *f)
+void ArticleViewer::beginWriting()
+{
+    begin( KURL( "file:"+KGlobal::dirs()->saveLocation("cache", "akregator/Media/") ) );
+    write(m_htmlHead);
+}
+
+void ArticleViewer::endWriting()
+{
+    m_currentText = m_currentText + "</body></html>";
+    write("</body></html>");
+    end();
+}
+
+void ArticleViewer::show(Feed *f, bool writeHeaders)
 {
     QString art, text;
 
+    if (writeHeaders)
+    {
     begin( KURL( "file:"+KGlobal::dirs()->saveLocation("cache", "akregator/Media/") ) );
     write(m_htmlHead);
+    }
 
     ArticleSequence::iterator it;
 @ -186,7 +202,14  @ void ArticleViewer::show(Feed *f)
     }
 
+    if (writeHeaders)
+    {
     m_currentText = text + "</body></html>";
     write("</body></html>");
     end();
+    }
+    else
+    {
+        m_currentText = m_currentText+text;
+    }
 }
 

--- kdenonbeta/akregator/src/articleviewer.h  #1.8:1.9
 @ -25,8 +25,11  @ namespace Akregator
             ArticleViewer(QWidget* parent, const char* name);
             void openDefault();
-            void show(Feed *f);
+            void show(Feed *f, bool headers=true);
             void show(Feed *f, MyArticle);
             void generateCSS();
             void reload();
+            void beginWriting();
+            void endWriting();
+                
 
         private:
[prev in list] [next in list] [prev in thread] [next in thread]