← Back to branch summary

~mixxxdevelopers/mixxx/mixxx-buildserver

« back to all changes in this revision

Viewing changes to mixxx/src/mixxxkeyboard.cpp

  • Committer: Albert Santoni
  • Date: 2011-03-20 00:27:15 UTC
  • mfrom: (2607.1.162 mixxx-1.9)
  • Revision ID: alberts@mixxx.org-20110320002715-sa2d88zbuc5kkyya
Merged from 1.9

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/mixxxkeyboard.cpp
109
109
 
110
110
QKeySequence MixxxKeyboard::getKeySeq(QKeyEvent * e)
111
111
{
112
 
    //XXX: If you want Mixxx to handle multiple modifiers,
113
 
    //     eg. Ctrl+Alt+G, then you'll need to change the
114
 
    //     code below a bit.
115
 
    QKeySequence s;
116
 
    int modifier = (int)e->modifiers() & Qt::ShiftModifier;
117
 
    if ((e->modifiers() & Qt::ShiftModifier) > 0)
118
 
        s = QKeySequence("Shift+" + e->text());
119
 
    else if ((e->modifiers() & Qt::ControlModifier) > 0)
120
 
        s = QKeySequence("Ctrl+" + e->text());
121
 
    else if ((e->modifiers() & Qt::AltModifier) > 0)
122
 
        s = QKeySequence("Alt+" + e->text());
123
 
    else
124
 
        s = QKeySequence(e->key());
125
 
 
126
 
    //qDebug() << "keyboard press: " << s;
127
 
    return s;
128
 
 
 
112
    QString modseq = QString::null;
 
113
        QString keyseq = QString::null;
 
114
 
 
115
 
 
116
        if (e->modifiers() & Qt::ShiftModifier)
 
117
               modseq += "Shift+";
 
118
 
 
119
        if (e->modifiers() & Qt::ControlModifier)
 
120
                modseq += "Ctrl+";
 
121
 
 
122
        if (e->modifiers() & Qt::AltModifier)
 
123
                modseq += "Alt+";
 
124
 
 
125
        if (e->modifiers() & Qt::MetaModifier)
 
126
                modseq += "Meta+";
 
127
 
 
128
        keyseq = (QString)QKeySequence(e->key());
 
129
 
 
130
        QString seq = modseq + keyseq;
 
131
        QKeySequence k = QKeySequence(seq);
 
132
        return k;
129
133
}
130
134
 
131
135
ConfigObject<ConfigValueKbd>* MixxxKeyboard::getKeyboardConfig() {