aboutsummaryrefslogtreecommitdiff
path: root/qdeduper/mingui.cpp
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2022-10-02 02:04:05 -0400
committerGravatar Chris Xiong <chirs241097@gmail.com> 2022-10-02 02:04:05 -0400
commit64a4fc1fb07863f35289b2dc050d30ecc96aaac6 (patch)
treeb79ad5212b2125bdb1846be52064c615c370d8df /qdeduper/mingui.cpp
parent3afafef65bff7fc6ecb02c88bc20657e1bdc2fe4 (diff)
downloaddeduper-64a4fc1fb07863f35289b2dc050d30ecc96aaac6.tar.xz
Add shortcut settings for item actions.
Implement check for ambiguous shortcuts. Make preference dialog wider by default.
Diffstat (limited to 'qdeduper/mingui.cpp')
-rw-r--r--qdeduper/mingui.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qdeduper/mingui.cpp b/qdeduper/mingui.cpp
index caf0249..f599ba0 100644
--- a/qdeduper/mingui.cpp
+++ b/qdeduper/mingui.cpp
@@ -829,9 +829,9 @@ void DeduperMainWindow::apply_prefs()
size_t actt = i % ItemActionType::ACTION_MAX;
std::string iamt = "hotkey/item_action_mod_" + std::to_string(actt);
std::string iakt = "hotkey/item_" + std::to_string(actn) + "_action_key";
- int ik = sr->get_option_int(iakt);
int im = sr->get_option_int(iamt);
- QKeySequence ks = QKeySequence(static_cast<Qt::Key>(ik | im));
+ int ik = sr->get_option_int(iakt);
+ QKeySequence ks = ~im ? QKeySequence(static_cast<Qt::Key>(ik | im)) : QKeySequence();
act->setShortcut(ks);
}
}