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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 9562fd8b58ddcf9540f63dcf94fb9401006c0234
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 8 03:49:39 2003 +0000

            API conveniences for IB.
    
            Reviewed by Maciej.
    
            * WebView.subproj/WebView.h:
            * WebView.subproj/WebView.m:
            (-[WebView canGoBack]):
            (-[WebView canGoForward]):
            (-[WebView reload:]):
            (-[WebView canMakeTextSmaller]):
            (-[WebView canMakeTextLarger]):
            (-[WebView makeTextSmaller:]):
            (-[WebView makeTextLarger:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4041 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f57b68c..4078fe8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,21 @@
 2003-04-07  Richard Williamson  <rjw at apple.com>
 
+        API conveniences for IB.
+        
+        Reviewed by Maciej.
+
+        * WebView.subproj/WebView.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView canGoBack]):
+        (-[WebView canGoForward]):
+        (-[WebView reload:]):
+        (-[WebView canMakeTextSmaller]):
+        (-[WebView canMakeTextLarger]):
+        (-[WebView makeTextSmaller:]):
+        (-[WebView makeTextLarger:]):
+
+2003-04-07  Richard Williamson  <rjw at apple.com>
+
         Fix for 3220988.  Cancel frame load if it's detached before
         finished loading.
 
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index ccee0cf..77fbf54 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -347,8 +347,15 @@ extern NSString *WebElementLinkLabelKey;	// NSString of the text within the anch
 
 
 @interface WebView (WebIBActions)
+- (IBAction)takeStringURLFrom:(id)sender;
 - (IBAction)stopLoading:(id)sender;
+- (IBAction)reload:(id)sender;
+- (BOOL)canGoBack;
 - (IBAction)goBack:(id)sender;
+- (BOOL)canGoForward;
 - (IBAction)goForward:(id)sender;
-- (IBAction)takeStringURLFrom:(id)sender;
+- (BOOL)canMakeTextLarger;
+- (IBAction)makeTextLarger:(id)sender;
+- (BOOL)canMakeTextSmaller;
+- (IBAction)makeTextSmaller:(id)sender;
 @end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index f0e5e0c..fd52b6a 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -496,6 +496,16 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
     [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString: URLString]]];
 }
 
+- (BOOL)canGoBack
+{
+    return [[self backForwardList] backItem] != nil;
+}
+
+- (BOOL)canGoForward
+{
+    return [[self backForwardList] forwardItem] != nil;
+}
+
 - (IBAction)goBack:(id)sender
 {
     [self goBack];
@@ -511,6 +521,52 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
     [[self mainFrame] stopLoading];
 }
 
+- (IBAction)reload:(id)sender
+{
+    [[self mainFrame] reload];
+}
+
+#define MinimumTextSizeMultiplier	0.5
+#define MaximumTextSizeMultiplier	3.0
+#define TextSizeMultiplierRatio		1.2
+
+- (BOOL)canMakeTextSmaller
+{
+    if ([[[[self mainFrame] dataSource] request] URL] == nil) {
+        return NO;
+    }
+    if ([self textSizeMultiplier]/TextSizeMultiplierRatio < MinimumTextSizeMultiplier) {
+        return NO;
+    }
+    return YES;
+}
+
+- (BOOL)canMakeTextLarger
+{
+    if ([[[[self mainFrame] dataSource] request] URL] == nil) {
+        return NO;
+    }
+    if ([self textSizeMultiplier]*TextSizeMultiplierRatio > MaximumTextSizeMultiplier) {
+        return NO;
+    }
+    return YES;
+}
+
+- (IBAction)makeTextSmaller:(id)sender
+{
+    if (![self canMakeTextSmaller]) {
+        return;
+    }
+    [self setTextSizeMultiplier:[self textSizeMultiplier]/TextSizeMultiplierRatio];
+}
+
+- (IBAction)makeTextLarger:(id)sender
+{
+    if (![self canMakeTextLarger]) {
+        return;
+    }
+    [self setTextSizeMultiplier:[self textSizeMultiplier]*TextSizeMultiplierRatio];
+}
 
 @end
 

-- 
WebKit Debian packaging