Skip to content

Commit

Permalink
v2.382
Browse files Browse the repository at this point in the history 
テンプレートの表示が英語になっていたので日本語で表示されるように修正。 Windows11で動くようにインストーラーの問題を修正。 サクラ初回起動時にインストールチェックを行う機能を追加。
  • Loading branch information
@kujirahand
kujirahand committed Aug 7, 2022
1 parent e2df66d commit ebf49cd
Show file tree
Hide file tree
Showing 19 changed files with 245 additions and 96 deletions.
45 changes: 45 additions & 0 deletions Include/memo/chosakusei.hmw
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
'���W���[�}�C�i�[�̒��������\�t�g
'
' 0 1 2 3 4 5 6 7 8 9 10 11
����="c,c#,d,d#,e,f,f#,g,g#,a,a#,b"
�������A","�ŁA��؂��āA�����ɁA�����B
����2=�啶���ϊ�(����)
'�����ƁA�����B
���W���[="0,2,4,5,7,9,11"
�}�C�i�[="0,2,3,5,7,8,10"//eab


TXT=""
�E��=""
�X�P�[��=���W���[
KEY���A0����A11�܂ŁA�J��Ԃ�(
���쐬�B
)�B
�E��="m"
�X�P�[��=�}�C�i�[
KEY���A0����A11�܂ŁA�J��Ԃ�(
���쐬�B
)�B


TXT&�u���A�R�s�[���܂����B�v�ƁA�����B
TXT���A�R�s�[�B
�I���B

�����쐬
RES=""
�X�P�[�����A","�ŁA��؂�
����(
F=����
F���A���l�Ƃ��Ĉ����B
F=(F+KEY)%12;
A=����#F
POS(A,"#")
�����A����>0 �Ȃ��(
RES=RES&MID(A,1,1)
)�B
)�B
FLAG = MID(("��#(" & RES & ") "),1,9) & "// " & (����2#KEY) & �E��
TXT = TXT & FLAG & "\n"
�߂�B

8 changes: 4 additions & 4 deletions ReadMe.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
【タイトル】　テキスト音楽「サクラ２」
【WEBサイト】 https://sakuramml.com/
【動作機種】　DOS/V互換機
【動作環境】　Windows Vista/7/8/10
【動作環境】　Windows 7/8/10/11
【ソフト種別】フリーソフトウェア（寄付歓迎）
【配布条件】　連絡を頂ければ配布自由
【転載条件】　事後でも必ず連絡して頂ければ転載可
【連 絡 先】　https://kujirahand.com から
【連 絡 先】　web@kujirahand.com
【ライセンス】修正BSDライセンス
──────────────────────────────
【動作環境】　MIDIの鳴る環境
【開発環境】 Microsoft Windows 10
【開発環境】 Microsoft Windows 11
　　Borland Delphi 7
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
【免責事項】
──────────────────────────────
　サクラは、フリーソフトですが、その著作権は、クジラ飛行机（酒徳峰章)にあります。
　サクラは、フリーソフトですが、その著作権は、クジラ飛行机にあります。
　このソフトを利用した際に発生したいかなる損害についても作者は責任を負いません。
　ソフトのインストールやバージョンアップの導入は、ご自身の責任において行ってください。
　ネットや雑誌への転載は大歓迎ですが、事前にメールで連絡してください。
Expand Down
6 changes: 3 additions & 3 deletions frmFindHelp.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object frmFindHelpF: TfrmFindHelpF
Left = 0
Top = 57
Width = 518
Height = 369
Height = 365
Align = alClient
BevelOuter = bvLowered
BevelWidth = 2
Expand All @@ -94,11 +94,11 @@ object frmFindHelpF: TfrmFindHelpF
Left = 2
Top = 2
Width = 514
Height = 365
Height = 361
Align = alClient
TabOrder = 0
ControlData = {
4C00000020350000B92500000000000000000000000000000000000000000000
4C000000203500004F2500000000000000000000000000000000000000000000
000000004C000000000000000000000001000000E0D057007335CF11AE690800
2B2E126208000000000000004C0000000114020000000000C000000000000046
8000000000000000000000000000000000000000000000000000000000000000
Expand Down
3 changes: 2 additions & 1 deletion frmFindHelp.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,14 @@ procedure TfrmFindHelpF.edtKeyKeyDown(Sender: TObject; var Key: Word;

procedure TfrmFindHelpF.FormCreate(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.LoadForm(Self);
end;

procedure TfrmFindHelpF.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.SaveForm(Self);

end;

end.
3 changes: 2 additions & 1 deletion frmKeyboardU.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ procedure TfrmKeyboard.FormCreate(Sender: TObject);
var
r: Integer;
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.LoadForm(Self);

oldShape := nil;
Expand Down Expand Up @@ -317,8 +318,8 @@ procedure TfrmKeyboard.FormShow(Sender: TObject);

procedure TfrmKeyboard.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.SaveForm(Self);

end;

procedure TfrmKeyboard.edCHChange(Sender: TObject);
Expand Down
4 changes: 3 additions & 1 deletion frmOnpu.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ procedure TfrmOnpu1.FormCreate(Sender: TObject);
var
w,h: Integer;
begin
if frmSakuraPad.FlagForceClose then Exit;

w := Self.Width ;
h := Self.Height ;
frmSakuraPad.ini.LoadForm(Self);
Expand Down Expand Up @@ -346,8 +348,8 @@ procedure TfrmOnpu1.btnBackSpaceClick(Sender: TObject);

procedure TfrmOnpu1.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.SaveForm(Self);

end;

procedure TfrmOnpu1.OutputTypeSutoton(IsSutoton: Boolean);
Expand Down
16 changes: 8 additions & 8 deletions frmPlayMonitorU.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ object frmPlayMonitor: TfrmPlayMonitor
Left = 88
Top = 22
Width = 2
Height = 236
Height = 239
Beveled = True
OnMoved = splitCMoved
end
object panelCC: TPanel
Left = 17
Top = 22
Width = 71
Height = 236
Height = 239
Align = alLeft
BevelOuter = bvNone
TabOrder = 0
object boxCC: TPaintBox
Left = 0
Top = 0
Width = 71
Height = 236
Height = 239
Align = alClient
OnClick = boxCCClick
end
Expand All @@ -48,15 +48,15 @@ object frmPlayMonitor: TfrmPlayMonitor
Left = 90
Top = 22
Width = 447
Height = 236
Height = 239
Align = alClient
BevelOuter = bvNone
TabOrder = 1
object boxNoteInfo: TPaintBox
Left = 0
Top = 0
Width = 447
Height = 236
Height = 239
Align = alClient
OnClick = boxNoteInfoClick
end
Expand Down Expand Up @@ -171,23 +171,23 @@ object frmPlayMonitor: TfrmPlayMonitor
Left = 0
Top = 22
Width = 17
Height = 236
Height = 239
Align = alLeft
BevelOuter = bvNone
TabOrder = 3
object boxCH: TPaintBox
Left = 0
Top = 0
Width = 17
Height = 236
Height = 239
Align = alClient
OnMouseDown = boxCHMouseDown
OnPaint = boxCHPaint
end
end
object pnlBottom: TPanel
Left = 0
Top = 258
Top = 261
Width = 537
Height = 19
Align = alBottom
Expand Down
4 changes: 4 additions & 0 deletions frmPlayMonitorU.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,8 @@ procedure TfrmPlayMonitor.FormCloseQuery(Sender: TObject;

procedure TfrmPlayMonitor.FormCreate(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;

bmpKeyboard := TBitmap.Create ;
frmSakuraPad.ini.LoadForm(Self);
Port := 0;
Expand All @@ -652,6 +654,8 @@ procedure TfrmPlayMonitor.FormCreate(Sender: TObject);

procedure TfrmPlayMonitor.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;

bmpKeyboard.Free ;
frmSakuraPad.ini.SaveForm(Self);
end;
Expand Down
3 changes: 2 additions & 1 deletion frmReplaceU.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ procedure TfrmReplace.popAllClick(Sender: TObject);

procedure TfrmReplace.FormCreate(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.LoadForm(Self);
edts[0] := edtKey ;
edts[1] := edtReplace ;
Expand All @@ -143,8 +144,8 @@ procedure TfrmReplace.edtReplaceEnter(Sender: TObject);

procedure TfrmReplace.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
frmSakuraPad.ini.SaveForm(Self);

end;

end.
6 changes: 3 additions & 3 deletions frmRythmBoxU.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object frmRythmBox: TfrmRythmBox
end
object panelBottom: TPanel
Left = 0
Top = 196
Top = 191
Width = 455
Height = 37
Align = alBottom
Expand Down Expand Up @@ -180,15 +180,15 @@ object frmRythmBox: TfrmRythmBox
Left = 0
Top = 0
Width = 455
Height = 196
Height = 191
Align = alClient
BevelWidth = 3
TabOrder = 1
object grdCanvas: TStringGrid
Left = 3
Top = 3
Width = 449
Height = 190
Height = 185
Align = alClient
Color = clBlack
DefaultColWidth = 20
Expand Down
3 changes: 3 additions & 0 deletions frmRythmBoxU.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ procedure TfrmRythmBox.patternInit;

procedure TfrmRythmBox.FormCreate(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;

frmSakuraPad.ini.LoadForm(Self);
csv := TCsvDb.Create ;
csv.UseHeader := False;
Expand Down Expand Up @@ -366,6 +368,7 @@ procedure TfrmRythmBox.mnuPasteToEditClick(Sender: TObject);

procedure TfrmRythmBox.FormDestroy(Sender: TObject);
begin
if frmSakuraPad.FlagForceClose then Exit;
csv.Free ;
frmSakuraPad.ini.SaveForm(Self);
end;
Expand Down
5 changes: 5 additions & 0 deletions history.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
���e�L�X�g���y�u�T�N���v�̍X�V����

��2022/08/07 ver.2.382
�E�e���v���[�g�̕\�����p��ɂȂ��Ă����̂œ��{��ŕ\�������悤�ɏC���B
�EWindows11�œ����悤�ɃC���X�g�[���[�̖����C���B
�E�T�N������N�����ɃC���X�g�[���`�F�b�N���s���@�\��lj��B

��2022/07/07 ver.2.381
�Ever.2.380�ŃC���X�g�[���[�������������Ă��Ȃ���肪�������̂ŏC���B

Expand Down
Loading

0 comments on commit ebf49cd

Please sign in to comment.