summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/options-dialog.cpp14
-rw-r--r--facetracknoir/options-dialog.hpp2
2 files changed, 8 insertions, 8 deletions
diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp
index 1d8e636a..8ac95b71 100644
--- a/facetracknoir/options-dialog.cpp
+++ b/facetracknoir/options-dialog.cpp
@@ -54,14 +54,14 @@ OptionsDialog::OptionsDialog()
connect(ui.bind_zero, &QPushButton::pressed, [&]() -> void { bind_key(s.zero.keycode, ui.zero_text); });
connect(ui.bind_toggle, &QPushButton::pressed, [&]() -> void { bind_key(s.toggle.keycode, ui.toggle_text); });
- ui.center_text->setText(QKeySequence(s.center.keycode).toString());
- ui.zero_text->setText(QKeySequence(s.zero.keycode).toString());
- ui.toggle_text->setText(QKeySequence(s.toggle.keycode).toString());
+ ui.center_text->setText(s.center.keycode == "" ? "None" : static_cast<QString>(s.center.keycode));
+ ui.toggle_text->setText(s.toggle.keycode == "" ? "None" : static_cast<QString>(s.toggle.keycode));
+ ui.zero_text->setText(s.zero.keycode == "" ? "None" : static_cast<QString>(s.zero.keycode));
}
-void OptionsDialog::bind_key(value<int>& ret, QLabel* label)
+void OptionsDialog::bind_key(value<QString>& ret, QLabel* label)
{
- ret = 0;
+ ret = "";
QDialog d;
auto l = new QHBoxLayout;
l->setMargin(0);
@@ -70,9 +70,9 @@ void OptionsDialog::bind_key(value<int>& ret, QLabel* label)
d.setLayout(l);
d.setFixedSize(QSize(500, 500));
d.setWindowFlags(Qt::Dialog);
- connect(k, &KeyboardListener::key_pressed, [&] (QKeySequence s) -> void { ret = static_cast<QVariant>(s).toInt(); d.close(); });
+ connect(k, &KeyboardListener::key_pressed, [&] (QKeySequence s) -> void { ret = s.toString(QKeySequence::PortableText); d.close(); });
d.exec();
- label->setText(QKeySequence(ret).toString());
+ label->setText(ret == "" ? "None" : static_cast<QString>(ret));
delete k;
delete l;
}
diff --git a/facetracknoir/options-dialog.hpp b/facetracknoir/options-dialog.hpp
index 0ab9849d..9ad656a4 100644
--- a/facetracknoir/options-dialog.hpp
+++ b/facetracknoir/options-dialog.hpp
@@ -18,5 +18,5 @@ private:
private slots:
void doOK();
void doCancel();
- void bind_key(value<int>& ret, QLabel* label);
+ void bind_key(value<QString>& ret, QLabel* label);
};