Rename icon files to fit XDG specifications. Add file icons. Add mime types

Our SVG icons now follow XDG standards by including a vendor
prefix. The new file type icons include application-vnd.altusmetrum as
a prefix so that they match the mime types declared.

Signed-off-by: Keith Packard <keithp@keithp.com>

5 files changed, 87 insertions, 58 deletions

diff --git a/altosui/.gitignore b/altosui/.gitignore
index 10b600e4..b0c8264b 100644
--- a/altosui/.gitignore
+++ b/altosui/.gitignore
@@ -17,7 +17,7 @@ Altos-Linux-*.tar.bz2
 Altos-Linux-*.sh
 Altos-Mac-*.zip
 Altos-Windows-*.exe
-altos.desktop
+altusmetrum-altosui.desktop
 *.dll
 *.dylib
 *.so
diff --git a/altosui/Info.plist.in b/altosui/Info.plist.in
index bae6d52c..8dc797d6 100644
--- a/altosui/Info.plist.in
+++ b/altosui/Info.plist.in
@@ -23,14 +23,14 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleIconFile</key>
-	<string>AltosUIIcon.icns</string>
+	<string>altusmetrum-altosui.icns</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
 	    <key>CFBundleTypeName</key>
 	    <string>Telemetry</string>
 	    <key>CFBundleTypeIconFile</key>
-	    <string>AltosUIIcon.icns</string>
+	    <string>application-vnd.altusmetrum.telemetry.icns</string>
 	    <key>CFBundleTypeExtensions</key>
 	    <array>
 	      <string>telem</string>
@@ -42,7 +42,7 @@
 	    <key>CFBundleTypeName</key>
 	    <string>Eeprom</string>
 	    <key>CFBundleTypeIconFile</key>
-	    <string>AltosUIIcon.icns</string>
+	    <string>application-vnd.altusmetrum.eeprom.icns</string>
 	    <key>CFBundleTypeExtensions</key>
 	    <array>
 	      <string>eeprom</string>
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index bc074a95..45d75699 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -72,26 +72,37 @@ JAR=altosui.jar
 FATJAR=altosui-fat.jar
 
 # Icons
-ICONDIR=$(top_srcdir)/icon
+ICONDIR=../icon
 
 JAVA_ICONS=\
-	$(ICONDIR)/altus-metrum-16.png \
-	$(ICONDIR)/altus-metrum-32.png \
-	$(ICONDIR)/altus-metrum-48.png \
-	$(ICONDIR)/altus-metrum-64.png \
-	$(ICONDIR)/altus-metrum-128.png \
-	$(ICONDIR)/altus-metrum-256.png
+	$(ICONDIR)/altusmetrum-altosui-16.png \
+	$(ICONDIR)/altusmetrum-altosui-32.png \
+	$(ICONDIR)/altusmetrum-altosui-48.png \
+	$(ICONDIR)/altusmetrum-altosui-64.png \
+	$(ICONDIR)/altusmetrum-altosui-128.png\
+	$(ICONDIR)/altusmetrum-altosui-256.png
 
 # icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
-	-C $(ICONDIR) altus-metrum-32.png \
-	-C $(ICONDIR) altus-metrum-48.png \
-	-C $(ICONDIR) altus-metrum-64.png \
-	-C $(ICONDIR) altus-metrum-128.png \
-	-C $(ICONDIR) altus-metrum-256.png
-
-WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico $(ICONDIR)/altus-metrum.exe
-MACOSX_ICON=$(ICONDIR)/AltosUIIcon.icns
+ICONJAR= \
+	-C $(ICONDIR) altusmetrum-altosui-16.png \
+	-C $(ICONDIR) altusmetrum-altosui-32.png \
+	-C $(ICONDIR) altusmetrum-altosui-48.png \
+	-C $(ICONDIR) altusmetrum-altosui-64.png \
+	-C $(ICONDIR) altusmetrum-altosui-128.png\
+	-C $(ICONDIR) altusmetrum-altosui-256.png
+
+WINDOWS_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.ico \
+	$(ICONDIR)/altusmetrum-altosui.exe
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.ico \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.exe \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.ico \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.exe
+
+MACOSX_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.icns \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.icns \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.icns
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
@@ -141,14 +152,14 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 
 LINUX_LIBS=libaltos32.so libaltos64.so
 
-LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) $(desktop_file).in ../icon/altusmetrum.svg
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) $(desktop_file).in $(ICONDIR)/altusmetrum-altosui.svg
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICON)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICONS)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) $(FIRMWARE) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(WINDOWS_ICONS)
 
 all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
