Use the official Syphon icon in the GUI

Replace the drawn placeholder glyph with Syphon's own icon (from
Syphon-Framework, BSD 2-Clause) for the "Add Syphon Source" toolbar/menu
action and for Syphon source items in the source list. Vendored as a Qt
resource (:/add-syphon).

Author: aalex

resources/images/icons/syphon.png

@@ -10,6 +10,7 @@
         <file alias="add-video">images/icons/add_movie_w.png</file>
         <file alias="add-camera">images/icons/add_camera_w.png</file>
         <file alias="add-color">images/icons/add_paint_w.png</file>
+        <file alias="add-syphon">images/icons/syphon.png</file>
         <file alias="add-mesh">images/shapes/add_quad.png</file>
         <file alias="add-triangle">images/shapes/add_triangle.png</file>
         <file alias="add-ellipse">images/shapes/add_circle.png</file>

resources/interface.qrc

@@ -125,9 +125,6 @@ class Syphon : public Texture
   /// Lists the Syphon servers currently available on the system.
   static QList<SyphonServerDescription> availableServers();
 
-  /// Builds the default Syphon glyph icon (drawn, no binary asset required).
-  static QIcon defaultIcon(int size, const QColor& color);
-
 signals:
   /// Emitted once, the first time a real frame resolution becomes known, so the
   /// UI can fit input shapes created before any frame had arrived.

src/core/Syphon.h

@@ -34,9 +34,8 @@
 
 #include "MM.h"
 
-#include <QPainter>
-#include <QPixmap>
-#include <QFont>
+#include <QIcon>
+#include <QImage>
 #include <QDebug>
 
 #import <Foundation/Foundation.h>
@@ -428,36 +427,9 @@ void teardown()
   return SyphonImpl::availableServers();
 }
 
-QIcon Syphon::defaultIcon(int size, const QColor& color)
-{
-  QPixmap pixmap(size, size);
-  pixmap.fill(Qt::transparent);
-
-  QPainter p(&pixmap);
-  p.setRenderHint(QPainter::Antialiasing, true);
-
-  // Rounded square outline.
-  QPen pen(color);
-  pen.setWidthF(qMax(1.0, size / 16.0));
-  p.setPen(pen);
-  const qreal m = size * 0.12;
-  const qreal r = size * 0.18;
-  p.drawRoundedRect(QRectF(m, m, size - 2 * m, size - 2 * m), r, r);
-
-  // "S" glyph for Syphon.
-  QFont font = p.font();
-  font.setBold(true);
-  font.setPixelSize(int(size * 0.6));
-  p.setFont(font);
-  p.drawText(pixmap.rect(), Qt::AlignCenter, QStringLiteral("S"));
-  p.end();
-
-  return QIcon(pixmap);
-}
-
 QIcon Syphon::getIcon() const
 {
-  return defaultIcon(MM::MAPPING_LIST_ICON_SIZE, QColor(220, 220, 220));
+  return QIcon(":/add-syphon");
 }
 
 }

src/core/SyphonImpl.mm

@@ -1892,7 +1892,7 @@ void MainWindow::createActions()
   // Add Syphon source (macOS only).
   addSyphonAction = new QAction(tr("Add &Syphon Source..."), this);
   addSyphonAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_Y);
-  addSyphonAction->setIcon(Syphon::defaultIcon(24, QColor(230, 230, 230)));
+  addSyphonAction->setIcon(QIcon(":/add-syphon"));
   addSyphonAction->setToolTip(tr("Receive live video from another application via Syphon..."));
   addSyphonAction->setIconVisibleInMenu(false);
   addSyphonAction->setShortcutContext(Qt::ApplicationShortcut);