Changeset 84201 in webkit


Ignore:
Timestamp:
Apr 18, 2011 4:06:47 PM (13 years ago)
Author:
andreas.kling@nokia.com
Message:

2011-04-18 Andreas Kling <kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Clean up tool-tip/status-bar confusion.
https://bugs.webkit.org/show_bug.cgi?id=58844

Tool-tips were incorrectly hooked up to the status bar text.
Chrome::setStatusbarText() now correctly causes the QWKPage::statusBarMessage() signal.

New API:

  • QWKPage::toolTipChanged(const QString& toolTip) [signal]

QGraphicsWKView will automatically listen for this and set its own toolTip().

  • UIProcess/API/qt/ClientImpl.cpp: (qt_wk_setStatusText):
  • UIProcess/API/qt/ClientImpl.h:
  • UIProcess/API/qt/qgraphicswkview.cpp: (QGraphicsWKView::QGraphicsWKView): (QGraphicsWKViewPrivate::onToolTipChanged):
  • UIProcess/API/qt/qgraphicswkview.h:
  • UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::toolTipChanged): (QWKPage::QWKPage):
  • UIProcess/API/qt/qwkpage.h:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r84193 r84201  
     12011-04-18  Andreas Kling  <kling@webkit.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt][WK2] Clean up tool-tip/status-bar confusion.
     6        https://bugs.webkit.org/show_bug.cgi?id=58844
     7
     8        Tool-tips were incorrectly hooked up to the status bar text.
     9        Chrome::setStatusbarText() now correctly causes the QWKPage::statusBarMessage() signal.
     10
     11        New API:
     12        - QWKPage::toolTipChanged(const QString& toolTip) [signal]
     13
     14        QGraphicsWKView will automatically listen for this and set its own toolTip().
     15
     16        * UIProcess/API/qt/ClientImpl.cpp:
     17        (qt_wk_setStatusText):
     18        * UIProcess/API/qt/ClientImpl.h:
     19        * UIProcess/API/qt/qgraphicswkview.cpp:
     20        (QGraphicsWKView::QGraphicsWKView):
     21        (QGraphicsWKViewPrivate::onToolTipChanged):
     22        * UIProcess/API/qt/qgraphicswkview.h:
     23        * UIProcess/API/qt/qwkpage.cpp:
     24        (QWKPagePrivate::toolTipChanged):
     25        (QWKPage::QWKPage):
     26        * UIProcess/API/qt/qwkpage.h:
     27
    1282011-04-18  Maciej Stachowiak  <mjs@apple.com>
    229
  • trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp

    r84064 r84201  
    174174{
    175175}
     176
     177void qt_wk_setStatusText(WKPageRef page, WKStringRef text, const void *clientInfo)
     178{
     179    QString qText = WKStringCopyQString(text);
     180    emit toQWKPage(clientInfo)->statusBarMessage(qText);
     181}
  • trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.h

    r84064 r84201  
    5151void qt_wk_takeFocus(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
    5252void qt_wk_runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo);
     53void qt_wk_setStatusText(WKPageRef page, WKStringRef text, const void *clientInfo);
    5354
    5455#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp

    r79832 r84201  
    5151    WKPageRef pageRef() const { return page->pageRef(); }
    5252
     53    void onToolTipChanged(const QString&);
    5354    void onScaleChanged();
    5455    void commitScale();
     
    8586    connect(d->page, SIGNAL(focusNextPrevChild(bool)), this, SLOT(focusNextPrevChildCallback(bool)));
    8687    connect(d->page, SIGNAL(showContextMenu(QSharedPointer<QMenu>)), this, SLOT(showContextMenu(QSharedPointer<QMenu>)));
     88    connect(d->page, SIGNAL(toolTipChanged(QString)), this, SLOT(onToolTipChanged(QString)));
    8789}
    8890
     
    425427}
    426428
     429void QGraphicsWKViewPrivate::onToolTipChanged(const QString& toolTip)
     430{
     431    q->setToolTip(toolTip);
     432}
     433
    427434void QGraphicsWKViewPrivate::commitScale()
    428435{
  • trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h

    r79832 r84201  
    9191
    9292private:
    93     Q_PRIVATE_SLOT(d, void onScaleChanged());
     93    Q_PRIVATE_SLOT(d, void onScaleChanged())
     94    Q_PRIVATE_SLOT(d, void onToolTipChanged(const QString&))
    9495
    9596    QGraphicsWKViewPrivate* d;
  • trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r84064 r84201  
    203203void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip)
    204204{
    205     emit q->statusBarMessage(QString(newTooltip));
     205    emit q->toolTipChanged(QString(newTooltip));
    206206}
    207207
     
    465465        0,  /* runJavaScriptConfirm */
    466466        0,  /* runJavaScriptPrompt */
    467         0,  /* setStatusText */
     467        qt_wk_setStatusText,
    468468        0,  /* mouseDidMoveOverElement */
    469469        0,  /* missingPluginButtonClicked */
  • trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.h

    r83982 r84201  
    123123public:
    124124    Q_SIGNAL void statusBarMessage(const QString&);
     125    Q_SIGNAL void toolTipChanged(const QString&);
    125126    Q_SIGNAL void titleChanged(const QString&);
    126127    Q_SIGNAL void loadStarted();
Note: See TracChangeset for help on using the changeset viewer.