From 3e844492a58214ff0cb8196028e94fdc6ddaa8a4 Mon Sep 17 00:00:00 2001 From: inovia Date: Sat, 9 Mar 2024 18:05:18 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=BBHSP3=E6=A9=9F=E8=83=BD=E3=81=AE?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=20=E3=83=BB=E3=82=A2=E3=82=A4=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=BB=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=81=AE=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88?= =?UTF-8?q?=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 15 +++++++++++++++ iconcnv/iconcnv.vcxproj.user | 11 +++++++++++ sakura_core/Funccode_x.hsrc | 2 +- sakura_core/cmd/CViewCommander.cpp | 2 +- sakura_core/cmd/CViewCommander.h | 1 + sakura_core/cmd/CViewCommander_HSP.cpp | 13 +++++++++++++ sakura_core/hsp/CHsp3.cpp | 3 ++- sakura_core/sakura_rc.rc | 2 +- sakura_core/window/CEditWnd.cpp | 4 ++-- 9 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 iconcnv/iconcnv.vcxproj.user diff --git a/.gitignore b/.gitignore index 428bf4ac82..9521fe3a51 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,18 @@ sha256.txt tags testData_*.txt UpgradeLog.htm +/iconcnv/Debug +/sakura/無題1_20230827_013413.hsp +/sakura/test2.hsp +/sakura/test.ico +/sakura/test.hsp +/sakura/start.ax +/sakura/packfile +/sakura/obj +/sakura/mod_WebView2_10115038.hsp +/sakura/hsptmp +/tests/unittests/tests1.vcxproj.user +/sakura_lang_en_US/sakura_lang_en_US.vcxproj.user +/sakura_core/hsp/res/test.hsp +/sakura_core/hsp/res/obj +/sakura_core/hsp/res/hsptmp diff --git a/iconcnv/iconcnv.vcxproj.user b/iconcnv/iconcnv.vcxproj.user new file mode 100644 index 0000000000..bf257c649d --- /dev/null +++ b/iconcnv/iconcnv.vcxproj.user @@ -0,0 +1,11 @@ + + + + /INPUT "C:\Users\inovia\Desktop\400.png" /OUTPUT "C:\Users\inovia\Desktop\400.ico" /RESIZE /FORCE32BIT + WindowsLocalDebugger + + + /INPUT "C:\Users\inovia\Desktop\400.png" /OUTPUT "C:\Users\inovia\Desktop\400.ico" /RESIZE /FORCE32BIT + WindowsLocalDebugger + + \ No newline at end of file diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 21ea11b5b5..95ff5f7330 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -487,7 +487,7 @@ F_HSP_RUN_ICON_CONVERTER = 31496, // アイコンコンバーター起動 F_HSP_OPEN_DOCUMENT = 31497, // ドキュメントを開く F_HSP_JUMP_DEFINITION = 31498, // 定義へ移動 F_HSP_JUMP_ALL_REFERENCES = 31499, // すべての参照を検索 -F_HSP_RUN_HSP3_UPDATER = 31500, // 機能の追加と削除 +F_HSP_RUN_HSP3_UPDATER = 31500, // HSP3機能のアップデート // Jul. 4, 2000 genta F_USERMACRO_0 = 31600, // 登録マクロ開始 diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 644b299b1d..88ef4dd4a5 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -613,7 +613,7 @@ BOOL CViewCommander::HandleCommand( case F_HSP_RUN_ICON_CONVERTER: /* アイコンコンバーター起動(&I) */ Command_HSP_RUN_ICON_CONVERTER(); break; - case F_HSP_RUN_HSP3_UPDATER: /* 機能の追加と削除(&A) */ + case F_HSP_RUN_HSP3_UPDATER: /* HSP3機能のアップデート(&A) */ Command_HSP_RUN_HSP3_UPDATER(); break; case F_HSP_SEARCH_KEYWORD: /* HSPキーワード検索(&K) */ diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index 5f167f3054..5b13df119b 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -394,6 +394,7 @@ class CViewCommander{ void Command_HSP_JUMP_DEFINITION(void); void Command_HSP_JUMP_ALL_REFERENCES(void); void Command_HSP_HIGHLIGHT_KEYWORDS(void); + void Command_HSP_TOGGLE_LINE_COMMENT(void); /* カスタムメニュー */ void Command_MENU_RBUTTON( void ); /* 右クリックメニュー */ diff --git a/sakura_core/cmd/CViewCommander_HSP.cpp b/sakura_core/cmd/CViewCommander_HSP.cpp index 0e8812c05e..569d9754ed 100644 --- a/sakura_core/cmd/CViewCommander_HSP.cpp +++ b/sakura_core/cmd/CViewCommander_HSP.cpp @@ -761,3 +761,16 @@ void CViewCommander::Command_HSP_HIGHLIGHT_KEYWORDS(void) // 選択解除 m_pCommanderView->GetSelectionInfo().DisableSelectArea(true); } + +void CViewCommander::Command_HSP_TOGGLE_LINE_COMMENT(void) +{ + // Ctrl+/ + // トグルタイプのコメント/コメントアウト + // 矩形選択時は無効 + // /**/ は解除時のみ有効 + // ; と // + // 付与時は // + // インデントも維持する (タブまたはスペースを左から検出して、// を埋める） + // 選択時はその範囲内のみ影響。非選択時はその行のみ。 + +} diff --git a/sakura_core/hsp/CHsp3.cpp b/sakura_core/hsp/CHsp3.cpp index 524cf42810..30569488ba 100644 --- a/sakura_core/hsp/CHsp3.cpp +++ b/sakura_core/hsp/CHsp3.cpp @@ -286,7 +286,8 @@ BOOL CHsp3::HscMakeW(const CNativeW& name) const // UTF-16 -> Shift_JIS CNativeA nameA; CShiftJis::UnicodeToSJIS( name, nameA._GetMemory()); - return m_pHsp3Dll->hsc3_make()(0, (void*)nameA.GetStringPtr(), 0, 0); + return m_pHsp3Dll->hsc3_make()(0, + (void*)nameA.GetStringPtr(), 1/* アイコン書き換え機能有効 */, 0); } BOOL CHsp3::HscGetMesW(CNativeW& msg) const diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index a59aa9fb50..fa463cfe92 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -2437,7 +2437,7 @@ BEGIN F_HSP_OPEN_DOCUMENT "ドキュメントを開く" F_HSP_JUMP_DEFINITION "定義へ移動" F_HSP_JUMP_ALL_REFERENCES "すべての参照を検索" - F_HSP_RUN_HSP3_UPDATER "機能の追加と削除..." + F_HSP_RUN_HSP3_UPDATER "HSP3機能のアップデート..." F_CUSTMENU_1 "カスタムメニュー1" F_CUSTMENU_2 "カスタムメニュー2" F_CUSTMENU_3 "カスタムメニュー3" diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index 50bb72ca43..3ef0bc9b71 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -1410,12 +1410,12 @@ LRESULT CEditWnd::DispatchEvent( if ( bAeroSnap) { - MYTRACE( L"Snap!!\n"); + // MYTRACE( L"Snap!!\n"); wp.rcNormalPosition = rc; ::SetWindowPlacement(hwnd, &wp); } else { - MYTRACE(L"Not Snap!!\n"); + // MYTRACE(L"Not Snap!!\n"); } }