[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a07129ff9a0574d9ef5cc0709f8938b52c0dae3f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 3 08:43:50 2002 +0000
top level:
* Site/static/javascript/javascript_window_status.html:
WebCore:
WebKit part of fix for:
Radar 2943465 - JavaScript window.defaultStatus property not implemented
Radar 2943464 - JavaScript window.status property is not implemented
Radar 2926213 - show url of moused-over link in status bar
Also fixed:
Radar 2980091 - KHTMLPart::findFrame() and KHTML::frameExists()
should search all frames, not just child frames
* khtml/khtml_part.cpp:
(KHTMLPart::overURL): Unifdef most of this, but adjust the wording.
(KHTMLPart::setStatusBarText): Implement by calling KWQKHTMLPartImpl.
* khtml/khtml_part.h:
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPartImpl::frameExists): Search all frames, not just child frames.
(KWQKHTMLPartImpl::findFrame): Search all frames, not just child frames.
(KWQKHTMLPartImpl::setStatusBarText): Implemented by calling WebCoreBridge.
* kwq/KWQKHTMLPartImpl.h:
* kwq/WebCoreBridge.h: Declare new setStatusText method
* kwq/kparts/part.h: Remove setStatusBarText method.
WebKit:
WebCore part of fix for:
Radar 2943465 - JavaScript window.defaultStatus property not implemented
Radar 2943464 - JavaScript window.status property is not implemented
Radar 2926213 - show url of moused-over link in status bar
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
(-[IFWebCoreBridge setStatusText:]): Connect bridge status text
setting to window context.
* WebView.subproj/IFWebController.h:
WebBrowser:
Fixed Radar 2980081 - Status bar should center-truncate status messages
* BrowserWindow.h:
* BrowserWindow.m:
(-[BrowserWindow windowDidResize:]):
(-[BrowserWindow dealloc]):
(-[BrowserWindow setStatus:]):
Remove dataSource argument:
* WebController.m:
(-[BrowserWebController setStatusText:]):
(-[BrowserWebController statusText]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1485105..907b114 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,28 @@
+2002-07-03 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit part of fix for:
+
+ Radar 2943465 - JavaScript window.defaultStatus property not implemented
+ Radar 2943464 - JavaScript window.status property is not implemented
+ Radar 2926213 - show url of moused-over link in status bar
+
+ Also fixed:
+
+ Radar 2980091 - KHTMLPart::findFrame() and KHTML::frameExists()
+ should search all frames, not just child frames
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL): Unifdef most of this, but adjust the wording.
+ (KHTMLPart::setStatusBarText): Implement by calling KWQKHTMLPartImpl.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::frameExists): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::findFrame): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::setStatusBarText): Implemented by calling WebCoreBridge.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/WebCoreBridge.h: Declare new setStatusText method
+ * kwq/kparts/part.h: Remove setStatusBarText method.
+
2002-07-02 Darin Adler <darin at apple.com>
- fixed 2978806 -- Crash going to ebay home page
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1485105..907b114 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,28 @@
+2002-07-03 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit part of fix for:
+
+ Radar 2943465 - JavaScript window.defaultStatus property not implemented
+ Radar 2943464 - JavaScript window.status property is not implemented
+ Radar 2926213 - show url of moused-over link in status bar
+
+ Also fixed:
+
+ Radar 2980091 - KHTMLPart::findFrame() and KHTML::frameExists()
+ should search all frames, not just child frames
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL): Unifdef most of this, but adjust the wording.
+ (KHTMLPart::setStatusBarText): Implement by calling KWQKHTMLPartImpl.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::frameExists): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::findFrame): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::setStatusBarText): Implemented by calling WebCoreBridge.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/WebCoreBridge.h: Declare new setStatusText method
+ * kwq/kparts/part.h: Remove setStatusBarText method.
+
2002-07-02 Darin Adler <darin at apple.com>
- fixed 2978806 -- Crash going to ebay home page
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1485105..907b114 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,28 @@
+2002-07-03 Maciej Stachowiak <mjs at apple.com>
+
+ WebKit part of fix for:
+
+ Radar 2943465 - JavaScript window.defaultStatus property not implemented
+ Radar 2943464 - JavaScript window.status property is not implemented
+ Radar 2926213 - show url of moused-over link in status bar
+
+ Also fixed:
+
+ Radar 2980091 - KHTMLPart::findFrame() and KHTML::frameExists()
+ should search all frames, not just child frames
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL): Unifdef most of this, but adjust the wording.
+ (KHTMLPart::setStatusBarText): Implement by calling KWQKHTMLPartImpl.
+ * khtml/khtml_part.h:
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::frameExists): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::findFrame): Search all frames, not just child frames.
+ (KWQKHTMLPartImpl::setStatusBarText): Implemented by calling WebCoreBridge.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/WebCoreBridge.h: Declare new setStatusText method
+ * kwq/kparts/part.h: Remove setStatusBarText method.
+
2002-07-02 Darin Adler <darin at apple.com>
- fixed 2978806 -- Crash going to ebay home page
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index b62b240..0228320 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2136,6 +2136,7 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
d->m_kjsStatusBarText = QString::null;
return;
}
+#endif
emit onURL( url );
@@ -2147,16 +2148,24 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
if (url.find( QString::fromLatin1( "javascript:" ),0, false ) != -1 )
{
+#ifdef APPLE_CHANGES
+ // FIXME: how to localize?
+ emit setStatusBarText( "Run script " + url.mid( url.find( "javascript:", 0, false ) + strlen("javascript:") ) );
+#else
emit setStatusBarText( url.mid( url.find( "javascript:", 0, false ) ) );
+#endif
return;
}
KURL u = completeURL(url);
+#ifndef APPLE_CHANGES
// special case for <a href="">
if ( url.isEmpty() )
u.setFileName( url );
+#endif
+#ifndef APPLE_CHANGES
QString com;
KMimeType::Ptr typ = KMimeType::findByURL( u );
@@ -2169,7 +2178,9 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
emit setStatusBarText(u.prettyURL());
return;
}
+#endif
+#ifndef APPLE_CHANGES
if ( u.isLocalFile() )
{
// TODO : use KIO::stat() and create a KFileItem out of its result,
@@ -2234,22 +2245,45 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
}
else
{
+#endif
QString extra;
if (target == QString::fromLatin1("_blank"))
{
+#ifdef APPLE_CHANGES
+ extra = " in new window";
+#else
extra = i18n(" (In new window)");
+#endif
}
else if (!target.isEmpty() &&
(target != QString::fromLatin1("_top")) &&
(target != QString::fromLatin1("_self")) &&
(target != QString::fromLatin1("_parent")))
{
+#ifdef APPLE_CHANGES
+ // FIXME: how to localize
+ if (frameExists(target)) {
+ // FIXME: It would be good if we could tell the difference between
+ // an existing frame in the same window vs. one in another window
+ // so we could say "in other window" in that case.
+ extra = " in other frame";
+ } else {
+ extra = " in new window";
+ }
+#else
extra = i18n(" (In other frame)");
+#endif
}
if (u.protocol() == QString::fromLatin1("mailto")) {
QString mailtoMsg/* = QString::fromLatin1("<img src=%1>").arg(locate("icon", QString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/;
+#ifdef APPLE_CHANGES
+ // FIXME: how to localize this?
+ // FIXME: addressbook integration? probably not worth it...
+ mailtoMsg += i18n("Send email to ") + KURL::decode_string(u.path());
+#else
mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path());
+#endif
QStringList queries = QStringList::split('&', u.query().mid(1));
for (QStringList::Iterator it = queries.begin(); it != queries.end(); ++it)
if ((*it).startsWith(QString::fromLatin1("subject=")))
@@ -2284,9 +2318,19 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
}
}
#endif
+#ifdef APPLE_CHANGES
+ // FIXME: needs localization
+ if (extra.isEmpty()) {
+ emit setStatusBarText("Link to " + u.prettyURL() + extra);
+ } else {
+ emit setStatusBarText("Open " + u.prettyURL() + extra);
+ }
+#else
emit setStatusBarText(u.prettyURL() + extra);
+#endif
+#ifndef APPLE_CHANGES
}
-#endif // APPLE_CHANGES
+#endif
}
void KHTMLPart::urlSelected( const QString &url, int button, int state, const QString &_target,
@@ -4634,6 +4678,12 @@ void KHTMLPart::setTitle(const DOMString &title)
impl->setTitle(title);
}
+void KHTMLPart::setStatusBarText(const QString &status)
+{
+ impl->setStatusBarText(status);
+}
+
+
void KHTMLPart::detachView()
{
impl->setView(0);
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 4276229..59116d6 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1088,8 +1088,9 @@ private:
#ifdef APPLE_CHANGES
public:
void setTitle(const DOM::DOMString &);
- void detachView();
-
+ void detachView();
+ void setStatusBarText(const QString &);
+
KWQKHTMLPartImpl *impl;
friend class KWQKHTMLPartImpl;
#endif
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 489eb68..2ea2467 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -60,7 +60,8 @@ public:
void setBaseURL(const KURL &);
void setTitle(const DOM::DOMString &);
-
+ void setStatusBarText(const QString &status);
+
QString documentSource() const;
IFWebDataSource *getDataSource();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 340940e..b8b4a72 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -587,12 +587,12 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
{
- return [bridge childFrameNamed:frameName.getNSString()];
+ return [bridge frameNamed:frameName.getNSString()] != nil;
}
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge childFrameNamed:frameName.getNSString()] bridge] part];
+ return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
@@ -635,6 +635,12 @@ void KWQKHTMLPartImpl::setTitle(const DOMString &title)
[bridge setTitle:title.string().getNSString()];
}
+void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
+{
+ [bridge setStatusText:status.getNSString()];
+}
+
+
KHTMLPart *KWQKHTMLPartImpl::parentPart()
{
return [[bridge parent] part];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 489eb68..2ea2467 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -60,7 +60,8 @@ public:
void setBaseURL(const KURL &);
void setTitle(const DOM::DOMString &);
-
+ void setStatusBarText(const QString &status);
+
QString documentSource() const;
IFWebDataSource *getDataSource();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 340940e..b8b4a72 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -587,12 +587,12 @@ void KWQKHTMLPartImpl::submitForm( const char *action, const QString &url, const
bool KWQKHTMLPartImpl::frameExists( const QString &frameName )
{
- return [bridge childFrameNamed:frameName.getNSString()];
+ return [bridge frameNamed:frameName.getNSString()] != nil;
}
KHTMLPart *KWQKHTMLPartImpl::findFrame(const QString &frameName)
{
- return [[[bridge childFrameNamed:frameName.getNSString()] bridge] part];
+ return [[[bridge frameNamed:frameName.getNSString()] bridge] part];
}
QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
@@ -635,6 +635,12 @@ void KWQKHTMLPartImpl::setTitle(const DOMString &title)
[bridge setTitle:title.string().getNSString()];
}
+void KWQKHTMLPartImpl::setStatusBarText(const QString &status)
+{
+ [bridge setStatusText:status.getNSString()];
+}
+
+
KHTMLPart *KWQKHTMLPartImpl::parentPart()
{
return [[bridge parent] part];
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index 811b6cd..d79e0c9 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -70,7 +70,6 @@ public:
void setXMLFile(const char *) { }
QObject *parent() const { return 0; }
void setInstance(KInstance *, bool) { }
- void setStatusBarText(const QString &) { }
};
class GUIActivateEvent { };
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 41fe9f4..8fed9de 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -103,6 +103,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (id <WebCoreFrame>)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
- (void)setTitle:(NSString *)title;
+- (void)setStatusText:(NSString *)status;
- (BOOL)createChildFrameNamed:(NSString *)frameName
withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)renderPart
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index 811b6cd..d79e0c9 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -70,7 +70,6 @@ public:
void setXMLFile(const char *) { }
QObject *parent() const { return 0; }
void setInstance(KInstance *, bool) { }
- void setStatusBarText(const QString &) { }
};
class GUIActivateEvent { };
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 549f8e1..d6c6f1d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-07-03 Maciej Stachowiak <mjs at apple.com>
+
+ WebCore part of fix for:
+
+ Radar 2943465 - JavaScript window.defaultStatus property not implemented
+ Radar 2943464 - JavaScript window.status property is not implemented
+ Radar 2926213 - show url of moused-over link in status bar
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge setStatusText:]): Connect bridge status text
+ setting to window context.
+ * WebView.subproj/IFWebController.h:
+
2002-07-02 Chris Blumenberg <cblu at apple.com>
Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 549f8e1..d6c6f1d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-07-03 Maciej Stachowiak <mjs at apple.com>
+
+ WebCore part of fix for:
+
+ Radar 2943465 - JavaScript window.defaultStatus property not implemented
+ Radar 2943464 - JavaScript window.status property is not implemented
+ Radar 2926213 - show url of moused-over link in status bar
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ (-[IFWebCoreBridge setStatusText:]): Connect bridge status text
+ setting to window context.
+ * WebView.subproj/IFWebController.h:
+
2002-07-02 Chris Blumenberg <cblu at apple.com>
Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index 91b96a9..47f7da5 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -146,6 +146,12 @@
[dataSource _setTitle:title];
}
+- (void)setStatusText:(NSString *)status
+{
+ WEBKIT_ASSERT(dataSource);
+ [[[dataSource controller] windowContext] setStatusText:status];
+}
+
- (id <WebCoreFrame>)mainFrame
{
return [[[dataSource controller] mainFrame] _bridgeFrame];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 91b96a9..47f7da5 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -146,6 +146,12 @@
[dataSource _setTitle:title];
}
+- (void)setStatusText:(NSString *)status
+{
+ WEBKIT_ASSERT(dataSource);
+ [[[dataSource controller] windowContext] setStatusText:status];
+}
+
- (id <WebCoreFrame>)mainFrame
{
return [[[dataSource controller] mainFrame] _bridgeFrame];
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 55832ee..2c5f675 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -80,8 +80,8 @@
- (IFWebController *)openNewWindowWithURL:(NSURL *)url;
-- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text;
+- (NSString *)statusText;
- (BOOL)areToolbarsVisible;
- (void)setToolbarsVisible:(BOOL)visible;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 55832ee..2c5f675 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -80,8 +80,8 @@
- (IFWebController *)openNewWindowWithURL:(NSURL *)url;
-- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text;
+- (NSString *)statusText;
- (BOOL)areToolbarsVisible;
- (void)setToolbarsVisible:(BOOL)visible;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 55832ee..2c5f675 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -80,8 +80,8 @@
- (IFWebController *)openNewWindowWithURL:(NSURL *)url;
-- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text;
+- (NSString *)statusText;
- (BOOL)areToolbarsVisible;
- (void)setToolbarsVisible:(BOOL)visible;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list