[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 667d503bbf355d46510758c600a449fff7c08d35
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 7 00:57:38 2002 +0000

    WebKit:
    
    	Add mechanism to store userStyleSheet preferences in WebKit in
    	preparation for Dave wiring up the implementation.
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences userStyleSheetEnabled]),
            (-[WebPreferences setUserStyleSheetEnabled:]),
            (-[WebPreferences userStyleSheetLocation]),
            (-[WebPreferences setUserStyleSheetLocation:]):
    	New methods, read and write UserDefaults values.
    
            (+[WebPreferences load]): Set initial values for
    	userStyleSheetEnabled and userStyleSheetLocation
    
    WebBrowser:
    
    	Updated to use userStyleSheet preferences from WebKit.
    
            * Defaults.plist,
            * PreferenceKeys.h:
    	Remove preference keys for ApplyStyleSheet since this is in
    	WebKit now.
    
            * Preferences.subproj/AppearancePreferences.m:
            (-[AppearancePreferences setStylesheetPathPreference:]),
            (-[AppearancePreferences stylesheetPathPreference]),
            (-[AppearancePreferences updateStylesheetViews]),
            (-[AppearancePreferences toggleApplyStylesheet:]):
    	Update to use WebKit preferences API; remove local storage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1756 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0b49c08..868c904 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	Add mechanism to store userStyleSheet preferences in WebKit in
+	preparation for Dave wiring up the implementation.
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences userStyleSheetEnabled]),
+        (-[WebPreferences setUserStyleSheetEnabled:]),
+        (-[WebPreferences userStyleSheetLocation]),
+        (-[WebPreferences setUserStyleSheetLocation:]):
+	New methods, read and write UserDefaults values.
+
+        (+[WebPreferences load]): Set initial values for
+	userStyleSheetEnabled and userStyleSheetLocation
+
 2002-08-06  Maciej Stachowiak  <mjs at apple.com>
 
 	Removed some APPLE_CHANGES no longer needed after the part change.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0b49c08..868c904 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	Add mechanism to store userStyleSheet preferences in WebKit in
+	preparation for Dave wiring up the implementation.
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences userStyleSheetEnabled]),
+        (-[WebPreferences setUserStyleSheetEnabled:]),
+        (-[WebPreferences userStyleSheetLocation]),
+        (-[WebPreferences setUserStyleSheetLocation:]):
+	New methods, read and write UserDefaults values.
+
+        (+[WebPreferences load]): Set initial values for
+	userStyleSheetEnabled and userStyleSheetLocation
+
 2002-08-06  Maciej Stachowiak  <mjs at apple.com>
 
 	Removed some APPLE_CHANGES no longer needed after the part change.
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index e3510d1..b4613c6 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -38,6 +38,13 @@
 - (int)minimumFontSize;
 - (void)setMinimumFontSize:(int)size;
 
+- (BOOL)userStyleSheetEnabled;
+- (void)setUserStyleSheetEnabled:(BOOL)flag;
+
+// The user style sheet is stored as a URL string, e.g. "file://<etc>"
+- (NSString *)userStyleSheetLocation;
+- (void)setUserStyleSheetLocation:(NSString *)string;
+
 - (BOOL)javaEnabled;
 - (void)setJavaEnabled:(BOOL)flag;
 
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index e8eab96..18edf7a 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -17,6 +17,8 @@
 #define        WebKitMinimumFontSizePreferenceKey        @"WebKitMinimumFontSize"
 #define        WebKitDefaultFontSizePreferenceKey        @"WebKitDefaultFontSize"
 #define	       WebKitFixedFontSizePreferenceKey		 @"WebKitFixedFontSize"
+#define	       WebKitUserStyleSheetEnabledPreferenceKey @"WebKitUserStyleSheetEnabledPreferenceKey"
+#define	       WebKitUserStyleSheetLocationPreferenceKey @"WebKitUserStyleSheetLocationPreferenceKey"
 #define        WebKitJavaEnabledPreferenceKey                @"WebKitJavaEnabled"
 #define        WebKitJavaScriptEnabledPreferenceKey        @"WebKitJavaScriptEnabled"
 #define        WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey        @"WebKitJavaScriptCanOpenWindowsAutomatically"
@@ -48,6 +50,7 @@ static WebPreferences *_standardPreferences = nil;
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
+    NSNumber *userStyleSheetEnabled = [NSNumber numberWithBool:FALSE];
     NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     NSNumber *javaScriptEnabled = [NSNumber numberWithBool:TRUE];
     NSNumber *javaScriptCanOpenWindows = [NSNumber numberWithBool:FALSE];
@@ -72,6 +75,8 @@ static WebPreferences *_standardPreferences = nil;
         @"1.85",                        WebKitResourceTimedLayoutDelayPreferenceKey,
         timedLayoutEnabled,             WebKitInitialTimedLayoutEnabledPreferenceKey,
         resourceTimedLayoutEnabled,     WebKitResourceTimedLayoutEnabledPreferenceKey,
+        userStyleSheetEnabled,          WebKitUserStyleSheetEnabledPreferenceKey,
+        @"",                    	WebKitUserStyleSheetLocationPreferenceKey,
         javaEnabled,                    WebKitJavaEnabledPreferenceKey,
         javaScriptEnabled,              WebKitJavaScriptEnabledPreferenceKey,
         javaScriptCanOpenWindows,       WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
@@ -176,6 +181,26 @@ static WebPreferences *_standardPreferences = nil;
 }
 
 
+- (BOOL)userStyleSheetEnabled
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitUserStyleSheetEnabledPreferenceKey];
+}
+
+- (void)setUserStyleSheetEnabled:(BOOL)flag
+{
+    [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitUserStyleSheetEnabledPreferenceKey];
+}
+
+- (NSString *)userStyleSheetLocation
+{
+    return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitUserStyleSheetLocationPreferenceKey];
+}
+
+- (void)setUserStyleSheetLocation:(NSString *)string
+{
+    [[NSUserDefaults standardUserDefaults] setObject:string forKey:WebKitUserStyleSheetLocationPreferenceKey];
+}
+
 - (BOOL)javaEnabled
 {
     return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJavaEnabledPreferenceKey];

-- 
WebKit Debian packaging