Commit 60f9c8de authored by Robert Sprowson's avatar Robert Sprowson
Browse files

New tool sprites added,plus associated change to Template file.

Version number now taken from VersionNum file at build time not the
messages file.
Saveing a draw file when a file of the same name already exists now
preserves the old files' attributes.
Tiny tickle for C99.

Version 1.12. Tagged as 'Draw-1_12'
parent 6933a1cf
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
......@@ -33,6 +33,8 @@ ROM_MODULE = aof.Draw
RDIR = Resources
LDIR = ${RDIR}.${LOCALE}
MSGS = Resources.GenMessage
#
# Export Paths for Messages module
#
......@@ -79,7 +81,7 @@ FILES =\
${LDIR}.!Help\
${LDIR}.!Run\
$(RDIR).!Sprites\
${LDIR}.Messages\
${MSGS} \
$(RDIR).Sprites\
${LDIR}.Templates\
abs.!RunImage
......@@ -89,7 +91,7 @@ FILESD =\
${LDIR}.!Help\
${LDIR}.!Run\
$(RDIR).!Sprites\
${LDIR}.Messages\
${MSGS} \
$(RDIR).Sprites\
${LDIR}.Templates\
abs.!RunImageD
......@@ -158,7 +160,7 @@ install: ${FILES}
$(CP) $(LDIR).!Run ${INSTDIR}.!Run ${CPFLAGS}
$(CP) abs.!RunImage ${INSTDIR}.!RunImage ${CPFLAGS}
$(CP) $(RDIR).!Sprites ${INSTDIR}.!Sprites ${CPFLAGS}
$(CP) $(LDIR).Messages ${INSTDIR}.Messages ${CPFLAGS}
${CP} ${MSGS} ${INSTDIR}.Messages ${CPFLAGS}
$(CP) $(RDIR).Sprites ${INSTDIR}.Sprites ${CPFLAGS}
$(CP) $(LDIR).Templates ${INSTDIR}.Templates ${CPFLAGS}
-Access ${INSTDIR}.!Boot lr/r
......@@ -194,14 +196,14 @@ installd: ${FILESD}
-Access ${INSTDIR}.Templates lr/r
@echo ${COMPONENT}: Application installed (Disc)
resources:
resources: ${MSGS}
${MKDIR} ${RESDIR}
${MKDIR} ${RESAPP}
${CP} ${RDIR}.ROM.!Boot ${RESAPP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${RESAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.ROM.!Run ${RESAPP}.!Run ${CPFLAGS}
|
${CP} ${LDIR}.Messages ${RESDIR}.Messages ${CPFLAGS}
${CP} ${MSGS} ${RESDIR}.Messages ${CPFLAGS}
${CP} ${LDIR}.Templates ${RESDIR}.Templates ${CPFLAGS}
@echo ${COMPONENT}: resource files copied to Messages module
......@@ -214,6 +216,7 @@ clean:
${WIPE} map.* ${WFLAGS}
${RM} abs.!RunImage
${RM} ${ROM_MODULE}
${RM} ${MSGS}
${RM} ${MODULE}
@echo ${COMPONENT}: cleaned
......@@ -275,18 +278,21 @@ rom_link:
${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom_link complete
oz.ModuleWrap: s.ModuleWrap s.AppName ${RESFILES} s.resfiles
oz.ModuleWrap: s.ModuleWrap ${MSGS} s.AppName ${RESFILES} s.resfiles
${AS} ${AFLAGS} s.ModuleWrap $@
s.ModuleWrap: ${WRAPPER}
${CP} ${WRAPPER} $@ ${CPFLAGS}
s.AppName: ${LDIR}.Messages
awk -f awk.AppName ${LDIR}.Messages > $@
${MSGS}: ${LDIR}.Messages awk.Version
awk -f awk.Version ${LDIR}.Messages > $@
s.ResFiles: asm.ResFiles
${CP} asm.ResFiles $@ ${CPFLAGS}
s.AppName: asm.AppName
${CP} asm.AppName $@ ${CPFLAGS}
#---------------------------------------------------------------------------
# debugging version:
#
......
No preview for this file type
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.62.
; Last processed by srccommit version: 1.68.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.11"
Module_Version SETA 111
Module_MajorVersion SETS "1.12"
Module_Version SETA 112
Module_MinorVersion SETS ""
Module_Date SETS "20 Apr 2000"
Module_ApplicationDate SETS "20-Apr-20"
Module_Date SETS "13 Jan 2003"
Module_ApplicationDate SETS "13-Jan-03"
Module_ComponentName SETS "Draw"
Module_ComponentPath SETS "RiscOS/Sources/Apps/Draw"
Module_FullVersion SETS "1.11"
Module_HelpVersion SETS "1.11 (20 Apr 2000)"
Module_FullVersion SETS "1.12"
Module_HelpVersion SETS "1.12 (13 Jan 2003)"
END
/* (1.11)
/* (1.12)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.62.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 1.11
#define Module_MajorVersion_CMHG 1.12
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Apr 2000
#define Module_Date_CMHG 13 Jan 2003
#define Module_MajorVersion "1.11"
#define Module_Version 194
#define Module_MajorVersion "1.12"
#define Module_Version 112
#define Module_MinorVersion ""
#define Module_Date "20 Apr 2000"
#define Module_Date "13 Jan 2003"
#define Module_ApplicationDate "20-Apr-00"
#define Module_ApplicationDate "13-Jan-03"
#define Module_ComponentName "Paint"
#define Module_ComponentPath "RiscOS/Sources/Apps/Paint"
#define Module_ComponentName "Draw"
#define Module_ComponentPath "RiscOS/Sources/Apps/Draw"
#define Module_FullVersion "1.11"
#define Module_HelpVersion "1.11 (20 Apr 2000)"
#define Module_LibraryVersionInfo "1:11"
#define Module_FullVersion "1.12"
#define Module_HelpVersion "1.12 (13 Jan 2003)"
#define Module_LibraryVersionInfo "1:12"
; AppName - generated from Messages, used by ModuleWrap
GBLS ApplicationName
GBLS ApplicationVersion
GET VersionASM
ApplicationName SETS "Draw"
ApplicationVersion SETS "$Module_MajorVersion ($Module_Date)"
END
#
# Output a messages file,with the ID token replaced with the date taken from the VersionNum file
#
BEGIN {
while (getline < "VersionNum" > 0) {
split($0, Version);
if (Version[1] == "#define") {
if (Version[2] == "Module_ApplicationDate") {
Date = substr(Version[3], 2, length(Version[3]) -2 );
}
if (Version[2] == "Module_MajorVersion_CMHG") {
VString = Version[3];
}
}
}
}
/^DrawID/ { printf("DrawID:%s (%s)\n", VString, Date); done = 1; next; }
{ print }
END {
if (!done) {
printf("DrawID:%s (%s)\n", VString, Date);
}
}
......@@ -768,15 +768,28 @@ static BOOL draw_file_create_file (char *name, int filetype, int bytecount)
{ ftracef0 ("draw_file: draw_file_create_file\n");
if (owner_xfersend.method == via_FILE)
{ os_filestr file;
int oldattribs = -1;
file.action = 17; /* Read cat info */
file.name = name;
(void) os_file(&file);
/* if something is already there,remember its attributes */
if (file.action != 0) oldattribs = file.end;
file.action /*r0*/ = 0xB; /*create stamped file*/
file.name /*r1*/ = name;
file.loadaddr /*r2*/ = filetype;
/*file.execaddr r3*/
file.start /*r4*/ = 0;
file.end /*r5*/ = bytecount;
if (wimpt_complain (os_file (&file))) return FALSE;
if (oldattribs != -1) {
file.action = 4; /* Write attribs */
file.end = oldattribs;
(void) os_file(&file);
};
}
return TRUE;
......
......@@ -194,7 +194,7 @@ static draw_dashstr pat4 = {0, 4, {dbc_FifthInch, dbc_TwentythInch,
#define linepatterntext "MenuLP1"
static draw_dashstr *linepatternvalue [6]={};
static draw_dashstr *linepatternvalue [6]={0};
static void init_static_arrays (void)
{ linepatternvalue [0] = 0;
......@@ -1970,9 +1970,9 @@ static menu mColour;
/* Definition of the standard grid sizes - must match the menu entries:
indexed by inch,cm, then menu subdivision */
static double gridSpace [] [] = {{1, 1, 1, 1, -1},
static double gridSpace [] [5] = {{1, 1, 1, 1, -1},
{1, 1, -1, 0, 0}};
static int gridDivide [] [] = {{4, 16, 5, 10, -1},
static int gridDivide [] [5] = {{4, 16, 5, 10, -1},
{2, 10, -1, 0, 0}};
static int grid_base [/*inch,cm*/] =
{s_Grid_Inch_userSpace, s_Grid_Cm_userSpace};
......
......@@ -144,7 +144,7 @@ typedef enum {alignLeft, alignRight, alignCentre, alignDouble} draw_align;
#define draw_textarea_BORDERY (dbc_FifthInch)
/* Font usage counter - more convenient for this to be global */
static draw_usedFont [256];
static int draw_usedFont [256];
/* Symbolic codes for font manager operations */
#define draw_font_vmove 11
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment