oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

began some rewrites to timeline drawing

Browse Source
This commit is contained in:
itsmattkc
2021-01-14 10:30:20 +11:00
parent fbdda3d6d4
commit f7883bd02c
60 changed files with 3134 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/footageviewer/footageviewer.cpp
+2 -2
View File
@@ -37,9 +37,9 @@ FootageViewerPanel::FootageViewerPanel(QWidget *parent) :
Retranslate();
}
QList<Footage *> FootageViewerPanel::GetSelectedFootage() const
QVector<Footage *> FootageViewerPanel::GetSelectedFootage() const
{
QList<Footage *> list;
QVector<Footage *> list;
Footage* f = static_cast<FootageViewerWidget*>(GetTimeBasedWidget())->GetFootage();
if (f) {
app/panel/footageviewer/footageviewer.h
+1 -1
View File
@@ -36,7 +36,7 @@ class FootageViewerPanel : public ViewerPanelBase, public FootageManagementPanel
public:
FootageViewerPanel(QWidget* parent);
virtual QList<Footage*> GetSelectedFootage() const override;
virtual QVector<Footage *> GetSelectedFootage() const override;
void SetFootage(Footage* f);
app/panel/project/footagemanagementpanel.h
+1 -1
View File
@@ -29,7 +29,7 @@ namespace olive {
class FootageManagementPanel {
public:
virtual QList<Footage*> GetSelectedFootage() const = 0;
virtual QVector<Footage*> GetSelectedFootage() const = 0;
};
}
app/panel/project/project.cpp
+4 -4
View File
@@ -115,7 +115,7 @@ void ProjectPanel::set_root(Item *item)
Retranslate();
}
QList<Item *> ProjectPanel::SelectedItems() const
QVector<Item *> ProjectPanel::SelectedItems() const
{
return explorer_->SelectedItems();
}
@@ -232,10 +232,10 @@ void ProjectPanel::SaveConnectedProject()
Core::instance()->SaveProject(this->project());
}
QList<Footage *> ProjectPanel::GetSelectedFootage() const
QVector<Footage *> ProjectPanel::GetSelectedFootage() const
{
QList<Item*> items = SelectedItems();
QList<Footage*> footage;
QVector<Item*> items = SelectedItems();
QVector<Footage*> footage;
foreach (Item* i, items) {
if (i->type() == Item::kFootage) {
app/panel/project/project.h
+2 -2
View File
@@ -44,11 +44,11 @@ public:
void set_root(Item* item);
QList<Item*> SelectedItems() const;
QVector<Item *> SelectedItems() const;
Folder* GetSelectedFolder() const;
virtual QList<Footage*> GetSelectedFootage() const override;
virtual QVector<Footage *> GetSelectedFootage() const override;
ProjectViewModel* model() const;
app/panel/timeline/timeline.cpp
+2 -2
View File
@@ -165,12 +165,12 @@ void TimelinePanel::ToggleSelectedEnabled()
static_cast<TimelineWidget*>(GetTimeBasedWidget())->ToggleSelectedEnabled();
}
void TimelinePanel::InsertFootageAtPlayhead(const QList<Footage *> &footage)
void TimelinePanel::InsertFootageAtPlayhead(const QVector<Footage *> &footage)
{
static_cast<TimelineWidget*>(GetTimeBasedWidget())->InsertFootageAtPlayhead(footage);
}
void TimelinePanel::OverwriteFootageAtPlayhead(const QList<Footage *> &footage)
void TimelinePanel::OverwriteFootageAtPlayhead(const QVector<Footage *> &footage)
{
static_cast<TimelineWidget*>(GetTimeBasedWidget())->OverwriteFootageAtPlayhead(footage);
}
app/panel/timeline/timeline.h
+2 -2
View File
@@ -83,9 +83,9 @@ public:
virtual void ToggleSelectedEnabled() override;
void InsertFootageAtPlayhead(const QList<Footage *> &footage);
void InsertFootageAtPlayhead(const QVector<Footage *> &footage);
void OverwriteFootageAtPlayhead(const QList<Footage *> &footage);
void OverwriteFootageAtPlayhead(const QVector<Footage *> &footage);
protected:
virtual void Retranslate() override;