Merge branch 'master' of https://github.com/olive-editor/olive

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

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();
 

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);

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.

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()

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

app/render/backend/renderbackend.cpp

@@ -67,7 +67,7 @@ void RenderBackend::Close()
   CloseInternal();
 
   for (int i=0;i<processors_.size();i++) {
-    // Invoke close and quit signals on processor and thred
+    // Invoke close and quit signals on processor and thread
     QMetaObject::invokeMethod(processors_.at(i),
                               "Close",
                               Qt::QueuedConnection);

app/task/task.h

@@ -35,7 +35,7 @@
  * To subclass your own Task, override Action() and return TRUE on success or FALSE on failure. Note that a Task can
  * provide a "negative" output and still have succeeded. For example, the ProbeTask's role is to determine whether a
  * certain media file can be used in Olive. Even if the probe *fails* to find a Decoder for this file, the Task itself
- * has *suceeded* at discovering this. A failure of ProbeTask would indicate a catastrophic failure meaning it was
+ * has *succeeded* at discovering this. A failure of ProbeTask would indicate a catastrophic failure meaning it was
  * unable to determine anything about the file.
  *
  * Tasks should be used with the TaskManager which will manage starting and deleting them. It'll also only start as

app/widget/curvewidget/curveview.cpp

@@ -21,7 +21,7 @@ CurveView::CurveView(QWidget *parent) :
 
 CurveView::~CurveView()
 {
-  // Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other memebers have been destroyed
+  // Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other members have been destroyed
   Clear();
 }
 

app/widget/curvewidget/curvewidget.cpp

@@ -80,7 +80,7 @@ CurveWidget::CurveWidget(QWidget *parent) :
 
 CurveWidget::~CurveWidget()
 {
-  // Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other memebers have been destroyed
+  // Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other members have been destroyed
   view_->Clear();
 }
 

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<QWidget*>& widgets_for_param = bridge->widgets();
       for (int i=0;i<widgets_for_param.size();i++) {
         content_layout_->addWidget(widgets_for_param.at(i), row_count, i + 1);

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();
 

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()/
  */

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: