~ubuntu-branches/ubuntu/trusty/autokey/trusty-proposed

« back to all changes in this revision

Viewing changes to src/lib/qtui/hotkeysettings.py

  • Committer: Package Import Robot
  • Author(s): Andrew Starr-Bochicchio, Jakub Wilk, Andrew Starr-Bochicchio
  • Date: 2014-01-28 22:10:47 UTC
  • mfrom: (1.4.5)
  • Revision ID: package-import@ubuntu.com-20140128221047-4ag02iz2c6ge1ns4
Tags: 0.90.4-1
* Team upload.

[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.

[ Andrew Starr-Bochicchio ]
* New upstream release (Closes: #717948).
* Acknowledge my own NMU.
* Fix debian/watch file to find new versions. 
* Fix chmod call in debian/rules for new path.
* Bump Standards-Version to 3.9.5, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
45
45
        self.superButton.setChecked(False)
46
46
        self.superButton.setObjectName(_fromUtf8("superButton"))
47
47
        self.horizontalLayout.addWidget(self.superButton)
48
 
        self.hyperButton = QtGui.QPushButton(Form)
 
48
        self.hyperButton = KPushButton(Form)
 
49
        self.hyperButton.setCheckable(True)
 
50
        self.hyperButton.setChecked(False)
49
51
        self.hyperButton.setObjectName(_fromUtf8("hyperButton"))
50
52
        self.horizontalLayout.addWidget(self.hyperButton)
 
53
        self.metaButton = KPushButton(Form)
 
54
        self.metaButton.setCheckable(True)
 
55
        self.metaButton.setChecked(False)
 
56
        self.metaButton.setObjectName(_fromUtf8("metaButton"))
 
57
        self.horizontalLayout.addWidget(self.metaButton)
51
58
        self.verticalLayout.addLayout(self.horizontalLayout)
52
59
        self.horizontalLayout_2 = QtGui.QHBoxLayout()
53
60
        self.horizontalLayout_2.setContentsMargins(-1, -1, -1, 5)
74
81
        self.shiftButton.setText(kdecore.i18n(_fromUtf8("Shift")))
75
82
        self.superButton.setText(kdecore.i18n(_fromUtf8("Super")))
76
83
        self.hyperButton.setText(kdecore.i18n(_fromUtf8("Hyper")))
 
84
        self.metaButton.setText(kdecore.i18n(_fromUtf8("Meta")))
77
85
        self.keyLabel.setText(kdecore.i18n(_fromUtf8("Key: %s")))
78
86
        self.setButton.setText(kdecore.i18n(_fromUtf8("Press to set")))
79
87