← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdeplasma-addons/oneiric-proposed

« back to all changes in this revision

Viewing changes to applets/plasmaboard/AlphaNumKey.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Romain Perier
  • Date: 2011-07-12 18:23:07 UTC
  • mfrom: (0.7.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20110712182307-ujyvnrb2hkr8gvhd
Tags: 4:4.6.90-0ubuntu1
* New upstream development release
  - Change dependencies to match new packages names
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/plasmaboard/AlphaNumKey.cpp
59
59
 
60
60
void AlphaNumKey::setLabel(int level)
61
61
{
62
 
    //m_label = Helpers::mapToUnicode(Helpers::keycodeToKeysym(getKeycode(),level));
63
62
    setLabel(Helpers::mapToUnicode(getKeysymbol(level)));
64
63
}
65
64
 
70
69
 
71
70
void AlphaNumKey::switchKey(bool isLevel2, bool isAlternative, bool isLocked)
72
71
{
73
 
        if(isLocked){
74
 
                isLevel2 = !isLevel2;
75
 
        }
76
 
        if(isLevel2){
77
 
                isAlternative ? setLabel(4) : setLabel(1);
78
 
        }
79
 
        else{
80
 
                setLabel(0);
81
 
                /*isAlternative ?
82
 
                setText(QChar(Helpers::mapToUnicode(Helpers::keycodeToKeysym(getKeycode(),0)))) :
83
 
                setText(QChar(Helpers::mapToUnicode(Helpers::keycodeToKeysym(getKeycode(),0))));*/
 
72
    if(isLocked){
 
73
        isLevel2 = !isLevel2;
 
74
    }
 
75
    if(isLevel2){
 
76
        isAlternative ? setLabel(4) : setLabel(1);
 
77
    }
 
78
    else{
 
79
        setLabel(0);
 
80
        /*isAlternative ?
 
81
        setText(QChar(Helpers::mapToUnicode(Helpers::keycodeToKeysym(getKeycode(),0)))) :
 
82
        setText(QChar(Helpers::mapToUnicode(Helpers::keycodeToKeysym(getKeycode(),0))));*/
84
83
    }
85
84
}
86
85