made slider value/string conversions abstract

This commit is contained in:
itsmattkc
2021-03-15 18:29:03 +11:00
parent 50c7f8019b
commit 0c73a4bd59
6 changed files with 9 additions and 4 deletions
+2
View File
@@ -32,6 +32,8 @@ FloatSlider::FloatSlider(QWidget *parent) :
decimal_places_(1),
autotrim_decimal_places_(false)
{
SetValue(0.0);
connect(this, SIGNAL(ValueChanged(QVariant)), this, SLOT(ConvertValue(QVariant)));
}
+2
View File
@@ -25,6 +25,8 @@ namespace olive {
IntegerSlider::IntegerSlider(QWidget* parent) :
SliderBase(kInteger, parent)
{
SetValue(0);
connect(this, SIGNAL(ValueChanged(QVariant)), this, SLOT(ConvertValue(QVariant)));
}
-2
View File
@@ -62,12 +62,10 @@ SliderBase::SliderBase(Mode mode, QWidget *parent) :
switch (mode_) {
case kString:
setCursor(Qt::PointingHandCursor);
SetValue(QString());
break;
case kInteger:
case kFloat:
setCursor(Qt::SizeHorCursor);
SetValue(0);
break;
}
}
+2 -2
View File
@@ -84,9 +84,9 @@ protected:
virtual double AdjustDragDistanceInternal(const double& start, const double& drag);
virtual QString ValueToString(const QVariant &v);
virtual QString ValueToString(const QVariant &v) = 0;
virtual QVariant StringToValue(const QString& s, bool* ok);
virtual QVariant StringToValue(const QString& s, bool* ok) = 0;
virtual void changeEvent(QEvent* e) override;
+2
View File
@@ -25,6 +25,8 @@ namespace olive {
StringSlider::StringSlider(QWidget* parent) :
SliderBase(kString, parent)
{
SetValue(QString());
connect(this, SIGNAL(ValueChanged(QVariant)), this, SLOT(ConvertValue(QVariant)));
}
+1
View File
@@ -29,6 +29,7 @@ TimeSlider::TimeSlider(QWidget *parent) :
IntegerSlider(parent)
{
SetMinimum(0);
SetValue(0);
connect(Core::instance(), &Core::TimecodeDisplayChanged, this, &TimeSlider::TimecodeDisplayChanged);
}