diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-29 14:54:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-29 14:54:15 -0600 |
| commit | 05e764aa4c991949a0249ffdaa203f7292c7b138 (patch) | |
| tree | dfed706502bde32ba7b6d7609c599e64b923b283 /tdecore/tdeaccelbase.cpp | |
| parent | 72849e2a6f973af3eeaa573a66635e37cc427bb0 (diff) | |
| download | tdelibs-05e764aa4c991949a0249ffdaa203f7292c7b138.tar.gz tdelibs-05e764aa4c991949a0249ffdaa203f7292c7b138.zip | |
Do not grab wrong key when AltGr sequence is required to access global accelerator sequence character
This resolves Bug 1676
Diffstat (limited to 'tdecore/tdeaccelbase.cpp')
| -rw-r--r-- | tdecore/tdeaccelbase.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp index 6673cabb4..41864d47c 100644 --- a/tdecore/tdeaccelbase.cpp +++ b/tdecore/tdeaccelbase.cpp @@ -131,7 +131,8 @@ TDEAccelAction* TDEAccelBase::insert( const TQString& sAction, const TQString& s const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ) { - //kdDebug(125) << "TDEAccelBase::insert() begin" << endl; + kdDebug(125) << "TDEAccelBase::insert() begin" << endl; + kdDebug(125) << "\t" << sAction << ": " << rgCutDefaults3.toString() << ": " << rgCutDefaults4.toString() << endl; TDEAccelAction* pAction = m_rgActions.insert( sAction, sDesc, sHelp, rgCutDefaults3, rgCutDefaults4, @@ -369,7 +370,7 @@ bool TDEAccelBase::updateConnections() info.pAction = 0; } - //kdDebug(125) << "mapKeyToAction[" << key.toStringInternal() << "] = " << info.pAction << endl; + kdDebug(125) << "mapKeyToAction[" << key.key().toStringInternal() << "] = " << info.pAction << endl; mapKeyToAction[key] = info; } @@ -421,9 +422,10 @@ bool TDEAccelBase::updateConnections() // Construct a list of keys to be connected, sorted highest priority first. void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) { - //kdDebug(125) << "TDEAccelBase::createKeyList()" << endl; - if( !isEnabledInternal()) + kdDebug(125) << "TDEAccelBase::createKeyList()" << endl; + if( !isEnabledInternal()) { return; + } // create the list // For each action @@ -437,13 +439,15 @@ void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) KKeyServer::Variations vars; vars.init( seq.key(0), !m_bNativeKeys ); for( uint iVari = 0; iVari < vars.count(); iVari++ ) { - if( vars.key(iVari).code() && vars.key(iVari).sym() ) + if( vars.key(iVari).code() && vars.key(iVari).sym() ) { rgKeys.push_back( X( iAction, iSeq, iVari, vars.key( iVari ) ) ); - //kdDebug(125) << "\t" << pAction->name() << ": " << vars.key(iVari).toStringInternal() << endl; + } + kdDebug(125) << "\t" << pAction->name() << ": " << vars.key(iVari).key().toStringInternal() << " [action specified: " << pAction->toStringInternal() << "]" << endl; } } - //else + //else { // kdDebug(125) << "\t*" << pAction->name() << ":" << endl; + // } } } } |