From 7b1b0c82800f5f1ae3a2e1de5f03e34aae0f5965 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 25 Dec 2018 07:39:08 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=E9=96=8B=E3=81=84=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=81=AE=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=82=92=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97=E3=83=9C?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=AB=E3=82=B3=E3=83=94=E3=83=BC=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/sakura/_RESOURCE/HLP000380.html | 20 ++++++++++++++++++++ help/sakura/sakura.hhc | 5 +++++ help/sakura/sakura.hhk | 4 ++++ help/sakura/sakura.hhp | 2 ++ sakura_core/Funccode_x.hsrc | 1 + sakura_core/cmd/CViewCommander.cpp | 1 + sakura_core/cmd/CViewCommander.h | 1 + sakura_core/cmd/CViewCommander_Clipboard.cpp | 11 +++++++++++ sakura_core/env/CShareData.cpp | 3 +++ sakura_core/func/Funccode.cpp | 2 ++ sakura_core/macro/CSMacroMgr.cpp | 1 + sakura_core/sakura.hh | 1 + sakura_core/sakura_rc.rc | 1 + sakura_lang_en_US/sakura_lang_rc.rc | 1 + 14 files changed, 54 insertions(+) create mode 100644 help/sakura/_RESOURCE/HLP000380.html diff --git a/help/sakura/_RESOURCE/HLP000380.html b/help/sakura/_RESOURCE/HLP000380.html new file mode 100644 index 0000000000..95d3e51faa --- /dev/null +++ b/help/sakura/_RESOURCE/HLP000380.html @@ -0,0 +1,20 @@ + + + + + + +このファイルのフォルダ名をコピー + + + + + + +

このファイルのフォルダ名をコピー

