summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-03-02 23:16:16 -0600
committerDarrell Anderson <[email protected]>2013-03-02 23:16:16 -0600
commita69ed77a67f853e33f87d9701029dd0a1f79ae2b (patch)
tree797d53e41945e22e548b8129eafcf2f4c40754c4
parent8d3c935861c114c05447fd82a9762fd227c1727f (diff)
downloadtdepim-a69ed77a67f853e33f87d9701029dd0a1f79ae2b.tar.gz
tdepim-a69ed77a67f853e33f87d9701029dd0a1f79ae2b.zip
Provide akregator check box controls for displaying favicons and loading images.
This partially resolves bug report 1360.
-rw-r--r--akregator/src/akregator.kcfg4
-rw-r--r--akregator/src/akregator_part.cpp20
-rw-r--r--akregator/src/settings_appearance.ui16
3 files changed, 40 insertions, 0 deletions
diff --git a/akregator/src/akregator.kcfg b/akregator/src/akregator.kcfg
index 9384d3161..29028f51a 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 48311dcce..355b66886 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 93897cc09..78a23de85 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>