• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得windowscocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

L3 Disk Explorer is an application in order to access to files in a floppy disk image for retro computer and operating system.


Commit MetaInfo

Revisionbf0263cc404687c124f26bb234f12483fbe4c2df (tree)
Time2022-04-21 21:08:46
AuthorSasaji <sasaji@s-sa...>
CommiterSasaji

Log Message

Version 0.4.5 Release

Change Summary

Incremental Difference

--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -3,7 +3,7 @@
33 #
44 CC=g++
55
6-APPLICATION_VERSION=0.4.4
6+APPLICATION_VERSION=0.4.5
77
88 CDEFS=
99 DBG_CDEFS=-D_DEBUG -D_DEBUG_LOG
--- a/data/disk_types.xml
+++ b/data/disk_types.xml
@@ -1061,6 +1061,7 @@
10611061 <Type>L3S1-2HD</Type>
10621062 <Type p="major">X1HU-2HD</Type>
10631063 <Type p="major">X1HU-2HD-2D</Type>
1064+ <Type>OS9-2HD</Type>
10641065 </DiskBasicTypes>
10651066 <DensityName>2HD/8inch2D</DensityName>
10661067 <DensityName lang="ja">2HD/8インチ2D</DensityName>
@@ -1092,6 +1093,7 @@
10921093 <Interleave>2</Interleave>
10931094 <DiskBasicTypes>
10941095 <Type>N88-2HD</Type>
1096+ <Type>OS9-2HD</Type>
10951097 </DiskBasicTypes>
10961098 <DensityName>2HD/8inch2D</DensityName>
10971099 <DensityName lang="ja">2HD/8インチ2D</DensityName>
--- a/docs/ChangeLog.txt
+++ b/docs/ChangeLog.txt
@@ -2,6 +2,14 @@
22 更新履歴
33 ==============================================================================
44
5+2020-02-11 Version 0.4.5
6+・ディスクリスト内のメニューにある「ディスク情報」のダイアログでOKを押すと
7+ 異常終了する不具合を修正した。
8+・ディスクリスト内のメニューにある「ディスク情報」で密度が正しく設定されて
9+ いない不具合を修正した。
10+・ディスク新規作成でパラメータを手動設定にした場合、密度を2DDや2HDに選択しても
11+ それが作成後のディスクに反映されない不具合を修正した。
12+
513 2019-12-14 Version 0.4.4
614 ・FM用2HDディスクの新規作成でトラック0、サイド0を単密度で作成するように
715 パラメータを変更した。
--- a/docs/DiskBasicSpec.txt
+++ b/docs/DiskBasicSpec.txt
@@ -1,8 +1,8 @@
11 ==============================================================================
22 L3 Disk Explorer 仕様
3- Version 0.4.4
3+ Version 0.4.5
44
5- Copyright(C) Sasaji 2015-2019 All Rights Reserved.
5+ Copyright(C) Sasaji 2015-2020 All Rights Reserved.
66 ==============================================================================
77
88 ●現在対応しているファイルシステム
--- a/docs/Readme.txt
+++ b/docs/Readme.txt
@@ -1,9 +1,9 @@
11 ==============================================================================
22 L3 Disk Explorer
3- Version 0.4.4
4- 2019/12/14
3+ Version 0.4.5
4+ 2020/02/11
55
6- Copyright(C) Sasaji 2015-2019 All Rights Reserved.
6+ Copyright(C) Sasaji 2015-2020 All Rights Reserved.
77 ==============================================================================
88
99 ● はじめに
@@ -1052,7 +1052,7 @@
10521052 ・CP/M Operating System Manual - DIGITAL RESERCH
10531053 ・THE PROGRAMMER'S CP/M HANDBOOK - Osborne/McGraw-Hill
10541054 ・Retro PC Gallery
1055- (http://www.mindspring.com/~thasegaw/rpcg/index.html)
1055+ (http://haserin09.la.coocan.jp/index.html)
10561056 ・アルゴの記憶
10571057 (http://www.geocities.co.jp/SiliconValley-Sunnyvale/2521/)
10581058 ・T.Fukui's Classic PC Web
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
11 ==============================================================================
22 L3 Disk Explorer
33
4- Copyright(C) Sasaji 2015-2019 All Rights Reserved.
4+ Copyright(C) Sasaji 2015-2020 All Rights Reserved.
55 ==============================================================================
66
77 ファイル構成
--- a/src/diskparambox.cpp
+++ b/src/diskparambox.cpp
@@ -285,18 +285,22 @@ bool DiskParamBox::ValidateAllParam()
285285 int sec = GetSectorsPerTrack();
286286 int inl = GetInterleave();
287287 if (disk_params) {
288- int i = comTemplate->GetSelection();
289- if (i < ((int)disk_params->Count() - 1)) {
290- if (disk_params->Item(i) == NULL) {
291- return false;
288+ if (comTemplate) {
289+ int i = comTemplate->GetSelection();
290+ if (i < ((int)disk_params->Count() - 1)) {
291+ if (disk_params->Item(i) == NULL) {
292+ return false;
293+ }
292294 }
293295 }
294296 } else {
295- int i = comTemplate->GetSelection();
296- int temp_pos = -1;
297- if (i >= 0) temp_pos = (int)(intptr_t)comTemplate->GetClientData((wxUint32)i);
298- if (temp_pos < 0) {
299- return false;
297+ if (comTemplate) {
298+ int i = comTemplate->GetSelection();
299+ int temp_pos = -1;
300+ if (i >= 0) temp_pos = (int)(intptr_t)comTemplate->GetClientData((wxUint32)i);
301+ if (temp_pos < 0) {
302+ return false;
303+ }
300304 }
301305 }
302306 if (trk * sid > DISKD88_MAX_TRACKS) {
@@ -488,7 +492,7 @@ void DiskParamBox::SetParamFromDisk(const DiskD88Disk *disk)
488492 SetParamToControl(disk);
489493 if (txtDiskName) txtDiskName->SetValue(disk->GetName(true));
490494 if (chkWprotect) chkWprotect->SetValue(disk->IsWriteProtected());
491- if (comDensity) comDensity->SetSelection(disk->GetDensity());
495+ if (comDensity) comDensity->SetSelection(disk->FindDensity(disk->GetDensity()));
492496
493497 txtTracks->Enable(false);
494498 txtSides->Enable(false);
@@ -642,7 +646,7 @@ void DiskParamBox::GetParamForManual(DiskParam &param)
642646 GetSectorsPerTrack(),
643647 GetSectorSize(),
644648 GetNumberingSector(),
645- GetDensity(),
649+ GetDensityValue(),
646650 GetInterleave(),
647651 sd,
648652 pt,
@@ -726,13 +730,20 @@ wxString DiskParamBox::GetDiskName() const
726730 return txtDiskName ? txtDiskName->GetValue() : wxT("");
727731 }
728732
729-/// 密度を返す
733+/// 密度(セレクトボックスの位置)を返す
730734 /// @return 0:2D 1:2DD 2:2HD
731735 int DiskParamBox::GetDensity() const
732736 {
733737 return comDensity ? comDensity->GetSelection() : 0;
734738 }
735739
740+/// 密度を表す値を返す
741+/// @return 0x00:2D 0x10:2DD 0x20:2HD
742+wxUint8 DiskParamBox::GetDensityValue() const
743+{
744+ return gDiskDensity[GetDensity()].val;
745+}
746+
736747 /// ディスク書き込み禁止か
737748 bool DiskParamBox::IsWriteProtected() const
738749 {
--- a/src/diskparambox.h
+++ b/src/diskparambox.h
@@ -128,6 +128,7 @@ public:
128128 int GetNumberingSector() const;
129129 wxString GetDiskName() const;
130130 int GetDensity() const;
131+ wxUint8 GetDensityValue() const;
131132 bool IsWriteProtected() const;
132133 int GetSingleNumber() const;
133134 int GetSingleSectorsPerTrack() const;
--- a/src/res/Info.plist
+++ b/src/res/Info.plist
@@ -7,7 +7,7 @@
77 <key>CFBundleExecutable</key>
88 <string>l3diskex</string>
99 <key>CFBundleGetInfoString</key>
10- <string>L3DiskExplorer version APPLICATION_VERSION, (c) 2015-2019 Sasaji</string>
10+ <string>L3DiskExplorer version APPLICATION_VERSION, (c) 2015-2020 Sasaji</string>
1111 <key>CFBundleIconFile</key>
1212 <string>l3diskex.icns</string>
1313 <key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
1919 <string>jp</string>
2020 </array>
2121 <key>CFBundleLongVersionString</key>
22- <string>APPLICATION_VERSION, (c) 2015-2019 Sasaji</string>
22+ <string>APPLICATION_VERSION, (c) 2015-2020 Sasaji</string>
2323 <key>CFBundleName</key>
2424 <string>L3DiskExproler</string>
2525 <key>CFBundlePackageType</key>
@@ -37,6 +37,6 @@
3737 <key>LSRequiresCarbon</key>
3838 <true/>
3939 <key>NSHumanReadableCopyright</key>
40- <string>Copyright 2015-2019 Sasaji</string>
40+ <string>Copyright 2015-2020 Sasaji</string>
4141 </dict>
4242 </plist>
--- a/src/uidisklist.cpp
+++ b/src/uidisklist.cpp
@@ -1081,7 +1081,7 @@ bool L3DiskList::InitializeDisk()
10811081 DiskParam param;
10821082 dlg.GetParam(param);
10831083 selected_disk->SetName(dlg.GetDiskName());
1084- selected_disk->SetDensity(dlg.GetDensity());
1084+ selected_disk->SetDensity(dlg.GetDensityValue());
10851085 selected_disk->SetWriteProtect(dlg.IsWriteProtected());
10861086 selected_disk->GetFile()->SetBasicTypeHint(dlg.GetCategory());
10871087 sts = selected_disk->Rebuild(param, selected_side);
@@ -1232,7 +1232,7 @@ void L3DiskList::ShowDiskAttr()
12321232 DiskParam param;
12331233 dlg.GetParam(param);
12341234 selected_disk->SetName(dlg.GetDiskName());
1235- selected_disk->SetDensity(dlg.GetDensity());
1235+ selected_disk->SetDensity(dlg.GetDensityValue());
12361236 selected_disk->SetWriteProtect(dlg.IsWriteProtected());
12371237 selected_disk->SetModify();
12381238 // ディスク名をセット
--- a/src/version.h
+++ b/src/version.h
@@ -1,17 +1,17 @@
11 /// @file version.h
22 ///
3-/// @author Copyright (c) 2015-2019 Sasaji. All rights reserved.
3+/// @author Copyright (c) 2015-2020 Sasaji. All rights reserved.
44 ///
55
66 #ifndef _VERSION_H_
77 #define _VERSION_H_
88
9-#define APPLICATION_VERSION "0.4.4"
9+#define APPLICATION_VERSION "0.4.5"
1010 #define APP_VER_MAJOR 0
1111 #define APP_VER_MINOR 4
12-#define APP_VER_REV 4
12+#define APP_VER_REV 5
1313 #define APP_VER_BUILD 0
14-#define APP_COPYRIGHT "Copyright (C) 2015-2019 Sasaji"
14+#define APP_COPYRIGHT "Copyright (C) 2015-2020 Sasaji"
1515
1616 #if defined(__MINGW32__)
1717 #if defined(x86_64) || defined(__x86_64)