@@ -195,7 +206,6 @@ else
 fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
-
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar
@@ -325,7 +335,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/AltosUI.app/Contents
 	mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
-	cp -p $(MACOSX_ICON) macosx/AltosUI.app/Contents/Resources
+	cp -p $(MACOSX_ICONS) macosx/AltosUI.app/Contents/Resources
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java
diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index c6da097e..07de5b13 100644
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -4,12 +4,14 @@
 !include java.nsh
 !include refresh-sh.nsh
 
-!define REG_NAME "Altus Metrum"
-!define PROG_ID	     "org.altusmetrum.altosui.1"
-!define PROG_ALTOSUI "org.altusmetrum.altosui.1"
-!define FAT_NAME "altosui-fat.jar"
-!define ICO_ICO "altus-metrum.ico"
-!define ICO_EXE "altus-metrum.exe"
+!define REG_NAME	"Altus Metrum"
+!define PROG_ID_TELEM	"altusmetrum.altosui.telem.1"
+!define PROG_ID_EEPROM	"altusmetrum.altosui.eeprom.1"
+!define FAT_NAME	"altosui-fat.jar"
+!define WIN_APP_ICON	"altusmetrum-altosui.ico"
+!define WIN_APP_EXE	"altusmetrum-altosui.exe"
+!define WIN_TELEM_EXE	"application-vnd.altusmetrum.telemetry.exe"
+!define WIN_EEPROM_EXE	"application-vnd.altusmetrum.eeprom.exe"
 
 Name "${REG_NAME} Installer"
 
@@ -104,13 +106,13 @@ Section "${REG_NAME} Application"
 
 	File "*.dll"
 
-	File "../icon/${ICO_ICO}"
+	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$SYSDIR\javaw.exe" "-jar ${FAT_NAME}" "$INSTDIR\${ICO_ICO}"
+	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$SYSDIR\javaw.exe" "-jar ${FAT_NAME}" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
-	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${ICO_ICO}"
+	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "TeleMetrum, TeleDongle and TeleBT Firmware"
@@ -145,35 +147,51 @@ SectionEnd
 
 Section "File Associations"
 
+	${DisableX64FSRedirection}
+
 	SetOutPath $INSTDIR
 
-	File "../icon/${ICO_EXE}"
+	File "../icon/${WIN_APP_EXE}"
+	File "../icon/${WIN_TELEM_EXE}"
+	File "../icon/${WIN_EEPROM_EXE}"
 
-	; application elements
-	
-	WriteRegStr HKCR "${PROG_ID}"			""				"Altus Metrum Data File"
-	WriteRegStr HKCR "${PROG_ID}"			"FriendlyTypeName"		"Altus Metrum Data File"
-	WriteRegStr HKCR "${PROG_ID}\CurVer"		""				"${PROG_ID}"
-	WriteRegStr HKCR "${PROG_ID}\DefaultIcon"	""				'"$INSTDIR\${ICO_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID}\shell\play\command" ""				'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+	DeleteRegKey HKCR "${PROG_ID_TELEM}"
+	DeleteRegKey HKCR "${PROG_ID_EEPROM}"
+
+	DeleteRegKey   HKCR ".eeprom\${PROG_ID_EEPROM}"
+	DeleteRegValue HKCR ".eeprom\OpenWithProgids" "${PROG_ID_EEPROM}"
+	DeleteRegKey   HKCR ".telem\${PROG_ID_EEPROM}"
+	DeleteRegValue HKCR ".telem\OpenWithProgids" "${PROG_ID_EEPROM}"
 
 	; .eeprom elements
 
-	WriteRegStr HKCR ".eeprom"			""				"${PROG_ALTOSUI}"
+	WriteRegStr HKCR "${PROG_ID_EEPROM}"		""				"Altus Metrum Log File"
+	WriteRegStr HKCR "${PROG_ID_EEPROM}"		"FriendlyTypeName"		"Altus Metrum Log File"
+	WriteRegStr HKCR "${PROG_ID_EEPROM}\CurVer"	""				"${PROG_ID_EEPROM}"
+	WriteRegStr HKCR "${PROG_ID_EEPROM}\DefaultIcon" ""				'"$INSTDIR\${WIN_EEPROM_EXE}",-101'
+  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+
+	WriteRegStr HKCR ".eeprom"			""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR ".eeprom"			"PerceivedType"			"Altus Metrum Log File"
-	WriteRegStr HKCR ".eeprom"			"Content Type"			"application/altosui"
+	WriteRegStr HKCR ".eeprom"			"Content Type"			"application/vnd.altusmetrum.eeprom"
 
