summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hindenburg <[email protected]>2018-02-28 21:14:42 -0500
committerKurt Hindenburg <[email protected]>2018-02-28 21:14:42 -0500
commit5b6ba95255073ce13c45c4bfb7a49c1142193368 (patch)
treebf7d1571c9dd6550450a9c9c4b7bb0853531522d
parente2e2ef66f7ad1a063465239555d7706ae5d27723 (diff)
Do not setShortcut() on the OK button on dialogs
using okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return); causes the Alt+O to not work on the OK button. Both Ctrl+Return and Alt+O now work to close the dialog. BUG: 364716 FIXED-IN: 18.04
-rw-r--r--src/ColorSchemeEditor.cpp1
-rw-r--r--src/CopyInputDialog.cpp1
-rw-r--r--src/EditProfileDialog.cpp1
-rw-r--r--src/HistorySizeDialog.cpp1
-rw-r--r--src/RenameTabDialog.cpp1
5 files changed, 0 insertions, 5 deletions
diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index ecabd0f..0f3741f 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -68,7 +68,6 @@ ColorSchemeEditor::ColorSchemeEditor(QWidget *aParent) :
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
- okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return);
connect(buttonBox, &QDialogButtonBox::accepted, this, &ColorSchemeEditor::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &ColorSchemeEditor::reject);
mainLayout->addWidget(buttonBox);
diff --git a/src/CopyInputDialog.cpp b/src/CopyInputDialog.cpp
index fa38256..387f91a 100644
--- a/src/CopyInputDialog.cpp
+++ b/src/CopyInputDialog.cpp
@@ -47,7 +47,6 @@ CopyInputDialog::CopyInputDialog(QWidget *parent) :
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
- okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return);
connect(buttonBox, &QDialogButtonBox::accepted, this, &CopyInputDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &CopyInputDialog::reject);
mainLayout->addWidget(buttonBox);
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index d2fa989..974987d 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -83,7 +83,6 @@ EditProfileDialog::EditProfileDialog(QWidget *aParent) :
mainLayout->addWidget(mainWidget);
QPushButton *okButton = mButtonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
- okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return);
connect(mButtonBox, &QDialogButtonBox::accepted, this, &Konsole::EditProfileDialog::accept);
connect(mButtonBox, &QDialogButtonBox::rejected, this, &Konsole::EditProfileDialog::reject);
diff --git a/src/HistorySizeDialog.cpp b/src/HistorySizeDialog.cpp
index 64eacb6..54a7d1f 100644
--- a/src/HistorySizeDialog.cpp
+++ b/src/HistorySizeDialog.cpp
@@ -43,7 +43,6 @@ HistorySizeDialog::HistorySizeDialog(QWidget *parent) :
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
- okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return);
connect(buttonBox, &QDialogButtonBox::accepted, this, &HistorySizeDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &HistorySizeDialog::reject);
mainLayout->addWidget(buttonBox);
diff --git a/src/RenameTabDialog.cpp b/src/RenameTabDialog.cpp
index 05e3ff8..be6770d 100644
--- a/src/RenameTabDialog.cpp
+++ b/src/RenameTabDialog.cpp
@@ -42,7 +42,6 @@ RenameTabDialog::RenameTabDialog(QWidget *parent) :
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setAutoDefault(true);
- okButton->setShortcut(Konsole::ACCEL | Qt::Key_Return);
connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameTabDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameTabDialog::reject);
mainLayout->addWidget(buttonBox);