[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:51:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 21e47adcd12fcb724e6016a1f9e1570ce8f3d8fe
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 31 21:46:56 2001 +0000
Changes to add address bar to test app.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index c31df53..5ae2b48 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -117,6 +117,8 @@ QApplication::~QApplication()
void QApplication::setMainWidget(QWidget *w)
{
+ NSRect b = [((_KWQOwner *)application)->containerView bounds];
+
if (application == nil){
NSLog (@"ERROR: QApplication::setMainWidget() application not set.\n");
return;
@@ -126,7 +128,7 @@ void QApplication::setMainWidget(QWidget *w)
return;
}
- NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+ NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,b.size.width,b.size.height)];
[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setHasVerticalScroller: YES];
[sv setHasHorizontalScroller: YES];
@@ -136,7 +138,7 @@ void QApplication::setMainWidget(QWidget *w)
[((_KWQOwner *)application)->window setAlphaValue: (float)0.8];
- [((_KWQOwner *)application)->window setContentView: sv];
+ [((_KWQOwner *)application)->containerView addSubview: sv];
}
diff --git a/WebCore/kwq/KWQView.h b/WebCore/kwq/KWQView.h
index 676529d..a00496c 100644
--- a/WebCore/kwq/KWQView.h
+++ b/WebCore/kwq/KWQView.h
@@ -27,6 +27,7 @@
class QWidget;
+class KHTMLPart;
@interface KWQView : NSView
{
@@ -62,6 +63,7 @@ class QWidget;
@interface KWQHTMLView : NSView
{
QWidget *widget;
+ KHTMLPart *part; // FIXME. This is a temporary reference.
bool isFlipped;
}
- initWithFrame: (NSRect)r widget: (QWidget *)w;
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 58a7158..afb4ebd 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -121,5 +121,14 @@
return isFlipped;
}
+// FIXME. This should be replaced. Ultimately we will use something like:
+// [[webView dataSource] setURL: url];
+- (void)setURL: (NSString *)urlString
+{
+ KURL url = [urlString cString];
+
+ part->openURL (url);
+}
+
@end
diff --git a/WebCore/kwq/_KWQOwner.h b/WebCore/kwq/_KWQOwner.h
index d230024..6f26d3a 100644
--- a/WebCore/kwq/_KWQOwner.h
+++ b/WebCore/kwq/_KWQOwner.h
@@ -3,5 +3,6 @@
@interface _KWQOwner : NSApplication
{
IBOutlet id window;
+ IBOutlet id containerView;
}
@end
diff --git a/WebCore/kwq/_KWQOwner.m b/WebCore/kwq/_KWQOwner.m
index 3e6a27c..b0d5c45 100644
--- a/WebCore/kwq/_KWQOwner.m
+++ b/WebCore/kwq/_KWQOwner.m
@@ -1,5 +1,11 @@
+// This class is a temporary hack for our test apps.
+
#import "_KWQOwner.h"
+ at interface KWQHTMLView : NSView
+- (void)setURL: (NSString *)urlString;
+ at end
+
@implementation _KWQOwner
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
@@ -7,4 +13,20 @@
NSLog (@"Did finish launching\n", nil);
}
+- changeURL: sender
+{
+ // Get the
+ NSString *url = [sender stringValue];
+ KWQHTMLView *htmlView;
+ NSArray *subs;
+
+ subs = [containerView subviews];
+ htmlView = (KWQHTMLView *)[[subs objectAtIndex: 0] documentView];
+ [htmlView setURL: url];
+ [containerView setNeedsDisplay: YES];
+
+ return self;
+}
+
+
@end
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
index 0fd7917..7ab970d 100644
--- a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
@@ -2,9 +2,10 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
+ ACTIONS = {changeURL = id; };
CLASS = _KWQOwner;
LANGUAGE = ObjC;
- OUTLETS = {window = id; };
+ OUTLETS = {containerView = id; window = id; };
SUPERCLASS = NSApplication;
}
);
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
index 0c7ae75..ba73594 100644
--- a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
@@ -5,7 +5,7 @@
<key>IBFramework Version</key>
<string>219.0</string>
<key>IBMainMenuLocation</key>
- <string>69 298 318 44 0 0 1600 1178 </string>
+ <string>69 252 318 44 0 0 1600 1002 </string>
<key>IBSystem Version</key>
<string>5G64</string>
<key>IBUserGuides</key>
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib
index 4e0c928..addb7d4 100644
Binary files a/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib and b/WebCore/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/WebCore/kwq/tests/khtmlview/draw.mm b/WebCore/kwq/tests/khtmlview/draw.mm
index e65f0c0..bdb22bb 100644
--- a/WebCore/kwq/tests/khtmlview/draw.mm
+++ b/WebCore/kwq/tests/khtmlview/draw.mm
@@ -73,11 +73,12 @@ int main( int argc, char **argv )
KHTMLView *htmlView = new KHTMLView (w, 0);
htmlView->resize (800,800);
KWQHTMLView *kwqHTMLView = [[[KWQHTMLView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: htmlView] autorelease];
+ kwqHTMLView->part = w;
w->setView (htmlView);
w->openURL (url);
-
+
htmlView->setView (kwqHTMLView);
htmlView->resize(800, 800);
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index c31df53..5ae2b48 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -117,6 +117,8 @@ QApplication::~QApplication()
void QApplication::setMainWidget(QWidget *w)
{
+ NSRect b = [((_KWQOwner *)application)->containerView bounds];
+
if (application == nil){
NSLog (@"ERROR: QApplication::setMainWidget() application not set.\n");
return;
@@ -126,7 +128,7 @@ void QApplication::setMainWidget(QWidget *w)
return;
}
- NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+ NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,b.size.width,b.size.height)];
[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setHasVerticalScroller: YES];
[sv setHasHorizontalScroller: YES];
@@ -136,7 +138,7 @@ void QApplication::setMainWidget(QWidget *w)
[((_KWQOwner *)application)->window setAlphaValue: (float)0.8];
- [((_KWQOwner *)application)->window setContentView: sv];
+ [((_KWQOwner *)application)->containerView addSubview: sv];
}
diff --git a/WebCore/src/kwq/KWQView.h b/WebCore/src/kwq/KWQView.h
index 676529d..a00496c 100644
--- a/WebCore/src/kwq/KWQView.h
+++ b/WebCore/src/kwq/KWQView.h
@@ -27,6 +27,7 @@
class QWidget;
+class KHTMLPart;
@interface KWQView : NSView
{
@@ -62,6 +63,7 @@ class QWidget;
@interface KWQHTMLView : NSView
{
QWidget *widget;
+ KHTMLPart *part; // FIXME. This is a temporary reference.
bool isFlipped;
}
- initWithFrame: (NSRect)r widget: (QWidget *)w;
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index 58a7158..afb4ebd 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -121,5 +121,14 @@
return isFlipped;
}
+// FIXME. This should be replaced. Ultimately we will use something like:
+// [[webView dataSource] setURL: url];
+- (void)setURL: (NSString *)urlString
+{
+ KURL url = [urlString cString];
+
+ part->openURL (url);
+}
+
@end
diff --git a/WebCore/src/kwq/_KWQOwner.h b/WebCore/src/kwq/_KWQOwner.h
index d230024..6f26d3a 100644
--- a/WebCore/src/kwq/_KWQOwner.h
+++ b/WebCore/src/kwq/_KWQOwner.h
@@ -3,5 +3,6 @@
@interface _KWQOwner : NSApplication
{
IBOutlet id window;
+ IBOutlet id containerView;
}
@end
diff --git a/WebCore/src/kwq/_KWQOwner.m b/WebCore/src/kwq/_KWQOwner.m
index 3e6a27c..b0d5c45 100644
--- a/WebCore/src/kwq/_KWQOwner.m
+++ b/WebCore/src/kwq/_KWQOwner.m
@@ -1,5 +1,11 @@
+// This class is a temporary hack for our test apps.
+
#import "_KWQOwner.h"
+ at interface KWQHTMLView : NSView
+- (void)setURL: (NSString *)urlString;
+ at end
+
@implementation _KWQOwner
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
@@ -7,4 +13,20 @@
NSLog (@"Did finish launching\n", nil);
}
+- changeURL: sender
+{
+ // Get the
+ NSString *url = [sender stringValue];
+ KWQHTMLView *htmlView;
+ NSArray *subs;
+
+ subs = [containerView subviews];
+ htmlView = (KWQHTMLView *)[[subs objectAtIndex: 0] documentView];
+ [htmlView setURL: url];
+ [containerView setNeedsDisplay: YES];
+
+ return self;
+}
+
+
@end
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
index 0fd7917..7ab970d 100644
--- a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/classes.nib
@@ -2,9 +2,10 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
+ ACTIONS = {changeURL = id; };
CLASS = _KWQOwner;
LANGUAGE = ObjC;
- OUTLETS = {window = id; };
+ OUTLETS = {containerView = id; window = id; };
SUPERCLASS = NSApplication;
}
);
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
index 0c7ae75..ba73594 100644
--- a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/info.nib
@@ -5,7 +5,7 @@
<key>IBFramework Version</key>
<string>219.0</string>
<key>IBMainMenuLocation</key>
- <string>69 298 318 44 0 0 1600 1178 </string>
+ <string>69 252 318 44 0 0 1600 1002 </string>
<key>IBSystem Version</key>
<string>5G64</string>
<key>IBUserGuides</key>
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib
index 4e0c928..addb7d4 100644
Binary files a/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib and b/WebCore/src/kwq/tests/khtmlview/WebViewTest/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/WebCore/src/kwq/tests/khtmlview/draw.mm b/WebCore/src/kwq/tests/khtmlview/draw.mm
index e65f0c0..bdb22bb 100644
--- a/WebCore/src/kwq/tests/khtmlview/draw.mm
+++ b/WebCore/src/kwq/tests/khtmlview/draw.mm
@@ -73,11 +73,12 @@ int main( int argc, char **argv )
KHTMLView *htmlView = new KHTMLView (w, 0);
htmlView->resize (800,800);
KWQHTMLView *kwqHTMLView = [[[KWQHTMLView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: htmlView] autorelease];
+ kwqHTMLView->part = w;
w->setView (htmlView);
w->openURL (url);
-
+
htmlView->setView (kwqHTMLView);
htmlView->resize(800, 800);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list