Cleanup for merge.

This commit is contained in:
Thomas Wilshaw
2021-04-14 12:48:44 +01:00
parent da275efdf2
commit 139adbdb31
8 changed files with 9 additions and 10 deletions
+1 -2
View File
@@ -1,6 +1,6 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2020 Olive Team
Copyright (C) 2021 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -127,7 +127,6 @@ QString RationalSlider::ValueToString(const QVariant &v)
case kTimestamp:
return QString::number(Timecode::time_to_timestamp(time, timebase_));
case kRational:
// Might we want to call reduce() on r here?
return v.value<rational>().toString();
case kFloat:
{
+2 -5
View File
@@ -1,6 +1,6 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2020 Olive Team
Copyright (C) 2021 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -27,10 +27,8 @@ namespace olive {
/**
* @brief A olive::rational based slider
*
* A slider that can display rationals as either timecode, a timestamp (frames), a rational (a/b)
* A slider that can display rationals as either timecode (drop or non-drop), a timestamp (frames),
* or a float (seconds).
*
* Control clikcing the slider (see sliderlabel.h) changes thedisplay type
*/
class RationalSlider : public SliderBase
{
@@ -42,7 +40,6 @@ public:
enum DisplayType {
kTimecode,
kTimestamp,
kRational,
kFloat
};
+1 -1
View File
@@ -57,7 +57,7 @@ void SliderLabel::mousePressEvent(QMouseEvent *e)
if (e->button() == Qt::LeftButton) {
if (e->modifiers() & Qt::AltModifier) {
emit RequestReset();
} else {
} else {
emit LabelPressed();
}
}