From a69ed77a67f853e33f87d9701029dd0a1f79ae2b Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sat, 2 Mar 2013 23:16:16 -0600
Subject: Provide akregator check box controls for displaying favicons and
 loading images. This partially resolves bug report 1360.

---
 akregator/src/akregator.kcfg         |  4 ++++
 akregator/src/akregator_part.cpp     | 20 ++++++++++++++++++++
 akregator/src/settings_appearance.ui | 16 ++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/akregator/src/akregator.kcfg b/akregator/src/akregator.kcfg
index 9384d316..29028f51 100644
--- a/akregator/src/akregator.kcfg
+++ b/akregator/src/akregator.kcfg
@@ -51,6 +51,10 @@
   </entry>
   <entry key="UnderlineLinks" type="Bool"> 
   </entry>
+  <entry key="EnableFavIcon" type="Bool"> 
+  </entry>
+  <entry key="AutoLoadImages" type="Bool"> 
+  </entry>
  </group>
   <group name="Archive">
    <entry key="ArchiveMode" type="Enum">
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 48311dcc..355b6688 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -886,6 +886,26 @@ void Part::initFonts()
         Settings::setUnderlineLinks(underline);
     }
 
+    if (!conf->hasKey("EnableFavicon"))
+    {
+        bool enableFavicon = true;
+        if (konq.hasKey("EnableFavicon"))
+            enableFavicon = konq.readBoolEntry("EnableFavicon");
+
+        kdDebug() << "Part::initFonts(): set EnableFavicon to " << enableFavicon << endl;
+        Settings::setEnableFavIcon(enableFavicon);
+    }
+
+    if (!conf->hasKey("AutoLoadImages"))
+    {
+        bool autoLoadImages = true;
+        if (konq.hasKey("AutoLoadImages"))
+            autoLoadImages = konq.readBoolEntry("AutoLoadImages");
+
+        kdDebug() << "Part::initFonts(): set AutoLoadImages to " << autoLoadImages << endl;
+        Settings::setAutoLoadImages(autoLoadImages);
+    }
+
 }
 
 bool Part::copyFile(const TQString& backup)
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 93897cc0..78a23de8 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -187,6 +187,22 @@
                 <string>&amp;Underline links</string>
             </property>
         </widget>
+        <widget class="TQCheckBox">
+            <property name="name">
+                <cstring>kcfg_EnableFavIcon</cstring>
+            </property>
+            <property name="text">
+                <string>&amp;Enable favicons</string>
+            </property>
+        </widget>
+        <widget class="TQCheckBox">
+            <property name="name">
+                <cstring>kcfg_AutoLoadImages</cstring>
+            </property>
+            <property name="text">
+                <string>Automatically load &amp;images</string>
+            </property>
+        </widget>
         <spacer>
             <property name="name">
                 <cstring>spacer1</cstring>
-- 
cgit v1.2.3