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

simple UI for tasks

Browse Source
This commit is contained in:
itsmattkc
2019-06-29 01:42:07 -07:00
parent 1a25a14a61
commit 84720b39cb
16 changed files with 405 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+8
View File
@@ -0,0 +1,8 @@
# Contributing to Olive
### Standards
When contributing to Olive, it's recommended to use the following rules:
* [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html)
* 120 column limit
app/core.cpp
-5
View File
@@ -155,11 +155,6 @@ void Core::ImportFiles(const QStringList &urls)
f->set_timestamp(file_info.lastModified());
//olive::ProbeMedia(f);
// FIXME: Test code only
for (int i=0;i<8;i++) {
olive::task_manager.AddTask(new Task());
}
// End test code
active_project->root()->add_child(f);
app/panel/CMakeLists.txt
+1
View File
@@ -15,6 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
add_subdirectory(project)
add_subdirectory(taskmanager)
add_subdirectory(timeline)
add_subdirectory(tool)
add_subdirectory(viewer)
app/panel/taskmanager/CMakeLists.txt
+22
View File
@@ -0,0 +1,22 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 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
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set(OLIVE_SOURCES
${OLIVE_SOURCES}
panel/taskmanager/taskmanager.h
panel/taskmanager/taskmanager.cpp
PARENT_SCOPE
)
app/panel/taskmanager/taskmanager.cpp
+52
View File
@@ -0,0 +1,52 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "taskmanager.h"
#include "task/taskmanager.h"
TaskManagerPanel::TaskManagerPanel(QWidget* parent) :
PanelWidget(parent)
{
// Create task view
view_ = new TaskView(this);
// Set it as the main widget
setWidget(view_);
// Connect task view to the task manager
connect(&olive::task_manager, SIGNAL(TaskAdded(Task*)), view_, SLOT(AddTask(Task*)));
// Set strings
Retranslate();
}
void TaskManagerPanel::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
Retranslate();
}
QDockWidget::changeEvent(e);
}
void TaskManagerPanel::Retranslate()
{
SetTitle(tr("Task Manager"));
}
app/panel/taskmanager/taskmanager.h
+42
View File
@@ -0,0 +1,42 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TASKMANAGER_PANEL_H
#define TASKMANAGER_PANEL_H
#include "widget/taskview/taskview.h"
#include "widget/panel/panel.h"
class TaskManagerPanel : public PanelWidget
{
Q_OBJECT
public:
TaskManagerPanel(QWidget* parent);
protected:
virtual void changeEvent(QEvent* e) override;
private:
void Retranslate();
TaskView* view_;
};
#endif // TASKMANAGER_H
app/task/task.h
+2
View File
@@ -58,6 +58,8 @@ protected:
signals:
void StatusChanged(Task::Status s);
void ProgressChanged(int p);
private:
void set_status(const Status& status);
app/task/taskmanager.cpp
+3
View File
@@ -38,6 +38,9 @@ void TaskManager::AddTask(Task* t)
// Add the Task to the queue
tasks_.append(t);
// Emit signal that a Task was added
emit TaskAdded(t);
// Scan through queue and start any Tasks that can (including this one)
StartNextWaiting();
}
app/task/taskmanager.h
+10
View File
@@ -56,6 +56,16 @@ public:
*/
void AddTask(Task *t);
signals:
/**
* @brief Signal emitted when a Task is added by AddTask()
*
* @param t
*
* Task that was added
*/
void TaskAdded(Task* t);
private:
/**
* @brief Scan through the task queue and start any Tasks that are able to start
app/widget/CMakeLists.txt
+1
View File
@@ -20,6 +20,7 @@ add_subdirectory(panel)
add_subdirectory(playbackcontrols)
add_subdirectory(projectexplorer)
add_subdirectory(projecttoolbar)
add_subdirectory(taskview)
add_subdirectory(toolbar)
add_subdirectory(viewer)
app/widget/taskview/CMakeLists.txt
+24
View File
@@ -0,0 +1,24 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 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
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set(OLIVE_SOURCES
${OLIVE_SOURCES}
widget/taskview/taskview.h
widget/taskview/taskview.cpp
widget/taskview/taskviewitem.h
widget/taskview/taskviewitem.cpp
PARENT_SCOPE
)
app/widget/taskview/taskview.cpp
+52
View File
@@ -0,0 +1,52 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "taskview.h"
#include <QPushButton>
TaskView::TaskView(QWidget* parent) :
QScrollArea(parent)
{
// Allow scroll area to resize widget to fit
setWidgetResizable(true);
// Create central widget
central_widget_ = new QWidget(this);
setWidget(central_widget_);
// Create layout for central widget
layout_ = new QVBoxLayout(central_widget_);
layout_->setSpacing(0);
layout_->setMargin(0);
// Add a "stretch" so that TaskViewItems don't try to expand all the way to the bottom
layout_->addStretch();
}
void TaskView::AddTask(Task *t)
{
// Create TaskViewItem (UI representation of a Task) and connect it
TaskViewItem* item = new TaskViewItem(central_widget_);
item->SetTask(t);
layout_->insertWidget(0, item);
}
app/widget/taskview/taskview.h
+43
View File
@@ -0,0 +1,43 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TASKVIEW_H
#define TASKVIEW_H
#include <QScrollArea>
#include <QVBoxLayout>
#include "widget/taskview/taskviewitem.h"
class TaskView : public QScrollArea
{
Q_OBJECT
public:
TaskView(QWidget* parent);
public slots:
void AddTask(Task* t);
private:
QWidget* central_widget_;
QVBoxLayout* layout_;
};
#endif // TASKVIEW_H
app/widget/taskview/taskviewitem.cpp
+90
View File
@@ -0,0 +1,90 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "taskviewitem.h"
#include <QVBoxLayout>
TaskViewItem::TaskViewItem(QWidget *parent) :
QFrame(parent),
task_(nullptr)
{
// Draw border around this item
setFrameShape(QFrame::StyledPanel);
// Create layout
QVBoxLayout* layout = new QVBoxLayout(this);
// Create header label
task_name_lbl_ = new QLabel(this);
layout->addWidget(task_name_lbl_);
// Create progress bar
progress_bar_ = new QProgressBar(this);
progress_bar_->setRange(0, 100);
layout->addWidget(progress_bar_);
// Create status label
task_status_lbl_ = new QLabel(this);
layout->addWidget(task_status_lbl_);
}
void TaskViewItem::SetTask(Task *t)
{
// Check if we already have a task and disconnect from it if so
if (task_ != nullptr) {
disconnect(task_, SIGNAL(StatusChanged(Task::Status)), this, SLOT(TaskStatusChange(Task::Status)));
disconnect(task_, SIGNAL(ProgressChanged(int)), progress_bar_, SLOT(setValue(int)));
}
// Set task
task_ = t;
// Set name label to the name (bolded)
task_name_lbl_->setText(QString("<b>%1</b>").arg(task_->text()));
// Connect to the task
connect(t, SIGNAL(StatusChanged(Task::Status)), this, SLOT(TaskStatusChange(Task::Status)));
connect(t, SIGNAL(ProgressChanged(int)), progress_bar_, SLOT(setValue(int)));
}
void TaskViewItem::TaskStatusChange(Task::Status status)
{
switch (status) {
case Task::kWaiting:
task_status_lbl_->setText(tr("Waiting..."));
progress_bar_->setValue(0);
break;
case Task::kWorking:
task_status_lbl_->setText(tr("Working..."));
progress_bar_->setValue(0);
break;
case Task::kFinished:
task_status_lbl_->setText(tr("Done"));
progress_bar_->setValue(100);
break;
case Task::kError:
task_status_lbl_->setText(
tr("Error: %1").arg(static_cast<Task*>(sender())->error())
);
progress_bar_->setValue(0);
break;
}
}
app/widget/taskview/taskviewitem.h
+50
View File
@@ -0,0 +1,50 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 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
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TASKVIEWITEM_H
#define TASKVIEWITEM_H
#include <QLabel>
#include <QProgressBar>
#include <QWidget>
#include "task/task.h"
class TaskViewItem : public QFrame
{
Q_OBJECT
public:
TaskViewItem(QWidget* parent);
void SetTask(Task* t);
private:
QLabel* task_name_lbl_;
QProgressBar* progress_bar_;
QLabel* task_status_lbl_;
Task* task_;
private slots:
void TaskStatusChange(Task::Status status);
};
#endif // TASKVIEWITEM_H
app/window/mainwindow/mainwindow.cpp
+5 -1
View File
@@ -24,9 +24,10 @@
// Panel objects
#include "panel/project/project.h"
#include "panel/viewer/viewer.h"
#include "panel/taskmanager/taskmanager.h"
#include "panel/timeline/timeline.h"
#include "panel/tool/tool.h"
#include "panel/viewer/viewer.h"
// Main menu bar
#include "mainmenu.h"
@@ -67,6 +68,9 @@ void olive::MainWindow::ProjectOpen(Project* p)
ToolPanel* tool_panel = new ToolPanel(this);
addDockWidget(Qt::BottomDockWidgetArea, tool_panel);
TaskManagerPanel* task_panel = new TaskManagerPanel(this);
addDockWidget(Qt::BottomDockWidgetArea, task_panel);
TimelinePanel* timeline_panel = new TimelinePanel(this);
addDockWidget(Qt::BottomDockWidgetArea, timeline_panel);
}