Add editor to a few more missing places.

4 files changed, 42 insertions, 54 deletions

diff --git a/cscript b/cscript
index dbcd3b7a2..6427db78d 100644
--- a/cscript
+++ b/cscript
@@ -325,6 +325,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_batch', file=f)
     print('%{_bindir}/dcpomatic2_cli', file=f)
     print('%{_bindir}/dcpomatic2_create', file=f)
+    print('%{_bindir}/dcpomatic2_editor', file=f)
     print('%{_bindir}/dcpomatic2_kdm', file=f)
     print('%{_bindir}/dcpomatic2_server', file=f)
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
@@ -339,6 +340,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_editor.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
@@ -363,6 +365,7 @@ def make_spec(filename, version, target, options, requires=None):
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
@@ -752,6 +755,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
             out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
+            out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
             return out
         else:
             if target.bits == 32:
@@ -783,6 +787,8 @@ def package(target, version, options):
                 packages.append((a, "com.dcpomatic.disk"))
             elif x.find("Combiner") != -1:
                 packages.append((a, "com.dcpomatic.combiner"))
+            elif x.find("Editor") != -1:
+                packages.append((a, "com.dcpomatic.editor"))
             else:
                 packages.append((a, "com.dcpomatic"))
         return packages
diff --git a/graphics/wscript b/graphics/wscript
index a5d477644..c87904683 100644
--- a/graphics/wscript
+++ b/graphics/wscript
@@ -23,7 +23,16 @@ def build(bld):
     # Linux application icons
     if bld.env.TARGET_LINUX and not bld.env.DISABLE_GUI:
         for r in [16, 22, 32, 48, 64, 128, 256, 512]:
-            for p in ['dcpomatic2', 'dcpomatic2_kdm', 'dcpomatic2_server', 'dcpomatic2_batch', 'dcpomatic2_player', 'dcpomatic2_playlist', 'dcpomatic2_disk', 'dcpomatic2_combiner']:
+            for p in [
+                'dcpomatic2',
+                'dcpomatic2_kdm',
+                'dcpomatic2_server',
+                'dcpomatic2_batch',
+                'dcpomatic2_player',
+                'dcpomatic2_playlist',
+                'dcpomatic2_disk',
+                'dcpomatic2_combiner',
+                'dcpomatic2_editor']:
                 bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), 'linux/%d/%s.png' % (r, p))
 
     # Install stuff for POSIX systems
diff --git a/platform/linux/dcpomatic_editor.desktop.in b/platform/linux/dcpomatic_editor.desktop.in
new file mode 100644
index 000000000..66e201129
--- /dev/null
+++ b/platform/linux/dcpomatic_editor.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_editor
+Name=DCP-o-matic 2 Editor
+Icon=dcpomatic2_editor
+Comment=DCP editor
+Categories=AudioVideo;Video
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 19e87db33..8518bd6b2 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -1,62 +1,25 @@
-def build(bld):
-    desktops = []
-
+def desktop(bld, suffix):
     obj = bld(features='subst')
-    obj.source = 'dcpomatic.desktop.in'
-    obj.target = 'dcpomatic2.desktop'
+    obj.source = f'dcpomatic{suffix}.desktop.in'
+    obj.target = 'dcpomatic2{suffix}.desktop'
     obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
     obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
+    return obj.target
 
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_batch.desktop.in'
-    obj.target = 'dcpomatic2_batch.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
-
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_server.desktop.in'
-    obj.target = 'dcpomatic2_server.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
-
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_kdm.desktop.in'
-    obj.target = 'dcpomatic2_kdm.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
+def build(bld):
+    desktops = [
+            desktop(bld, ''),
+            desktop(bld, '_batch'),
+            desktop(bld, '_server'),
+            desktop(bld, '_kdm'),
+            desktop(bld, '_player'),
+            desktop(bld, '_playlist'),
+            desktop(bld, '_combiner'),
+            desktop(bld, '_editor'),
+        ]
 
     if bld.env.ENABLE_DISK:
-        obj = bld(features='subst')
-        obj.source = 'dcpomatic_disk.desktop.in'
-        obj.target = 'dcpomatic2_disk.desktop'
-        obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-        obj.VERSION = bld.env.VERSION
-        desktops.append(obj.target)
-
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_player.desktop.in'
-    obj.target = 'dcpomatic2_player.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
-
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_playlist.desktop.in'
-    obj.target = 'dcpomatic2_playlist.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
-
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic_combiner.desktop.in'
-    obj.target = 'dcpomatic2_combiner.desktop'
-    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
-    obj.VERSION = bld.env.VERSION
-    desktops.append(obj.target)
+        desktops.append(desktop(bld, '_disk'))
 
     if not bld.env.DISABLE_GUI:
         bld.install_as('${PREFIX}/share/polkit-1/actions/com.dcpomatic.write-drive.policy', 'com.dcpomatic.write-drive.policy')