diff options
| author |  Lioncash | 2019-05-25 04:19:51 -0400 |
|---|---|---|
| committer | Lioncash | 2019-05-25 04:25:11 -0400 |
| commit | 6640f631e2a97f376c42ef2e1e5a316ab61d9dc5 (patch) | |
| tree | 132b28037ac99bc2c0ae30267a428894fab5ad28 | |
| parent | configure_hotkeys: Change critical error dialog into a warning dialog (diff) | |
| download | yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.gz yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.tar.xz yuzu-6640f631e2a97f376c42ef2e1e5a316ab61d9dc5.zip | |
configure_hotkeys: Tidy up key sequence conflict error string
Avoids mentioning the user and formalizes the error itself.
| -rw-r--r-- | src/yuzu/configuration/configure_hotkeys.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp index 583fd6a0e..c486ac2ed 100644 --- a/src/yuzu/configuration/configure_hotkeys.cpp +++ b/src/yuzu/configuration/configure_hotkeys.cpp | |||
| @@ -67,8 +67,8 @@ void ConfigureHotkeys::Configure(QModelIndex index) { | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) { | 69 | if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) { |
| 70 | QMessageBox::warning(this, tr("Error in inputted key"), | 70 | QMessageBox::warning(this, tr("Conflicting Key Sequence"), |
| 71 | tr("You're using a key that's already bound.")); | 71 | tr("The entered key sequence is already assigned to another hotkey.")); |
| 72 | } else { | 72 | } else { |
| 73 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); | 73 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); |
| 74 | } | 74 | } |