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

minor code cleanups

Browse Source
This commit is contained in:
itsmattkc
2019-03-05 10:15:39 -08:00
parent f9e7c3a3dd
commit 95977143d0
8 changed files with 245 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/media.cpp
+8 -2
View File
@@ -86,7 +86,8 @@ void Media::set_footage(FootagePtr f) {
}
void Media::set_sequence(SequencePtr s) {
set_icon(QIcon(":/icons/sequence.svg"));
// ensure icon setting occurs in a separate thread
set_icon(":/icons/sequence.svg");
type = MEDIA_TYPE_SEQUENCE;
object = VoidPtr(s);
if (s != nullptr) update_tooltip();
@@ -94,11 +95,16 @@ void Media::set_sequence(SequencePtr s) {
void Media::set_folder() {
if (folder_name.isEmpty()) folder_name = QCoreApplication::translate("Media", "New Folder");
set_icon(QIcon(":/icons/folder.svg"));
set_icon(":/icons/folder.svg");
type = MEDIA_TYPE_FOLDER;
object = nullptr;
}
void Media::set_icon(const QString &str)
{
set_icon(QIcon(str));
}
void Media::set_icon(const QIcon &ico) {
icon = ico;
}