Changeset 23528 in webkit

Timestamp:

Jun 14, 2007 10:13:54 AM (17 years ago)

Author:

staikos

Message:

Implement the javascript dialogs and file chooser dialog, along with some
cleanups.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/FileChooserQt.cpp (modified) (2 diffs)
• WebKitQt/Api/qwebpage.cpp (modified) (4 diffs)
• WebKitQt/Api/qwebpage.h (modified) (4 diffs)
• WebKitQt/ChangeLog (modified) (1 diff)
• WebKitQt/WebCoreSupport/ChromeClientQt.cpp (modified) (3 diffs)
• WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)
• WebKitQt/WebCoreSupport/FrameLoaderClientQt.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-14  George Staikos  <staikos@kde.org>
+
+        Reviewed by Lars.
+
+        Implement the file chooser for Qt.
+
+        * platform/qt/FileChooserQt.cpp:
+        (WebCore::FileChooser::openFileChooser):
+        (WebCore::FileChooser::basenameForWidth):
+
 2007-06-14  George Staikos  <staikos@kde.org>
 

trunk/WebCore/platform/qt/FileChooserQt.cpp

@@ -22 +22 @@
 #include "FileChooser.h"
 
+#include "Document.h"
+#include "Frame.h"
+#include "FrameLoaderClientQt.h"
 #include "Icon.h"
-#include "NotImplemented.h"
+#include "Page.h"
+
+#include <QFontMetrics>
 
 namespace WebCore {
@@ -38 +43 @@
 }
 
-void FileChooser::openFileChooser(Document*)
+void FileChooser::openFileChooser(Document* doc)
 {
-    notImplemented();
+    Page *page = doc->page();
+    Frame *frame = doc->frame();
+    if (!page || !frame)
+        return;
+
+    FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(frame->loader()->client());
+    if (!fl)
+        return;
+
+    QString f = fl->chooseFile(m_filename);
+    if (!f.isEmpty())
+        chooseFile(f);
 }
 
-String FileChooser::basenameForWidth(const Font&, int width) const
+String FileChooser::basenameForWidth(const Font& f, int width) const
 {
-    notImplemented();
-    return String();
+    QFontMetrics fm((QFont)f);
+    return fm.elidedText(m_filename, Qt::ElideLeft, width);
 }
 

trunk/WebKitQt/Api/qwebpage.cpp

@@ -49 +49 @@
 #include <QDragMoveEvent>
 #include <QDropEvent>
+#include <QFileDialog>
+#include <QHttpRequestHeader>
+#include <QInputDialog>
+#include <QMessageBox>
 #include <QUndoStack>
 #include <QUrl>
 #include <QVBoxLayout>
-#include <QHttpRequestHeader>
 
 using namespace WebCore;
@@ -59 +62 @@
     : q(qq), modified(false)
 {
+    q->setFocusPolicy(Qt::ClickFocus);
     chromeClient = new ChromeClientQt(q);
     contextMenuClient = new ContextMenuClientQt();
@@ -217 +221 @@
 }
 
-void QWebPage::statusTextChanged(const QString& text)
-{
-}
-
-void QWebPage::runJavaScriptAlert(QWebFrame *frame, const QString& msg)
-{
+void QWebPage::javaScriptAlert(QWebFrame *frame, const QString& msg)
+{
+    QMessageBox::information(frame, title(), msg, QMessageBox::Ok);
+}
+
+bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
+{
+    return 0 == QMessageBox::information(frame, title(), msg, QMessageBox::Yes, QMessageBox::No);
+}
+
+bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result)
+{
+    bool ok = false;
+    QString x = QInputDialog::getText(frame, title(), msg, QLineEdit::Normal, defaultValue, &ok);
+    if (ok && result) {
+        *result = x;
+    }
+    return ok;
 }
 
@@ -407 +423 @@
     return settings;
 }
+
+QString QWebPage::chooseFile(QWebFrame *parentFrame, const QString& oldFile)
+{
+    return QFileDialog::getOpenFileName(parentFrame, QString::null, oldFile);
+}
+

trunk/WebKitQt/Api/qwebpage.h

@@ -61 +61 @@
     ~QWebPage();
 
-
     void open(const QUrl &url);
     void open(const QWebNetworkRequest &request);
@@ -80 +79 @@
     bool isModified() const;
 
-    virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
-
-    virtual void statusTextChanged(const QString& text);
-
-    virtual void runJavaScriptAlert(QWebFrame *frame, const QString& msg);
-
     QUndoStack *undoStack();
     
-    virtual void dragEnterEvent(QDragEnterEvent *);
-    virtual void dragLeaveEvent(QDragLeaveEvent *);
-    virtual void dragMoveEvent(QDragMoveEvent *);
-    virtual void dropEvent(QDropEvent *);
-
     void setNetworkInterface(QWebNetworkInterface *interface);
     QWebNetworkInterface *networkInterface() const;
