Re-added the custom colours patch for the article list. Fixes bug 213220.

Package-Manager: portage-2.1.5_rc2

4 files changed, 336 insertions, 2 deletions

diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 79bdc0bfe457..d6a0910cccad 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.92 2008/03/04 06:22:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.93 2008/04/15 18:51:28 philantrop Exp $
+
+*akregator-3.5.9-r1 (15 Apr 2008)
+
+  15 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/akregator-3.5.9-customcolors.patch, +akregator-3.5.9-r1.ebuild:
+  Re-added the custom colours patch for the article list. Fixes bug 213220.
 
   04 Mar 2008; Jeroen Roovers <jer@gentoo.org> akregator-3.5.8.ebuild,
   akregator-3.5.9.ebuild:
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index fec38bd4f59f..3422cbef3db9 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,7 +1,9 @@
+AUX akregator-3.5.9-customcolors.patch 11558 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f SHA1 321387cb813d0615a5760f5d5ed107b344a88e8a SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5.8.tar.bz2 14107449 RMD160 bb34c7e88227a1ebdd8ff38ee41445f85969175e SHA1 8284db2d3d767228cfb2cad4bf8d5221848d64f2 SHA256 433f8541af0a05e0a7e15df5ecca8463a29b6574871b941a8312b04b2233fef1
 DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54 SHA1 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15 SHA256 ee3f02ac828f1915c09b8c0a1289efcfbae36321cd07bc071df8be041de10d3a
 EBUILD akregator-3.5.8.ebuild 777 RMD160 6c0e59583fa7663cddc54bec89f6249e6e3b5fad SHA1 f0dd548464eff2ad55aacc6e007e31116508f3d5 SHA256 882a97efb83e3fca4b2cf3c206dd8659d901c4e54525aa64b7d1b7b83e3d97aa
+EBUILD akregator-3.5.9-r1.ebuild 790 RMD160 cab0d5d85bb8583692064951637904f0d4024554 SHA1 57bd1bbb53c23edcf902bee111660b3d659ec83d SHA256 685f8011aad87c9d9f2801790b2ccd603e1cb44ff3e347677cbeb6a0e139d6f0
 EBUILD akregator-3.5.9.ebuild 729 RMD160 3daec8ff34cfd6df210a4e2cc7564520b3c56754 SHA1 65522e2f9595fabe60eeea6ebaf1d723640786a7 SHA256 6add18f4c0f7670f301a4f9024ed8c7c071b8783adab7ef960d177ee6246f411
