Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-23 16:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AppleWin/AppleWin

Browse Source
This commit is contained in:
michaelangel007 2014-09-02 08:46:30 -07:00
commit 1083f0e981
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/History.txt
View File

@ -9,17 +9,18 @@ https://github.com/AppleWin/AppleWin/issues/new
Tom Charlesworth Tom Charlesworth
1.25.0 - 28 Aug 2014 1.25.0.1 - 1 Sep 2014
-------------------- ---------------------
Note: This is the last planned version to support Win98/ME.
. The next release of AppleWin will be built with VS2008 Express, so will only work under Windows 2000 and later.
Changes: Changes:
. Changed the AppleWin project host from BerliOS to GitHub. . Changed the AppleWin project host from BerliOS to GitHub.
. Dropped support for Win98/ME, as AppleWin now built with VS2008 Express:
So AppleWin will only work under Windows 2000 and later.
. [Feature #221] Restored F6 original behavior that was changed in v1.22.0. . [Feature #221] Restored F6 original behavior that was changed in v1.22.0.
F6 Toggle full-screen / windowed mode. F6 Toggle full-screen / windowed mode.
Ctrl-F6 Toggle windowed 1x/2x zoom. Ctrl-F6 Toggle windowed 1x/2x zoom.
. Ctrl-PrintScreen will copy the text screen (auto detect 40/80 columns) to the clipboard. . Ctrl-PrintScreen will copy the text screen (auto detect 40/80 columns) to the clipboard.
. [Feature #198] Alt-Return toggles full screen. . [Feature #198] Alt-Enter toggles full screen.
. [Feature #199] Added a configuration option "Confirm reboot" to skip the F2 reboot confirmation. . [Feature #199] Added a configuration option "Confirm reboot" to skip the F2 reboot confirmation.
. [Feature #201] Added display of current Track/Sector for the floppy drives. . [Feature #201] Added display of current Track/Sector for the floppy drives.
- In 2x window mode the status is displayed below the drive LEDs. - In 2x window mode the status is displayed below the drive LEDs.

4
help/keyboard.html
View File

@ -48,7 +48,7 @@
key temporarily sets the emulation to full speed (i.e. unthrottled).<br> key temporarily sets the emulation to full speed (i.e. unthrottled).<br>
NOTE:&nbsp; The status of the PC's NOTE:&nbsp; The status of the PC's
<span style="font-style: italic;">Scroll Lock</span> <span style="font-style: italic;">Scroll Lock</span>
LED is meaningless.&nbsp; The emulator will only run full-speed while the LED is meaningless.&nbsp; The emulator will only run full speed while the
<span style="font-style: italic;">Scroll Lock</span> <span style="font-style: italic;">Scroll Lock</span>
key is pressed down.</p> key is pressed down.</p>
<p><span style="font-weight: bold;">Shift+Insert:</span><br> <p><span style="font-weight: bold;">Shift+Insert:</span><br>
@ -62,6 +62,8 @@
See above.</p> See above.</p>
<p><span style="font-weight: bold;">Ctrl+PrintScrn:</span><br> <p><span style="font-weight: bold;">Ctrl+PrintScrn:</span><br>
Copy the text screen (auto detect 40/80 columns) to the clipboard.</p> Copy the text screen (auto detect 40/80 columns) to the clipboard.</p>
<p><span style="font-weight: bold;">Alt+Enter:</span><br>
Toggle between windowed and full screen video modes. (NB. Will conflict with emulation when doing Open Apple + Enter.)</p>
<p><span style="font-weight: bold;">Function Keys F1-F8:</span><br> <p><span style="font-weight: bold;">Function Keys F1-F8:</span><br>
These PC function keys correspond to buttons on the <a href="toolbar.html">toolbar</a>.</p> These PC function keys correspond to buttons on the <a href="toolbar.html">toolbar</a>.</p>
<p><span style="font-weight: bold;">Function Key F2 + Ctrl:</span><br> <p><span style="font-weight: bold;">Function Key F2 + Ctrl:</span><br>

8
resource/Applewin.rc
View File

@ -251,8 +251,8 @@ DISK_ICON ICON "DISK.ICO"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,0,0 FILEVERSION 1,25,0,1
PRODUCTVERSION 1,25,0,0 PRODUCTVERSION 1,25,0,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -270,12 +270,12 @@ BEGIN
VALUE "Comments", "https://github.com/AppleWin" VALUE "Comments", "https://github.com/AppleWin"
VALUE "CompanyName", "AppleWin" VALUE "CompanyName", "AppleWin"
VALUE "FileDescription", "Apple //e Emulator for Windows" VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", "1, 25, 0, 0" VALUE "FileVersion", "1, 25, 0, 1"
VALUE "InternalName", "APPLEWIN" VALUE "InternalName", "APPLEWIN"
VALUE "LegalCopyright", " 1994-2014 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "LegalCopyright", " 1994-2014 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator" VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", "1, 25, 0, 0" VALUE "ProductVersion", "1, 25, 0, 1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"