From 99822f48f8daa42f43de30ddda8d409d37cd23ea Mon Sep 17 00:00:00 2001 From: Katsuhisa Yuasa Date: Sat, 28 Sep 2019 20:28:32 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=BD=BF=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E6=8C=BF=E5=85=A5=20?= =?UTF-8?q?=E3=81=A8=20=E6=9C=80=E8=BF=91=E4=BD=BF=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=8C=BF=E5=85=A5=20?= =?UTF-8?q?=E3=82=92=E8=A1=8C=E3=81=86=E6=A9=9F=E8=83=BD=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/MainMenu.ini | 2 ++ resource/mytool.bmp | Bin 63478 -> 63478 bytes sakura_core/Funccode_x.hsrc | 2 ++ sakura_core/cmd/CViewCommander.cpp | 2 ++ sakura_core/cmd/CViewCommander.h | 4 ++- sakura_core/cmd/CViewCommander_Insert.cpp | 30 ++++++++++++++++++++++ sakura_core/doc/CEditDoc.cpp | 2 ++ sakura_core/func/Funccode.cpp | 4 ++- sakura_core/macro/CSMacroMgr.cpp | 4 +++ sakura_core/sakura_rc.rc | 2 ++ sakura_core/uiparts/CMenuDrawer.cpp | 4 +-- sakura_lang_en_US/sakura_lang_rc.rc | 2 ++ 12 files changed, 54 insertions(+), 4 deletions(-) diff --git a/resource/MainMenu.ini b/resource/MainMenu.ini index 396dcbbc0e..9ff769664e 100644 --- a/resource/MainMenu.ini +++ b/resource/MainMenu.ini @@ -60,6 +60,8 @@ 2,1,30790,D, 2,1,30791,T, 2,1,30792,C, +2,1,30794,F, +2,1,30795,O, 1,0,34012,V, 2,1,30230,L, 2,1,30231,R, diff --git a/resource/mytool.bmp b/resource/mytool.bmp index b9a389461cc86391999bf735984b579d6ccced4e..eb53e5c80895c5663a6555d51047c8c87a887590 100644 GIT binary patch literal 63478 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 literal 63478 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 diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 4271e4b7f1..90ba67ebf9 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -266,6 +266,8 @@ F_INS_DATE = 30790, //日付挿入 なし F_INS_TIME = 30791, //時刻挿入 なし F_CTRL_CODE_DIALOG = 30792, //コントロールコードの入力(ダイアログ) なし F_CTRL_CODE = 30793. //コントロールコードの入力 wchar_t code +F_INS_FILE_USED_RECENTLY = 30794, // 最近使ったファイル挿入 +F_INS_FOLDER_USED_RECENTLY = 30795, // 最近使ったフォルダ挿入 // 変換系 diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 5e1826da80..7f9d14f057 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -390,6 +390,8 @@ BOOL CViewCommander::HandleCommand( case F_INS_TIME: Command_INS_TIME();break; //時刻挿入 case F_CTRL_CODE_DIALOG: Command_CtrlCode_Dialog();break; /* コントロールコードの入力(ダイアログ) */ //@@@ 2002.06.02 MIK case F_CTRL_CODE: Command_WCHAR( (wchar_t)lparam1, false );break; + case F_INS_FILE_USED_RECENTLY: Command_INS_FILE_USED_RECENTLY();break; //最近使ったファイル挿入 + case F_INS_FOLDER_USED_RECENTLY:Command_INS_FOLDER_USED_RECENTLY();break; //最近使ったフォルダ挿入 /* 変換 */ case F_TOLOWER: Command_TOLOWER();break; /* 小文字 */ diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index 08807f0b18..dba8b83b5b 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -152,7 +152,6 @@ class CViewCommander{ void Command_SORT(BOOL bAsc); // 2001.12.06 hor void Command_MERGE(void); // 2001.12.06 hor void Command_Reconvert(void); /* メニューからの再変換対応 minfu 2002.04.09 */ - void Command_CtrlCode_Dialog(void); /* コントロールコードの入力(ダイアログ) */ //@@@ 2002.06.02 MIK /* カーソル移動系 */ // Oct. 24, 2001 genta 機能拡張のため引数追加 @@ -236,6 +235,9 @@ class CViewCommander{ /* 挿入系 */ void Command_INS_DATE( void ); //日付挿入 void Command_INS_TIME( void ); //時刻挿入 + void Command_CtrlCode_Dialog(void); /* コントロールコードの入力(ダイアログ) */ //@@@ 2002.06.02 MIK + void Command_INS_FILE_USED_RECENTLY( void ); //最近使ったファイル挿入 + void Command_INS_FOLDER_USED_RECENTLY( void ); //最近使ったフォルダ挿入 /* 変換系 */ void Command_TOLOWER( void ); /* 小文字 */ diff --git a/sakura_core/cmd/CViewCommander_Insert.cpp b/sakura_core/cmd/CViewCommander_Insert.cpp index 15c90a54f3..26bf975500 100644 --- a/sakura_core/cmd/CViewCommander_Insert.cpp +++ b/sakura_core/cmd/CViewCommander_Insert.cpp @@ -17,6 +17,8 @@ #include "dlg/CDlgCtrlCode.h" //コントロールコードの入力(ダイアログ) #include "env/CFormatManager.h" +#include "recent/CMRUFile.h" +#include "recent/CMRUFolder.h" //日付挿入 void CViewCommander::Command_INS_DATE( void ) @@ -62,3 +64,31 @@ void CViewCommander::Command_CtrlCode_Dialog( void ) HandleCommand( F_CTRL_CODE, true, cDlgCtrlCode.GetCharCode(), 0, 0, 0 ); } } + +// 最近使ったファイル挿入 +void CViewCommander::Command_INS_FILE_USED_RECENTLY( void ) +{ + std::wstring eol = GetDocument()->m_cDocEditor.GetNewLineCode().GetValue2(); + std::wstring s; + CMRUFile cMRUFile; + auto list = cMRUFile.GetPathList(); + for (auto item : list) { + s += item; + s += eol; + } + Command_INSTEXT( true, s.c_str(), (CLogicInt)s.size(), TRUE ); +} + +// 最近使ったフォルダ挿入 +void CViewCommander::Command_INS_FOLDER_USED_RECENTLY( void ) +{ + std::wstring eol = GetDocument()->m_cDocEditor.GetNewLineCode().GetValue2(); + std::wstring s; + CMRUFolder cMRUFolder; + auto list = cMRUFolder.GetPathList(); + for (auto item : list) { + s += item; + s += eol; + } + Command_INSTEXT( true, s.c_str(), (CLogicInt)s.size(), TRUE ); +} diff --git a/sakura_core/doc/CEditDoc.cpp b/sakura_core/doc/CEditDoc.cpp index c6c69d4a94..ec80f1b746 100644 --- a/sakura_core/doc/CEditDoc.cpp +++ b/sakura_core/doc/CEditDoc.cpp @@ -118,6 +118,8 @@ static const EFunctionCode EIsModificationForbidden[] = { F_INS_DATE, F_INS_TIME, F_CTRL_CODE_DIALOG, //@@@ 2002.06.02 MIK + F_INS_FILE_USED_RECENTLY, + F_INS_FOLDER_USED_RECENTLY, F_TOLOWER, F_TOUPPER, F_TOHANKAKU, diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index aa9569e2f9..4222283538 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -287,7 +287,9 @@ const int nFincList_Clip_Num = _countof( pnFuncList_Clip ); //Oct. 16, 2000 JEPR const EFunctionCode pnFuncList_Insert[] = { F_INS_DATE , // 日付挿入 F_INS_TIME , // 時刻挿入 - F_CTRL_CODE_DIALOG //コントロールコードの入力 + F_CTRL_CODE_DIALOG , // コントロールコードの入力 + F_INS_FILE_USED_RECENTLY, // 最近使ったファイル挿入 + F_INS_FOLDER_USED_RECENTLY, // 最近使ったフォルダ挿入 }; const int nFincList_Insert_Num = _countof( pnFuncList_Insert ); diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index 1b7e32beeb..2be7b13953 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -227,6 +227,8 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoCommandArr[] = {F_INS_TIME, LTEXT("InsertTime"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, // 時刻挿入 {F_CTRL_CODE_DIALOG, LTEXT("CtrlCodeDialog"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //コントロールコードの入力(ダイアログ) //@@@ 2002.06.02 MIK {F_CTRL_CODE, LTEXT("CtrlCode"), {VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //コントロールコードの入力 2013.12.12 + {F_INS_FILE_USED_RECENTLY, LTEXT("InsertFileUsedRecently"),{VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, // 最近使ったファイル挿入 + {F_INS_FOLDER_USED_RECENTLY,LTEXT("InsertFolderUsedRecently"),{VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, // 最近使ったフォルダ挿入 /* 変換系 */ {F_TOLOWER, LTEXT("ToLower"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //小文字 @@ -1050,6 +1052,8 @@ BOOL CSMacroMgr::CanFuncIsKeyMacro( int nFuncID ) case F_INS_TIME :// 時刻挿入 // case F_CTRL_CODE_DIALOG ://コントロールコードの入力(ダイアログ) //@@@ 2002.06.02 MIK case F_CTRL_CODE ://コントロールコードの入力 2013.12.12 + case F_INS_FILE_USED_RECENTLY :// 最近使ったファイル挿入 + case F_INS_FOLDER_USED_RECENTLY :// 最近使ったフォルダ挿入 /* 変換系 */ case F_TOLOWER ://小文字 diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 56a37d94d6..5293ec3eca 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -2504,6 +2504,8 @@ BEGIN F_INS_DATE "日付挿入" F_INS_TIME "時刻挿入" F_CTRL_CODE_DIALOG "コントロールコード入力..." + F_INS_FILE_USED_RECENTLY "最近使ったファイル挿入" + F_INS_FOLDER_USED_RECENTLY "最近使ったフォルダ挿入" END STRINGTABLE DISCARDABLE diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index 046f5a25d6..ac95d6e9aa 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -305,8 +305,8 @@ CMenuDrawer::CMenuDrawer() /* 185 */ F_INS_DATE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //日付挿入 //Nov. 5, 2000 JEPRO 追加 /* 186 */ F_INS_TIME /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //時刻挿入 //Nov. 5, 2000 JEPRO 追加 /* 187 */ F_CTRL_CODE_DIALOG /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //コントロールコードの入力(ダイアログ) //@@@ 2002.06.02 MIK -/* 188 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //ダミー -/* 189 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //ダミー +/* 188 */ F_INS_FILE_USED_RECENTLY /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //最近使ったファイル挿入 +/* 189 */ F_INS_FOLDER_USED_RECENTLY /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //最近使ったフォルダ挿入 /* 190 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //ダミー /* 191 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //ダミー /* 192 */ F_DISABLE /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //ダミー diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index cab3ef2dd7..35301ddbe8 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -2509,6 +2509,8 @@ BEGIN F_INS_DATE "Ins. Date" F_INS_TIME "Ins. Time" F_CTRL_CODE_DIALOG "Control Code Input" + F_INS_FILE_USED_RECENTLY "Ins. Recently Used File" + F_INS_FOLDER_USED_RECENTLY "Ins. Recently Used Folder" END STRINGTABLE DISCARDABLE