Commit Graph

167 Commits

Author SHA1 Message Date
Andy McFadden
e5ac0ac631 Fix OMF version confusion
VERSION=0/1/2 corresponds, simply, to v0/v1/v2, where v0 was only
used for some older 8-bit Orca/M stuff.  v2.1 can be detected by
looking for the optional "tempOrg" field.

Also, allow the disk version number to be set to zero in 2IMG images.
2020-06-25 14:12:29 -07:00
Andy McFadden
e625ab5f3a Version 4.0.4-d1
The latest DeployMaster got fussy about registry keys and whether
it's installing for the computer or a single user.  Seemed to work
okay on my system.
2020-03-26 11:09:20 -07:00
Andy McFadden
8d5e07e683 Allow files larger than 16MB to be added to HFS volumes
Ideally this would add a "what's your limit" call to the disk image
library, but this will do for now.
2020-03-26 11:08:24 -07:00
Andy McFadden
8ecb8e35eb Fix INSTR( token in Apple /// Business BASIC
Should be "INSTR(" rather than "INSTR$(".  Fixes issue #38.
2019-10-27 08:05:12 -07:00
Andy McFadden
31197837fe Update version to 4.0.3 2017-12-12 10:54:20 -08:00
Andy McFadden
da182e1c61 Change file extraction extension handling
When extracting files, you can ask CiderPress to add a file extension
by checking the "add file extension" box.  Whether or not this box
is checked, files that undergo a format conversion (e.g. AWP to RTF,
or SHR to BMP) have a file extension added to identify the file's
new format.

This turned out to be confusing and inconvenient at times, notably
when working with Merlin source files.  See issues #10 and #26 on
github for details.

CiderPress no longer adds file extensions to format-converted files
unless the "add file extension" box is checked.  (The "Configure for
easy access in Windows" button checks this box for you, so the
default behavior is still "safe".)

Also, fix a minor visual glitch in the extract dialog.

Also, update to version 4.0.3-a3.
2017-12-01 13:48:50 -08:00
Andy McFadden
1c2b187a32 Release v4.0.3-a2 2017-11-13 14:33:08 -08:00
Andy McFadden
2adbe9591f Add optional MouseText-to-ASCII conversion
The AWP5 MouseText output is okay for some things but not others.
This adds an ASCII conversion, enabled through a preference.
2017-11-13 14:24:58 -08:00
Andy McFadden
3d88397024 Adjust width of extract dialog
The last letter of "Auto-detect & convert files with text" was being
cut off.
2017-11-13 12:59:34 -08:00
Andy McFadden
35a897b248 Add support for AW5 inverse and MouseText
AppleWorks 5 added inverse text and MouseText.  We can handle inverse
text with RTF features, and convert MouseText to something vaguely
similar in the Unicode symbol set.
2017-11-11 14:53:28 -08:00
Andy McFadden
640959dad5 Fix 64-bit math error
32-bit * 32-bit = 32-bit, so disk images with partitions whose size
exceeded the capacity of a 32-bit int were coming out wrong.

Updated version to 4.0.3-a1.
2017-10-30 10:17:54 -07:00
Andy McFadden
c2e3fb8353 Update version for v4.0.2 release 2017-09-22 17:40:23 -07:00
Andy McFadden
d35a9670b5 Rework Super Hi-Res handling, particularly APF
We weren't handling oddly sized images well.  This was mostly a
problem for Apple Preferred Format, PNT/$0002.
2017-09-22 16:23:33 -07:00
Andy McFadden
549342b3d9 Fix file viewer glitch with empty output
The file viewer was seeing zero-length formatted output and assuming
that it was the result of zero-length input.  This is a problem
because the code disables the format options when there's nothing to
format.  This resulted in the strange behavior noted in issue #14.

Now the "is source empty" value is passed explicitly, and we display
a different message when the formatter fails.
2017-09-22 11:25:08 -07:00
Andy McFadden
9f0640142d Update deploy file for v4.0.2-a3 2017-09-21 15:06:38 -07:00
Andy McFadden
1797536793 Update version to 4.0.2-a3 2017-09-21 13:59:33 -07:00
Andy McFadden
8e326f2f62 Fix for issue #20
Reject NuDateTime structs with invalid fields.  Passing bogus values
to the ATL CTime constructor does bad things.
2017-09-21 12:20:16 -07:00
Andy McFadden
a8c2e4cfd6 Bump copyright date 2016-01-11 13:52:30 -08:00
Andy McFadden
c1694deb7e Added notes about VS2015CE and WinXP 2016-01-11 13:41:54 -08:00
Andy McFadden
98f098d421 Half-step toward VS2015 CE
When initially opened in Visual Studio 2015 Community Edition, the
project was updated to use the v140_xp toolset.  When the program
was run under WinXP it complained about a missing runtime DLL.  When
the DLL was provided, it complained about another one (with a
slightly strange name).  So I reverted the tools to v120_xp, i.e.
Visual Studio 2013.  (I don't know if this works because the tools
are included with VS2015, or because I have VS2013 installed and it
managed to find them.)

Whatever the case, it now builds for me with either IDE, and seems
to work fine on Windows XP, but I'd like to figure out why the XP
build isn't working with the v140_xp tools.
2016-01-11 11:33:41 -08:00
Andy McFadden
9e2fded3b9 Bump version to v4.0.2-a2 2016-01-11 11:16:01 -08:00
Andy McFadden
c7869c38a5 Initialize fUseRTF to "true"
The field wasn't being initialized, so if you did things in a
certain way (open a .SDK as a ShrinkIt archive, double-click on
the disk image, then view an AppleWorks AWP document), the flag
might be initialized to "false" and you'd lose the formatting.
2016-01-11 10:53:32 -08:00
Andy McFadden
6153b0f9a1 Pull in recent nufxlib changes
Update to v3.1.0-a2.
2016-01-11 10:30:08 -08:00
Andy McFadden
ebef6a27c2 Fix display of invalid resource forks
We were dumping various fields, but if the resource fork was too
short we were actually dumping uninitialized data.

Also, bumped version to 4.0.2-a1.
2015-12-26 17:07:46 -08:00
Andy McFadden
6bcf388c3e Update NufxLib with recent 3.1.0 changes 2015-12-26 16:50:42 -08:00
Andy McFadden
7596c950fa Propagate change from NuLib2 (snprintf in VS2015) 2015-11-15 15:38:21 -08:00
Andy McFadden
8bbe730184 Merge branch 'master' of https://github.com/fadden/ciderpress 2015-08-24 09:00:41 -07:00
Andy McFadden
f8dbc6530b Bump version to 4.0.1 2015-08-24 09:00:20 -07:00
Andy McFadden
1c254de31d Merge pull request #12 from boblaublaw/master
the only fix needed for OS X support
2015-08-03 21:07:50 -07:00
boblaublaw
654f0e64b9 removing ifdef, including time.h is fine 2015-08-03 18:14:13 -07:00
boblaublaw
5d1eb055da the only fix needed for OS X support 2015-08-02 20:35:24 -07:00
Andy McFadden
92942437d9 Add LZ4FH support
Also, bump version to 4.0.1-a3.
2015-08-02 13:34:51 -07:00
Andy McFadden
adb65c5e9d Fix Merlin file formatting
The code was mis-handling semicolons embedded in macros, treating
them as the start of a comment.  It now checks to see if they're
at the start of a line or preceded by a space.
2015-07-01 09:05:07 -07:00
Andy McFadden
8c1707e28b Update for 4.0.1-a1 release 2015-02-17 10:49:16 -08:00
Andy McFadden
e22eb99212 Fix "find" feature in file viewer
The 1.0 edit control only searched down, so the fact that CP was
misconfiguring the search request didn't matter.  This change fixes
the search parameters and enables bi-directional searches.
2015-02-17 10:41:22 -08:00
Andy McFadden
4d85f31f0f Fix handling of dCpy with resource fork
DiskCopy disk images on HFS volumes, such as the ByteWorks Opus ][
CD-ROM, have resource forks.  The double-click handler was screening
out forked files, so double-clicking on one of these disk images
was popping open the file viewer instead of creating a new instance
of CiderPress.
2015-01-23 10:18:47 -08:00
Andy McFadden
beb4f605d9 Prep for v4.0.0 release 2015-01-23 09:14:58 -08:00
Andy McFadden
9679cb57a8 Change web URL
This changes the "visit web site" help menu item from faddensoft.com
to a2ciderpress.com.
2015-01-23 09:14:00 -08:00
Andy McFadden
a250f6d89a Disable logging in non-debug builds
Ideally there would be a preference that allowed you to enable
logging and specify the file's location.  That could make remote
debugging of certain problems easier.
2015-01-22 10:06:55 -08:00
Andy McFadden
5498a4e835 Handle carriage returns in REM statements
With a bit of hex-editing it's possible to embed carriage returns
in REM statements.  The reformatter wasn't handling that well.  The
new output matches what LIST generates.

The output generated cannot be imported by the text-to-BASIC
importer because it doesn't understand the blank lines.  The output
generated before this change didn't work either, though that was a
bit harder to figure out because the CRs are harder to see in Windows
than CRLF.

It should be possible to teach the importer to handle such files,
though I think these files are pretty rare -- I happened to find
them in some Peter Watson freeware.
2015-01-21 13:40:28 -08:00
Andy McFadden
a2c15eee55 Another file open tweak
We can report a better error message for cases where the NuFX
archive master header is intact but something else is damaged.
2015-01-19 17:38:03 -08:00
Andy McFadden
b727e8ca81 Set version to 4.0.0 RC1 2015-01-19 16:58:14 -08:00
Andy McFadden
357aba39ec Fix file viewer position for tall SHR images
The images in Paintworks PNT files are 2x the height of the SHR
screen.  The rich edit control was ending up scrolled to the bottom
of the image, which is bad because many of the image files don't
really have anything interesting in the bottom half.  This shifts
the position back to the top.

Also, some minor source code touch-ups.
2015-01-16 15:15:40 -08:00
Andy McFadden
61c4069031 Fine-tune file viewer size
The height was supposed to be just tall enough to fit a Super
Hi-Res graphic without needing to scroll, but it had become too
short by about 6 pixels.

The width was supposed to be wide enough to exactly fit 80-column
text, but the optional scroll bar ate two columns when it appeared.
We now over-size the viewer so it looks right when the scroll bar
appears.
2015-01-15 16:24:40 -08:00
Andy McFadden
06eeabc8a4 Switch to system font
Switch the remaining dialogs to the system font.  This required
minor adjustments in a couple of places.

Also, remove the remnants of the ChooseDir dialog.
2015-01-15 16:10:08 -08:00
Andy McFadden
829e275b23 Tweak "open file" behavior
For a file with ".shk" extension, prioritize disk image over NuFX
file archive.  The disk image code won't accept it if it has more
than one entry, and it's pretty rare for somebody to want to open
a single-disk archive in file mode.

Ideally all single-disk archives are named ".sdk", but there's
probably a lot that are just named ".shk", so this will probably
be more convenient.
2015-01-15 15:45:31 -08:00
Andy McFadden
b5169033a1 Update progress dialogs
Do the Mac OS Roman conversion in a couple of places.  Fix the
NuFX extraction progress, which got all blinky after the wide char
update.
2015-01-15 15:35:34 -08:00
Andy McFadden
650434f06b Update fonts in MDC dialogs
The About box needed some adjusting -- apparently the 10-point MS
Shell Dlg doesn't have the same metrics as the 10-point MS Sans
Serif.
2015-01-15 14:26:39 -08:00
Andy McFadden
0861b7ead4 Simplify 2015-01-15 14:21:01 -08:00
Andy McFadden
8c34eb1213 Volume name and font fixes
More volume name MOR conversions.  I think I got them all.

This also switches the "archive info", "add files", and "extract
files" dialogs to use the System Font.  We were using "MS Sans
Serif" before, which looks a bit ratty on Windows 7 because it
doesn't take advantage of ClearType.  (Apparently the ClearType
version is "Microsoft Sans Serif", though when you set the "use
system font" boolean to true it changes the font name to "MS Shell
Dlg".)  The old font also seems to be missing certain glyphs, e.g.
my HFS volume name had 'TM' in it, but that just showed up as a box
(which is why, in case you were wondering, these changes ended up
together).

The new font seems to work equally well on WinXP, so I may enable
it for all dialogs in a follow-up change.  As far as I can tell it
has the same font metrics -- I haven't seen anything weird looking
in the dialogs I've updated so far.

Also, bumped the version to 4.0.0-b3.
2015-01-15 11:35:48 -08:00