feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid use of QKeySequence::isEmpty in checks in command implementations.

Browse Source 
isEmpty is the wrong thing to check when setting the default shortcut. In addition,
registering commands should not set their shortcut automatically (that
should be defined solely by the default shortcut and reading the
settings, which is done later).
This commit is contained in:
con
2010-10-08 13:18:35 +02:00
parent 6371d2835d
commit 0078bb0802
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -200,12 +200,14 @@ using namespace Core::Internal;
*/
CommandPrivate::CommandPrivate(int id)
: m_attributes(0), m_id(id)
: m_attributes(0), m_id(id), m_isKeyInitialized(false)
{
}
void CommandPrivate::setDefaultKeySequence(const QKeySequence &key)
{
if (!m_isKeyInitialized)
setKeySequence(key);
m_defaultKey = key;
}
@@ -214,6 +216,12 @@ QKeySequence CommandPrivate::defaultKeySequence() const
return m_defaultKey;
}
void CommandPrivate::setKeySequence(const QKeySequence &key)
{
Q_UNUSED(key)
m_isKeyInitialized = true;
}
void CommandPrivate::setDefaultText(const QString &text)
{
m_defaultText = text;
@@ -306,15 +314,9 @@ Core::Context Shortcut::context() const
return m_context;
}
void Shortcut::setDefaultKeySequence(const QKeySequence &key)
{
if (m_shortcut->key().isEmpty())
setKeySequence(key);
CommandPrivate::setDefaultKeySequence(key);
}
void Shortcut::setKeySequence(const QKeySequence &key)
{
CommandPrivate::setKeySequence(key);
m_shortcut->setKey(key);
emit keySequenceChanged();
}
@@ -405,15 +407,9 @@ QList<CommandLocation> Action::locations() const
return m_locations;
}
void Action::setDefaultKeySequence(const QKeySequence &key)
{
if (m_action->shortcut().isEmpty())
setKeySequence(key);
CommandPrivate::setDefaultKeySequence(key);
}
void Action::setKeySequence(const QKeySequence &key)
{
CommandPrivate::setKeySequence(key);
m_action->setShortcut(key);
updateToolTipWithKeySequence();
emit keySequenceChanged();
@@ -538,3 +534,4 @@ void Action::setActive(bool state)
emit activeStateChanged();
}
}