@@ -138 +126 @@
      */
     void hoveringOverLink(const QString &link, const QString &title);
+    /**
+     * Signal is emitted when the statusbar text is changed by the page.
+     */
+    void statusBarTextChanged(const QString& text);
 
 protected:
@@ -144 +136 @@
 
     virtual NavigationRequestResponse navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request);
+    virtual QString chooseFile(QWebFrame *frame, const QString& oldFile);
+    virtual void javaScriptAlert(QWebFrame *frame, const QString& msg);
+    virtual bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
+    virtual bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
+    virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
+
+    virtual void dragEnterEvent(QDragEnterEvent *);
+    virtual void dragLeaveEvent(QDragLeaveEvent *);
+    virtual void dragMoveEvent(QDragMoveEvent *);
+    virtual void dropEvent(QDropEvent *);
 
 private:

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-06-14  George Staikos  <staikos@kde.org>
+
+        Reviewed by Lars.
+
+        Implement all of the Javascript dialogs and file chooser.
+        Also makes the statusbar virtual into a signal and shuffles some
+        virtuals around a bit.  The helper in FrameLoaderClientQt may go away
+        shortly.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+        (QWebPage::javaScriptAlert):
+        (QWebPage::javaScriptConfirm):
+        (QWebPage::javaScriptPrompt):
+        (QWebPage::chooseFile):
+        * Api/qwebpage.h:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::canRunBeforeUnloadConfirmPanel):
+        (WebCore::ChromeClientQt::runBeforeUnloadConfirmPanel):
+        (WebCore::ChromeClientQt::runJavaScriptAlert):
+        (WebCore::ChromeClientQt::runJavaScriptConfirm):
+        (WebCore::ChromeClientQt::runJavaScriptPrompt):
+        (WebCore::ChromeClientQt::setStatusbarText):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::chooseFile):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
 2007-06-14  Simon Hausmann  <hausmann@kde.org>
 

trunk/WebKitQt/WebCoreSupport/ChromeClientQt.cpp

@@ -30 +30 @@
 
 #include "Frame.h"
+#include "FrameLoadRequest.h"
+#include "FrameLoader.h"
+#include "FrameLoaderClientQt.h"
 #include "FrameView.h"
-#include "FrameLoadRequest.h"
 #include "NotImplemented.h"
 
@@ -223 +225 @@
 bool ChromeClientQt::canRunBeforeUnloadConfirmPanel()
 {
-    notImplemented();
-    return false;
+    return true;
 }
 
 bool ChromeClientQt::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
 {
-    notImplemented();
-    return false;
+    return runJavaScriptConfirm(frame, message);
 }
 
@@ -238 +238 @@
 }
 
-void ChromeClientQt::runJavaScriptAlert(Frame*, const String& msg)
+void ChromeClientQt::runJavaScriptAlert(Frame* f, const String& msg)
 {
     QString x = msg;
-    m_webPage->runJavaScriptAlert(0, x);
-}
-
-bool ChromeClientQt::runJavaScriptConfirm(Frame*, const String&)
-{
-    notImplemented();
-    return false;
-}
-
-bool ChromeClientQt::runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result)
-{
-    notImplemented();
-    return false;
-}
-
-void ChromeClientQt::setStatusbarText(const String&)
-{
-    notImplemented();
+    FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());
+    m_webPage->javaScriptAlert(fl->webFrame(), x);
+}
+
+bool ChromeClientQt::runJavaScriptConfirm(Frame* f, const String& msg)
+{
+    QString x = msg;
+    FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());
+    return m_webPage->javaScriptConfirm(fl->webFrame(), x);
+}
+
+bool ChromeClientQt::runJavaScriptPrompt(Frame* f, const String& message, const String& defaultValue, String& result)
+{
+    QString x = result;
+    FrameLoaderClientQt *fl = static_cast<FrameLoaderClientQt*>(f->loader()->client());
+    bool rc = m_webPage->javaScriptPrompt(fl->webFrame(), (QString)message, (QString)defaultValue, &x);
+    result = x;
+    return rc;
+}
+
+void ChromeClientQt::setStatusbarText(const String& msg)
+{
+    QString x = msg;
+    emit m_webPage->statusBarTextChanged(x);
 }
 

trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -949 +949 @@
 }
 
-}
+QString FrameLoaderClientQt::chooseFile(const QString& oldFile)
+{
+    return webFrame()->page()->chooseFile(webFrame(), oldFile);
+}
+
+}

trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.h

@@ -223 +223 @@
         virtual void windowObjectCleared() const;
 
+        QString chooseFile(const QString& oldFile);
+
     private:
         Frame *m_frame;