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

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Never show the feed icon for single items
From:       Frank Osterfeld <osterfeld () kde ! org>
Date:       2013-01-04 0:12:19
Message-ID: 20130104001219.A44B7A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 157194608432992ae77a64a8f04aee8a89a0d422 by Frank Osterfeld.
Committed on 04/01/2013 at 01:10.
Pushed by osterfeld into branch 'akregator_port'.

Never show the feed icon for single items

Showing the image for each and every item (instead of in the feed
summary, where it's still shown) is just distracting and visual noise.

M  +2    -14   akregator2/src/articleformatter.cpp
M  +3    -8    akregator2/src/articleformatter.h
M  +2    -2    akregator2/src/articleviewer.cpp

http://commits.kde.org/kdepim/157194608432992ae77a64a8f04aee8a89a0d422

diff --git a/akregator2/src/articleformatter.cpp \
b/akregator2/src/articleformatter.cpp index 683c2a8..ee10614 100644
--- a/akregator2/src/articleformatter.cpp
+++ b/akregator2/src/articleformatter.cpp
@@ -180,7 +180,7 @@ static QString formatCollectionSummary( const Collection& c, int \
unread ) {  return formatFeedSummary( fc, unread );
 }
 
-QString DefaultNormalViewFormatter::formatItem( const Akonadi::Item& aitem, const \
Akonadi::Collection& storageCollection, IconOption icon) const +QString \
DefaultNormalViewFormatter::formatItem( const Akonadi::Item& aitem ) const  {
     const KRss::Item item = aitem.payload<KRss::Item>();
 
@@ -226,12 +226,6 @@ QString DefaultNormalViewFormatter::formatItem( const \
Akonadi::Item& aitem, cons  
     text += "</div>\n"; // end headerbox
 
-    if (icon == ShowIcon )
-    {
-        KRss::FeedCollection fc( storageCollection );
-        text += imageLink( fc );
-    }
-
     const QString content = item.contentWithDescriptionAsFallback();
 
     if (!content.isEmpty())
@@ -358,7 +352,7 @@ DefaultNormalViewFormatter::~DefaultNormalViewFormatter()
 {
 }
 
-QString DefaultCombinedViewFormatter::formatItem( const Akonadi::Item& aitem, const \
Akonadi::Collection& storageCollection, IconOption icon ) const +QString \
DefaultCombinedViewFormatter::formatItem( const Akonadi::Item& aitem ) const  {
     const KRss::Item item = aitem.payload<KRss::Item>();
 
@@ -403,12 +397,6 @@ QString DefaultCombinedViewFormatter::formatItem( const \
Akonadi::Item& aitem, co  
     text += "</div>\n"; // end headerbox
 
-    if (icon == ShowIcon )
-    {
-        KRss::FeedCollection fc( storageCollection );
-        text += imageLink( fc );
-    }
-
     const QString content = item.contentWithDescriptionAsFallback();
     if (!content.isEmpty())
     {
diff --git a/akregator2/src/articleformatter.h b/akregator2/src/articleformatter.h
index 098cf3c..6161c8b 100644
--- a/akregator2/src/articleformatter.h
+++ b/akregator2/src/articleformatter.h
@@ -43,18 +43,13 @@ class ArticleFormatter
 {
     public:
 
-        enum IconOption {
-            NoIcon,
-            ShowIcon
-        };
-
         explicit ArticleFormatter( QPaintDevice* device = 0 );
 
         virtual ~ArticleFormatter();
 
         void setPaintDevice(QPaintDevice* device);
 
-        virtual QString formatItem( const Akonadi::Item& item, const \
Akonadi::Collection& storageCollection, IconOption icon ) const = 0; +        virtual \
QString formatItem( const Akonadi::Item& item ) const = 0;  
         virtual QString formatSummary( const Akonadi::Collection& collection, int \
unread ) const = 0;  
@@ -77,7 +72,7 @@ class DefaultNormalViewFormatter : public ArticleFormatter
         explicit DefaultNormalViewFormatter( QPaintDevice* device = 0 );
         ~DefaultNormalViewFormatter();
 
-        QString formatItem( const Akonadi::Item& item, const Akonadi::Collection& \
storageCollection, IconOption option ) const; +        QString formatItem( const \
Akonadi::Item& item ) const;  
         /* reimp */ QString formatSummary( const Akonadi::Collection& collection, \
int unread ) const;  
@@ -97,7 +92,7 @@ class DefaultCombinedViewFormatter : public ArticleFormatter
 
         explicit DefaultCombinedViewFormatter( QPaintDevice* device = 0 );
 
-        QString formatItem( const Akonadi::Item& item, const Akonadi::Collection& \
storageCollection, IconOption option ) const; +        QString formatItem( const \
Akonadi::Item& item ) const;  
         /* reimp */ QString formatSummary( const Akonadi::Collection& collection, \
int unread ) const;  
diff --git a/akregator2/src/articleviewer.cpp b/akregator2/src/articleviewer.cpp
index 6b3b0e7..349f782 100644
--- a/akregator2/src/articleviewer.cpp
+++ b/akregator2/src/articleviewer.cpp
@@ -543,7 +543,7 @@ void ArticleViewer::showItem( const Akonadi::Collection& \
storageCollection, cons  if ( fc.preferItemLinkForDisplay() && !item.link().isEmpty() \
)  openUrl( m_link );
     else
-      renderContent( m_normalViewFormatter->formatItem( aitem, storageCollection, \
ArticleFormatter::ShowIcon ) ); +      renderContent( \
m_normalViewFormatter->formatItem( aitem ) );  
     setArticleActionsEnabled(true);
 }
@@ -581,7 +581,7 @@ void ArticleViewer::slotUpdateCombinedView()
 
    QString text;
    Q_FOREACH( const Akonadi::Item& i, items )
-       text += "<p><div class=\"article\">"+m_combinedViewFormatter->formatItem( i, \
Akonadi::Collection(), ArticleFormatter::NoIcon )+"</div><p>"; +       text += \
"<p><div class=\"article\">"+m_combinedViewFormatter->formatItem( i )+"</div><p>";  
    renderContent(text);
 }


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