Another attempt to fix copyed hotkeys by updating the identifier

* check on name OR id
* remote keys not updated, but lenient check on local machine
* Remark: Sometimes copied hotkeys d not work
This commit is contained in:
Klaus Basan
2019-02-13 03:11:13 +01:00
committed by Mat Sutcliffe
parent eb1427e55f
commit d8a730302a
7 changed files with 95 additions and 26 deletions

View File

@@ -38,11 +38,26 @@ namespace BlackMisc
m_combination = combination;
}
bool CActionHotkey::isForSameMachine(const CActionHotkey &key) const
bool CActionHotkey::isForSameMachineId(const CActionHotkey &key) const
{
return this->getApplicableMachine().hasSameMachineId(key.getApplicableMachine());
}
bool CActionHotkey::isForSameMachineName(const CActionHotkey &key) const
{
return this->getApplicableMachine().hasSameMachineName(key.getApplicableMachine());
}
bool CActionHotkey::isForSameMachine(const CActionHotkey &key) const
{
return this->isForSameMachineId(key) || this->isForSameMachineName(key);
}
void CActionHotkey::updateToCurrentMachine()
{
m_identifier.updateToCurrentMachine();
}
void CActionHotkey::setObject(const CActionHotkey &obj)
{
m_action = obj.m_action;