-	WriteRegStr HKCR ".eeprom\OpenWithProgids"	"${PROG_ID}"			""
-	WriteRegStr HKCR ".eeprom\${PROG_ID}"		""				"${REG_NAME}"
+	WriteRegStr HKCR ".eeprom\OpenWithProgids"	"${PROG_ID_EEPROM}"		""
+	WriteRegStr HKCR ".eeprom\${PROG_ID_EEPROM}"	""				"${REG_NAME}"
 	
 	; .telem elements
 	
-	WriteRegStr HKCR ".telem"			""				"${PROG_ALTOSUI}"
+	WriteRegStr HKCR "${PROG_ID_TELEM}"		""				"Altus Metrum Telemetry File"
+	WriteRegStr HKCR "${PROG_ID_TELEM}"		"FriendlyTypeName"		"Altus Metrum Telemetry File"
+	WriteRegStr HKCR "${PROG_ID_TELEM}\CurVer"	""				"${PROG_ID_TELEM}"
+	WriteRegStr HKCR "${PROG_ID_TELEM}\DefaultIcon" ""				'"$INSTDIR\${WIN_TELEM_EXE}",-101'
+  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+
+	WriteRegStr HKCR ".telem"			""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR ".telem"			"PerceivedType"			"Altus Metrum Telemetry File"
-	WriteRegStr HKCR ".telem"			"Content Type"			"application/altosui"
+	WriteRegStr HKCR ".telem"			"Content Type"			"application/vnd.altusmetrum.telemetry"
 
-	WriteRegStr HKCR ".telem\OpenWithProgids"	"${PROG_ID}"			""
-	WriteRegStr HKCR ".telem\${PROG_ID}"		""				"${REG_NAME}"
+	WriteRegStr HKCR ".telem\OpenWithProgids"	"${PROG_ID_TELEM}"		""
+	WriteRegStr HKCR ".telem\${PROG_ID_TELEM}"	""				"${REG_NAME}"
 
 	Call RefreshShellIcons
 SectionEnd
@@ -206,21 +224,22 @@ Section "Uninstall"
 
 	DetailPrint "Delete uninstall reg entries"
 
-	DeleteRegKey   HKCR "${PROG_ID}"
+	DeleteRegKey   HKCR "${PROG_ID_EEPROM}"
+	DeleteRegKey   HKCR "${PROG_ID_TELEM}"
 
-	DeleteRegKey   HKCR ".eeprom\${PROG_ID}"
-	DeleteRegValue HKCR ".eeprom\OpenWithProgids" "${PROG_ID}"
+	DeleteRegKey   HKCR ".eeprom\${PROG_ID_EEPROM}"
+	DeleteRegValue HKCR ".eeprom\OpenWithProgids" "${PROG_ID_EEPROM}"
 
-	DeleteRegKey   HKCR ".telem\${PROG_ID}"
-	DeleteRegValue HKCR ".telem\OpenWithProgids" "${PROG_ID}"
+	DeleteRegKey   HKCR ".telem\${PROG_ID_TELEM}"
+	DeleteRegValue HKCR ".telem\OpenWithProgids" "${PROG_ID_TELEM}"
 
 	DetailPrint "Delete file association reg entries"
 
 	Delete "$INSTDIR\${FAT_NAME}"
 	Delete "$INSTDIR\uninstall-${REG_NAME}.exe"
 
-	Delete "$INSTDIR\${ICO_ICO}"
-	Delete "$INSTDIR\${ICO_EXE}"
+	Delete "$INSTDIR\${WIN_APP_ICON}"
+	Delete "$INSTDIR\${WIN_APP_EXE}"
 
 	; Remove shortcuts, if any
 	Delete "$SMPROGRAMS\${REG_NAME}.lnk"
diff --git a/altosui/altusmetrum-altosui.desktop.in b/altosui/altusmetrum-altosui.desktop.in
index 716571ce..10fd9e9d 100644
--- a/altosui/altusmetrum-altosui.desktop.in
+++ b/altosui/altusmetrum-altosui.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Name=AltOS UI
 GenericName=Altus Metrum Ground Station
 Comment=View and log downlink data from Altus Metrum products
-Icon=%icondir%/altusmetrum.svg
+Icon=%icondir%/altusmetrum-altosui.svg
 Exec=%bindir%/altosui %f
 Terminal=false
 MimeType=application/vnd.altusmetrum.telemetry;application/vnd.altusmetrum.eeprom