Commit 55e153de authored by Gabriel de Dietrich's avatar Gabriel de Dietrich Committed by The Qt Project
Browse files

MenuItem: Added 'exclusiveGroup' property


Change-Id: Ic4ce7ef203ae4beef1ea536ff3961360345de169
Reviewed-by: default avatarJ-P Nurmi <jpnurmi@digia.com>
parent bf2d0527
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1
No related merge requests found
Showing with 18 additions and 0 deletions
...@@ -217,6 +217,7 @@ void QtMenuItem::bindToAction(QtAction *action) ...@@ -217,6 +217,7 @@ void QtMenuItem::bindToAction(QtAction *action)
connect(m_action, SIGNAL(triggered()), this, SIGNAL(triggered())); connect(m_action, SIGNAL(triggered()), this, SIGNAL(triggered()));
connect(m_action, SIGNAL(toggled(bool)), this, SLOT(updateChecked())); connect(m_action, SIGNAL(toggled(bool)), this, SLOT(updateChecked()));
connect(m_action, SIGNAL(exclusiveGroupChanged()), this, SIGNAL(exclusiveGroupChanged()));
connect(m_action, SIGNAL(enabledChanged()), this, SLOT(updateEnabled())); connect(m_action, SIGNAL(enabledChanged()), this, SLOT(updateEnabled()));
connect(m_action, SIGNAL(textChanged()), this, SLOT(updateText())); connect(m_action, SIGNAL(textChanged()), this, SLOT(updateText()));
connect(m_action, SIGNAL(shortcutChanged(QString)), this, SLOT(updateShortcut())); connect(m_action, SIGNAL(shortcutChanged(QString)), this, SLOT(updateShortcut()));
...@@ -255,6 +256,7 @@ void QtMenuItem::unbindFromAction(QObject *o) ...@@ -255,6 +256,7 @@ void QtMenuItem::unbindFromAction(QObject *o)
disconnect(action, SIGNAL(triggered()), this, SIGNAL(triggered())); disconnect(action, SIGNAL(triggered()), this, SIGNAL(triggered()));
disconnect(action, SIGNAL(toggled(bool)), this, SLOT(updateChecked())); disconnect(action, SIGNAL(toggled(bool)), this, SLOT(updateChecked()));
disconnect(action, SIGNAL(exclusiveGroupChanged()), this, SIGNAL(exclusiveGroupChanged()));
disconnect(action, SIGNAL(enabledChanged()), this, SLOT(updateEnabled())); disconnect(action, SIGNAL(enabledChanged()), this, SLOT(updateEnabled()));
disconnect(action, SIGNAL(textChanged()), this, SLOT(updateText())); disconnect(action, SIGNAL(textChanged()), this, SLOT(updateText()));
disconnect(action, SIGNAL(shortcutChanged(QString)), this, SLOT(updateShortcut())); disconnect(action, SIGNAL(shortcutChanged(QString)), this, SLOT(updateShortcut()));
...@@ -359,6 +361,16 @@ void QtMenuItem::updateChecked() ...@@ -359,6 +361,16 @@ void QtMenuItem::updateChecked()
emit toggled(checked); emit toggled(checked);
} }
QtExclusiveGroup *QtMenuItem::exclusiveGroup() const
{
return m_action ? m_action->exclusiveGroup() : 0;
}
void QtMenuItem::setExclusiveGroup(QtExclusiveGroup *eg)
{
action()->setExclusiveGroup(eg);
}
bool QtMenuItem::enabled() const bool QtMenuItem::enabled() const
{ {
return m_action ? m_action->isEnabled() : false; return m_action ? m_action->isEnabled() : false;
......
...@@ -52,6 +52,7 @@ class QUrl; ...@@ -52,6 +52,7 @@ class QUrl;
class QPlatformMenuItem; class QPlatformMenuItem;
class QQuickItem; class QQuickItem;
class QtAction; class QtAction;
class QtExclusiveGroup;
class QtMenu; class QtMenu;
class QtMenuBase: public QObject class QtMenuBase: public QObject
...@@ -96,6 +97,7 @@ class QtMenuItem: public QtMenuBase ...@@ -96,6 +97,7 @@ class QtMenuItem: public QtMenuBase
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged) Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged)
Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged) Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged)
Q_PROPERTY(QtExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged)
Q_PROPERTY(QtAction *action READ action WRITE setAction NOTIFY actionChanged) Q_PROPERTY(QtAction *action READ action WRITE setAction NOTIFY actionChanged)
Q_PROPERTY(QtMenu *parentMenu READ parentMenu) Q_PROPERTY(QtMenu *parentMenu READ parentMenu)
...@@ -121,6 +123,9 @@ public: ...@@ -121,6 +123,9 @@ public:
bool checked() const; bool checked() const;
void setChecked(bool checked); void setChecked(bool checked);
QtExclusiveGroup *exclusiveGroup() const;
void setExclusiveGroup(QtExclusiveGroup *);
bool enabled() const; bool enabled() const;
void setEnabled(bool enabled); void setEnabled(bool enabled);
...@@ -134,6 +139,7 @@ Q_SIGNALS: ...@@ -134,6 +139,7 @@ Q_SIGNALS:
void textChanged(); void textChanged();
void shortcutChanged(); void shortcutChanged();
void checkableChanged(); void checkableChanged();
void exclusiveGroupChanged();
void toggled(bool); void toggled(bool);
void enabledChanged(); void enabledChanged();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment