From 139adbdb31bc356c4f6856a0df3daabe544c98fe Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Wed, 14 Apr 2021 12:43:34 +0100 Subject: [PATCH] Cleanup for merge. --- app/panel/timebased/timebased.h | 1 + app/widget/menu/menushared.cpp | 2 +- app/widget/nodeparamview/nodeparamview.cpp | 1 - app/widget/nodeparamview/nodeparamviewitem.h | 2 ++ app/widget/nodeparamview/nodeparamviewwidgetbridge.h | 1 + app/widget/slider/rationalslider.cpp | 3 +-- app/widget/slider/rationalslider.h | 7 ++----- app/widget/slider/sliderlabel.cpp | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/panel/timebased/timebased.h b/app/panel/timebased/timebased.h index 7394bc280..984e2ba6e 100644 --- a/app/panel/timebased/timebased.h +++ b/app/panel/timebased/timebased.h @@ -41,6 +41,7 @@ public: rational GetTime(); + // Get the timebase of this panels widget const rational& timebase(); ViewerOutput *GetConnectedViewer() const diff --git a/app/widget/menu/menushared.cpp b/app/widget/menu/menushared.cpp index c61f22335..51260c9b0 100644 --- a/app/widget/menu/menushared.cpp +++ b/app/widget/menu/menushared.cpp @@ -163,7 +163,7 @@ void MenuShared::AddItemsForClipEditMenu(Menu *m) void MenuShared::AddItemsForTimeRulerMenu(Menu *m, const rational& timebase) { // If a menu is already created (such as the view menu) we need to remove the instance - // of dropfram or non-dropframe timecode that is already there to avoid double displays + // of dropframe or non-dropframe timecode that is already there to avoid double displays if (m->actions().contains(view_timecode_view_dropframe_item_)) { m->removeAction(view_timecode_view_dropframe_item_); diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp index bbb9b7fb2..eb37ef242 100644 --- a/app/widget/nodeparamview/nodeparamview.cpp +++ b/app/widget/nodeparamview/nodeparamview.cpp @@ -133,7 +133,6 @@ NodeParamView::NodeParamView(QWidget *parent) : &QApplication::focusChanged, this, &NodeParamView::FocusChanged); - } void NodeParamView::SelectNodes(const QVector &nodes) diff --git a/app/widget/nodeparamview/nodeparamviewitem.h b/app/widget/nodeparamview/nodeparamviewitem.h index 813da7221..12899525f 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.h +++ b/app/widget/nodeparamview/nodeparamviewitem.h @@ -85,6 +85,7 @@ public: int GetElementY(NodeInput c) const; + // Set the timebase of any timebased widgets contained here void SetTimebase(const rational& timebase); signals: @@ -169,6 +170,7 @@ public: void SetTime(const rational& time); + // Set the timebase of the NodeParamViewItemBody void SetTimebase(const rational& timebase); Node* GetNode() const; diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h index cba43e1a6..e12892702 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h @@ -49,6 +49,7 @@ public: return widgets_; } + // Set the timebase of certain Timebased widgets void SetTimebase(const rational& timebase); signals: diff --git a/app/widget/slider/rationalslider.cpp b/app/widget/slider/rationalslider.cpp index bb5f093c1..d7f2299e7 100644 --- a/app/widget/slider/rationalslider.cpp +++ b/app/widget/slider/rationalslider.cpp @@ -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().toString(); case kFloat: { diff --git a/app/widget/slider/rationalslider.h b/app/widget/slider/rationalslider.h index 3f171f5c2..5a077c76c 100644 --- a/app/widget/slider/rationalslider.h +++ b/app/widget/slider/rationalslider.h @@ -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 }; diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp index fbccd3c53..3aa37ecca 100644 --- a/app/widget/slider/sliderlabel.cpp +++ b/app/widget/slider/sliderlabel.cpp @@ -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(); } }