diff --git a/app/core.cpp b/app/core.cpp index 7854a5271..e2cf27a53 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -102,7 +102,7 @@ void Core::Start() startup_project_ = args.first(); } - // Declare custom types for Qt signal/slot syste + // Declare custom types for Qt signal/slot system DeclareTypesForQt(); // Set up node factory/library diff --git a/app/core.h b/app/core.h index 5cb9bc6cf..1d0988485 100644 --- a/app/core.h +++ b/app/core.h @@ -256,7 +256,7 @@ public slots: void CreateNewFolder(); /** - * @brief Createa a new sequence in the currently active project + * @brief Create a new sequence in the currently active project */ void CreateNewSequence(); diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp index cbb75d12e..59ab3198a 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp @@ -62,7 +62,7 @@ PreferencesGeneralTab::PreferencesGeneralTab() general_layout->addWidget(new QLabel(tr("Auto-Scroll Method:")), row, 0); - // ComboBox indices match enum indicies + // ComboBox indices match enum indices autoscroll_method_ = new QComboBox(); autoscroll_method_->addItem(tr("None"), AutoScroll::kNone); autoscroll_method_->addItem(tr("Page Scrolling"), AutoScroll::kPage); diff --git a/app/node/param.h b/app/node/param.h index 719253880..849a4a57e 100644 --- a/app/node/param.h +++ b/app/node/param.h @@ -248,7 +248,7 @@ public: const QString id() const; /** - * @brief The type of node paramter this is + * @brief The type of node parameter this is * * This must be set in subclasses, but most of the time you should probably subclass from NodeInput and NodeOutput * anyway. diff --git a/app/packaging/linux/CMakeLists.txt b/app/packaging/linux/CMakeLists.txt index 037470651..ffef26e04 100644 --- a/app/packaging/linux/CMakeLists.txt +++ b/app/packaging/linux/CMakeLists.txt @@ -35,17 +35,13 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.olivevideoeditor.Olive.appdata.xml install(FILES org.olivevideoeditor.Olive.desktop DESTINATION share/applications) install(FILES org.olivevideoeditor.Olive.xml DESTINATION share/mime/packages) -install(FILES icons/16x16/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/16x16/apps) -install(FILES icons/32x32/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/32x32/apps) -install(FILES icons/48x48/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/48x48/apps) -install(FILES icons/64x64/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/64x64/apps) -install(FILES icons/128x128/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/128x128/apps) -install(FILES icons/256x256/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/256x256/apps) -install(FILES icons/512x512/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/512x512/apps) -install(FILES icons/16x16/application-vnd.olive-project.png DESTINATION share/icons/hicolor/16x16/mimetypes) -install(FILES icons/32x32/application-vnd.olive-project.png DESTINATION share/icons/hicolor/32x32/mimetypes) -install(FILES icons/48x48/application-vnd.olive-project.png DESTINATION share/icons/hicolor/48x48/mimetypes) -install(FILES icons/64x64/application-vnd.olive-project.png DESTINATION share/icons/hicolor/64x64/mimetypes) -install(FILES icons/128x128/application-vnd.olive-project.png DESTINATION share/icons/hicolor/128x128/mimetypes) -install(FILES icons/256x256/application-vnd.olive-project.png DESTINATION share/icons/hicolor/256x256/mimetypes) -install(FILES icons/512x512/application-vnd.olive-project.png DESTINATION share/icons/hicolor/512x512/mimetypes) +foreach(size 16 32 48 64 128 256 512) + install( + FILES icons/${size}x${size}/org.olivevideoeditor.Olive.png + DESTINATION share/icons/hicolor/${size}x${size}/apps + ) + install( + FILES icons/${size}x${size}/application-vnd.olive-project.png + DESTINATION share/icons/hicolor/${size}x${size}/mimetypes + ) +endforeach() diff --git a/app/project/projectimportmanager.cpp b/app/project/projectimportmanager.cpp index 9448fc875..096524874 100644 --- a/app/project/projectimportmanager.cpp +++ b/app/project/projectimportmanager.cpp @@ -47,7 +47,7 @@ void ProjectImportManager::Import(Folder *folder, const QFileInfoList &import, i break; } - // Check if this file is a diretory + // Check if this file is a directory if (file_info.isDir()) { // QDir::entryList only returns filenames, we can use entryInfoList() to get full paths diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp index 8d4cf1b5e..bb51f56ea 100644 --- a/app/render/backend/renderbackend.cpp +++ b/app/render/backend/renderbackend.cpp @@ -67,7 +67,7 @@ void RenderBackend::Close() CloseInternal(); for (int i=0;iClear(); } diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp index 781cd201c..a459d03e9 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.cpp +++ b/app/widget/nodeparamview/nodeparamviewitem.cpp @@ -147,7 +147,7 @@ void NodeParamViewItem::SetupUI() NodeParamViewWidgetBridge* bridge = new NodeParamViewWidgetBridge(input, this); bridges_.append(bridge); - // Add widgets for this parameter ot the layout + // Add widgets for this parameter to the layout const QList& widgets_for_param = bridge->widgets(); for (int i=0;iaddWidget(widgets_for_param.at(i), row_count, i + 1); diff --git a/app/widget/nodeview/nodeviewitem.h b/app/widget/nodeview/nodeviewitem.h index 363b080aa..cc03e02d7 100644 --- a/app/widget/nodeview/nodeviewitem.h +++ b/app/widget/nodeview/nodeviewitem.h @@ -49,7 +49,7 @@ public: void SetNode(Node* n); /** - * @brief Get currently attached noe + * @brief Get currently attached node */ Node* node(); diff --git a/app/widget/nodeview/nodeviewundo.h b/app/widget/nodeview/nodeviewundo.h index 042eadd2a..02389cf48 100644 --- a/app/widget/nodeview/nodeviewundo.h +++ b/app/widget/nodeview/nodeviewundo.h @@ -9,7 +9,7 @@ #include "undo/undocommand.h" /** - * @brief An undoable commnd for connecting two NodeParams together + * @brief An undoable command for connecting two NodeParams together * * Can be considered a QUndoCommand wrapper for NodeParam::ConnectEdge()/ */ @@ -31,7 +31,7 @@ private: }; /** - * @brief An undoable commnd for disconnecting two NodeParams + * @brief An undoable command for disconnecting two NodeParams * * Can be considered a QUndoCommand wrapper for NodeParam::DisonnectEdge()/ */ diff --git a/appveyor.yml b/appveyor.yml index 4fff08dc3..ed053f1e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ image: Visual Studio 2017 environment: TRAVIS_REPO_SLUG: olive-editor/olive -# Hack to not buid the "continuous" tag (https://github.com/appveyor/ci/issues/486) -# FIXME: Will unforttunately skip release tags +# Hack to not build the "continuous" tag (https://github.com/appveyor/ci/issues/486) +# FIXME: Will unfortunately skip release tags skip_tags: true install: