Commit: 0c45a39c48b7baca9d95f2f2a40e53b6d121834d - L3DiskEx (git)

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

• Revision: 0c45a39c48b7baca9d95f2f2a40e53b6d121834d (tree)
• Time: 2022-04-21 19:39:17
• Author: Sasaji <sasaji@s-sa...>
• Commiter: Sasaji

Log Message

Version 0.1.1 Release

Change Summary

• modified: Makefile.macosx
• modified: docs/ChangeLog.txt
• modified: docs/Readme.txt
• modified: src/basicfmt.cpp
• modified: src/basicfmt.h
• modified: src/config.cpp
• modified: src/config.h
• modified: src/uidisklist.cpp
• modified: src/uidisklist.h
• modified: src/uifilelist.cpp
• modified: src/uifilelist.h
• modified: src/uirawdisk.cpp
• modified: src/uirawdisk.h
• modified: src/version.h

Incremental Difference

--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -3,7 +3,7 @@
 #
 CC=g++
 
-APPLICATION_VERSION=0.1.0
+APPLICATION_VERSION=0.1.1
 
 CDEFS=
 DBG_CDEFS=-D_DEBUG -D_DEBUG_LOG

--- a/docs/ChangeLog.txt
+++ b/docs/ChangeLog.txt
@@ -2,6 +2,11 @@
  更新履歴
 ==============================================================================
 
[phone]	Version 0.1.1
+・単密度のディスクイメージから倍密度へドラッグ＆ドロップすると拡張子が不明に
+  なることがある不具合を修正。
+・ファイル追加する際、ディレクトリエントリを初期化していなかった不具合を修正。
+
 2015-11-21	Version 0.1.0
 ・新規作成。
 

--- a/docs/Readme.txt
+++ b/docs/Readme.txt
@@ -1,9 +1,9 @@
 ==============================================================================
     L3 Disk Explorer
-                                                               Version 0.1
-                                                                2015/11/21
+                                                              Version 0.1.1
+                                                                2016/01/27
 
-                                 Copyright(C) Sasaji 2015 All Rights Reserved.
+                            Copyright(C) Sasaji 2015-2016 All Rights Reserved.
 ==============================================================================
 
 ● はじめに

--- a/src/basicfmt.cpp
+++ b/src/basicfmt.cpp
@@ -588,6 +588,13 @@ void DiskBasicDirItem::SetFileNameAndAttr(const wxString &filename, int file_typ
 	}
 }
 
