From 60c8af46bfdeba3e2a023965f7b74bd63b252733 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 12 Apr 2024 00:52:32 -0500 Subject: [PATCH] Rename keybind to hotkey --- scwx-qt/scwx-qt.cmake | 4 ++-- .../ui/{keybind_edit.cpp => hotkey_edit.cpp} | 22 +++++++++---------- .../ui/{keybind_edit.hpp => hotkey_edit.hpp} | 8 +++---- scwx-qt/source/scwx/qt/ui/settings_dialog.ui | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) rename scwx-qt/source/scwx/qt/ui/{keybind_edit.cpp => hotkey_edit.cpp} (82%) rename scwx-qt/source/scwx/qt/ui/{keybind_edit.hpp => hotkey_edit.hpp} (80%) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 5f58eded..280b1d95 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -231,9 +231,9 @@ set(HDR_UI source/scwx/qt/ui/about_dialog.hpp source/scwx/qt/ui/county_dialog.hpp source/scwx/qt/ui/download_dialog.hpp source/scwx/qt/ui/flow_layout.hpp + source/scwx/qt/ui/hotkey_edit.hpp source/scwx/qt/ui/imgui_debug_dialog.hpp source/scwx/qt/ui/imgui_debug_widget.hpp - source/scwx/qt/ui/keybind_edit.hpp source/scwx/qt/ui/layer_dialog.hpp source/scwx/qt/ui/left_elided_item_delegate.hpp source/scwx/qt/ui/level2_products_widget.hpp @@ -254,9 +254,9 @@ set(SRC_UI source/scwx/qt/ui/about_dialog.cpp source/scwx/qt/ui/county_dialog.cpp source/scwx/qt/ui/download_dialog.cpp source/scwx/qt/ui/flow_layout.cpp + source/scwx/qt/ui/hotkey_edit.cpp source/scwx/qt/ui/imgui_debug_dialog.cpp source/scwx/qt/ui/imgui_debug_widget.cpp - source/scwx/qt/ui/keybind_edit.cpp source/scwx/qt/ui/layer_dialog.cpp source/scwx/qt/ui/left_elided_item_delegate.cpp source/scwx/qt/ui/level2_products_widget.cpp diff --git a/scwx-qt/source/scwx/qt/ui/keybind_edit.cpp b/scwx-qt/source/scwx/qt/ui/hotkey_edit.cpp similarity index 82% rename from scwx-qt/source/scwx/qt/ui/keybind_edit.cpp rename to scwx-qt/source/scwx/qt/ui/hotkey_edit.cpp index b2cc1ec7..a3aa649d 100644 --- a/scwx-qt/source/scwx/qt/ui/keybind_edit.cpp +++ b/scwx-qt/source/scwx/qt/ui/hotkey_edit.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -10,10 +10,10 @@ namespace qt namespace ui { -static const std::string logPrefix_ = "scwx::qt::ui::keybind_edit"; +static const std::string logPrefix_ = "scwx::qt::ui::hotkey_edit"; static const auto logger_ = scwx::util::Logger::Create(logPrefix_); -class KeybindEdit::Impl +class HotkeyEdit::Impl { public: explicit Impl() {}; @@ -22,7 +22,7 @@ public: QKeySequence sequence_ {}; }; -KeybindEdit::KeybindEdit(QWidget* parent) : +HotkeyEdit::HotkeyEdit(QWidget* parent) : QLineEdit(parent), p {std::make_unique()} { setReadOnly(true); @@ -51,14 +51,14 @@ KeybindEdit::KeybindEdit(QWidget* parent) : } } -KeybindEdit::~KeybindEdit() {} +HotkeyEdit::~HotkeyEdit() {} -QKeySequence KeybindEdit::key_sequence() const +QKeySequence HotkeyEdit::key_sequence() const { return p->sequence_; } -void KeybindEdit::set_key_sequence(const QKeySequence& sequence) +void HotkeyEdit::set_key_sequence(const QKeySequence& sequence) { if (sequence != p->sequence_) { @@ -68,7 +68,7 @@ void KeybindEdit::set_key_sequence(const QKeySequence& sequence) } } -void KeybindEdit::focusInEvent(QFocusEvent* e) +void HotkeyEdit::focusInEvent(QFocusEvent* e) { logger_->trace("focusInEvent"); @@ -79,7 +79,7 @@ void KeybindEdit::focusInEvent(QFocusEvent* e) QLineEdit::focusInEvent(e); } -void KeybindEdit::focusOutEvent(QFocusEvent* e) +void HotkeyEdit::focusOutEvent(QFocusEvent* e) { logger_->trace("focusOutEvent"); @@ -90,7 +90,7 @@ void KeybindEdit::focusOutEvent(QFocusEvent* e) QLineEdit::focusOutEvent(e); } -void KeybindEdit::keyPressEvent(QKeyEvent* e) +void HotkeyEdit::keyPressEvent(QKeyEvent* e) { logger_->trace("keyPressEvent"); @@ -124,7 +124,7 @@ void KeybindEdit::keyPressEvent(QKeyEvent* e) setText(sequence.toString()); } -void KeybindEdit::keyReleaseEvent(QKeyEvent*) +void HotkeyEdit::keyReleaseEvent(QKeyEvent*) { logger_->trace("keyReleaseEvent"); diff --git a/scwx-qt/source/scwx/qt/ui/keybind_edit.hpp b/scwx-qt/source/scwx/qt/ui/hotkey_edit.hpp similarity index 80% rename from scwx-qt/source/scwx/qt/ui/keybind_edit.hpp rename to scwx-qt/source/scwx/qt/ui/hotkey_edit.hpp index 3d90bcbf..316fa8f8 100644 --- a/scwx-qt/source/scwx/qt/ui/keybind_edit.hpp +++ b/scwx-qt/source/scwx/qt/ui/hotkey_edit.hpp @@ -9,14 +9,14 @@ namespace qt namespace ui { -class KeybindEdit : public QLineEdit +class HotkeyEdit : public QLineEdit { Q_OBJECT - Q_DISABLE_COPY_MOVE(KeybindEdit) + Q_DISABLE_COPY_MOVE(HotkeyEdit) public: - explicit KeybindEdit(QWidget* parent = nullptr); - ~KeybindEdit(); + explicit HotkeyEdit(QWidget* parent = nullptr); + ~HotkeyEdit(); QKeySequence key_sequence() const; diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui index 1e35c261..6790b659 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui @@ -97,7 +97,7 @@ - Key Binds + Hotkeys @@ -1016,7 +1016,7 @@ - +