blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 20:20:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up custom map inputs, making it easier for others to use

Browse source
This commit is contained in:
AdenKoperczak 2025-03-16 15:52:29 -04:00
parent c9ead60dd4
commit fee00b737a
11 changed files with 425 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scwx-qt/source/scwx/qt/settings/general_settings.cpp
View file

@ -107,6 +107,10 @@ public:
SCWX_SETTINGS_ENUM_VALIDATOR(scwx::util::ClockFormat,
scwx::util::ClockFormatIterator(),
scwx::util::GetClockFormatName));
customStyleUrl_.SetValidator(
[](const std::string& value)
{ return value.find("key=") == std::string::npos; });
customStyleDrawLayer_.SetValidator([](const std::string& value)
{ return !value.empty(); });
defaultAlertAction_.SetValidator(

154
scwx-qt/source/scwx/qt/settings/settings_interface.cpp
View file

@ -12,6 +12,7 @@
#include <QLineEdit>
#include <QSpinBox>
#include <QWidget>
#include <utility>
#include <vector>
namespace scwx::qt::settings
@ -19,6 +20,9 @@ namespace scwx::qt::settings
static const std::string logPrefix_ = "scwx::qt::settings::settings_interface";
static const QString kValidStyleSheet_ = "";
static const QString kInvalidStyleSheet_ = "border: 2px solid red;";
template<class T>
class SettingsInterface<T>::Impl
{
@ -59,6 +63,8 @@ public:
bool unitEnabled_ {false};
bool trimmingEnabled_ {false};
std::optional<std::string> invalidTooltip_;
};
template<class T>
@ -167,20 +173,24 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
{
if constexpr (std::is_same_v<T, std::string>)
{
QObject::connect(hotkeyEdit,
&ui::HotkeyEdit::KeySequenceChanged,
p->context_.get(),
[this](const QKeySequence& sequence)
{
std::string value {
sequence.toString().toStdString()};
QObject::connect(
hotkeyEdit,
&ui::HotkeyEdit::KeySequenceChanged,
p->context_.get(),
[this, hotkeyEdit](const QKeySequence& sequence)
{
const std::string value {sequence.toString().toStdString()};
// Attempt to stage the value
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
// Attempt to stage the value
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
// TODO: Display invalid status
});
hotkeyEdit->setStyleSheet(p->stagedValid_ ? kValidStyleSheet_ :
kInvalidStyleSheet_);
hotkeyEdit->setToolTip(p->invalidTooltip_ && !p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
}
else if (QLineEdit* lineEdit = dynamic_cast<QLineEdit*>(widget))
@ -189,53 +199,64 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
{
// If the line is edited (not programatically changed), stage the new
// value
QObject::connect(lineEdit,
&QLineEdit::textEdited,
p->context_.get(),
[this](const QString& text)
{
QString trimmedText =
p->trimmingEnabled_ ? text.trimmed() : text;
QObject::connect(
lineEdit,
&QLineEdit::textEdited,
p->context_.get(),
[this, lineEdit](const QString& text)
{
const QString trimmedText =
p->trimmingEnabled_ ? text.trimmed() : text;
// Map to value if required
std::string value {trimmedText.toStdString()};
if (p->mapToValue_ != nullptr)
{
value = p->mapToValue_(value);
}
// Map to value if required
std::string value {trimmedText.toStdString()};
if (p->mapToValue_ != nullptr)
{
value = p->mapToValue_(value);
}
// Attempt to stage the value
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
// Attempt to stage the value
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
// TODO: Display invalid status
});
lineEdit->setStyleSheet(p->stagedValid_ ? kValidStyleSheet_ :
kInvalidStyleSheet_);
lineEdit->setToolTip(p->invalidTooltip_ && !p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
else if constexpr (std::is_same_v<T, double>)
{
// If the line is edited (not programatically changed), stage the new
// value
QObject::connect(lineEdit,
&QLineEdit::textEdited,
p->context_.get(),
[this](const QString& text)
{
// Convert to a double
bool ok;
double value = text.toDouble(&ok);
if (ok)
{
// Attempt to stage the value
p->stagedValid_ =
p->variable_->StageValue(value);
p->UpdateResetButton();
}
else
{
p->stagedValid_ = false;
p->UpdateResetButton();
}
});
QObject::connect(
lineEdit,
&QLineEdit::textEdited,
p->context_.get(),
[this, lineEdit](const QString& text)
{
// Convert to a double
bool ok = false;
const double value = text.toDouble(&ok);
if (ok)
{
// Attempt to stage the value
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
}
else
{
p->stagedValid_ = false;
p->UpdateResetButton();
}
lineEdit->setStyleSheet(p->stagedValid_ ? kValidStyleSheet_ :
kInvalidStyleSheet_);
lineEdit->setToolTip(p->invalidTooltip_ && !p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
else if constexpr (std::is_same_v<T, std::vector<std::int64_t>>)
{
@ -245,7 +266,7 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
lineEdit,
&QLineEdit::textEdited,
p->context_.get(),
[this](const QString& text)
[this, lineEdit](const QString& text)
{
// Map to value if required
T value {};
@ -280,7 +301,11 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
p->stagedValid_ = p->variable_->StageValue(value);
p->UpdateResetButton();
// TODO: Display invalid status
lineEdit->setStyleSheet(p->stagedValid_ ? kValidStyleSheet_ :
kInvalidStyleSheet_);
lineEdit->setToolTip(p->invalidTooltip_ && !p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
}
@ -343,7 +368,7 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
spinBox,
&QSpinBox::valueChanged,
p->context_.get(),
[this](int i)
[this, spinBox](int i)
{
const T value = p->variable_->GetValue();
const std::optional<T> staged = p->variable_->GetStaged();
@ -364,6 +389,12 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
p->UpdateResetButton();
}
// Otherwise, don't process an unchanged value
spinBox->setStyleSheet(p->stagedValid_ ? kValidStyleSheet_ :
kInvalidStyleSheet_);
spinBox->setToolTip(p->invalidTooltip_ && !p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
}
@ -389,7 +420,7 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
doubleSpinBox,
&QDoubleSpinBox::valueChanged,
p->context_.get(),
[this](double d)
[this, doubleSpinBox](double d)
{
if (p->unitEnabled_)
{
@ -415,6 +446,13 @@ void SettingsInterface<T>::SetEditWidget(QWidget* widget)
p->UpdateResetButton();
}
// Otherwise, don't process an unchanged value
doubleSpinBox->setStyleSheet(
p->stagedValid_ ? kValidStyleSheet_ : kInvalidStyleSheet_);
doubleSpinBox->setToolTip(p->invalidTooltip_ &&
!p->stagedValid_ ?
p->invalidTooltip_->c_str() :
"");
});
}
}
@ -500,6 +538,12 @@ void SettingsInterface<T>::EnableTrimming(bool trimmingEnabled)
p->trimmingEnabled_ = trimmingEnabled;
}
template<class T>
void SettingsInterface<T>::SetInvalidTooltip(std::optional<std::string> tooltip)
{
p->invalidTooltip_ = std::move(tooltip);
}
template<class T>
template<class U>
void SettingsInterface<T>::Impl::SetWidgetText(U* widget, const T& currentValue)

8
scwx-qt/source/scwx/qt/settings/settings_interface.hpp
View file

@ -1,5 +1,6 @@
#pragma once
#include <optional>
#include <scwx/qt/settings/settings_interface_base.hpp>
#include <functional>
@ -130,6 +131,13 @@ public:
*/
void EnableTrimming(bool trimmingEnabled = true);
/**
* Set a tooltip to be displayed when an invalid input is given.
*
* @param tooltip the tooltip to be displayed
*/
void SetInvalidTooltip(std::optional<std::string> tooltip);
private:
class Impl;
std::unique_ptr<Impl> p;