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

Squashed commit of the following:

Browse Source 
commit 60c0f65c5e3c2faf1f7b0ae10b4131dabbcf715b
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Feb 15 22:34:16 2023 -0800

    mainwindow: don't close last timeline panel when removing sequence

commit bc892810d67c1dd4f9c0639767c563681f29701d
Merge: 69051a120 aef08f8cd
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Feb 14 17:05:25 2023 -0800

    Merge branch 'master' into kddockwidgets

commit 69051a120b8423d0ad7b38def2f7555d323cd74d
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Feb 14 15:29:24 2023 -0800

    finished kddockwidgets integration

commit 9a39dbeade871a0b9454b424c7f7a7482671d40b
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Tue Feb 14 11:54:25 2023 -0800

    switch to kddockwidgets
This commit is contained in:
itsmattkc
2023-02-16 00:44:08 -08:00
parent 9a87b197b3
commit 25b6b07a06
49 changed files with 252 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/project/project.cpp
+3 -11
View File
@@ -34,8 +34,8 @@
namespace olive {
ProjectPanel::ProjectPanel(QWidget *parent) :
PanelWidget(QStringLiteral("ProjectPanel"), parent)
ProjectPanel::ProjectPanel(const QString &unique_name) :
PanelWidget(unique_name)
{
// Create main widget and its layout
QWidget* central_widget = new QWidget(this);
@@ -83,7 +83,6 @@ void ProjectPanel::set_project(Project* p)
if (project()) {
disconnect(project(), &Project::NameChanged, this, &ProjectPanel::UpdateSubtitle);
disconnect(project(), &Project::NameChanged, this, &ProjectPanel::ProjectNameChanged);
disconnect(project(), &Project::ModifiedChanged, this, &ProjectPanel::setWindowModified);
}
explorer_->set_project(p);
@@ -91,18 +90,11 @@ void ProjectPanel::set_project(Project* p)
if (project()) {
connect(project(), &Project::NameChanged, this, &ProjectPanel::UpdateSubtitle);
connect(project(), &Project::NameChanged, this, &ProjectPanel::ProjectNameChanged);
connect(project(), &Project::ModifiedChanged, this, &ProjectPanel::setWindowModified);
}
UpdateSubtitle();
emit ProjectNameChanged();
if (p) {
setWindowModified(p->is_modified());
} else {
setWindowModified(false);
}
}
Folder *ProjectPanel::get_root() const
@@ -197,7 +189,7 @@ void ProjectPanel::ShowNewMenu()
void ProjectPanel::UpdateSubtitle()
{
if (project()) {
QString project_title = QStringLiteral("[*]%1").arg(project()->name());
QString project_title = QStringLiteral("%1").arg(project()->name());
if (explorer_->get_root() != project()->root()) {
QString folder_path;