#include "Frame.h"
#include "FrameTree.h"
#include "FrameView.h"
+#include "IconDatabase.h"
#include "Page.h"
#include "ResourceRequest.h"
#include "SelectionController.h"
else return QString();
}
+QUrl QWebFrame::url() const
+{
+ return QUrl((QString)d->frame->loader()->url().string());
+}
+
+QPixmap QWebFrame::icon() const
+{
+ String url = d->frame->loader()->url().string();
+ Image* image = iconDatabase()->iconForPageURL(url, IntSize(16, 16));
+ if (!image || image->isNull()) {
+ image = iconDatabase()->defaultIcon(IntSize(16, 16));
+ }
+
+ if (!image) {
+ return QPixmap();
+ }
+
+ QPixmap *icon = image->getPixmap();
+ if (!icon) {
+ return QPixmap();
+ }
+ return *icon;
+}
+
+
QString QWebFrame::name() const
{
return d->frame->tree()->name();
void QWebFrame::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy)
{
- Q_ASSERT(ScrollbarAuto == Qt::ScrollBarAsNeeded);
- Q_ASSERT(ScrollbarAlwaysOff == Qt::ScrollBarAlwaysOff);
- Q_ASSERT(ScrollbarAlwaysOn == Qt::ScrollBarAlwaysOn);
+ Q_ASSERT((int)ScrollbarAuto == (int)Qt::ScrollBarAsNeeded);
+ Q_ASSERT((int)ScrollbarAlwaysOff == (int)Qt::ScrollBarAlwaysOff);
+ Q_ASSERT((int)ScrollbarAlwaysOn == (int)Qt::ScrollBarAlwaysOn);
d->frameView->setVScrollbarMode((ScrollbarMode)policy);
}
class QRect;
class QPoint;
class QPainter;
+class QPixmap;
class QMouseEvent;
class QWheelEvent;
class QWebNetworkRequest;
QString markup() const;
QString innerText() const;
QString renderTreeDump() const;
+
QString title() const;
+ QUrl url() const;
+ QPixmap icon() const;
+
QString name() const;
QList<QWebFrame*> childFrames() const;
void loadStarted();
void loadFinished();
+ /**
+ * Signal is emitted when the mainframe()'s initial layout is completed.
+ */
+ void initialLayoutComplete();
+
/**
* Signal is emitted when an icon ("favicon") is loaded from the site.
*/
#include "FrameLoadRequest.h"
#include "KURL.h"
#include "Image.h"
-#include "IconDatabase.h"
#include "InspectorClientQt.h"
#include "InspectorController.h"
#include "FocusController.h"
delete d;
}
-QUrl QWebPage::url() const
-{
- return QUrl((QString)mainFrame()->d->frame->loader()->url().string());
-}
-
-QString QWebPage::title() const
-{
- return mainFrame()->title();
-}
-
QWebFrame *QWebPage::mainFrame() const
{
d->createMainFrame();
void QWebPage::javaScriptAlert(QWebFrame *frame, const QString& msg)
{
//FIXME frame pos...
- QMessageBox::information(this, title(), msg, QMessageBox::Ok);
+ QMessageBox::information(this, mainFrame()->title(), msg, QMessageBox::Ok);
}
bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
{
//FIXME frame pos...
- return 0 == QMessageBox::information(this, title(), msg, QMessageBox::Yes, QMessageBox::No);
+ return 0 == QMessageBox::information(this, mainFrame()->title(), msg, QMessageBox::Yes, QMessageBox::No);
}
bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result)
//FIXME frame pos...
bool ok = false;
#ifndef QT_NO_INPUTDIALOG
- QString x = QInputDialog::getText(this, title(), msg, QLineEdit::Normal, defaultValue, &ok);
+ QString x = QInputDialog::getText(this, mainFrame()->title(), msg, QLineEdit::Normal, defaultValue, &ok);
if (ok && result) {
*result = x;
}
return QWebNetworkInterface::defaultInterface();
}
-QPixmap QWebPage::icon() const
-{
- Image* image = iconDatabase()->iconForPageURL(url().toString(), IntSize(16, 16));
- if (!image || image->isNull()) {
- image = iconDatabase()->defaultIcon(IntSize(16, 16));
- }
-
- if (!image) {
- return QPixmap();
- }
-
- QPixmap *icon = image->getPixmap();
- if (!icon) {
- return QPixmap();
- }
- return *icon;
-}
-
QWebSettings *QWebPage::settings()
{
return d->settings;
QWebSettings *settings();
- // ### move to frame
- QString title() const;
- QUrl url() const;
- QPixmap icon() const;
-
bool isModified() const;
QUndoStack *undoStack() const;
void selectionChanged();
- /**
- * Signal is emitted when the mainframe()'s initial layout is completed.
- */
- // ### move to frame
- void initialLayoutComplete();
-
// ### call addedToHistory instead, something more signal'ish
void addToHistory(const QUrl&);
QString QWebView::title() const
{
if (d->page)
- return d->page->title();
+ return d->page->mainFrame()->title();
return QString();
}
QUrl QWebView::url() const
{
if (d->page)
- return d->page->url();
+ return d->page->mainFrame()->url();
return QUrl();
}
QPixmap QWebView::icon() const
{
if (d->page)
- return d->page->icon();
+ return d->page->mainFrame()->icon();
return QPixmap();
}
+2008-01-04 Lars Knoll <lars@trolltech.com>
+
+ Reviewed by Simon.
+
+ moved title(), url(), icon() and initialLayoutComplete() from QWebPage to QWebFrame
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::url):
+ (QWebFrame::icon):
+ (QWebFrame::setVerticalScrollBarPolicy):
+ * Api/qwebframe.h:
+ * Api/qwebpage.cpp:
+ (QWebPage::javaScriptAlert):
+ (QWebPage::javaScriptPrompt):
+ (QWebPage::networkInterface):
+ * Api/qwebpage.h:
+ * Api/qwebview.cpp:
+ (QWebView::title):
+ (QWebView::url):
+ (QWebView::icon):
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+
2008-01-03 Simon Hausmann <hausmann@webkit.org>
Reviewed by Lars.
void FrameLoaderClientQt::dispatchDidFirstLayout()
{
if (m_webFrame)
- emit m_webFrame->page()->initialLayoutComplete();
+ emit m_webFrame->initialLayoutComplete();
}