dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it possible to use enter in shortcuts

Browse Source
This commit is contained in:
Jonas Kvinge
2019-02-09 12:47:40 +01:00
parent 9c3cb82fca
commit 676f8dc8be
3 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/globalshortcuts/globalshortcutgrabber.cpp
View File

@@ -40,6 +40,10 @@ GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
ui_->setupUi(this);
modifier_keys_ << Qt::Key_Shift << Qt::Key_Control << Qt::Key_Meta << Qt::Key_Alt << Qt::Key_AltGr;
connect(ui_->buttonBox, SIGNAL(accepted()), this, SLOT(Accepted()));
connect(ui_->buttonBox, SIGNAL(rejected()), this, SLOT(Rejected()));
}
GlobalShortcutGrabber::~GlobalShortcutGrabber() {
@@ -48,8 +52,8 @@ GlobalShortcutGrabber::~GlobalShortcutGrabber() {
QKeySequence GlobalShortcutGrabber::GetKey(const QString &name) {
ui_->label->setText(tr("Press a key combination to use for %1...").arg(name));
ui_->combo->clear();
ui_->label_shortcut->setText(tr("Press a key combination to use for %1...").arg(name));
ui_->label_key->clear();
ret_ = QKeySequence();
@@ -102,5 +106,13 @@ bool GlobalShortcutGrabber::event(QEvent *e) {
}
void GlobalShortcutGrabber::UpdateText() {
ui_->combo->setText("<b>" + ret_.toString(QKeySequence::NativeText) + "</b>");
ui_->label_key->setText("<b>" + ret_.toString(QKeySequence::NativeText) + "</b>");
}
void GlobalShortcutGrabber::Accepted() {
accept();
}
void GlobalShortcutGrabber::Rejected() {
if (ui_->label_key->text().isEmpty()) reject();
}