+現在編集中のファイルのフォルダ名をクリップボードへコピーします。
+
+■マクロ構文
+・構文: CopyFolder( );
+・記録: ○
+ diff --git a/help/sakura/sakura.hhc b/help/sakura/sakura.hhc index 44adb04125..6c17d143ca 100644 --- a/help/sakura/sakura.hhc +++ b/help/sakura/sakura.hhc @@ -595,6 +595,11 @@ +
  • + + + +
  • diff --git a/help/sakura/sakura.hhk b/help/sakura/sakura.hhk index aac56d1249..92fff0e1cb 100644 --- a/help/sakura/sakura.hhk +++ b/help/sakura/sakura.hhk @@ -453,6 +453,10 @@
  • + + + +
  • diff --git a/help/sakura/sakura.hhp b/help/sakura/sakura.hhp index 6ed694900d..178b7e2fe1 100644 --- a/help/sakura/sakura.hhp +++ b/help/sakura/sakura.hhp @@ -389,6 +389,7 @@ _RESOURCE\HLP000376.html _RESOURCE\HLP000377.html _RESOURCE\HLP000378.html _RESOURCE\HLP000379.html +_RESOURCE\HLP000380.html _RESOURCE\HLP_UR000.html _RESOURCE\HLP_UR017.html _RESOURCE\HLP_UR016.html @@ -782,6 +783,7 @@ HLP000376=_RESOURCE\HLP000376.html HLP000377=_RESOURCE\HLP000377.html HLP000378=_RESOURCE\HLP000378.html HLP000379=_RESOURCE\HLP000379.html +HLP000380=_RESOURCE\HLP000380.html HLP_UR000=_RESOURCE\HLP_UR000.html HLP_UR017=_RESOURCE\HLP_UR017.html HLP_UR016=_RESOURCE\HLP_UR016.html diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 87d03fe3d9..f71ce7db3a 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -258,6 +258,7 @@ F_COPYPATH = 30620, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝 F_COPYTAG = 30621, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ 縺ｪ縺 F_COPYFNAME = 30622, //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 F_CREATEKEYBINDLIST = 30630, //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ 縺ｪ縺 +F_COPYFOLDER = 32820, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 // 謖ｿ蜈･邉ｻ diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 5f5d83c73d..9f5ebdb72c 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -375,6 +375,7 @@ BOOL CViewCommander::HandleCommand( case F_ADDTAIL_W: Command_ADDTAIL( (const wchar_t*)lparam1, (int)lparam2 );break; /* 譛蠕後↓繝繧ｭ繧ｹ繝医ｒ霑ｽ蜉 */ case F_COPYFNAME: Command_COPYFILENAME();break; //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ / /2002/2/3 aroka case F_COPYPATH: Command_COPYPATH();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + case F_COPYFOLDER: Command_COPYFOLDER();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ case F_COPYTAG: Command_COPYTAG();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 15, 2000 jepro 荳翫→蜷後§隱ｬ譏弱↓縺ｪ縺｣縺ｦ縺縺溘ｮ繧剃ｿｮ豁｣ case F_COPYLINES: Command_COPYLINES();break; //驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦後さ繝斐ｼ case F_COPYLINESASPASSAGE: Command_COPYLINESASPASSAGE();break; //驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦悟ｼ慕畑隨ｦ莉倥″繧ｳ繝斐ｼ diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index 74ef5dbf59..bbd032f9cf 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -223,6 +223,7 @@ class CViewCommander{ void Command_ADDTAIL( const wchar_t* pszData, int nDataLen); /* 譛蠕後↓繝繧ｭ繧ｹ繝医ｒ霑ｽ蜉 */ void Command_COPYFILENAME( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ //2002/2/3 aroka void Command_COPYPATH( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ + void Command_COPYFOLDER( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ void Command_COPYTAG( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ */ void Command_COPYLINES( void ); /* 驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦後さ繝斐ｼ */ void Command_COPYLINESASPASSAGE( void ); /* 驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦悟ｼ慕畑隨ｦ莉倥″繧ｳ繝斐ｼ */ diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 2b285b8dc9..b2643420de 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1118,6 +1118,17 @@ void CViewCommander::Command_COPYPATH( void ) } } +/* 迴ｾ蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ +void CViewCommander::Command_COPYFOLDER( void ) +{ + if (!GetDocument()->m_cDocFile.GetFilePathClass().IsValidPath()) { + ErrorBeep(); + return; + } + std::wstring strFolder(GetDocument()->m_cDocFile.GetFilePathClass().GetDirPath()); + m_pCommanderView->MySetClipboardData( strFolder.c_str(), wcslen(strFolder.c_str()), false ); +} + // May 9, 2000 genta /* 迴ｾ蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵け繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ void CViewCommander::Command_COPYTAG( void ) diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index e001d2fb36..4562f6ccd9 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -1351,6 +1351,9 @@ void CShareData::InitPopupMenu(DLLSHAREDATA* pShareData) rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYPATH; rMenu.m_nCustMenuItemKeyArr [0][n] = '\\'; n++; + rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYFOLDER; + rMenu.m_nCustMenuItemKeyArr [0][n] = 'O'; + n++; rMenu.m_nCustMenuItemFuncArr[0][n] = F_OPEN_FOLDER_IN_EXPLORER; rMenu.m_nCustMenuItemKeyArr[0][n] = 'E'; n++; diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index 894c55a681..13475fc3b1 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -277,6 +277,7 @@ const EFunctionCode pnFuncList_Clip[] = { //Oct. 16, 2000 JEPRO 螟画焚蜷榊､画峩( F_COPY_COLOR_HTML_LINENUMBER, //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ F_COPYFNAME , //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ //2002/2/3 aroka F_COPYPATH , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + F_COPYFOLDER , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ F_COPYTAG , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 14, 2000 JEPRO 繝｡繝九Η繝ｼ縺ｫ蜷医ｏ縺帙※荳九↓遘ｻ蜍 F_CREATEKEYBINDLIST //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ //Sept. 15, 2000 JEPRO IDM_TEST縺ｮ縺ｾ縺ｾ縺ｧ縺ｯ縺縺ｾ縺上＞縺九↑縺縺ｮ縺ｧF縺ｫ螟峨∴縺ｦ逋ｻ骭ｲ //Dec. 25, 2000 蠕ｩ豢ｻ }; @@ -744,6 +745,7 @@ int FuncID_To_HelpContextID( EFunctionCode nFuncID ) case F_COPY_COLOR_HTML: return HLP000342; //驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPY_COLOR_HTML_LINENUMBER: return HLP000343; //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPYPATH: return HLP000056; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + case F_COPYFOLDER: return HLP000380; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ case F_COPYTAG: return HLP000175; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Oct. 17, 2000 JEPRO 霑ｽ蜉 case F_COPYFNAME: return HLP000303; //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ // 2002/2/3 aroka // case IDM_TEST_CREATEKEYBINDLIST: return 57; //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵け繝ｪ繝繝励懊ｼ繝峨∈繧ｳ繝斐ｼ //Sept. 15, 2000 jepro縲後Μ繧ｹ繝医阪ｒ縲御ｸ隕ｧ縲阪↓螟画峩 diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index e324eb981d..8003e9fbcf 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -217,6 +217,7 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoCommandArr[] = {F_COPY_COLOR_HTML, LTEXT("CopyColorHtml"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ {F_COPY_COLOR_HTML_LINENUMBER, LTEXT("CopyColorHtmlWithLineNumber"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ {F_COPYPATH, LTEXT("CopyPath"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + {F_COPYFOLDER, LTEXT("CopyFolder"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ {F_COPYFNAME, LTEXT("CopyFilename"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ // 2002/2/3 aroka {F_COPYTAG, LTEXT("CopyTag"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 15, 2000 jepro 荳翫→蜷後§隱ｬ譏弱↓縺ｪ縺｣縺ｦ縺縺溘ｮ繧剃ｿｮ豁｣ {F_CREATEKEYBINDLIST, LTEXT("CopyKeyBindList"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ //Sept. 15, 2000 JEPRO 霑ｽ蜉 //Dec. 25, 2000 蠕ｩ豢ｻ diff --git a/sakura_core/sakura.hh b/sakura_core/sakura.hh index 4f53679458..4d7e90e03b 100644 --- a/sakura_core/sakura.hh +++ b/sakura_core/sakura.hh @@ -62,6 +62,7 @@ #define HLP000377 377 //邂｡逅閠縺ｨ縺励※繧ｳ繝槭Φ繝峨励Ο繝ｳ繝励ヨ繧帝幕縺 #define HLP000378 378 //PowerShell繧帝幕縺 #define HLP000379 379 //邂｡逅閠縺ｨ縺励※PowerShell繧帝幕縺 +#define HLP000380 380 //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ #define HLP000363 363 //繝励Ο繝輔ぃ繧､繝ｫ繝槭ロ繝ｼ繧ｸ繝｣ #define HLP000029 29 //譛霑台ｽｿ縺｣縺溘ヵ繧｡繧､繝ｫ #define HLP000023 23 //譛霑台ｽｿ縺｣縺溘ヵ繧ｩ繝ｫ繝 diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 1508531a9a..b2291c6505 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -2492,6 +2492,7 @@ BEGIN F_COPYPATH "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｳ繝斐ｼ" F_COPYTAG "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ" F_COPYFNAME "縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｳ繝斐ｼ" + F_COPYFOLDER "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ" END STRINGTABLE DISCARDABLE diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 520f94487f..5d1ae6b2f5 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -2496,6 +2496,7 @@ BEGIN F_COPYPATH "Copy this file's path" F_COPYTAG "Copy file path and cursor location" F_COPYFNAME "Copy this file's name" + F_COPYFOLDER "Copy this file's folder" END STRINGTABLE DISCARDABLE From d1a9bb3d4aafc9f031d17ccfef1f73e3cd7d010f Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 25 Dec 2018 07:54:53 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=AB=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=B9=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8C=E3=81=B0=E5=8F=96=E3=82=8A=E9=99=A4?= =?UTF-8?q?=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Clipboard.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index b2643420de..b7efa22717 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1126,6 +1126,16 @@ void CViewCommander::Command_COPYFOLDER( void ) return; } std::wstring strFolder(GetDocument()->m_cDocFile.GetFilePathClass().GetDirPath()); + + /* 譛ｫ蟆ｾ縺ｫ繝舌ャ繧ｯ繧ｹ繝ｩ繝繧ｷ繝･縺後≠繧後ｰ蜿悶ｊ髯､縺 */ + auto itr = strFolder.rbegin(); + if (*itr == L'\\') + { + auto itrClear = strFolder.end(); + itrClear--; + strFolder.erase(itrClear); + } + m_pCommanderView->MySetClipboardData( strFolder.c_str(), wcslen(strFolder.c_str()), false ); } From b57f2177e711ead9029569e5979a1224c7f9e0c5 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 25 Dec 2018 09:30:08 +0900 Subject: [PATCH 03/15] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80?= =?UTF-8?q?=E5=90=8D=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC=E3=82=92=E8=A1=8C?= =?UTF-8?q?=E3=81=86=E3=83=9E=E3=82=AF=E3=83=AD=E3=82=92=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=B5=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AB=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++ tools/macro/copyfolder/copyfolder.js | 35 +++++++++++++++++++++++++++ tools/macro/copyfolder/copyfolder.mac | 35 +++++++++++++++++++++++++++ tools/macro/copyfolder/copyfolder.vbs | 35 +++++++++++++++++++++++++++ tools/macro/macro.md | 10 ++++++++ 5 files changed, 121 insertions(+) create mode 100644 tools/macro/copyfolder/copyfolder.js create mode 100644 tools/macro/copyfolder/copyfolder.mac create mode 100644 tools/macro/copyfolder/copyfolder.vbs create mode 100644 tools/macro/macro.md diff --git a/README.md b/README.md index cfa41b37f0..66fcd467c1 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ - [蜊倅ｽ薙ユ繧ｹ繝](#蜊倅ｽ薙ユ繧ｹ繝) - [繝繝舌ャ繧ｰ譁ｹ豕評(#繝繝舌ャ繧ｰ譁ｹ豕) - [螟画峩螻･豁ｴ](#螟画峩螻･豁ｴ) + - [繝槭け繝ｭ縺ｮ繧ｵ繝ｳ繝励Ν](#繝槭け繝ｭ縺ｮ繧ｵ繝ｳ繝励Ν) @@ -123,3 +124,8 @@ https://ci.appveyor.com/project/sakuraeditor/sakura/history 縺ｧ隱ｬ譏弱＠縺ｦ縺繧区焔鬆縺ｧ繝ｭ繝ｼ繧ｫ繝ｫ縺ｧ遒ｺ隱阪〒縺阪∪縺吶 [CHANGELOG.md縺ｫ縺､縺縺ｦ](https://github.com/sakura-editor/sakura/wiki/CHANGELOG.md%E3%81%AB%E3%81%A4%E3%81%84%E3%81%A6) 縺ｮ繝壹ｼ繧ｸ縺ｫ`CHANGELOG.md` 縺ｫ髢｢縺吶ｋ隱ｬ譏弱ｒ險倩ｼ峨＠縺ｦ縺縺ｾ縺吶 + +## 繝槭け繝ｭ縺ｮ繧ｵ繝ｳ繝励Ν + +[tools/macro](縺薙■繧)縺ｧ繝槭け繝ｭ縺ｮ繧ｵ繝ｳ繝励Ν繧呈署萓帙＠縺ｦ縺ｾ縺吶 +繧ゅ＠繧ｵ繝ｳ繝励Ν繧剃ｽ懊▲縺ｦ繧ゅ＞縺繧茨ｽ槭→縺縺譁ｹ縺後♀繧峨ｌ縺ｾ縺励◆繧 PR 縺ｮ菴懈舌♀鬘倥＞縺励∪縺吶 diff --git a/tools/macro/copyfolder/copyfolder.js b/tools/macro/copyfolder/copyfolder.js new file mode 100644 index 0000000000..7430f2f3ca --- /dev/null +++ b/tools/macro/copyfolder/copyfolder.js @@ -0,0 +1,35 @@ +ｻｿ// MIT License +// +// Copyright (c) 2018 Sakura Editor Organization +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// 縲檎樟蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ縲阪ｮ繝槭け繝ｭ讖溯ｽ繧 +// 繝繧ｹ繝医☆繧九◆繧√ｮ繧ｵ繝ｳ繝励Ν縺ｮ繧ｭ繝ｼ繝懊ｼ繝峨槭け繝ｭ縺ｧ縺吶 +// +// 蜑肴署譚｡莉ｶ +// 1. ver 2.4.0.0 莉･髯阪ｮ繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧剃ｽｿ逕ｨ縺吶ｋ +// 菴ｿ縺譁ｹ +// 1. 繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧帝幕縺 +// 2. 縺ｪ縺ｫ縺九ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ繧帝幕縺 +// 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ +// 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 +// 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ +// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +CopyFolder(); diff --git a/tools/macro/copyfolder/copyfolder.mac b/tools/macro/copyfolder/copyfolder.mac new file mode 100644 index 0000000000..7430f2f3ca --- /dev/null +++ b/tools/macro/copyfolder/copyfolder.mac @@ -0,0 +1,35 @@ +ｻｿ// MIT License +// +// Copyright (c) 2018 Sakura Editor Organization +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// 縲檎樟蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ縲阪ｮ繝槭け繝ｭ讖溯ｽ繧 +// 繝繧ｹ繝医☆繧九◆繧√ｮ繧ｵ繝ｳ繝励Ν縺ｮ繧ｭ繝ｼ繝懊ｼ繝峨槭け繝ｭ縺ｧ縺吶 +// +// 蜑肴署譚｡莉ｶ +// 1. ver 2.4.0.0 莉･髯阪ｮ繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧剃ｽｿ逕ｨ縺吶ｋ +// 菴ｿ縺譁ｹ +// 1. 繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧帝幕縺 +// 2. 縺ｪ縺ｫ縺九ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ繧帝幕縺 +// 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ +// 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 +// 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ +// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +CopyFolder(); diff --git a/tools/macro/copyfolder/copyfolder.vbs b/tools/macro/copyfolder/copyfolder.vbs new file mode 100644 index 0000000000..2b56c428a9 --- /dev/null +++ b/tools/macro/copyfolder/copyfolder.vbs @@ -0,0 +1,35 @@ +ｻｿ' MIT License +' +' Copyright (c) 2018 Sakura Editor Organization +' +' Permission is hereby granted, free of charge, to any person obtaining a copy +' of this software and associated documentation files (the "Software"), to deal +' in the Software without restriction, including without limitation the rights +' to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +' copies of the Software, and to permit persons to whom the Software is +' furnished to do so, subject to the following conditions: +' +' The above copyright notice and this permission notice shall be included in all +' copies or substantial portions of the Software. +' +' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +' IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +' FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +' AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +' LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +' OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +' SOFTWARE. +' +' 縲檎樟蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ縲阪ｮ繝槭け繝ｭ讖溯ｽ繧 +' 繝繧ｹ繝医☆繧九◆繧√ｮ繧ｵ繝ｳ繝励Ν縺ｮ繧ｭ繝ｼ繝懊ｼ繝峨槭け繝ｭ縺ｧ縺吶 +' +' 蜑肴署譚｡莉ｶ +' 1. ver 2.4.0.0 莉･髯阪ｮ繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧剃ｽｿ逕ｨ縺吶ｋ +' 菴ｿ縺譁ｹ +' 1. 繧ｵ繧ｯ繝ｩ繧ｨ繝繧｣繧ｿ繧帝幕縺 +' 2. 縺ｪ縺ｫ縺九ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ繧帝幕縺 +' 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ +' 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 +' 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ +' 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +CopyFolder() diff --git a/tools/macro/macro.md b/tools/macro/macro.md new file mode 100644 index 0000000000..7522147764 --- /dev/null +++ b/tools/macro/macro.md @@ -0,0 +1,10 @@ +ｻｿ# 繧ｵ繝ｳ繝励Ν繝槭け繝ｭ + +繝槭け繝ｭ縺ｮ繧ｵ繝ｳ繝励Ν繧呈署萓帙☆繧九 +繧ｨ繝繧｣繧ｿ譛ｬ菴薙〒縺ｮ繝繧ｹ繝育畑縺翫ｈ縺ｳ繝ｦ繝ｼ繧ｶ繝ｼ縺後し繝ｳ繝励Ν縺ｨ縺励※蜿らｧ蜿ｯ閭ｽ縺ｪ縺薙→繧堤岼逧縺ｨ縺吶ｋ縲 + +|荳ｻ縺ｪ髢｢謨ｰ蜷鋼繝繧ｹ繝医☆繧区ｩ溯ｽ|蟇ｾ蠢懊ヰ繝ｼ繧ｸ繝ｧ繝ｳ|繝槭け繝ｭ繝代せ|繧ｿ繧､繝慾 +|--|--|--|--|--| +|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.mac](copyfolder/copyfolder.mac)|繧ｭ繝ｼ繝槭け繝ｭ| +|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.js](copyfolder/copyfolder.js)|WSH(Jscript)| +|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.vbs](copyfolder/copyfolder.vbs)|WSH(VBScript)| From c2eea4810f3c56b78e02a7c0dc351390a1434069 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 25 Dec 2018 09:42:17 +0900 Subject: [PATCH 04/15] =?UTF-8?q?S=5FCopyFolder=20=E3=81=AE=E3=83=9E?= =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=81=AE=E8=AA=AC=E6=98=8E=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/macro/macro.HHP | 1 + help/macro/macro.hhc | 5 +++++ help/macro/macro.hhk | 8 ++++++++ .../source/reference/clipboard/S_CopyFolder.html | 16 ++++++++++++++++ help/macro/source/reference/clipboard/index.html | 1 + help/macro/source/reference/index.html | 1 + 6 files changed, 32 insertions(+) create mode 100644 help/macro/source/reference/clipboard/S_CopyFolder.html diff --git a/help/macro/macro.HHP b/help/macro/macro.HHP index b3fff2065c..8fbe0c79d6 100644 --- a/help/macro/macro.HHP +++ b/help/macro/macro.HHP @@ -130,6 +130,7 @@ source\reference\clipboard\S_CopyLinesAsPassage.html source\reference\clipboard\S_CopyLinesWithLineNumber.html source\reference\clipboard\S_CopyPath.html source\reference\clipboard\S_CopyFilename.html +source\reference\clipboard\S_CopyFolder.html source\reference\clipboard\S_CopyTag.html source\reference\clipboard\S_CopyKeyBindList.html source\reference\insert\S_InsertDate.html diff --git a/help/macro/macro.hhc b/help/macro/macro.hhc index 46b5071b46..9225192682 100644 --- a/help/macro/macro.hhc +++ b/help/macro/macro.hhc @@ -612,6 +612,11 @@ +
  • + + + +
  • diff --git a/help/macro/macro.hhk b/help/macro/macro.hhk index 8e6acd6bb0..224c467f01 100644 --- a/help/macro/macro.hhk +++ b/help/macro/macro.hhk @@ -185,6 +185,11 @@ +
  • + + + +
  • @@ -1099,6 +1104,9 @@
  • +
  • + +
  • diff --git a/help/macro/source/reference/clipboard/S_CopyFolder.html b/help/macro/source/reference/clipboard/S_CopyFolder.html new file mode 100644 index 0000000000..6d8ef34742 --- /dev/null +++ b/help/macro/source/reference/clipboard/S_CopyFolder.html @@ -0,0 +1,16 @@ +S_CopyFolder + + + + +Sakura-Editor Macro Reference + +

    S_CopyFolder

    +
    +
    機能
    +
    このファイルのフォルダ名をコピー
    +
    構文
    +
    void S_CopyFolder ( )
    +
    +
    + \ No newline at end of file diff --git a/help/macro/source/reference/clipboard/index.html b/help/macro/source/reference/clipboard/index.html index 55ded465c7..b1484fda86 100644 --- a/help/macro/source/reference/clipboard/index.html +++ b/help/macro/source/reference/clipboard/index.html @@ -26,6 +26,7 @@
  • S_CopyColorHtmlWithLineNumberl
  • S_CopyPath
  • S_CopyFilename
    • +
  • S_CopyFolder
  • S_CopyTag
  • S_CopyKeyBindList
    • diff --git a/help/macro/source/reference/index.html b/help/macro/source/reference/index.html index be44bb07e8..1d8624e3e3 100644 --- a/help/macro/source/reference/index.html +++ b/help/macro/source/reference/index.html @@ -185,6 +185,7 @@
  • S_CopyColorHtmlWithLineNumberl
  • S_CopyPath
  • S_CopyFilename
    • +
  • S_CopyFolder
  • S_CopyTag
  • S_CopyKeyBindList
    • From 2101eabf77932f74d07af565b58befb68fb35d2c Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 25 Dec 2018 09:57:52 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=82=B9?= =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E7=B0=A1?= =?UTF-8?q?=E7=95=A5=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Clipboard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index b7efa22717..20003bd399 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1128,14 +1128,14 @@ void CViewCommander::Command_COPYFOLDER( void ) std::wstring strFolder(GetDocument()->m_cDocFile.GetFilePathClass().GetDirPath()); /* 譛ｫ蟆ｾ縺ｫ繝舌ャ繧ｯ繧ｹ繝ｩ繝繧ｷ繝･縺後≠繧後ｰ蜿悶ｊ髯､縺 */ - auto itr = strFolder.rbegin(); - if (*itr == L'\\') + auto itrClear = strFolder.end(); + itrClear--; + if (*itrClear == L'\\') { - auto itrClear = strFolder.end(); - itrClear--; strFolder.erase(itrClear); } + /* 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ */ m_pCommanderView->MySetClipboardData( strFolder.c_str(), wcslen(strFolder.c_str()), false ); } From 4acf3cf3071264b728122aa8e3efae73420d8be7 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Wed, 26 Dec 2018 14:55:16 +0900 Subject: [PATCH 06/15] =?UTF-8?q?CopyDirPath=20=E3=81=AB=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/macro/macro.HHP | 2 +- help/macro/macro.hhc | 2 +- help/macro/macro.hhk | 10 +++++----- .../{S_CopyFolder.html => S_CopyDirPath.html} | 0 help/macro/source/reference/clipboard/index.html | 2 +- help/macro/source/reference/index.html | 2 +- sakura_core/Funccode_x.hsrc | 2 +- sakura_core/cmd/CViewCommander.cpp | 2 +- sakura_core/cmd/CViewCommander.h | 2 +- sakura_core/cmd/CViewCommander_Clipboard.cpp | 2 +- sakura_core/env/CShareData.cpp | 2 +- sakura_core/func/Funccode.cpp | 4 ++-- sakura_core/macro/CSMacroMgr.cpp | 2 +- sakura_core/sakura_rc.rc | 2 +- sakura_lang_en_US/sakura_lang_rc.rc | 2 +- .../copyfolder.js => CopyDirPath/CopyDirPath.js} | 2 +- .../copyfolder.mac => CopyDirPath/CopyDirPath.mac} | 2 +- .../copyfolder.vbs => CopyDirPath/CopyDirPath.vbs} | 2 +- tools/macro/macro.md | 6 +++--- 19 files changed, 25 insertions(+), 25 deletions(-) rename help/macro/source/reference/clipboard/{S_CopyFolder.html => S_CopyDirPath.html} (100%) rename tools/macro/{copyfolder/copyfolder.js => CopyDirPath/CopyDirPath.js} (99%) rename tools/macro/{copyfolder/copyfolder.mac => CopyDirPath/CopyDirPath.mac} (99%) rename tools/macro/{copyfolder/copyfolder.vbs => CopyDirPath/CopyDirPath.vbs} (99%) diff --git a/help/macro/macro.HHP b/help/macro/macro.HHP index 8fbe0c79d6..ef2f41e95e 100644 --- a/help/macro/macro.HHP +++ b/help/macro/macro.HHP @@ -130,7 +130,7 @@ source\reference\clipboard\S_CopyLinesAsPassage.html source\reference\clipboard\S_CopyLinesWithLineNumber.html source\reference\clipboard\S_CopyPath.html source\reference\clipboard\S_CopyFilename.html -source\reference\clipboard\S_CopyFolder.html +source\reference\clipboard\S_CopyDirPath.html source\reference\clipboard\S_CopyTag.html source\reference\clipboard\S_CopyKeyBindList.html source\reference\insert\S_InsertDate.html diff --git a/help/macro/macro.hhc b/help/macro/macro.hhc index 9225192682..a739a9630e 100644 --- a/help/macro/macro.hhc +++ b/help/macro/macro.hhc @@ -614,7 +614,7 @@
  • - +
  • diff --git a/help/macro/macro.hhk b/help/macro/macro.hhk index 224c467f01..53805129bb 100644 --- a/help/macro/macro.hhk +++ b/help/macro/macro.hhk @@ -186,9 +186,9 @@
  • - - - + + +
  • @@ -1105,8 +1105,8 @@
  • - - + +
  • diff --git a/help/macro/source/reference/clipboard/S_CopyFolder.html b/help/macro/source/reference/clipboard/S_CopyDirPath.html similarity index 100% rename from help/macro/source/reference/clipboard/S_CopyFolder.html rename to help/macro/source/reference/clipboard/S_CopyDirPath.html diff --git a/help/macro/source/reference/clipboard/index.html b/help/macro/source/reference/clipboard/index.html index b1484fda86..ed0c928bb7 100644 --- a/help/macro/source/reference/clipboard/index.html +++ b/help/macro/source/reference/clipboard/index.html @@ -26,7 +26,7 @@
  • S_CopyColorHtmlWithLineNumberl
  • S_CopyPath
  • S_CopyFilename
    • -
  • S_CopyFolder
    • +
  • S_CopyDirPath
  • S_CopyTag
  • S_CopyKeyBindList
    • diff --git a/help/macro/source/reference/index.html b/help/macro/source/reference/index.html index 1d8624e3e3..2cf012a319 100644 --- a/help/macro/source/reference/index.html +++ b/help/macro/source/reference/index.html @@ -185,7 +185,7 @@
  • S_CopyColorHtmlWithLineNumberl
  • S_CopyPath
  • S_CopyFilename
    • -
  • S_CopyFolder
    • +
  • S_CopyDirPath
  • S_CopyTag
  • S_CopyKeyBindList
    • diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index f71ce7db3a..8975fff976 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -258,7 +258,7 @@ F_COPYPATH = 30620, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝 F_COPYTAG = 30621, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ 縺ｪ縺 F_COPYFNAME = 30622, //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 F_CREATEKEYBINDLIST = 30630, //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ 縺ｪ縺 -F_COPYFOLDER = 32820, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 +F_COPYDIRPATH = 32820, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 // 謖ｿ蜈･邉ｻ diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 9f5ebdb72c..5f1e3c65bf 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -375,7 +375,7 @@ BOOL CViewCommander::HandleCommand( case F_ADDTAIL_W: Command_ADDTAIL( (const wchar_t*)lparam1, (int)lparam2 );break; /* 譛蠕後↓繝繧ｭ繧ｹ繝医ｒ霑ｽ蜉 */ case F_COPYFNAME: Command_COPYFILENAME();break; //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ / /2002/2/3 aroka case F_COPYPATH: Command_COPYPATH();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ - case F_COPYFOLDER: Command_COPYFOLDER();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + case F_COPYDIRPATH: Command_COPYDIRPATH();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ case F_COPYTAG: Command_COPYTAG();break; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 15, 2000 jepro 荳翫→蜷後§隱ｬ譏弱↓縺ｪ縺｣縺ｦ縺縺溘ｮ繧剃ｿｮ豁｣ case F_COPYLINES: Command_COPYLINES();break; //驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦後さ繝斐ｼ case F_COPYLINESASPASSAGE: Command_COPYLINESASPASSAGE();break; //驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦悟ｼ慕畑隨ｦ莉倥″繧ｳ繝斐ｼ diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index bbd032f9cf..330247aa0a 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -223,7 +223,7 @@ class CViewCommander{ void Command_ADDTAIL( const wchar_t* pszData, int nDataLen); /* 譛蠕後↓繝繧ｭ繧ｹ繝医ｒ霑ｽ蜉 */ void Command_COPYFILENAME( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ //2002/2/3 aroka void Command_COPYPATH( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ - void Command_COPYFOLDER( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ + void Command_COPYDIRPATH( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ void Command_COPYTAG( void ); /* 縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ */ void Command_COPYLINES( void ); /* 驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦後さ繝斐ｼ */ void Command_COPYLINESASPASSAGE( void ); /* 驕ｸ謚樒ｯ蝗ｲ蜀蜈ｨ陦悟ｼ慕畑隨ｦ莉倥″繧ｳ繝斐ｼ */ diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 20003bd399..6b302e37a8 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1119,7 +1119,7 @@ void CViewCommander::Command_COPYPATH( void ) } /* 迴ｾ蝨ｨ邱ｨ髮荳ｭ縺ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ */ -void CViewCommander::Command_COPYFOLDER( void ) +void CViewCommander::Command_COPYDIRPATH( void ) { if (!GetDocument()->m_cDocFile.GetFilePathClass().IsValidPath()) { ErrorBeep(); diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index 4562f6ccd9..12d376a8c2 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -1351,7 +1351,7 @@ void CShareData::InitPopupMenu(DLLSHAREDATA* pShareData) rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYPATH; rMenu.m_nCustMenuItemKeyArr [0][n] = '\\'; n++; - rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYFOLDER; + rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYDIRPATH; rMenu.m_nCustMenuItemKeyArr [0][n] = 'O'; n++; rMenu.m_nCustMenuItemFuncArr[0][n] = F_OPEN_FOLDER_IN_EXPLORER; diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index 13475fc3b1..6ade336c34 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -277,7 +277,7 @@ const EFunctionCode pnFuncList_Clip[] = { //Oct. 16, 2000 JEPRO 螟画焚蜷榊､画峩( F_COPY_COLOR_HTML_LINENUMBER, //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ F_COPYFNAME , //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ //2002/2/3 aroka F_COPYPATH , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ - F_COPYFOLDER , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + F_COPYDIRPATH , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ F_COPYTAG , //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 14, 2000 JEPRO 繝｡繝九Η繝ｼ縺ｫ蜷医ｏ縺帙※荳九↓遘ｻ蜍 F_CREATEKEYBINDLIST //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ //Sept. 15, 2000 JEPRO IDM_TEST縺ｮ縺ｾ縺ｾ縺ｧ縺ｯ縺縺ｾ縺上＞縺九↑縺縺ｮ縺ｧF縺ｫ螟峨∴縺ｦ逋ｻ骭ｲ //Dec. 25, 2000 蠕ｩ豢ｻ }; @@ -745,7 +745,7 @@ int FuncID_To_HelpContextID( EFunctionCode nFuncID ) case F_COPY_COLOR_HTML: return HLP000342; //驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPY_COLOR_HTML_LINENUMBER: return HLP000343; //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPYPATH: return HLP000056; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ - case F_COPYFOLDER: return HLP000380; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + case F_COPYDIRPATH: return HLP000380; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ case F_COPYTAG: return HLP000175; //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Oct. 17, 2000 JEPRO 霑ｽ蜉 case F_COPYFNAME: return HLP000303; //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ // 2002/2/3 aroka // case IDM_TEST_CREATEKEYBINDLIST: return 57; //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵け繝ｪ繝繝励懊ｼ繝峨∈繧ｳ繝斐ｼ //Sept. 15, 2000 jepro縲後Μ繧ｹ繝医阪ｒ縲御ｸ隕ｧ縲阪↓螟画峩 diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index 8003e9fbcf..3faaf783ac 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -217,7 +217,7 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoCommandArr[] = {F_COPY_COLOR_HTML, LTEXT("CopyColorHtml"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ {F_COPY_COLOR_HTML_LINENUMBER, LTEXT("CopyColorHtmlWithLineNumber"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ {F_COPYPATH, LTEXT("CopyPath"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ - {F_COPYFOLDER, LTEXT("CopyFolder"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + {F_COPYDIRPATH, LTEXT("CopyDirPath"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ {F_COPYFNAME, LTEXT("CopyFilename"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ // 2002/2/3 aroka {F_COPYTAG, LTEXT("CopyTag"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 15, 2000 jepro 荳翫→蜷後§隱ｬ譏弱↓縺ｪ縺｣縺ｦ縺縺溘ｮ繧剃ｿｮ豁｣ {F_CREATEKEYBINDLIST, LTEXT("CopyKeyBindList"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ //Sept. 15, 2000 JEPRO 霑ｽ蜉 //Dec. 25, 2000 蠕ｩ豢ｻ diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index b2291c6505..1c851ef156 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -2492,7 +2492,7 @@ BEGIN F_COPYPATH "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｳ繝斐ｼ" F_COPYTAG "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ" F_COPYFNAME "縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｳ繝斐ｼ" - F_COPYFOLDER "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ" + F_COPYDIRPATH "縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ" END STRINGTABLE DISCARDABLE diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 5d1ae6b2f5..02979021da 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -2496,7 +2496,7 @@ BEGIN F_COPYPATH "Copy this file's path" F_COPYTAG "Copy file path and cursor location" F_COPYFNAME "Copy this file's name" - F_COPYFOLDER "Copy this file's folder" + F_COPYDIRPATH "Copy this file's folder" END STRINGTABLE DISCARDABLE diff --git a/tools/macro/copyfolder/copyfolder.js b/tools/macro/CopyDirPath/CopyDirPath.js similarity index 99% rename from tools/macro/copyfolder/copyfolder.js rename to tools/macro/CopyDirPath/CopyDirPath.js index 7430f2f3ca..e71da94941 100644 --- a/tools/macro/copyfolder/copyfolder.js +++ b/tools/macro/CopyDirPath/CopyDirPath.js @@ -32,4 +32,4 @@ // 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 // 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ // 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 -CopyFolder(); +CopyDirPath(); diff --git a/tools/macro/copyfolder/copyfolder.mac b/tools/macro/CopyDirPath/CopyDirPath.mac similarity index 99% rename from tools/macro/copyfolder/copyfolder.mac rename to tools/macro/CopyDirPath/CopyDirPath.mac index 7430f2f3ca..e71da94941 100644 --- a/tools/macro/copyfolder/copyfolder.mac +++ b/tools/macro/CopyDirPath/CopyDirPath.mac @@ -32,4 +32,4 @@ // 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 // 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ // 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 -CopyFolder(); +CopyDirPath(); diff --git a/tools/macro/copyfolder/copyfolder.vbs b/tools/macro/CopyDirPath/CopyDirPath.vbs similarity index 99% rename from tools/macro/copyfolder/copyfolder.vbs rename to tools/macro/CopyDirPath/CopyDirPath.vbs index 2b56c428a9..9769f1ac73 100644 --- a/tools/macro/copyfolder/copyfolder.vbs +++ b/tools/macro/CopyDirPath/CopyDirPath.vbs @@ -32,4 +32,4 @@ ' 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 ' 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ ' 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 -CopyFolder() +CopyDirPath() diff --git a/tools/macro/macro.md b/tools/macro/macro.md index 7522147764..4117362906 100644 --- a/tools/macro/macro.md +++ b/tools/macro/macro.md @@ -5,6 +5,6 @@ |荳ｻ縺ｪ髢｢謨ｰ蜷鋼繝繧ｹ繝医☆繧区ｩ溯ｽ|蟇ｾ蠢懊ヰ繝ｼ繧ｸ繝ｧ繝ｳ|繝槭け繝ｭ繝代せ|繧ｿ繧､繝慾 |--|--|--|--|--| -|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.mac](copyfolder/copyfolder.mac)|繧ｭ繝ｼ繝槭け繝ｭ| -|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.js](copyfolder/copyfolder.js)|WSH(Jscript)| -|CopyFolder|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[copyfolder/copyfolder.vbs](copyfolder/copyfolder.vbs)|WSH(VBScript)| +|CopyDirPath|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[CopyDirPath/CopyDirPath.mac](CopyDirPath/CopyDirPath.mac)|繧ｭ繝ｼ繝槭け繝ｭ| +|CopyDirPath|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[CopyDirPath/CopyDirPath.js](CopyDirPath/CopyDirPath.js)|WSH(Jscript)| +|CopyDirPath|迴ｾ蝨ｨ髢九＞縺ｦ縺繧九ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｮ繧ｳ繝斐ｼ|ver 2.4.0.0 莉･髯鋼[CopyDirPath/CopyDirPath.vbs](CopyDirPath/CopyDirPath.vbs)|WSH(VBScript)| From 842b6144b06d77e8f2d26b1fdfd6b19f7c4900bc Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 27 Dec 2018 08:21:10 +0900 Subject: [PATCH 07/15] =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E8=A8=88?= =?UTF-8?q?=E7=AE=97=E3=82=92=E5=8A=B9=E7=8E=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Clipboard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 6b302e37a8..63e9dd1109 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1136,7 +1136,7 @@ void CViewCommander::Command_COPYDIRPATH( void ) } /* 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繝輔か繝ｫ繝蜷阪ｒ繧ｳ繝斐ｼ */ - m_pCommanderView->MySetClipboardData( strFolder.c_str(), wcslen(strFolder.c_str()), false ); + m_pCommanderView->MySetClipboardData( strFolder.c_str(), strFolder.size(), false ); } // May 9, 2000 genta From d742e472a4ee5205a458df3251a41d2719f73732 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 27 Dec 2018 08:24:44 +0900 Subject: [PATCH 08/15] =?UTF-8?q?[ci=20skip]=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/macro/CopyDirPath/CopyDirPath.js | 2 +- tools/macro/CopyDirPath/CopyDirPath.mac | 2 +- tools/macro/CopyDirPath/CopyDirPath.vbs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/macro/CopyDirPath/CopyDirPath.js b/tools/macro/CopyDirPath/CopyDirPath.js index e71da94941..3302612aec 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.js +++ b/tools/macro/CopyDirPath/CopyDirPath.js @@ -31,5 +31,5 @@ // 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ // 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 // 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ -// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 CopyDirPath(); diff --git a/tools/macro/CopyDirPath/CopyDirPath.mac b/tools/macro/CopyDirPath/CopyDirPath.mac index e71da94941..3302612aec 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.mac +++ b/tools/macro/CopyDirPath/CopyDirPath.mac @@ -31,5 +31,5 @@ // 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ // 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 // 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ -// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +// 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 CopyDirPath(); diff --git a/tools/macro/CopyDirPath/CopyDirPath.vbs b/tools/macro/CopyDirPath/CopyDirPath.vbs index 9769f1ac73..9810f94899 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.vbs +++ b/tools/macro/CopyDirPath/CopyDirPath.vbs @@ -31,5 +31,5 @@ ' 3. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ] 繧帝∈縺ｶ ' 4. 縺薙ｮ繝槭け繝ｭ繝輔ぃ繧､繝ｫ縺ｮ繝代せ繧呈欠螳壹☆繧 ' 5. [繝繝ｼ繝ｫ] 繝｡繝九Η繝ｼ縺九ｉ [繧ｭ繝ｼ繝槭け繝ｭ縺ｮ螳溯｡珪 繧帝∈縺ｶ -' 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 +' 6. 繧ｯ繝ｪ繝繝励懊ｼ繝峨↓髢九＞縺溘ユ繧ｭ繧ｹ繝医ヵ繧｡繧､繝ｫ縺ｮ繝輔か繝ｫ繝繝代せ縺後さ繝斐ｼ縺輔ｌ繧九ｮ縺ｧ縲√お繝繧｣繧ｿ遲峨↓雋ｼ繧贋ｻ倥¢繧九 CopyDirPath() From 2dabce1e26354933ed7229949403533b5b2e0e54 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 27 Dec 2018 08:32:32 +0900 Subject: [PATCH 09/15] =?UTF-8?q?=E8=A1=A8=E7=8F=BE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/macro/macro.hhc | 2 +- sakura_lang_en_US/sakura_lang_rc.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/help/macro/macro.hhc b/help/macro/macro.hhc index a739a9630e..7ee37fe37f 100644 --- a/help/macro/macro.hhc +++ b/help/macro/macro.hhc @@ -613,7 +613,7 @@
  • - + diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 02979021da..7c9b1918e4 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -2496,7 +2496,7 @@ BEGIN F_COPYPATH "Copy this file's path" F_COPYTAG "Copy file path and cursor location" F_COPYFNAME "Copy this file's name" - F_COPYDIRPATH "Copy this file's folder" + F_COPYDIRPATH "Copy this file's directory path" END STRINGTABLE DISCARDABLE From 196a93f8b18029347b9d56cc676274515b074ad9 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Fri, 28 Dec 2018 07:55:25 +0900 Subject: [PATCH 10/15] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/sakura/_RESOURCE/HLP000380.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/help/sakura/_RESOURCE/HLP000380.html b/help/sakura/_RESOURCE/HLP000380.html index 95d3e51faa..e71931d6f8 100644 --- a/help/sakura/_RESOURCE/HLP000380.html +++ b/help/sakura/_RESOURCE/HLP000380.html @@ -5,8 +5,8 @@ このファイルのフォルダ名をコピー - - + + @@ -15,6 +15,6 @@ 現在編集中のファイルのフォルダ名をクリップボードへコピーします。

    ■マクロ構文
    -・構文: CopyFolder( );
    +・構文: CopyDirPath( );
    ・記録: ○
    From 08fe56af99464a6a2efcf19c11ab990869142ceb Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sat, 29 Dec 2018 08:43:46 +0900 Subject: [PATCH 11/15] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E6=9C=89=E5=8A=B9=E5=8C=96=E6=9D=A1=E4=BB=B6=E3=81=AE?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=BC=8F=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/func/Funccode.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index 6ade336c34..46e69037ae 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -1175,6 +1175,7 @@ bool IsFuncEnable( const CEditDoc* pcEditDoc, const DLLSHAREDATA* pShareData, EF case F_REDO: return pcEditDoc->m_cDocEditor.IsEnableRedo(); /* Redo(繧繧顔峩縺)蜿ｯ閭ｽ縺ｪ迥ｶ諷九°ｼ */ case F_COPYPATH: + case F_COPYDIRPATH: case F_COPYTAG: case F_COPYFNAME: // 2002/2/3 aroka case F_OPEN_HfromtoC: //蜷悟錐縺ｮC/C++繝倥ャ繝(繧ｽ繝ｼ繧ｹ)繧帝幕縺 //Feb. 7, 2001 JEPRO 霑ｽ蜉 From 0850ff4a44f51035182245bd1d80e0f65bf08420 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sat, 29 Dec 2018 10:41:51 +0900 Subject: [PATCH 12/15] =?UTF-8?q?=E3=82=BF=E3=83=96=E3=83=A1=E3=83=8B?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=81=AB=E3=82=82=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/env/CShareData.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index 12d376a8c2..1aec1d81cc 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -1417,6 +1417,9 @@ void CShareData::InitPopupMenu(DLLSHAREDATA* pShareData) rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_COPYPATH; rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = '\0'; n++; + rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_COPYDIRPATH; + rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = '\0'; + n++; rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_OPEN_FOLDER_IN_EXPLORER; rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = 'F'; n++; From 64efe7b991256fe3db6595e68904d13d46988090 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sat, 29 Dec 2018 10:44:39 +0900 Subject: [PATCH 13/15] =?UTF-8?q?=E3=82=BB=E3=83=91=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/env/CShareData.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index 1aec1d81cc..ac17aede4b 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -1354,6 +1354,9 @@ void CShareData::InitPopupMenu(DLLSHAREDATA* pShareData) rMenu.m_nCustMenuItemFuncArr[0][n] = F_COPYDIRPATH; rMenu.m_nCustMenuItemKeyArr [0][n] = 'O'; n++; + rMenu.m_nCustMenuItemFuncArr[0][n] = F_0; + rMenu.m_nCustMenuItemKeyArr [0][n] = '\0'; + n++; rMenu.m_nCustMenuItemFuncArr[0][n] = F_OPEN_FOLDER_IN_EXPLORER; rMenu.m_nCustMenuItemKeyArr[0][n] = 'E'; n++; @@ -1420,6 +1423,9 @@ void CShareData::InitPopupMenu(DLLSHAREDATA* pShareData) rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_COPYDIRPATH; rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = '\0'; n++; + rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_0; + rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = '\0'; + n++; rMenu.m_nCustMenuItemFuncArr[CUSTMENU_INDEX_FOR_TABWND][n] = F_OPEN_FOLDER_IN_EXPLORER; rMenu.m_nCustMenuItemKeyArr [CUSTMENU_INDEX_FOR_TABWND][n] = 'F'; n++; From 8321322665cd96de13c593d5992ca23eec14431b Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sat, 29 Dec 2018 13:25:18 +0900 Subject: [PATCH 14/15] =?UTF-8?q?=E3=82=AD=E3=83=BC=E3=83=9E=E3=82=AF?= =?UTF-8?q?=E3=83=AD=E3=81=AE=E8=A8=98=E9=8C=B2=E5=AF=BE=E8=B1=A1=E3=81=8B?= =?UTF-8?q?=E3=82=89=E5=A4=96=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/macro/CSMacroMgr.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index 3faaf783ac..3af713094c 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -1040,6 +1040,7 @@ BOOL CSMacroMgr::CanFuncIsKeyMacro( int nFuncID ) case F_COPY_COLOR_HTML ://驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPY_COLOR_HTML_LINENUMBER://驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ case F_COPYPATH ://縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ + case F_COPYDIRPATH ://縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ case F_COPYTAG ://縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ //Sept. 15, 2000 jepro 荳翫→蜷後§隱ｬ譏弱↓縺ｪ縺｣縺ｦ縺縺溘ｮ繧剃ｿｮ豁｣ case F_COPYFNAME ://縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ // 2002/2/3 aroka case F_CREATEKEYBINDLIST ://繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ //Sept. 15, 2000 JEPRO 霑ｽ蜉 //Dec. 25, 2000 蠕ｩ豢ｻ From c1c6792627301429bcc63d5fd3b10663f3b7e1ca Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 30 Dec 2018 10:53:12 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=E3=83=84=E3=83=BC=E3=83=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=AB=E9=A0=85=E7=9B=AE?= =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/Funccode_x.hsrc | 2 +- sakura_core/uiparts/CMenuDrawer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 8975fff976..4271e4b7f1 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -258,7 +258,7 @@ F_COPYPATH = 30620, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝 F_COPYTAG = 30621, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝代せ蜷阪→繧ｫ繝ｼ繧ｽ繝ｫ菴咲ｽｮ繧偵さ繝斐ｼ 縺ｪ縺 F_COPYFNAME = 30622, //縺薙ｮ繝輔ぃ繧､繝ｫ蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 F_CREATEKEYBINDLIST = 30630, //繧ｭ繝ｼ蜑ｲ繧雁ｽ薙※荳隕ｧ繧偵さ繝斐ｼ 縺ｪ縺 -F_COPYDIRPATH = 32820, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 +F_COPYDIRPATH = 30631, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ 縺ｪ縺 // 謖ｿ蜈･邉ｻ diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index d3ae622042..3ebbc3a640 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -312,7 +312,7 @@ CMenuDrawer::CMenuDrawer() /* 175 */ F_COPY_ADDCRLF /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //謚倥ｊ霑斐＠菴咲ｽｮ縺ｫ謾ｹ陦後ｒ縺､縺代※繧ｳ繝斐ｼ /* 176 */ F_COPY_COLOR_HTML /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //驕ｸ謚樒ｯ蝗ｲ蜀濶ｲ莉倥″HTML繧ｳ繝斐ｼ /* 177 */ F_COPY_COLOR_HTML_LINENUMBER /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //驕ｸ謚樒ｯ蝗ｲ蜀陦檎分蜿ｷ濶ｲ莉倥″HTML繧ｳ繝斐ｼ -/* 178 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //繝繝溘ｼ +/* 178 */ F_COPYDIRPATH /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //縺薙ｮ繝輔ぃ繧､繝ｫ縺ｮ繝輔か繝ｫ繝蜷阪ｒ繧ｯ繝ｪ繝繝励懊ｼ繝峨↓繧ｳ繝斐ｼ /* 179 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //繝繝溘ｼ /* 180 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //繝繝溘ｼ /* 181 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //繝繝溘ｼ