-MISC ChangeLog 12245 RMD160 b6c20506f52e28ace38471c2ebc6f3b879e06066 SHA1 9e60b824828d80ee4284321156c42574b318e3dd SHA256 3665aeb09d7ff0e8aacd70e4d14d84328064d575bef638eaed53093578dc2f73
+MISC ChangeLog 12492 RMD160 e9d1341c597b077697c29e20abcaf6e4fe129549 SHA1 a5b6975a8599758b9d6ff28faebee2d8b91dac2a SHA256 46aa0dff06fd08c1b168e209e676a86c3fe881298a949c7d03cf776d888ad6ec
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/akregator/akregator-3.5.9-r1.ebuild b/kde-base/akregator/akregator-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..c8ea736f4450
--- /dev/null
+++ b/kde-base/akregator/akregator-3.5.9-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5.9-r1.ebuild,v 1.1 2008/04/15 18:51:28 philantrop Exp $
+
+KMNAME=kdepim
+
+EAPI="1"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-04.tar.bz2"
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
+	>=kde-base/kontact-${PV}:${SLOT}
+	!net-www/akregator"
+RDEPEND="${DEPEND}"
+
+KMCOPYLIB="libkdepim libkdepim
+	libkpinterfaces kontact/interfaces"
+KMEXTRACTONLY="libkdepim
+	kontact/interfaces"
+KMEXTRA="kontact/plugins/akregator"
+
+PATCHES=( "${FILESDIR}/${P}-customcolors.patch" )
diff --git a/kde-base/akregator/files/akregator-3.5.9-customcolors.patch b/kde-base/akregator/files/akregator-3.5.9-customcolors.patch
new file mode 100644
index 000000000000..c0e5e8b229ea
--- /dev/null
+++ b/kde-base/akregator/files/akregator-3.5.9-customcolors.patch
@@ -0,0 +1,298 @@
+Index: akregator.kcfg
+===================================================================
+--- akregator/src/akregator.kcfg	(revision 573936)
++++ akregator/src/akregator.kcfg	(working copy)
+@@ -40,6 +40,16 @@
+    <entry key="Fixed Font" type="String" />
+    <entry key="Serif Font" type="String" />
+    <entry key="Sans Serif Font" type="String" />
++   <entry key="UseCustomColors" type="Bool">
++        <default>false</default>
++   </entry>
++    <entry key="ColorUnreadArticles" type="Color">
++        <default>#0000FF</default>
++    </entry>
++    <entry key="ColorNewArticles" type="Color">
++        <default>#FF0000</default>
++    </entry>
++        
+  </group>
+  <group name="HTML Settings" >
+   <entry key="Fonts" type="StringList" />
+Index: articlelistview.cpp
+===================================================================
+--- akregator/src/articlelistview.cpp	(revision 573936)
++++ akregator/src/articlelistview.cpp	(working copy)
+@@ -181,15 +181,20 @@
+         QColorGroup cg2(cg);
+     
+         if (article().status() == Article::Unread)
+-            cg2.setColor(QColorGroup::Text, Qt::blue);
++            cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorUnreadArticles() : Qt::blue);
+         else // New
+-            cg2.setColor(QColorGroup::Text, Qt::red);
++            cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorNewArticles() : Qt::red);
+     
+         KListViewItem::paintCell( p, cg2, column, width, align );
+     }
+ 
+ }
+ 
++void ArticleListView::slotPaletteOrFontChanged()
++{
++    triggerUpdate();
++}
++
+ void ArticleListView::ArticleItem::updateItem(const Article& article)
+ {
+     m_article = article;
+Index: articlelistview.h
+===================================================================
+--- akregator/src/articlelistview.h	(revision 573936)
++++ akregator/src/articlelistview.h	(working copy)
+@@ -80,6 +80,8 @@
+             /** selects next unread article in list view, first unread article if no article was selected */
+             void slotNextUnreadArticle();
+ 
++            void slotPaletteOrFontChanged();
++            
+         signals:
+             void signalArticleChosen(const Article& article);
+             void signalDoubleClicked(const Article&, const QPoint&, int);
+Index: settings_appearance.ui
+===================================================================
+--- akregator/src/settings_appearance.ui	(revision 573936)
++++ akregator/src/settings_appearance.ui	(working copy)
+@@ -10,20 +10,20 @@
+             <x>0</x>
+             <y>0</y>
+             <width>418</width>
+-            <height>377</height>
++            <height>566</height>
+         </rect>
+     </property>
+     <property name="caption">
+         <string>General</string>
+     </property>
+-    <vbox>
++    <grid>
+         <property name="name">
+             <cstring>unnamed</cstring>
+         </property>
+         <property name="margin">
+             <number>0</number>
+         </property>
+-        <widget class="QGroupBox">
++        <widget class="QGroupBox" row="1" column="0">
+             <property name="name">
+                 <cstring>groupBox3</cstring>
+             </property>
+@@ -114,8 +114,25 @@
+                 </widget>
+             </grid>
+         </widget>
+-        <widget class="QGroupBox">
++        <spacer row="4" column="0">
+             <property name="name">
++                <cstring>spacer1</cstring>
++            </property>
++            <property name="orientation">
++                <enum>Vertical</enum>
++            </property>
++            <property name="sizeType">
++                <enum>Expanding</enum>
++            </property>
++            <property name="sizeHint">
++                <size>
++                    <width>20</width>
++                    <height>41</height>
++                </size>
++            </property>
++        </spacer>
++        <widget class="QGroupBox" row="2" column="0">
++            <property name="name">
+                 <cstring>FontsGroupBox</cstring>
+             </property>
+             <property name="title">
+@@ -179,7 +196,7 @@
+                 </widget>
+             </grid>
+         </widget>
+-        <widget class="QCheckBox">
++        <widget class="QCheckBox" row="3" column="0">
+             <property name="name">
+                 <cstring>kcfg_UnderlineLinks</cstring>
+             </property>
+@@ -187,24 +204,99 @@
+                 <string>&amp;Underline links</string>
+             </property>
+         </widget>
+-        <spacer>
++        <widget class="QGroupBox" row="0" column="0">
+             <property name="name">
+-                <cstring>spacer1</cstring>
++                <cstring>groupBox3_2</cstring>
+             </property>
+-            <property name="orientation">
+-                <enum>Vertical</enum>
++            <property name="title">
++                <string>Article List Colors</string>
+             </property>
+-            <property name="sizeType">
+-                <enum>Expanding</enum>
+-            </property>
+-            <property name="sizeHint">
+-                <size>
+-                    <width>20</width>
+-                    <height>41</height>
+-                </size>
+-            </property>
+-        </spacer>
+-    </vbox>
++            <grid>
++                <property name="name">
++                    <cstring>unnamed</cstring>
++                </property>
++                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
++                    <property name="name">
++                        <cstring>kcfg_UseCustomColors</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Use custom colors</string>
++                    </property>
++                </widget>
++                <widget class="QLayoutWidget" row="1" column="0">
++                    <property name="name">
++                        <cstring>layout1</cstring>
++                    </property>
++                    <grid>
++                        <property name="name">
++                            <cstring>unnamed</cstring>
++                        </property>
++                        <widget class="QLabel" row="0" column="0">
++                            <property name="name">
++                                <cstring>lbl_unreadArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string>Unread articles</string>
++                            </property>
++                        </widget>
++                        <widget class="KColorButton" row="1" column="1">
++                            <property name="name">
++                                <cstring>kcfg_ColorNewArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string></string>
++                            </property>
++                        </widget>
++                        <widget class="KColorButton" row="0" column="1">
++                            <property name="name">
++                                <cstring>kcfg_ColorUnreadArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string></string>
++                            </property>
++                        </widget>
++                        <widget class="QLabel" row="1" column="0">
++                            <property name="name">
++                                <cstring>lbl_newArticles</cstring>
++                            </property>
++                            <property name="enabled">
++                                <bool>false</bool>
++                            </property>
++                            <property name="text">
++                                <string>New articles</string>
++                            </property>
++                        </widget>
++                    </grid>
++                </widget>
++                <spacer row="1" column="1">
++                    <property name="name">
++                        <cstring>spacer2</cstring>
++                    </property>
++                    <property name="orientation">
++                        <enum>Horizontal</enum>
++                    </property>
++                    <property name="sizeType">
++                        <enum>Expanding</enum>
++                    </property>
++                    <property name="sizeHint">
++                        <size>
++                            <width>110</width>
++                            <height>20</height>
++                        </size>
++                    </property>
++                </spacer>
++            </grid>
++        </widget>
++    </grid>
+ </widget>
+ <customwidgets>
+ </customwidgets>
+@@ -233,18 +325,38 @@
+         <receiver>kcfg_MinimumFontSize</receiver>
+         <slot>setValue(int)</slot>
+     </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>kcfg_ColorUnreadArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>kcfg_ColorNewArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>lbl_unreadArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
++    <connection>
++        <sender>kcfg_UseCustomColors</sender>
++        <signal>toggled(bool)</signal>
++        <receiver>lbl_newArticles</receiver>
++        <slot>setEnabled(bool)</slot>
++    </connection>
+ </connections>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+-    <includehint>knuminput.h</includehint>
+-    <includehint>knuminput.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
+     <includehint>kfontcombo.h</includehint>
+-    <includehint>klineedit.h</includehint>
++    <includehint>kcolorbutton.h</includehint>
++    <includehint>kcolorbutton.h</includehint>
+ </includehints>
+ </UI>
+Index: akregator_view.cpp
+===================================================================
+--- akregator/src/akregator_view.cpp	(revision 577072)
++++ akregator/src/akregator_view.cpp	(working copy)
+@@ -297,6 +297,8 @@
+     connect( m_articleList, SIGNAL(signalDoubleClicked(const Article&, const QPoint&, int)),
+                 this, SLOT( slotOpenArticleExternal(const Article&, const QPoint&, int)) );
+ 
++    connect( m_part, SIGNAL(signalSettingsChanged()), m_articleList, SLOT(slotPaletteOrFontChanged()));
++    
+     m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
+     m_articleViewer->setSafeMode();  // disable JS, Java, etc...
+