+void DiskBasicDirItem::ClearFileNameAndAttr()
+{
+	if (data) {
+		memset(data, 0, sizeof(directory_t));
+	}
+}
+
 int DiskBasicDirItem::GetFileType()
 {
 	return (data->type <= 2 ? data->type : 0);
@@ -694,7 +701,7 @@ bool DiskBasicDirItem::ConvFromNativeNameWithExtension(int format_type, int file
 	gCharCodes.ConvToString(src, 8, dst);
 	dst.Trim(true);
 	if (format_type != 0) {
-		if (ext && ext[0] != 0x00 && ext[0] != 0x20) {
+		if (ext && ext[0] != 0x00 && ext[0] != 0x20 && ext[0] != 0xff) {
 			dst += wxT(".");
 			gCharCodes.ConvToString(ext, 3, dst);
 			dst.Trim(true);
@@ -1370,6 +1377,7 @@ bool DiskBasic::SaveFile(DiskBasicDirItem *item, wxInputStream *istream, const w
 	}
 
 	// ファイル名属性を設定
+	item->ClearFileNameAndAttr();
 	item->SetFileNameAndAttr(filename, file_type, data_type);
 
 	int sizeremain = (int)istream->GetLength();

--- a/src/basicfmt.h
+++ b/src/basicfmt.h
@@ -245,6 +245,7 @@ public:
 
 	void SetFileName(const wxString &filename);
 	void SetFileNameAndAttr(const wxString &filename, int file_type, int data_type);
+	void ClearFileNameAndAttr();
 	int GetFileType();
 	int GetDataType();
 	wxString GetFileNameStr();

--- a/src/config.cpp
+++ b/src/config.cpp
@@ -31,8 +31,8 @@ void Params::AddRecentFile(const wxString &val)
 	// 追加
 	mRecentFiles.Insert(fpath.GetFullPath(), 0);
 	// 10を超える分は消す
-	if (mRecentFiles.Count() > 10) {
-		mRecentFiles.RemoveAt(10);
+	if (mRecentFiles.Count() > MAX_RECENT_FILES) {
+		mRecentFiles.RemoveAt(MAX_RECENT_FILES);
 	}
 }
 
@@ -70,7 +70,7 @@ void Config::Load()
 		,wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH | wxCONFIG_USE_NO_ESCAPE_CHARACTERS);
 
 	ini->Read(_T("Path"), &mFilePath, mFilePath);
-	for(size_t i=0; i<10; i++) {
+	for(int i=0; i<MAX_RECENT_FILES; i++) {
 		wxString sval;
 		ini->Read(wxString::Format(_T("Recent%d"), i), &sval);
 		if (!sval.IsEmpty()) {
@@ -95,7 +95,7 @@ void Config::Save()
 		,wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_RELATIVE_PATH | wxCONFIG_USE_NO_ESCAPE_CHARACTERS);
 
 	ini->Write(_T("Path"), mFilePath);
-	for(size_t i=0,row=0; row<10 && i<mRecentFiles.Count(); i++) {
+	for(int i=0,row=0; row<MAX_RECENT_FILES && i<(int)mRecentFiles.Count(); i++) {
 		wxString sval = mRecentFiles.Item(i);
 		if (sval.IsEmpty()) continue;
 		ini->Write(wxString::Format(_T("Recent%d"), row), sval);

--- a/src/config.h
+++ b/src/config.h
@@ -8,6 +8,8 @@
 #include "common.h"
 #include <wx/wx.h>
 
+#define MAX_RECENT_FILES 10
+
 /// 設定ファイルパラメータ
 class Params
 {

--- a/src/uidisklist.cpp
+++ b/src/uidisklist.cpp
@@ -116,6 +116,9 @@ L3DiskList::L3DiskList(L3DiskFrame *parentframe, wxWindow *parentwindow)
 	menuPopup->AppendSeparator();
 	menuPopup->Append(IDM_PROPERTY_DISK, _("Disk &Information"));
 
+	// key
+	Bind(wxEVT_CHAR, &L3DiskList::OnChar, this);
+
 	ClearFileName();
 }
 
@@ -231,6 +234,19 @@ void L3DiskList::OnPropertyDisk(wxCommandEvent& event)
 	ShowDiskAttr();
 }
 
+/// キー入力
+void L3DiskList::OnChar(wxKeyEvent& event)
+{
+	switch(event.GetKeyCode()) {
+	case WXK_RETURN:
+		ShowDiskAttr();
+		break;
+	case WXK_DELETE:
+		DeleteDisk();
+		break;
+	}
+}
+
 /// ポップアップメニュー表示
 void L3DiskList::ShowPopupMenu()
 {

--- a/src/uidisklist.h
+++ b/src/uidisklist.h
@@ -91,6 +91,8 @@ public:
 	void OnFormatDisk(wxCommandEvent& event);
 
 	void OnPropertyDisk(wxCommandEvent& event);
+
+	void OnChar(wxKeyEvent& event);
 	//@}
 	/// @name functions
 	//@{

--- a/src/uifilelist.cpp
+++ b/src/uifilelist.cpp
@@ -75,6 +75,7 @@ wxEND_EVENT_TABLE()
 L3DiskFileList::L3DiskFileList(L3DiskFrame *parentframe, wxWindow *parentwindow)
        : wxPanel(parentwindow, wxID_ANY, wxDefaultPosition, wxDefaultSize)
 {
+	initialized = false;
 	parent   = parentwindow;
 	frame    = parentframe;
 
@@ -122,6 +123,9 @@ L3DiskFileList::L3DiskFileList(L3DiskFrame *parentframe, wxWindow *parentwindow)
 	menuPopup->AppendSeparator();
 	menuPopup->Append(IDM_PROPERTY, _("&Property"));
 
+	// key
+	list->Bind(wxEVT_CHAR, &L3DiskFileList::OnChar, this);
+
 #if 0
 	UINT fno = 0;
 	char fname[257];
@@ -132,6 +136,8 @@ L3DiskFileList::L3DiskFileList(L3DiskFrame *parentframe, wxWindow *parentwindow)
 	} while(fno != 0);
 	::CloseClipboard();
 #endif
+
+	initialized = true;
 }
 
 L3DiskFileList::~L3DiskFileList()
@@ -152,6 +158,8 @@ void L3DiskFileList::OnSize(wxSizeEvent& event)
 /// 選択
 void L3DiskFileList::OnSelectionChanged(wxDataViewEvent& event)
 {
+	if (!initialized) return;
+
 	if (GetSelectedRow() == wxNOT_FOUND) {
 		// 非選択
 		UnselectItem();
@@ -236,6 +244,19 @@ void L3DiskFileList::OnProperty(wxCommandEvent& event)
 	ShowFileAttr();
 }
 
+/// キー押下
+void L3DiskFileList::OnChar(wxKeyEvent& event)
+{
+	switch(event.GetKeyCode()) {
+	case WXK_RETURN:
+		ShowFileAttr();
+		break;
+	case WXK_DELETE:
+		DeleteDataFile();
+		break;
+	}
+}
+
 /// ポップアップメニュー表示
 void L3DiskFileList::ShowPopupMenu()
 {
@@ -305,7 +326,7 @@ void L3DiskFileList::RefreshFiles()
 		lval = dir->Item(i).GetGroupSize();
 		data.push_back( lval >= 0 ? wxNumberFormatter::ToString(lval) : wxT("---") );	// 使用グループ数
 		lval = dir->Item(i).GetStartGroup();
-		data.push_back( wxString::Format(wxT("%02x"), lval));	// 開始グループ
+		data.push_back( wxString::Format(wxT("%02x"), (int)lval));	// 開始グループ
 
 		int track_num = -1;
 		int side_num = -1;

--- a/src/uifilelist.h
+++ b/src/uifilelist.h
@@ -57,6 +57,8 @@ private:
 	// BASICフォーマットの情報
 	DiskBasic basic;
 
+	bool initialized;
+
 	int ShowIntNameBoxAndCheckSameFile(IntNameBox &dlg);
 
 public:
@@ -77,6 +79,7 @@ public:
 	void OnDeleteFile(wxCommandEvent& event);
 	void OnRenameFile(wxCommandEvent& event);
 	void OnProperty(wxCommandEvent& event);
+	void OnChar(wxKeyEvent& event);
 	//@}
 
 	void ShowPopupMenu();

--- a/src/uirawdisk.cpp
+++ b/src/uirawdisk.cpp
@@ -659,6 +659,7 @@ wxEND_EVENT_TABLE()
 L3DiskRawSector::L3DiskRawSector(L3DiskFrame *parentframe, L3DiskRawPanel *parentwindow)
        : wxDataViewListCtrl(parentwindow, wxID_ANY, wxDefaultPosition, wxDefaultSize)
 {
+	initialized = false;
 	parent   = parentwindow;
 	frame    = parentframe;
 
@@ -690,6 +691,8 @@ L3DiskRawSector::L3DiskRawSector(L3DiskFrame *parentframe, L3DiskRawPanel *paren
 	menuPopup->Append(IDM_MODIFY_DENSITY_TRACK, _("Modify All Density On This Track"));
 	menuPopup->AppendSeparator();
 	menuPopup->Append(IDM_PROPERTY_SECTOR, _("&Property"));
+
+	initialized = true;
 }
 
 L3DiskRawSector::~L3DiskRawSector()
@@ -701,6 +704,8 @@ L3DiskRawSector::~L3DiskRawSector()
 /// 選択
 void L3DiskRawSector::OnSelectionChanged(wxDataViewEvent& event)
 {
+	if (!initialized) return;
+
 	if (GetSelectedRow() == wxNOT_FOUND || !track) {
 		// 非選択
 		UnselectItem();

--- a/src/uirawdisk.h
+++ b/src/uirawdisk.h
@@ -148,6 +148,8 @@ private:
 
 	wxDataViewItem selected_item;
 
+	bool initialized;
+
 public:
 	L3DiskRawSector(L3DiskFrame *parentframe, L3DiskRawPanel *parent);
 	~L3DiskRawSector();

--- a/src/version.h
+++ b/src/version.h
@@ -4,12 +4,12 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define APPLICATION_VERSION	"0.1.0"
+#define APPLICATION_VERSION	"0.1.1"
 #define APP_VER_MAJOR	0
 #define APP_VER_MINOR	1
-#define APP_VER_REV	0
+#define APP_VER_REV	1
 #define APP_VER_BUILD	0
-#define APP_COPYRIGHT	"Copyright (C) 2015 Sasaji"
+#define APP_COPYRIGHT	"Copyright (C) 2015-2016 Sasaji"
 
 #if defined(__MINGW32__)
 #ifdef x86_64