From 1e89fa4226be870d97d3b21c6c7087886c81bbc5 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Tue, 11 Sep 2018 15:48:43 +0200 Subject: Clean up WebEngineAction API - Rename iconText to iconName - Remove unused QQuickWebEngineAction::toggled signal - Remove argument of QQuickWebEngineAction::enabledChanged signal Change-Id: I37172c096003eea58e567753265abd91679dacf1 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebengineaction.cpp | 19 ++++++++++--------- src/webengine/api/qquickwebengineaction_p.h | 9 ++++----- src/webengine/api/qquickwebengineaction_p_p.h | 4 ++-- src/webengine/api/qquickwebengineview.cpp | 14 +++++++------- src/webengine/plugin/plugins.qmltypes | 7 +------ src/webengine/ui_delegates_manager.cpp | 2 +- 6 files changed, 25 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/webengine/api/qquickwebengineaction.cpp b/src/webengine/api/qquickwebengineaction.cpp index a0be20b54..16eef04d3 100644 --- a/src/webengine/api/qquickwebengineaction.cpp +++ b/src/webengine/api/qquickwebengineaction.cpp @@ -68,10 +68,10 @@ QT_BEGIN_NAMESPACE \endcode */ -QQuickWebEngineActionPrivate::QQuickWebEngineActionPrivate(const QVariant &data, const QString &text, const QString &iconText, bool enabled) +QQuickWebEngineActionPrivate::QQuickWebEngineActionPrivate(const QVariant &data, const QString &text, const QString &iconName, bool enabled) : m_data(data) , m_text(text) - , m_iconText(iconText) + , m_iconName(iconName) , m_enabled(enabled) { } @@ -86,7 +86,7 @@ void QQuickWebEngineActionPrivate::setEnabled(bool enabled) if (m_enabled == enabled) return; m_enabled = enabled; - emit q->enabledChanged(enabled); + emit q->enabledChanged(); } QVariant QQuickWebEngineActionPrivate::data() const @@ -102,9 +102,9 @@ void QQuickWebEngineActionPrivate::trigger() } } -QQuickWebEngineAction::QQuickWebEngineAction(const QVariant &data, const QString &text, const QString &iconText, bool enabled, QObject *parent) +QQuickWebEngineAction::QQuickWebEngineAction(const QVariant &data, const QString &text, const QString &iconName, bool enabled, QObject *parent) : QObject(parent) - , d_ptr(new QQuickWebEngineActionPrivate(data, text, iconText, enabled)) + , d_ptr(new QQuickWebEngineActionPrivate(data, text, iconName, enabled)) { d_ptr->q_ptr = this; } @@ -132,14 +132,15 @@ QString QQuickWebEngineAction::text() const } /*! - \qmlproperty string WebEngineAction::iconText + \qmlproperty string WebEngineAction::iconName - This property holds the action's descriptive icon text. + This property holds the name of the icon for the action. This name + can be used to pick the icon from a theme. */ -QString QQuickWebEngineAction::iconText() const +QString QQuickWebEngineAction::iconName() const { Q_D(const QQuickWebEngineAction); - return d->m_iconText; + return d->m_iconName; } /*! diff --git a/src/webengine/api/qquickwebengineaction_p.h b/src/webengine/api/qquickwebengineaction_p.h index 5296f9dd6..8f5f3386c 100644 --- a/src/webengine/api/qquickwebengineaction_p.h +++ b/src/webengine/api/qquickwebengineaction_p.h @@ -69,25 +69,24 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineAction : public QObject { Q_OBJECT Q_PROPERTY(QString text READ text CONSTANT FINAL) - Q_PROPERTY(QString iconText READ iconText CONSTANT FINAL) + Q_PROPERTY(QString iconName READ iconName CONSTANT FINAL) Q_PROPERTY(bool enabled READ isEnabled NOTIFY enabledChanged FINAL) public: - QQuickWebEngineAction(const QVariant &data, const QString &text, const QString &iconText, bool enabled, QObject *parent); + QQuickWebEngineAction(const QVariant &data, const QString &text, const QString &iconName, bool enabled, QObject *parent); QQuickWebEngineAction(QObject *parent); ~QQuickWebEngineAction(); QString text() const; - QString iconText() const; + QString iconName() const; bool isEnabled() const; public Q_SLOTS: Q_INVOKABLE void trigger(); Q_SIGNALS: - void toggled(); void triggered(); - void enabledChanged(const bool enabled); + void enabledChanged(); private: Q_DECLARE_PRIVATE(QQuickWebEngineAction) diff --git a/src/webengine/api/qquickwebengineaction_p_p.h b/src/webengine/api/qquickwebengineaction_p_p.h index cb1817e55..4320f73e4 100644 --- a/src/webengine/api/qquickwebengineaction_p_p.h +++ b/src/webengine/api/qquickwebengineaction_p_p.h @@ -63,7 +63,7 @@ class QQuickWebEngineActionPrivate { public: Q_DECLARE_PUBLIC(QQuickWebEngineAction) - QQuickWebEngineActionPrivate(const QVariant &data, const QString &text, const QString &iconText, bool enabled); + QQuickWebEngineActionPrivate(const QVariant &data, const QString &text, const QString &iconName, bool enabled); ~QQuickWebEngineActionPrivate(); void setEnabled(bool enabled); @@ -77,7 +77,7 @@ private: QVariant m_data; QString m_text; - QString m_iconText; + QString m_iconName; bool m_enabled; }; diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 6bf23ea7b..116f49c3c 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1768,30 +1768,30 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action) } QString text; - QString iconText; + QString iconName; switch (action) { case Back: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Back); - iconText = QStringLiteral("go-previous"); + iconName = QStringLiteral("go-previous"); break; case Forward: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Forward); - iconText = QStringLiteral("go-next"); + iconName = QStringLiteral("go-next"); break; case Stop: text = tr("Stop"); break; case Reload: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Reload); - iconText = QStringLiteral("view-refresh"); + iconName = QStringLiteral("view-refresh"); break; case ReloadAndBypassCache: text = tr("Reload and Bypass Cache"); break; case Cut: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Cut); - iconText = QStringLiteral("Cut"); + iconName = QStringLiteral("Cut"); break; case Copy: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Copy); @@ -1870,7 +1870,7 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action) break; case ViewSource: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::ViewSource); - iconText = QStringLiteral("view-source"); + iconName = QStringLiteral("view-source"); break; case ToggleBold: text = tr("&Bold"); @@ -1914,7 +1914,7 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action) break; } - QQuickWebEngineAction *retVal = new QQuickWebEngineAction(action, text, iconText, false, this); + QQuickWebEngineAction *retVal = new QQuickWebEngineAction(action, text, iconName, false, this); d->actions[action] = retVal; d->updateAction(action); diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes index a17bcfbab..1f295ac57 100644 --- a/src/webengine/plugin/plugins.qmltypes +++ b/src/webengine/plugin/plugins.qmltypes @@ -15,14 +15,9 @@ Module { isCreatable: false exportMetaObjectRevisions: [0] Property { name: "text"; type: "string"; isReadonly: true } - Property { name: "iconText"; type: "string"; isReadonly: true } + Property { name: "iconName"; type: "string"; isReadonly: true } Property { name: "enabled"; type: "bool"; isReadonly: true } - Signal { name: "toggled" } Signal { name: "triggered" } - Signal { - name: "enabledChanged" - Parameter { name: "enabled"; type: "bool" } - } Method { name: "trigger" } } Component { diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index c35d26017..252bdc9b6 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -215,7 +215,7 @@ void UIDelegatesManager::addMenuItem(QQuickWebEngineAction *action, QObject *men QObject *it = menuItemComponent->beginCreate(qmlContext(m_view)); QQmlProperty(it, QStringLiteral("text")).write(action->text()); - QQmlProperty(it, QStringLiteral("iconName")).write(action->iconText()); + QQmlProperty(it, QStringLiteral("iconName")).write(action->iconName()); QQmlProperty(it, QStringLiteral("enabled")).write(action->isEnabled()); QQmlProperty(it, QStringLiteral("checkable")).write(checkable); QQmlProperty(it, QStringLiteral("checked")).write(checked); -- cgit v1.2.3