Import of filer icons for removeable SCSI drives (USB) and SD cards from Richard Hallas

Translated 'SDFS' messages into German.
Dummy resources run performed, no runtime testing.

Version 1.05. Tagged as 'ADFSFiler-1_05'

Makefile

@@ -22,31 +22,40 @@
 # 25-May-94  AMcC         Created.
 #
 
-COMPONENT ?= ADFSFiler
-ROM_SOURCE = s.ADFSFiler
-RESOURCEEXTRA = resources_${COMPONENT}
-PRIVATEMSGS = yes
+COMPONENT       ?= ADFSFiler
+ROM_SOURCE       = s.ADFSFiler
+RESOURCEEXTRA    = resources_${COMPONENT}
+PRIVATEMSGS      = yes
+ifeq (${TEMPLATES},yes)
+PRIVATETEMPLATES = resources_templates
+endif
 
 include StdTools
 include AAsmModule
 
+#
+# For ADFSFiler: templates + merged messages, sprites are in the Wimp pool
+#
 resources_ADFSFiler: resources_templates
 	@|
 
-resources_SCSIFiler: ${MERGEDMSGS}
+#
+# For SCSIFiler: sprites + merged messages, templates shared with ADFS unless requested explicitly
+#
+resources_SCSIFiler: ${MERGEDMSGS} ${PRIVATETEMPLATES}
 	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
-	IfThere LocalRes:^.Zip Then ${CP} LocalRes:^.Zip ${RESFSDIR}.Sprites ${CPFLAGS}
-	IfThere LocalRes:^.Zip11 Then ${CP} LocalRes:^.Zip11 ${RESFSDIR}.Sprites11 ${CPFLAGS}
-	IfThere LocalRes:^.Zip22 Then ${CP} LocalRes:^.Zip22 ${RESFSDIR}.Sprites22 ${CPFLAGS}
+	${INSTRES} -I Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} SCSI.Sprites
 
-ifeq (${SCSITEMPLATES},yes)
-resources_SCSIFiler: resources_templates
-endif
-
-resources_SDFSFiler: ${MERGEDMSGS}
+#
+# For SDFSFiler: sprites + merged messages, templates shared with ADFS unless requested explicitly
+#
+resources_SDFSFiler: ${MERGEDMSGS} ${PRIVATETEMPLATES}
 	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
-	${INSTRES} -I Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} SDFS.Sprites [SDFS.Sprites11] [SDFS.Sprites22] Templates
+	${INSTRES} -I Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} SDFS.Sprites
 
+#
+# Static dependencies:
+#
 o.${MACHINE}._Messages_.ADFSFiler:
 	${MKDIR} ${MERGEDMDIR}
 	${TOUCH} $@

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "1.04"
-Module_Version          SETA    104
+Module_MajorVersion     SETS    "1.05"
+Module_Version          SETA    105
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "14 Apr 2012"
-Module_ApplicationDate  SETS    "14-Apr-12"
+Module_Date             SETS    "30 Aug 2012"
+Module_ApplicationDate  SETS    "30-Aug-12"
 Module_ComponentName    SETS    "ADFSFiler"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
-Module_FullVersion      SETS    "1.04"
-Module_HelpVersion      SETS    "1.04 (14 Apr 2012)"
+Module_FullVersion      SETS    "1.05"
+Module_HelpVersion      SETS    "1.05 (30 Aug 2012)"
                         END

VersionNum

-/* (1.04)
+/* (1.05)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.04
+#define Module_MajorVersion_CMHG        1.05
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                14 Apr 2012
+#define Module_Date_CMHG                30 Aug 2012
 
-#define Module_MajorVersion             "1.04"
-#define Module_Version                  104
+#define Module_MajorVersion             "1.05"
+#define Module_Version                  105
 #define Module_MinorVersion             ""
-#define Module_Date                     "14 Apr 2012"
+#define Module_Date                     "30 Aug 2012"
 
-#define Module_ApplicationDate          "14-Apr-12"
+#define Module_ApplicationDate          "30-Aug-12"
 
 #define Module_ComponentName            "ADFSFiler"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
 
-#define Module_FullVersion              "1.04"
-#define Module_HelpVersion              "1.04 (14 Apr 2012)"
-#define Module_LibraryVersionInfo       "1:4"
+#define Module_FullVersion              "1.05"
+#define Module_HelpVersion              "1.05 (30 Aug 2012)"
+#define Module_LibraryVersionInfo       "1:5"