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

List:       kde-commits
Subject:    playground/libs/webkitkde/kdewebkit/settings
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2009-07-31 22:24:53
Message-ID: 1249079093.493464.19091.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005384 by adawit:

Added support for reading kcookiejar's configuration

 M  +12 -2     webkitsettings.cpp  
 M  +3 -0      webkitsettings.h  


--- trunk/playground/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp #1005383:1005384
@@ -91,6 +91,7 @@
     bool m_jsPopupBlockerPassivePopup : 1;
     bool m_accessKeysEnabled : 1;
     bool m_zoomTextOnly : 1;
+    bool m_useCookieJar : 1;
 
     // the virtual global "domain"
     KPerDomainSettings global;
@@ -307,6 +308,10 @@
 
   init( local.data(), false );
 
+  KConfig config ( "kcookiejarrc", KConfig::NoGlobals );
+  KConfigGroup cg ( &config, "Cookie Policy");
+  d->m_useCookieJar = cg.readEntry("Cookies", false);
+
 }
 
 void WebKitSettings::init( KConfig * config, bool reset )
@@ -665,8 +670,8 @@
 
   // These numbers were generated by trial and error. I started with 1.5, and that fixed most pages, but
   // it made Google and KDE.org right, and Wikipedia a bit too big. 1.45 seems to work okay.
-  QWebSettings::globalSettings()->setFontSize(QWebSettings::MinimumFontSize, minFontSize() * 1.45);
-  QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFontSize, mediumFontSize() * 1.45);
+  QWebSettings::globalSettings()->setFontSize(QWebSettings::MinimumFontSize, minFontSize() * 1.42);
+  QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFontSize, mediumFontSize() * 1.42);
 }
 
 
@@ -1097,6 +1102,11 @@
     return d->m_jsPopupBlockerPassivePopup;
 }
 
+bool WebKitSettings::isCookieJarEnabled() const
+{
+    return d->m_useCookieJar;
+}
+
 K_GLOBAL_STATIC(WebKitSettings, s_webKitSettings)
 
 WebKitSettings* WebKitSettings::self()
--- trunk/playground/libs/webkitkde/kdewebkit/settings/webkitsettings.h #1005383:1005384
@@ -220,6 +220,9 @@
     void setJSPopupBlockerPassivePopup(bool enabled);
     bool jsPopupBlockerPassivePopup() const;
 
+    // CookieJar...
+    bool isCookieJarEnabled() const;
+
     // Global config object stuff.
     static WebKitSettings* self();
     /**
[prev in list] [next in list] [prev in thread] [next in thread]