From 933ed1c5f1df7925b6d39bd1f2d694a7a40f9c31 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Wed, 14 Jul 2021 13:05:43 +0900 Subject: [PATCH 001/129] =?UTF-8?q?CClipboard::SetText=20=E3=81=A8=20CClip?= =?UTF-8?q?board::GetText=20=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-cclipboard.cpp | 111 ++++++++++++++++++---------- 1 file changed, 71 insertions(+), 40 deletions(-) diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index b78ef30729..6052bcbbc6 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -28,33 +28,36 @@ #define NOMINMAX #endif /* #ifndef NOMINMAX */ -#include +#include +#include + #include -#include #include +#include "CEol.h" #include "mem/CNativeW.h" #include "_os/CClipboard.h" -/*! - * HWND型のスマートポインタを実現するためのdeleterクラス - */ -struct window_closer -{ - void operator()(HWND hWnd) const - { - ::DestroyWindow(hWnd); +class CClipboard1 : public testing::Test { +protected: + void SetUp() override { + hInstance = ::GetModuleHandle(nullptr); + hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); + if (!hWnd) FAIL(); + } + void TearDown() override { + if (hWnd) + ::DestroyWindow(hWnd); } -}; - -//! HWND型のスマートポインタ -using windowHolder = std::unique_ptr::type, window_closer>; + HINSTANCE hInstance = nullptr; + HWND hWnd = nullptr; +}; /*! * @brief SetHtmlTextのテスト */ -TEST(CClipboard, SetHtmlText) +TEST_F(CClipboard1, SetHtmlText) { constexpr const wchar_t inputData[] = L"test 109"; constexpr const char expected[] = @@ -71,36 +74,64 @@ TEST(CClipboard, SetHtmlText) const UINT uHtmlFormat = ::RegisterClipboardFormat(L"HTML Format"); - auto hInstance = ::GetModuleHandleW(nullptr); - if (HWND hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); hWnd) { - // HWNDをスマートポインタに入れる - windowHolder holder(hWnd); - - // クリップボード操作クラスでSetHtmlTextする - CClipboard cClipBoard(hWnd); + // クリップボード操作クラスでSetHtmlTextする + CClipboard cClipBoard(hWnd); - // 操作は失敗しないはず。 - ASSERT_TRUE(cClipBoard.SetHtmlText(inputData)); + // 操作は失敗しないはず。 + ASSERT_TRUE(cClipBoard.SetHtmlText(inputData)); - // 操作に成功するとHTML形式のデータを利用できるはず。 - ASSERT_TRUE(::IsClipboardFormatAvailable(uHtmlFormat)); + // 操作に成功するとHTML形式のデータを利用できるはず。 + ASSERT_TRUE(::IsClipboardFormatAvailable(uHtmlFormat)); - // クリップボード操作クラスが対応してないので生APIを呼んで確認する。 + // クリップボード操作クラスが対応してないので生APIを呼んで確認する。 - // グローバルメモリをロックできた場合のみ中身を取得しに行く - if (HGLOBAL hClipData = ::GetClipboardData(uHtmlFormat); hClipData != nullptr) { - // データをstd::stringにコピーする - const size_t cchData = ::GlobalSize(hClipData); - const char* pData = (char*)::GlobalLock(hClipData); - std::string strClipData(pData, cchData); + // グローバルメモリをロックできた場合のみ中身を取得しに行く + if (HGLOBAL hClipData = ::GetClipboardData(uHtmlFormat); hClipData != nullptr) { + // データをstd::stringにコピーする + const size_t cchData = ::GlobalSize(hClipData); + const char* pData = (char*)::GlobalLock(hClipData); + std::string strClipData(pData, cchData); - // 使い終わったらロック解除する - ::GlobalUnlock(hClipData); + // 使い終わったらロック解除する + ::GlobalUnlock(hClipData); - ASSERT_STREQ(expected, strClipData.c_str()); - } - else { - FAIL(); - } + ASSERT_STREQ(expected, strClipData.c_str()); + } + else { + FAIL(); } } + +TEST_F(CClipboard1, SetTextAndGetText) +{ + const std::wstring_view text = L"てすと"; + CClipboard clipboard(hWnd); + CNativeW buffer; + bool column; + bool line; + CEol eol(EEolType::cr_and_lf); + + clipboard.Empty(); + + // テキストを設定する（矩形選択フラグなし・行選択フラグなし） + EXPECT_TRUE(clipboard.SetText(text.data(), text.length(), false, false, -1)); + EXPECT_TRUE(CClipboard::HasValidData()); + // Unicode文字列を取得する + EXPECT_TRUE(clipboard.GetText(&buffer, &column, &line, eol, CF_UNICODETEXT)); + EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_FALSE(column); + EXPECT_FALSE(line); + + clipboard.Empty(); + + // テキストを設定する（矩形選択あり・行選択あり） + EXPECT_TRUE(clipboard.SetText(text.data(), text.length(), true, true, -1)); + EXPECT_TRUE(CClipboard::HasValidData()); + // サクラエディタ独自形式データを取得する + EXPECT_TRUE(clipboard.GetText(&buffer, &column, nullptr, eol, CClipboard::GetSakuraFormat())); + EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_TRUE(column); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, &line, eol, CClipboard::GetSakuraFormat())); + EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_TRUE(line); +} From 8212d55c39b6dc9c1f7b96e1d989567dcaa81780 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 2 Jan 2022 10:22:54 +0900 Subject: [PATCH 002/129] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=81=A8=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=82=92=E8=A8=98=E6=86=B6=E3=81=99=E3=82=8B=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=A3=9C=E5=AE=8C=E5=80=99=E8=A3=9C=E3=83=80?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=AB=E9=99=90=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E5=BE=A9=E5=85=83=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/CHokanMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp index ac271a81e1..e361aa997d 100644 --- a/sakura_core/CHokanMgr.cpp +++ b/sakura_core/CHokanMgr.cpp @@ -483,6 +483,12 @@ BOOL CHokanMgr::OnSize( WPARAM wParam, LPARAM lParam ) POINT po; RECT rcDlg; + ::GetWindowRect(GetHwnd(), &rcDlg); + m_xPos = rcDlg.left; + m_xPos = rcDlg.top; + m_nWidth = rcDlg.right - rcDlg.left; + m_nHeight = rcDlg.bottom - rcDlg.top; + ::GetClientRect( GetHwnd(), &rcDlg ); nWidth = rcDlg.right - rcDlg.left; // width of client area nHeight = rcDlg.bottom - rcDlg.top; // height of client area From 62d06add280849ed77b4636a024fac8083d8d8ab Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 2 Jan 2022 10:25:37 +0900 Subject: [PATCH 003/129] =?UTF-8?q?=E4=BC=BC=E9=80=9A=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/CHokanMgr.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp index e361aa997d..5056137f0f 100644 --- a/sakura_core/CHokanMgr.cpp +++ b/sakura_core/CHokanMgr.cpp @@ -475,8 +475,6 @@ BOOL CHokanMgr::OnSize( WPARAM wParam, LPARAM lParam ) IDC_LIST_WORDS }; int nControls = _countof( Controls ); - int nWidth; - int nHeight; int i; RECT rc; HWND hwndCtrl; @@ -490,8 +488,8 @@ BOOL CHokanMgr::OnSize( WPARAM wParam, LPARAM lParam ) m_nHeight = rcDlg.bottom - rcDlg.top; ::GetClientRect( GetHwnd(), &rcDlg ); - nWidth = rcDlg.right - rcDlg.left; // width of client area - nHeight = rcDlg.bottom - rcDlg.top; // height of client area + int nClientWidth = rcDlg.right - rcDlg.left; // width of client area + int nClientHeight = rcDlg.bottom - rcDlg.top; // height of client area // 2001/06/18 Start by asa-o: サイズ変更後の位置を保存 m_poWin.x = rcDlg.left - 4; @@ -518,8 +516,8 @@ BOOL CHokanMgr::OnSize( WPARAM wParam, LPARAM lParam ) NULL, rc.left, rc.top, - nWidth - rc.left * 2, - nHeight - rc.top * 2/* - 20*/, + nClientWidth - rc.left * 2, + nClientHeight - rc.top * 2/* - 20*/, SWP_NOOWNERZORDER | SWP_NOZORDER ); } From c8996484bb9d77455951610116e7c722f28eeb40 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 2 Jan 2022 10:27:05 +0900 Subject: [PATCH 004/129] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=83=9C?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=B9=E3=81=8B=E3=82=89=E3=81=AE=E3=83=86?= =?UTF-8?q?=E3=82=AD=E3=82=B9=E3=83=88=E5=8F=96=E5=BE=97=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=A7=E5=8F=96=E3=82=8A=E3=81=93=E3=81=BC=E3=81=97=E3=81=8C?= =?UTF-8?q?=E7=94=9F=E3=81=98=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/apiwrap/StdControl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/apiwrap/StdControl.cpp b/sakura_core/apiwrap/StdControl.cpp index 9fd2546770..e9a824351c 100644 --- a/sakura_core/apiwrap/StdControl.cpp +++ b/sakura_core/apiwrap/StdControl.cpp @@ -108,7 +108,7 @@ namespace ApiWrap{ } // アイテムテキストを設定するのに必要なバッファを確保する - strText.resize( cchRequired ); + strText.resize(cchRequired + 1); // ListBox_GetText() はコピーした文字数を返す。 const int actualCopied = ListBox_GetText( hList, nIndex, strText.data() ); From 978a9a5e26d92b1cf17cb521a4ec57adb8419f34 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 2 Jan 2022 10:28:04 +0900 Subject: [PATCH 005/129] =?UTF-8?q?ApiWrap::List=5FGetText()=E3=81=AE?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-StdControl.cpp | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/unittests/test-StdControl.cpp b/tests/unittests/test-StdControl.cpp index 16045afae0..b2ec2eafb4 100644 --- a/tests/unittests/test-StdControl.cpp +++ b/tests/unittests/test-StdControl.cpp @@ -48,3 +48,35 @@ TEST(StdControl, Wnd_GetText2) DestroyWindow(hwnd); ASSERT_STREQ(s.c_str(), text); } + +TEST(StdControl, List_GetText) { + std::wstring text = L"0123456789abcdef"; + HWND list = ::CreateWindow(L"LISTBOX", nullptr, 0, 1, 1, 1, 1, nullptr, nullptr, nullptr, nullptr); + ApiWrap::List_AddString(list, text.c_str()); + ApiWrap::List_AddString(list, L""); + + std::wstring result1; + ASSERT_TRUE(ApiWrap::List_GetText(list, 0, result1)); + ASSERT_EQ(result1, text); + + result1.clear(); + ASSERT_TRUE(ApiWrap::List_GetText(list, 1, result1)); + ASSERT_TRUE(result1.empty()); + + ASSERT_FALSE(ApiWrap::List_GetText(list, 2, result1)); + + wchar_t result2[15]{}; + ASSERT_EQ(ApiWrap::List_GetText(list, 0, result2), LB_ERRSPACE); + + wchar_t result3[16]{}; + ASSERT_EQ(ApiWrap::List_GetText(list, 0, result3), LB_ERRSPACE); + + wchar_t result4[17]{}; + ASSERT_EQ(ApiWrap::List_GetText(list, 0, result4), text.length()); + ASSERT_STREQ(result4, text.c_str()); + + result4[0] = L'\0'; + ASSERT_EQ(ApiWrap::List_GetText(list, 2, result4), LB_ERR); + + ::DestroyWindow(list); +} From 7508075459d8339f4f875786333ea9020ca85034 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Mon, 3 Jan 2022 23:01:03 +0900 Subject: [PATCH 006/129] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=97=E3=83=9F?= =?UTF-8?q?=E3=82=B9=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/CHokanMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp index 5056137f0f..5745f7f65e 100644 --- a/sakura_core/CHokanMgr.cpp +++ b/sakura_core/CHokanMgr.cpp @@ -483,7 +483,7 @@ BOOL CHokanMgr::OnSize( WPARAM wParam, LPARAM lParam ) ::GetWindowRect(GetHwnd(), &rcDlg); m_xPos = rcDlg.left; - m_xPos = rcDlg.top; + m_yPos = rcDlg.top; m_nWidth = rcDlg.right - rcDlg.left; m_nHeight = rcDlg.bottom - rcDlg.top; From b18d540b4099e57edfa360bdcb3b2ef7f73e7db4 Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Tue, 4 Jan 2022 16:21:20 +0900 Subject: [PATCH 007/129] =?UTF-8?q?=E3=83=88=E3=83=AA=E3=83=97=E3=83=AB?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E6=99=82=E3=81=AB=E6=AC=A1?= =?UTF-8?q?=E3=81=AE=E8=A1=8C=E3=81=AE=E5=85=88=E9=A0=AD=E3=81=ABURL?= =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E3=81=A8=E3=81=9D=E3=82=8C=E3=81=8C?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=86=E7=8F=BE=E8=B1=A1=E3=81=8C=E8=B5=B7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/view/CEditView_Mouse.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 661cf41ecf..2ee3fc85cd 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -289,6 +289,7 @@ normal_action:; GetSelectionInfo().BeginSelectArea(); // 現在のカーソル位置から選択を開始する GetSelectionInfo().m_bBeginLineSelect = false; // 行単位選択中 OFF } + return; }else /* 選択開始処理 */ /* SHIFTキーが押されていたか */ From 53846169b50c696a837a2a2744f85bfa91bdd7dd Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Tue, 4 Jan 2022 17:26:50 +0900 Subject: [PATCH 008/129] =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=82=BD=E3=83=AB?= =?UTF-8?q?=E5=89=8D=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E5=87=A6?= =?UTF-8?q?=E7=90=86=20CViewCommander::Command=5FDELETE=5FBACK=20=E3=81=A7?= =?UTF-8?q?=20CDocEditor::m=5FnOpeBlkRedawCount=20=E3=82=92=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=AF=E3=83=AA=E3=83=A1=E3=83=B3=E3=83=88=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0=20?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=AC=E3=83=83=E3=83=88=E7=A7=BB=E5=8B=95?= =?UTF-8?q?=E3=81=AE=20CMoveCaretOpe=20=E8=BF=BD=E5=8A=A0=E3=81=A7?= =?UTF-8?q?=E3=81=AF=E5=86=8D=E6=8F=8F=E7=94=BB=E3=81=AF=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=84=A1=E3=81=84=E3=81=AF=E3=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Edit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sakura_core/cmd/CViewCommander_Edit.cpp b/sakura_core/cmd/CViewCommander_Edit.cpp index fbe2b8cf31..6af3767297 100644 --- a/sakura_core/cmd/CViewCommander_Edit.cpp +++ b/sakura_core/cmd/CViewCommander_Edit.cpp @@ -857,6 +857,7 @@ void CViewCommander::Command_DELETE_BACK( void ) GetCaret().GetCaretLogicPos() ) ); + GetDocument()->m_cDocEditor.m_nOpeBlkRedawCount++; } m_pCommanderView->DeleteData( true ); } From 8a043b30277b5e10b1475e0648fe888f5cf67816 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Wed, 5 Jan 2022 00:37:49 +0900 Subject: [PATCH 009/129] =?UTF-8?q?.vs=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=92=E9=99=A4=E5=A4=96=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=81=AB=E5=8A=A0=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/ChmSourceConverter/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ChmSourceConverter/.gitignore b/tools/ChmSourceConverter/.gitignore index 1f1945e50e..bc5a1fc989 100644 --- a/tools/ChmSourceConverter/.gitignore +++ b/tools/ChmSourceConverter/.gitignore @@ -2,3 +2,4 @@ **/obj **/packages **/TestResults +/.vs From dd7d091a56ea7cacf610b8bc2314030fb138c196 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 14 Nov 2021 16:00:01 +0900 Subject: [PATCH 010/129] =?UTF-8?q?ChmSourceConverter=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=82=B2=E3=83=83=E3=83=88=E3=82=92=E3=80=8C.NET=20Fr?= =?UTF-8?q?amework=204.7.2=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChmSourceConverter.Test.csproj | 3 ++- .../ChmSourceConverter/App.config | 13 ++++++------- .../ChmSourceConverter/ChmSourceConverter.csproj | 3 ++- .../Properties/Settings.Designer.cs | 10 +++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tools/ChmSourceConverter/ChmSourceConverter.Test/ChmSourceConverter.Test.csproj b/tools/ChmSourceConverter/ChmSourceConverter.Test/ChmSourceConverter.Test.csproj index 49a63cc716..a1bdb76456 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter.Test/ChmSourceConverter.Test.csproj +++ b/tools/ChmSourceConverter/ChmSourceConverter.Test/ChmSourceConverter.Test.csproj @@ -10,7 +10,7 @@ Properties ChmSourceConverter ChmSourceConverter.Test - v4.6.1 + v4.7.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 15.0 @@ -20,6 +20,7 @@ UnitTest + true diff --git a/tools/ChmSourceConverter/ChmSourceConverter/App.config b/tools/ChmSourceConverter/ChmSourceConverter/App.config index b382b6cb62..8af32f6bf8 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/App.config +++ b/tools/ChmSourceConverter/ChmSourceConverter/App.config @@ -1,19 +1,18 @@ - + - -
+ +
- + - + .html .css .js @@ -40,4 +39,4 @@ - \ No newline at end of file + diff --git a/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverter.csproj b/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverter.csproj index 77dc98c9c1..8fa227a8fe 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverter.csproj +++ b/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverter.csproj @@ -8,10 +8,11 @@ Exe ChmSourceConverter ChmSourceConverter - v4.6.1 + v4.7.2 512 true true + AnyCPU diff --git a/tools/ChmSourceConverter/ChmSourceConverter/Properties/Settings.Designer.cs b/tools/ChmSourceConverter/ChmSourceConverter/Properties/Settings.Designer.cs index 2415c06cba..ab4300f6a0 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/Properties/Settings.Designer.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace ChmSourceConverter.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); From 2c1f78b7a3efa7851f1bc0433f175465f069f8bd Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 14 Nov 2021 16:05:26 +0900 Subject: [PATCH 011/129] =?UTF-8?q?ToolBarTools=E3=81=AE=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=82=B2=E3=83=83=E3=83=88=E3=82=92=E3=80=8C.NET=20Framework?= =?UTF-8?q?=204.7.2=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ToolBarImageCommon/ToolBarImageCommon.csproj | 3 ++- tools/ToolBarTools/ToolBarImageMuxer/App.config | 6 +++--- .../ToolBarTools/ToolBarImageMuxer/ToolBarImageMuxer.csproj | 3 ++- tools/ToolBarTools/ToolBarImageSplitter/App.config | 6 +++--- .../ToolBarImageSplitter/ToolBarImageSplitter.csproj | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/ToolBarTools/ToolBarImageCommon/ToolBarImageCommon.csproj b/tools/ToolBarTools/ToolBarImageCommon/ToolBarImageCommon.csproj index ab8e259e8f..9dcdfbc28f 100644 --- a/tools/ToolBarTools/ToolBarImageCommon/ToolBarImageCommon.csproj +++ b/tools/ToolBarTools/ToolBarImageCommon/ToolBarImageCommon.csproj @@ -9,9 +9,10 @@ Properties ToolBarImageCommon ToolBarImageCommon - v4.6.1 + v4.7.2 512 true + true diff --git a/tools/ToolBarTools/ToolBarImageMuxer/App.config b/tools/ToolBarTools/ToolBarImageMuxer/App.config index 731f6de6c2..ecdcf8a54d 100644 --- a/tools/ToolBarTools/ToolBarImageMuxer/App.config +++ b/tools/ToolBarTools/ToolBarImageMuxer/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/tools/ToolBarTools/ToolBarImageMuxer/ToolBarImageMuxer.csproj b/tools/ToolBarTools/ToolBarImageMuxer/ToolBarImageMuxer.csproj index 5ca961c49f..596356e21a 100644 --- a/tools/ToolBarTools/ToolBarImageMuxer/ToolBarImageMuxer.csproj +++ b/tools/ToolBarTools/ToolBarImageMuxer/ToolBarImageMuxer.csproj @@ -8,10 +8,11 @@ Exe ToolBarImageMuxer ToolBarImageMuxer - v4.6.1 + v4.7.2 512 true true + AnyCPU diff --git a/tools/ToolBarTools/ToolBarImageSplitter/App.config b/tools/ToolBarTools/ToolBarImageSplitter/App.config index 731f6de6c2..ecdcf8a54d 100644 --- a/tools/ToolBarTools/ToolBarImageSplitter/App.config +++ b/tools/ToolBarTools/ToolBarImageSplitter/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/tools/ToolBarTools/ToolBarImageSplitter/ToolBarImageSplitter.csproj b/tools/ToolBarTools/ToolBarImageSplitter/ToolBarImageSplitter.csproj index 43fcf71dff..985c820dc5 100644 --- a/tools/ToolBarTools/ToolBarImageSplitter/ToolBarImageSplitter.csproj +++ b/tools/ToolBarTools/ToolBarImageSplitter/ToolBarImageSplitter.csproj @@ -8,10 +8,11 @@ Exe ToolBarImageSplitter ToolBarImageSplitter - v4.6.1 + v4.7.2 512 true true + AnyCPU From 992d0ea221380060688ed68c0bed78affc95cb01 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 14 Nov 2021 16:18:46 +0900 Subject: [PATCH 012/129] =?UTF-8?q?.vsconfig=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=86=85=E5=AE=B9=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/ChmSourceConverter/.vsconfig | 5 +---- tools/ToolBarTools/.vsconfig | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/ChmSourceConverter/.vsconfig b/tools/ChmSourceConverter/.vsconfig index 41cb3ceacc..e1fc733bc8 100644 --- a/tools/ChmSourceConverter/.vsconfig +++ b/tools/ChmSourceConverter/.vsconfig @@ -1,10 +1,7 @@ { "version": "1.0", "components": [ - "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Component.Roslyn.Compiler", - "Microsoft.VisualStudio.Component.Roslyn.LanguageServices", - "Microsoft.Net.Component.4.6.1.TargetingPack" + "Microsoft.Net.Component.4.7.2.TargetingPack" ] } \ No newline at end of file diff --git a/tools/ToolBarTools/.vsconfig b/tools/ToolBarTools/.vsconfig index 41cb3ceacc..e1fc733bc8 100644 --- a/tools/ToolBarTools/.vsconfig +++ b/tools/ToolBarTools/.vsconfig @@ -1,10 +1,7 @@ { "version": "1.0", "components": [ - "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Component.Roslyn.Compiler", - "Microsoft.VisualStudio.Component.Roslyn.LanguageServices", - "Microsoft.Net.Component.4.6.1.TargetingPack" + "Microsoft.Net.Component.4.7.2.TargetingPack" ] } \ No newline at end of file From 7db1206e1d8a7053b957e2a1d9914b4e02efc815 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 9 Jan 2022 20:37:22 +0900 Subject: [PATCH 013/129] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=83=81=E5=A4=89=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/compiletests.run.cmd | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/compiletests.run.cmd b/tests/compiletests.run.cmd index 013df2ee9b..decce3fa58 100644 --- a/tests/compiletests.run.cmd +++ b/tests/compiletests.run.cmd @@ -5,8 +5,6 @@ set SOURCE_DIR=%~dp0compiletests :: find generic tools if not defined CMD_VSWHERE call %~dp0..\tools\find-tools.bat -set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 - if not exist "%CMD_CMAKE%" ( echo "no cmake found." exit /b 1 From 8ed5587e4fbdbc2a21202a8baca2d699c55f3066 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 10 Jan 2022 16:15:51 +0900 Subject: [PATCH 014/129] =?UTF-8?q?=E3=83=9E=E3=83=AB=E3=83=81vs=E6=A7=8B?= =?UTF-8?q?=E6=88=90=E5=90=91=E3=81=91=E3=81=AE=E7=92=B0=E5=A2=83=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 標準で利用できるVMImageにはマルチvs構成のものがないので、 Azure Pilelinesのビルド設定から環境変数を削除します。 --- azure-pipelines.yml | 2 -- ci/azure-pipelines/template.job.build-unittest.yml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fdce3c6ab8..fb432eafff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,7 +97,6 @@ jobs: name: VS2017 vmImage: 'VS2017-Win2016' displayName: VS2017 - ARG_VSVERSION: 15 # サクラエディタのビルドを行う JOB (VS2019) # * サクラエディタ本体 @@ -111,7 +110,6 @@ jobs: name: VS2019 vmImage: 'windows-2019' displayName: VS2019 - ARG_VSVERSION: 16 # サクラエディタのビルドを行う JOB(MinGW) # * サクラエディタ本体 diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml index a4f410e0ed..a091c06d54 100644 --- a/ci/azure-pipelines/template.job.build-unittest.yml +++ b/ci/azure-pipelines/template.job.build-unittest.yml @@ -26,10 +26,6 @@ jobs: BuildPlatform: 'x64' Configuration: 'Release' - # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch - variables: - ARG_VSVERSION: ${{ parameters.ARG_VSVERSION }} - steps: # show environmental variables for debug. - script: set From 4c725422bd037115bf3333ea5985396e11932380 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 10 Jan 2022 21:23:17 +0900 Subject: [PATCH 015/129] Checkout batch files with CRLF Using LF in batch files may cause unexpected behavior. Always use CRLF. --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 3c472d19d2..acc0d35fef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ *.kwd text *.khp text *.hkn text -*.bat text +*.bat text eol=crlf Makefile text eol=lf sakura_rc.h text eol=crlf *.rc text working-tree-encoding=utf-16le-bom eol=crlf From 1014d56774589e44519d805b81d16430ef8cedc5 Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Mon, 10 Jan 2022 22:20:33 +0900 Subject: [PATCH 016/129] =?UTF-8?q?=E3=83=9F=E3=83=8B=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=81=AE=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6?= =?UTF-8?q?=E6=A8=AA=E5=B9=85=E3=81=A8=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=82=92=E8=A1=A8=E7=A4=BA=E3=82=B9?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=83=AB=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B?= =?UTF-8?q?=E3=81=A6=E6=8B=A1=E5=A4=A7=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20=E3=83=9F=E3=83=8B=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=81=AE=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E5=80=A4=E3=82=92=20-1=20=E3=81=8B=E3=82=89?= =?UTF-8?q?=20-2=20=E3=81=AB=E5=A4=89=E6=9B=B4=20=E3=83=AB=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=AE=E9=AB=98=E3=81=95=E3=80=81=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=A9=E3=83=BC=E3=81=A8=E3=83=86=E3=82=AD=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=AE=E9=9A=99=E9=96=93=E3=80=81=E8=A1=8C=E7=95=AA?= =?UTF-8?q?=E5=8F=B7=E3=81=A8=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E9=9A=99=E9=96=93=E3=82=92=E8=A1=A8=E7=A4=BA=E3=82=B9=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6?= =?UTF-8?q?=E6=8B=A1=E5=A4=A7=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20=E6=96=87=E5=AD=97=E3=81=AE=E9=96=93?= =?UTF-8?q?=E9=9A=94=E3=81=A8=E8=A1=8C=E3=81=AE=E9=96=93=E9=9A=94=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=AB=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E6=8B=A1=E5=A4=A7=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=87=A6=E7=90=86=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/doc/layout/CLayoutMgr.cpp | 7 ++++--- sakura_core/env/CShareData.cpp | 2 +- sakura_core/view/CEditView.cpp | 16 ++++++++-------- sakura_core/view/CRuler.cpp | 3 ++- sakura_core/view/CTextArea.cpp | 5 +++-- sakura_core/view/CViewFont.cpp | 3 ++- sakura_core/view/figures/CFigure_ZenSpace.cpp | 3 ++- sakura_core/window/CEditWnd.cpp | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/sakura_core/doc/layout/CLayoutMgr.cpp b/sakura_core/doc/layout/CLayoutMgr.cpp index 47b6e7c82d..07fe1c4c00 100644 --- a/sakura_core/doc/layout/CLayoutMgr.cpp +++ b/sakura_core/doc/layout/CLayoutMgr.cpp @@ -34,6 +34,7 @@ #include "debug/CRunningTimer.h" #include "charset/charcode.h" #include "config/app_constants.h" +#include "util/window.h" // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // 生成と破棄 // @@ -137,7 +138,7 @@ void CLayoutMgr::SetLayoutInfo( if (nTsvModeOld != nTsvMode && nTsvMode != TSV_MODE_NONE) { m_tsvInfo.CalcTabLength(this->m_pcDocLineMgr); } - m_nSpacing = refType.m_nColumnSpace; + m_nSpacing = DpiScaleX(refType.m_nColumnSpace); if( nCharLayoutXPerKeta == -1 ) { // Viewが持ってるフォント情報は古い、しょうがないので自分で作る @@ -145,8 +146,8 @@ void CLayoutMgr::SetLayoutInfo( HDC hdc = ::GetDC(hwnd); CViewFont viewFont(pLogfont); CTextMetrics temp; - temp.Update(hdc, viewFont.GetFontHan(), refType.m_nLineSpace, refType.m_nColumnSpace); - m_nCharLayoutXPerKeta = temp.GetHankakuWidth() + m_pTypeConfig->m_nColumnSpace; + temp.Update(hdc, viewFont.GetFontHan(), DpiScaleY(refType.m_nLineSpace), DpiScaleX(refType.m_nColumnSpace)); + m_nCharLayoutXPerKeta = temp.GetHankakuWidth() + DpiScaleX(m_pTypeConfig->m_nColumnSpace); ::ReleaseDC(hwnd, hdc); }else{ m_nCharLayoutXPerKeta = nCharLayoutXPerKeta; diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index efa09572b0..87629e1109 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -272,7 +272,7 @@ bool CShareData::InitShareData() sWindow.m_bDispMiniMap = false; // ミニマップを表示する sWindow.m_nFUNCKEYWND_Place = 1; /* ファンクションキー表示位置／0:上 1:下 */ sWindow.m_nFUNCKEYWND_GroupNum = 4; // 2002/11/04 Moca ファンクションキーのグループボタン数 - sWindow.m_nMiniMapFontSize = -1; + sWindow.m_nMiniMapFontSize = -2; sWindow.m_nMiniMapQuality = NONANTIALIASED_QUALITY; sWindow.m_nMiniMapWidth = 150; diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index e55806fab1..a8d00a79e8 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -220,7 +220,7 @@ BOOL CEditView::Create( m_szComposition[0] = L'\0'; /* ルーラー表示 */ - GetTextArea().SetAreaTop(GetTextArea().GetAreaTop()+GetDllShareData().m_Common.m_sWindow.m_nRulerHeight); /* ルーラー高さ */ + GetTextArea().SetAreaTop(GetTextArea().GetAreaTop()+DpiScaleY(GetDllShareData().m_Common.m_sWindow.m_nRulerHeight)); /* ルーラー高さ */ GetRuler().SetRedrawFlag(); // ルーラー全体を描き直す時=true 2002.02.25 Add By KK m_hdcCompatDC = NULL; /* 再描画用コンパチブルＤＣ */ m_hbmpCompatBMP = NULL; /* 再描画用メモリＢＭＰ */ @@ -274,13 +274,13 @@ BOOL CEditView::Create( m_cRegexKeyword = new CRegexKeyword( GetDllShareData().m_Common.m_sSearch.m_szRegexpLib ); //@@@ 2001.11.17 add MIK m_cRegexKeyword->RegexKeySetTypes(m_pTypeData); //@@@ 2001.11.17 add MIK - GetTextArea().SetTopYohaku( GetDllShareData().m_Common.m_sWindow.m_nRulerBottomSpace ); /* ルーラーとテキストの隙間 */ + GetTextArea().SetTopYohaku(DpiScaleY(GetDllShareData().m_Common.m_sWindow.m_nRulerBottomSpace)); /* ルーラーとテキストの隙間 */ GetTextArea().SetAreaTop( GetTextArea().GetTopYohaku() ); /* 表示域の上端座標 */ /* ルーラー表示 */ if( m_pTypeData->m_ColorInfoArr[COLORIDX_RULER].m_bDisp && !m_bMiniMap ){ - GetTextArea().SetAreaTop( GetTextArea().GetAreaTop() + GetDllShareData().m_Common.m_sWindow.m_nRulerHeight); /* ルーラー高さ */ + GetTextArea().SetAreaTop(GetTextArea().GetAreaTop() + DpiScaleY(GetDllShareData().m_Common.m_sWindow.m_nRulerHeight)); /* ルーラー高さ */ } - GetTextArea().SetLeftYohaku( GetDllShareData().m_Common.m_sWindow.m_nLineNumRightSpace ); + GetTextArea().SetLeftYohaku(DpiScaleX(GetDllShareData().m_Common.m_sWindow.m_nLineNumRightSpace)); /* ウィンドウクラスの登録 */ // Apr. 27, 2000 genta @@ -1121,7 +1121,7 @@ void CEditView::SetFont( void ) if( m_bMiniMap ){ GetTextMetrics().Update(hdc, GetFontset().GetFontHan(), 0, 0); }else{ - GetTextMetrics().Update(hdc, GetFontset().GetFontHan(), m_pTypeData->m_nLineSpace, m_pTypeData->m_nColumnSpace); + GetTextMetrics().Update(hdc, GetFontset().GetFontHan(), DpiScaleY(m_pTypeData->m_nLineSpace), DpiScaleX(m_pTypeData->m_nColumnSpace)); } ::ReleaseDC( GetHwnd(), hdc ); @@ -1690,7 +1690,7 @@ void CEditView::OnChangeSetting() } RECT rc; - GetTextArea().SetTopYohaku( GetDllShareData().m_Common.m_sWindow.m_nRulerBottomSpace ); /* ルーラーとテキストの隙間 */ + GetTextArea().SetTopYohaku(DpiScaleY(GetDllShareData().m_Common.m_sWindow.m_nRulerBottomSpace)); /* ルーラーとテキストの隙間 */ GetTextArea().SetAreaTop( GetTextArea().GetTopYohaku() ); /* 表示域の上端座標 */ // 文書種別更新 @@ -1698,9 +1698,9 @@ void CEditView::OnChangeSetting() /* ルーラー表示 */ if( m_pTypeData->m_ColorInfoArr[COLORIDX_RULER].m_bDisp && !m_bMiniMap ){ - GetTextArea().SetAreaTop(GetTextArea().GetAreaTop() + GetDllShareData().m_Common.m_sWindow.m_nRulerHeight); /* ルーラー高さ */ + GetTextArea().SetAreaTop(GetTextArea().GetAreaTop() + DpiScaleY(GetDllShareData().m_Common.m_sWindow.m_nRulerHeight)); /* ルーラー高さ */ } - GetTextArea().SetLeftYohaku( GetDllShareData().m_Common.m_sWindow.m_nLineNumRightSpace ); + GetTextArea().SetLeftYohaku(DpiScaleX(GetDllShareData().m_Common.m_sWindow.m_nLineNumRightSpace)); /* フォントの変更 */ SetFont(); diff --git a/sakura_core/view/CRuler.cpp b/sakura_core/view/CRuler.cpp index 8b8389b851..b565850514 100644 --- a/sakura_core/view/CRuler.cpp +++ b/sakura_core/view/CRuler.cpp @@ -28,6 +28,7 @@ #include "view/CEditView.h" #include "doc/CEditDoc.h" #include "types/CTypeSupport.h" +#include "util/window.h" CRuler::CRuler(const CEditView* pEditView, const CEditDoc* pEditDoc) : m_pEditView(pEditView) @@ -122,7 +123,7 @@ void CRuler::DrawRulerBg(CGraphics& gr) } if (m_hFont == NULL) { LOGFONT lf = {0}; - lf.lfHeight = 1 - pCommon->m_sWindow.m_nRulerHeight; // 2002/05/13 ai + lf.lfHeight = 1 - DpiScaleY(pCommon->m_sWindow.m_nRulerHeight); // 2002/05/13 ai lf.lfWidth = 0; lf.lfEscapement = 0; lf.lfOrientation = 0; diff --git a/sakura_core/view/CTextArea.cpp b/sakura_core/view/CTextArea.cpp index ac28afa8d9..ee88493d8a 100644 --- a/sakura_core/view/CTextArea.cpp +++ b/sakura_core/view/CTextArea.cpp @@ -31,6 +31,7 @@ #include "env/DLLSHAREDATA.h" #include "doc/CEditDoc.h" #include "config/app_constants.h" +#include "util/window.h" // 2014.07.26 katze //#define USE_LOG10 // この行のコメントを外すと行番号の最小桁数の計算にlog10()を用いる @@ -63,8 +64,8 @@ CTextArea::CTextArea(CEditView* pEditView) m_nViewRowNum = CLayoutInt(0); /* 表示域の行数 */ m_nViewTopLine = CLayoutInt(0); /* 表示域の一番上の行 */ m_nViewLeftCol = CLayoutInt(0); /* 表示域の一番左の桁 */ - SetTopYohaku( pShareData->m_Common.m_sWindow.m_nRulerBottomSpace ); /* ルーラーとテキストの隙間 */ - SetLeftYohaku( pShareData->m_Common.m_sWindow.m_nLineNumRightSpace ); + SetTopYohaku(DpiScaleY(pShareData->m_Common.m_sWindow.m_nRulerBottomSpace)); /* ルーラーとテキストの隙間 */ + SetLeftYohaku(DpiScaleX(pShareData->m_Common.m_sWindow.m_nLineNumRightSpace)); m_nViewAlignTop = GetTopYohaku(); /* 表示域の上端座標 */ } diff --git a/sakura_core/view/CViewFont.cpp b/sakura_core/view/CViewFont.cpp index a08facc633..f36e6d6dc9 100644 --- a/sakura_core/view/CViewFont.cpp +++ b/sakura_core/view/CViewFont.cpp @@ -27,13 +27,14 @@ #include "StdAfx.h" #include "CViewFont.h" #include "env/DLLSHAREDATA.h" +#include "util/window.h" /*! フォント作成 */ void CViewFont::CreateFonts( const LOGFONT *plf ) { LOGFONT lf; - int miniSize = GetDllShareData().m_Common.m_sWindow.m_nMiniMapFontSize; + int miniSize = ::DpiScaleX(GetDllShareData().m_Common.m_sWindow.m_nMiniMapFontSize); int quality = GetDllShareData().m_Common.m_sWindow.m_nMiniMapQuality; int outPrec = OUT_TT_ONLY_PRECIS; // FixedSys等でMiniMapのフォントが小さくならない修正 diff --git a/sakura_core/view/figures/CFigure_ZenSpace.cpp b/sakura_core/view/figures/CFigure_ZenSpace.cpp index 290768fe49..ee3dd34f3f 100644 --- a/sakura_core/view/figures/CFigure_ZenSpace.cpp +++ b/sakura_core/view/figures/CFigure_ZenSpace.cpp @@ -27,6 +27,7 @@ #include "CFigure_ZenSpace.h" #include "types/CTypeSupport.h" #include "apiwrap/StdApi.h" +#include "util/window.h" void Draw_ZenSpace( CGraphics& gr, const CMyRect& rc ); @@ -92,7 +93,7 @@ void CFigure_ZenSpace::DispSpace(CGraphics& gr, DispPos* pDispPos, CEditView* pc CMyRect rcZenSp; // 注：ベースライン無視 rcZenSp.SetPos(pDispPos->GetDrawPos().x, pDispPos->GetDrawPos().y); - rcZenSp.SetSize(dx[0]- pcView->m_pcEditDoc->m_cDocType.GetDocumentAttribute().m_nColumnSpace, + rcZenSp.SetSize(dx[0]- DpiScaleX(pcView->m_pcEditDoc->m_cDocType.GetDocumentAttribute().m_nColumnSpace), pcView->GetTextMetrics().GetHankakuHeight()); // 描画 diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index 475f90ff7e..9337854d86 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -3303,7 +3303,7 @@ LRESULT CEditWnd::OnSize2( WPARAM wParam, LPARAM lParam, bool bUpdateStatus ) // ミニマップ int nMiniMapWidth = 0; if( m_cMiniMapView.GetHwnd() ){ - nMiniMapWidth = GetDllShareData().m_Common.m_sWindow.m_nMiniMapWidth; + nMiniMapWidth = ::DpiScaleX(GetDllShareData().m_Common.m_sWindow.m_nMiniMapWidth); ::MoveWindow( m_cMiniMapView.GetHwnd(), (eDockSideFL == DOCKSIDE_RIGHT)? cx - nFuncListWidth - nMiniMapWidth: cx - nMiniMapWidth, (eDockSideFL == DOCKSIDE_TOP)? nTop + nFuncListHeight: nTop, From 93cf3f3eacfed6a4d0a2c30d5445b53b2599db3c Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Fri, 7 Jan 2022 13:03:57 +0900 Subject: [PATCH 017/129] =?UTF-8?q?"Visual=20Studio=202022"=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=9F=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/find-tools.bat | 4 ++++ vcx-props/vcxcompat.props | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index f490f10e5b..b68b285987 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -167,6 +167,8 @@ exit /b set NUM_VSVERSION=15 ) else if "%ARG_VSVERSION%" == "2019" ( set NUM_VSVERSION=16 + ) else if "%ARG_VSVERSION%" == "2022" ( + set NUM_VSVERSION=17 ) else if "%ARG_VSVERSION%" == "latest" ( call :check_latest_installed_vsversion ) else ( @@ -185,6 +187,8 @@ exit /b set CMAKE_G_PARAM=Visual Studio 15 2017 ) else if "%NUM_VSVERSION%" == "16" ( set CMAKE_G_PARAM=Visual Studio 16 2019 + ) else if "%NUM_VSVERSION%" == "17" ( + set CMAKE_G_PARAM=Visual Studio 17 2022 ) else ( call :set_cmake_gparam_automatically ) diff --git a/vcx-props/vcxcompat.props b/vcx-props/vcxcompat.props index d83904fe00..1f8527903f 100644 --- a/vcx-props/vcxcompat.props +++ b/vcx-props/vcxcompat.props @@ -6,10 +6,16 @@ 10.0 + + 10.0 + v141 v142 + + v143 + From 85f88eb8fa67ab4c3ee858c5eb61d65ee4414fcc Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Fri, 14 Jan 2022 11:52:57 +0900 Subject: [PATCH 018/129] =?UTF-8?q?[AZP]=20=E3=82=B9=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=97=E3=83=88=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=A7=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E3=81=99=E3=82=8BPython=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/azure-pipelines/template.job.python-check.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/azure-pipelines/template.job.python-check.yml b/ci/azure-pipelines/template.job.python-check.yml index 6e19cb02cd..aceae8f641 100644 --- a/ci/azure-pipelines/template.job.python-check.yml +++ b/ci/azure-pipelines/template.job.python-check.yml @@ -22,10 +22,8 @@ jobs: strategy: maxParallel: 2 matrix: - python_2.7: - versionSpec: '2.7' - python_3.7: - versionSpec: '3.7' + python3: + versionSpec: '3.x' steps: # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/use-python-version?view=azure-devops From 5a45cc2068dd4cf96788ad063609a4de8ee962e3 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 16 Jan 2022 22:32:21 +0900 Subject: [PATCH 019/129] =?UTF-8?q?NUM=5FVSVERSION=E3=81=AE=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E5=87=BA=E5=8A=9B=E3=82=92=E5=BE=A9=E6=B4=BB=E3=81=95?= =?UTF-8?q?=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/find-tools.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index b68b285987..8b5f1c1bef 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -53,6 +53,7 @@ echo ^|- CMD_CMAKE=%CMD_CMAKE% echo ^|- CMD_NINJA=%CMD_NINJA% echo ^|- CMD_LEPROC=%CMD_LEPROC% echo ^|- CMD_PYTHON=%CMD_PYTHON% +echo ^|- NUM_VSVERSION=%NUM_VSVERSION% echo ^|- CMAKE_G_PARAM=%CMAKE_G_PARAM% endlocal ^ && set "CMD_GIT=%CMD_GIT%" ^ From 73d92e68c83068774825bfd0383a7975920d58fe Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Mon, 17 Jan 2022 00:09:21 +0900 Subject: [PATCH 020/129] =?UTF-8?q?[AZP]=20=E3=82=B8=E3=83=A7=E3=83=96?= =?UTF-8?q?=E3=82=92=E5=90=8C=E6=99=82=E3=81=AB=E5=AE=9F=E8=A1=8C=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E4=B8=8A=E9=99=90=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E3=82=84=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当該ジョブの実行対象となるmatrixの数と同数以下であるため。 --- ci/azure-pipelines/template.job.python-check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/azure-pipelines/template.job.python-check.yml b/ci/azure-pipelines/template.job.python-check.yml index aceae8f641..547304d298 100644 --- a/ci/azure-pipelines/template.job.python-check.yml +++ b/ci/azure-pipelines/template.job.python-check.yml @@ -20,7 +20,6 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: - maxParallel: 2 matrix: python3: versionSpec: '3.x' From 9a321010e7db99e134226c16b08691b9e79530ee Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 16 Jan 2022 22:42:21 +0900 Subject: [PATCH 021/129] =?UTF-8?q?MinGW=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=81=A7=E5=BF=85=E8=A6=81=E3=81=AA=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=83=84=E3=83=BC=E3=83=AB=E3=82=92=E6=98=8E=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E3=81=AB=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml b/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml index 021e73102f..60baa9127d 100644 --- a/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml +++ b/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml @@ -5,5 +5,5 @@ # なし ############################################################################################################# steps: - - script: echo nothing to do. - displayName: nothing to do + - script: C:\msys64\usr\bin\bash --login -c "pacman -S --noconfirm mingw-w64-x86_64-toolchain" + displayName: Install MinGW-w64 build tools via Pacman From a364e3cfb64ad98d911e4237aa5f72b6a3ab6b55 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Tue, 18 Jan 2022 13:45:25 +0900 Subject: [PATCH 022/129] =?UTF-8?q?[AZP]=20=E6=88=90=E6=9E=9C=E7=89=A9?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=AF=E3=81=AE=E5=AE=9F=E8=A1=8C=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/azure-pipelines/template.job.build-unittest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml index a091c06d54..53a2ac3f31 100644 --- a/ci/azure-pipelines/template.job.build-unittest.yml +++ b/ci/azure-pipelines/template.job.build-unittest.yml @@ -72,7 +72,7 @@ jobs: # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/conditions?view=azure-devops&tabs=yaml#job-status-functions # - task: CopyFiles@1 - condition: succeededOrFailed() + condition: and(eq(variables['Configuration'], 'Release'), succeededOrFailed()) displayName: Copy to ArtifactStagingDirectory inputs: contents: | @@ -82,7 +82,7 @@ jobs: # see https://docs.microsoft.com/en-us/azure/devops/pipelines/artifacts/build-artifacts?view=azure-devops&tabs=yaml - task: PublishBuildArtifacts@1 - condition: succeededOrFailed() + condition: and(eq(variables['Configuration'], 'Release'), succeededOrFailed()) displayName: Publish ArtifactStagingDirectory inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' From dd0cd25a8b26f3a63fac95b262d761fff9e7dbf8 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Fri, 21 Jan 2022 11:04:39 +0900 Subject: [PATCH 023/129] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E3=82=92=E5=8F=8D=E6=98=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 既存のテストへの変更を差し戻し * CClipboard1 → CClipboardTestFixture * Empty の呼び出しの意図についてコメントを追加 * EXPECT_STREQ を使用する --- tests/unittests/test-cclipboard.cpp | 98 ++++++++++++++++++----------- 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index 6052bcbbc6..3be8a100ca 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -28,8 +28,10 @@ #define NOMINMAX #endif /* #ifndef NOMINMAX */ +#include #include #include +#include #include #include @@ -38,26 +40,25 @@ #include "mem/CNativeW.h" #include "_os/CClipboard.h" -class CClipboard1 : public testing::Test { -protected: - void SetUp() override { - hInstance = ::GetModuleHandle(nullptr); - hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); - if (!hWnd) FAIL(); - } - void TearDown() override { - if (hWnd) - ::DestroyWindow(hWnd); +/*! + * HWND型のスマートポインタを実現するためのdeleterクラス + */ +struct window_closer +{ + void operator()(HWND hWnd) const + { + ::DestroyWindow(hWnd); } - - HINSTANCE hInstance = nullptr; - HWND hWnd = nullptr; }; +//! HWND型のスマートポインタ +using windowHolder = std::unique_ptr::type, window_closer>; + + /*! * @brief SetHtmlTextのテスト */ -TEST_F(CClipboard1, SetHtmlText) +TEST(CClipboard, SetHtmlText) { constexpr const wchar_t inputData[] = L"test 109"; constexpr const char expected[] = @@ -74,35 +75,57 @@ TEST_F(CClipboard1, SetHtmlText) const UINT uHtmlFormat = ::RegisterClipboardFormat(L"HTML Format"); - // クリップボード操作クラスでSetHtmlTextする - CClipboard cClipBoard(hWnd); + auto hInstance = ::GetModuleHandleW(nullptr); + if (HWND hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); hWnd) { + // HWNDをスマートポインタに入れる + windowHolder holder(hWnd); - // 操作は失敗しないはず。 - ASSERT_TRUE(cClipBoard.SetHtmlText(inputData)); + // クリップボード操作クラスでSetHtmlTextする + CClipboard cClipBoard(hWnd); - // 操作に成功するとHTML形式のデータを利用できるはず。 - ASSERT_TRUE(::IsClipboardFormatAvailable(uHtmlFormat)); + // 操作は失敗しないはず。 + ASSERT_TRUE(cClipBoard.SetHtmlText(inputData)); - // クリップボード操作クラスが対応してないので生APIを呼んで確認する。 + // 操作に成功するとHTML形式のデータを利用できるはず。 + ASSERT_TRUE(::IsClipboardFormatAvailable(uHtmlFormat)); - // グローバルメモリをロックできた場合のみ中身を取得しに行く - if (HGLOBAL hClipData = ::GetClipboardData(uHtmlFormat); hClipData != nullptr) { - // データをstd::stringにコピーする - const size_t cchData = ::GlobalSize(hClipData); - const char* pData = (char*)::GlobalLock(hClipData); - std::string strClipData(pData, cchData); + // クリップボード操作クラスが対応してないので生APIを呼んで確認する。 - // 使い終わったらロック解除する - ::GlobalUnlock(hClipData); + // グローバルメモリをロックできた場合のみ中身を取得しに行く + if (HGLOBAL hClipData = ::GetClipboardData(uHtmlFormat); hClipData != nullptr) { + // データをstd::stringにコピーする + const size_t cchData = ::GlobalSize(hClipData); + const char* pData = (char*)::GlobalLock(hClipData); + std::string strClipData(pData, cchData); - ASSERT_STREQ(expected, strClipData.c_str()); - } - else { - FAIL(); + // 使い終わったらロック解除する + ::GlobalUnlock(hClipData); + + ASSERT_STREQ(expected, strClipData.c_str()); + } + else { + FAIL(); + } } } -TEST_F(CClipboard1, SetTextAndGetText) +class CClipboardTestFixture : public testing::Test { +protected: + void SetUp() override { + hInstance = ::GetModuleHandle(nullptr); + hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); + if (!hWnd) FAIL(); + } + void TearDown() override { + if (hWnd) + ::DestroyWindow(hWnd); + } + + HINSTANCE hInstance = nullptr; + HWND hWnd = nullptr; +}; + +TEST_F(CClipboardTestFixture, SetTextAndGetText) { const std::wstring_view text = L"てすと"; CClipboard clipboard(hWnd); @@ -111,6 +134,7 @@ TEST_F(CClipboard1, SetTextAndGetText) bool line; CEol eol(EEolType::cr_and_lf); + // テストを実行する前にクリップボードの内容を破棄しておく。 clipboard.Empty(); // テキストを設定する（矩形選択フラグなし・行選択フラグなし） @@ -118,7 +142,7 @@ TEST_F(CClipboard1, SetTextAndGetText) EXPECT_TRUE(CClipboard::HasValidData()); // Unicode文字列を取得する EXPECT_TRUE(clipboard.GetText(&buffer, &column, &line, eol, CF_UNICODETEXT)); - EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_STREQ(buffer.GetStringPtr(), text.data()); EXPECT_FALSE(column); EXPECT_FALSE(line); @@ -129,9 +153,9 @@ TEST_F(CClipboard1, SetTextAndGetText) EXPECT_TRUE(CClipboard::HasValidData()); // サクラエディタ独自形式データを取得する EXPECT_TRUE(clipboard.GetText(&buffer, &column, nullptr, eol, CClipboard::GetSakuraFormat())); - EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_STREQ(buffer.GetStringPtr(), text.data()); EXPECT_TRUE(column); EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, &line, eol, CClipboard::GetSakuraFormat())); - EXPECT_EQ(buffer.Compare(text.data()), 0); + EXPECT_STREQ(buffer.GetStringPtr(), text.data()); EXPECT_TRUE(line); } From add95b53ebbf95b5a2fafd653ebcb3cf45c9812a Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Fri, 21 Jan 2022 08:16:17 +0900 Subject: [PATCH 024/129] =?UTF-8?q?[AZP]=20VS=E3=81=A7=E3=81=AE=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=92=E9=99=A4=E3=81=8F=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=96=E3=81=AE=E5=AE=9F=E8=A1=8C=E3=81=AB=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E3=81=AEWindows=E7=92=B0=E5=A2=83=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fb432eafff..acac73e1cc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -117,35 +117,35 @@ jobs: - template: ci/azure-pipelines/template.job.build-on-msys2.yml parameters: name: MinGW - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' displayName: MinGW # SonarQube で解析を行う JOB - template: ci/azure-pipelines/template.job.SonarQube.yml parameters: name: SonarQube - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' displayName: SonarQube # Cppcheck を行う JOB - template: ci/azure-pipelines/template.job.cppcheck.yml parameters: name: cppcheck - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' displayName: cppcheck # doxygen を行う JOB - template: ci/azure-pipelines/template.job.doxygen.yml parameters: name: doxygen - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' displayName: doxygen # 文字コードのチェックを行う JOB - template: ci/azure-pipelines/template.job.checkEncoding.yml parameters: name: checkEncoding - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' ############################################################################################################# # Python スクリプトのコンパイル確認を行う job @@ -153,5 +153,5 @@ jobs: - template: ci/azure-pipelines/template.job.python-check.yml parameters: name: script_check - vmImage: 'VS2017-Win2016' + vmImage: 'windows-latest' displayName: script_check From ceccdb53dabf743fd744eff496e207be4c3d45c6 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Fri, 21 Jan 2022 23:14:34 +0900 Subject: [PATCH 025/129] =?UTF-8?q?[AZP]=20VS2017=E3=81=A7=E3=81=AE?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B8=E3=83=A7=E3=83=96=E3=82=92?= =?UTF-8?q?=E5=BB=83=E6=AD=A2=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- azure-pipelines.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index acac73e1cc..2ebfc4879a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -87,17 +87,6 @@ pr: ############################################################################################################################### jobs: -# サクラエディタのビルドを行う JOB (VS2017) -# * サクラエディタ本体 -# * HTML Help -# * Installer -# * 単体テスト -- template: ci/azure-pipelines/template.job.build-unittest.yml - parameters: - name: VS2017 - vmImage: 'VS2017-Win2016' - displayName: VS2017 - # サクラエディタのビルドを行う JOB (VS2019) # * サクラエディタ本体 # * HTML Help From dff128fcbe0dde7b97286cbb10e6d7cc16d6cb59 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sat, 22 Jan 2022 00:21:39 +0900 Subject: [PATCH 026/129] =?UTF-8?q?[AZP]=20=E9=96=A2=E4=BF=82=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=83=89=E3=82=AD=E3=83=A5=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/azure-pipelines/azure-pipelines.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/azure-pipelines/azure-pipelines.md b/ci/azure-pipelines/azure-pipelines.md index 8b159118c4..ad3145bfc9 100644 --- a/ci/azure-pipelines/azure-pipelines.md +++ b/ci/azure-pipelines/azure-pipelines.md @@ -76,7 +76,6 @@ https://azure.microsoft.com/ja-jp/services/devops/pipelines/ にアクセスし | JOB 名 | 説明 | job を定義する template | ----|----|---- -|VS2017 | Visual Studio 2017 でサクラエディタのビルドを行う | [template.job.build-unittest.yml](template.job.build-unittest.yml) | |VS2019 | Visual Studio 2019 でサクラエディタのビルドを行う | [template.job.build-unittest.yml](template.job.build-unittest.yml) | |MinGW | MinGW でサクラエディタのビルドを行う | [template.job.build-on-msys2.yml](template.job.build-on-msys2.yml) | |SonarQube | SonarQube での解析を行う | [template.job.SonarQube.yml](template.job.SonarQube.yml) | From 63c46a99a2811e18ce1a986f7192491bf0c7e290 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 23 Jan 2022 17:43:12 +0900 Subject: [PATCH 027/129] =?UTF-8?q?ExtractCtags=E3=81=AEWin32=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=AE=E4=BE=9D=E5=AD=98=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=82=B2=E3=83=83=E3=83=88=E6=8C=87=E5=AE=9A=E3=82=92x64?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=A8=E5=90=88=E3=82=8F=E3=81=9B?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index ed9d56c47a..b1727b8e0c 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -951,7 +951,7 @@ - + From 4e5841b0ed14a63d39c363c5b5445f7db2a7fe0d Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 23 Jan 2022 19:48:51 +0900 Subject: [PATCH 028/129] =?UTF-8?q?PropertyGroup=20Label=3D"Configuration"?= =?UTF-8?q?=E3=81=AE=E8=A8=98=E8=BF=B0=E3=82=921=E3=81=A4=E3=81=AB?= =?UTF-8?q?=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 18 ++---------------- sakura_lang_en_US/sakura_lang_en_US.vcxproj | 17 +---------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index ed9d56c47a..2381083664 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -25,26 +25,12 @@ - + Application false Unicode - - Application - false - Unicode - - - Application - false - Unicode - true - - - Application - false - Unicode + true diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 5221d452cb..5273b81eb4 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -24,22 +24,7 @@ - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - + DynamicLibrary false Unicode From e8c8ab9f9f25c92efad22ea88f2e6f476c65efd4 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 23 Jan 2022 19:50:55 +0900 Subject: [PATCH 029/129] =?UTF-8?q?ImportGroup=20Label=3D"PropertySheets"?= =?UTF-8?q?=E3=81=AE=E8=A8=98=E8=BF=B0=E3=82=921=E3=81=A4=E3=81=AB?= =?UTF-8?q?=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 2381083664..b70b53716b 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -36,16 +36,7 @@ - - - - - - - - - - + From 7231def16438f69f3e8ad1bbc3b8b4da048cbc5b Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 23 Jan 2022 19:53:39 +0900 Subject: [PATCH 030/129] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=AB=E3=83=AA=E3=83=B3=E3=82=AF?= =?UTF-8?q?=E3=81=AE=E6=8C=87=E5=AE=9A4=E3=81=A4=E3=82=922=E3=81=A4?= =?UTF-8?q?=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 12 +++--------- sakura_lang_en_US/sakura_lang_en_US.vcxproj | 12 ++---------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index b70b53716b..d190577e3b 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -46,17 +46,11 @@ <_ProjectFileVersion>15.0.27130.2020 - - false - - - false - - + true - - true + + false diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 5273b81eb4..f1c8e52d26 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -42,19 +42,11 @@ <_ProjectFileVersion>15.0.27130.2020 - + true true - - true - true - - - true - false - - + true false From 51f1b013a87ed909485518e80e931de2262fd6f3 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 23 Jan 2022 19:35:20 +0900 Subject: [PATCH 031/129] =?UTF-8?q?Locale=20Emulator=E3=81=AE=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 15 +++++++++++++-- .../template.job.build-unittest.yml | 13 ++++++++++++- ci/init-locale-emulator.ahk | 7 +++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 ci/init-locale-emulator.ahk diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index 45ccf3a8b7..bcb225a90d 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -90,8 +90,19 @@ jobs: shell: cmd - name: Install Locale Emulator - run: choco install locale-emulator -y - shell: cmd + run: | + choco install autohotkey.install --confirm + $LEExpandDir = "${{github.workspace}}\tools\locale-emulator" + $LEInitScript = "${{github.workspace}}\ci\init-locale-emulator.ahk" + New-Item "${LEExpandDir}" -ItemType Directory + Invoke-WebRequest ` + "https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" ` + -OutFile "${LEExpandDir}\locale-emulator.zip" + Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}" + Start-Process "AutoHotKey" "${LEInitScript}" + Start-Process "${LEExpandDir}\LEInstaller.exe" + echo "${LEExpandDir}" >> $env:GITHUB_PATH + shell: pwsh - name: Build HTML Help run: build-chm.bat diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml index 53a2ac3f31..96a9d2ae09 100644 --- a/ci/azure-pipelines/template.job.build-unittest.yml +++ b/ci/azure-pipelines/template.job.build-unittest.yml @@ -47,7 +47,18 @@ jobs: displayName: Bitmap Split/Mux # Install Locale Emulator - - script: choco install locale-emulator -y + - pwsh: | + choco install autohotkey.install --confirm + $LEExpandDir = "$(Build.SourcesDirectory)\tools\locale-emulator" + $LEInitScript = "$(Build.SourcesDirectory)\ci\init-locale-emulator.ahk" + New-Item "${LEExpandDir}" -ItemType Directory + Invoke-WebRequest ` + "https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" ` + -OutFile "${LEExpandDir}\locale-emulator.zip" + Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}" + Start-Process "AutoHotKey" "${LEInitScript}" + Start-Process "${LEExpandDir}\LEInstaller.exe" + echo "##vso[task.prependpath]${LEExpandDir}" displayName: Install Locale Emulator # Build HTML Help diff --git a/ci/init-locale-emulator.ahk b/ci/init-locale-emulator.ahk new file mode 100644 index 0000000000..c1976fa341 --- /dev/null +++ b/ci/init-locale-emulator.ahk @@ -0,0 +1,7 @@ +#NoEnv +#NoTrayIcon +SetTitleMatchMode, 1 + +window_title = % "LE Context Menu Installer - V" +WinWait, %window_title%, , 20 +WinClose %window_title% From aefb3d4c0717fc6e33ae56f8f192bdaa29e30911 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 23 Jan 2022 20:12:01 +0900 Subject: [PATCH 032/129] =?UTF-8?q?Inno=20Setup=E3=81=AE=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=81=AA=E3=81=84=E3=81=97?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=87=AA=E5=89=8D=E3=81=A7=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 4 ++++ ci/azure-pipelines/template.job.build-unittest.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index bcb225a90d..9cbe83ee44 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -108,6 +108,10 @@ jobs: run: build-chm.bat shell: cmd + - name: Update/Install Inno Setup + run: choco upgrade innosetup --confirm + shell: pwsh + - name: Build installer with Inno Setup run: build-installer.bat ${{ matrix.platform }} ${{ matrix.config }} shell: cmd diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml index 96a9d2ae09..83ab615991 100644 --- a/ci/azure-pipelines/template.job.build-unittest.yml +++ b/ci/azure-pipelines/template.job.build-unittest.yml @@ -65,6 +65,10 @@ jobs: - script: build-chm.bat displayName: Build HTML Help + # Install/Update Inno Setup + - pwsh: choco upgrade innosetup --confirm + displayName: Install/Update Inno Setup + # Build installer with Inno Setup - script: build-installer.bat $(BuildPlatform) $(Configuration) displayName: Build installer with Inno Setup From 1cd9f56b0a0fa0b6a4cbf6f343206e1982460488 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Tue, 25 Jan 2022 01:42:07 +0900 Subject: [PATCH 033/129] =?UTF-8?q?CI=E3=81=A7VS2022=E3=82=92=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E3=81=97=E3=81=9F=E3=83=93=E3=83=AB=E3=83=89=E3=82=82?= =?UTF-8?q?=E8=A1=8C=E3=81=86=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 --- .github/workflows/build-sakura.yml | 5 ++++- azure-pipelines.yml | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index 9cbe83ee44..21728dcec5 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -34,10 +34,13 @@ jobs: build: # The type of runner that the job will run on name: MSBuild - runs-on: windows-latest + runs-on: ${{matrix.os}} strategy: matrix: + os: + - windows-2019 + - windows-2022 config: - Debug - Release diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ebfc4879a..070593638f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -100,6 +100,13 @@ jobs: vmImage: 'windows-2019' displayName: VS2019 +# サクラエディタのビルドを行う JOB (VS2022) +- template: ci/azure-pipelines/template.job.build-unittest.yml + parameters: + name: VS2022 + vmImage: 'windows-2022' + displayName: VS2022 + # サクラエディタのビルドを行う JOB(MinGW) # * サクラエディタ本体 # * 単体テスト From 21e190d103975e77e39cda534959fa74cdbe983a Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Wed, 26 Jan 2022 17:23:42 +0900 Subject: [PATCH 034/129] =?UTF-8?q?[GHA]=20=E5=8D=98=E4=BD=93=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E5=AE=9F=E6=96=BD=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index 21728dcec5..ed519cbc39 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -92,6 +92,11 @@ jobs: run: build-sln.bat ${{ matrix.platform }} ${{ matrix.config }} shell: cmd + - name: Run unit tests + run: .\tests1.exe --gtest_output=xml:${{github.workspace}}\tests1.exe-googletest-${{matrix.platform}}-${{matrix.config}}.xml + working-directory: ${{github.workspace}}\${{matrix.platform}}\${{matrix.config}} + shell: pwsh + - name: Install Locale Emulator run: | choco install autohotkey.install --confirm From 949f39909e92275003235c2670f791899ba023f4 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Wed, 26 Jan 2022 18:31:03 +0900 Subject: [PATCH 035/129] =?UTF-8?q?[AZP]=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=AE=E4=B8=8D=E4=B8=80=E8=87=B4=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 --- ci/azure-pipelines/template.job.build-unittest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml index 83ab615991..87c5d37af8 100644 --- a/ci/azure-pipelines/template.job.build-unittest.yml +++ b/ci/azure-pipelines/template.job.build-unittest.yml @@ -65,9 +65,9 @@ jobs: - script: build-chm.bat displayName: Build HTML Help - # Install/Update Inno Setup + # Update/Install Inno Setup - pwsh: choco upgrade innosetup --confirm - displayName: Install/Update Inno Setup + displayName: Update/Install Inno Setup # Build installer with Inno Setup - script: build-installer.bat $(BuildPlatform) $(Configuration) From 2a920310e5cafbafc3ee29712cadb37196b18529 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Wed, 26 Jan 2022 12:07:41 +0900 Subject: [PATCH 036/129] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=EF=BC=88=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=A8=E3=83=A9=E3=83=BC=E5=AF=BE=E7=AD=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-zoom.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unittests/test-zoom.cpp b/tests/unittests/test-zoom.cpp index 6305c058db..289ea58f66 100644 --- a/tests/unittests/test-zoom.cpp +++ b/tests/unittests/test-zoom.cpp @@ -23,6 +23,7 @@ distribution. */ #include +#include #include "util/zoom.h" /*! From b9cb771c8ee531b6fae14269360bb96b7d701145 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:29:28 +0900 Subject: [PATCH 037/129] =?UTF-8?q?GoogleTest=E3=81=8C`DEBUG=5FPOSTFIX`?= =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=AA=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=93=E3=81=A8=E3=81=AB=E3=82=88=E3=82=8B?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E5=90=8D=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/googletest.targets | 6 ++---- tests/unittests/Makefile | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/googletest.targets b/tests/googletest.targets index 3c6efdf7b8..91c2fae8d0 100644 --- a/tests/googletest.targets +++ b/tests/googletest.targets @@ -7,10 +7,8 @@ $(GoogleTestInstallDir)lib $(GoogleTestInstallDir)lib64 $(GoogleTestLibInstallDir);$(LibraryPath) - d - - gtest$(NameSuffix).lib - gtest_main$(NameSuffix).lib + gtest.lib + gtest_main.lib $(GoogleTestLibInstallDir)\$(GTestLibName) $(GoogleTestLibInstallDir)\$(GTestMainLibName) diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile index b16eb0ad16..59c3692614 100644 --- a/tests/unittests/Makefile +++ b/tests/unittests/Makefile @@ -81,8 +81,6 @@ ifeq (,$(findstring -D_DEBUG,$(DEFINES))) ifeq (,$(findstring -DNDEBUG,$(DEFINES))) DEFINES += -DNDEBUG endif -else -LIB_SUFFIX = d endif CFLAGS= \ @@ -120,8 +118,8 @@ LIBS= \ -lgdi32 \ -lcomdlg32 \ -L$(GOOGLETEST_INSTALL_DIR)/lib \ - -lgtest$(or $(LIB_SUFFIX),) \ - -lgtest_main$(or $(LIB_SUFFIX),) \ + -lgtest \ + -lgtest_main \ $(MYLIBS) exe= $(or $(OUTDIR),.)/tests1.exe From 56d37120d01ed7b15059c089e990ecaea6f994d1 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:31:17 +0900 Subject: [PATCH 038/129] =?UTF-8?q?GoogleTest=E3=82=92=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/googletest b/tests/googletest index 3cf8f514d8..0b7798b2fb 160000 --- a/tests/googletest +++ b/tests/googletest @@ -1 +1 @@ -Subproject commit 3cf8f514d859d65b7202e51c662a03a92887b8e2 +Subproject commit 0b7798b2fba340969a0cf83698e5c0a2e25b7dbc From 45a8a4ce5f30b4c6278b0cb3a619840ded820d36 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Thu, 27 Jan 2022 21:34:12 +0900 Subject: [PATCH 039/129] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=82=AF=E3=83=88=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E5=86=85=E3=81=AELink=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E3=81=AE=E8=A8=98=E8=BF=B0=E4=BD=8D=E7=BD=AE=E3=82=92=E7=A7=BB?= =?UTF-8?q?=E5=8B=95=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index b657d16d8b..2d94b8907e 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -69,17 +69,17 @@ true true - - Windows - comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;Dwmapi.lib;%(AdditionalDependencies) - true - 0x0411 true + + Windows + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;Dwmapi.lib;%(AdditionalDependencies) + true + call postBuild.bat $(Platform) $(Configuration) @@ -94,12 +94,12 @@ MultiThreadedDebug EnableFastChecks - - false - _DEBUG;%(PreprocessorDefinitions) + + false + @@ -110,26 +110,26 @@ ProgramDatabase true + + NDEBUG;%(PreprocessorDefinitions) + UseFastLinkTimeCodeGeneration true true true - - NDEBUG;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - true - WIN32;%(PreprocessorDefinitions) + + true + From 58f5897f311fafe8595c0e2e9f0ebfbffe7cdf72 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 9 Jan 2022 20:32:02 +0900 Subject: [PATCH 040/129] =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0NUM?= =?UTF-8?q?=5FVSVERSION=E3=81=8C=E7=84=A1=E8=A6=96=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/find-tools.bat | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index 8b5f1c1bef..139c4702d3 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -161,10 +161,14 @@ exit /b :: 16 => Visual Studio 2019 :: --------------------------------------------------------------------------------------------------------------------- :msbuild + if defined ARG_VSVERSION ( + goto :convert_arg_vsversion + ) + goto :varidate_num_vsversion + +:convert_arg_vsversion :: convert productLineVersion to Internal Major Version - if "%ARG_VSVERSION%" == "" ( - set NUM_VSVERSION=15 - ) else if "%ARG_VSVERSION%" == "2017" ( + if "%ARG_VSVERSION%" == "2017" ( set NUM_VSVERSION=15 ) else if "%ARG_VSVERSION%" == "2019" ( set NUM_VSVERSION=16 @@ -176,6 +180,11 @@ exit /b set NUM_VSVERSION=%ARG_VSVERSION% ) +:varidate_num_vsversion + if not defined NUM_VSVERSION ( + set NUM_VSVERSION=15 + ) + call :check_installed_vsversion call :find_msbuild From a617d1205e3dff11702a26ad90aadfb79f94afc9 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 10 Jan 2022 17:22:39 +0900 Subject: [PATCH 041/129] =?UTF-8?q?find-tools.bat=E3=81=AE=E7=92=B0?= =?UTF-8?q?=E5=A2=83=E5=A4=89=E6=95=B0=E3=82=AF=E3=83=AA=E3=82=A2=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=82=92=E9=96=A2=E6=95=B0=E5=8C=96=E3=81=97=E3=81=A6?= =?UTF-8?q?=E5=86=85=E9=83=A8=E3=81=8B=E3=82=89=E5=91=BC=E3=81=B9=E3=82=8B?= =?UTF-8?q?=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 --- tools/find-tools.bat | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index 139c4702d3..c4f46ab846 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -2,22 +2,7 @@ setlocal if "%1" equ "clear" ( - endlocal - set CMD_GIT= - set CMD_7Z= - set CMD_HHC= - set CMD_ISCC= - set CMD_CPPCHECK= - set CMD_DOXYGEN= - set CMD_VSWHERE= - set CMD_MSBUILD= - set CMD_CMAKE= - set CMD_NINJA= - set CMD_LEPROC= - set CMD_PYTHON= - set NUM_VSVERSION= - set CMAKE_G_PARAM= - set FIND_TOOLS_CALLED= + call :clear_variables echo find-tools.bat has been cleared exit /b ) else if "%~1" neq "" ( @@ -75,6 +60,25 @@ endlocal ^ set FIND_TOOLS_CALLED=1 exit /b +:clear_variables + endlocal + set CMD_GIT= + set CMD_7Z= + set CMD_HHC= + set CMD_ISCC= + set CMD_CPPCHECK= + set CMD_DOXYGEN= + set CMD_VSWHERE= + set CMD_MSBUILD= + set CMD_CMAKE= + set CMD_NINJA= + set CMD_LEPROC= + set CMD_PYTHON= + set NUM_VSVERSION= + set CMAKE_G_PARAM= + set FIND_TOOLS_CALLED= + exit /b + :Git set APPDIR=Git\Cmd set PATH2=%PATH%;%ProgramFiles%\%APPDIR%\;%ProgramFiles(x86)%\%APPDIR%\;%ProgramW6432%\%APPDIR%\; From 2b61f1fbf8df030364a7a2335aa9ce6964353920 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 10 Jan 2022 18:39:47 +0900 Subject: [PATCH 042/129] =?UTF-8?q?=E5=BC=95=E6=95=B0(ARG=5FVSVERSION)?= =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=9F=E3=82=89=E7=92=B0?= =?UTF-8?q?=E5=A2=83=E5=A4=89=E6=95=B0=E3=82=92=E6=B4=97=E3=81=84=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E7=B5=84=E3=81=BF?= =?UTF-8?q?=E3=81=AA=E3=81=8A=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/find-tools.bat | 157 +++++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index c4f46ab846..3c6251332e 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -5,9 +5,34 @@ if "%1" equ "clear" ( call :clear_variables echo find-tools.bat has been cleared exit /b -) else if "%~1" neq "" ( +) + +if not defined CMD_VSWHERE call :vswhere 2> nul +if not exist "%CMD_VSWHERE%" ( + echo vswhere was not found + exit /b +) + +set ARG_VSVERSION= +if "%1" neq "" ( set "ARG_VSVERSION=%~1" ) +call :convert_arg_vsversion +if not defined ARG_VSVERSION ( + call :convert_arg_vsversion +) + +if defined NUM_VSVERSION ( + if "%ARG_VSVERSION%" neq "%NUM_VSVERSION%" ( + call :clear_variables + setlocal + set "ARG_VSVERSION=%~1" + call :vswhere + call :convert_arg_vsversion + ) +) +set NUM_VSVERSION=%ARG_VSVERSION% + if defined FIND_TOOLS_CALLED ( echo find-tools.bat already called exit /b @@ -20,7 +45,6 @@ if not defined CMD_HHC call :hhc 2> nul if not defined CMD_ISCC call :iscc 2> nul if not defined CMD_CPPCHECK call :cppcheck 2> nul if not defined CMD_DOXYGEN call :doxygen 2> nul -if not defined CMD_VSWHERE call :vswhere 2> nul if not defined CMD_MSBUILD call :msbuild 2> nul if not defined CMD_CMAKE call :cmake 2> nul if not defined CMD_NINJA call :cmake 2> nul @@ -79,6 +103,44 @@ exit /b set FIND_TOOLS_CALLED= exit /b +:convert_arg_vsversion + if not defined ARG_VSVERSION ( + set "ARG_VSVERSION=%NUM_VSVERSION%" + ) + if not defined ARG_VSVERSION ( + set "ARG_VSVERSION=latest" + ) + + :: convert productLineVersion to Internal Major Version + if "%ARG_VSVERSION%" == "2017" ( + set ARG_VSVERSION=15 + ) else if "%ARG_VSVERSION%" == "2019" ( + set ARG_VSVERSION=16 + ) else if "%ARG_VSVERSION%" == "2022" ( + set ARG_VSVERSION=17 + ) else if "%ARG_VSVERSION%" == "latest" ( + call :get_latest_installed_vsversion + ) + ::指定されたバージョンのC++がインストールされているかチェック + set /a ARG_VSVERSION_NEXT=ARG_VSVERSION + 1 + for /f "usebackq delims=" %%d in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -version [%ARG_VSVERSION%^,%ARG_VSVERSION_NEXT%^)`) do ( + if exist "%%d" exit /b + ) + ::指定されたバージョンが存在しなければ「指定なし」にしてやり直す + set ARG_VSVERSION= + exit /b + +:get_latest_installed_vsversion + for /f "usebackq delims=" %%v in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationVersion -latest`) do ( + set VSVERSION=%%v + ) + if defined VSVERSION ( + set ARG_VSVERSION=%VSVERSION:~0,2% + ) else ( + set ARG_VSVERSION=15 + ) + exit /b + :Git set APPDIR=Git\Cmd set PATH2=%PATH%;%ProgramFiles%\%APPDIR%\;%ProgramFiles(x86)%\%APPDIR%\;%ProgramW6432%\%APPDIR%\; @@ -156,104 +218,41 @@ exit /b :: --------------------------------------------------------------------------------------------------------------------- :: sub routine for finding msbuild -:: -:: ARG_VSVERSION -:: latest => the latest version of installed Visual Studio -:: 2017 => Visual Studio 2017 -:: 2019 => Visual Studio 2019 -:: 15 => Visual Studio 2017 -:: 16 => Visual Studio 2019 :: --------------------------------------------------------------------------------------------------------------------- :msbuild - if defined ARG_VSVERSION ( - goto :convert_arg_vsversion - ) - goto :varidate_num_vsversion - -:convert_arg_vsversion - :: convert productLineVersion to Internal Major Version - if "%ARG_VSVERSION%" == "2017" ( - set NUM_VSVERSION=15 - ) else if "%ARG_VSVERSION%" == "2019" ( - set NUM_VSVERSION=16 - ) else if "%ARG_VSVERSION%" == "2022" ( - set NUM_VSVERSION=17 - ) else if "%ARG_VSVERSION%" == "latest" ( - call :check_latest_installed_vsversion - ) else ( - set NUM_VSVERSION=%ARG_VSVERSION% - ) - -:varidate_num_vsversion - if not defined NUM_VSVERSION ( - set NUM_VSVERSION=15 - ) - - call :check_installed_vsversion - - call :find_msbuild - if not exist "%CMD_MSBUILD%" ( + :: vs2017単独インストールで導入されるvswhereには機能制限がある + if "%ARG_VSVERSION%" == "15" ( call :find_msbuild_legacy - set NUM_VSVERSION=15 - ) - - if "%NUM_VSVERSION%" == "15" ( set CMAKE_G_PARAM=Visual Studio 15 2017 - ) else if "%NUM_VSVERSION%" == "16" ( - set CMAKE_G_PARAM=Visual Studio 16 2019 - ) else if "%NUM_VSVERSION%" == "17" ( - set CMAKE_G_PARAM=Visual Studio 17 2022 ) else ( + call :find_msbuild call :set_cmake_gparam_automatically ) exit /b -:set_cmake_gparam_automatically - call :get_product_line_version - set CMAKE_G_PARAM=Visual Studio %NUM_VSVERSION% %VS_PRODUCT_LINE_VERSION% - exit /b - -:get_product_line_version - set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 - for /f "usebackq delims=" %%v in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property catalog_productLineVersion -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do ( - set VS_PRODUCT_LINE_VERSION=%%v - ) - exit /b - -:check_latest_installed_vsversion - for /f "usebackq delims=" %%v in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationVersion -latest`) do ( - set VSVERSION=%%v - ) - set NUM_VSVERSION=%VSVERSION:~0,2% - exit /b - -:check_installed_vsversion - set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 - for /f "usebackq delims=" %%d in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do ( - if exist "%%d" exit /b - ) - call :check_latest_installed_vsversion - exit /b - :find_msbuild set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 for /f "usebackq delims=" %%a in (`"%CMD_VSWHERE%" -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do ( set "CMD_MSBUILD=%%a" ) - if exist "%CMD_MSBUILD%" ( - exit /b - ) - set CMD_MSBUILD= exit /b :find_msbuild_legacy for /f "usebackq delims=" %%d in (`"%CMD_VSWHERE%" -requires Microsoft.Component.MSBuild -property installationPath -version [15^,16^)`) do ( set "CMD_MSBUILD=%%d\MSBuild\15.0\Bin\MSBuild.exe" ) - if exist "%CMD_MSBUILD%" ( - exit /b + exit /b + +:set_cmake_gparam_automatically + call :get_product_line_version + set CMAKE_G_PARAM=Visual Studio %NUM_VSVERSION% %VS_PRODUCT_LINE_VERSION% + exit /b + +:get_product_line_version + set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 + for /f "usebackq delims=" %%v in (`"%CMD_VSWHERE%" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property catalog_productLineVersion -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do ( + set VS_PRODUCT_LINE_VERSION=%%v ) - set CMD_MSBUILD= exit /b :cmake From e6cba4f95eb543533cce4616a966628001950e8b Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sun, 23 Jan 2022 23:11:56 +0900 Subject: [PATCH 043/129] =?UTF-8?q?find-tools:=20=E7=B4=B0=E3=81=8B?= =?UTF-8?q?=E3=81=84=E4=BF=AE=E6=AD=A3=E3=82=92=E5=AE=9F=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 変数のローカル化をやめるタイミングの変更 - 探索処理では`ARG_VSVERSION`ではなく、値が確定している`NUM_VSVERSION`を参照する - インデントに使用する文字を揃える --- tools/find-tools.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/find-tools.bat b/tools/find-tools.bat index 3c6251332e..9113ecfeb0 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -2,6 +2,7 @@ setlocal if "%1" equ "clear" ( + endlocal call :clear_variables echo find-tools.bat has been cleared exit /b @@ -24,6 +25,7 @@ if not defined ARG_VSVERSION ( if defined NUM_VSVERSION ( if "%ARG_VSVERSION%" neq "%NUM_VSVERSION%" ( + endlocal call :clear_variables setlocal set "ARG_VSVERSION=%~1" @@ -85,7 +87,6 @@ set FIND_TOOLS_CALLED=1 exit /b :clear_variables - endlocal set CMD_GIT= set CMD_7Z= set CMD_HHC= @@ -221,7 +222,7 @@ exit /b :: --------------------------------------------------------------------------------------------------------------------- :msbuild :: vs2017単独インストールで導入されるvswhereには機能制限がある - if "%ARG_VSVERSION%" == "15" ( + if "%NUM_VSVERSION%" == "15" ( call :find_msbuild_legacy set CMAKE_G_PARAM=Visual Studio 15 2017 ) else ( @@ -296,7 +297,7 @@ exit /b call :find_py call :check_python_version if defined CMD_PYTHON ( - exit /b 0 + exit /b 0 ) call :find_python From e03800f30783bf4299f4b1f9a615af56d09c0c6d Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:45:02 +0900 Subject: [PATCH 044/129] =?UTF-8?q?find-tools:=20=E3=83=89=E3=82=AD?= =?UTF-8?q?=E3=83=A5=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AB=E6=8E=A2=E7=B4=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=81=AE=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/find-tools.md | 52 +++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/tools/find-tools.md b/tools/find-tools.md index 4a81f06241..be7c961e8c 100644 --- a/tools/find-tools.md +++ b/tools/find-tools.md @@ -19,7 +19,7 @@ | Inno Setup 5 | CMD_ISCC | Inno Setup 5 | ISCC.exe | | Cppcheck | CMD_CPPCHECK | cppcheck | cppcheck.exe | | Doxygen | CMD_DOXYGEN | doxygen\bin | doxygen.exe | -| vswhere | CMD_VSWHERE | Microsoft Visual Studio\Installer | vswhere.exe | +| Visual Studio Locator | CMD_VSWHERE | Microsoft Visual Studio\Installer | vswhere.exe | | MSBuild | CMD_MSBUILD | 特殊 | MSBuild.exe | | Locale Emulator | CMD_LEPROC | なし | LEProc.exe | | Python | CMD_PYTHON | なし | py.exe (python.exe) | @@ -41,39 +41,31 @@ MSBuild以外の探索手順は同一であり、7-Zipを例に説明する。 ### ユーザーがビルドに使用する Visual Studio のバージョンを切り替える方法 -環境変数 ```ARG_VSVERSION``` の値でビルドに使用するバージョンを切り替えられる。 +環境変数 `NUM_VSVERSION` の値でビルドに使用するバージョンを切り替えられる。 -| ARG_VSVERSION | 使用される Visual Studio のバージョン | -| -------------- | ------------------------------------- | -| 空 | インストールされている Visual Studio の最新 | -| 15 | Visual Studio 2017 | -| 16 | Visual Studio 2019 | -| 2017 | Visual Studio 2017 | -| 2019 | Visual Studio 2019 | +| NUM_VSVERSION | 使用される Visual Studio のバージョン | +| -------------- | -------------------------------------- | +| （未定義） | インストールされている最新のバージョン | +| 15 | Visual Studio 2017 | +| 16 | Visual Studio 2019 | +| 17 | Visual Studio 2022 | ### 検索ロジック -1. `ARG_VSVERSION` から`VC++`のバージョン指定(`NUM_VSVERSION`)を判断する。 - 1. `ARG_VSVERSION` 未指定の場合、`15`が指定されたものとみなす。 - 1. `ARG_VSVERSION` が`2017`の場合、`15`が指定されたものとみなす。 - 1. `ARG_VSVERSION` が`2019`の場合、`16`が指定されたものとみなす。 - 1. `ARG_VSVERSION` が`latest`の場合、最新バージョンを取得する。 - 1. `ARG_VSVERSION` が上記以外の場合、`%ARG_VSVERSION%`が指定されたものとみなす。 -1. 指定されたバージョンのVC++がインストールされているかチェックする。 - 1. `vswhere -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -version [%NUM_VSVERSION%, %NUM_VSVERSION% + 1)` を実行する。 - 1. 取得したパスが存在していたら、バージョン指定(`NUM_VSVERSION`)は正しいとみなす。 - 1. 取得したパスが存在していなかったら、最新バージョンを取得する。 -1. インストール済み`VC++`の最新バージョンを取得する。 - 1. `vswhere -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationVersion -latest` を実行する。 - 1. 取得したバージョンが指定されたものとみなす。(`NUM_VSVERSION`に代入する。) -1. 指定されたバージョンの`MsBuild.exe`を検索する。 - 1. `-find`オプションを付けて`MsBuild.exe`を検索する。(`vswhere -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe -version [%NUM_VSVERSION%, %NUM_VSVERSION% + 1)`) - 1. `vswhere` が VS2019 以降ver の場合、`MSBuild.exe` が見つかるので検索終了。 - 1. `vswhere` が VS2017 以前ver の場合、`MSBuild.exe` が見つからない(エラーになる)ので検索続行。 -1. VS2017 の `MsBuild.exe` を検索する。 - 1. VS2017 のインストールパスを検索する。(`vswhere -requires Microsoft.Component.MSBuild -property installationPath -version [15^,16^)`) - 1. VS2017 のインストールパス配下の所定位置(`%Vs2017InstallRoot%\MSBuild\15.0\Bin`)に`MSBuild.exe`が存在する場合、そのパスを `MSBuild.exe` のパスとみなす。 - この場合、バージョン指定(`NUM_VSVERSION`)に`15`が指定されたものとみなす。 +1. バッチファイルの引数をチェックする。 + 1. 引数が指定されていない場合、`NUM_VSVERSION`が定義されていればその値を、そうでなければ`latest`を指定したものとみなす。 + 2. 引数にプロダクトバージョン（例：`2019`）が指定されている場合は値をメジャーバージョンに変換する。 + `latest`を指定した場合は、実行環境にインストールされている最新のメジャーバージョンを取得する。 + 3. 指定したバージョンがインストールされているか確認し、見つからなければ引数の指定はなかったものとみなしてチェックをやり直す。 + 4. `NUM_VSVERSION`が指定されている場合に限り、設定されている値とここまでのチェックで見つかったバージョンが同じであるか確認する。 + もし異なっている場合は環境変数を初期化した上で引数チェックをやり直す。 +2. 引数チェックで決定したバージョンの MSBuild を探す。 + - Visual Studio 2017 が選択された場合 + - VS2017 のインストールパスを取得し、配下の所定位置に`MSBuild.exe`が存在する場合、そのパスを`MSBuild`のパスとして利用する。 + - CMakeのジェネレータ名を示す`CMAKE_G_PARAM`に`Visual Studio 15 2017`を設定する。 + - Visual Studio 2019 以降が選択された場合 + - Visual Studio Locator の`-find`オプションを利用して`MSBuild.exe`を検索し、見つかったパスを`MSBuild`のパスとして利用する。 + - `NUM_VSVERSION`と別途取得したプロダクトバージョンからCMakeのジェネレータ名を生成し、`CMAKE_G_PARAM`に設定する。 ### 参照 * https://github.com/Microsoft/vswhere From 2078f2653b86fd918eb35b227b2265f01f3c8293 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:50:51 +0900 Subject: [PATCH 045/129] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88=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 --- tools/find-tools.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/find-tools.md b/tools/find-tools.md index be7c961e8c..4caae98260 100644 --- a/tools/find-tools.md +++ b/tools/find-tools.md @@ -53,19 +53,19 @@ MSBuild以外の探索手順は同一であり、7-Zipを例に説明する。 ### 検索ロジック 1. バッチファイルの引数をチェックする。 - 1. 引数が指定されていない場合、`NUM_VSVERSION`が定義されていればその値を、そうでなければ`latest`を指定したものとみなす。 - 2. 引数にプロダクトバージョン（例：`2019`）が指定されている場合は値をメジャーバージョンに変換する。 - `latest`を指定した場合は、実行環境にインストールされている最新のメジャーバージョンを取得する。 - 3. 指定したバージョンがインストールされているか確認し、見つからなければ引数の指定はなかったものとみなしてチェックをやり直す。 - 4. `NUM_VSVERSION`が指定されている場合に限り、設定されている値とここまでのチェックで見つかったバージョンが同じであるか確認する。 - もし異なっている場合は環境変数を初期化した上で引数チェックをやり直す。 + 1. 引数が指定されていない場合、`NUM_VSVERSION`が定義されていればその値を、そうでなければ`latest`を指定したものとみなす。 + 2. 引数にプロダクトバージョン（例：`2019`）が指定されている場合は値をメジャーバージョンに変換する。 + `latest`を指定した場合は、実行環境にインストールされている最新のメジャーバージョンを取得する。 + 3. 指定したバージョンがインストールされているか確認し、見つからなければ引数の指定はなかったものとみなしてチェックをやり直す。 + 4. `NUM_VSVERSION`が指定されている場合に限り、設定されている値とここまでのチェックで見つかったバージョンが同じであるか確認する。 + もし異なっている場合は環境変数を初期化した上で引数チェックをやり直す。 2. 引数チェックで決定したバージョンの MSBuild を探す。 - - Visual Studio 2017 が選択された場合 - - VS2017 のインストールパスを取得し、配下の所定位置に`MSBuild.exe`が存在する場合、そのパスを`MSBuild`のパスとして利用する。 - - CMakeのジェネレータ名を示す`CMAKE_G_PARAM`に`Visual Studio 15 2017`を設定する。 - - Visual Studio 2019 以降が選択された場合 - - Visual Studio Locator の`-find`オプションを利用して`MSBuild.exe`を検索し、見つかったパスを`MSBuild`のパスとして利用する。 - - `NUM_VSVERSION`と別途取得したプロダクトバージョンからCMakeのジェネレータ名を生成し、`CMAKE_G_PARAM`に設定する。 + - Visual Studio 2017 が選択された場合 + - VS2017 のインストールパスを取得し、配下の所定位置に`MSBuild.exe`が存在する場合、そのパスを`MSBuild`のパスとして利用する。 + - CMakeのジェネレータ名を示す`CMAKE_G_PARAM`に`Visual Studio 15 2017`を設定する。 + - Visual Studio 2019 以降が選択された場合 + - Visual Studio Locator の`-find`オプションを利用して`MSBuild.exe`を検索し、見つかったパスを`MSBuild`のパスとして利用する。 + - `NUM_VSVERSION`と別途取得したプロダクトバージョンからCMakeのジェネレータ名を生成し、`CMAKE_G_PARAM`に設定する。 ### 参照 * https://github.com/Microsoft/vswhere From 8230b8cec8e81140470223ed2d748eb3c35e5134 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Fri, 4 Feb 2022 02:26:18 +0900 Subject: [PATCH 046/129] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E7=A2=BA=E8=AA=8D=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E3=83=A9=E3=82=A4=E3=83=88=E8=A1=A8=E8=A8=98?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- sakura_core/sakura_rc.rc2 | 2 +- sakura_lang_en_US/sakura_lang_rc.rc2 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 9f05afd0d9..5281dd5e09 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ zlib License -Copyright (C) 2018-2021, Sakura Editor Organization +Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/sakura_rc.rc2 b/sakura_core/sakura_rc.rc2 index d1fe93e59c..0ce44a256e 100644 --- a/sakura_core/sakura_rc.rc2 +++ b/sakura_core/sakura_rc.rc2 @@ -27,7 +27,7 @@ #define _GSTR_APPNAME _APP_NAME_1 _APP_NAME_2 _APP_NAME_3 _APP_NAME_4 #endif -#define S_COPYRIGHT "Copyright (C) 1998-2021 by Norio Nakatani & Collaborators" +#define S_COPYRIGHT "Copyright (C) 1998-2022 by Norio Nakatani & Collaborators" ///////////////////////////////////////////////////////////////////////////// // diff --git a/sakura_lang_en_US/sakura_lang_rc.rc2 b/sakura_lang_en_US/sakura_lang_rc.rc2 index d5a081a36f..9e41b69edd 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc2 +++ b/sakura_lang_en_US/sakura_lang_rc.rc2 @@ -27,8 +27,8 @@ #define _GSTR_APPNAME _APP_NAME_1 _APP_NAME_2 _APP_NAME_3 _APP_NAME_4 #endif -#define S_COPYRIGHT "Copyright (C) 1998-2021 by Norio Nakatani & Collaborators" -#define S_COPYRIGHT_TRANSLATION "Copyright (C) 2011-2021 by Lucien & Collaborators" +#define S_COPYRIGHT "Copyright (C) 1998-2022 by Norio Nakatani & Collaborators" +#define S_COPYRIGHT_TRANSLATION "Copyright (C) 2011-2022 by Lucien & Collaborators" ///////////////////////////////////////////////////////////////////////////// // From 737a8c424a2bb1d5d7b90f5e6ee93d3861c277ad Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sat, 5 Feb 2022 16:47:22 +0900 Subject: [PATCH 047/129] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E8=A1=A8=E8=A8=98=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeaderMake/HeaderMake.cpp | 2 +- sakura_core/CAutoReloadAgent.cpp | 2 +- sakura_core/CAutoReloadAgent.h | 2 +- sakura_core/CAutoSaveAgent.cpp | 2 +- sakura_core/CAutoSaveAgent.h | 2 +- sakura_core/CBackupAgent.cpp | 2 +- sakura_core/CBackupAgent.h | 2 +- sakura_core/CCodeChecker.cpp | 2 +- sakura_core/CCodeChecker.h | 2 +- sakura_core/CDataProfile.cpp | 2 +- sakura_core/CDataProfile.h | 2 +- sakura_core/CDicMgr.cpp | 2 +- sakura_core/CDicMgr.h | 2 +- sakura_core/CEditApp.cpp | 2 +- sakura_core/CEditApp.h | 2 +- sakura_core/CEol.cpp | 2 +- sakura_core/CEol.h | 2 +- sakura_core/CFileExt.cpp | 2 +- sakura_core/CFileExt.h | 2 +- sakura_core/CGrepAgent.cpp | 2 +- sakura_core/CGrepAgent.h | 2 +- sakura_core/CGrepEnumFileBase.h | 2 +- sakura_core/CGrepEnumFiles.h | 2 +- sakura_core/CGrepEnumFilterFiles.h | 2 +- sakura_core/CGrepEnumFilterFolders.h | 2 +- sakura_core/CGrepEnumFolders.h | 2 +- sakura_core/CGrepEnumKeys.h | 2 +- sakura_core/CHokanMgr.cpp | 2 +- sakura_core/CHokanMgr.h | 2 +- sakura_core/CKeyWordSetMgr.cpp | 2 +- sakura_core/CKeyWordSetMgr.h | 2 +- sakura_core/CLoadAgent.cpp | 2 +- sakura_core/CLoadAgent.h | 2 +- sakura_core/CMarkMgr.cpp | 2 +- sakura_core/CMarkMgr.h | 2 +- sakura_core/COpe.cpp | 2 +- sakura_core/COpe.h | 2 +- sakura_core/COpeBlk.cpp | 2 +- sakura_core/COpeBlk.h | 2 +- sakura_core/COpeBuf.cpp | 2 +- sakura_core/COpeBuf.h | 2 +- sakura_core/CProfile.cpp | 2 +- sakura_core/CProfile.h | 2 +- sakura_core/CPropertyManager.cpp | 2 +- sakura_core/CPropertyManager.h | 2 +- sakura_core/CReadManager.cpp | 2 +- sakura_core/CReadManager.h | 2 +- sakura_core/CRegexKeyword.cpp | 2 +- sakura_core/CRegexKeyword.h | 2 +- sakura_core/CSaveAgent.cpp | 2 +- sakura_core/CSaveAgent.h | 2 +- sakura_core/CSearchAgent.cpp | 2 +- sakura_core/CSearchAgent.h | 2 +- sakura_core/CSelectLang.cpp | 2 +- sakura_core/CSelectLang.h | 2 +- sakura_core/CSortedTagJumpList.cpp | 2 +- sakura_core/CSortedTagJumpList.h | 2 +- sakura_core/CWriteManager.cpp | 2 +- sakura_core/CWriteManager.h | 2 +- sakura_core/EditInfo.cpp | 2 +- sakura_core/EditInfo.h | 2 +- sakura_core/GrepInfo.cpp | 2 +- sakura_core/GrepInfo.h | 2 +- sakura_core/StdAfx.cpp | 2 +- sakura_core/StdAfx.h | 2 +- sakura_core/String_define.h | 2 +- sakura_core/_main/CAppMode.cpp | 2 +- sakura_core/_main/CAppMode.h | 2 +- sakura_core/_main/CCommandLine.cpp | 2 +- sakura_core/_main/CCommandLine.h | 2 +- sakura_core/_main/CControlProcess.cpp | 2 +- sakura_core/_main/CControlProcess.h | 2 +- sakura_core/_main/CControlTray.cpp | 2 +- sakura_core/_main/CControlTray.h | 2 +- sakura_core/_main/CMutex.h | 2 +- sakura_core/_main/CNormalProcess.cpp | 2 +- sakura_core/_main/CNormalProcess.h | 2 +- sakura_core/_main/CProcess.cpp | 2 +- sakura_core/_main/CProcess.h | 2 +- sakura_core/_main/CProcessFactory.cpp | 2 +- sakura_core/_main/CProcessFactory.h | 2 +- sakura_core/_main/WinMain.cpp | 2 +- sakura_core/_main/global.cpp | 2 +- sakura_core/_main/global.h | 2 +- sakura_core/_os/CClipboard.cpp | 2 +- sakura_core/_os/CClipboard.h | 2 +- sakura_core/_os/CDropTarget.cpp | 2 +- sakura_core/_os/CDropTarget.h | 2 +- sakura_core/_os/OleTypes.h | 2 +- sakura_core/apiwrap/CommonControl.h | 2 +- sakura_core/apiwrap/StdApi.cpp | 2 +- sakura_core/apiwrap/StdApi.h | 2 +- sakura_core/apiwrap/StdControl.cpp | 2 +- sakura_core/apiwrap/StdControl.h | 2 +- sakura_core/basis/CErrorInfo.cpp | 2 +- sakura_core/basis/CErrorInfo.h | 2 +- sakura_core/basis/CLaxInteger.cpp | 2 +- sakura_core/basis/CLaxInteger.h | 2 +- sakura_core/basis/CMyPoint.cpp | 2 +- sakura_core/basis/CMyPoint.h | 2 +- sakura_core/basis/CMyRect.cpp | 2 +- sakura_core/basis/CMyRect.h | 2 +- sakura_core/basis/CMySize.cpp | 2 +- sakura_core/basis/CMySize.h | 2 +- sakura_core/basis/CMyString.cpp | 2 +- sakura_core/basis/CMyString.h | 2 +- sakura_core/basis/CStrictInteger.cpp | 2 +- sakura_core/basis/CStrictInteger.h | 2 +- sakura_core/basis/CStrictPoint.cpp | 2 +- sakura_core/basis/CStrictPoint.h | 2 +- sakura_core/basis/CStrictRange.cpp | 2 +- sakura_core/basis/CStrictRange.h | 2 +- sakura_core/basis/CStrictRect.cpp | 2 +- sakura_core/basis/CStrictRect.h | 2 +- sakura_core/basis/SakuraBasis.cpp | 2 +- sakura_core/basis/SakuraBasis.h | 2 +- sakura_core/basis/TComImpl.hpp | 2 +- sakura_core/basis/_com_raise_error.cpp | 2 +- sakura_core/basis/primitive.h | 2 +- sakura_core/charset/CCesu8.cpp | 2 +- sakura_core/charset/CCesu8.h | 2 +- sakura_core/charset/CCodeBase.cpp | 2 +- sakura_core/charset/CCodeBase.h | 2 +- sakura_core/charset/CCodeFactory.cpp | 2 +- sakura_core/charset/CCodeFactory.h | 2 +- sakura_core/charset/CCodeMediator.cpp | 2 +- sakura_core/charset/CCodeMediator.h | 2 +- sakura_core/charset/CCodePage.cpp | 2 +- sakura_core/charset/CCodePage.h | 2 +- sakura_core/charset/CESI.cpp | 2 +- sakura_core/charset/CESI.h | 2 +- sakura_core/charset/CEuc.cpp | 2 +- sakura_core/charset/CEuc.h | 2 +- sakura_core/charset/CJis.cpp | 2 +- sakura_core/charset/CJis.h | 2 +- sakura_core/charset/CLatin1.cpp | 2 +- sakura_core/charset/CLatin1.h | 2 +- sakura_core/charset/CShiftJis.cpp | 2 +- sakura_core/charset/CShiftJis.h | 2 +- sakura_core/charset/CUnicode.cpp | 2 +- sakura_core/charset/CUnicode.h | 2 +- sakura_core/charset/CUnicodeBe.cpp | 2 +- sakura_core/charset/CUnicodeBe.h | 2 +- sakura_core/charset/CUtf7.cpp | 2 +- sakura_core/charset/CUtf7.h | 2 +- sakura_core/charset/CUtf8.cpp | 2 +- sakura_core/charset/CUtf8.h | 2 +- sakura_core/charset/CharsetDetector.cpp | 2 +- sakura_core/charset/CharsetDetector.h | 2 +- sakura_core/charset/charcode.cpp | 2 +- sakura_core/charset/charcode.h | 2 +- sakura_core/charset/charset.cpp | 2 +- sakura_core/charset/charset.h | 2 +- sakura_core/charset/codechecker.cpp | 2 +- sakura_core/charset/codechecker.h | 2 +- sakura_core/charset/codeutil.cpp | 2 +- sakura_core/charset/codeutil.h | 2 +- sakura_core/cmd/CViewCommander.cpp | 2 +- sakura_core/cmd/CViewCommander.h | 2 +- sakura_core/cmd/CViewCommander_Bookmark.cpp | 2 +- sakura_core/cmd/CViewCommander_Clipboard.cpp | 2 +- sakura_core/cmd/CViewCommander_Convert.cpp | 2 +- sakura_core/cmd/CViewCommander_Cursor.cpp | 2 +- sakura_core/cmd/CViewCommander_CustMenu.cpp | 2 +- sakura_core/cmd/CViewCommander_Diff.cpp | 2 +- sakura_core/cmd/CViewCommander_Edit.cpp | 2 +- sakura_core/cmd/CViewCommander_Edit_advanced.cpp | 2 +- sakura_core/cmd/CViewCommander_Edit_word_line.cpp | 2 +- sakura_core/cmd/CViewCommander_File.cpp | 2 +- sakura_core/cmd/CViewCommander_Grep.cpp | 2 +- sakura_core/cmd/CViewCommander_Insert.cpp | 2 +- sakura_core/cmd/CViewCommander_Macro.cpp | 2 +- sakura_core/cmd/CViewCommander_ModeChange.cpp | 2 +- sakura_core/cmd/CViewCommander_Outline.cpp | 2 +- sakura_core/cmd/CViewCommander_Search.cpp | 2 +- sakura_core/cmd/CViewCommander_Select.cpp | 2 +- sakura_core/cmd/CViewCommander_Settings.cpp | 2 +- sakura_core/cmd/CViewCommander_Support.cpp | 2 +- sakura_core/cmd/CViewCommander_TagJump.cpp | 2 +- sakura_core/cmd/CViewCommander_Window.cpp | 2 +- sakura_core/cmd/CViewCommander_inline.h | 2 +- sakura_core/config/app_constants.h | 2 +- sakura_core/config/build_config.cpp | 2 +- sakura_core/config/build_config.h | 2 +- sakura_core/config/maxdata.h | 2 +- sakura_core/config/system_constants.h | 2 +- sakura_core/convert/CConvert.cpp | 2 +- sakura_core/convert/CConvert.h | 2 +- sakura_core/convert/CConvert_CodeAutoToSjis.cpp | 2 +- sakura_core/convert/CConvert_CodeAutoToSjis.h | 2 +- sakura_core/convert/CConvert_CodeFromSjis.cpp | 2 +- sakura_core/convert/CConvert_CodeFromSjis.h | 2 +- sakura_core/convert/CConvert_CodeToSjis.cpp | 2 +- sakura_core/convert/CConvert_CodeToSjis.h | 2 +- sakura_core/convert/CConvert_HaneisuToZeneisu.cpp | 2 +- sakura_core/convert/CConvert_HaneisuToZeneisu.h | 2 +- sakura_core/convert/CConvert_HankataToZenhira.cpp | 2 +- sakura_core/convert/CConvert_HankataToZenhira.h | 2 +- sakura_core/convert/CConvert_HankataToZenkata.cpp | 2 +- sakura_core/convert/CConvert_HankataToZenkata.h | 2 +- sakura_core/convert/CConvert_SpaceToTab.cpp | 2 +- sakura_core/convert/CConvert_SpaceToTab.h | 2 +- sakura_core/convert/CConvert_TabToSpace.cpp | 2 +- sakura_core/convert/CConvert_TabToSpace.h | 2 +- sakura_core/convert/CConvert_ToHankaku.cpp | 2 +- sakura_core/convert/CConvert_ToHankaku.h | 2 +- sakura_core/convert/CConvert_ToLower.cpp | 2 +- sakura_core/convert/CConvert_ToLower.h | 2 +- sakura_core/convert/CConvert_ToUpper.cpp | 2 +- sakura_core/convert/CConvert_ToUpper.h | 2 +- sakura_core/convert/CConvert_ToZenhira.cpp | 2 +- sakura_core/convert/CConvert_ToZenhira.h | 2 +- sakura_core/convert/CConvert_ToZenkata.cpp | 2 +- sakura_core/convert/CConvert_ToZenkata.h | 2 +- sakura_core/convert/CConvert_Trim.cpp | 2 +- sakura_core/convert/CConvert_Trim.h | 2 +- sakura_core/convert/CConvert_ZeneisuToHaneisu.cpp | 2 +- sakura_core/convert/CConvert_ZeneisuToHaneisu.h | 2 +- sakura_core/convert/CConvert_ZenkataToHankata.cpp | 2 +- sakura_core/convert/CConvert_ZenkataToHankata.h | 2 +- sakura_core/convert/CDecode.h | 2 +- sakura_core/convert/CDecode_Base64Decode.cpp | 2 +- sakura_core/convert/CDecode_Base64Decode.h | 2 +- sakura_core/convert/CDecode_UuDecode.cpp | 2 +- sakura_core/convert/CDecode_UuDecode.h | 2 +- sakura_core/convert/convert_util.cpp | 2 +- sakura_core/convert/convert_util.h | 2 +- sakura_core/convert/convert_util2.cpp | 2 +- sakura_core/convert/convert_util2.h | 2 +- sakura_core/debug/CRunningTimer.cpp | 2 +- sakura_core/debug/CRunningTimer.h | 2 +- sakura_core/debug/Debug1.cpp | 2 +- sakura_core/debug/Debug1.h | 2 +- sakura_core/debug/Debug2.cpp | 2 +- sakura_core/debug/Debug2.h | 2 +- sakura_core/debug/Debug3.cpp | 2 +- sakura_core/debug/Debug3.h | 2 +- sakura_core/dlg/CDialog.cpp | 2 +- sakura_core/dlg/CDialog.h | 2 +- sakura_core/dlg/CDlgAbout.cpp | 2 +- sakura_core/dlg/CDlgAbout.h | 2 +- sakura_core/dlg/CDlgCancel.cpp | 2 +- sakura_core/dlg/CDlgCancel.h | 2 +- sakura_core/dlg/CDlgCompare.cpp | 2 +- sakura_core/dlg/CDlgCompare.h | 2 +- sakura_core/dlg/CDlgCtrlCode.cpp | 2 +- sakura_core/dlg/CDlgCtrlCode.h | 2 +- sakura_core/dlg/CDlgDiff.cpp | 2 +- sakura_core/dlg/CDlgDiff.h | 2 +- sakura_core/dlg/CDlgExec.cpp | 2 +- sakura_core/dlg/CDlgExec.h | 2 +- sakura_core/dlg/CDlgFavorite.cpp | 2 +- sakura_core/dlg/CDlgFavorite.h | 2 +- sakura_core/dlg/CDlgFileUpdateQuery.cpp | 2 +- sakura_core/dlg/CDlgFileUpdateQuery.h | 2 +- sakura_core/dlg/CDlgFind.cpp | 2 +- sakura_core/dlg/CDlgFind.h | 2 +- sakura_core/dlg/CDlgGrep.cpp | 2 +- sakura_core/dlg/CDlgGrep.h | 2 +- sakura_core/dlg/CDlgGrepReplace.cpp | 2 +- sakura_core/dlg/CDlgGrepReplace.h | 2 +- sakura_core/dlg/CDlgInput1.cpp | 2 +- sakura_core/dlg/CDlgInput1.h | 2 +- sakura_core/dlg/CDlgJump.cpp | 2 +- sakura_core/dlg/CDlgJump.h | 2 +- sakura_core/dlg/CDlgOpenFile.cpp | 2 +- sakura_core/dlg/CDlgOpenFile.h | 2 +- sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp | 2 +- sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp | 2 +- sakura_core/dlg/CDlgPluginOption.cpp | 2 +- sakura_core/dlg/CDlgPluginOption.h | 2 +- sakura_core/dlg/CDlgPrintSetting.cpp | 2 +- sakura_core/dlg/CDlgPrintSetting.h | 2 +- sakura_core/dlg/CDlgProfileMgr.cpp | 2 +- sakura_core/dlg/CDlgProfileMgr.h | 2 +- sakura_core/dlg/CDlgProperty.cpp | 2 +- sakura_core/dlg/CDlgProperty.h | 2 +- sakura_core/dlg/CDlgReplace.cpp | 2 +- sakura_core/dlg/CDlgReplace.h | 2 +- sakura_core/dlg/CDlgSetCharSet.cpp | 2 +- sakura_core/dlg/CDlgSetCharSet.h | 2 +- sakura_core/dlg/CDlgTagJumpList.cpp | 2 +- sakura_core/dlg/CDlgTagJumpList.h | 2 +- sakura_core/dlg/CDlgTagsMake.cpp | 2 +- sakura_core/dlg/CDlgTagsMake.h | 2 +- sakura_core/dlg/CDlgWinSize.cpp | 2 +- sakura_core/dlg/CDlgWinSize.h | 2 +- sakura_core/dlg/CDlgWindowList.cpp | 2 +- sakura_core/dlg/CDlgWindowList.h | 2 +- sakura_core/doc/CBlockComment.cpp | 2 +- sakura_core/doc/CBlockComment.h | 2 +- sakura_core/doc/CDocEditor.cpp | 2 +- sakura_core/doc/CDocEditor.h | 2 +- sakura_core/doc/CDocFile.cpp | 2 +- sakura_core/doc/CDocFile.h | 2 +- sakura_core/doc/CDocFileOperation.cpp | 2 +- sakura_core/doc/CDocFileOperation.h | 2 +- sakura_core/doc/CDocListener.cpp | 2 +- sakura_core/doc/CDocListener.h | 2 +- sakura_core/doc/CDocLocker.cpp | 2 +- sakura_core/doc/CDocLocker.h | 2 +- sakura_core/doc/CDocOutline.cpp | 2 +- sakura_core/doc/CDocOutline.h | 2 +- sakura_core/doc/CDocReader.cpp | 2 +- sakura_core/doc/CDocReader.h | 2 +- sakura_core/doc/CDocType.cpp | 2 +- sakura_core/doc/CDocType.h | 2 +- sakura_core/doc/CDocTypeSetting.cpp | 2 +- sakura_core/doc/CDocTypeSetting.h | 2 +- sakura_core/doc/CDocVisitor.cpp | 2 +- sakura_core/doc/CDocVisitor.h | 2 +- sakura_core/doc/CEditDoc.cpp | 2 +- sakura_core/doc/CEditDoc.h | 2 +- sakura_core/doc/CLineComment.cpp | 2 +- sakura_core/doc/CLineComment.h | 2 +- sakura_core/doc/layout/CLayout.cpp | 2 +- sakura_core/doc/layout/CLayout.h | 2 +- sakura_core/doc/layout/CLayoutExInfo.h | 2 +- sakura_core/doc/layout/CLayoutMgr.cpp | 2 +- sakura_core/doc/layout/CLayoutMgr.h | 2 +- sakura_core/doc/layout/CLayoutMgr_DoLayout.cpp | 2 +- sakura_core/doc/layout/CLayoutMgr_New.cpp | 2 +- sakura_core/doc/layout/CLayoutMgr_New2.cpp | 2 +- sakura_core/doc/layout/CTsvModeInfo.cpp | 2 +- sakura_core/doc/layout/CTsvModeInfo.h | 2 +- sakura_core/doc/logic/CDocLine.cpp | 2 +- sakura_core/doc/logic/CDocLine.h | 2 +- sakura_core/doc/logic/CDocLineMgr.cpp | 2 +- sakura_core/doc/logic/CDocLineMgr.h | 2 +- sakura_core/docplus/CBookmarkManager.cpp | 2 +- sakura_core/docplus/CBookmarkManager.h | 2 +- sakura_core/docplus/CDiffManager.cpp | 2 +- sakura_core/docplus/CDiffManager.h | 2 +- sakura_core/docplus/CFuncListManager.cpp | 2 +- sakura_core/docplus/CFuncListManager.h | 2 +- sakura_core/docplus/CModifyManager.cpp | 2 +- sakura_core/docplus/CModifyManager.h | 2 +- sakura_core/env/CAppNodeManager.cpp | 2 +- sakura_core/env/CAppNodeManager.h | 2 +- sakura_core/env/CDocTypeManager.cpp | 2 +- sakura_core/env/CDocTypeManager.h | 2 +- sakura_core/env/CFileNameManager.cpp | 2 +- sakura_core/env/CFileNameManager.h | 2 +- sakura_core/env/CFormatManager.cpp | 2 +- sakura_core/env/CFormatManager.h | 2 +- sakura_core/env/CHelpManager.cpp | 2 +- sakura_core/env/CHelpManager.h | 2 +- sakura_core/env/CSakuraEnvironment.cpp | 2 +- sakura_core/env/CSakuraEnvironment.h | 2 +- sakura_core/env/CSearchKeywordManager.cpp | 2 +- sakura_core/env/CSearchKeywordManager.h | 2 +- sakura_core/env/CShareData.cpp | 2 +- sakura_core/env/CShareData.h | 2 +- sakura_core/env/CShareData_IO.cpp | 2 +- sakura_core/env/CShareData_IO.h | 2 +- sakura_core/env/CTagJumpManager.cpp | 2 +- sakura_core/env/CTagJumpManager.h | 2 +- sakura_core/env/CommonSetting.cpp | 2 +- sakura_core/env/CommonSetting.h | 2 +- sakura_core/env/DLLSHAREDATA.cpp | 2 +- sakura_core/env/DLLSHAREDATA.h | 2 +- sakura_core/extmodule/CBregexp.cpp | 2 +- sakura_core/extmodule/CBregexp.h | 2 +- sakura_core/extmodule/CBregexpDll2.cpp | 2 +- sakura_core/extmodule/CBregexpDll2.h | 2 +- sakura_core/extmodule/CDllHandler.cpp | 2 +- sakura_core/extmodule/CDllHandler.h | 2 +- sakura_core/extmodule/CHtmlHelp.cpp | 2 +- sakura_core/extmodule/CHtmlHelp.h | 2 +- sakura_core/extmodule/CIcu4cI18n.cpp | 2 +- sakura_core/extmodule/CIcu4cI18n.h | 2 +- sakura_core/extmodule/CMigemo.cpp | 2 +- sakura_core/extmodule/CMigemo.h | 2 +- sakura_core/extmodule/CUchardet.cpp | 2 +- sakura_core/extmodule/CUchardet.h | 2 +- sakura_core/extmodule/CUxTheme.cpp | 2 +- sakura_core/extmodule/CUxTheme.h | 2 +- sakura_core/func/CFuncKeyWnd.cpp | 2 +- sakura_core/func/CFuncKeyWnd.h | 2 +- sakura_core/func/CFuncLookup.cpp | 2 +- sakura_core/func/CFuncLookup.h | 2 +- sakura_core/func/CKeyBind.cpp | 2 +- sakura_core/func/CKeyBind.h | 2 +- sakura_core/func/Funccode.cpp | 2 +- sakura_core/func/Funccode.h | 2 +- sakura_core/io/CBinaryStream.cpp | 2 +- sakura_core/io/CBinaryStream.h | 2 +- sakura_core/io/CFile.cpp | 2 +- sakura_core/io/CFile.h | 2 +- sakura_core/io/CFileLoad.cpp | 2 +- sakura_core/io/CFileLoad.h | 2 +- sakura_core/io/CIoBridge.cpp | 2 +- sakura_core/io/CIoBridge.h | 2 +- sakura_core/io/CStream.cpp | 2 +- sakura_core/io/CStream.h | 2 +- sakura_core/io/CTextStream.cpp | 2 +- sakura_core/io/CTextStream.h | 2 +- sakura_core/io/CZipFile.cpp | 2 +- sakura_core/io/CZipFile.h | 2 +- sakura_core/macro/CCookieManager.cpp | 2 +- sakura_core/macro/CCookieManager.h | 2 +- sakura_core/macro/CEditorIfObj.cpp | 2 +- sakura_core/macro/CEditorIfObj.h | 2 +- sakura_core/macro/CIfObj.cpp | 2 +- sakura_core/macro/CIfObj.h | 2 +- sakura_core/macro/CKeyMacroMgr.cpp | 2 +- sakura_core/macro/CKeyMacroMgr.h | 2 +- sakura_core/macro/CMacro.cpp | 2 +- sakura_core/macro/CMacro.h | 2 +- sakura_core/macro/CMacroFactory.cpp | 2 +- sakura_core/macro/CMacroFactory.h | 2 +- sakura_core/macro/CMacroManagerBase.cpp | 2 +- sakura_core/macro/CMacroManagerBase.h | 2 +- sakura_core/macro/CPPA.cpp | 2 +- sakura_core/macro/CPPA.h | 2 +- sakura_core/macro/CPPAMacroMgr.cpp | 2 +- sakura_core/macro/CPPAMacroMgr.h | 2 +- sakura_core/macro/CSMacroMgr.cpp | 2 +- sakura_core/macro/CSMacroMgr.h | 2 +- sakura_core/macro/CWSH.cpp | 2 +- sakura_core/macro/CWSH.h | 2 +- sakura_core/macro/CWSHIfObj.cpp | 2 +- sakura_core/macro/CWSHIfObj.h | 2 +- sakura_core/macro/CWSHManager.cpp | 2 +- sakura_core/macro/CWSHManager.h | 2 +- sakura_core/mem/CMemory.cpp | 2 +- sakura_core/mem/CMemory.h | 2 +- sakura_core/mem/CMemoryIterator.h | 2 +- sakura_core/mem/CNative.cpp | 2 +- sakura_core/mem/CNative.h | 2 +- sakura_core/mem/CNativeA.cpp | 2 +- sakura_core/mem/CNativeA.h | 2 +- sakura_core/mem/CNativeW.cpp | 2 +- sakura_core/mem/CNativeW.h | 2 +- sakura_core/mem/CPoolResource.h | 2 +- sakura_core/mem/CRecycledBuffer.cpp | 2 +- sakura_core/mem/CRecycledBuffer.h | 2 +- sakura_core/mfclike/CMyWnd.cpp | 2 +- sakura_core/mfclike/CMyWnd.h | 2 +- sakura_core/outline/CDlgFileTree.cpp | 2 +- sakura_core/outline/CDlgFileTree.h | 2 +- sakura_core/outline/CDlgFuncList.cpp | 2 +- sakura_core/outline/CDlgFuncList.h | 2 +- sakura_core/outline/CFuncInfo.cpp | 2 +- sakura_core/outline/CFuncInfo.h | 2 +- sakura_core/outline/CFuncInfoArr.cpp | 2 +- sakura_core/outline/CFuncInfoArr.h | 2 +- sakura_core/parse/CWordParse.cpp | 2 +- sakura_core/parse/CWordParse.h | 2 +- sakura_core/plugin/CComplementIfObj.h | 2 +- sakura_core/plugin/CDllPlugin.cpp | 2 +- sakura_core/plugin/CDllPlugin.h | 2 +- sakura_core/plugin/CJackManager.cpp | 2 +- sakura_core/plugin/CJackManager.h | 2 +- sakura_core/plugin/COutlineIfObj.h | 2 +- sakura_core/plugin/CPlugin.cpp | 2 +- sakura_core/plugin/CPlugin.h | 2 +- sakura_core/plugin/CPluginIfObj.h | 2 +- sakura_core/plugin/CPluginManager.cpp | 2 +- sakura_core/plugin/CPluginManager.h | 2 +- sakura_core/plugin/CSmartIndentIfObj.h | 2 +- sakura_core/plugin/CWSHPlugin.cpp | 2 +- sakura_core/plugin/CWSHPlugin.h | 2 +- sakura_core/print/CPrint.cpp | 2 +- sakura_core/print/CPrint.h | 2 +- sakura_core/print/CPrintPreview.cpp | 2 +- sakura_core/print/CPrintPreview.h | 2 +- sakura_core/prop/CPropComBackup.cpp | 2 +- sakura_core/prop/CPropComCustmenu.cpp | 2 +- sakura_core/prop/CPropComEdit.cpp | 2 +- sakura_core/prop/CPropComFile.cpp | 2 +- sakura_core/prop/CPropComFileName.cpp | 2 +- sakura_core/prop/CPropComFormat.cpp | 2 +- sakura_core/prop/CPropComGeneral.cpp | 2 +- sakura_core/prop/CPropComGrep.cpp | 2 +- sakura_core/prop/CPropComHelper.cpp | 2 +- sakura_core/prop/CPropComKeybind.cpp | 2 +- sakura_core/prop/CPropComKeyword.cpp | 2 +- sakura_core/prop/CPropComMacro.cpp | 2 +- sakura_core/prop/CPropComMainMenu.cpp | 2 +- sakura_core/prop/CPropComPlugin.cpp | 2 +- sakura_core/prop/CPropComStatusbar.cpp | 2 +- sakura_core/prop/CPropComTab.cpp | 2 +- sakura_core/prop/CPropComToolbar.cpp | 2 +- sakura_core/prop/CPropComWin.cpp | 2 +- sakura_core/prop/CPropCommon.cpp | 2 +- sakura_core/prop/CPropCommon.h | 2 +- sakura_core/recent/CMRUFile.cpp | 2 +- sakura_core/recent/CMRUFile.h | 2 +- sakura_core/recent/CMRUFolder.cpp | 2 +- sakura_core/recent/CMRUFolder.h | 2 +- sakura_core/recent/CMruListener.cpp | 2 +- sakura_core/recent/CMruListener.h | 2 +- sakura_core/recent/CRecent.cpp | 2 +- sakura_core/recent/CRecent.h | 2 +- sakura_core/recent/CRecentCmd.cpp | 2 +- sakura_core/recent/CRecentCmd.h | 2 +- sakura_core/recent/CRecentCurDir.cpp | 2 +- sakura_core/recent/CRecentCurDir.h | 2 +- sakura_core/recent/CRecentEditNode.cpp | 2 +- sakura_core/recent/CRecentEditNode.h | 2 +- sakura_core/recent/CRecentExceptMru.cpp | 2 +- sakura_core/recent/CRecentExceptMru.h | 2 +- sakura_core/recent/CRecentExcludeFile.cpp | 2 +- sakura_core/recent/CRecentExcludeFile.h | 2 +- sakura_core/recent/CRecentExcludeFolder.cpp | 2 +- sakura_core/recent/CRecentExcludeFolder.h | 2 +- sakura_core/recent/CRecentFile.cpp | 2 +- sakura_core/recent/CRecentFile.h | 2 +- sakura_core/recent/CRecentFolder.cpp | 2 +- sakura_core/recent/CRecentFolder.h | 2 +- sakura_core/recent/CRecentGrepFile.cpp | 2 +- sakura_core/recent/CRecentGrepFile.h | 2 +- sakura_core/recent/CRecentGrepFolder.cpp | 2 +- sakura_core/recent/CRecentGrepFolder.h | 2 +- sakura_core/recent/CRecentImp.cpp | 2 +- sakura_core/recent/CRecentImp.h | 2 +- sakura_core/recent/CRecentReplace.cpp | 2 +- sakura_core/recent/CRecentReplace.h | 2 +- sakura_core/recent/CRecentSearch.cpp | 2 +- sakura_core/recent/CRecentSearch.h | 2 +- sakura_core/recent/CRecentTagjumpKeyword.cpp | 2 +- sakura_core/recent/CRecentTagjumpKeyword.h | 2 +- sakura_core/recent/SShare_History.h | 2 +- sakura_core/typeprop/CDlgKeywordSelect.cpp | 2 +- sakura_core/typeprop/CDlgKeywordSelect.h | 2 +- sakura_core/typeprop/CDlgSameColor.cpp | 2 +- sakura_core/typeprop/CDlgSameColor.h | 2 +- sakura_core/typeprop/CDlgTypeAscertain.cpp | 2 +- sakura_core/typeprop/CDlgTypeAscertain.h | 2 +- sakura_core/typeprop/CDlgTypeList.cpp | 2 +- sakura_core/typeprop/CDlgTypeList.h | 2 +- sakura_core/typeprop/CImpExpManager.cpp | 2 +- sakura_core/typeprop/CImpExpManager.h | 2 +- sakura_core/typeprop/CPropTypes.cpp | 2 +- sakura_core/typeprop/CPropTypes.h | 2 +- sakura_core/typeprop/CPropTypesColor.cpp | 2 +- sakura_core/typeprop/CPropTypesKeyHelp.cpp | 2 +- sakura_core/typeprop/CPropTypesRegex.cpp | 2 +- sakura_core/typeprop/CPropTypesScreen.cpp | 2 +- sakura_core/typeprop/CPropTypesSupport.cpp | 2 +- sakura_core/typeprop/CPropTypesWindow.cpp | 2 +- sakura_core/types/CType.cpp | 2 +- sakura_core/types/CType.h | 2 +- sakura_core/types/CTypeSupport.cpp | 2 +- sakura_core/types/CTypeSupport.h | 2 +- sakura_core/types/CType_Asm.cpp | 2 +- sakura_core/types/CType_Awk.cpp | 2 +- sakura_core/types/CType_Basis.cpp | 2 +- sakura_core/types/CType_Cobol.cpp | 2 +- sakura_core/types/CType_CorbaIdl.cpp | 2 +- sakura_core/types/CType_Cpp.cpp | 2 +- sakura_core/types/CType_Dos.cpp | 2 +- sakura_core/types/CType_Erlang.cpp | 2 +- sakura_core/types/CType_Html.cpp | 2 +- sakura_core/types/CType_Ini.cpp | 2 +- sakura_core/types/CType_Java.cpp | 2 +- sakura_core/types/CType_Others.cpp | 2 +- sakura_core/types/CType_Pascal.cpp | 2 +- sakura_core/types/CType_Perl.cpp | 2 +- sakura_core/types/CType_Python.cpp | 2 +- sakura_core/types/CType_Rich.cpp | 2 +- sakura_core/types/CType_Sql.cpp | 2 +- sakura_core/types/CType_Tex.cpp | 2 +- sakura_core/types/CType_Text.cpp | 2 +- sakura_core/types/CType_Vb.cpp | 2 +- sakura_core/uiparts/CGraphics.cpp | 2 +- sakura_core/uiparts/CGraphics.h | 2 +- sakura_core/uiparts/CImageListMgr.cpp | 2 +- sakura_core/uiparts/CImageListMgr.h | 2 +- sakura_core/uiparts/CMenuDrawer.cpp | 2 +- sakura_core/uiparts/CMenuDrawer.h | 2 +- sakura_core/uiparts/CSoundSet.cpp | 2 +- sakura_core/uiparts/CSoundSet.h | 2 +- sakura_core/uiparts/CVisualProgress.cpp | 2 +- sakura_core/uiparts/CVisualProgress.h | 2 +- sakura_core/uiparts/CWaitCursor.cpp | 2 +- sakura_core/uiparts/CWaitCursor.h | 2 +- sakura_core/uiparts/HandCursor.h | 2 +- sakura_core/util/MessageBoxF.cpp | 2 +- sakura_core/util/MessageBoxF.h | 2 +- sakura_core/util/RegKey.h | 2 +- sakura_core/util/StaticType.h | 2 +- sakura_core/util/container.h | 2 +- sakura_core/util/design_template.h | 2 +- sakura_core/util/file.cpp | 2 +- sakura_core/util/file.h | 2 +- sakura_core/util/format.cpp | 2 +- sakura_core/util/format.h | 2 +- sakura_core/util/input.cpp | 2 +- sakura_core/util/input.h | 2 +- sakura_core/util/module.cpp | 2 +- sakura_core/util/module.h | 2 +- sakura_core/util/ole_convert.cpp | 2 +- sakura_core/util/ole_convert.h | 2 +- sakura_core/util/os.cpp | 2 +- sakura_core/util/os.h | 2 +- sakura_core/util/relation_tool.cpp | 2 +- sakura_core/util/relation_tool.h | 2 +- sakura_core/util/shell.cpp | 2 +- sakura_core/util/shell.h | 2 +- sakura_core/util/std_macro.h | 2 +- sakura_core/util/string_ex.cpp | 2 +- sakura_core/util/string_ex.h | 2 +- sakura_core/util/string_ex2.cpp | 2 +- sakura_core/util/string_ex2.h | 2 +- sakura_core/util/tchar_convert.cpp | 2 +- sakura_core/util/tchar_convert.h | 2 +- sakura_core/util/tchar_template.cpp | 2 +- sakura_core/util/tchar_template.h | 2 +- sakura_core/util/window.cpp | 2 +- sakura_core/util/window.h | 2 +- sakura_core/util/zoom.cpp | 2 +- sakura_core/util/zoom.h | 2 +- sakura_core/version.h | 2 +- sakura_core/view/CCaret.cpp | 2 +- sakura_core/view/CCaret.h | 2 +- sakura_core/view/CEditView.cpp | 2 +- sakura_core/view/CEditView.h | 2 +- sakura_core/view/CEditView_CmdHokan.cpp | 2 +- sakura_core/view/CEditView_Cmdgrep.cpp | 2 +- sakura_core/view/CEditView_Cmdisrch.cpp | 2 +- sakura_core/view/CEditView_Command.cpp | 2 +- sakura_core/view/CEditView_Command_New.cpp | 2 +- sakura_core/view/CEditView_Diff.cpp | 2 +- sakura_core/view/CEditView_ExecCmd.cpp | 2 +- sakura_core/view/CEditView_Ime.cpp | 2 +- sakura_core/view/CEditView_Mouse.cpp | 2 +- sakura_core/view/CEditView_Paint.cpp | 2 +- sakura_core/view/CEditView_Paint.h | 2 +- sakura_core/view/CEditView_Paint_Bracket.cpp | 2 +- sakura_core/view/CEditView_Scroll.cpp | 2 +- sakura_core/view/CEditView_Search.cpp | 2 +- sakura_core/view/CMiniMapView.cpp | 2 +- sakura_core/view/CMiniMapView.h | 2 +- sakura_core/view/CRuler.cpp | 2 +- sakura_core/view/CRuler.h | 2 +- sakura_core/view/CTextArea.cpp | 2 +- sakura_core/view/CTextArea.h | 2 +- sakura_core/view/CTextDrawer.cpp | 2 +- sakura_core/view/CTextDrawer.h | 2 +- sakura_core/view/CTextMetrics.cpp | 2 +- sakura_core/view/CTextMetrics.h | 2 +- sakura_core/view/CViewCalc.cpp | 2 +- sakura_core/view/CViewCalc.h | 2 +- sakura_core/view/CViewFont.cpp | 2 +- sakura_core/view/CViewFont.h | 2 +- sakura_core/view/CViewParser.cpp | 2 +- sakura_core/view/CViewParser.h | 2 +- sakura_core/view/CViewSelect.cpp | 2 +- sakura_core/view/CViewSelect.h | 2 +- sakura_core/view/DispPos.cpp | 2 +- sakura_core/view/DispPos.h | 2 +- sakura_core/view/colors/CColorStrategy.cpp | 2 +- sakura_core/view/colors/CColorStrategy.h | 2 +- sakura_core/view/colors/CColor_Comment.cpp | 2 +- sakura_core/view/colors/CColor_Comment.h | 2 +- sakura_core/view/colors/CColor_Found.cpp | 2 +- sakura_core/view/colors/CColor_Found.h | 2 +- sakura_core/view/colors/CColor_Heredoc.cpp | 2 +- sakura_core/view/colors/CColor_Heredoc.h | 2 +- sakura_core/view/colors/CColor_KeywordSet.cpp | 2 +- sakura_core/view/colors/CColor_KeywordSet.h | 2 +- sakura_core/view/colors/CColor_Numeric.cpp | 2 +- sakura_core/view/colors/CColor_Numeric.h | 2 +- sakura_core/view/colors/CColor_Quote.cpp | 2 +- sakura_core/view/colors/CColor_Quote.h | 2 +- sakura_core/view/colors/CColor_RegexKeyword.cpp | 2 +- sakura_core/view/colors/CColor_RegexKeyword.h | 2 +- sakura_core/view/colors/CColor_Url.cpp | 2 +- sakura_core/view/colors/CColor_Url.h | 2 +- sakura_core/view/colors/EColorIndexType.h | 2 +- sakura_core/view/figures/CFigureManager.cpp | 2 +- sakura_core/view/figures/CFigureManager.h | 2 +- sakura_core/view/figures/CFigureStrategy.cpp | 2 +- sakura_core/view/figures/CFigureStrategy.h | 2 +- sakura_core/view/figures/CFigure_Comma.cpp | 2 +- sakura_core/view/figures/CFigure_Comma.h | 2 +- sakura_core/view/figures/CFigure_CtrlCode.cpp | 2 +- sakura_core/view/figures/CFigure_CtrlCode.h | 2 +- sakura_core/view/figures/CFigure_Eol.cpp | 2 +- sakura_core/view/figures/CFigure_Eol.h | 2 +- sakura_core/view/figures/CFigure_HanSpace.cpp | 2 +- sakura_core/view/figures/CFigure_HanSpace.h | 2 +- sakura_core/view/figures/CFigure_Tab.cpp | 2 +- sakura_core/view/figures/CFigure_Tab.h | 2 +- sakura_core/view/figures/CFigure_ZenSpace.cpp | 2 +- sakura_core/view/figures/CFigure_ZenSpace.h | 2 +- sakura_core/window/CAutoScrollWnd.cpp | 2 +- sakura_core/window/CAutoScrollWnd.h | 2 +- sakura_core/window/CEditWnd.cpp | 2 +- sakura_core/window/CEditWnd.h | 2 +- sakura_core/window/CMainStatusBar.cpp | 2 +- sakura_core/window/CMainStatusBar.h | 2 +- sakura_core/window/CMainToolBar.cpp | 2 +- sakura_core/window/CMainToolBar.h | 2 +- sakura_core/window/CSplitBoxWnd.cpp | 2 +- sakura_core/window/CSplitBoxWnd.h | 2 +- sakura_core/window/CSplitterWnd.cpp | 2 +- sakura_core/window/CSplitterWnd.h | 2 +- sakura_core/window/CTabWnd.cpp | 2 +- sakura_core/window/CTabWnd.h | 2 +- sakura_core/window/CTipWnd.cpp | 2 +- sakura_core/window/CTipWnd.h | 2 +- sakura_core/window/CWnd.cpp | 2 +- sakura_core/window/CWnd.h | 2 +- tests/compiletests/clayoutint_test.cpp.in | 2 +- tests/unittests/StartEditorProcessForTest.h | 2 +- tests/unittests/code-main.cpp | 2 +- tests/unittests/coverage.cpp | 2 +- tests/unittests/test-StdControl.cpp | 2 +- tests/unittests/test-cclipboard.cpp | 2 +- tests/unittests/test-ccodebase.cpp | 2 +- tests/unittests/test-ccommandline.cpp | 2 +- tests/unittests/test-cconvert.cpp | 2 +- tests/unittests/test-cdecode.cpp | 2 +- tests/unittests/test-cdlgopenfile.cpp | 2 +- tests/unittests/test-cdlgprofilemgr.cpp | 2 +- tests/unittests/test-cdocline.cpp | 2 +- tests/unittests/test-cdoclinemgr.cpp | 2 +- tests/unittests/test-cdoctypemanager.cpp | 2 +- tests/unittests/test-ceol.cpp | 2 +- tests/unittests/test-cerrorinfo.cpp | 2 +- tests/unittests/test-cfileext.cpp | 2 +- tests/unittests/test-charcode.cpp | 2 +- tests/unittests/test-clayoutint.cpp | 2 +- tests/unittests/test-cmemory.cpp | 2 +- tests/unittests/test-cnative.cpp | 2 +- tests/unittests/test-cprofile.cpp | 2 +- tests/unittests/test-crunningtimer.cpp | 2 +- tests/unittests/test-csakuraenvironment.cpp | 2 +- tests/unittests/test-csearchagent.cpp | 2 +- tests/unittests/test-ctextmetrics.cpp | 2 +- tests/unittests/test-cwordparse.cpp | 2 +- tests/unittests/test-czipfile.cpp | 2 +- tests/unittests/test-design_template.cpp | 2 +- tests/unittests/test-editinfo.cpp | 2 +- tests/unittests/test-file.cpp | 2 +- tests/unittests/test-format.cpp | 2 +- tests/unittests/test-grepinfo.cpp | 2 +- tests/unittests/test-int2dec.cpp | 2 +- tests/unittests/test-is_mailaddress.cpp | 2 +- tests/unittests/test-loadstring.cpp | 2 +- tests/unittests/test-mydevmode.cpp | 2 +- tests/unittests/test-parameterized.cpp | 2 +- tests/unittests/test-printECodeType.cpp | 2 +- tests/unittests/test-printEFunctionCode.cpp | 2 +- tests/unittests/test-sample-disabled.cpp | 2 +- tests/unittests/test-sample.cpp | 2 +- tests/unittests/test-ssearchoption.cpp | 2 +- tests/unittests/test-statictype.cpp | 2 +- tests/unittests/test-string_ex.cpp | 2 +- tests/unittests/test-winmain.cpp | 2 +- tests/unittests/test-zoom.cpp | 2 +- .../ChmSourceConverter.Test/EncoderEscapingFallbackTest.cs | 2 +- .../ChmSourceConverter/ChmSourceConverterApp.cs | 2 +- .../ChmSourceConverter/EncoderEscapingFallback.cs | 2 +- .../ChmSourceConverter/EncoderEscapingFallbackBuffer.cs | 2 +- tools/ChmSourceConverter/ChmSourceConverter/FileContents.cs | 2 +- tools/ChmSourceConverter/ChmSourceConverter/LineEnumerator.cs | 2 +- tools/ChmSourceConverter/ChmSourceConverter/Program.cs | 2 +- tools/macro/CopyDirPath/CopyDirPath.js | 2 +- tools/macro/CopyDirPath/CopyDirPath.mac | 2 +- tools/macro/CopyDirPath/CopyDirPath.vbs | 2 +- 764 files changed, 764 insertions(+), 764 deletions(-) diff --git a/HeaderMake/HeaderMake.cpp b/HeaderMake/HeaderMake.cpp index af2a114515..a599ed141d 100644 --- a/HeaderMake/HeaderMake.cpp +++ b/HeaderMake/HeaderMake.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2007-2008, kobake Copyright (C) 2009, rastiv - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CAutoReloadAgent.cpp b/sakura_core/CAutoReloadAgent.cpp index 14f38d154f..3a5fd20c81 100644 --- a/sakura_core/CAutoReloadAgent.cpp +++ b/sakura_core/CAutoReloadAgent.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CAutoReloadAgent.h b/sakura_core/CAutoReloadAgent.h index a3e0843f04..db2f57df8c 100644 --- a/sakura_core/CAutoReloadAgent.h +++ b/sakura_core/CAutoReloadAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CAutoSaveAgent.cpp b/sakura_core/CAutoSaveAgent.cpp index c8a0d95fc9..d0d2f89ca6 100644 --- a/sakura_core/CAutoSaveAgent.cpp +++ b/sakura_core/CAutoSaveAgent.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2000-2001, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CAutoSaveAgent.h b/sakura_core/CAutoSaveAgent.h index 656c174f6f..5d6262a7dd 100644 --- a/sakura_core/CAutoSaveAgent.h +++ b/sakura_core/CAutoSaveAgent.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2000-2001, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CBackupAgent.cpp b/sakura_core/CBackupAgent.cpp index e92d33a381..0643b1755b 100644 --- a/sakura_core/CBackupAgent.cpp +++ b/sakura_core/CBackupAgent.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CBackupAgent.h b/sakura_core/CBackupAgent.h index cfb29905c0..c78cf531c3 100644 --- a/sakura_core/CBackupAgent.h +++ b/sakura_core/CBackupAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CCodeChecker.cpp b/sakura_core/CCodeChecker.cpp index cc0fc09aa4..5d6bf912c2 100644 --- a/sakura_core/CCodeChecker.cpp +++ b/sakura_core/CCodeChecker.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CCodeChecker.h b/sakura_core/CCodeChecker.h index cc7f5454af..1b7e124f9e 100644 --- a/sakura_core/CCodeChecker.h +++ b/sakura_core/CCodeChecker.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CDataProfile.cpp b/sakura_core/CDataProfile.cpp index f5a1415e84..72f92b2a7c 100644 --- a/sakura_core/CDataProfile.cpp +++ b/sakura_core/CDataProfile.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CDataProfile.h b/sakura_core/CDataProfile.h index 9056361e94..b210d06fc7 100644 --- a/sakura_core/CDataProfile.h +++ b/sakura_core/CDataProfile.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CDicMgr.cpp b/sakura_core/CDicMgr.cpp index 8489200783..452baeb1f6 100644 --- a/sakura_core/CDicMgr.cpp +++ b/sakura_core/CDicMgr.cpp @@ -10,7 +10,7 @@ Copyright (C) 2003, Moca Copyright (C) 2006, fon Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CDicMgr.h b/sakura_core/CDicMgr.h index d13196c4d5..6fe37dc047 100644 --- a/sakura_core/CDicMgr.h +++ b/sakura_core/CDicMgr.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CEditApp.cpp b/sakura_core/CEditApp.cpp index b578548e1a..17a331b2ac 100644 --- a/sakura_core/CEditApp.cpp +++ b/sakura_core/CEditApp.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CEditApp.h b/sakura_core/CEditApp.h index 2274d6b25b..23f11ef937 100644 --- a/sakura_core/CEditApp.h +++ b/sakura_core/CEditApp.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CEol.cpp b/sakura_core/CEol.cpp index 3956e0b6ef..ee3fe52ea5 100644 --- a/sakura_core/CEol.cpp +++ b/sakura_core/CEol.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2000-2001, genta Copyright (C) 2000, Frozen, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CEol.h b/sakura_core/CEol.h index ba0ce5ded9..5ce800d377 100644 --- a/sakura_core/CEol.h +++ b/sakura_core/CEol.h @@ -7,7 +7,7 @@ /* Copyright (C) 2000-2001, genta Copyright (C) 2002, frozen, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CFileExt.cpp b/sakura_core/CFileExt.cpp index 7455e22aff..b96c1b3e73 100644 --- a/sakura_core/CFileExt.cpp +++ b/sakura_core/CFileExt.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2003, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CFileExt.h b/sakura_core/CFileExt.h index 2bd82a5aef..753e64fa14 100644 --- a/sakura_core/CFileExt.h +++ b/sakura_core/CFileExt.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2003, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepAgent.cpp b/sakura_core/CGrepAgent.cpp index 9a691b3e8b..12703d54d9 100644 --- a/sakura_core/CGrepAgent.cpp +++ b/sakura_core/CGrepAgent.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepAgent.h b/sakura_core/CGrepAgent.h index 10769c6a5c..7f4c219359 100644 --- a/sakura_core/CGrepAgent.h +++ b/sakura_core/CGrepAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumFileBase.h b/sakura_core/CGrepEnumFileBase.h index 294a4d710e..11374a9e4f 100644 --- a/sakura_core/CGrepEnumFileBase.h +++ b/sakura_core/CGrepEnumFileBase.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, wakura - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumFiles.h b/sakura_core/CGrepEnumFiles.h index 66f5a81273..f9f67e0f26 100644 --- a/sakura_core/CGrepEnumFiles.h +++ b/sakura_core/CGrepEnumFiles.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, wakura - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumFilterFiles.h b/sakura_core/CGrepEnumFilterFiles.h index 18b5b6c78c..71c450b272 100644 --- a/sakura_core/CGrepEnumFilterFiles.h +++ b/sakura_core/CGrepEnumFilterFiles.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, wakura - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumFilterFolders.h b/sakura_core/CGrepEnumFilterFolders.h index 88669453f2..df5ad1ad28 100644 --- a/sakura_core/CGrepEnumFilterFolders.h +++ b/sakura_core/CGrepEnumFilterFolders.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, wakura - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumFolders.h b/sakura_core/CGrepEnumFolders.h index 0d6c5fdc57..04fd06145d 100644 --- a/sakura_core/CGrepEnumFolders.h +++ b/sakura_core/CGrepEnumFolders.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, wakura - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CGrepEnumKeys.h b/sakura_core/CGrepEnumKeys.h index 902cf4d18d..2cd02358de 100644 --- a/sakura_core/CGrepEnumKeys.h +++ b/sakura_core/CGrepEnumKeys.h @@ -8,7 +8,7 @@ /* Copyright (C) 2008, wakura Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp index 5745f7f65e..ad16aabc90 100644 --- a/sakura_core/CHokanMgr.cpp +++ b/sakura_core/CHokanMgr.cpp @@ -11,7 +11,7 @@ Copyright (C) 2003, Moca, KEITA Copyright (C) 2004, genta, Moca, novice Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/CHokanMgr.h b/sakura_core/CHokanMgr.h index 23a5a531e2..808073ece8 100644 --- a/sakura_core/CHokanMgr.h +++ b/sakura_core/CHokanMgr.h @@ -7,7 +7,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, asa-o Copyright (C) 2003, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CKeyWordSetMgr.cpp b/sakura_core/CKeyWordSetMgr.cpp index fd1156c62b..90e3760d48 100644 --- a/sakura_core/CKeyWordSetMgr.cpp +++ b/sakura_core/CKeyWordSetMgr.cpp @@ -12,7 +12,7 @@ Copyright (C) 2002, genta, Moca Copyright (C) 2004, Moca Copyright (C) 2005, Moca, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CKeyWordSetMgr.h b/sakura_core/CKeyWordSetMgr.h index 130b667462..55d9ec53b4 100644 --- a/sakura_core/CKeyWordSetMgr.h +++ b/sakura_core/CKeyWordSetMgr.h @@ -12,7 +12,7 @@ Copyright (C) 2001, jepro Copyright (C) 2004, Moca Copyright (C) 2005, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CLoadAgent.cpp b/sakura_core/CLoadAgent.cpp index af5c8c0246..c41ebe120f 100644 --- a/sakura_core/CLoadAgent.cpp +++ b/sakura_core/CLoadAgent.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CLoadAgent.h b/sakura_core/CLoadAgent.h index 2d7b14e8e4..d947c57b4f 100644 --- a/sakura_core/CLoadAgent.h +++ b/sakura_core/CLoadAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CMarkMgr.cpp b/sakura_core/CMarkMgr.cpp index b2fc803b3f..90e055f081 100644 --- a/sakura_core/CMarkMgr.cpp +++ b/sakura_core/CMarkMgr.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2000-2001, genta Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CMarkMgr.h b/sakura_core/CMarkMgr.h index caca41969f..7bf7ced60e 100644 --- a/sakura_core/CMarkMgr.h +++ b/sakura_core/CMarkMgr.h @@ -7,7 +7,7 @@ /* Copyright (C) 2000-2001, genta Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/COpe.cpp b/sakura_core/COpe.cpp index b2bb3646df..2d18b983c1 100644 --- a/sakura_core/COpe.cpp +++ b/sakura_core/COpe.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/COpe.h b/sakura_core/COpe.h index 850b661014..c63d26b6ce 100644 --- a/sakura_core/COpe.h +++ b/sakura_core/COpe.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/COpeBlk.cpp b/sakura_core/COpeBlk.cpp index 02d2e3eb44..640c4f69dc 100644 --- a/sakura_core/COpeBlk.cpp +++ b/sakura_core/COpeBlk.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/COpeBlk.h b/sakura_core/COpeBlk.h index fcdfd26433..5c49ce63ae 100644 --- a/sakura_core/COpeBlk.h +++ b/sakura_core/COpeBlk.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/COpeBuf.cpp b/sakura_core/COpeBuf.cpp index e3cdb8b69a..fc2fb5e9e1 100644 --- a/sakura_core/COpeBuf.cpp +++ b/sakura_core/COpeBuf.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/COpeBuf.h b/sakura_core/COpeBuf.h index 9cebf2da43..34d2b3bb5b 100644 --- a/sakura_core/COpeBuf.h +++ b/sakura_core/COpeBuf.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CProfile.cpp b/sakura_core/CProfile.cpp index 228f419672..fb3eba5242 100644 --- a/sakura_core/CProfile.cpp +++ b/sakura_core/CProfile.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, D.S.Koba, MIK, genta Copyright (C) 2006, D.S.Koba, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CProfile.h b/sakura_core/CProfile.h index 87e85eea14..b075f8476f 100644 --- a/sakura_core/CProfile.h +++ b/sakura_core/CProfile.h @@ -9,7 +9,7 @@ */ /* Copyright (C) 2003-2006, D.S.Koba - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CPropertyManager.cpp b/sakura_core/CPropertyManager.cpp index ff2482ef93..c056fa02a5 100644 --- a/sakura_core/CPropertyManager.cpp +++ b/sakura_core/CPropertyManager.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CPropertyManager.h b/sakura_core/CPropertyManager.h index 6d91c1ce90..7ceb036290 100644 --- a/sakura_core/CPropertyManager.h +++ b/sakura_core/CPropertyManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CReadManager.cpp b/sakura_core/CReadManager.cpp index 6b7d94fcce..6d2efbd48d 100644 --- a/sakura_core/CReadManager.cpp +++ b/sakura_core/CReadManager.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CReadManager.h b/sakura_core/CReadManager.h index 268ba66e2e..2933b0c11a 100644 --- a/sakura_core/CReadManager.h +++ b/sakura_core/CReadManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CRegexKeyword.cpp b/sakura_core/CRegexKeyword.cpp index 558f668416..2d270689d3 100644 --- a/sakura_core/CRegexKeyword.cpp +++ b/sakura_core/CRegexKeyword.cpp @@ -10,7 +10,7 @@ /* Copyright (C) 2001, MIK Copyright (C) 2002, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CRegexKeyword.h b/sakura_core/CRegexKeyword.h index f1d5bdb70d..222e85816c 100644 --- a/sakura_core/CRegexKeyword.h +++ b/sakura_core/CRegexKeyword.h @@ -9,7 +9,7 @@ */ /* Copyright (C) 2001, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CSaveAgent.cpp b/sakura_core/CSaveAgent.cpp index 49ee32b492..83e4f0e0e1 100644 --- a/sakura_core/CSaveAgent.cpp +++ b/sakura_core/CSaveAgent.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CSaveAgent.h b/sakura_core/CSaveAgent.h index d27b00e2e1..98e981224a 100644 --- a/sakura_core/CSaveAgent.h +++ b/sakura_core/CSaveAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CSearchAgent.cpp b/sakura_core/CSearchAgent.cpp index 27ffa3a45d..76ca395b85 100644 --- a/sakura_core/CSearchAgent.cpp +++ b/sakura_core/CSearchAgent.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CSearchAgent.h b/sakura_core/CSearchAgent.h index b133e7ee87..0f4e8442fc 100644 --- a/sakura_core/CSearchAgent.h +++ b/sakura_core/CSearchAgent.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CSelectLang.cpp b/sakura_core/CSelectLang.cpp index 8136b54e7d..8a246b0206 100644 --- a/sakura_core/CSelectLang.cpp +++ b/sakura_core/CSelectLang.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2011, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CSelectLang.h b/sakura_core/CSelectLang.h index 7efd60a9f9..3f003a5f00 100644 --- a/sakura_core/CSelectLang.h +++ b/sakura_core/CSelectLang.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2011, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/CSortedTagJumpList.cpp b/sakura_core/CSortedTagJumpList.cpp index 8f88449803..4780df477b 100644 --- a/sakura_core/CSortedTagJumpList.cpp +++ b/sakura_core/CSortedTagJumpList.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2005, MIK, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CSortedTagJumpList.h b/sakura_core/CSortedTagJumpList.h index c529a19ecd..0bc00fe379 100644 --- a/sakura_core/CSortedTagJumpList.h +++ b/sakura_core/CSortedTagJumpList.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2005, MIK, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CWriteManager.cpp b/sakura_core/CWriteManager.cpp index c02650d3ff..73ed90a036 100644 --- a/sakura_core/CWriteManager.cpp +++ b/sakura_core/CWriteManager.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/CWriteManager.h b/sakura_core/CWriteManager.h index e3a1f6ecbb..65bab37e1b 100644 --- a/sakura_core/CWriteManager.h +++ b/sakura_core/CWriteManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/EditInfo.cpp b/sakura_core/EditInfo.cpp index 66e51f16e3..039ce7d6fe 100644 --- a/sakura_core/EditInfo.cpp +++ b/sakura_core/EditInfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/EditInfo.h b/sakura_core/EditInfo.h index 192e89a825..ffee63af57 100644 --- a/sakura_core/EditInfo.h +++ b/sakura_core/EditInfo.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/GrepInfo.cpp b/sakura_core/GrepInfo.cpp index 01f9834a99..ad217113b8 100644 --- a/sakura_core/GrepInfo.cpp +++ b/sakura_core/GrepInfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/GrepInfo.h b/sakura_core/GrepInfo.h index bf0733831c..508d5518e2 100644 --- a/sakura_core/GrepInfo.h +++ b/sakura_core/GrepInfo.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/StdAfx.cpp b/sakura_core/StdAfx.cpp index 2c8faefcef..baa60cf9b8 100644 --- a/sakura_core/StdAfx.cpp +++ b/sakura_core/StdAfx.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/StdAfx.h b/sakura_core/StdAfx.h index e0fe88f6dd..3b6c3c027d 100644 --- a/sakura_core/StdAfx.h +++ b/sakura_core/StdAfx.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/String_define.h b/sakura_core/String_define.h index 3470a46abd..e878572890 100644 --- a/sakura_core/String_define.h +++ b/sakura_core/String_define.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_main/CAppMode.cpp b/sakura_core/_main/CAppMode.cpp index ebc74d8246..3e9372fb2f 100644 --- a/sakura_core/_main/CAppMode.cpp +++ b/sakura_core/_main/CAppMode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_main/CAppMode.h b/sakura_core/_main/CAppMode.h index dd51e7d2e8..e577d63837 100644 --- a/sakura_core/_main/CAppMode.h +++ b/sakura_core/_main/CAppMode.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_main/CCommandLine.cpp b/sakura_core/_main/CCommandLine.cpp index c69370c719..3b39bfdd47 100644 --- a/sakura_core/_main/CCommandLine.cpp +++ b/sakura_core/_main/CCommandLine.cpp @@ -12,7 +12,7 @@ Copyright (C) 2005, D.S.Koba, genta, susu Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CCommandLine.h b/sakura_core/_main/CCommandLine.h index 13e9ed7658..18125145d0 100644 --- a/sakura_core/_main/CCommandLine.h +++ b/sakura_core/_main/CCommandLine.h @@ -11,7 +11,7 @@ Copyright (C) 2002, genta Copyright (C) 2005, D.S.Koba Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CControlProcess.cpp b/sakura_core/_main/CControlProcess.cpp index d4334504b4..ed1db79ee5 100644 --- a/sakura_core/_main/CControlProcess.cpp +++ b/sakura_core/_main/CControlProcess.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, aroka CProcessより分離, YAZAKI Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CControlProcess.h b/sakura_core/_main/CControlProcess.h index a3cc104575..e42f5527de 100644 --- a/sakura_core/_main/CControlProcess.h +++ b/sakura_core/_main/CControlProcess.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, aroka 新規作成, YAZAKI Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index c8a09429aa..b92e36eed8 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -19,7 +19,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji Copyright (C) 2008, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/_main/CControlTray.h b/sakura_core/_main/CControlTray.h index 1e5ccb93b7..bb8c64534b 100644 --- a/sakura_core/_main/CControlTray.h +++ b/sakura_core/_main/CControlTray.h @@ -17,7 +17,7 @@ Copyright (C) 2003, genta Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CMutex.h b/sakura_core/_main/CMutex.h index f3f42ab284..0fa386e537 100644 --- a/sakura_core/_main/CMutex.h +++ b/sakura_core/_main/CMutex.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2007, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_main/CNormalProcess.cpp b/sakura_core/_main/CNormalProcess.cpp index 012ae52a88..ef01557d5d 100644 --- a/sakura_core/_main/CNormalProcess.cpp +++ b/sakura_core/_main/CNormalProcess.cpp @@ -14,7 +14,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2008, Uchi Copyright (C) 2009, syat, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CNormalProcess.h b/sakura_core/_main/CNormalProcess.h index 71afcb1f6c..96e170d49f 100644 --- a/sakura_core/_main/CNormalProcess.h +++ b/sakura_core/_main/CNormalProcess.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2002, aroka 新規作成 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CProcess.cpp b/sakura_core/_main/CProcess.cpp index 560c4c5e8d..85361de7dd 100644 --- a/sakura_core/_main/CProcess.cpp +++ b/sakura_core/_main/CProcess.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, aroka 新規作成 Copyright (C) 2004, Moca Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CProcess.h b/sakura_core/_main/CProcess.h index 08978b8a73..9db1943f43 100644 --- a/sakura_core/_main/CProcess.h +++ b/sakura_core/_main/CProcess.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, aroka 新規作成 Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CProcessFactory.cpp b/sakura_core/_main/CProcessFactory.cpp index d960e707be..6df4f4aa10 100644 --- a/sakura_core/_main/CProcessFactory.cpp +++ b/sakura_core/_main/CProcessFactory.cpp @@ -10,7 +10,7 @@ Copyright (C) 2001, masami shoji Copyright (C) 2002, aroka WinMainより分離 Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/CProcessFactory.h b/sakura_core/_main/CProcessFactory.h index 75457dafb7..5274eb7e49 100644 --- a/sakura_core/_main/CProcessFactory.h +++ b/sakura_core/_main/CProcessFactory.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, aroka 新規作成 Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/WinMain.cpp b/sakura_core/_main/WinMain.cpp index 3754caf413..30de519da6 100644 --- a/sakura_core/_main/WinMain.cpp +++ b/sakura_core/_main/WinMain.cpp @@ -14,7 +14,7 @@ Copyright (C) 2002, aroka Copyright (C) 2007, kobake Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/global.cpp b/sakura_core/_main/global.cpp index fbc095f8ee..9d72f72e4f 100644 --- a/sakura_core/_main/global.cpp +++ b/sakura_core/_main/global.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, KK Copyright (C) 2003, MIK Copyright (C) 2005, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_main/global.h b/sakura_core/_main/global.h index cb4681d716..7d04421fe9 100644 --- a/sakura_core/_main/global.h +++ b/sakura_core/_main/global.h @@ -13,7 +13,7 @@ Copyright (C) 2005, MIK, Moca, genta Copyright (C) 2006, aroka, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index 4f98e23e2c..8a3bea8f27 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index 33b74bb21b..7dfa2f7c0a 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/_os/CDropTarget.cpp b/sakura_core/_os/CDropTarget.cpp index 68acb8a70a..63700910c1 100644 --- a/sakura_core/_os/CDropTarget.cpp +++ b/sakura_core/_os/CDropTarget.cpp @@ -8,7 +8,7 @@ Copyright (C) 2002, aroka Copyright (C) 2008, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/_os/CDropTarget.h b/sakura_core/_os/CDropTarget.h index 4531f3feef..f2cdfa4779 100644 --- a/sakura_core/_os/CDropTarget.h +++ b/sakura_core/_os/CDropTarget.h @@ -8,7 +8,7 @@ Copyright (C) 2002, aroka Copyright (C) 2008, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/_os/OleTypes.h b/sakura_core/_os/OleTypes.h index 9d7eb378a2..052609771d 100644 --- a/sakura_core/_os/OleTypes.h +++ b/sakura_core/_os/OleTypes.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2003, 鬼, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/apiwrap/CommonControl.h b/sakura_core/apiwrap/CommonControl.h index 2aa4e408bb..f5ef8ea409 100644 --- a/sakura_core/apiwrap/CommonControl.h +++ b/sakura_core/apiwrap/CommonControl.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/apiwrap/StdApi.cpp b/sakura_core/apiwrap/StdApi.cpp index 3f192c4182..79cf18ba09 100644 --- a/sakura_core/apiwrap/StdApi.cpp +++ b/sakura_core/apiwrap/StdApi.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/apiwrap/StdApi.h b/sakura_core/apiwrap/StdApi.h index 45a7451c06..0731af8445 100644 --- a/sakura_core/apiwrap/StdApi.h +++ b/sakura_core/apiwrap/StdApi.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/apiwrap/StdControl.cpp b/sakura_core/apiwrap/StdControl.cpp index e9a824351c..9dab6a89cb 100644 --- a/sakura_core/apiwrap/StdControl.cpp +++ b/sakura_core/apiwrap/StdControl.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/apiwrap/StdControl.h b/sakura_core/apiwrap/StdControl.h index 73a42aef77..0ac3786f46 100644 --- a/sakura_core/apiwrap/StdControl.h +++ b/sakura_core/apiwrap/StdControl.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CErrorInfo.cpp b/sakura_core/basis/CErrorInfo.cpp index 070723dab2..7a9b3fddc6 100644 --- a/sakura_core/basis/CErrorInfo.cpp +++ b/sakura_core/basis/CErrorInfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CErrorInfo.h b/sakura_core/basis/CErrorInfo.h index 00142f6a65..d82a1b4d8f 100644 --- a/sakura_core/basis/CErrorInfo.h +++ b/sakura_core/basis/CErrorInfo.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CLaxInteger.cpp b/sakura_core/basis/CLaxInteger.cpp index 6f1dc8e6cb..ae50a3b6d8 100644 --- a/sakura_core/basis/CLaxInteger.cpp +++ b/sakura_core/basis/CLaxInteger.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CLaxInteger.h b/sakura_core/basis/CLaxInteger.h index 811e4432e5..a021d1ba7f 100644 --- a/sakura_core/basis/CLaxInteger.h +++ b/sakura_core/basis/CLaxInteger.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyPoint.cpp b/sakura_core/basis/CMyPoint.cpp index 92e590d697..a97db10975 100644 --- a/sakura_core/basis/CMyPoint.cpp +++ b/sakura_core/basis/CMyPoint.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyPoint.h b/sakura_core/basis/CMyPoint.h index 05abf9f70b..e9a803b858 100644 --- a/sakura_core/basis/CMyPoint.h +++ b/sakura_core/basis/CMyPoint.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyRect.cpp b/sakura_core/basis/CMyRect.cpp index bbb5c6cb67..176806ff9e 100644 --- a/sakura_core/basis/CMyRect.cpp +++ b/sakura_core/basis/CMyRect.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyRect.h b/sakura_core/basis/CMyRect.h index 99e1240350..8c399fc416 100644 --- a/sakura_core/basis/CMyRect.h +++ b/sakura_core/basis/CMyRect.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMySize.cpp b/sakura_core/basis/CMySize.cpp index e4aa0ce6ab..32ab9464ec 100644 --- a/sakura_core/basis/CMySize.cpp +++ b/sakura_core/basis/CMySize.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMySize.h b/sakura_core/basis/CMySize.h index 9670a3815e..3f73ecadf4 100644 --- a/sakura_core/basis/CMySize.h +++ b/sakura_core/basis/CMySize.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyString.cpp b/sakura_core/basis/CMyString.cpp index 4198acef39..5ff6436702 100644 --- a/sakura_core/basis/CMyString.cpp +++ b/sakura_core/basis/CMyString.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CMyString.h b/sakura_core/basis/CMyString.h index 0316bb38fb..3819dc05e4 100644 --- a/sakura_core/basis/CMyString.h +++ b/sakura_core/basis/CMyString.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictInteger.cpp b/sakura_core/basis/CStrictInteger.cpp index 9be77c04ef..2659800d9d 100644 --- a/sakura_core/basis/CStrictInteger.cpp +++ b/sakura_core/basis/CStrictInteger.cpp @@ -2,7 +2,7 @@ /* Copyright (C) 2007, kobake Copyright (C) 2007-2017 SAKURA Editor Project - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictInteger.h b/sakura_core/basis/CStrictInteger.h index b4c190311c..e6d6d91df8 100644 --- a/sakura_core/basis/CStrictInteger.h +++ b/sakura_core/basis/CStrictInteger.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictPoint.cpp b/sakura_core/basis/CStrictPoint.cpp index c1ef0e8d22..7605889ac6 100644 --- a/sakura_core/basis/CStrictPoint.cpp +++ b/sakura_core/basis/CStrictPoint.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictPoint.h b/sakura_core/basis/CStrictPoint.h index e454d33042..c2a11e9299 100644 --- a/sakura_core/basis/CStrictPoint.h +++ b/sakura_core/basis/CStrictPoint.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictRange.cpp b/sakura_core/basis/CStrictRange.cpp index 3cf4d42964..a7ef508719 100644 --- a/sakura_core/basis/CStrictRange.cpp +++ b/sakura_core/basis/CStrictRange.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictRange.h b/sakura_core/basis/CStrictRange.h index 3d2760ba8b..7093c989e9 100644 --- a/sakura_core/basis/CStrictRange.h +++ b/sakura_core/basis/CStrictRange.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictRect.cpp b/sakura_core/basis/CStrictRect.cpp index 6eaa67cb78..518e62ca57 100644 --- a/sakura_core/basis/CStrictRect.cpp +++ b/sakura_core/basis/CStrictRect.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/CStrictRect.h b/sakura_core/basis/CStrictRect.h index 3b3a18d205..6a6c105d47 100644 --- a/sakura_core/basis/CStrictRect.h +++ b/sakura_core/basis/CStrictRect.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/SakuraBasis.cpp b/sakura_core/basis/SakuraBasis.cpp index 629126cb35..19621295af 100644 --- a/sakura_core/basis/SakuraBasis.cpp +++ b/sakura_core/basis/SakuraBasis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/SakuraBasis.h b/sakura_core/basis/SakuraBasis.h index 4f895c35e8..5ac7aff7fd 100644 --- a/sakura_core/basis/SakuraBasis.h +++ b/sakura_core/basis/SakuraBasis.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/TComImpl.hpp b/sakura_core/basis/TComImpl.hpp index 82cfbd04c7..207e0a2e22 100644 --- a/sakura_core/basis/TComImpl.hpp +++ b/sakura_core/basis/TComImpl.hpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/_com_raise_error.cpp b/sakura_core/basis/_com_raise_error.cpp index f8cc6af90a..b0f281a852 100644 --- a/sakura_core/basis/_com_raise_error.cpp +++ b/sakura_core/basis/_com_raise_error.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/basis/primitive.h b/sakura_core/basis/primitive.h index 567c852dac..67278dbc1c 100644 --- a/sakura_core/basis/primitive.h +++ b/sakura_core/basis/primitive.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCesu8.cpp b/sakura_core/charset/CCesu8.cpp index c6e40323cd..7583390553 100644 --- a/sakura_core/charset/CCesu8.cpp +++ b/sakura_core/charset/CCesu8.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCesu8.h b/sakura_core/charset/CCesu8.h index 1f1c09d07f..310fbecff5 100644 --- a/sakura_core/charset/CCesu8.h +++ b/sakura_core/charset/CCesu8.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeBase.cpp b/sakura_core/charset/CCodeBase.cpp index 43219c5ff2..fe5dd91086 100644 --- a/sakura_core/charset/CCodeBase.cpp +++ b/sakura_core/charset/CCodeBase.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeBase.h b/sakura_core/charset/CCodeBase.h index 800d29322b..4c818325a2 100644 --- a/sakura_core/charset/CCodeBase.h +++ b/sakura_core/charset/CCodeBase.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeFactory.cpp b/sakura_core/charset/CCodeFactory.cpp index 584662d157..ac6be7984f 100644 --- a/sakura_core/charset/CCodeFactory.cpp +++ b/sakura_core/charset/CCodeFactory.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeFactory.h b/sakura_core/charset/CCodeFactory.h index 9704f638b5..02960b1a74 100644 --- a/sakura_core/charset/CCodeFactory.h +++ b/sakura_core/charset/CCodeFactory.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeMediator.cpp b/sakura_core/charset/CCodeMediator.cpp index e5ee7ca234..8c672d3a4e 100644 --- a/sakura_core/charset/CCodeMediator.cpp +++ b/sakura_core/charset/CCodeMediator.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodeMediator.h b/sakura_core/charset/CCodeMediator.h index 0eacc06382..246ed39cad 100644 --- a/sakura_core/charset/CCodeMediator.h +++ b/sakura_core/charset/CCodeMediator.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodePage.cpp b/sakura_core/charset/CCodePage.cpp index d77bf6047e..6e836564d2 100644 --- a/sakura_core/charset/CCodePage.cpp +++ b/sakura_core/charset/CCodePage.cpp @@ -5,7 +5,7 @@ */ /* Copyright (C) 2010-2012 Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CCodePage.h b/sakura_core/charset/CCodePage.h index db1174d83c..6b0f3ba56e 100644 --- a/sakura_core/charset/CCodePage.h +++ b/sakura_core/charset/CCodePage.h @@ -5,7 +5,7 @@ */ /* Copyright (C) 2010-2012 Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CESI.cpp b/sakura_core/charset/CESI.cpp index 1b2ff3c458..5a3e7f3c9a 100644 --- a/sakura_core/charset/CESI.cpp +++ b/sakura_core/charset/CESI.cpp @@ -8,7 +8,7 @@ /* Copyright (C) 2006 Copyright (C) 2007 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CESI.h b/sakura_core/charset/CESI.h index 76279506d1..35f08fa862 100644 --- a/sakura_core/charset/CESI.h +++ b/sakura_core/charset/CESI.h @@ -9,7 +9,7 @@ /* Copyright (C) 2006 Copyright (C) 2007 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CEuc.cpp b/sakura_core/charset/CEuc.cpp index 2f91e3554d..7b17067500 100644 --- a/sakura_core/charset/CEuc.cpp +++ b/sakura_core/charset/CEuc.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CEuc.h b/sakura_core/charset/CEuc.h index 2d19f27f49..8b60a470b1 100644 --- a/sakura_core/charset/CEuc.h +++ b/sakura_core/charset/CEuc.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CJis.cpp b/sakura_core/charset/CJis.cpp index 1f887166f8..3f54e58404 100644 --- a/sakura_core/charset/CJis.cpp +++ b/sakura_core/charset/CJis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CJis.h b/sakura_core/charset/CJis.h index b529a07bb4..7414669219 100644 --- a/sakura_core/charset/CJis.h +++ b/sakura_core/charset/CJis.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CLatin1.cpp b/sakura_core/charset/CLatin1.cpp index b1358e393e..16baea13d8 100644 --- a/sakura_core/charset/CLatin1.cpp +++ b/sakura_core/charset/CLatin1.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 20010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CLatin1.h b/sakura_core/charset/CLatin1.h index 343ad20b05..9559172bc6 100644 --- a/sakura_core/charset/CLatin1.h +++ b/sakura_core/charset/CLatin1.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 20010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CShiftJis.cpp b/sakura_core/charset/CShiftJis.cpp index f746da8271..273198cbd5 100644 --- a/sakura_core/charset/CShiftJis.cpp +++ b/sakura_core/charset/CShiftJis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CShiftJis.h b/sakura_core/charset/CShiftJis.h index c8ef03f178..b16e6d43c7 100644 --- a/sakura_core/charset/CShiftJis.h +++ b/sakura_core/charset/CShiftJis.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUnicode.cpp b/sakura_core/charset/CUnicode.cpp index 6fdb1b9461..d7572d2fd0 100644 --- a/sakura_core/charset/CUnicode.cpp +++ b/sakura_core/charset/CUnicode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUnicode.h b/sakura_core/charset/CUnicode.h index 8fc687f5c6..65ab42d4dd 100644 --- a/sakura_core/charset/CUnicode.h +++ b/sakura_core/charset/CUnicode.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUnicodeBe.cpp b/sakura_core/charset/CUnicodeBe.cpp index 11008776dc..5aa750dbc6 100644 --- a/sakura_core/charset/CUnicodeBe.cpp +++ b/sakura_core/charset/CUnicodeBe.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUnicodeBe.h b/sakura_core/charset/CUnicodeBe.h index c3c95791aa..375c4d4c03 100644 --- a/sakura_core/charset/CUnicodeBe.h +++ b/sakura_core/charset/CUnicodeBe.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUtf7.cpp b/sakura_core/charset/CUtf7.cpp index e1fffff3f5..5bbb5262b6 100644 --- a/sakura_core/charset/CUtf7.cpp +++ b/sakura_core/charset/CUtf7.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUtf7.h b/sakura_core/charset/CUtf7.h index fab6836a6a..b4708f7f95 100644 --- a/sakura_core/charset/CUtf7.h +++ b/sakura_core/charset/CUtf7.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUtf8.cpp b/sakura_core/charset/CUtf8.cpp index d8bae8203e..d1c85fa144 100644 --- a/sakura_core/charset/CUtf8.cpp +++ b/sakura_core/charset/CUtf8.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CUtf8.h b/sakura_core/charset/CUtf8.h index 3b449ab33c..4980d1e42a 100644 --- a/sakura_core/charset/CUtf8.h +++ b/sakura_core/charset/CUtf8.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CharsetDetector.cpp b/sakura_core/charset/CharsetDetector.cpp index ff6fb197a4..88cc61de8b 100644 --- a/sakura_core/charset/CharsetDetector.cpp +++ b/sakura_core/charset/CharsetDetector.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/CharsetDetector.h b/sakura_core/charset/CharsetDetector.h index 4e8171a162..5ab3982fba 100644 --- a/sakura_core/charset/CharsetDetector.h +++ b/sakura_core/charset/CharsetDetector.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/charcode.cpp b/sakura_core/charset/charcode.cpp index 52597affd5..17a54d15e7 100644 --- a/sakura_core/charset/charcode.cpp +++ b/sakura_core/charset/charcode.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/charcode.h b/sakura_core/charset/charcode.h index 91203a518d..766975eb7a 100644 --- a/sakura_core/charset/charcode.h +++ b/sakura_core/charset/charcode.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/charset.cpp b/sakura_core/charset/charset.cpp index 6f08eb18d9..69b65ad9ce 100644 --- a/sakura_core/charset/charset.cpp +++ b/sakura_core/charset/charset.cpp @@ -12,7 +12,7 @@ Copyright (C) 2010, Uchi Copyright (C) 2012, novice Copyright (C) 2013, Moca, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/charset.h b/sakura_core/charset/charset.h index 89f4abe225..4b528fcdec 100644 --- a/sakura_core/charset/charset.h +++ b/sakura_core/charset/charset.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/codechecker.cpp b/sakura_core/charset/codechecker.cpp index 12de27eef6..49709f0c5d 100644 --- a/sakura_core/charset/codechecker.cpp +++ b/sakura_core/charset/codechecker.cpp @@ -9,7 +9,7 @@ /* Copyright (C) 2006, D. S. Koba, genta Copyright (C) 2007 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/codechecker.h b/sakura_core/charset/codechecker.h index 38933c9893..c0d7fe0d2e 100644 --- a/sakura_core/charset/codechecker.h +++ b/sakura_core/charset/codechecker.h @@ -10,7 +10,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2006, D. S. Koba, genta Copyright (C) 2007 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/codeutil.cpp b/sakura_core/charset/codeutil.cpp index 8c88dbd9a5..0a818ab480 100644 --- a/sakura_core/charset/codeutil.cpp +++ b/sakura_core/charset/codeutil.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/charset/codeutil.h b/sakura_core/charset/codeutil.h index f5b5ee6dd0..784a0e938a 100644 --- a/sakura_core/charset/codeutil.h +++ b/sakura_core/charset/codeutil.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index bbab8606f5..168a6493cf 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -19,7 +19,7 @@ Copyright (C) 2010, ryoji Copyright (C) 2011, ryoji, nasukoji Copyright (C) 2012, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index 17285f36e7..3d159d8c5e 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/cmd/CViewCommander_Bookmark.cpp b/sakura_core/cmd/CViewCommander_Bookmark.cpp index 0afb828f85..0775619a6c 100644 --- a/sakura_core/cmd/CViewCommander_Bookmark.cpp +++ b/sakura_core/cmd/CViewCommander_Bookmark.cpp @@ -8,7 +8,7 @@ Copyright (C) 2000-2001, genta Copyright (C) 2002, hor, YAZAKI, MIK Copyright (C) 2006, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 9cb591ae9b..207dc4c04b 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -12,7 +12,7 @@ Copyright (C) 2005, genta Copyright (C) 2007, ryoji Copyright (C) 2010, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Convert.cpp b/sakura_core/cmd/CViewCommander_Convert.cpp index ca4a801d01..1ab532cd65 100644 --- a/sakura_core/cmd/CViewCommander_Convert.cpp +++ b/sakura_core/cmd/CViewCommander_Convert.cpp @@ -8,7 +8,7 @@ Copyright (C) 2000-2001, jepro Copyright (C) 2001, Stonee, Misaka Copyright (C) 2002, ai - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Cursor.cpp b/sakura_core/cmd/CViewCommander_Cursor.cpp index 1f574021d1..bac9b0dd39 100644 --- a/sakura_core/cmd/CViewCommander_Cursor.cpp +++ b/sakura_core/cmd/CViewCommander_Cursor.cpp @@ -13,7 +13,7 @@ Copyright (C) 2006, genta Copyright (C) 2007, kobake, maru Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_CustMenu.cpp b/sakura_core/cmd/CViewCommander_CustMenu.cpp index 19f4360689..ac9baf8254 100644 --- a/sakura_core/cmd/CViewCommander_CustMenu.cpp +++ b/sakura_core/cmd/CViewCommander_CustMenu.cpp @@ -11,7 +11,7 @@ Copyright (C) 2007, ryoji, maru, Uchi Copyright (C) 2008, ryoji, nasukoji Copyright (C) 2009, ryoji, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Diff.cpp b/sakura_core/cmd/CViewCommander_Diff.cpp index 089dd17261..e9acc816e9 100644 --- a/sakura_core/cmd/CViewCommander_Diff.cpp +++ b/sakura_core/cmd/CViewCommander_Diff.cpp @@ -13,7 +13,7 @@ Copyright (C) 2007, kobake Copyright (C) 2008, kobake Copyright (C) 2008, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Edit.cpp b/sakura_core/cmd/CViewCommander_Edit.cpp index 6af3767297..20a9c70cfb 100644 --- a/sakura_core/cmd/CViewCommander_Edit.cpp +++ b/sakura_core/cmd/CViewCommander_Edit.cpp @@ -12,7 +12,7 @@ Copyright (C) 2008, ryoji, nasukoji Copyright (C) 2009, ryoji Copyright (C) 2010, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Edit_advanced.cpp b/sakura_core/cmd/CViewCommander_Edit_advanced.cpp index 56743ea76e..2dd782bbeb 100644 --- a/sakura_core/cmd/CViewCommander_Edit_advanced.cpp +++ b/sakura_core/cmd/CViewCommander_Edit_advanced.cpp @@ -18,7 +18,7 @@ Copyright (C) 2010, ryoji Copyright (C) 2011, ryoji Copyright (C) 2012, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Edit_word_line.cpp b/sakura_core/cmd/CViewCommander_Edit_word_line.cpp index eae40ad3bc..390e8cfcd5 100644 --- a/sakura_core/cmd/CViewCommander_Edit_word_line.cpp +++ b/sakura_core/cmd/CViewCommander_Edit_word_line.cpp @@ -8,7 +8,7 @@ Copyright (C) 2003, かろと Copyright (C) 2005, Moca Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_File.cpp b/sakura_core/cmd/CViewCommander_File.cpp index 80e37a6273..e660169fb0 100644 --- a/sakura_core/cmd/CViewCommander_File.cpp +++ b/sakura_core/cmd/CViewCommander_File.cpp @@ -12,7 +12,7 @@ Copyright (C) 2005, genta Copyright (C) 2006, ryoji, maru Copyright (C) 2007, ryoji, maru, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/cmd/CViewCommander_Grep.cpp b/sakura_core/cmd/CViewCommander_Grep.cpp index cbf661bae8..4c8bf0a871 100644 --- a/sakura_core/cmd/CViewCommander_Grep.cpp +++ b/sakura_core/cmd/CViewCommander_Grep.cpp @@ -7,7 +7,7 @@ Copyright (C) 2003, MIK Copyright (C) 2005, genta Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Insert.cpp b/sakura_core/cmd/CViewCommander_Insert.cpp index 12924ff613..c8b0f0285f 100644 --- a/sakura_core/cmd/CViewCommander_Insert.cpp +++ b/sakura_core/cmd/CViewCommander_Insert.cpp @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Macro.cpp b/sakura_core/cmd/CViewCommander_Macro.cpp index 4f33e373bf..71fec1a930 100644 --- a/sakura_core/cmd/CViewCommander_Macro.cpp +++ b/sakura_core/cmd/CViewCommander_Macro.cpp @@ -13,7 +13,7 @@ Copyright (C) 2006, maru Copyright (C) 2007, ryoji, genta Copyright (C) 2008, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_ModeChange.cpp b/sakura_core/cmd/CViewCommander_ModeChange.cpp index 58fb926399..b5ff649765 100644 --- a/sakura_core/cmd/CViewCommander_ModeChange.cpp +++ b/sakura_core/cmd/CViewCommander_ModeChange.cpp @@ -8,7 +8,7 @@ Copyright (C) 2003, Moca Copyright (C) 2005, genta Copyright (C) 2007, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/cmd/CViewCommander_Outline.cpp b/sakura_core/cmd/CViewCommander_Outline.cpp index a719c9435a..feb44fb99e 100644 --- a/sakura_core/cmd/CViewCommander_Outline.cpp +++ b/sakura_core/cmd/CViewCommander_Outline.cpp @@ -13,7 +13,7 @@ Copyright (C) 2007, genta, kobake Copyright (C) 2009, genta Copyright (C) 2011, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Search.cpp b/sakura_core/cmd/CViewCommander_Search.cpp index 748e3de553..7a204fa102 100644 --- a/sakura_core/cmd/CViewCommander_Search.cpp +++ b/sakura_core/cmd/CViewCommander_Search.cpp @@ -16,7 +16,7 @@ Copyright (C) 2009, ryoji, genta Copyright (C) 2010, ryoji Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Select.cpp b/sakura_core/cmd/CViewCommander_Select.cpp index ba2420aba2..07c69480e1 100644 --- a/sakura_core/cmd/CViewCommander_Select.cpp +++ b/sakura_core/cmd/CViewCommander_Select.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, YAZAKI Copyright (C) 2005, Moca Copyright (C) 2007, kobake, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Settings.cpp b/sakura_core/cmd/CViewCommander_Settings.cpp index 5362eaeca6..24516881f0 100644 --- a/sakura_core/cmd/CViewCommander_Settings.cpp +++ b/sakura_core/cmd/CViewCommander_Settings.cpp @@ -13,7 +13,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2008, ryoji, nasukoji Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Support.cpp b/sakura_core/cmd/CViewCommander_Support.cpp index a93298df6c..97356ce8e8 100644 --- a/sakura_core/cmd/CViewCommander_Support.cpp +++ b/sakura_core/cmd/CViewCommander_Support.cpp @@ -14,7 +14,7 @@ Copyright (C) 2007, kobake, ryoji Copyright (C) 2011, Moca Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_TagJump.cpp b/sakura_core/cmd/CViewCommander_TagJump.cpp index 5a55ca59ed..92bea00b2f 100644 --- a/sakura_core/cmd/CViewCommander_TagJump.cpp +++ b/sakura_core/cmd/CViewCommander_TagJump.cpp @@ -15,7 +15,7 @@ Copyright (C) 2007, ryoji, maru, Uchi Copyright (C) 2008, MIK Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_Window.cpp b/sakura_core/cmd/CViewCommander_Window.cpp index baab9b67bc..9cd130fc97 100644 --- a/sakura_core/cmd/CViewCommander_Window.cpp +++ b/sakura_core/cmd/CViewCommander_Window.cpp @@ -15,7 +15,7 @@ Copyright (C) 2008, syat Copyright (C) 2009, syat Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/cmd/CViewCommander_inline.h b/sakura_core/cmd/CViewCommander_inline.h index 610f67d188..cb7d779c5b 100644 --- a/sakura_core/cmd/CViewCommander_inline.h +++ b/sakura_core/cmd/CViewCommander_inline.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2013, novice - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/config/app_constants.h b/sakura_core/config/app_constants.h index 9916227ee0..91157b5a84 100644 --- a/sakura_core/config/app_constants.h +++ b/sakura_core/config/app_constants.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/config/build_config.cpp b/sakura_core/config/build_config.cpp index 9f9f71652d..37014a71d5 100644 --- a/sakura_core/config/build_config.cpp +++ b/sakura_core/config/build_config.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/config/build_config.h b/sakura_core/config/build_config.h index 6cff0c7648..770b4d335b 100644 --- a/sakura_core/config/build_config.h +++ b/sakura_core/config/build_config.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/config/maxdata.h b/sakura_core/config/maxdata.h index dc7cc9ac63..c6baa7298b 100644 --- a/sakura_core/config/maxdata.h +++ b/sakura_core/config/maxdata.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/config/system_constants.h b/sakura_core/config/system_constants.h index d2ef125a58..2e9ed365ab 100644 --- a/sakura_core/config/system_constants.h +++ b/sakura_core/config/system_constants.h @@ -11,7 +11,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert.cpp b/sakura_core/convert/CConvert.cpp index 19563d3e0b..6e77f4e3f1 100644 --- a/sakura_core/convert/CConvert.cpp +++ b/sakura_core/convert/CConvert.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert.h b/sakura_core/convert/CConvert.h index 9895924172..d2d3d5fae4 100644 --- a/sakura_core/convert/CConvert.h +++ b/sakura_core/convert/CConvert.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeAutoToSjis.cpp b/sakura_core/convert/CConvert_CodeAutoToSjis.cpp index d524091181..17131941ec 100644 --- a/sakura_core/convert/CConvert_CodeAutoToSjis.cpp +++ b/sakura_core/convert/CConvert_CodeAutoToSjis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeAutoToSjis.h b/sakura_core/convert/CConvert_CodeAutoToSjis.h index 48fc30a03f..c0dd250068 100644 --- a/sakura_core/convert/CConvert_CodeAutoToSjis.h +++ b/sakura_core/convert/CConvert_CodeAutoToSjis.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeFromSjis.cpp b/sakura_core/convert/CConvert_CodeFromSjis.cpp index 6e2eae2d10..400194dd3f 100644 --- a/sakura_core/convert/CConvert_CodeFromSjis.cpp +++ b/sakura_core/convert/CConvert_CodeFromSjis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeFromSjis.h b/sakura_core/convert/CConvert_CodeFromSjis.h index 6949066d7c..c52372c4bf 100644 --- a/sakura_core/convert/CConvert_CodeFromSjis.h +++ b/sakura_core/convert/CConvert_CodeFromSjis.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeToSjis.cpp b/sakura_core/convert/CConvert_CodeToSjis.cpp index f79e5b8f70..e33b24a26d 100644 --- a/sakura_core/convert/CConvert_CodeToSjis.cpp +++ b/sakura_core/convert/CConvert_CodeToSjis.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_CodeToSjis.h b/sakura_core/convert/CConvert_CodeToSjis.h index affdcffa06..86b23e0372 100644 --- a/sakura_core/convert/CConvert_CodeToSjis.h +++ b/sakura_core/convert/CConvert_CodeToSjis.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HaneisuToZeneisu.cpp b/sakura_core/convert/CConvert_HaneisuToZeneisu.cpp index a69fe1b9bf..42f4716af9 100644 --- a/sakura_core/convert/CConvert_HaneisuToZeneisu.cpp +++ b/sakura_core/convert/CConvert_HaneisuToZeneisu.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HaneisuToZeneisu.h b/sakura_core/convert/CConvert_HaneisuToZeneisu.h index a3331a77c8..ac9356eada 100644 --- a/sakura_core/convert/CConvert_HaneisuToZeneisu.h +++ b/sakura_core/convert/CConvert_HaneisuToZeneisu.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HankataToZenhira.cpp b/sakura_core/convert/CConvert_HankataToZenhira.cpp index 729860c64e..78312f8dbe 100644 --- a/sakura_core/convert/CConvert_HankataToZenhira.cpp +++ b/sakura_core/convert/CConvert_HankataToZenhira.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HankataToZenhira.h b/sakura_core/convert/CConvert_HankataToZenhira.h index 7e3804459d..bcaeac7ddc 100644 --- a/sakura_core/convert/CConvert_HankataToZenhira.h +++ b/sakura_core/convert/CConvert_HankataToZenhira.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HankataToZenkata.cpp b/sakura_core/convert/CConvert_HankataToZenkata.cpp index e542e52550..10b33f62d6 100644 --- a/sakura_core/convert/CConvert_HankataToZenkata.cpp +++ b/sakura_core/convert/CConvert_HankataToZenkata.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_HankataToZenkata.h b/sakura_core/convert/CConvert_HankataToZenkata.h index d49c3f1b80..57502f4207 100644 --- a/sakura_core/convert/CConvert_HankataToZenkata.h +++ b/sakura_core/convert/CConvert_HankataToZenkata.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_SpaceToTab.cpp b/sakura_core/convert/CConvert_SpaceToTab.cpp index fb8b6f6345..05a3ecbe53 100644 --- a/sakura_core/convert/CConvert_SpaceToTab.cpp +++ b/sakura_core/convert/CConvert_SpaceToTab.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_SpaceToTab.h b/sakura_core/convert/CConvert_SpaceToTab.h index 20e083bdd5..ae92e34336 100644 --- a/sakura_core/convert/CConvert_SpaceToTab.h +++ b/sakura_core/convert/CConvert_SpaceToTab.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_TabToSpace.cpp b/sakura_core/convert/CConvert_TabToSpace.cpp index dc17779d31..d3693f28b7 100644 --- a/sakura_core/convert/CConvert_TabToSpace.cpp +++ b/sakura_core/convert/CConvert_TabToSpace.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_TabToSpace.h b/sakura_core/convert/CConvert_TabToSpace.h index d53cc29576..aace349282 100644 --- a/sakura_core/convert/CConvert_TabToSpace.h +++ b/sakura_core/convert/CConvert_TabToSpace.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToHankaku.cpp b/sakura_core/convert/CConvert_ToHankaku.cpp index 0a9ce2f6b3..9427c4487a 100644 --- a/sakura_core/convert/CConvert_ToHankaku.cpp +++ b/sakura_core/convert/CConvert_ToHankaku.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToHankaku.h b/sakura_core/convert/CConvert_ToHankaku.h index 97c5f7f806..05d7cc1924 100644 --- a/sakura_core/convert/CConvert_ToHankaku.h +++ b/sakura_core/convert/CConvert_ToHankaku.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToLower.cpp b/sakura_core/convert/CConvert_ToLower.cpp index 6a47170c18..747b4d2a09 100644 --- a/sakura_core/convert/CConvert_ToLower.cpp +++ b/sakura_core/convert/CConvert_ToLower.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToLower.h b/sakura_core/convert/CConvert_ToLower.h index fcf30b1f55..d930d9cc87 100644 --- a/sakura_core/convert/CConvert_ToLower.h +++ b/sakura_core/convert/CConvert_ToLower.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToUpper.cpp b/sakura_core/convert/CConvert_ToUpper.cpp index 240ec1f72d..a939a7cfc5 100644 --- a/sakura_core/convert/CConvert_ToUpper.cpp +++ b/sakura_core/convert/CConvert_ToUpper.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToUpper.h b/sakura_core/convert/CConvert_ToUpper.h index dc9ad7ec59..52c5beda2c 100644 --- a/sakura_core/convert/CConvert_ToUpper.h +++ b/sakura_core/convert/CConvert_ToUpper.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToZenhira.cpp b/sakura_core/convert/CConvert_ToZenhira.cpp index e76856e2d7..db5b768ba3 100644 --- a/sakura_core/convert/CConvert_ToZenhira.cpp +++ b/sakura_core/convert/CConvert_ToZenhira.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToZenhira.h b/sakura_core/convert/CConvert_ToZenhira.h index 6542ae699c..0f0a4d5b4c 100644 --- a/sakura_core/convert/CConvert_ToZenhira.h +++ b/sakura_core/convert/CConvert_ToZenhira.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToZenkata.cpp b/sakura_core/convert/CConvert_ToZenkata.cpp index 59c2964d0e..2e40854b5a 100644 --- a/sakura_core/convert/CConvert_ToZenkata.cpp +++ b/sakura_core/convert/CConvert_ToZenkata.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ToZenkata.h b/sakura_core/convert/CConvert_ToZenkata.h index d761e48481..91147a0b86 100644 --- a/sakura_core/convert/CConvert_ToZenkata.h +++ b/sakura_core/convert/CConvert_ToZenkata.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_Trim.cpp b/sakura_core/convert/CConvert_Trim.cpp index 6526c4e949..c6e203fc60 100644 --- a/sakura_core/convert/CConvert_Trim.cpp +++ b/sakura_core/convert/CConvert_Trim.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_Trim.h b/sakura_core/convert/CConvert_Trim.h index 7c70aaea2d..2e35f77964 100644 --- a/sakura_core/convert/CConvert_Trim.h +++ b/sakura_core/convert/CConvert_Trim.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ZeneisuToHaneisu.cpp b/sakura_core/convert/CConvert_ZeneisuToHaneisu.cpp index 4c9446acdd..42100d39df 100644 --- a/sakura_core/convert/CConvert_ZeneisuToHaneisu.cpp +++ b/sakura_core/convert/CConvert_ZeneisuToHaneisu.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ZeneisuToHaneisu.h b/sakura_core/convert/CConvert_ZeneisuToHaneisu.h index 5c7e7f887f..2ce25ba5e3 100644 --- a/sakura_core/convert/CConvert_ZeneisuToHaneisu.h +++ b/sakura_core/convert/CConvert_ZeneisuToHaneisu.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ZenkataToHankata.cpp b/sakura_core/convert/CConvert_ZenkataToHankata.cpp index d186f8cee0..51a9dd536d 100644 --- a/sakura_core/convert/CConvert_ZenkataToHankata.cpp +++ b/sakura_core/convert/CConvert_ZenkataToHankata.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CConvert_ZenkataToHankata.h b/sakura_core/convert/CConvert_ZenkataToHankata.h index 25726640bb..c9dc247c8c 100644 --- a/sakura_core/convert/CConvert_ZenkataToHankata.h +++ b/sakura_core/convert/CConvert_ZenkataToHankata.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CDecode.h b/sakura_core/convert/CDecode.h index 38f8ea3fb6..845ece13e8 100644 --- a/sakura_core/convert/CDecode.h +++ b/sakura_core/convert/CDecode.h @@ -4,7 +4,7 @@ @author */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CDecode_Base64Decode.cpp b/sakura_core/convert/CDecode_Base64Decode.cpp index 7d64d99c89..85fab95d04 100644 --- a/sakura_core/convert/CDecode_Base64Decode.cpp +++ b/sakura_core/convert/CDecode_Base64Decode.cpp @@ -5,7 +5,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CDecode_Base64Decode.h b/sakura_core/convert/CDecode_Base64Decode.h index 8998aa4a28..658c19442d 100644 --- a/sakura_core/convert/CDecode_Base64Decode.h +++ b/sakura_core/convert/CDecode_Base64Decode.h @@ -5,7 +5,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CDecode_UuDecode.cpp b/sakura_core/convert/CDecode_UuDecode.cpp index c4b902f5a7..6651a86e2a 100644 --- a/sakura_core/convert/CDecode_UuDecode.cpp +++ b/sakura_core/convert/CDecode_UuDecode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/CDecode_UuDecode.h b/sakura_core/convert/CDecode_UuDecode.h index 96329aa30e..e13df7ff07 100644 --- a/sakura_core/convert/CDecode_UuDecode.h +++ b/sakura_core/convert/CDecode_UuDecode.h @@ -5,7 +5,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/convert_util.cpp b/sakura_core/convert/convert_util.cpp index fb070b71e9..7f9b5f1eac 100644 --- a/sakura_core/convert/convert_util.cpp +++ b/sakura_core/convert/convert_util.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/convert_util.h b/sakura_core/convert/convert_util.h index fd766c5cf3..d590ed9dd8 100644 --- a/sakura_core/convert/convert_util.h +++ b/sakura_core/convert/convert_util.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/convert_util2.cpp b/sakura_core/convert/convert_util2.cpp index 0808728062..9253ab3688 100644 --- a/sakura_core/convert/convert_util2.cpp +++ b/sakura_core/convert/convert_util2.cpp @@ -5,7 +5,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/convert/convert_util2.h b/sakura_core/convert/convert_util2.h index 6cb81b4a95..93c98e5489 100644 --- a/sakura_core/convert/convert_util2.h +++ b/sakura_core/convert/convert_util2.h @@ -5,7 +5,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/debug/CRunningTimer.cpp b/sakura_core/debug/CRunningTimer.cpp index eaf5573237..ea32ba93e8 100644 --- a/sakura_core/debug/CRunningTimer.cpp +++ b/sakura_core/debug/CRunningTimer.cpp @@ -9,7 +9,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/debug/CRunningTimer.h b/sakura_core/debug/CRunningTimer.h index 477ae6a8c3..d1e1943f88 100644 --- a/sakura_core/debug/CRunningTimer.h +++ b/sakura_core/debug/CRunningTimer.h @@ -9,7 +9,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/debug/Debug1.cpp b/sakura_core/debug/Debug1.cpp index ffbdae0e11..9cf8813aca 100644 --- a/sakura_core/debug/Debug1.cpp +++ b/sakura_core/debug/Debug1.cpp @@ -10,7 +10,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/debug/Debug1.h b/sakura_core/debug/Debug1.h index 0bb95c3a76..327ad2b722 100644 --- a/sakura_core/debug/Debug1.h +++ b/sakura_core/debug/Debug1.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/debug/Debug2.cpp b/sakura_core/debug/Debug2.cpp index 235f95422b..c8646aee0d 100644 --- a/sakura_core/debug/Debug2.cpp +++ b/sakura_core/debug/Debug2.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/debug/Debug2.h b/sakura_core/debug/Debug2.h index 3f6541339c..f917af9685 100644 --- a/sakura_core/debug/Debug2.h +++ b/sakura_core/debug/Debug2.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/debug/Debug3.cpp b/sakura_core/debug/Debug3.cpp index 3c1f339e23..0fcd9582da 100644 --- a/sakura_core/debug/Debug3.cpp +++ b/sakura_core/debug/Debug3.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/debug/Debug3.h b/sakura_core/debug/Debug3.h index 835c3412d3..ad78e895eb 100644 --- a/sakura_core/debug/Debug3.h +++ b/sakura_core/debug/Debug3.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDialog.cpp b/sakura_core/dlg/CDialog.cpp index e4b5ebf0cd..58002e9072 100644 --- a/sakura_core/dlg/CDialog.cpp +++ b/sakura_core/dlg/CDialog.cpp @@ -14,7 +14,7 @@ Copyright (C) 2009, ryoji Copyright (C) 2011, nasukoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDialog.h b/sakura_core/dlg/CDialog.h index f8c502bcf8..3e50d2ee5f 100644 --- a/sakura_core/dlg/CDialog.h +++ b/sakura_core/dlg/CDialog.h @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2011, nasukoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 190c7078c5..253839913c 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -13,7 +13,7 @@ Copyright (C) 2004, Moca Copyright (C) 2005, genta Copyright (C) 2006, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgAbout.h b/sakura_core/dlg/CDlgAbout.h index 1c2271560d..6751813e2e 100644 --- a/sakura_core/dlg/CDlgAbout.h +++ b/sakura_core/dlg/CDlgAbout.h @@ -8,7 +8,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2000, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgCancel.cpp b/sakura_core/dlg/CDlgCancel.cpp index d20c141739..3375b39728 100644 --- a/sakura_core/dlg/CDlgCancel.cpp +++ b/sakura_core/dlg/CDlgCancel.cpp @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2008, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgCancel.h b/sakura_core/dlg/CDlgCancel.h index 2a64e72290..971d0ed4a9 100644 --- a/sakura_core/dlg/CDlgCancel.h +++ b/sakura_core/dlg/CDlgCancel.h @@ -8,7 +8,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2008, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgCompare.cpp b/sakura_core/dlg/CDlgCompare.cpp index f60f27a052..9f531d1c20 100644 --- a/sakura_core/dlg/CDlgCompare.cpp +++ b/sakura_core/dlg/CDlgCompare.cpp @@ -11,7 +11,7 @@ Copyright (C) 2003, MIK Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgCompare.h b/sakura_core/dlg/CDlgCompare.h index 5fcfa6f35e..884f5e2996 100644 --- a/sakura_core/dlg/CDlgCompare.h +++ b/sakura_core/dlg/CDlgCompare.h @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2000, jepro - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgCtrlCode.cpp b/sakura_core/dlg/CDlgCtrlCode.cpp index ee392e8c42..9dbd2dc15b 100644 --- a/sakura_core/dlg/CDlgCtrlCode.cpp +++ b/sakura_core/dlg/CDlgCtrlCode.cpp @@ -8,7 +8,7 @@ Copyright (C) 2002-2003, MIK Copyright (C) 2006, ryoji + Copyright (C) 2011, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgCtrlCode.h b/sakura_core/dlg/CDlgCtrlCode.h index 339619d720..190d740a17 100644 --- a/sakura_core/dlg/CDlgCtrlCode.h +++ b/sakura_core/dlg/CDlgCtrlCode.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2002, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgDiff.cpp b/sakura_core/dlg/CDlgDiff.cpp index bcce0f306c..f665fe2226 100644 --- a/sakura_core/dlg/CDlgDiff.cpp +++ b/sakura_core/dlg/CDlgDiff.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, MIK, genta, じゅうじ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgDiff.h b/sakura_core/dlg/CDlgDiff.h index 425bd5f1a6..2e23e01cf1 100644 --- a/sakura_core/dlg/CDlgDiff.h +++ b/sakura_core/dlg/CDlgDiff.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, MIK Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgExec.cpp b/sakura_core/dlg/CDlgExec.cpp index f52326d1a4..678c1f7dc1 100644 --- a/sakura_core/dlg/CDlgExec.cpp +++ b/sakura_core/dlg/CDlgExec.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, maru Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgExec.h b/sakura_core/dlg/CDlgExec.h index 7cef104a13..5d1f494e4e 100644 --- a/sakura_core/dlg/CDlgExec.h +++ b/sakura_core/dlg/CDlgExec.h @@ -7,7 +7,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgFavorite.cpp b/sakura_core/dlg/CDlgFavorite.cpp index 4b414b7888..004afd6685 100644 --- a/sakura_core/dlg/CDlgFavorite.cpp +++ b/sakura_core/dlg/CDlgFavorite.cpp @@ -8,7 +8,7 @@ Copyright (C) 2003, MIK Copyright (C) 2006, ryoji Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgFavorite.h b/sakura_core/dlg/CDlgFavorite.h index ef3ea96d1c..39c65fbfcf 100644 --- a/sakura_core/dlg/CDlgFavorite.h +++ b/sakura_core/dlg/CDlgFavorite.h @@ -7,7 +7,7 @@ /* Copyright (C) 2003, MIK Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgFileUpdateQuery.cpp b/sakura_core/dlg/CDlgFileUpdateQuery.cpp index faf288f8dc..34b3069a9e 100644 --- a/sakura_core/dlg/CDlgFileUpdateQuery.cpp +++ b/sakura_core/dlg/CDlgFileUpdateQuery.cpp @@ -8,7 +8,7 @@ */ /* Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgFileUpdateQuery.h b/sakura_core/dlg/CDlgFileUpdateQuery.h index 1dbb4e21c9..b3a61a63ff 100644 --- a/sakura_core/dlg/CDlgFileUpdateQuery.h +++ b/sakura_core/dlg/CDlgFileUpdateQuery.h @@ -8,7 +8,7 @@ */ /* Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgFind.cpp b/sakura_core/dlg/CDlgFind.cpp index 5b0e96c482..95728cedb6 100644 --- a/sakura_core/dlg/CDlgFind.cpp +++ b/sakura_core/dlg/CDlgFind.cpp @@ -13,7 +13,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgFind.h b/sakura_core/dlg/CDlgFind.h index 088c04af11..cc40aa3f07 100644 --- a/sakura_core/dlg/CDlgFind.h +++ b/sakura_core/dlg/CDlgFind.h @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgGrep.cpp b/sakura_core/dlg/CDlgGrep.cpp index 0b0e7b3b2b..68bf0bc016 100644 --- a/sakura_core/dlg/CDlgGrep.cpp +++ b/sakura_core/dlg/CDlgGrep.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2010, ryoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgGrep.h b/sakura_core/dlg/CDlgGrep.h index cb67490d40..cfb1f1fe51 100644 --- a/sakura_core/dlg/CDlgGrep.h +++ b/sakura_core/dlg/CDlgGrep.h @@ -8,7 +8,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgGrepReplace.cpp b/sakura_core/dlg/CDlgGrepReplace.cpp index 0610a02272..9694add5cb 100644 --- a/sakura_core/dlg/CDlgGrepReplace.cpp +++ b/sakura_core/dlg/CDlgGrepReplace.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2010, ryoji Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgGrepReplace.h b/sakura_core/dlg/CDlgGrepReplace.h index 6614579882..f37802ddcc 100644 --- a/sakura_core/dlg/CDlgGrepReplace.h +++ b/sakura_core/dlg/CDlgGrepReplace.h @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, Moca Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgInput1.cpp b/sakura_core/dlg/CDlgInput1.cpp index edadc43805..4602b2d1f9 100644 --- a/sakura_core/dlg/CDlgInput1.cpp +++ b/sakura_core/dlg/CDlgInput1.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, MIK Copyright (C) 2003, KEITA Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgInput1.h b/sakura_core/dlg/CDlgInput1.h index 43d62fe0a3..1e5cc6533d 100644 --- a/sakura_core/dlg/CDlgInput1.h +++ b/sakura_core/dlg/CDlgInput1.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgJump.cpp b/sakura_core/dlg/CDlgJump.cpp index 149e740050..c7ea236588 100644 --- a/sakura_core/dlg/CDlgJump.cpp +++ b/sakura_core/dlg/CDlgJump.cpp @@ -11,7 +11,7 @@ Copyright (C) 2002, aroka, MIK, YAZAKI Copyright (C) 2004, genta Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgJump.h b/sakura_core/dlg/CDlgJump.h index 76feb35a69..18e9e918c0 100644 --- a/sakura_core/dlg/CDlgJump.h +++ b/sakura_core/dlg/CDlgJump.h @@ -9,7 +9,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2000, jepro Copyright (C) 2002, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgOpenFile.cpp b/sakura_core/dlg/CDlgOpenFile.cpp index d935976dc2..2dfdc64f8b 100644 --- a/sakura_core/dlg/CDlgOpenFile.cpp +++ b/sakura_core/dlg/CDlgOpenFile.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, novice, ryoji Copyright (C) 2006, ryoji, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgOpenFile.h b/sakura_core/dlg/CDlgOpenFile.h index 6e7efb5fce..ba9bedb34f 100644 --- a/sakura_core/dlg/CDlgOpenFile.h +++ b/sakura_core/dlg/CDlgOpenFile.h @@ -12,7 +12,7 @@ Copyright (C) 2004, genta, MIK Copyright (C) 2005, ryoji Copyright (C) 2006, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp index 5263ed3b60..fa4ded52c7 100644 --- a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp +++ b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, novice, ryoji Copyright (C) 2006, ryoji, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp index a29d62cbb4..3cd6ae2134 100644 --- a/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp +++ b/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, novice, ryoji Copyright (C) 2006, ryoji, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgPluginOption.cpp b/sakura_core/dlg/CDlgPluginOption.cpp index ac34116e83..f1b903e631 100644 --- a/sakura_core/dlg/CDlgPluginOption.cpp +++ b/sakura_core/dlg/CDlgPluginOption.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgPluginOption.h b/sakura_core/dlg/CDlgPluginOption.h index e280b7d471..2a3cbcb570 100644 --- a/sakura_core/dlg/CDlgPluginOption.h +++ b/sakura_core/dlg/CDlgPluginOption.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgPrintSetting.cpp b/sakura_core/dlg/CDlgPrintSetting.cpp index d2b297e82a..20eb77aa65 100644 --- a/sakura_core/dlg/CDlgPrintSetting.cpp +++ b/sakura_core/dlg/CDlgPrintSetting.cpp @@ -12,7 +12,7 @@ Copyright (C) 2002, MIK, aroka, YAZAKI Copyright (C) 2003, かろと Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgPrintSetting.h b/sakura_core/dlg/CDlgPrintSetting.h index 6b60c5c9fa..0ea7486f77 100644 --- a/sakura_core/dlg/CDlgPrintSetting.h +++ b/sakura_core/dlg/CDlgPrintSetting.h @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgProfileMgr.cpp b/sakura_core/dlg/CDlgProfileMgr.cpp index 5929083748..4b45aeb92a 100644 --- a/sakura_core/dlg/CDlgProfileMgr.cpp +++ b/sakura_core/dlg/CDlgProfileMgr.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2013, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgProfileMgr.h b/sakura_core/dlg/CDlgProfileMgr.h index a447c59b15..6eeb3a57d1 100644 --- a/sakura_core/dlg/CDlgProfileMgr.h +++ b/sakura_core/dlg/CDlgProfileMgr.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2013, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgProperty.cpp b/sakura_core/dlg/CDlgProperty.cpp index ea4a077244..ea85c49a24 100644 --- a/sakura_core/dlg/CDlgProperty.cpp +++ b/sakura_core/dlg/CDlgProperty.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, Moca, MIK, YAZAKI Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgProperty.h b/sakura_core/dlg/CDlgProperty.h index b2753b4482..6a4f066573 100644 --- a/sakura_core/dlg/CDlgProperty.h +++ b/sakura_core/dlg/CDlgProperty.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgReplace.cpp b/sakura_core/dlg/CDlgReplace.cpp index aac234b14a..09700e0458 100644 --- a/sakura_core/dlg/CDlgReplace.cpp +++ b/sakura_core/dlg/CDlgReplace.cpp @@ -12,7 +12,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgReplace.h b/sakura_core/dlg/CDlgReplace.h index 37c7491ab4..c6379c9569 100644 --- a/sakura_core/dlg/CDlgReplace.h +++ b/sakura_core/dlg/CDlgReplace.h @@ -10,7 +10,7 @@ Copyright (C) 2002, hor Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgSetCharSet.cpp b/sakura_core/dlg/CDlgSetCharSet.cpp index bfcb7f39b8..fd04ccdce1 100644 --- a/sakura_core/dlg/CDlgSetCharSet.cpp +++ b/sakura_core/dlg/CDlgSetCharSet.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgSetCharSet.h b/sakura_core/dlg/CDlgSetCharSet.h index 18b9219375..7705a91685 100644 --- a/sakura_core/dlg/CDlgSetCharSet.h +++ b/sakura_core/dlg/CDlgSetCharSet.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgTagJumpList.cpp b/sakura_core/dlg/CDlgTagJumpList.cpp index c9503601f5..02f31d6741 100644 --- a/sakura_core/dlg/CDlgTagJumpList.cpp +++ b/sakura_core/dlg/CDlgTagJumpList.cpp @@ -10,7 +10,7 @@ Copyright (C) 2005, MIK Copyright (C) 2006, genta, ryoji Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgTagJumpList.h b/sakura_core/dlg/CDlgTagJumpList.h index e6dc5e900e..57b5225cb6 100644 --- a/sakura_core/dlg/CDlgTagJumpList.h +++ b/sakura_core/dlg/CDlgTagJumpList.h @@ -8,7 +8,7 @@ Copyright (C) 2003, MIK Copyright (C) 2005, MIK Copyright (C) 2010, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgTagsMake.cpp b/sakura_core/dlg/CDlgTagsMake.cpp index a687ec1e5e..dec592d1e0 100644 --- a/sakura_core/dlg/CDlgTagsMake.cpp +++ b/sakura_core/dlg/CDlgTagsMake.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2003, MIK Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgTagsMake.h b/sakura_core/dlg/CDlgTagsMake.h index aded3dbe83..397c549094 100644 --- a/sakura_core/dlg/CDlgTagsMake.h +++ b/sakura_core/dlg/CDlgTagsMake.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2003, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgWinSize.cpp b/sakura_core/dlg/CDlgWinSize.cpp index 6ef4508a1a..104131d8b7 100644 --- a/sakura_core/dlg/CDlgWinSize.cpp +++ b/sakura_core/dlg/CDlgWinSize.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2004, genta, Moca Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgWinSize.h b/sakura_core/dlg/CDlgWinSize.h index c9af8a038b..74b00e0acd 100644 --- a/sakura_core/dlg/CDlgWinSize.h +++ b/sakura_core/dlg/CDlgWinSize.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2004, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/dlg/CDlgWindowList.cpp b/sakura_core/dlg/CDlgWindowList.cpp index 6bea5b34a9..89275113e1 100644 --- a/sakura_core/dlg/CDlgWindowList.cpp +++ b/sakura_core/dlg/CDlgWindowList.cpp @@ -13,7 +13,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji Copyright (C) 2015, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/dlg/CDlgWindowList.h b/sakura_core/dlg/CDlgWindowList.h index 271b432051..7168e7d06d 100644 --- a/sakura_core/dlg/CDlgWindowList.h +++ b/sakura_core/dlg/CDlgWindowList.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2015, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CBlockComment.cpp b/sakura_core/doc/CBlockComment.cpp index 8fa1495190..36fa7cc7f5 100644 --- a/sakura_core/doc/CBlockComment.cpp +++ b/sakura_core/doc/CBlockComment.cpp @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI, Moca Copyright (C) 2005, D.S.Koba - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/CBlockComment.h b/sakura_core/doc/CBlockComment.h index d3570f3a94..9f48b27bbe 100644 --- a/sakura_core/doc/CBlockComment.h +++ b/sakura_core/doc/CBlockComment.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, Yazaki Copyright (C) 2005, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/CDocEditor.cpp b/sakura_core/doc/CDocEditor.cpp index ce12c8f47f..29c3ca3fc9 100644 --- a/sakura_core/doc/CDocEditor.cpp +++ b/sakura_core/doc/CDocEditor.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocEditor.h b/sakura_core/doc/CDocEditor.h index 27dc9fc663..56f2694ae0 100644 --- a/sakura_core/doc/CDocEditor.h +++ b/sakura_core/doc/CDocEditor.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocFile.cpp b/sakura_core/doc/CDocFile.cpp index 7a453b6cfc..a67d1f4508 100644 --- a/sakura_core/doc/CDocFile.cpp +++ b/sakura_core/doc/CDocFile.cpp @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocFile.h b/sakura_core/doc/CDocFile.h index 756e8fce71..9d2e989750 100644 --- a/sakura_core/doc/CDocFile.h +++ b/sakura_core/doc/CDocFile.h @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocFileOperation.cpp b/sakura_core/doc/CDocFileOperation.cpp index 1c95bde3e4..9a7aa11d92 100644 --- a/sakura_core/doc/CDocFileOperation.cpp +++ b/sakura_core/doc/CDocFileOperation.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocFileOperation.h b/sakura_core/doc/CDocFileOperation.h index 95b8edfcd0..404366a70c 100644 --- a/sakura_core/doc/CDocFileOperation.h +++ b/sakura_core/doc/CDocFileOperation.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocListener.cpp b/sakura_core/doc/CDocListener.cpp index 73f75cfa6e..55cbec5cd0 100644 --- a/sakura_core/doc/CDocListener.cpp +++ b/sakura_core/doc/CDocListener.cpp @@ -10,7 +10,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocListener.h b/sakura_core/doc/CDocListener.h index 0cd92dc606..b5cf9d4a9a 100644 --- a/sakura_core/doc/CDocListener.h +++ b/sakura_core/doc/CDocListener.h @@ -11,7 +11,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocLocker.cpp b/sakura_core/doc/CDocLocker.cpp index e0f88b04a5..bea82f534a 100644 --- a/sakura_core/doc/CDocLocker.cpp +++ b/sakura_core/doc/CDocLocker.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocLocker.h b/sakura_core/doc/CDocLocker.h index aba4f4a5b5..3793b6bf68 100644 --- a/sakura_core/doc/CDocLocker.h +++ b/sakura_core/doc/CDocLocker.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocOutline.cpp b/sakura_core/doc/CDocOutline.cpp index 1e08b37128..4f4863ea96 100644 --- a/sakura_core/doc/CDocOutline.cpp +++ b/sakura_core/doc/CDocOutline.cpp @@ -11,7 +11,7 @@ Copyright (C) 2002, frozen Copyright (C) 2003, zenryaku Copyright (C) 2005, genta, D.S.Koba, じゅうじ - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/doc/CDocOutline.h b/sakura_core/doc/CDocOutline.h index cd6e18ebd9..c6736f9fa9 100644 --- a/sakura_core/doc/CDocOutline.h +++ b/sakura_core/doc/CDocOutline.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocReader.cpp b/sakura_core/doc/CDocReader.cpp index b703866ece..ba864a7be6 100644 --- a/sakura_core/doc/CDocReader.cpp +++ b/sakura_core/doc/CDocReader.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocReader.h b/sakura_core/doc/CDocReader.h index 9087e08008..4266cf3f5f 100644 --- a/sakura_core/doc/CDocReader.h +++ b/sakura_core/doc/CDocReader.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocType.cpp b/sakura_core/doc/CDocType.cpp index 8d87b9203b..a21280cc05 100644 --- a/sakura_core/doc/CDocType.cpp +++ b/sakura_core/doc/CDocType.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocType.h b/sakura_core/doc/CDocType.h index ad06410420..b97566fe13 100644 --- a/sakura_core/doc/CDocType.h +++ b/sakura_core/doc/CDocType.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocTypeSetting.cpp b/sakura_core/doc/CDocTypeSetting.cpp index 9be3d474b0..094cbd4896 100644 --- a/sakura_core/doc/CDocTypeSetting.cpp +++ b/sakura_core/doc/CDocTypeSetting.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocTypeSetting.h b/sakura_core/doc/CDocTypeSetting.h index 9cf8251199..1c46badc99 100644 --- a/sakura_core/doc/CDocTypeSetting.h +++ b/sakura_core/doc/CDocTypeSetting.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocVisitor.cpp b/sakura_core/doc/CDocVisitor.cpp index e70d5a6d12..6d6c43864b 100644 --- a/sakura_core/doc/CDocVisitor.cpp +++ b/sakura_core/doc/CDocVisitor.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CDocVisitor.h b/sakura_core/doc/CDocVisitor.h index 0b1a929b2e..4de4d44d06 100644 --- a/sakura_core/doc/CDocVisitor.h +++ b/sakura_core/doc/CDocVisitor.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CEditDoc.cpp b/sakura_core/doc/CEditDoc.cpp index abca67d5ef..7e49ea9d95 100644 --- a/sakura_core/doc/CEditDoc.cpp +++ b/sakura_core/doc/CEditDoc.cpp @@ -18,7 +18,7 @@ Copyright (C) 2009, nasukoji Copyright (C) 2011, ryoji Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CEditDoc.h b/sakura_core/doc/CEditDoc.h index 145e781c97..7a1a67433e 100644 --- a/sakura_core/doc/CEditDoc.h +++ b/sakura_core/doc/CEditDoc.h @@ -15,7 +15,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji, maru Copyright (C) 2008, ryoji, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/CLineComment.cpp b/sakura_core/doc/CLineComment.cpp index 38a4e6bf88..ac9ae60580 100644 --- a/sakura_core/doc/CLineComment.cpp +++ b/sakura_core/doc/CLineComment.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, Yazaki, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/CLineComment.h b/sakura_core/doc/CLineComment.h index 55d3c32762..38eeeeba34 100644 --- a/sakura_core/doc/CLineComment.h +++ b/sakura_core/doc/CLineComment.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2002, Yazaki - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayout.cpp b/sakura_core/doc/layout/CLayout.cpp index 3bd2614613..97e1f1c225 100644 --- a/sakura_core/doc/layout/CLayout.cpp +++ b/sakura_core/doc/layout/CLayout.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayout.h b/sakura_core/doc/layout/CLayout.h index 6ef20b3272..04b75c560f 100644 --- a/sakura_core/doc/layout/CLayout.h +++ b/sakura_core/doc/layout/CLayout.h @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI, aroka Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayoutExInfo.h b/sakura_core/doc/layout/CLayoutExInfo.h index 248cba0b22..8d18504180 100644 --- a/sakura_core/doc/layout/CLayoutExInfo.h +++ b/sakura_core/doc/layout/CLayoutExInfo.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/layout/CLayoutMgr.cpp b/sakura_core/doc/layout/CLayoutMgr.cpp index 47b6e7c82d..5a270d59dd 100644 --- a/sakura_core/doc/layout/CLayoutMgr.cpp +++ b/sakura_core/doc/layout/CLayoutMgr.cpp @@ -10,7 +10,7 @@ Copyright (C) 2004, genta, Moca Copyright (C) 2005, D.S.Koba, Moca Copyright (C) 2009, ryoji, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayoutMgr.h b/sakura_core/doc/layout/CLayoutMgr.h index e165503b08..ef6629bc3e 100644 --- a/sakura_core/doc/layout/CLayoutMgr.h +++ b/sakura_core/doc/layout/CLayoutMgr.h @@ -14,7 +14,7 @@ Copyright (C) 2003, genta Copyright (C) 2005, Moca, genta, D.S.Koba Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayoutMgr_DoLayout.cpp b/sakura_core/doc/layout/CLayoutMgr_DoLayout.cpp index cabbfcd265..86c489eca1 100644 --- a/sakura_core/doc/layout/CLayoutMgr_DoLayout.cpp +++ b/sakura_core/doc/layout/CLayoutMgr_DoLayout.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/layout/CLayoutMgr_New.cpp b/sakura_core/doc/layout/CLayoutMgr_New.cpp index b5ff4ef52f..1e25aa0257 100644 --- a/sakura_core/doc/layout/CLayoutMgr_New.cpp +++ b/sakura_core/doc/layout/CLayoutMgr_New.cpp @@ -11,7 +11,7 @@ Copyright (C) 2004, Moca, genta Copyright (C) 2005, D.S.Koba, Moca Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CLayoutMgr_New2.cpp b/sakura_core/doc/layout/CLayoutMgr_New2.cpp index c901e87244..17daaa513f 100644 --- a/sakura_core/doc/layout/CLayoutMgr_New2.cpp +++ b/sakura_core/doc/layout/CLayoutMgr_New2.cpp @@ -7,7 +7,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, MIK, aroka Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/layout/CTsvModeInfo.cpp b/sakura_core/doc/layout/CTsvModeInfo.cpp index 5056b96d7a..9f6ca32890 100644 --- a/sakura_core/doc/layout/CTsvModeInfo.cpp +++ b/sakura_core/doc/layout/CTsvModeInfo.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2015, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/layout/CTsvModeInfo.h b/sakura_core/doc/layout/CTsvModeInfo.h index 8d11b65252..8b984ba096 100644 --- a/sakura_core/doc/layout/CTsvModeInfo.h +++ b/sakura_core/doc/layout/CTsvModeInfo.h @@ -3,7 +3,7 @@ */ /* Copyright (C) 2015, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/doc/logic/CDocLine.cpp b/sakura_core/doc/logic/CDocLine.cpp index 1f05973355..2725e642e8 100644 --- a/sakura_core/doc/logic/CDocLine.cpp +++ b/sakura_core/doc/logic/CDocLine.cpp @@ -7,7 +7,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, hor, genta Copyright (C) 2002, MIK, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/logic/CDocLine.h b/sakura_core/doc/logic/CDocLine.h index 88003aa49a..f66961690a 100644 --- a/sakura_core/doc/logic/CDocLine.h +++ b/sakura_core/doc/logic/CDocLine.h @@ -10,7 +10,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, hor Copyright (C) 2002, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/logic/CDocLineMgr.cpp b/sakura_core/doc/logic/CDocLineMgr.cpp index 4bd77233dd..a644720a16 100644 --- a/sakura_core/doc/logic/CDocLineMgr.cpp +++ b/sakura_core/doc/logic/CDocLineMgr.cpp @@ -15,7 +15,7 @@ Copyright (C) 2003, Moca, ryoji, genta, かろと Copyright (C) 2004, genta, Moca Copyright (C) 2005, D.S.Koba, ryoji, かろと - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/doc/logic/CDocLineMgr.h b/sakura_core/doc/logic/CDocLineMgr.h index 1816d2c815..761b91f557 100644 --- a/sakura_core/doc/logic/CDocLineMgr.h +++ b/sakura_core/doc/logic/CDocLineMgr.h @@ -12,7 +12,7 @@ Copyright (C) 2001, hor, genta Copyright (C) 2002, aroka, MIK, hor Copyright (C) 2003, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/docplus/CBookmarkManager.cpp b/sakura_core/docplus/CBookmarkManager.cpp index c7f352ca68..b15175314e 100644 --- a/sakura_core/docplus/CBookmarkManager.cpp +++ b/sakura_core/docplus/CBookmarkManager.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CBookmarkManager.h b/sakura_core/docplus/CBookmarkManager.h index d762f9bc12..f9af307977 100644 --- a/sakura_core/docplus/CBookmarkManager.h +++ b/sakura_core/docplus/CBookmarkManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CDiffManager.cpp b/sakura_core/docplus/CDiffManager.cpp index fd05ebbff9..56b027c516 100644 --- a/sakura_core/docplus/CDiffManager.cpp +++ b/sakura_core/docplus/CDiffManager.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CDiffManager.h b/sakura_core/docplus/CDiffManager.h index 13210ed8b7..1c4324dd09 100644 --- a/sakura_core/docplus/CDiffManager.h +++ b/sakura_core/docplus/CDiffManager.h @@ -3,7 +3,7 @@ //2008.02.23 kobake 大整理 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CFuncListManager.cpp b/sakura_core/docplus/CFuncListManager.cpp index a10d54419c..374e53ab9e 100644 --- a/sakura_core/docplus/CFuncListManager.cpp +++ b/sakura_core/docplus/CFuncListManager.cpp @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CFuncListManager.h b/sakura_core/docplus/CFuncListManager.h index 1c6937f5f6..feae741150 100644 --- a/sakura_core/docplus/CFuncListManager.h +++ b/sakura_core/docplus/CFuncListManager.h @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CModifyManager.cpp b/sakura_core/docplus/CModifyManager.cpp index be817f56a1..b43fa72dea 100644 --- a/sakura_core/docplus/CModifyManager.cpp +++ b/sakura_core/docplus/CModifyManager.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/docplus/CModifyManager.h b/sakura_core/docplus/CModifyManager.h index b970b6a5ca..303990267e 100644 --- a/sakura_core/docplus/CModifyManager.h +++ b/sakura_core/docplus/CModifyManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CAppNodeManager.cpp b/sakura_core/env/CAppNodeManager.cpp index 0e8171b2e0..c0b48d8cf4 100644 --- a/sakura_core/env/CAppNodeManager.cpp +++ b/sakura_core/env/CAppNodeManager.cpp @@ -9,7 +9,7 @@ Copyright (C) 2011, syat Copyright (C) 2012, syat, Uchi Copyright (C) 2013, Moca, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CAppNodeManager.h b/sakura_core/env/CAppNodeManager.h index ecc5594c13..7afdc7de37 100644 --- a/sakura_core/env/CAppNodeManager.h +++ b/sakura_core/env/CAppNodeManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CDocTypeManager.cpp b/sakura_core/env/CDocTypeManager.cpp index aa622b98d8..6a0955298e 100644 --- a/sakura_core/env/CDocTypeManager.cpp +++ b/sakura_core/env/CDocTypeManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CDocTypeManager.h b/sakura_core/env/CDocTypeManager.h index 631fe62c39..177f9bd58f 100644 --- a/sakura_core/env/CDocTypeManager.h +++ b/sakura_core/env/CDocTypeManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CFileNameManager.cpp b/sakura_core/env/CFileNameManager.cpp index f010ee3944..914d9a76be 100644 --- a/sakura_core/env/CFileNameManager.cpp +++ b/sakura_core/env/CFileNameManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CFileNameManager.h b/sakura_core/env/CFileNameManager.h index 5ca1114724..4bb0eb9a24 100644 --- a/sakura_core/env/CFileNameManager.h +++ b/sakura_core/env/CFileNameManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CFormatManager.cpp b/sakura_core/env/CFormatManager.cpp index 8dc6d70c57..eac2740239 100644 --- a/sakura_core/env/CFormatManager.cpp +++ b/sakura_core/env/CFormatManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CFormatManager.h b/sakura_core/env/CFormatManager.h index 44833475af..13f12b17b7 100644 --- a/sakura_core/env/CFormatManager.h +++ b/sakura_core/env/CFormatManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CHelpManager.cpp b/sakura_core/env/CHelpManager.cpp index 76ad1dcfca..509fabe2b2 100644 --- a/sakura_core/env/CHelpManager.cpp +++ b/sakura_core/env/CHelpManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CHelpManager.h b/sakura_core/env/CHelpManager.h index f330ed8c05..f12b57fb68 100644 --- a/sakura_core/env/CHelpManager.h +++ b/sakura_core/env/CHelpManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CSakuraEnvironment.cpp b/sakura_core/env/CSakuraEnvironment.cpp index 902fd054ba..93c085a38b 100644 --- a/sakura_core/env/CSakuraEnvironment.cpp +++ b/sakura_core/env/CSakuraEnvironment.cpp @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake, ryoji Copyright (C) 2012, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CSakuraEnvironment.h b/sakura_core/env/CSakuraEnvironment.h index 89e411305d..ac029f4b1b 100644 --- a/sakura_core/env/CSakuraEnvironment.h +++ b/sakura_core/env/CSakuraEnvironment.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CSearchKeywordManager.cpp b/sakura_core/env/CSearchKeywordManager.cpp index bf6d3d7c3b..d1eb5cec14 100644 --- a/sakura_core/env/CSearchKeywordManager.cpp +++ b/sakura_core/env/CSearchKeywordManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CSearchKeywordManager.h b/sakura_core/env/CSearchKeywordManager.h index 61c4a63a19..4e9fc62c81 100644 --- a/sakura_core/env/CSearchKeywordManager.h +++ b/sakura_core/env/CSearchKeywordManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index efa09572b0..39fbc7521e 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -18,7 +18,7 @@ Copyright (C) 2009, nasukoji, ryoji Copyright (C) 2011, nasukoji Copyright (C) 2012, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/env/CShareData.h b/sakura_core/env/CShareData.h index 9353e810b3..6c880e6cf0 100644 --- a/sakura_core/env/CShareData.h +++ b/sakura_core/env/CShareData.h @@ -16,7 +16,7 @@ Copyright (C) 2007, ryoji, maru Copyright (C) 2008, ryoji, Uchi Copyright (C) 2011, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index cd83b5abb3..a18e9407b9 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -2,7 +2,7 @@ //2008.XX.XX kobake CShareDataから分離 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CShareData_IO.h b/sakura_core/env/CShareData_IO.h index edd0284a03..a736732f8e 100644 --- a/sakura_core/env/CShareData_IO.h +++ b/sakura_core/env/CShareData_IO.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CTagJumpManager.cpp b/sakura_core/env/CTagJumpManager.cpp index af99fe7f95..a696856c82 100644 --- a/sakura_core/env/CTagJumpManager.cpp +++ b/sakura_core/env/CTagJumpManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CTagJumpManager.h b/sakura_core/env/CTagJumpManager.h index 8aedd927d8..feb5459206 100644 --- a/sakura_core/env/CTagJumpManager.h +++ b/sakura_core/env/CTagJumpManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CommonSetting.cpp b/sakura_core/env/CommonSetting.cpp index 8183b54897..2726d412ac 100644 --- a/sakura_core/env/CommonSetting.cpp +++ b/sakura_core/env/CommonSetting.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/CommonSetting.h b/sakura_core/env/CommonSetting.h index 4a9c24541b..1e5349d251 100644 --- a/sakura_core/env/CommonSetting.h +++ b/sakura_core/env/CommonSetting.h @@ -2,7 +2,7 @@ //2007.09.28 kobake Common整理 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/DLLSHAREDATA.cpp b/sakura_core/env/DLLSHAREDATA.cpp index ce0c2cd1c6..d8d40d3478 100644 --- a/sakura_core/env/DLLSHAREDATA.cpp +++ b/sakura_core/env/DLLSHAREDATA.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/env/DLLSHAREDATA.h b/sakura_core/env/DLLSHAREDATA.h index a2de7beff3..ed247c3d43 100644 --- a/sakura_core/env/DLLSHAREDATA.h +++ b/sakura_core/env/DLLSHAREDATA.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CBregexp.cpp b/sakura_core/extmodule/CBregexp.cpp index 58cf687823..fcfe140e86 100644 --- a/sakura_core/extmodule/CBregexp.cpp +++ b/sakura_core/extmodule/CBregexp.cpp @@ -17,7 +17,7 @@ Copyright (C) 2005, かろと Copyright (C) 2006, かろと Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CBregexp.h b/sakura_core/extmodule/CBregexp.h index 59d05ab1c2..1e2a3510bb 100644 --- a/sakura_core/extmodule/CBregexp.h +++ b/sakura_core/extmodule/CBregexp.h @@ -17,7 +17,7 @@ Copyright (C) 2005, かろと, aroka Copyright (C) 2006, かろと Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CBregexpDll2.cpp b/sakura_core/extmodule/CBregexpDll2.cpp index 6f0f2db443..6991a75a71 100644 --- a/sakura_core/extmodule/CBregexpDll2.cpp +++ b/sakura_core/extmodule/CBregexpDll2.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CBregexpDll2.h b/sakura_core/extmodule/CBregexpDll2.h index ec8e4ae0d4..4058bfe45d 100644 --- a/sakura_core/extmodule/CBregexpDll2.h +++ b/sakura_core/extmodule/CBregexpDll2.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CDllHandler.cpp b/sakura_core/extmodule/CDllHandler.cpp index b74e3b10b9..492fe89cb7 100644 --- a/sakura_core/extmodule/CDllHandler.cpp +++ b/sakura_core/extmodule/CDllHandler.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2001, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CDllHandler.h b/sakura_core/extmodule/CDllHandler.h index 04f37ee075..40d4f86fc2 100644 --- a/sakura_core/extmodule/CDllHandler.h +++ b/sakura_core/extmodule/CDllHandler.h @@ -7,7 +7,7 @@ /* Copyright (C) 2001, genta Copyright (C) 2002, YAZAKI, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CHtmlHelp.cpp b/sakura_core/extmodule/CHtmlHelp.cpp index 0821495bac..d0e708b624 100644 --- a/sakura_core/extmodule/CHtmlHelp.cpp +++ b/sakura_core/extmodule/CHtmlHelp.cpp @@ -8,7 +8,7 @@ */ /* Copyright (C) 2001, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CHtmlHelp.h b/sakura_core/extmodule/CHtmlHelp.h index 4954f6cf5e..ab42f3a766 100644 --- a/sakura_core/extmodule/CHtmlHelp.h +++ b/sakura_core/extmodule/CHtmlHelp.h @@ -8,7 +8,7 @@ */ /* Copyright (C) 2001, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CIcu4cI18n.cpp b/sakura_core/extmodule/CIcu4cI18n.cpp index 1527ca4891..57fd764afc 100644 --- a/sakura_core/extmodule/CIcu4cI18n.cpp +++ b/sakura_core/extmodule/CIcu4cI18n.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CIcu4cI18n.h b/sakura_core/extmodule/CIcu4cI18n.h index f9c09fbdba..cef065fa1d 100644 --- a/sakura_core/extmodule/CIcu4cI18n.h +++ b/sakura_core/extmodule/CIcu4cI18n.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CMigemo.cpp b/sakura_core/extmodule/CMigemo.cpp index 2c0b887c6a..d492a4b73f 100644 --- a/sakura_core/extmodule/CMigemo.cpp +++ b/sakura_core/extmodule/CMigemo.cpp @@ -9,7 +9,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2009, miau Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/extmodule/CMigemo.h b/sakura_core/extmodule/CMigemo.h index 3fa4a6f8d9..87a8fdb1ee 100644 --- a/sakura_core/extmodule/CMigemo.h +++ b/sakura_core/extmodule/CMigemo.h @@ -10,7 +10,7 @@ Copyright (C) 2004, isearch Copyright (C) 2005, aroka Copyright (C) 2009, miau - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/extmodule/CUchardet.cpp b/sakura_core/extmodule/CUchardet.cpp index 149b8ccb20..4b987b4eab 100644 --- a/sakura_core/extmodule/CUchardet.cpp +++ b/sakura_core/extmodule/CUchardet.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CUchardet.h b/sakura_core/extmodule/CUchardet.h index c73c1e972e..7b2ae68b6f 100644 --- a/sakura_core/extmodule/CUchardet.h +++ b/sakura_core/extmodule/CUchardet.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CUxTheme.cpp b/sakura_core/extmodule/CUxTheme.cpp index 266a1726fb..062a3b8eb5 100644 --- a/sakura_core/extmodule/CUxTheme.cpp +++ b/sakura_core/extmodule/CUxTheme.cpp @@ -8,7 +8,7 @@ */ /* Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/extmodule/CUxTheme.h b/sakura_core/extmodule/CUxTheme.h index 902e3f880a..be093599c1 100644 --- a/sakura_core/extmodule/CUxTheme.h +++ b/sakura_core/extmodule/CUxTheme.h @@ -8,7 +8,7 @@ */ /* Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/func/CFuncKeyWnd.cpp b/sakura_core/func/CFuncKeyWnd.cpp index 85431c81c4..c19d56f730 100644 --- a/sakura_core/func/CFuncKeyWnd.cpp +++ b/sakura_core/func/CFuncKeyWnd.cpp @@ -12,7 +12,7 @@ Copyright (C) 2006, aroka, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/func/CFuncKeyWnd.h b/sakura_core/func/CFuncKeyWnd.h index 5378ec5568..00997e996b 100644 --- a/sakura_core/func/CFuncKeyWnd.h +++ b/sakura_core/func/CFuncKeyWnd.h @@ -8,7 +8,7 @@ Copyright (C) 2002, YAZAKI, aroka Copyright (C) 2006, aroka Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/func/CFuncLookup.cpp b/sakura_core/func/CFuncLookup.cpp index 9b9fd37f6a..192824de14 100644 --- a/sakura_core/func/CFuncLookup.cpp +++ b/sakura_core/func/CFuncLookup.cpp @@ -10,7 +10,7 @@ /* Copyright (C) 2001, genta Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/func/CFuncLookup.h b/sakura_core/func/CFuncLookup.h index ac9c13e0e5..1a532db577 100644 --- a/sakura_core/func/CFuncLookup.h +++ b/sakura_core/func/CFuncLookup.h @@ -10,7 +10,7 @@ Copyright (C) 2001, genta Copyright (C) 2002, aroka Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/func/CKeyBind.cpp b/sakura_core/func/CKeyBind.cpp index bd53597975..6c4cbb33f7 100644 --- a/sakura_core/func/CKeyBind.cpp +++ b/sakura_core/func/CKeyBind.cpp @@ -11,7 +11,7 @@ Copyright (C) 2002, YAZAKI, aroka Copyright (C) 2007, ryoji Copyright (C) 2008, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/func/CKeyBind.h b/sakura_core/func/CKeyBind.h index 8420975404..efe6f9f9a2 100644 --- a/sakura_core/func/CKeyBind.h +++ b/sakura_core/func/CKeyBind.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index fd54e51727..0ded27ba38 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -15,7 +15,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2008, nasukoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/func/Funccode.h b/sakura_core/func/Funccode.h index 376a68f1ff..c5c691f5f2 100644 --- a/sakura_core/func/Funccode.h +++ b/sakura_core/func/Funccode.h @@ -13,7 +13,7 @@ Copyright (C) 2005, genta, MIK, maru Copyright (C) 2006, aroka, かろと, fon, ryoji Copyright (C) 2007, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CBinaryStream.cpp b/sakura_core/io/CBinaryStream.cpp index 0e2bc4c3fe..97f963a15b 100644 --- a/sakura_core/io/CBinaryStream.cpp +++ b/sakura_core/io/CBinaryStream.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CBinaryStream.h b/sakura_core/io/CBinaryStream.h index dfa97db6b9..ff6ec985c8 100644 --- a/sakura_core/io/CBinaryStream.h +++ b/sakura_core/io/CBinaryStream.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CFile.cpp b/sakura_core/io/CFile.cpp index dc50862393..e37d92d5e0 100644 --- a/sakura_core/io/CFile.cpp +++ b/sakura_core/io/CFile.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CFile.h b/sakura_core/io/CFile.h index 1913003f8d..ef84561cd3 100644 --- a/sakura_core/io/CFile.h +++ b/sakura_core/io/CFile.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CFileLoad.cpp b/sakura_core/io/CFileLoad.cpp index 19fbb409a8..2c679993d2 100644 --- a/sakura_core/io/CFileLoad.cpp +++ b/sakura_core/io/CFileLoad.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, Moca, genta Copyright (C) 2003, Moca, ryoji Copyright (C) 2006, rastiv - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CFileLoad.h b/sakura_core/io/CFileLoad.h index 2130158898..cb9b1e6945 100644 --- a/sakura_core/io/CFileLoad.h +++ b/sakura_core/io/CFileLoad.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, Moca, genta Copyright (C) 2003, Moca, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CIoBridge.cpp b/sakura_core/io/CIoBridge.cpp index 08922ebcc2..2dd67f1c54 100644 --- a/sakura_core/io/CIoBridge.cpp +++ b/sakura_core/io/CIoBridge.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CIoBridge.h b/sakura_core/io/CIoBridge.h index 9989bbd8ee..6ee6e850f3 100644 --- a/sakura_core/io/CIoBridge.h +++ b/sakura_core/io/CIoBridge.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CStream.cpp b/sakura_core/io/CStream.cpp index b8bdf2a95c..f63b223275 100644 --- a/sakura_core/io/CStream.cpp +++ b/sakura_core/io/CStream.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CStream.h b/sakura_core/io/CStream.h index e44e7930cf..04c43745f7 100644 --- a/sakura_core/io/CStream.h +++ b/sakura_core/io/CStream.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CTextStream.cpp b/sakura_core/io/CTextStream.cpp index 94b64d1c20..36630885fc 100644 --- a/sakura_core/io/CTextStream.cpp +++ b/sakura_core/io/CTextStream.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CTextStream.h b/sakura_core/io/CTextStream.h index 9113d5cd25..d7bed9223d 100644 --- a/sakura_core/io/CTextStream.h +++ b/sakura_core/io/CTextStream.h @@ -8,7 +8,7 @@ //将来はUTF-8等にすることにより、UNICODEデータの欠落が起こらないようにしたい。 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CZipFile.cpp b/sakura_core/io/CZipFile.cpp index a51eb0db1b..80dd3d6f10 100644 --- a/sakura_core/io/CZipFile.cpp +++ b/sakura_core/io/CZipFile.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2011, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/io/CZipFile.h b/sakura_core/io/CZipFile.h index ef20c47ae1..c9733bab80 100644 --- a/sakura_core/io/CZipFile.h +++ b/sakura_core/io/CZipFile.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2011, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CCookieManager.cpp b/sakura_core/macro/CCookieManager.cpp index 1ef93b0a97..887420c51b 100644 --- a/sakura_core/macro/CCookieManager.cpp +++ b/sakura_core/macro/CCookieManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CCookieManager.h b/sakura_core/macro/CCookieManager.h index 97aad900f8..8ad7e9b0cf 100644 --- a/sakura_core/macro/CCookieManager.h +++ b/sakura_core/macro/CCookieManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CEditorIfObj.cpp b/sakura_core/macro/CEditorIfObj.cpp index c05e64dd67..3ba681314b 100644 --- a/sakura_core/macro/CEditorIfObj.cpp +++ b/sakura_core/macro/CEditorIfObj.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CEditorIfObj.h b/sakura_core/macro/CEditorIfObj.h index d53df6965b..138ea52c30 100644 --- a/sakura_core/macro/CEditorIfObj.h +++ b/sakura_core/macro/CEditorIfObj.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CIfObj.cpp b/sakura_core/macro/CIfObj.cpp index fa0d53227d..cdace73d92 100644 --- a/sakura_core/macro/CIfObj.cpp +++ b/sakura_core/macro/CIfObj.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, FILE, zenryaku Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CIfObj.h b/sakura_core/macro/CIfObj.h index 08fb939083..a9cfdcd9a6 100644 --- a/sakura_core/macro/CIfObj.h +++ b/sakura_core/macro/CIfObj.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, 鬼, genta Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CKeyMacroMgr.cpp b/sakura_core/macro/CKeyMacroMgr.cpp index 95f3cdb814..e7943e004a 100644 --- a/sakura_core/macro/CKeyMacroMgr.cpp +++ b/sakura_core/macro/CKeyMacroMgr.cpp @@ -11,7 +11,7 @@ Copyright (C) 2001, aroka Copyright (C) 2002, YAZAKI, aroka, genta Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CKeyMacroMgr.h b/sakura_core/macro/CKeyMacroMgr.h index 8f6c5eb539..8e70db4fe3 100644 --- a/sakura_core/macro/CKeyMacroMgr.h +++ b/sakura_core/macro/CKeyMacroMgr.h @@ -7,7 +7,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, aroka Copyright (C) 2002, YAZAKI, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp index 85c1546a5c..e8e0e2af43 100644 --- a/sakura_core/macro/CMacro.cpp +++ b/sakura_core/macro/CMacro.cpp @@ -16,7 +16,7 @@ Copyright (C) 2008, nasukoji, ryoji Copyright (C) 2009, ryoji, nasukoji Copyright (C) 2011, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CMacro.h b/sakura_core/macro/CMacro.h index 8b47e5bd3a..19a9038e76 100644 --- a/sakura_core/macro/CMacro.h +++ b/sakura_core/macro/CMacro.h @@ -9,7 +9,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI Copyright (C) 2003, 鬼 - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CMacroFactory.cpp b/sakura_core/macro/CMacroFactory.cpp index 59456d1558..fb85b32718 100644 --- a/sakura_core/macro/CMacroFactory.cpp +++ b/sakura_core/macro/CMacroFactory.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2002, genta Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CMacroFactory.h b/sakura_core/macro/CMacroFactory.h index 8904cd8d40..2a8e273296 100644 --- a/sakura_core/macro/CMacroFactory.h +++ b/sakura_core/macro/CMacroFactory.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, genta Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CMacroManagerBase.cpp b/sakura_core/macro/CMacroManagerBase.cpp index 0f6a083e4f..5c3097eed7 100644 --- a/sakura_core/macro/CMacroManagerBase.cpp +++ b/sakura_core/macro/CMacroManagerBase.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CMacroManagerBase.h b/sakura_core/macro/CMacroManagerBase.h index 12f95f1731..80e88747ac 100644 --- a/sakura_core/macro/CMacroManagerBase.h +++ b/sakura_core/macro/CMacroManagerBase.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2002, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CPPA.cpp b/sakura_core/macro/CPPA.cpp index db1fc90191..0c9d9b90c3 100644 --- a/sakura_core/macro/CPPA.cpp +++ b/sakura_core/macro/CPPA.cpp @@ -10,7 +10,7 @@ Copyright (C) 2001, YAZAKI Copyright (C) 2002, YAZAKI, aroka, genta, Moca Copyright (C) 2003, Moca, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CPPA.h b/sakura_core/macro/CPPA.h index ca64bc0617..7183937902 100644 --- a/sakura_core/macro/CPPA.h +++ b/sakura_core/macro/CPPA.h @@ -10,7 +10,7 @@ Copyright (C) 2001, YAZAKI, genta Copyright (C) 2002, YAZAKI, Moca Copyright (C) 2003, genta, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CPPAMacroMgr.cpp b/sakura_core/macro/CPPAMacroMgr.cpp index 31e920c5eb..429d1ccdb3 100644 --- a/sakura_core/macro/CPPAMacroMgr.cpp +++ b/sakura_core/macro/CPPAMacroMgr.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2002, YAZAKI, genta Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CPPAMacroMgr.h b/sakura_core/macro/CPPAMacroMgr.h index aa1cb47b62..845027f204 100644 --- a/sakura_core/macro/CPPAMacroMgr.h +++ b/sakura_core/macro/CPPAMacroMgr.h @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, aroka Copyright (C) 2002, YAZAKI, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index ae15a56b3a..856911525d 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -18,7 +18,7 @@ Copyright (C) 2007, ryoji, maru Copyright (C) 2008, nasukoji, ryoji Copyright (C) 2011, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CSMacroMgr.h b/sakura_core/macro/CSMacroMgr.h index 9c34c3dae0..e25b66de50 100644 --- a/sakura_core/macro/CSMacroMgr.h +++ b/sakura_core/macro/CSMacroMgr.h @@ -9,7 +9,7 @@ Copyright (C) 2002, YAZAKI, genta Copyright (C) 2005, FILE Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CWSH.cpp b/sakura_core/macro/CWSH.cpp index 67fa41443c..2e1c76c804 100644 --- a/sakura_core/macro/CWSH.cpp +++ b/sakura_core/macro/CWSH.cpp @@ -10,7 +10,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, FILE, zenryaku Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CWSH.h b/sakura_core/macro/CWSH.h index 111cb1c424..a064642ead 100644 --- a/sakura_core/macro/CWSH.h +++ b/sakura_core/macro/CWSH.h @@ -10,7 +10,7 @@ /* Copyright (C) 2002, 鬼, genta Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/macro/CWSHIfObj.cpp b/sakura_core/macro/CWSHIfObj.cpp index b4bfd63bc9..da1cd602a2 100644 --- a/sakura_core/macro/CWSHIfObj.cpp +++ b/sakura_core/macro/CWSHIfObj.cpp @@ -9,7 +9,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, FILE, zenryaku Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CWSHIfObj.h b/sakura_core/macro/CWSHIfObj.h index 829000e2a7..a830747897 100644 --- a/sakura_core/macro/CWSHIfObj.h +++ b/sakura_core/macro/CWSHIfObj.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, 鬼, genta Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CWSHManager.cpp b/sakura_core/macro/CWSHManager.cpp index e972a4a5d5..04ad09baf8 100644 --- a/sakura_core/macro/CWSHManager.cpp +++ b/sakura_core/macro/CWSHManager.cpp @@ -9,7 +9,7 @@ Copyright (C) 2004, genta Copyright (C) 2005, FILE, zenryaku Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/macro/CWSHManager.h b/sakura_core/macro/CWSHManager.h index cf3791f4be..6c092aa08b 100644 --- a/sakura_core/macro/CWSHManager.h +++ b/sakura_core/macro/CWSHManager.h @@ -13,7 +13,7 @@ */ /* Copyright (C) 2002, 鬼, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/mem/CMemory.cpp b/sakura_core/mem/CMemory.cpp index 9d876dd815..9ef9792f8f 100644 --- a/sakura_core/mem/CMemory.cpp +++ b/sakura_core/mem/CMemory.cpp @@ -12,7 +12,7 @@ Copyright (C) 2003, genta, Moca, かろと Copyright (C) 2004, Moca Copyright (C) 2005, Moca, D.S.Koba - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CMemory.h b/sakura_core/mem/CMemory.h index 73c550dd79..5979380cc1 100644 --- a/sakura_core/mem/CMemory.h +++ b/sakura_core/mem/CMemory.h @@ -9,7 +9,7 @@ Copyright (C) 2001, jepro, Stonee Copyright (C) 2002, Moca, genta, aroka Copyright (C) 2005, D.S.Koba - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CMemoryIterator.h b/sakura_core/mem/CMemoryIterator.h index ef985b32b7..97d9870f35 100644 --- a/sakura_core/mem/CMemoryIterator.h +++ b/sakura_core/mem/CMemoryIterator.h @@ -8,7 +8,7 @@ Copyright (C) 2002, Yazaki Copyright (C) 2003, genta Copyright (C) 2005, D.S.Koba - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/mem/CNative.cpp b/sakura_core/mem/CNative.cpp index 27c26d25a4..39770e1ff0 100644 --- a/sakura_core/mem/CNative.cpp +++ b/sakura_core/mem/CNative.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CNative.h b/sakura_core/mem/CNative.h index 5f1dfcadc2..ad47f7994a 100644 --- a/sakura_core/mem/CNative.h +++ b/sakura_core/mem/CNative.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CNativeA.cpp b/sakura_core/mem/CNativeA.cpp index f6b5bf56b7..58e28aa857 100644 --- a/sakura_core/mem/CNativeA.cpp +++ b/sakura_core/mem/CNativeA.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CNativeA.h b/sakura_core/mem/CNativeA.h index 4728f9781e..a4f06bfb78 100644 --- a/sakura_core/mem/CNativeA.h +++ b/sakura_core/mem/CNativeA.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CNativeW.cpp b/sakura_core/mem/CNativeW.cpp index 5d4b98c629..9641999138 100644 --- a/sakura_core/mem/CNativeW.cpp +++ b/sakura_core/mem/CNativeW.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CNativeW.h b/sakura_core/mem/CNativeW.h index a3b2ee3cc5..891da32a88 100644 --- a/sakura_core/mem/CNativeW.h +++ b/sakura_core/mem/CNativeW.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CPoolResource.h b/sakura_core/mem/CPoolResource.h index d9a500773f..577284051e 100644 --- a/sakura_core/mem/CPoolResource.h +++ b/sakura_core/mem/CPoolResource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CRecycledBuffer.cpp b/sakura_core/mem/CRecycledBuffer.cpp index eab9d94615..b367358058 100644 --- a/sakura_core/mem/CRecycledBuffer.cpp +++ b/sakura_core/mem/CRecycledBuffer.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mem/CRecycledBuffer.h b/sakura_core/mem/CRecycledBuffer.h index b839912f07..6580803683 100644 --- a/sakura_core/mem/CRecycledBuffer.h +++ b/sakura_core/mem/CRecycledBuffer.h @@ -5,7 +5,7 @@ //取得したメモリブロックはCRecycledBufferの管理下にあるため、解放してはいけない。 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mfclike/CMyWnd.cpp b/sakura_core/mfclike/CMyWnd.cpp index 38d975a710..62e8a1445e 100644 --- a/sakura_core/mfclike/CMyWnd.cpp +++ b/sakura_core/mfclike/CMyWnd.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/mfclike/CMyWnd.h b/sakura_core/mfclike/CMyWnd.h index f8a89c02d2..c4c0c36086 100644 --- a/sakura_core/mfclike/CMyWnd.h +++ b/sakura_core/mfclike/CMyWnd.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/outline/CDlgFileTree.cpp b/sakura_core/outline/CDlgFileTree.cpp index 0aeffcce84..25fda72009 100644 --- a/sakura_core/outline/CDlgFileTree.cpp +++ b/sakura_core/outline/CDlgFileTree.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2010, Uchi Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/outline/CDlgFileTree.h b/sakura_core/outline/CDlgFileTree.h index 0de50d16a3..174cb95821 100644 --- a/sakura_core/outline/CDlgFileTree.h +++ b/sakura_core/outline/CDlgFileTree.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2014, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/outline/CDlgFuncList.cpp b/sakura_core/outline/CDlgFuncList.cpp index e8496cdac2..2bbd17e73a 100644 --- a/sakura_core/outline/CDlgFuncList.cpp +++ b/sakura_core/outline/CDlgFuncList.cpp @@ -17,7 +17,7 @@ Copyright (C) 2006, genta, ryoji Copyright (C) 2007, ryoji Copyright (C) 2010, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/outline/CDlgFuncList.h b/sakura_core/outline/CDlgFuncList.h index 057eda54e9..8653de58d5 100644 --- a/sakura_core/outline/CDlgFuncList.h +++ b/sakura_core/outline/CDlgFuncList.h @@ -13,7 +13,7 @@ Copyright (C) 2005, genta Copyright (C) 2006, aroka Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/outline/CFuncInfo.cpp b/sakura_core/outline/CFuncInfo.cpp index 602a38cd8d..9fb04fefe0 100644 --- a/sakura_core/outline/CFuncInfo.cpp +++ b/sakura_core/outline/CFuncInfo.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/outline/CFuncInfo.h b/sakura_core/outline/CFuncInfo.h index 1bc992bdae..2e979e8bd5 100644 --- a/sakura_core/outline/CFuncInfo.h +++ b/sakura_core/outline/CFuncInfo.h @@ -8,7 +8,7 @@ Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI Copyright (C) 2003, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/outline/CFuncInfoArr.cpp b/sakura_core/outline/CFuncInfoArr.cpp index 3cb9b92f7c..f391369987 100644 --- a/sakura_core/outline/CFuncInfoArr.cpp +++ b/sakura_core/outline/CFuncInfoArr.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/outline/CFuncInfoArr.h b/sakura_core/outline/CFuncInfoArr.h index 38479c53c4..bdc291bbae 100644 --- a/sakura_core/outline/CFuncInfoArr.h +++ b/sakura_core/outline/CFuncInfoArr.h @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/parse/CWordParse.cpp b/sakura_core/parse/CWordParse.cpp index 3e4a3c4aaa..829455ad58 100644 --- a/sakura_core/parse/CWordParse.cpp +++ b/sakura_core/parse/CWordParse.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/parse/CWordParse.h b/sakura_core/parse/CWordParse.h index 9bc1df5385..b27abe0646 100644 --- a/sakura_core/parse/CWordParse.h +++ b/sakura_core/parse/CWordParse.h @@ -2,7 +2,7 @@ //2007.09.30 kobake CDocLineMgr から分離 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CComplementIfObj.h b/sakura_core/plugin/CComplementIfObj.h index 6383445fcf..3a0bb4910a 100644 --- a/sakura_core/plugin/CComplementIfObj.h +++ b/sakura_core/plugin/CComplementIfObj.h @@ -5,7 +5,7 @@ /* Copyright (C) 2009, syat Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CDllPlugin.cpp b/sakura_core/plugin/CDllPlugin.cpp index f433565d8b..2f60861d1a 100644 --- a/sakura_core/plugin/CDllPlugin.cpp +++ b/sakura_core/plugin/CDllPlugin.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CDllPlugin.h b/sakura_core/plugin/CDllPlugin.h index 5039265f67..f53c34dea0 100644 --- a/sakura_core/plugin/CDllPlugin.h +++ b/sakura_core/plugin/CDllPlugin.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CJackManager.cpp b/sakura_core/plugin/CJackManager.cpp index 5f31ee9142..7950c16a33 100644 --- a/sakura_core/plugin/CJackManager.cpp +++ b/sakura_core/plugin/CJackManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CJackManager.h b/sakura_core/plugin/CJackManager.h index 6e4408da57..829241a2fa 100644 --- a/sakura_core/plugin/CJackManager.h +++ b/sakura_core/plugin/CJackManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/COutlineIfObj.h b/sakura_core/plugin/COutlineIfObj.h index f9e5548f7b..21a205d48a 100644 --- a/sakura_core/plugin/COutlineIfObj.h +++ b/sakura_core/plugin/COutlineIfObj.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CPlugin.cpp b/sakura_core/plugin/CPlugin.cpp index b47c91ab28..c0f45d4a64 100644 --- a/sakura_core/plugin/CPlugin.cpp +++ b/sakura_core/plugin/CPlugin.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CPlugin.h b/sakura_core/plugin/CPlugin.h index 6c374bc55b..e3412d9c28 100644 --- a/sakura_core/plugin/CPlugin.h +++ b/sakura_core/plugin/CPlugin.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CPluginIfObj.h b/sakura_core/plugin/CPluginIfObj.h index 34d1cf9193..af5b8cef7c 100644 --- a/sakura_core/plugin/CPluginIfObj.h +++ b/sakura_core/plugin/CPluginIfObj.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CPluginManager.cpp b/sakura_core/plugin/CPluginManager.cpp index dfcd5a1756..f2b0af9dc6 100644 --- a/sakura_core/plugin/CPluginManager.cpp +++ b/sakura_core/plugin/CPluginManager.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CPluginManager.h b/sakura_core/plugin/CPluginManager.h index 6db93c937d..42571ab021 100644 --- a/sakura_core/plugin/CPluginManager.h +++ b/sakura_core/plugin/CPluginManager.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CSmartIndentIfObj.h b/sakura_core/plugin/CSmartIndentIfObj.h index 3861c40d1d..56b8c195e2 100644 --- a/sakura_core/plugin/CSmartIndentIfObj.h +++ b/sakura_core/plugin/CSmartIndentIfObj.h @@ -5,7 +5,7 @@ /* Copyright (C) 2009, syat Copyright (C) 2010, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CWSHPlugin.cpp b/sakura_core/plugin/CWSHPlugin.cpp index 20a8349bcb..eb99f8180d 100644 --- a/sakura_core/plugin/CWSHPlugin.cpp +++ b/sakura_core/plugin/CWSHPlugin.cpp @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/plugin/CWSHPlugin.h b/sakura_core/plugin/CWSHPlugin.h index 2254b768ef..77ae61c718 100644 --- a/sakura_core/plugin/CWSHPlugin.h +++ b/sakura_core/plugin/CWSHPlugin.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/print/CPrint.cpp b/sakura_core/print/CPrint.cpp index 7c6ff926c2..5ebe659879 100644 --- a/sakura_core/print/CPrint.cpp +++ b/sakura_core/print/CPrint.cpp @@ -10,7 +10,7 @@ Copyright (C) 2001, hor Copyright (C) 2002, MIK Copyright (C) 2003, かろと - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/print/CPrint.h b/sakura_core/print/CPrint.h index e3936570da..44c7232d38 100644 --- a/sakura_core/print/CPrint.h +++ b/sakura_core/print/CPrint.h @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2003, かろと - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/print/CPrintPreview.cpp b/sakura_core/print/CPrintPreview.cpp index 6a3601915d..5044dfe97a 100644 --- a/sakura_core/print/CPrintPreview.cpp +++ b/sakura_core/print/CPrintPreview.cpp @@ -13,7 +13,7 @@ Copyright (C) 2008, nasukoji Copyright (C) 2012, ossan (ossan@ongs.net) Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/print/CPrintPreview.h b/sakura_core/print/CPrintPreview.h index ba5ff89ba7..a6e8af3712 100644 --- a/sakura_core/print/CPrintPreview.h +++ b/sakura_core/print/CPrintPreview.h @@ -7,7 +7,7 @@ /* Copyright (C) 2002, YAZAKI Copyright (C) 2003, かろと - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComBackup.cpp b/sakura_core/prop/CPropComBackup.cpp index a501fb16aa..77a9bff167 100644 --- a/sakura_core/prop/CPropComBackup.cpp +++ b/sakura_core/prop/CPropComBackup.cpp @@ -14,7 +14,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/prop/CPropComCustmenu.cpp b/sakura_core/prop/CPropComCustmenu.cpp index 7d1c73a66a..8362f7e93a 100644 --- a/sakura_core/prop/CPropComCustmenu.cpp +++ b/sakura_core/prop/CPropComCustmenu.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/prop/CPropComEdit.cpp b/sakura_core/prop/CPropComEdit.cpp index 6c1c929ba3..7fb4b44dbe 100644 --- a/sakura_core/prop/CPropComEdit.cpp +++ b/sakura_core/prop/CPropComEdit.cpp @@ -11,7 +11,7 @@ Copyright (C) 2003, KEITA Copyright (C) 2006, ryoji Copyright (C) 2007, genta, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComFile.cpp b/sakura_core/prop/CPropComFile.cpp index 209a9c06dd..aa57e86591 100644 --- a/sakura_core/prop/CPropComFile.cpp +++ b/sakura_core/prop/CPropComFile.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, YAZAKI, MIK, aroka, hor Copyright (C) 2004, genta, ryoji Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComFileName.cpp b/sakura_core/prop/CPropComFileName.cpp index 3cb67e545f..2d1d4494df 100644 --- a/sakura_core/prop/CPropComFileName.cpp +++ b/sakura_core/prop/CPropComFileName.cpp @@ -10,7 +10,7 @@ Copyright (C) 2003, Moca, KEITA Copyright (C) 2004, D.S.Koba Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComFormat.cpp b/sakura_core/prop/CPropComFormat.cpp index 87e2560807..a62f6fde54 100644 --- a/sakura_core/prop/CPropComFormat.cpp +++ b/sakura_core/prop/CPropComFormat.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, YAZAKI, MIK, aroka Copyright (C) 2003, KEITA Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/prop/CPropComGeneral.cpp b/sakura_core/prop/CPropComGeneral.cpp index b620efef42..a097ce61fd 100644 --- a/sakura_core/prop/CPropComGeneral.cpp +++ b/sakura_core/prop/CPropComGeneral.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComGrep.cpp b/sakura_core/prop/CPropComGrep.cpp index 1992c688f3..366209a831 100644 --- a/sakura_core/prop/CPropComGrep.cpp +++ b/sakura_core/prop/CPropComGrep.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, YAZAKI, MIK Copyright (C) 2003, KEITA Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/prop/CPropComHelper.cpp b/sakura_core/prop/CPropComHelper.cpp index bbb857b350..ab7ed1a68b 100644 --- a/sakura_core/prop/CPropComHelper.cpp +++ b/sakura_core/prop/CPropComHelper.cpp @@ -14,7 +14,7 @@ Copyright (C) 2009, ryoji Copyright (C) 2012, Moca Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComKeybind.cpp b/sakura_core/prop/CPropComKeybind.cpp index 67cf90e4c1..0b5e216abf 100644 --- a/sakura_core/prop/CPropComKeybind.cpp +++ b/sakura_core/prop/CPropComKeybind.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComKeyword.cpp b/sakura_core/prop/CPropComKeyword.cpp index d7c27a4703..9416305703 100644 --- a/sakura_core/prop/CPropComKeyword.cpp +++ b/sakura_core/prop/CPropComKeyword.cpp @@ -13,7 +13,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComMacro.cpp b/sakura_core/prop/CPropComMacro.cpp index fe8d060c65..228d913e27 100644 --- a/sakura_core/prop/CPropComMacro.cpp +++ b/sakura_core/prop/CPropComMacro.cpp @@ -11,7 +11,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComMainMenu.cpp b/sakura_core/prop/CPropComMainMenu.cpp index 3f0a8044cb..c5f55facf5 100644 --- a/sakura_core/prop/CPropComMainMenu.cpp +++ b/sakura_core/prop/CPropComMainMenu.cpp @@ -5,7 +5,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComPlugin.cpp b/sakura_core/prop/CPropComPlugin.cpp index 0b06296154..b1e2db3dd7 100644 --- a/sakura_core/prop/CPropComPlugin.cpp +++ b/sakura_core/prop/CPropComPlugin.cpp @@ -5,7 +5,7 @@ */ /* Copyright (C) 2009, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComStatusbar.cpp b/sakura_core/prop/CPropComStatusbar.cpp index bf16e8e883..8aab4a950b 100644 --- a/sakura_core/prop/CPropComStatusbar.cpp +++ b/sakura_core/prop/CPropComStatusbar.cpp @@ -12,7 +12,7 @@ Copyright (C) 2006, ryoji Copyright (C) 2007, genta Copyright (C) 2007, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComTab.cpp b/sakura_core/prop/CPropComTab.cpp index aac6bfb9aa..d3f59ecd66 100644 --- a/sakura_core/prop/CPropComTab.cpp +++ b/sakura_core/prop/CPropComTab.cpp @@ -14,7 +14,7 @@ Copyright (C) 2007, genta, ryoji Copyright (C) 2012, Moca Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropComToolbar.cpp b/sakura_core/prop/CPropComToolbar.cpp index ae202c9e04..068dad4a9e 100644 --- a/sakura_core/prop/CPropComToolbar.cpp +++ b/sakura_core/prop/CPropComToolbar.cpp @@ -11,7 +11,7 @@ Copyright (C) 2005, aroka Copyright (C) 2006, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropComWin.cpp b/sakura_core/prop/CPropComWin.cpp index 84caeea1cc..e29ba194a4 100644 --- a/sakura_core/prop/CPropComWin.cpp +++ b/sakura_core/prop/CPropComWin.cpp @@ -12,7 +12,7 @@ Copyright (C) 2004, Moca Copyright (C) 2006, ryoji, fon Copyright (C) 2007, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/prop/CPropCommon.cpp b/sakura_core/prop/CPropCommon.cpp index 711016e37a..ad96185f44 100644 --- a/sakura_core/prop/CPropCommon.cpp +++ b/sakura_core/prop/CPropCommon.cpp @@ -15,7 +15,7 @@ Copyright (C) 2009, nasukoji Copyright (C) 2010, Uchi Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/prop/CPropCommon.h b/sakura_core/prop/CPropCommon.h index c5c0ba5095..05036e9bc1 100644 --- a/sakura_core/prop/CPropCommon.h +++ b/sakura_core/prop/CPropCommon.h @@ -14,7 +14,7 @@ Copyright (C) 2007, genta, ryoji Copyright (C) 2010, Uchi Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CMRUFile.cpp b/sakura_core/recent/CMRUFile.cpp index d7c771798f..22d32c8b6a 100644 --- a/sakura_core/recent/CMRUFile.cpp +++ b/sakura_core/recent/CMRUFile.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, YAZAKI, Moca, genta Copyright (C) 2003, MIK Copyright (C) 2006, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/recent/CMRUFile.h b/sakura_core/recent/CMRUFile.h index f0e7cfae63..c2a9b9284a 100644 --- a/sakura_core/recent/CMRUFile.h +++ b/sakura_core/recent/CMRUFile.h @@ -10,7 +10,7 @@ Copyright (C) 2002, YAZAKI, aroka Copyright (C) 2003, MIK Copyright (C) 2004, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CMRUFolder.cpp b/sakura_core/recent/CMRUFolder.cpp index 0d1d4a9553..844471e4ae 100644 --- a/sakura_core/recent/CMRUFolder.cpp +++ b/sakura_core/recent/CMRUFolder.cpp @@ -9,7 +9,7 @@ Copyright (C) 2001, YAZAKI Copyright (C) 2002, YAZAKI, Moca, genta Copyright (C) 2003, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/recent/CMRUFolder.h b/sakura_core/recent/CMRUFolder.h index 65a53600db..390e754d15 100644 --- a/sakura_core/recent/CMRUFolder.h +++ b/sakura_core/recent/CMRUFolder.h @@ -9,7 +9,7 @@ Copyright (C) 2000, jepro Copyright (C) 2002, YAZAKI, aroka Copyright (C) 2003, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CMruListener.cpp b/sakura_core/recent/CMruListener.cpp index 770a63f401..e3031576be 100644 --- a/sakura_core/recent/CMruListener.cpp +++ b/sakura_core/recent/CMruListener.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CMruListener.h b/sakura_core/recent/CMruListener.h index 633e929735..fabd1b977c 100644 --- a/sakura_core/recent/CMruListener.h +++ b/sakura_core/recent/CMruListener.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecent.cpp b/sakura_core/recent/CRecent.cpp index 3b667ca697..a8b7161965 100644 --- a/sakura_core/recent/CRecent.cpp +++ b/sakura_core/recent/CRecent.cpp @@ -11,7 +11,7 @@ /* Copyright (C) 2003, MIK Copyright (C) 2005, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecent.h b/sakura_core/recent/CRecent.h index 9f89912c81..6768cd0c06 100644 --- a/sakura_core/recent/CRecent.h +++ b/sakura_core/recent/CRecent.h @@ -12,7 +12,7 @@ /* Copyright (C) 2003, MIK Copyright (C) 2005, MIK - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentCmd.cpp b/sakura_core/recent/CRecentCmd.cpp index 7ffd4bd6a9..67d52901de 100644 --- a/sakura_core/recent/CRecentCmd.cpp +++ b/sakura_core/recent/CRecentCmd.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentCmd.h b/sakura_core/recent/CRecentCmd.h index d26e10e53f..f158c2cd38 100644 --- a/sakura_core/recent/CRecentCmd.h +++ b/sakura_core/recent/CRecentCmd.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentCurDir.cpp b/sakura_core/recent/CRecentCurDir.cpp index 669e1daafa..ac235f5b17 100644 --- a/sakura_core/recent/CRecentCurDir.cpp +++ b/sakura_core/recent/CRecentCurDir.cpp @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2013, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentCurDir.h b/sakura_core/recent/CRecentCurDir.h index abd4a9b577..08e10ac8ca 100644 --- a/sakura_core/recent/CRecentCurDir.h +++ b/sakura_core/recent/CRecentCurDir.h @@ -2,7 +2,7 @@ /* Copyright (C) 2008, kobake Copyright (C) 2013, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentEditNode.cpp b/sakura_core/recent/CRecentEditNode.cpp index 90940c83bd..09e973abf2 100644 --- a/sakura_core/recent/CRecentEditNode.cpp +++ b/sakura_core/recent/CRecentEditNode.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentEditNode.h b/sakura_core/recent/CRecentEditNode.h index 8d40512131..24563d2601 100644 --- a/sakura_core/recent/CRecentEditNode.h +++ b/sakura_core/recent/CRecentEditNode.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExceptMru.cpp b/sakura_core/recent/CRecentExceptMru.cpp index b55a0c464d..3d91b5bdc5 100644 --- a/sakura_core/recent/CRecentExceptMru.cpp +++ b/sakura_core/recent/CRecentExceptMru.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExceptMru.h b/sakura_core/recent/CRecentExceptMru.h index 28999bb656..1df935f8f9 100644 --- a/sakura_core/recent/CRecentExceptMru.h +++ b/sakura_core/recent/CRecentExceptMru.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExcludeFile.cpp b/sakura_core/recent/CRecentExcludeFile.cpp index 8fed849ce6..ec2e09ab49 100644 --- a/sakura_core/recent/CRecentExcludeFile.cpp +++ b/sakura_core/recent/CRecentExcludeFile.cpp @@ -1,6 +1,6 @@ /*! @file - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExcludeFile.h b/sakura_core/recent/CRecentExcludeFile.h index 6e06f63733..ec69356403 100644 --- a/sakura_core/recent/CRecentExcludeFile.h +++ b/sakura_core/recent/CRecentExcludeFile.h @@ -1,6 +1,6 @@ /*! @file - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExcludeFolder.cpp b/sakura_core/recent/CRecentExcludeFolder.cpp index d793c07eab..b61ad6d28c 100644 --- a/sakura_core/recent/CRecentExcludeFolder.cpp +++ b/sakura_core/recent/CRecentExcludeFolder.cpp @@ -1,6 +1,6 @@ /*! @file - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentExcludeFolder.h b/sakura_core/recent/CRecentExcludeFolder.h index 67d0e62adb..6922e9d12b 100644 --- a/sakura_core/recent/CRecentExcludeFolder.h +++ b/sakura_core/recent/CRecentExcludeFolder.h @@ -1,6 +1,6 @@ /*! @file - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentFile.cpp b/sakura_core/recent/CRecentFile.cpp index 117228d40a..f8114041b5 100644 --- a/sakura_core/recent/CRecentFile.cpp +++ b/sakura_core/recent/CRecentFile.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentFile.h b/sakura_core/recent/CRecentFile.h index 49aa5c141f..2ae111e4de 100644 --- a/sakura_core/recent/CRecentFile.h +++ b/sakura_core/recent/CRecentFile.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentFolder.cpp b/sakura_core/recent/CRecentFolder.cpp index 256c9d9092..42296fdec6 100644 --- a/sakura_core/recent/CRecentFolder.cpp +++ b/sakura_core/recent/CRecentFolder.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentFolder.h b/sakura_core/recent/CRecentFolder.h index 9feb8feb6c..6399adc250 100644 --- a/sakura_core/recent/CRecentFolder.h +++ b/sakura_core/recent/CRecentFolder.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentGrepFile.cpp b/sakura_core/recent/CRecentGrepFile.cpp index 7eec1e3058..6863f9e5f2 100644 --- a/sakura_core/recent/CRecentGrepFile.cpp +++ b/sakura_core/recent/CRecentGrepFile.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentGrepFile.h b/sakura_core/recent/CRecentGrepFile.h index af98c6aa4b..78daa69988 100644 --- a/sakura_core/recent/CRecentGrepFile.h +++ b/sakura_core/recent/CRecentGrepFile.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentGrepFolder.cpp b/sakura_core/recent/CRecentGrepFolder.cpp index d519acf8af..06bee2926b 100644 --- a/sakura_core/recent/CRecentGrepFolder.cpp +++ b/sakura_core/recent/CRecentGrepFolder.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentGrepFolder.h b/sakura_core/recent/CRecentGrepFolder.h index f209a57159..25fafc8ed7 100644 --- a/sakura_core/recent/CRecentGrepFolder.h +++ b/sakura_core/recent/CRecentGrepFolder.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentImp.cpp b/sakura_core/recent/CRecentImp.cpp index 5aaf458778..5116ee3d1c 100644 --- a/sakura_core/recent/CRecentImp.cpp +++ b/sakura_core/recent/CRecentImp.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentImp.h b/sakura_core/recent/CRecentImp.h index c35abd84e6..ce85202c6a 100644 --- a/sakura_core/recent/CRecentImp.h +++ b/sakura_core/recent/CRecentImp.h @@ -2,7 +2,7 @@ // 各CRecent実装クラスのベースクラス /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentReplace.cpp b/sakura_core/recent/CRecentReplace.cpp index 926d0a77db..06365ce740 100644 --- a/sakura_core/recent/CRecentReplace.cpp +++ b/sakura_core/recent/CRecentReplace.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentReplace.h b/sakura_core/recent/CRecentReplace.h index 6b2377d6aa..6a6264ae05 100644 --- a/sakura_core/recent/CRecentReplace.h +++ b/sakura_core/recent/CRecentReplace.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentSearch.cpp b/sakura_core/recent/CRecentSearch.cpp index a10cb0e63d..95dd26786f 100644 --- a/sakura_core/recent/CRecentSearch.cpp +++ b/sakura_core/recent/CRecentSearch.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentSearch.h b/sakura_core/recent/CRecentSearch.h index 6ca3817565..9e0b43811a 100644 --- a/sakura_core/recent/CRecentSearch.h +++ b/sakura_core/recent/CRecentSearch.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentTagjumpKeyword.cpp b/sakura_core/recent/CRecentTagjumpKeyword.cpp index ac8621d911..acb9bbbd31 100644 --- a/sakura_core/recent/CRecentTagjumpKeyword.cpp +++ b/sakura_core/recent/CRecentTagjumpKeyword.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/CRecentTagjumpKeyword.h b/sakura_core/recent/CRecentTagjumpKeyword.h index 7f1f3da90f..aef85f51cd 100644 --- a/sakura_core/recent/CRecentTagjumpKeyword.h +++ b/sakura_core/recent/CRecentTagjumpKeyword.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/recent/SShare_History.h b/sakura_core/recent/SShare_History.h index a4ade260d8..7ce9b8a954 100644 --- a/sakura_core/recent/SShare_History.h +++ b/sakura_core/recent/SShare_History.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgKeywordSelect.cpp b/sakura_core/typeprop/CDlgKeywordSelect.cpp index 9b1f5f4637..03d7201c74 100644 --- a/sakura_core/typeprop/CDlgKeywordSelect.cpp +++ b/sakura_core/typeprop/CDlgKeywordSelect.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2005, MIK Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgKeywordSelect.h b/sakura_core/typeprop/CDlgKeywordSelect.h index 1a361e15d8..e1d7dd6251 100644 --- a/sakura_core/typeprop/CDlgKeywordSelect.h +++ b/sakura_core/typeprop/CDlgKeywordSelect.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2005, MIK, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgSameColor.cpp b/sakura_core/typeprop/CDlgSameColor.cpp index 0036084728..b75fd33942 100644 --- a/sakura_core/typeprop/CDlgSameColor.cpp +++ b/sakura_core/typeprop/CDlgSameColor.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgSameColor.h b/sakura_core/typeprop/CDlgSameColor.h index 5e1f526b95..628027038e 100644 --- a/sakura_core/typeprop/CDlgSameColor.h +++ b/sakura_core/typeprop/CDlgSameColor.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgTypeAscertain.cpp b/sakura_core/typeprop/CDlgTypeAscertain.cpp index b88d1a2764..efbe34db5c 100644 --- a/sakura_core/typeprop/CDlgTypeAscertain.cpp +++ b/sakura_core/typeprop/CDlgTypeAscertain.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgTypeAscertain.h b/sakura_core/typeprop/CDlgTypeAscertain.h index 6aa5abbe1b..b3fe4de9a5 100644 --- a/sakura_core/typeprop/CDlgTypeAscertain.h +++ b/sakura_core/typeprop/CDlgTypeAscertain.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CDlgTypeList.cpp b/sakura_core/typeprop/CDlgTypeList.cpp index 4dafbd388b..f32cc1625b 100644 --- a/sakura_core/typeprop/CDlgTypeList.cpp +++ b/sakura_core/typeprop/CDlgTypeList.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, MIK Copyright (C) 2006, ryoji Copyright (C) 2010, Uchi, Beta.Ito, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CDlgTypeList.h b/sakura_core/typeprop/CDlgTypeList.h index bc2b61032c..2a33db27b1 100644 --- a/sakura_core/typeprop/CDlgTypeList.h +++ b/sakura_core/typeprop/CDlgTypeList.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CImpExpManager.cpp b/sakura_core/typeprop/CImpExpManager.cpp index ecc2af8d4d..91f8a5265a 100644 --- a/sakura_core/typeprop/CImpExpManager.cpp +++ b/sakura_core/typeprop/CImpExpManager.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CImpExpManager.h b/sakura_core/typeprop/CImpExpManager.h index 4bd3e943b3..cae39085ea 100644 --- a/sakura_core/typeprop/CImpExpManager.h +++ b/sakura_core/typeprop/CImpExpManager.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2010, Uchi, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CPropTypes.cpp b/sakura_core/typeprop/CPropTypes.cpp index d007b4432a..51cb5e57ec 100644 --- a/sakura_core/typeprop/CPropTypes.cpp +++ b/sakura_core/typeprop/CPropTypes.cpp @@ -16,7 +16,7 @@ Copyright (C) 2008, nasukoji Copyright (C) 2009, ryoji, genta Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypes.h b/sakura_core/typeprop/CPropTypes.h index b722f22503..ef66082dc7 100644 --- a/sakura_core/typeprop/CPropTypes.h +++ b/sakura_core/typeprop/CPropTypes.h @@ -13,7 +13,7 @@ Copyright (C) 2005, MIK, aroka, genta Copyright (C) 2006, fon Copyright (C) 2010, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypesColor.cpp b/sakura_core/typeprop/CPropTypesColor.cpp index 79a77ab4b3..7f3071b097 100644 --- a/sakura_core/typeprop/CPropTypesColor.cpp +++ b/sakura_core/typeprop/CPropTypesColor.cpp @@ -15,7 +15,7 @@ Copyright (C) 2007, ryoji, genta Copyright (C) 2008, nasukoji Copyright (C) 2009, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypesKeyHelp.cpp b/sakura_core/typeprop/CPropTypesKeyHelp.cpp index 81afaeee78..1049026113 100644 --- a/sakura_core/typeprop/CPropTypesKeyHelp.cpp +++ b/sakura_core/typeprop/CPropTypesKeyHelp.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2006, fon, ryoji Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/typeprop/CPropTypesRegex.cpp b/sakura_core/typeprop/CPropTypesRegex.cpp index 2e8db77aa7..00286a8fc7 100644 --- a/sakura_core/typeprop/CPropTypesRegex.cpp +++ b/sakura_core/typeprop/CPropTypesRegex.cpp @@ -9,7 +9,7 @@ Copyright (C) 2002, MIK Copyright (C) 2003, MIK, KEITA Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypesScreen.cpp b/sakura_core/typeprop/CPropTypesScreen.cpp index 5415ff2de1..a87d09fa85 100644 --- a/sakura_core/typeprop/CPropTypesScreen.cpp +++ b/sakura_core/typeprop/CPropTypesScreen.cpp @@ -14,7 +14,7 @@ Copyright (C) 2007, ryoji, genta Copyright (C) 2008, nasukoji Copyright (C) 2009, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypesSupport.cpp b/sakura_core/typeprop/CPropTypesSupport.cpp index 19c3e0d134..a064ea8d81 100644 --- a/sakura_core/typeprop/CPropTypesSupport.cpp +++ b/sakura_core/typeprop/CPropTypesSupport.cpp @@ -14,7 +14,7 @@ Copyright (C) 2007, ryoji, genta Copyright (C) 2008, nasukoji Copyright (C) 2009, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/typeprop/CPropTypesWindow.cpp b/sakura_core/typeprop/CPropTypesWindow.cpp index 0031068556..fe447496ef 100644 --- a/sakura_core/typeprop/CPropTypesWindow.cpp +++ b/sakura_core/typeprop/CPropTypesWindow.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType.cpp b/sakura_core/types/CType.cpp index f3501fd66b..2e262088e5 100644 --- a/sakura_core/types/CType.cpp +++ b/sakura_core/types/CType.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType.h b/sakura_core/types/CType.h index dfef85180d..3a4203a705 100644 --- a/sakura_core/types/CType.h +++ b/sakura_core/types/CType.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CTypeSupport.cpp b/sakura_core/types/CTypeSupport.cpp index fa3b44b5c0..fb77c58f64 100644 --- a/sakura_core/types/CTypeSupport.cpp +++ b/sakura_core/types/CTypeSupport.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CTypeSupport.h b/sakura_core/types/CTypeSupport.h index 3faeb0db75..8656abcee4 100644 --- a/sakura_core/types/CTypeSupport.h +++ b/sakura_core/types/CTypeSupport.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Asm.cpp b/sakura_core/types/CType_Asm.cpp index 4a27431b05..c3b006bf83 100644 --- a/sakura_core/types/CType_Asm.cpp +++ b/sakura_core/types/CType_Asm.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Awk.cpp b/sakura_core/types/CType_Awk.cpp index 918dcb9876..56c92730ec 100644 --- a/sakura_core/types/CType_Awk.cpp +++ b/sakura_core/types/CType_Awk.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Basis.cpp b/sakura_core/types/CType_Basis.cpp index 6969e54b71..d6f8474855 100644 --- a/sakura_core/types/CType_Basis.cpp +++ b/sakura_core/types/CType_Basis.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Cobol.cpp b/sakura_core/types/CType_Cobol.cpp index dee58a5b63..83eab0c4d0 100644 --- a/sakura_core/types/CType_Cobol.cpp +++ b/sakura_core/types/CType_Cobol.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_CorbaIdl.cpp b/sakura_core/types/CType_CorbaIdl.cpp index c23d172ad3..93ce40dc24 100644 --- a/sakura_core/types/CType_CorbaIdl.cpp +++ b/sakura_core/types/CType_CorbaIdl.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Cpp.cpp b/sakura_core/types/CType_Cpp.cpp index 57d5e40cac..67720a4a26 100644 --- a/sakura_core/types/CType_Cpp.cpp +++ b/sakura_core/types/CType_Cpp.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Dos.cpp b/sakura_core/types/CType_Dos.cpp index 1dc4f36a03..7357e80609 100644 --- a/sakura_core/types/CType_Dos.cpp +++ b/sakura_core/types/CType_Dos.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Erlang.cpp b/sakura_core/types/CType_Erlang.cpp index 456f1cbda5..a1122309d1 100644 --- a/sakura_core/types/CType_Erlang.cpp +++ b/sakura_core/types/CType_Erlang.cpp @@ -7,7 +7,7 @@ */ /* Copyright (C) 2009, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Html.cpp b/sakura_core/types/CType_Html.cpp index 03b9989583..693969c10f 100644 --- a/sakura_core/types/CType_Html.cpp +++ b/sakura_core/types/CType_Html.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Ini.cpp b/sakura_core/types/CType_Ini.cpp index 528de4bcd7..3394a11866 100644 --- a/sakura_core/types/CType_Ini.cpp +++ b/sakura_core/types/CType_Ini.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Java.cpp b/sakura_core/types/CType_Java.cpp index c18ef07132..4b592f408c 100644 --- a/sakura_core/types/CType_Java.cpp +++ b/sakura_core/types/CType_Java.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Others.cpp b/sakura_core/types/CType_Others.cpp index 4344345add..c49974de4c 100644 --- a/sakura_core/types/CType_Others.cpp +++ b/sakura_core/types/CType_Others.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Pascal.cpp b/sakura_core/types/CType_Pascal.cpp index d4b4089274..88e7dd51c2 100644 --- a/sakura_core/types/CType_Pascal.cpp +++ b/sakura_core/types/CType_Pascal.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Perl.cpp b/sakura_core/types/CType_Perl.cpp index b377bd31fc..03ea6efe25 100644 --- a/sakura_core/types/CType_Perl.cpp +++ b/sakura_core/types/CType_Perl.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Python.cpp b/sakura_core/types/CType_Python.cpp index ea19df21c7..81aa162151 100644 --- a/sakura_core/types/CType_Python.cpp +++ b/sakura_core/types/CType_Python.cpp @@ -6,7 +6,7 @@ */ /* Copyright (C) 2007, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Rich.cpp b/sakura_core/types/CType_Rich.cpp index f517da0324..296e17069c 100644 --- a/sakura_core/types/CType_Rich.cpp +++ b/sakura_core/types/CType_Rich.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Sql.cpp b/sakura_core/types/CType_Sql.cpp index 872b3a673e..9dc2271423 100644 --- a/sakura_core/types/CType_Sql.cpp +++ b/sakura_core/types/CType_Sql.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Tex.cpp b/sakura_core/types/CType_Tex.cpp index 6ca370c8f1..6347cdb6b1 100644 --- a/sakura_core/types/CType_Tex.cpp +++ b/sakura_core/types/CType_Tex.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Text.cpp b/sakura_core/types/CType_Text.cpp index 4403257f23..7114b7aac5 100644 --- a/sakura_core/types/CType_Text.cpp +++ b/sakura_core/types/CType_Text.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/types/CType_Vb.cpp b/sakura_core/types/CType_Vb.cpp index b1c16dba83..9016433784 100644 --- a/sakura_core/types/CType_Vb.cpp +++ b/sakura_core/types/CType_Vb.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CGraphics.cpp b/sakura_core/uiparts/CGraphics.cpp index 4329f90f07..04968462f5 100644 --- a/sakura_core/uiparts/CGraphics.cpp +++ b/sakura_core/uiparts/CGraphics.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CGraphics.h b/sakura_core/uiparts/CGraphics.h index d88c93c266..cc06737a2f 100644 --- a/sakura_core/uiparts/CGraphics.h +++ b/sakura_core/uiparts/CGraphics.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CImageListMgr.cpp b/sakura_core/uiparts/CImageListMgr.cpp index 0d367edbd2..cb6fa26e3f 100644 --- a/sakura_core/uiparts/CImageListMgr.cpp +++ b/sakura_core/uiparts/CImageListMgr.cpp @@ -11,7 +11,7 @@ Copyright (C) 2003, Moca, genta, wmlhq Copyright (C) 2007, ryoji Copyright (C) 2010, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/uiparts/CImageListMgr.h b/sakura_core/uiparts/CImageListMgr.h index 5dbe8b0e66..c5377ca995 100644 --- a/sakura_core/uiparts/CImageListMgr.h +++ b/sakura_core/uiparts/CImageListMgr.h @@ -7,7 +7,7 @@ /* Copyright (C) 2000-2003, genta Copyright (C) 2003, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index f62011763d..40f574b2c8 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -14,7 +14,7 @@ Copyright (C) 2006, aroka, fon Copyright (C) 2007, ryoji Copyright (C) 2008, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/uiparts/CMenuDrawer.h b/sakura_core/uiparts/CMenuDrawer.h index 0b02534bc4..af7b8af203 100644 --- a/sakura_core/uiparts/CMenuDrawer.h +++ b/sakura_core/uiparts/CMenuDrawer.h @@ -10,7 +10,7 @@ Copyright (C) 2003, MIK Copyright (C) 2005, aroka, genta Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/uiparts/CSoundSet.cpp b/sakura_core/uiparts/CSoundSet.cpp index f4859b19e0..5ac7b340a6 100644 --- a/sakura_core/uiparts/CSoundSet.cpp +++ b/sakura_core/uiparts/CSoundSet.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CSoundSet.h b/sakura_core/uiparts/CSoundSet.h index 490f1426a5..86cabebdb8 100644 --- a/sakura_core/uiparts/CSoundSet.h +++ b/sakura_core/uiparts/CSoundSet.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CVisualProgress.cpp b/sakura_core/uiparts/CVisualProgress.cpp index 9b252f90c6..ceafe26d2f 100644 --- a/sakura_core/uiparts/CVisualProgress.cpp +++ b/sakura_core/uiparts/CVisualProgress.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CVisualProgress.h b/sakura_core/uiparts/CVisualProgress.h index 0b205f1881..e86e9d165f 100644 --- a/sakura_core/uiparts/CVisualProgress.h +++ b/sakura_core/uiparts/CVisualProgress.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/uiparts/CWaitCursor.cpp b/sakura_core/uiparts/CWaitCursor.cpp index 9a433c4be2..1499fb101b 100644 --- a/sakura_core/uiparts/CWaitCursor.cpp +++ b/sakura_core/uiparts/CWaitCursor.cpp @@ -5,7 +5,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/uiparts/CWaitCursor.h b/sakura_core/uiparts/CWaitCursor.h index e969fc205f..e609b28d7a 100644 --- a/sakura_core/uiparts/CWaitCursor.h +++ b/sakura_core/uiparts/CWaitCursor.h @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/uiparts/HandCursor.h b/sakura_core/uiparts/HandCursor.h index 872b2e995f..f955bb1a33 100644 --- a/sakura_core/uiparts/HandCursor.h +++ b/sakura_core/uiparts/HandCursor.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/MessageBoxF.cpp b/sakura_core/util/MessageBoxF.cpp index e8f2ef5363..ec60da392c 100644 --- a/sakura_core/util/MessageBoxF.cpp +++ b/sakura_core/util/MessageBoxF.cpp @@ -9,7 +9,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/MessageBoxF.h b/sakura_core/util/MessageBoxF.h index 2ff4c36715..06a3dff475 100644 --- a/sakura_core/util/MessageBoxF.h +++ b/sakura_core/util/MessageBoxF.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 1998-2001, Norio Nakatani - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/RegKey.h b/sakura_core/util/RegKey.h index ded31a11de..6c04a88ae4 100644 --- a/sakura_core/util/RegKey.h +++ b/sakura_core/util/RegKey.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/StaticType.h b/sakura_core/util/StaticType.h index c51cd507d8..a17cb124bd 100644 --- a/sakura_core/util/StaticType.h +++ b/sakura_core/util/StaticType.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/container.h b/sakura_core/util/container.h index 07d3563acf..ab8d7b7a70 100644 --- a/sakura_core/util/container.h +++ b/sakura_core/util/container.h @@ -6,7 +6,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/design_template.h b/sakura_core/util/design_template.h index da26e80ef2..de2b60d007 100644 --- a/sakura_core/util/design_template.h +++ b/sakura_core/util/design_template.h @@ -7,7 +7,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/file.cpp b/sakura_core/util/file.cpp index 2f8c6c8c88..aaf52e8319 100644 --- a/sakura_core/util/file.cpp +++ b/sakura_core/util/file.cpp @@ -2,7 +2,7 @@ Copyright (C) 2002, SUI Copyright (C) 2003, MIK Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/file.h b/sakura_core/util/file.h index 42a22c0fd6..2efdd904b4 100644 --- a/sakura_core/util/file.h +++ b/sakura_core/util/file.h @@ -2,7 +2,7 @@ /* Copyright (C) 2002, SUI Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/format.cpp b/sakura_core/util/format.cpp index 3ceee5a619..81d413b2e7 100644 --- a/sakura_core/util/format.cpp +++ b/sakura_core/util/format.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/format.h b/sakura_core/util/format.h index caf70c1af7..d151aee72b 100644 --- a/sakura_core/util/format.h +++ b/sakura_core/util/format.h @@ -2,7 +2,7 @@ // 2007.10.20 kobake 書式関連 /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/input.cpp b/sakura_core/util/input.cpp index 023fb5ddc7..246e88b921 100644 --- a/sakura_core/util/input.cpp +++ b/sakura_core/util/input.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/input.h b/sakura_core/util/input.h index 20d25ed6c6..801a2ab0b6 100644 --- a/sakura_core/util/input.h +++ b/sakura_core/util/input.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/module.cpp b/sakura_core/util/module.cpp index 7adf7b8b8a..5f653f87e3 100644 --- a/sakura_core/util/module.cpp +++ b/sakura_core/util/module.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/module.h b/sakura_core/util/module.h index 3bba339071..b5f9e42634 100644 --- a/sakura_core/util/module.h +++ b/sakura_core/util/module.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/ole_convert.cpp b/sakura_core/util/ole_convert.cpp index 56fde7cabb..6e0758db65 100644 --- a/sakura_core/util/ole_convert.cpp +++ b/sakura_core/util/ole_convert.cpp @@ -3,7 +3,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/ole_convert.h b/sakura_core/util/ole_convert.h index 6235ade18b..3c4569d96a 100644 --- a/sakura_core/util/ole_convert.h +++ b/sakura_core/util/ole_convert.h @@ -3,7 +3,7 @@ */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/os.cpp b/sakura_core/util/os.cpp index 9bf96d2d12..8e07c7dd96 100644 --- a/sakura_core/util/os.cpp +++ b/sakura_core/util/os.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/os.h b/sakura_core/util/os.h index 1fe16bde55..aa962d8618 100644 --- a/sakura_core/util/os.h +++ b/sakura_core/util/os.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/relation_tool.cpp b/sakura_core/util/relation_tool.cpp index e7c38f6554..43235e9c5c 100644 --- a/sakura_core/util/relation_tool.cpp +++ b/sakura_core/util/relation_tool.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/relation_tool.h b/sakura_core/util/relation_tool.h index ed602b17ce..6a070f501e 100644 --- a/sakura_core/util/relation_tool.h +++ b/sakura_core/util/relation_tool.h @@ -4,7 +4,7 @@ */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/shell.cpp b/sakura_core/util/shell.cpp index 2cee6ac4e1..b86213526f 100644 --- a/sakura_core/util/shell.cpp +++ b/sakura_core/util/shell.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/shell.h b/sakura_core/util/shell.h index b98e771390..da105d639a 100644 --- a/sakura_core/util/shell.h +++ b/sakura_core/util/shell.h @@ -3,7 +3,7 @@ // なんかシェルっぽい機能の関数群 /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/std_macro.h b/sakura_core/util/std_macro.h index bcd6856b25..1b0babb41a 100644 --- a/sakura_core/util/std_macro.h +++ b/sakura_core/util/std_macro.h @@ -2,7 +2,7 @@ //2007.10.18 kobake 作成 /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index 2b2ab2bdb1..efab81d74b 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index 74f586f60e..5656caf2d6 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/string_ex2.cpp b/sakura_core/util/string_ex2.cpp index 785461b9b5..3280bc7594 100644 --- a/sakura_core/util/string_ex2.cpp +++ b/sakura_core/util/string_ex2.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/string_ex2.h b/sakura_core/util/string_ex2.h index 15bc7df225..9756e7132d 100644 --- a/sakura_core/util/string_ex2.h +++ b/sakura_core/util/string_ex2.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/tchar_convert.cpp b/sakura_core/util/tchar_convert.cpp index 15ac4d702e..2de7e01fb0 100644 --- a/sakura_core/util/tchar_convert.cpp +++ b/sakura_core/util/tchar_convert.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/tchar_convert.h b/sakura_core/util/tchar_convert.h index 170fbd3c7f..9ee4795a70 100644 --- a/sakura_core/util/tchar_convert.h +++ b/sakura_core/util/tchar_convert.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/tchar_template.cpp b/sakura_core/util/tchar_template.cpp index 98bf0c2b0d..355276c0ac 100644 --- a/sakura_core/util/tchar_template.cpp +++ b/sakura_core/util/tchar_template.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/tchar_template.h b/sakura_core/util/tchar_template.h index fc158f1b40..5e5155f28b 100644 --- a/sakura_core/util/tchar_template.h +++ b/sakura_core/util/tchar_template.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/window.cpp b/sakura_core/util/window.cpp index bafb85aa0a..ac9dec87a2 100644 --- a/sakura_core/util/window.cpp +++ b/sakura_core/util/window.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 5d9ee496ad..181af5a245 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/zoom.cpp b/sakura_core/util/zoom.cpp index 694b157364..2fa238424a 100644 --- a/sakura_core/util/zoom.cpp +++ b/sakura_core/util/zoom.cpp @@ -2,7 +2,7 @@ @brief ズーム倍率算出 */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/util/zoom.h b/sakura_core/util/zoom.h index d2ba88bc01..431af9b9df 100644 --- a/sakura_core/util/zoom.h +++ b/sakura_core/util/zoom.h @@ -2,7 +2,7 @@ @brief ズーム倍率算出 */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/version.h b/sakura_core/version.h index e4176fc832..f75dceabdb 100644 --- a/sakura_core/version.h +++ b/sakura_core/version.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CCaret.cpp b/sakura_core/view/CCaret.cpp index bf6eadc4fa..d8c545f3e9 100644 --- a/sakura_core/view/CCaret.cpp +++ b/sakura_core/view/CCaret.cpp @@ -10,7 +10,7 @@ Copyright (C) 2011, Moca, syat Copyright (C) 2012, ryoji, Moca Copyright (C) 2013, Moca, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CCaret.h b/sakura_core/view/CCaret.h index 740beda434..0e4c97f849 100644 --- a/sakura_core/view/CCaret.h +++ b/sakura_core/view/CCaret.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index e55806fab1..108a59f8f1 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -17,7 +17,7 @@ Copyright (C) 2007, ryoji, じゅうじ, maru Copyright (C) 2009, nasukoji, ryoji Copyright (C) 2010, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView.h b/sakura_core/view/CEditView.h index 23c4dfed99..49c3bb00ff 100644 --- a/sakura_core/view/CEditView.h +++ b/sakura_core/view/CEditView.h @@ -16,7 +16,7 @@ Copyright (C) 2007, ryoji, maru Copyright (C) 2008, ryoji Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_CmdHokan.cpp b/sakura_core/view/CEditView_CmdHokan.cpp index a778bc4ca0..6f29a562cb 100644 --- a/sakura_core/view/CEditView_CmdHokan.cpp +++ b/sakura_core/view/CEditView_CmdHokan.cpp @@ -11,7 +11,7 @@ Copyright (C) 2003, Moca Copyright (C) 2004, Moca Copyright (C) 2005, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Cmdgrep.cpp b/sakura_core/view/CEditView_Cmdgrep.cpp index 661c33f181..bb53f70b18 100644 --- a/sakura_core/view/CEditView_Cmdgrep.cpp +++ b/sakura_core/view/CEditView_Cmdgrep.cpp @@ -10,7 +10,7 @@ Copyright (C) 2003, MIK Copyright (C) 2005, genta Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Cmdisrch.cpp b/sakura_core/view/CEditView_Cmdisrch.cpp index 5bea8f3798..b310e4c0ca 100644 --- a/sakura_core/view/CEditView_Cmdisrch.cpp +++ b/sakura_core/view/CEditView_Cmdisrch.cpp @@ -7,7 +7,7 @@ /* Copyright (C) 2004, isearch Copyright (C) 2005, genta, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Command.cpp b/sakura_core/view/CEditView_Command.cpp index 3d80829ed6..cd5fc838cb 100644 --- a/sakura_core/view/CEditView_Command.cpp +++ b/sakura_core/view/CEditView_Command.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_Command_New.cpp b/sakura_core/view/CEditView_Command_New.cpp index 69c371e317..a9e34b6343 100644 --- a/sakura_core/view/CEditView_Command_New.cpp +++ b/sakura_core/view/CEditView_Command_New.cpp @@ -14,7 +14,7 @@ Copyright (C) 2006, genta, Moca, fon Copyright (C) 2007, ryoji, maru Copyright (C) 2009, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Diff.cpp b/sakura_core/view/CEditView_Diff.cpp index 4703388292..675b2757ac 100644 --- a/sakura_core/view/CEditView_Diff.cpp +++ b/sakura_core/view/CEditView_Diff.cpp @@ -14,7 +14,7 @@ Copyright (C) 2005, maru Copyright (C) 2007, ryoji, kobake Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_ExecCmd.cpp b/sakura_core/view/CEditView_ExecCmd.cpp index 5f187f2da4..ea84ed44fa 100644 --- a/sakura_core/view/CEditView_ExecCmd.cpp +++ b/sakura_core/view/CEditView_ExecCmd.cpp @@ -15,7 +15,7 @@ Copyright (C) 2005, genta, MIK, novice, aroka, D.S.Koba, かろと, Moca Copyright (C) 2006, Moca, aroka, ryoji, fon, genta Copyright (C) 2007, ryoji, じゅうじ, maru - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Ime.cpp b/sakura_core/view/CEditView_Ime.cpp index bf3e06e23f..e4b7573e72 100644 --- a/sakura_core/view/CEditView_Ime.cpp +++ b/sakura_core/view/CEditView_Ime.cpp @@ -15,7 +15,7 @@ Copyright (C) 2005, genta, MIK, novice, aroka, D.S.Koba, かろと, Moca Copyright (C) 2006, Moca, aroka, ryoji, fon, genta Copyright (C) 2007, ryoji, じゅうじ, maru - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 2ee3fc85cd..6ac2937d0f 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -15,7 +15,7 @@ Copyright (C) 2005, genta, MIK, novice, aroka, D.S.Koba, かろと, Moca Copyright (C) 2006, Moca, aroka, ryoji, fon, genta Copyright (C) 2007, ryoji, じゅうじ, maru - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holders to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Paint.cpp b/sakura_core/view/CEditView_Paint.cpp index 1af26836c4..6d42eb6ca3 100644 --- a/sakura_core/view/CEditView_Paint.cpp +++ b/sakura_core/view/CEditView_Paint.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_Paint.h b/sakura_core/view/CEditView_Paint.h index c3640a1b9e..b1f176a2a5 100644 --- a/sakura_core/view/CEditView_Paint.h +++ b/sakura_core/view/CEditView_Paint.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_Paint_Bracket.cpp b/sakura_core/view/CEditView_Paint_Bracket.cpp index 4fc9bf0e75..107df52cb3 100644 --- a/sakura_core/view/CEditView_Paint_Bracket.cpp +++ b/sakura_core/view/CEditView_Paint_Bracket.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CEditView_Scroll.cpp b/sakura_core/view/CEditView_Scroll.cpp index ce46870642..7330b9408a 100644 --- a/sakura_core/view/CEditView_Scroll.cpp +++ b/sakura_core/view/CEditView_Scroll.cpp @@ -18,7 +18,7 @@ Copyright (C) 2009, nasukoji Copyright (C) 2010, Moca Copyright (C) 2012, ryoji, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/view/CEditView_Search.cpp b/sakura_core/view/CEditView_Search.cpp index 6a8edfed1d..3fe42ee925 100644 --- a/sakura_core/view/CEditView_Search.cpp +++ b/sakura_core/view/CEditView_Search.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CMiniMapView.cpp b/sakura_core/view/CMiniMapView.cpp index 8b01472bcf..7dfd7a00aa 100644 --- a/sakura_core/view/CMiniMapView.cpp +++ b/sakura_core/view/CMiniMapView.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CMiniMapView.h b/sakura_core/view/CMiniMapView.h index 8868b5e1ed..883b35235b 100644 --- a/sakura_core/view/CMiniMapView.h +++ b/sakura_core/view/CMiniMapView.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CRuler.cpp b/sakura_core/view/CRuler.cpp index 8b8389b851..29adc06910 100644 --- a/sakura_core/view/CRuler.cpp +++ b/sakura_core/view/CRuler.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CRuler.h b/sakura_core/view/CRuler.h index 287b28ee19..c2f6db3a32 100644 --- a/sakura_core/view/CRuler.h +++ b/sakura_core/view/CRuler.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextArea.cpp b/sakura_core/view/CTextArea.cpp index ac28afa8d9..d0db29c80f 100644 --- a/sakura_core/view/CTextArea.cpp +++ b/sakura_core/view/CTextArea.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextArea.h b/sakura_core/view/CTextArea.h index 92da7ba53b..a2ecc5f17a 100644 --- a/sakura_core/view/CTextArea.h +++ b/sakura_core/view/CTextArea.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextDrawer.cpp b/sakura_core/view/CTextDrawer.cpp index 0889740050..33e254f0e3 100644 --- a/sakura_core/view/CTextDrawer.cpp +++ b/sakura_core/view/CTextDrawer.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextDrawer.h b/sakura_core/view/CTextDrawer.h index 3430968f26..f053f067d6 100644 --- a/sakura_core/view/CTextDrawer.h +++ b/sakura_core/view/CTextDrawer.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextMetrics.cpp b/sakura_core/view/CTextMetrics.cpp index 2a5878c142..9ff53f1205 100644 --- a/sakura_core/view/CTextMetrics.cpp +++ b/sakura_core/view/CTextMetrics.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CTextMetrics.h b/sakura_core/view/CTextMetrics.h index ed52603490..b42046ceb0 100644 --- a/sakura_core/view/CTextMetrics.h +++ b/sakura_core/view/CTextMetrics.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2007, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewCalc.cpp b/sakura_core/view/CViewCalc.cpp index 0e21431bf7..f59d1d0315 100644 --- a/sakura_core/view/CViewCalc.cpp +++ b/sakura_core/view/CViewCalc.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewCalc.h b/sakura_core/view/CViewCalc.h index 998f733e27..d4b4645ce9 100644 --- a/sakura_core/view/CViewCalc.h +++ b/sakura_core/view/CViewCalc.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewFont.cpp b/sakura_core/view/CViewFont.cpp index a08facc633..e520a2df16 100644 --- a/sakura_core/view/CViewFont.cpp +++ b/sakura_core/view/CViewFont.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewFont.h b/sakura_core/view/CViewFont.h index 54b952faa4..6905e753b7 100644 --- a/sakura_core/view/CViewFont.h +++ b/sakura_core/view/CViewFont.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewParser.cpp b/sakura_core/view/CViewParser.cpp index 1767001135..d0ac6e9e67 100644 --- a/sakura_core/view/CViewParser.cpp +++ b/sakura_core/view/CViewParser.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewParser.h b/sakura_core/view/CViewParser.h index 458d7cb6d7..c80acc124b 100644 --- a/sakura_core/view/CViewParser.h +++ b/sakura_core/view/CViewParser.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewSelect.cpp b/sakura_core/view/CViewSelect.cpp index 863551c698..168e69d838 100644 --- a/sakura_core/view/CViewSelect.cpp +++ b/sakura_core/view/CViewSelect.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/CViewSelect.h b/sakura_core/view/CViewSelect.h index bdde13378d..29761f39f4 100644 --- a/sakura_core/view/CViewSelect.h +++ b/sakura_core/view/CViewSelect.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/DispPos.cpp b/sakura_core/view/DispPos.cpp index 56b61ae2d8..6d24a6f836 100644 --- a/sakura_core/view/DispPos.cpp +++ b/sakura_core/view/DispPos.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/DispPos.h b/sakura_core/view/DispPos.h index fb24303dfc..d1d657a81d 100644 --- a/sakura_core/view/DispPos.h +++ b/sakura_core/view/DispPos.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColorStrategy.cpp b/sakura_core/view/colors/CColorStrategy.cpp index 576c58e743..fbf7a66454 100644 --- a/sakura_core/view/colors/CColorStrategy.cpp +++ b/sakura_core/view/colors/CColorStrategy.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColorStrategy.h b/sakura_core/view/colors/CColorStrategy.h index 8edb07907b..712e718c7e 100644 --- a/sakura_core/view/colors/CColorStrategy.h +++ b/sakura_core/view/colors/CColorStrategy.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Comment.cpp b/sakura_core/view/colors/CColor_Comment.cpp index 11f0433d10..a8b2e28412 100644 --- a/sakura_core/view/colors/CColor_Comment.cpp +++ b/sakura_core/view/colors/CColor_Comment.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Comment.h b/sakura_core/view/colors/CColor_Comment.h index 8faf9c44d5..5ae3c7d226 100644 --- a/sakura_core/view/colors/CColor_Comment.h +++ b/sakura_core/view/colors/CColor_Comment.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Found.cpp b/sakura_core/view/colors/CColor_Found.cpp index 9b63f8dca6..c379468eb1 100644 --- a/sakura_core/view/colors/CColor_Found.cpp +++ b/sakura_core/view/colors/CColor_Found.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Found.h b/sakura_core/view/colors/CColor_Found.h index 54f9d6d4d4..1377e289e1 100644 --- a/sakura_core/view/colors/CColor_Found.h +++ b/sakura_core/view/colors/CColor_Found.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Heredoc.cpp b/sakura_core/view/colors/CColor_Heredoc.cpp index 1d8d34486a..471be4482b 100644 --- a/sakura_core/view/colors/CColor_Heredoc.cpp +++ b/sakura_core/view/colors/CColor_Heredoc.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Heredoc.h b/sakura_core/view/colors/CColor_Heredoc.h index cbb81db1b1..51bbfeba1b 100644 --- a/sakura_core/view/colors/CColor_Heredoc.h +++ b/sakura_core/view/colors/CColor_Heredoc.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2011, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_KeywordSet.cpp b/sakura_core/view/colors/CColor_KeywordSet.cpp index f3c926a37e..8586fdb421 100644 --- a/sakura_core/view/colors/CColor_KeywordSet.cpp +++ b/sakura_core/view/colors/CColor_KeywordSet.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_KeywordSet.h b/sakura_core/view/colors/CColor_KeywordSet.h index 47e15f9880..b7cf7507b8 100644 --- a/sakura_core/view/colors/CColor_KeywordSet.h +++ b/sakura_core/view/colors/CColor_KeywordSet.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Numeric.cpp b/sakura_core/view/colors/CColor_Numeric.cpp index 2adc902b4e..43cc11a505 100644 --- a/sakura_core/view/colors/CColor_Numeric.cpp +++ b/sakura_core/view/colors/CColor_Numeric.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Numeric.h b/sakura_core/view/colors/CColor_Numeric.h index c430c994ac..9839f27bb6 100644 --- a/sakura_core/view/colors/CColor_Numeric.h +++ b/sakura_core/view/colors/CColor_Numeric.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Quote.cpp b/sakura_core/view/colors/CColor_Quote.cpp index c5b12e0c74..fd119086a3 100644 --- a/sakura_core/view/colors/CColor_Quote.cpp +++ b/sakura_core/view/colors/CColor_Quote.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Quote.h b/sakura_core/view/colors/CColor_Quote.h index 92afc6c7c9..1c0b40f4a6 100644 --- a/sakura_core/view/colors/CColor_Quote.h +++ b/sakura_core/view/colors/CColor_Quote.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_RegexKeyword.cpp b/sakura_core/view/colors/CColor_RegexKeyword.cpp index bdae468f88..e12acbc1b0 100644 --- a/sakura_core/view/colors/CColor_RegexKeyword.cpp +++ b/sakura_core/view/colors/CColor_RegexKeyword.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_RegexKeyword.h b/sakura_core/view/colors/CColor_RegexKeyword.h index 9045e296eb..948f05492a 100644 --- a/sakura_core/view/colors/CColor_RegexKeyword.h +++ b/sakura_core/view/colors/CColor_RegexKeyword.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Url.cpp b/sakura_core/view/colors/CColor_Url.cpp index e1492def1d..b150fa1738 100644 --- a/sakura_core/view/colors/CColor_Url.cpp +++ b/sakura_core/view/colors/CColor_Url.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/CColor_Url.h b/sakura_core/view/colors/CColor_Url.h index f9d4235115..118309c121 100644 --- a/sakura_core/view/colors/CColor_Url.h +++ b/sakura_core/view/colors/CColor_Url.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/colors/EColorIndexType.h b/sakura_core/view/colors/EColorIndexType.h index 211a5dc0d6..e1500e17c4 100644 --- a/sakura_core/view/colors/EColorIndexType.h +++ b/sakura_core/view/colors/EColorIndexType.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigureManager.cpp b/sakura_core/view/figures/CFigureManager.cpp index 2aac1ce0a4..d42ce00cd7 100644 --- a/sakura_core/view/figures/CFigureManager.cpp +++ b/sakura_core/view/figures/CFigureManager.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigureManager.h b/sakura_core/view/figures/CFigureManager.h index d5cdd8b472..3fc6fd6ae8 100644 --- a/sakura_core/view/figures/CFigureManager.h +++ b/sakura_core/view/figures/CFigureManager.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigureStrategy.cpp b/sakura_core/view/figures/CFigureStrategy.cpp index 1dfaa07b25..a025fd642f 100644 --- a/sakura_core/view/figures/CFigureStrategy.cpp +++ b/sakura_core/view/figures/CFigureStrategy.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigureStrategy.h b/sakura_core/view/figures/CFigureStrategy.h index 6e683aa7c0..229b44af3f 100644 --- a/sakura_core/view/figures/CFigureStrategy.h +++ b/sakura_core/view/figures/CFigureStrategy.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Comma.cpp b/sakura_core/view/figures/CFigure_Comma.cpp index e21e2ba16c..7ebe840653 100644 --- a/sakura_core/view/figures/CFigure_Comma.cpp +++ b/sakura_core/view/figures/CFigure_Comma.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Comma.h b/sakura_core/view/figures/CFigure_Comma.h index 4f571fbfe8..23f4bb2ecb 100644 --- a/sakura_core/view/figures/CFigure_Comma.h +++ b/sakura_core/view/figures/CFigure_Comma.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2015, syat - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_CtrlCode.cpp b/sakura_core/view/figures/CFigure_CtrlCode.cpp index 8242c5c47e..25c0972b63 100644 --- a/sakura_core/view/figures/CFigure_CtrlCode.cpp +++ b/sakura_core/view/figures/CFigure_CtrlCode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_CtrlCode.h b/sakura_core/view/figures/CFigure_CtrlCode.h index f0f04ba9f6..f1d1be4273 100644 --- a/sakura_core/view/figures/CFigure_CtrlCode.h +++ b/sakura_core/view/figures/CFigure_CtrlCode.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Eol.cpp b/sakura_core/view/figures/CFigure_Eol.cpp index ea611264fe..c81d405d40 100644 --- a/sakura_core/view/figures/CFigure_Eol.cpp +++ b/sakura_core/view/figures/CFigure_Eol.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Eol.h b/sakura_core/view/figures/CFigure_Eol.h index 6d5d5fac77..8b9a0ae591 100644 --- a/sakura_core/view/figures/CFigure_Eol.h +++ b/sakura_core/view/figures/CFigure_Eol.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_HanSpace.cpp b/sakura_core/view/figures/CFigure_HanSpace.cpp index 42f7c2ba86..74d537cc18 100644 --- a/sakura_core/view/figures/CFigure_HanSpace.cpp +++ b/sakura_core/view/figures/CFigure_HanSpace.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_HanSpace.h b/sakura_core/view/figures/CFigure_HanSpace.h index 9818eb9c55..e5e20226cd 100644 --- a/sakura_core/view/figures/CFigure_HanSpace.h +++ b/sakura_core/view/figures/CFigure_HanSpace.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Tab.cpp b/sakura_core/view/figures/CFigure_Tab.cpp index 3eb3584d73..bb7ac3847c 100644 --- a/sakura_core/view/figures/CFigure_Tab.cpp +++ b/sakura_core/view/figures/CFigure_Tab.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_Tab.h b/sakura_core/view/figures/CFigure_Tab.h index d9bcfeeb0a..46cebda2b5 100644 --- a/sakura_core/view/figures/CFigure_Tab.h +++ b/sakura_core/view/figures/CFigure_Tab.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_ZenSpace.cpp b/sakura_core/view/figures/CFigure_ZenSpace.cpp index 290768fe49..90284036dc 100644 --- a/sakura_core/view/figures/CFigure_ZenSpace.cpp +++ b/sakura_core/view/figures/CFigure_ZenSpace.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/view/figures/CFigure_ZenSpace.h b/sakura_core/view/figures/CFigure_ZenSpace.h index 7f1ac7079b..8728235d46 100644 --- a/sakura_core/view/figures/CFigure_ZenSpace.h +++ b/sakura_core/view/figures/CFigure_ZenSpace.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CAutoScrollWnd.cpp b/sakura_core/window/CAutoScrollWnd.cpp index 93e5935d32..0401474c41 100644 --- a/sakura_core/window/CAutoScrollWnd.cpp +++ b/sakura_core/window/CAutoScrollWnd.cpp @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CAutoScrollWnd.h b/sakura_core/window/CAutoScrollWnd.h index 56a785a8c7..5f6e9d4917 100644 --- a/sakura_core/window/CAutoScrollWnd.h +++ b/sakura_core/window/CAutoScrollWnd.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2012, Moca - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index 475f90ff7e..a10cf68804 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -18,7 +18,7 @@ Copyright (C) 2010, ryoji, Moca、Uchi Copyright (C) 2011, ryoji Copyright (C) 2013, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CEditWnd.h b/sakura_core/window/CEditWnd.h index 72f7e91ec6..bc5b668eb6 100644 --- a/sakura_core/window/CEditWnd.h +++ b/sakura_core/window/CEditWnd.h @@ -17,7 +17,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2008, ryoji Copyright (C) 2009, nasukoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CMainStatusBar.cpp b/sakura_core/window/CMainStatusBar.cpp index df6a6eff94..503a1708c7 100644 --- a/sakura_core/window/CMainStatusBar.cpp +++ b/sakura_core/window/CMainStatusBar.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CMainStatusBar.h b/sakura_core/window/CMainStatusBar.h index 4720b5d2cd..2cdaac4393 100644 --- a/sakura_core/window/CMainStatusBar.h +++ b/sakura_core/window/CMainStatusBar.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CMainToolBar.cpp b/sakura_core/window/CMainToolBar.cpp index b3d2a4b15d..1a232d94c7 100644 --- a/sakura_core/window/CMainToolBar.cpp +++ b/sakura_core/window/CMainToolBar.cpp @@ -4,7 +4,7 @@ Copyright (C) 2008, kobake Copyright (C) 2010, Uchi, Moca Copyright (C) 2012, aroka, Uchi - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CMainToolBar.h b/sakura_core/window/CMainToolBar.h index 85b560ca35..f765b11c1d 100644 --- a/sakura_core/window/CMainToolBar.h +++ b/sakura_core/window/CMainToolBar.h @@ -1,7 +1,7 @@ /*! @file */ /* Copyright (C) 2008, kobake - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CSplitBoxWnd.cpp b/sakura_core/window/CSplitBoxWnd.cpp index 3399d5487b..73b5ac0ce3 100644 --- a/sakura_core/window/CSplitBoxWnd.cpp +++ b/sakura_core/window/CSplitBoxWnd.cpp @@ -8,7 +8,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CSplitBoxWnd.h b/sakura_core/window/CSplitBoxWnd.h index a2e7455fee..409d1e6270 100644 --- a/sakura_core/window/CSplitBoxWnd.h +++ b/sakura_core/window/CSplitBoxWnd.h @@ -6,7 +6,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CSplitterWnd.cpp b/sakura_core/window/CSplitterWnd.cpp index 9695cd9113..758f9777fd 100644 --- a/sakura_core/window/CSplitterWnd.cpp +++ b/sakura_core/window/CSplitterWnd.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, aroka, YAZAKI Copyright (C) 2003, MIK Copyright (C) 2007, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CSplitterWnd.h b/sakura_core/window/CSplitterWnd.h index 25fd3559eb..a0a4499637 100644 --- a/sakura_core/window/CSplitterWnd.h +++ b/sakura_core/window/CSplitterWnd.h @@ -7,7 +7,7 @@ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2002, aroka, YAZAKI - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CTabWnd.cpp b/sakura_core/window/CTabWnd.cpp index 15ae3472b1..084a198969 100644 --- a/sakura_core/window/CTabWnd.cpp +++ b/sakura_core/window/CTabWnd.cpp @@ -14,7 +14,7 @@ Copyright (C) 2009, ryoji Copyright (C) 2012, Moca, syat, novice, uchi Copyright (C) 2013, Moca, Uchi, aroka, novice, syat, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CTabWnd.h b/sakura_core/window/CTabWnd.h index 4ecd903a1d..b9101ff62c 100644 --- a/sakura_core/window/CTabWnd.h +++ b/sakura_core/window/CTabWnd.h @@ -12,7 +12,7 @@ Copyright (C) 2007, ryoji Copyright (C) 2012, Moca, syat Copyright (C) 2013, Uchi, aroka, novice, syat, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sakura_core/window/CTipWnd.cpp b/sakura_core/window/CTipWnd.cpp index 00e85544d8..ab37670bfc 100644 --- a/sakura_core/window/CTipWnd.cpp +++ b/sakura_core/window/CTipWnd.cpp @@ -10,7 +10,7 @@ Copyright (C) 2002, GAE Copyright (C) 2005, D.S.Koba Copyright (C) 2006, ryoji, genta - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CTipWnd.h b/sakura_core/window/CTipWnd.h index 31864dcd1e..d5c7495b4c 100644 --- a/sakura_core/window/CTipWnd.h +++ b/sakura_core/window/CTipWnd.h @@ -9,7 +9,7 @@ Copyright (C) 2001, asa-o Copyright (C) 2002, aroka Copyright (C) 2006, genta, fon - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CWnd.cpp b/sakura_core/window/CWnd.cpp index 65e1476f56..911c37ca94 100644 --- a/sakura_core/window/CWnd.cpp +++ b/sakura_core/window/CWnd.cpp @@ -9,7 +9,7 @@ Copyright (C) 2000, genta Copyright (C) 2003, MIK, KEITA Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/sakura_core/window/CWnd.h b/sakura_core/window/CWnd.h index 568601a3eb..6c74ffdce5 100644 --- a/sakura_core/window/CWnd.h +++ b/sakura_core/window/CWnd.h @@ -9,7 +9,7 @@ Copyright (C) 2002, aroka Copyright (C) 2003, MIK Copyright (C) 2006, ryoji - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This source code is designed for sakura editor. Please contact the copyright holder to use this code for other purpose. diff --git a/tests/compiletests/clayoutint_test.cpp.in b/tests/compiletests/clayoutint_test.cpp.in index 843a32fbae..499ff70771 100644 --- a/tests/compiletests/clayoutint_test.cpp.in +++ b/tests/compiletests/clayoutint_test.cpp.in @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/StartEditorProcessForTest.h b/tests/unittests/StartEditorProcessForTest.h index 01e8de67e1..3e25a55e9f 100644 --- a/tests/unittests/StartEditorProcessForTest.h +++ b/tests/unittests/StartEditorProcessForTest.h @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/code-main.cpp b/tests/unittests/code-main.cpp index b531d3abff..863d79e228 100644 --- a/tests/unittests/code-main.cpp +++ b/tests/unittests/code-main.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/coverage.cpp b/tests/unittests/coverage.cpp index 10cf18d8da..0fc8dcaa40 100644 --- a/tests/unittests/coverage.cpp +++ b/tests/unittests/coverage.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-StdControl.cpp b/tests/unittests/test-StdControl.cpp index b2ec2eafb4..4044b4872c 100644 --- a/tests/unittests/test-StdControl.cpp +++ b/tests/unittests/test-StdControl.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index 3be8a100ca..c4330bc81b 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021 Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-ccodebase.cpp b/tests/unittests/test-ccodebase.cpp index 001235122e..13bde9d1ad 100644 --- a/tests/unittests/test-ccodebase.cpp +++ b/tests/unittests/test-ccodebase.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-ccommandline.cpp b/tests/unittests/test-ccommandline.cpp index 4ffa1878ac..d28f508e66 100644 --- a/tests/unittests/test-ccommandline.cpp +++ b/tests/unittests/test-ccommandline.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cconvert.cpp b/tests/unittests/test-cconvert.cpp index b77fe42b39..5ac2b35637 100644 --- a/tests/unittests/test-cconvert.cpp +++ b/tests/unittests/test-cconvert.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdecode.cpp b/tests/unittests/test-cdecode.cpp index 457a99b76c..114352e3b8 100644 --- a/tests/unittests/test-cdecode.cpp +++ b/tests/unittests/test-cdecode.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdlgopenfile.cpp b/tests/unittests/test-cdlgopenfile.cpp index 90bc235cb9..d70a0f841e 100644 --- a/tests/unittests/test-cdlgopenfile.cpp +++ b/tests/unittests/test-cdlgopenfile.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdlgprofilemgr.cpp b/tests/unittests/test-cdlgprofilemgr.cpp index 22c99ee5ea..9bdbc46cc8 100644 --- a/tests/unittests/test-cdlgprofilemgr.cpp +++ b/tests/unittests/test-cdlgprofilemgr.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdocline.cpp b/tests/unittests/test-cdocline.cpp index 2093309f83..6e01e292e9 100644 --- a/tests/unittests/test-cdocline.cpp +++ b/tests/unittests/test-cdocline.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdoclinemgr.cpp b/tests/unittests/test-cdoclinemgr.cpp index 5bd5de0ba9..5447280349 100644 --- a/tests/unittests/test-cdoclinemgr.cpp +++ b/tests/unittests/test-cdoclinemgr.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cdoctypemanager.cpp b/tests/unittests/test-cdoctypemanager.cpp index ff946e5028..802ad4efb8 100644 --- a/tests/unittests/test-cdoctypemanager.cpp +++ b/tests/unittests/test-cdoctypemanager.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-ceol.cpp b/tests/unittests/test-ceol.cpp index a3a612fd09..537f654521 100644 --- a/tests/unittests/test-ceol.cpp +++ b/tests/unittests/test-ceol.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cerrorinfo.cpp b/tests/unittests/test-cerrorinfo.cpp index 32124cdb5b..e479040428 100644 --- a/tests/unittests/test-cerrorinfo.cpp +++ b/tests/unittests/test-cerrorinfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cfileext.cpp b/tests/unittests/test-cfileext.cpp index cf65b9fd27..3b9a569eb1 100644 --- a/tests/unittests/test-cfileext.cpp +++ b/tests/unittests/test-cfileext.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-charcode.cpp b/tests/unittests/test-charcode.cpp index 1a5c32d3c0..47f4512a7a 100644 --- a/tests/unittests/test-charcode.cpp +++ b/tests/unittests/test-charcode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-clayoutint.cpp b/tests/unittests/test-clayoutint.cpp index b3a708c81c..73db76f1b9 100644 --- a/tests/unittests/test-clayoutint.cpp +++ b/tests/unittests/test-clayoutint.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cmemory.cpp b/tests/unittests/test-cmemory.cpp index 5c49c904c0..06b981cd71 100644 --- a/tests/unittests/test-cmemory.cpp +++ b/tests/unittests/test-cmemory.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cnative.cpp b/tests/unittests/test-cnative.cpp index 6a795fd4f2..a0e4b02ef5 100644 --- a/tests/unittests/test-cnative.cpp +++ b/tests/unittests/test-cnative.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cprofile.cpp b/tests/unittests/test-cprofile.cpp index f8cbbb24b7..07aafe6e84 100644 --- a/tests/unittests/test-cprofile.cpp +++ b/tests/unittests/test-cprofile.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-crunningtimer.cpp b/tests/unittests/test-crunningtimer.cpp index 5f13990105..e99f16a7df 100644 --- a/tests/unittests/test-crunningtimer.cpp +++ b/tests/unittests/test-crunningtimer.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-csakuraenvironment.cpp b/tests/unittests/test-csakuraenvironment.cpp index b7d5eda7ae..743719c713 100644 --- a/tests/unittests/test-csakuraenvironment.cpp +++ b/tests/unittests/test-csakuraenvironment.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-csearchagent.cpp b/tests/unittests/test-csearchagent.cpp index feb4baf58f..f33de0a006 100644 --- a/tests/unittests/test-csearchagent.cpp +++ b/tests/unittests/test-csearchagent.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-ctextmetrics.cpp b/tests/unittests/test-ctextmetrics.cpp index 1b41224f4c..915fc1526e 100644 --- a/tests/unittests/test-ctextmetrics.cpp +++ b/tests/unittests/test-ctextmetrics.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-cwordparse.cpp b/tests/unittests/test-cwordparse.cpp index 2f1b62154b..79d2b2fc99 100644 --- a/tests/unittests/test-cwordparse.cpp +++ b/tests/unittests/test-cwordparse.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-czipfile.cpp b/tests/unittests/test-czipfile.cpp index 9565bbb485..07e1ef9744 100644 --- a/tests/unittests/test-czipfile.cpp +++ b/tests/unittests/test-czipfile.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021 Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-design_template.cpp b/tests/unittests/test-design_template.cpp index 6d06a8e12a..cc838d7323 100644 --- a/tests/unittests/test-design_template.cpp +++ b/tests/unittests/test-design_template.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021 Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-editinfo.cpp b/tests/unittests/test-editinfo.cpp index 3c0ca58b9c..689898e4c9 100644 --- a/tests/unittests/test-editinfo.cpp +++ b/tests/unittests/test-editinfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-file.cpp b/tests/unittests/test-file.cpp index ec59b6fba8..33d41810d7 100644 --- a/tests/unittests/test-file.cpp +++ b/tests/unittests/test-file.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-format.cpp b/tests/unittests/test-format.cpp index 8ad200c2df..39acd1981f 100644 --- a/tests/unittests/test-format.cpp +++ b/tests/unittests/test-format.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-grepinfo.cpp b/tests/unittests/test-grepinfo.cpp index d9b0341312..ee0c279ef5 100644 --- a/tests/unittests/test-grepinfo.cpp +++ b/tests/unittests/test-grepinfo.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-int2dec.cpp b/tests/unittests/test-int2dec.cpp index 42e0a91f37..a3aeb540d4 100644 --- a/tests/unittests/test-int2dec.cpp +++ b/tests/unittests/test-int2dec.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-is_mailaddress.cpp b/tests/unittests/test-is_mailaddress.cpp index 69af569eed..3b131ce3f4 100644 --- a/tests/unittests/test-is_mailaddress.cpp +++ b/tests/unittests/test-is_mailaddress.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-loadstring.cpp b/tests/unittests/test-loadstring.cpp index 024e3614ee..229a47b919 100644 --- a/tests/unittests/test-loadstring.cpp +++ b/tests/unittests/test-loadstring.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-mydevmode.cpp b/tests/unittests/test-mydevmode.cpp index 6c452165d9..7f551a7fcf 100644 --- a/tests/unittests/test-mydevmode.cpp +++ b/tests/unittests/test-mydevmode.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-parameterized.cpp b/tests/unittests/test-parameterized.cpp index 4eaa1c5347..9f171ad0e4 100644 --- a/tests/unittests/test-parameterized.cpp +++ b/tests/unittests/test-parameterized.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-printECodeType.cpp b/tests/unittests/test-printECodeType.cpp index 7a5c72a449..bab20c0a15 100644 --- a/tests/unittests/test-printECodeType.cpp +++ b/tests/unittests/test-printECodeType.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-printEFunctionCode.cpp b/tests/unittests/test-printEFunctionCode.cpp index 181eb0a004..d547d97165 100644 --- a/tests/unittests/test-printEFunctionCode.cpp +++ b/tests/unittests/test-printEFunctionCode.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-sample-disabled.cpp b/tests/unittests/test-sample-disabled.cpp index fa60340f3b..30b6ee8f87 100644 --- a/tests/unittests/test-sample-disabled.cpp +++ b/tests/unittests/test-sample-disabled.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-sample.cpp b/tests/unittests/test-sample.cpp index ab38870630..f646261235 100644 --- a/tests/unittests/test-sample.cpp +++ b/tests/unittests/test-sample.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-ssearchoption.cpp b/tests/unittests/test-ssearchoption.cpp index 94377ae292..cf7e0bb66a 100644 --- a/tests/unittests/test-ssearchoption.cpp +++ b/tests/unittests/test-ssearchoption.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-statictype.cpp b/tests/unittests/test-statictype.cpp index 1ef307c696..b66b550d05 100644 --- a/tests/unittests/test-statictype.cpp +++ b/tests/unittests/test-statictype.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021 Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index c3412a60d0..e85ac41075 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-winmain.cpp b/tests/unittests/test-winmain.cpp index da6b49be0a..bc4a2350e4 100644 --- a/tests/unittests/test-winmain.cpp +++ b/tests/unittests/test-winmain.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2018-2021, Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tests/unittests/test-zoom.cpp b/tests/unittests/test-zoom.cpp index 289ea58f66..f262d67eec 100644 --- a/tests/unittests/test-zoom.cpp +++ b/tests/unittests/test-zoom.cpp @@ -1,6 +1,6 @@ /*! @file */ /* - Copyright (C) 2021, Sakura Editor Organization + Copyright (C) 2021-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter.Test/EncoderEscapingFallbackTest.cs b/tools/ChmSourceConverter/ChmSourceConverter.Test/EncoderEscapingFallbackTest.cs index 2d61e07a63..4d65a557f4 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter.Test/EncoderEscapingFallbackTest.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter.Test/EncoderEscapingFallbackTest.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverterApp.cs b/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverterApp.cs index d69ed08353..f71258d965 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverterApp.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/ChmSourceConverterApp.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallback.cs b/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallback.cs index a3315371ef..385b083204 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallback.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallback.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallbackBuffer.cs b/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallbackBuffer.cs index 2a093f253f..a168bc0752 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallbackBuffer.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/EncoderEscapingFallbackBuffer.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/FileContents.cs b/tools/ChmSourceConverter/ChmSourceConverter/FileContents.cs index 9b9cb1e989..10d6ca2223 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/FileContents.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/FileContents.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/LineEnumerator.cs b/tools/ChmSourceConverter/ChmSourceConverter/LineEnumerator.cs index a6c9125ff1..e800cd91b2 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/LineEnumerator.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/LineEnumerator.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/ChmSourceConverter/ChmSourceConverter/Program.cs b/tools/ChmSourceConverter/ChmSourceConverter/Program.cs index 9c74408a48..31a76d9dea 100644 --- a/tools/ChmSourceConverter/ChmSourceConverter/Program.cs +++ b/tools/ChmSourceConverter/ChmSourceConverter/Program.cs @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Sakura Editor Organization + Copyright (C) 2018-2022, Sakura Editor Organization This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/tools/macro/CopyDirPath/CopyDirPath.js b/tools/macro/CopyDirPath/CopyDirPath.js index 3302612aec..70049ececc 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.js +++ b/tools/macro/CopyDirPath/CopyDirPath.js @@ -1,6 +1,6 @@ // MIT License // -// Copyright (c) 2018 Sakura Editor Organization +// Copyright (C) 2018-2022, 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 diff --git a/tools/macro/CopyDirPath/CopyDirPath.mac b/tools/macro/CopyDirPath/CopyDirPath.mac index 3302612aec..70049ececc 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.mac +++ b/tools/macro/CopyDirPath/CopyDirPath.mac @@ -1,6 +1,6 @@ // MIT License // -// Copyright (c) 2018 Sakura Editor Organization +// Copyright (C) 2018-2022, 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 diff --git a/tools/macro/CopyDirPath/CopyDirPath.vbs b/tools/macro/CopyDirPath/CopyDirPath.vbs index 9810f94899..e1a1f8694a 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.vbs +++ b/tools/macro/CopyDirPath/CopyDirPath.vbs @@ -1,6 +1,6 @@ ' MIT License ' -' Copyright (c) 2018 Sakura Editor Organization +' Copyright (C) 2018-2022, 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 From 21c06c6b7c4efdecc1330ded1408477cb06de359 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Sat, 5 Feb 2022 16:50:19 +0900 Subject: [PATCH 048/129] =?UTF-8?q?ToolBarTools:=20=E3=82=BD=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=94=E3=83=BC=E3=83=A9=E3=82=A4=E3=83=88=E8=A1=A8=E8=A8=98?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/ToolBarTools/ToolBarImageCommon/Bmp.cs | 25 ++++++++++++++++++- .../ReadWriteStructWithAllocGCHandle.cs | 25 ++++++++++++++++++- .../ToolBarImageMuxer/BmpFileComparer.cs | 25 ++++++++++++++++++- .../ToolBarImageMuxer/BmpMuxer.cs | 25 ++++++++++++++++++- .../ToolBarTools/ToolBarImageMuxer/Program.cs | 25 ++++++++++++++++++- .../ToolBarImageSplitter/BmpSplitter.cs | 25 ++++++++++++++++++- .../ToolBarImageSplitter/Program.cs | 25 ++++++++++++++++++- 7 files changed, 168 insertions(+), 7 deletions(-) diff --git a/tools/ToolBarTools/ToolBarImageCommon/Bmp.cs b/tools/ToolBarTools/ToolBarImageCommon/Bmp.cs index 9a5e47bcbf..9a985eba12 100644 --- a/tools/ToolBarTools/ToolBarImageCommon/Bmp.cs +++ b/tools/ToolBarTools/ToolBarImageCommon/Bmp.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/tools/ToolBarTools/ToolBarImageCommon/ReadWriteStructWithAllocGCHandle.cs b/tools/ToolBarTools/ToolBarImageCommon/ReadWriteStructWithAllocGCHandle.cs index 4e5528a1b3..17634c1eb5 100644 --- a/tools/ToolBarTools/ToolBarImageCommon/ReadWriteStructWithAllocGCHandle.cs +++ b/tools/ToolBarTools/ToolBarImageCommon/ReadWriteStructWithAllocGCHandle.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.IO; using System.Collections.Generic; using System.Text; diff --git a/tools/ToolBarTools/ToolBarImageMuxer/BmpFileComparer.cs b/tools/ToolBarTools/ToolBarImageMuxer/BmpFileComparer.cs index 75a75a5f12..6b485033e2 100644 --- a/tools/ToolBarTools/ToolBarImageMuxer/BmpFileComparer.cs +++ b/tools/ToolBarTools/ToolBarImageMuxer/BmpFileComparer.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/tools/ToolBarTools/ToolBarImageMuxer/BmpMuxer.cs b/tools/ToolBarTools/ToolBarImageMuxer/BmpMuxer.cs index c6d5d5be39..8a3f11ae42 100644 --- a/tools/ToolBarTools/ToolBarImageMuxer/BmpMuxer.cs +++ b/tools/ToolBarTools/ToolBarImageMuxer/BmpMuxer.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/tools/ToolBarTools/ToolBarImageMuxer/Program.cs b/tools/ToolBarTools/ToolBarImageMuxer/Program.cs index f6fe6c3a7f..866bca8335 100644 --- a/tools/ToolBarTools/ToolBarImageMuxer/Program.cs +++ b/tools/ToolBarTools/ToolBarImageMuxer/Program.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/tools/ToolBarTools/ToolBarImageSplitter/BmpSplitter.cs b/tools/ToolBarTools/ToolBarImageSplitter/BmpSplitter.cs index a85f911033..34c964daa7 100644 --- a/tools/ToolBarTools/ToolBarImageSplitter/BmpSplitter.cs +++ b/tools/ToolBarTools/ToolBarImageSplitter/BmpSplitter.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/tools/ToolBarTools/ToolBarImageSplitter/Program.cs b/tools/ToolBarTools/ToolBarImageSplitter/Program.cs index fb21f82bbf..51ad7ca4d5 100644 --- a/tools/ToolBarTools/ToolBarImageSplitter/Program.cs +++ b/tools/ToolBarTools/ToolBarImageSplitter/Program.cs @@ -1,4 +1,27 @@ -using System; +/* + Copyright (C) 2020-2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + */ +using System; using System.Collections.Generic; using System.Linq; using System.Text; From fc5aadc26b86b02b181da198dc02c830186223a5 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:06:58 +0900 Subject: [PATCH 049/129] =?UTF-8?q?CI=E3=81=AE=E5=AE=9F=E8=A1=8C=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=81=8B=E3=82=89=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?= =?UTF-8?q?=E5=90=8D=E3=82=92=E9=99=A4=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 7 ------- azure-pipelines.yml | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index ed519cbc39..cb48fde50a 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -4,9 +4,6 @@ name: build sakura # events but only for the master branch on: push: - branches: - - master - - feature/* paths-ignore: - '**/*.md' - .gitignore @@ -16,10 +13,6 @@ on: - 'ci/azure-pipelines/template*.yml' pull_request: - branches: - - master - - feature/* - - release/* paths-ignore: - '**/*.md' - .gitignore diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 070593638f..eb68fbe545 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,12 +4,6 @@ # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops&viewFallbackFrom=vsts&tabs=yaml ############################################################################################################################### trigger: - branches: - include: - - master - - develop - - feature/* - - revert-* paths: exclude: - .github/* @@ -45,12 +39,6 @@ trigger: # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops&tabs=yaml#pull-request-validation ############################################################################################################################### pr: - branches: - include: - - master - - develop - - feature/* - - revert-* paths: exclude: - .github/* From 95e4ebf75f908f1b15229104b1b104c7e9ed1fcd Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:46:35 +0900 Subject: [PATCH 050/129] =?UTF-8?q?[GHA]=20=E3=83=AF=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=BC=E3=82=92=E6=89=8B=E5=8B=95=E3=81=A7?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 2 ++ .github/workflows/sonarscan.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index ed519cbc39..0b5465e707 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -3,6 +3,8 @@ name: build sakura # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml index 088813a861..b8e316a8fb 100644 --- a/.github/workflows/sonarscan.yml +++ b/.github/workflows/sonarscan.yml @@ -3,6 +3,7 @@ name: SonarCloud # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch on: + workflow_dispatch: push: paths-ignore: - '**/*.md' From 342a04d40694c45e8ccf9239434c37971f2dfb09 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Mon, 7 Feb 2022 07:38:24 +0900 Subject: [PATCH 051/129] =?UTF-8?q?[GHA]=20=E3=83=AF=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=BC=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E4=B8=AD=E3=81=AE=E4=BD=99=E5=88=86=E3=81=AA?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-sakura.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml index 0b5465e707..baba0273be 100644 --- a/.github/workflows/build-sakura.yml +++ b/.github/workflows/build-sakura.yml @@ -4,7 +4,6 @@ name: build sakura # events but only for the master branch on: workflow_dispatch: - push: branches: - master @@ -16,7 +15,6 @@ on: - appveyor.yml - 'azure-pipelines*.yml' - 'ci/azure-pipelines/template*.yml' - pull_request: branches: - master From a3bcc0fe8af742736eb7db4ba157f42d5a9f5ad7 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:28:09 +0900 Subject: [PATCH 052/129] =?UTF-8?q?[AZP]=20=E9=99=A4=E5=A4=96=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=84=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E3=83=AF=E3=82=A4=E3=83=AB=E3=83=89=E3=82=AB=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=A7=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- azure-pipelines.yml | 50 ++++----------------------------------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb68fbe545..cba8eccf9d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,32 +6,11 @@ trigger: paths: exclude: - - .github/* + - '**/*.md' + - '.github/*' - .gitignore - .travis.yml - appveyor.yml - - CHANGELOG.md - - CONTRIBUTING.md - - CPPLINT.md - - README.md - - SonarQube.md - - addDoxygenFileComment.md - - build.md - - create-big-file.md - - debug-tasktray-menu.md - - get-PR.md - - ci/azure-pipelines/azure-pipelines.md - - ci/build-batchfiles.md - - ci/build-envvars.md - - installer/externals/bregonig/README.md - - installer/externals/universal-ctags/README.md - - installer/readme.md - - remove-redundant-blank-lines.md - - tools/find-tools.md - - tools/macro/macro.md - - tools/zip/readme.md - - tests/unittest.md - - vcx-props/project-PlatformToolset.md ############################################################################################################################### # ビルドトリガー (Pull Request) @@ -41,32 +20,11 @@ trigger: pr: paths: exclude: - - .github/* + - '**/*.md' + - '.github/*' - .gitignore - .travis.yml - appveyor.yml - - CHANGELOG.md - - CONTRIBUTING.md - - CPPLINT.md - - README.md - - SonarQube.md - - addDoxygenFileComment.md - - build.md - - create-big-file.md - - debug-tasktray-menu.md - - get-PR.md - - ci/azure-pipelines/azure-pipelines.md - - ci/build-batchfiles.md - - ci/build-envvars.md - - installer/externals/bregonig/README.md - - installer/externals/universal-ctags/README.md - - installer/readme.md - - remove-redundant-blank-lines.md - - tools/find-tools.md - - tools/macro/macro.md - - tools/zip/readme.md - - tests/unittest.md - - vcx-props/project-PlatformToolset.md ############################################################################################################################### # jobs/job 定義 From 23fd2eae43120002597cd0260daccb3b3e8e17d2 Mon Sep 17 00:00:00 2001 From: Kohki Akikaze <67105596+kazasaku@users.noreply.github.com> Date: Wed, 9 Feb 2022 08:48:43 +0900 Subject: [PATCH 053/129] =?UTF-8?q?[AZP]=20=E9=99=A4=E5=A4=96=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=BB=96?= =?UTF-8?q?=E3=81=AECI=E3=81=A8=E6=8F=83=E3=81=88=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cba8eccf9d..a7f696c8d7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ trigger: - '**/*.md' - '.github/*' - .gitignore - - .travis.yml + - .editorconfig - appveyor.yml ############################################################################################################################### @@ -23,7 +23,7 @@ pr: - '**/*.md' - '.github/*' - .gitignore - - .travis.yml + - .editorconfig - appveyor.yml ############################################################################################################################### From 4322e2c6f7c4a272f5c694d92df9068abc1d2c38 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Wed, 9 Feb 2022 22:05:52 +0900 Subject: [PATCH 054/129] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4?= =?UTF-8?q?=E3=83=96=E5=B1=95=E9=96=8B=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=92?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=8C=96=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/ExtractArchives.targets | 18 ++++++++++++++++++ sakura/sakura.vcxproj | 13 +------------ 2 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 sakura/ExtractArchives.targets diff --git a/sakura/ExtractArchives.targets b/sakura/ExtractArchives.targets new file mode 100644 index 0000000000..fe44ed7a30 --- /dev/null +++ b/sakura/ExtractArchives.targets @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 2d94b8907e..c033d57d66 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -914,23 +914,12 @@ + - - - - - - - - - - - - \ No newline at end of file From 5ce5d95d3945501b1dd505e4d2040b5f97e5d18b Mon Sep 17 00:00:00 2001 From: berryzplus Date: Thu, 10 Feb 2022 00:34:46 +0900 Subject: [PATCH 055/129] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4?= =?UTF-8?q?=E3=83=96=E5=B1=95=E9=96=8B=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=92?= =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/ExtractArchives.targets | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sakura/ExtractArchives.targets b/sakura/ExtractArchives.targets index fe44ed7a30..fe936c0ec5 100644 --- a/sakura/ExtractArchives.targets +++ b/sakura/ExtractArchives.targets @@ -1,18 +1,24 @@ - - - + + $(SolutionDir)installer\externals\bregonig\bron420.zip + x64/bregonig.dll + bregonig.dll + $(OutDir)bregonig.dll + $(SolutionDir)installer/externals/universal-ctags/ctags-2020-01-12_feffe43a-x64.zip + $(SolutionDir)installer/externals/universal-ctags/ctags-2020-01-12_feffe43a-x86.zip + ctags.exe + $(OutDir)ctags.exe + + + - - - - - + + - - + + \ No newline at end of file From 2dda1e21bd78b5d9aff491f039eb8a93b6713db3 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 11:23:19 +0900 Subject: [PATCH 056/129] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4?= =?UTF-8?q?=E3=83=96=E5=B1=95=E9=96=8B=E3=82=BF=E3=82=B9=E3=82=AF=E3=81=AE?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B=E3=82=92=E3=80=8C=E8=A9=B3?= =?UTF-8?q?=E7=B4=B0=E3=83=A2=E3=83=BC=E3=83=89=E3=80=8D=E3=81=AB=E9=99=90?= =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/ExtractArchives.targets | 43 ++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/sakura/ExtractArchives.targets b/sakura/ExtractArchives.targets index fe936c0ec5..4f1f229827 100644 --- a/sakura/ExtractArchives.targets +++ b/sakura/ExtractArchives.targets @@ -9,11 +9,46 @@ ctags.exe $(OutDir)ctags.exe - - + + + + + + + + + + + + + + - - + + From 6f62630e79f884c37ac3526845f428dd80195662 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 12:23:51 +0900 Subject: [PATCH 057/129] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4?= =?UTF-8?q?=E3=83=96=E5=B1=95=E9=96=8B=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=92?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E5=A0=B4=E5=90=88=E3=81=A0=E3=81=91?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/ExtractArchives.targets | 45 +++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/sakura/ExtractArchives.targets b/sakura/ExtractArchives.targets index 4f1f229827..5c4897c68b 100644 --- a/sakura/ExtractArchives.targets +++ b/sakura/ExtractArchives.targets @@ -27,14 +27,47 @@ psInfo.CreateNoWindow = true; psInfo.UseShellExecute = false; psInfo.RedirectStandardOutput = true; -args = "7z e \"" + ArchivePath.ToString() + "\" -o\"" + Path.GetDirectoryName(Output.ToString()) + "\" -y " + InternalPath; -psInfo.FileName = "cmd"; -psInfo.Arguments = "/c " + args; +string outputTimestamp = null; +string sourceTimestamp = null; -Log.LogMessage(MessageImportance.Normal, args); -p = Process.Start(psInfo); +if (File.Exists(Output.ToString())) { + args = "((Get-ItemPropertyValue -Path '" + Output.ToString() + "' -name LastWriteTime).ToString('u'))"; + psInfo.FileName = "powershell"; + psInfo.Arguments = "-NoLogo -ExecutionPolicy RemoteSigned -Command " + args; -Log.LogMessage(MessageImportance.Low, p.StandardOutput.ReadToEnd()); + Log.LogMessage(MessageImportance.Low, args); + p = Process.Start(psInfo); + + outputTimestamp = p.StandardOutput.ReadToEnd(); + p.Dispose(); + p = null; + + if (!string.IsNullOrEmpty(outputTimestamp)) { + args = "(((7z l '" + ArchivePath.ToString() + "' " + InternalPath + " | Select-String " + InternalPath + ").ToString().SubString(0, 19) | Get-Date).ToString('u'))"; + psInfo.Arguments = "-NoLogo -ExecutionPolicy RemoteSigned -Command " + args; + + Log.LogMessage(MessageImportance.Low, args); + p = Process.Start(psInfo); + + sourceTimestamp = p.StandardOutput.ReadToEnd(); + p.Dispose(); + p = null; + } +} + +if (string.IsNullOrEmpty(outputTimestamp) || + string.IsNullOrEmpty(sourceTimestamp) || + outputTimestamp != sourceTimestamp) +{ + args = "7z e \"" + ArchivePath.ToString() + "\" -o\"" + Path.GetDirectoryName(Output.ToString()) + "\" -y " + InternalPath; + psInfo.FileName = "cmd"; + psInfo.Arguments = "/c " + args; + + Log.LogMessage(MessageImportance.Normal, args); + p = Process.Start(psInfo); + + Log.LogMessage(MessageImportance.Low, p.StandardOutput.ReadToEnd()); +} ]]> From c4ccaf739aa52017b682af69172f378ae437fd7f Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 14:26:01 +0900 Subject: [PATCH 058/129] =?UTF-8?q?=E8=AA=A4=E8=A8=98=E8=A8=82=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ユーザーデータの格納先インデックスに謎のマジックナンバー「0」を使用していたのを訂正。 --- sakura_core/view/CEditView.cpp | 6 +++--- sakura_core/view/CEditView_Mouse.cpp | 2 +- sakura_core/window/CSplitterWnd.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 108a59f8f1..5dc90e31d6 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -95,7 +95,7 @@ LRESULT CALLBACK EditViewWndProc( pCEdit = reinterpret_cast(pCreate->lpCreateParams); return pCEdit->DispatchEvent( hwnd, uMsg, wParam, lParam ); default: - pCEdit = ( CEditView* )::GetWindowLongPtr( hwnd, 0 ); + pCEdit = ( CEditView* )::GetWindowLongPtr( hwnd, GWLP_USERDATA ); if( NULL != pCEdit ){ // May 16, 2000 genta // From Here @@ -124,7 +124,7 @@ VOID CALLBACK EditViewTimerProc( ) { CEditView* pCEditView; - pCEditView = ( CEditView* )::GetWindowLongPtr( hwnd, 0 ); + pCEditView = ( CEditView* )::GetWindowLongPtr( hwnd, GWLP_USERDATA ); if( NULL != pCEditView ){ pCEditView->OnTimer( hwnd, uMsg, idEvent, dwTime ); } @@ -451,7 +451,7 @@ LRESULT CEditView::DispatchEvent( return OnMOUSEHWHEEL( wParam, lParam ); case WM_CREATE: - ::SetWindowLongPtr( hwnd, 0, (LONG_PTR) this ); + ::SetWindowLongPtr( hwnd, GWLP_USERDATA, (LONG_PTR) this ); m_hwndSizeBox = ::CreateWindowEx( 0L, /* no extended styles */ WC_SCROLLBAR, /* scroll bar control class */ diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 6ac2937d0f..8939ca2e2c 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -718,7 +718,7 @@ void CEditView::OnMBUTTONUP( WPARAM fwKeys, int xPos , int yPos ) void CALLBACK AutoScrollTimerProc( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime ) { CEditView* pCEditView; - pCEditView = ( CEditView* )::GetWindowLongPtr( hwnd, 0 ); + pCEditView = ( CEditView* )::GetWindowLongPtr( hwnd, GWLP_USERDATA ); if( NULL != pCEditView ){ pCEditView->AutoScrollOnTimer(); } diff --git a/sakura_core/window/CSplitterWnd.cpp b/sakura_core/window/CSplitterWnd.cpp index 758f9777fd..3756690345 100644 --- a/sakura_core/window/CSplitterWnd.cpp +++ b/sakura_core/window/CSplitterWnd.cpp @@ -298,7 +298,7 @@ void CSplitterWnd::DoSplit( int nHorizontal, int nVertical ) int v; for( v=0; v < m_nChildWndCount; v++ ){ - pcViewArr[v] = ( CEditView* )::GetWindowLongPtr( m_ChildWndArr[v], 0 ); + pcViewArr[v] = ( CEditView* )::GetWindowLongPtr( m_ChildWndArr[v], GWLP_USERDATA ); } ::GetClientRect( GetHwnd(), &rc ); if( nHorizontal < nLimit ){ @@ -809,7 +809,7 @@ LRESULT CSplitterWnd::OnSize( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam const int nFrameWidth = DpiScaleX(SPLITTER_FRAME_WIDTH); BOOL bSizeBox; for( i = 0; i < m_nChildWndCount; ++i ){ - pcViewArr[i] = ( CEditView* )::GetWindowLongPtr( m_ChildWndArr[i], 0 ); + pcViewArr[i] = ( CEditView* )::GetWindowLongPtr( m_ChildWndArr[i], GWLP_USERDATA ); } /* From fc8c4ad663633245874458f6109e45011904aa3e Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 18:35:09 +0900 Subject: [PATCH 059/129] =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84?= =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E9=A0=98=E5=9F=9F=E3=82=92=E7=A2=BA=E4=BF=9D?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/_main/CControlTray.cpp | 2 +- sakura_core/view/CEditView.cpp | 2 +- sakura_core/window/CEditWnd.cpp | 2 +- sakura_core/window/CWnd.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index b92e36eed8..43e8003ff1 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -247,7 +247,7 @@ HWND CControlTray::Create( HINSTANCE hInstance ) CS_BYTEALIGNWINDOW; wc.lpfnWndProc = CControlTrayWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = 0; + wc.cbWndExtra = NULL; wc.hInstance = m_hInstance; wc.hIcon = LoadIcon( NULL, IDI_APPLICATION ); wc.hCursor = LoadCursor( NULL, IDC_ARROW ); diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 5dc90e31d6..74a519d35b 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -288,7 +288,7 @@ BOOL CEditView::Create( wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = EditViewWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = sizeof( LONG_PTR ); + wc.cbWndExtra = NULL; wc.hInstance = G_AppInstance(); wc.hIcon = LoadIcon( NULL, IDI_APPLICATION ); wc.hCursor = NULL/*LoadCursor( NULL, IDC_IBEAM )*/; diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index a10cf68804..661cb7d014 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -376,7 +376,7 @@ HWND CEditWnd::_CreateMainWindow(int nGroup, const STabGroupInfo& sTabGroupInfo) wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = CEditWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = 32; + wc.cbWndExtra = NULL; wc.hInstance = G_AppInstance(); // Dec, 2, 2002 genta アイコン読み込み方法変更 wc.hIcon = GetAppIcon( G_AppInstance(), ICON_DEFAULT_APP, FN_APP_ICON, false ); diff --git a/sakura_core/window/CWnd.cpp b/sakura_core/window/CWnd.cpp index 911c37ca94..c5a667810a 100644 --- a/sakura_core/window/CWnd.cpp +++ b/sakura_core/window/CWnd.cpp @@ -123,7 +123,7 @@ ATOM CWnd::RegisterWC( wc.style = CS_DBLCLKS; wc.lpfnWndProc = CWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = 32; + wc.cbWndExtra = NULL; wc.hInstance = m_hInstance; wc.hIcon = hIcon; wc.hCursor = hCursor; From ac046f27463a0c55bb11e99acd13f97037545325 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 19:13:04 +0900 Subject: [PATCH 060/129] =?UTF-8?q?Revert=20"=E4=BD=BF=E3=82=8F=E3=81=AA?= =?UTF-8?q?=E3=81=84=E6=8B=A1=E5=BC=B5=E9=A0=98=E5=9F=9F=E3=82=92=E7=A2=BA?= =?UTF-8?q?=E4=BF=9D=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fc8c4ad663633245874458f6109e45011904aa3e. --- sakura_core/_main/CControlTray.cpp | 2 +- sakura_core/view/CEditView.cpp | 2 +- sakura_core/window/CEditWnd.cpp | 2 +- sakura_core/window/CWnd.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index 43e8003ff1..b92e36eed8 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -247,7 +247,7 @@ HWND CControlTray::Create( HINSTANCE hInstance ) CS_BYTEALIGNWINDOW; wc.lpfnWndProc = CControlTrayWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = NULL; + wc.cbWndExtra = 0; wc.hInstance = m_hInstance; wc.hIcon = LoadIcon( NULL, IDI_APPLICATION ); wc.hCursor = LoadCursor( NULL, IDC_ARROW ); diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 74a519d35b..5dc90e31d6 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -288,7 +288,7 @@ BOOL CEditView::Create( wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = EditViewWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = NULL; + wc.cbWndExtra = sizeof( LONG_PTR ); wc.hInstance = G_AppInstance(); wc.hIcon = LoadIcon( NULL, IDI_APPLICATION ); wc.hCursor = NULL/*LoadCursor( NULL, IDC_IBEAM )*/; diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index 661cb7d014..a10cf68804 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -376,7 +376,7 @@ HWND CEditWnd::_CreateMainWindow(int nGroup, const STabGroupInfo& sTabGroupInfo) wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = CEditWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = NULL; + wc.cbWndExtra = 32; wc.hInstance = G_AppInstance(); // Dec, 2, 2002 genta アイコン読み込み方法変更 wc.hIcon = GetAppIcon( G_AppInstance(), ICON_DEFAULT_APP, FN_APP_ICON, false ); diff --git a/sakura_core/window/CWnd.cpp b/sakura_core/window/CWnd.cpp index c5a667810a..911c37ca94 100644 --- a/sakura_core/window/CWnd.cpp +++ b/sakura_core/window/CWnd.cpp @@ -123,7 +123,7 @@ ATOM CWnd::RegisterWC( wc.style = CS_DBLCLKS; wc.lpfnWndProc = CWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = NULL; + wc.cbWndExtra = 32; wc.hInstance = m_hInstance; wc.hIcon = hIcon; wc.hCursor = hCursor; From fa5f9a2f4034135b979a2cee08c6d223515f54a4 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 11 Feb 2022 19:15:39 +0900 Subject: [PATCH 061/129] =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84?= =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E9=A0=98=E5=9F=9F=E3=82=92=E7=A2=BA=E4=BF=9D?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/view/CEditView.cpp | 2 +- sakura_core/window/CEditWnd.cpp | 2 +- sakura_core/window/CWnd.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 5dc90e31d6..1575c3fd35 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -288,7 +288,7 @@ BOOL CEditView::Create( wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = EditViewWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = sizeof( LONG_PTR ); + wc.cbWndExtra = 0; wc.hInstance = G_AppInstance(); wc.hIcon = LoadIcon( NULL, IDI_APPLICATION ); wc.hCursor = NULL/*LoadCursor( NULL, IDC_IBEAM )*/; diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index a10cf68804..2037e35bb7 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -376,7 +376,7 @@ HWND CEditWnd::_CreateMainWindow(int nGroup, const STabGroupInfo& sTabGroupInfo) wc.style = CS_DBLCLKS | CS_BYTEALIGNCLIENT | CS_BYTEALIGNWINDOW; wc.lpfnWndProc = CEditWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = 32; + wc.cbWndExtra = 0; wc.hInstance = G_AppInstance(); // Dec, 2, 2002 genta アイコン読み込み方法変更 wc.hIcon = GetAppIcon( G_AppInstance(), ICON_DEFAULT_APP, FN_APP_ICON, false ); diff --git a/sakura_core/window/CWnd.cpp b/sakura_core/window/CWnd.cpp index 911c37ca94..8454b6e06f 100644 --- a/sakura_core/window/CWnd.cpp +++ b/sakura_core/window/CWnd.cpp @@ -123,7 +123,7 @@ ATOM CWnd::RegisterWC( wc.style = CS_DBLCLKS; wc.lpfnWndProc = CWndProc; wc.cbClsExtra = 0; - wc.cbWndExtra = 32; + wc.cbWndExtra = 0; wc.hInstance = m_hInstance; wc.hIcon = hIcon; wc.hCursor = hCursor; From e930db6d5dd2652d7fc117546a2c2b35058a8a64 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 12 Feb 2022 19:14:02 +0900 Subject: [PATCH 062/129] =?UTF-8?q?FileMatchScore=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E8=80=90=E6=80=A7=E3=82=92=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/file.cpp | 48 ++++++++++----------- sakura_core/util/file.h | 2 +- tests/unittests/test-file.cpp | 80 +++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 26 deletions(-) diff --git a/sakura_core/util/file.cpp b/sakura_core/util/file.cpp index aaf52e8319..c198ab0d2d 100644 --- a/sakura_core/util/file.cpp +++ b/sakura_core/util/file.cpp @@ -996,40 +996,38 @@ void my_splitpath_w ( // ----------------------------------------------------------------------------- int FileMatchScore( const WCHAR *file1, const WCHAR *file2 ); -// フルパスからファイル名の.以降を分離する -// 2014.06.15 フォルダ名に.が含まれた場合、フォルダが分離されたのを修正 -static void FileNameSepExt( const WCHAR *file, WCHAR* pszFile, WCHAR* pszExt ) +// フルパスからファイル名と拡張子（ファイル名の.以降）を分離する +// @date 2014/06/15 moca_skr フォルダ名に.が含まれた場合、フォルダが分離されたのを修正した対応で新規作成 +static void FileNameSepExt( std::wstring_view file, std::wstring& szFile, std::wstring& szExt ) { - const WCHAR* folderPos = file; - const WCHAR* x = folderPos; - while( x ){ - x = wcschr(folderPos, L'\\'); - if( x ){ - x++; - folderPos = x; - } + const WCHAR* folderPos; + folderPos = ::wcsrchr(file.data(), L'\\'); + if( folderPos ){ + folderPos++; + }else{ + folderPos = file.data(); } - const WCHAR* p = wcschr(folderPos, L'.'); - if( p ){ - wmemcpy(pszFile, file, p - file); - pszFile[p - file] = L'\0'; - wcscpy(pszExt, p); + + if (const auto p = ::wcschr(folderPos, L'.')) + { + szFile.assign(folderPos, p - folderPos); + szExt.assign(p); }else{ - wcscpy(pszFile, file); - pszExt[0] = L'\0'; + szFile.assign(folderPos); + szExt.clear(); } } -int FileMatchScoreSepExt( const WCHAR *file1, const WCHAR *file2 ) +int FileMatchScoreSepExt( std::wstring_view file1, std::wstring_view file2 ) { - WCHAR szFile1[_MAX_PATH]; - WCHAR szFile2[_MAX_PATH]; - WCHAR szFileExt1[_MAX_PATH]; - WCHAR szFileExt2[_MAX_PATH]; + std::wstring szFile1; + std::wstring szFile2; + std::wstring szFileExt1; + std::wstring szFileExt2; FileNameSepExt(file1, szFile1, szFileExt1); FileNameSepExt(file2, szFile2, szFileExt2); - int score = FileMatchScore(szFile1, szFile2); - score += FileMatchScore(szFileExt1, szFileExt2); + int score = FileMatchScore(szFile1.data(), szFile2.data()); + score += FileMatchScore(szFileExt1.data(), szFileExt2.data()); return score; } diff --git a/sakura_core/util/file.h b/sakura_core/util/file.h index 2efdd904b4..77a065a4e7 100644 --- a/sakura_core/util/file.h +++ b/sakura_core/util/file.h @@ -114,7 +114,7 @@ bool GetLastWriteTimestamp( const WCHAR* filename, CFileTime* pcFileTime ); // O void my_splitpath_w ( const wchar_t *comln , wchar_t *drv,wchar_t *dir,wchar_t *fnm,wchar_t *ext ); #define my_splitpath_t my_splitpath_w -int FileMatchScoreSepExt( const WCHAR *file1, const WCHAR *file2 ); +int FileMatchScoreSepExt( std::wstring_view file1, std::wstring_view file2 ); void GetStrTrancateWidth( WCHAR* dest, int nSize, const WCHAR* path, HDC hDC, int nPxWidth ); void GetShortViewPath(WCHAR* dest, int nSize, const WCHAR* path, HDC hDC, int nPxWidth, bool bFitMode ); diff --git a/tests/unittests/test-file.cpp b/tests/unittests/test-file.cpp index 33d41810d7..8aebb29f60 100644 --- a/tests/unittests/test-file.cpp +++ b/tests/unittests/test-file.cpp @@ -516,6 +516,86 @@ TEST(file, CalcDirectoryDepth) EXPECT_DEATH({ CalcDirectoryDepth(nullptr); }, ".*"); } +/*! + FileMatchScoreSepExtのテスト + */ +TEST(file, FileMatchScoreSepExt) +{ + int result = 0; + + // FileNameSepExtのテストパターン + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test.txt)", + LR"(C:\TEMP\TEST.TXT)"); + ASSERT_EQ(_countof(LR"(test.txt)") - 1, result); + + // FileNameSepExtのテストパターン（パスにフォルダが含まれない） + result = FileMatchScoreSepExt( + LR"(TEST.TXT)", + LR"(test.txt)"); + ASSERT_EQ(_countof(LR"(test.txt)") - 1, result); + + // FileNameSepExtのテストパターン（ファイル名がない） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\.txt)", + LR"(C:\TEMP\.txt)"); + ASSERT_EQ(_countof(LR"(.txt)") - 1, result); + + // FileNameSepExtのテストパターン（拡張子がない） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test)", + LR"(C:\TEMP\test)"); + ASSERT_EQ(_countof(LR"(test)") - 1, result); + + // 全く同じパス同士の比較（ファイル名＋拡張子が完全一致） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test.txt)", + LR"(C:\TEMP\TEST.TXT)"); + ASSERT_EQ(_countof(LR"(test.txt)") - 1, result); + + // 異なるパスでファイル名＋拡張子が同じ（ファイル名＋拡張子が完全一致） + result = FileMatchScoreSepExt( + LR"(C:\TEMP1\TEST.TXT)", + LR"(C:\TEMP2\test.txt)"); + ASSERT_EQ(_countof(LR"(test.txt)") - 1, result); + + // ファイル名が異なる1（最長一致を取得） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test.txt)", + LR"(C:\TEMP\TEST1.TST)"); + ASSERT_EQ(_countof(LR"(test)") - 1 + _countof(LR"(.t)") - 1, result); + + // ファイル名が異なる2（最長一致を取得） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test1.tst)", + LR"(C:\TEMP\TEST.TXT)"); + ASSERT_EQ(_countof(LR"(test)") - 1 + _countof(LR"(.t)") - 1, result); + + // 拡張子が異なる1（最長一致を取得） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test.txt)", + LR"(C:\TEMP\TEXT.TXTX)"); + ASSERT_EQ(_countof(LR"(te)") - 1 + _countof(LR"(.txt)") - 1, result); + + // 拡張子が異なる2（最長一致を取得） + result = FileMatchScoreSepExt( + LR"(C:\TEMP\text.txtx)", + LR"(C:\TEMP\TEST.TXT)"); + ASSERT_EQ(_countof(LR"(te)") - 1 + _countof(LR"(.txt)") - 1, result); + + // サロゲート文字を含む1 + result = FileMatchScoreSepExt( + LR"(C:\TEMP\test👉👆.TST)", + LR"(C:\TEMP\TEST👉👇.txt)"); + ASSERT_EQ(_countof(LR"(test👉)") - 1 + _countof(LR"(.t)") - 1, result); + + // サロゲート文字を含む2 + result = FileMatchScoreSepExt( + LR"(C:\TEMP\TEST👉👇.txt)", + LR"(C:\TEMP\test👉👆.TST)"); + ASSERT_EQ(_countof(LR"(test👉)") - 1 + _countof(LR"(.t)") - 1, result); +} + /*! GetExtのテスト */ From c685fc688d2f0497cc80cd9eaefde064663e6aff Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 12 Feb 2022 20:26:18 +0900 Subject: [PATCH 063/129] =?UTF-8?q?MinGW=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MinGWは文字列のエンコーディングをShift-JISと仮定するため、サロゲート文字をベタ書きできなかった。 --- tests/unittests/test-file.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/unittests/test-file.cpp b/tests/unittests/test-file.cpp index 8aebb29f60..621df499fd 100644 --- a/tests/unittests/test-file.cpp +++ b/tests/unittests/test-file.cpp @@ -585,15 +585,15 @@ TEST(file, FileMatchScoreSepExt) // サロゲート文字を含む1 result = FileMatchScoreSepExt( - LR"(C:\TEMP\test👉👆.TST)", - LR"(C:\TEMP\TEST👉👇.txt)"); - ASSERT_EQ(_countof(LR"(test👉)") - 1 + _countof(LR"(.t)") - 1, result); + L"C:\\TEMP\\test\xD83D\xDC49\xD83D\xDC46.TST", + L"C:\\TEMP\\TEST\xD83D\xDC49\xD83D\xDC47.txt"); + ASSERT_EQ(_countof(LR"(testXX)") - 1 + _countof(LR"(.t)") - 1, result); // サロゲート文字を含む2 result = FileMatchScoreSepExt( - LR"(C:\TEMP\TEST👉👇.txt)", - LR"(C:\TEMP\test👉👆.TST)"); - ASSERT_EQ(_countof(LR"(test👉)") - 1 + _countof(LR"(.t)") - 1, result); + L"C:\\TEMP\\TEST\xD83D\xDC49\xD83D\xDC47.txt", + L"C:\\TEMP\\test\xD83D\xDC49\xD83D\xDC46.TST"); + ASSERT_EQ(_countof(LR"(testXX)") - 1 + _countof(LR"(.t)") - 1, result); } /*! From 88e5ad1a07569447ff74968c2bcfd52582e5ffbf Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 12 Feb 2022 23:24:02 +0900 Subject: [PATCH 064/129] =?UTF-8?q?CFontAutoDeleter=E3=82=92=E3=83=AA?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=81=97=E3=81=A6=E5=AE=89=E5=85=A8=E6=80=A7=E3=82=92=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CFontAutoDeleterは似非スマートポインタ。 コピーコンストラクタが未実装で、削除済みフォントを何度も削除しようとしてWindows GDIにダメージを与える危険があったのを修正する。 --- sakura_core/util/window.cpp | 65 ++++++++++++------------- sakura_core/util/window.h | 24 ++++++---- tests/unittests/test-window.cpp | 66 ++++++++++++++++++++++++++ tests/unittests/tests1.vcxproj | 1 + tests/unittests/tests1.vcxproj.filters | 3 ++ 5 files changed, 115 insertions(+), 44 deletions(-) create mode 100644 tests/unittests/test-window.cpp diff --git a/sakura_core/util/window.cpp b/sakura_core/util/window.cpp index ac9dec87a2..8cad4618d3 100644 --- a/sakura_core/util/window.cpp +++ b/sakura_core/util/window.cpp @@ -287,56 +287,51 @@ int CTextWidthCalc::GetTextHeight() const return tm.tmHeight; } -CFontAutoDeleter::CFontAutoDeleter() - : m_hFontOld(NULL) - , m_hFont(NULL) - , m_hwnd(NULL) -{} +CFontAutoDeleter::CFontAutoDeleter(const Me& other) +{ + operator = (other); +} -CFontAutoDeleter::~CFontAutoDeleter() +CFontAutoDeleter& CFontAutoDeleter::operator = (const Me& other) { - if( m_hFont ){ - DeleteObject( m_hFont ); - m_hFont = NULL; + Clear(); + + if (const auto hFont = other.m_hFont) { + if (LOGFONT lf = {}; + ::GetObject(hFont, sizeof(lf), &lf)) { + m_hFont = ::CreateFontIndirect(&lf); + } } + + return *this; } -void CFontAutoDeleter::SetFont( HFONT hfontOld, HFONT hfont, HWND hwnd ) +CFontAutoDeleter::~CFontAutoDeleter() { - if( m_hFont ){ - ::DeleteObject( m_hFont ); - } - if( m_hFont != hfontOld ){ - m_hFontOld = hfontOld; - } - m_hFont = hfont; - m_hwnd = hwnd; + Clear(); } -/*! ウィンドウのリリース(WM_DESTROY用) -*/ -void CFontAutoDeleter::ReleaseOnDestroy() +void CFontAutoDeleter::Clear() { - if( m_hFont ){ - ::DeleteObject( m_hFont ); - m_hFont = NULL; + if (m_hFont) { + ::DeleteObject(m_hFont); + m_hFont = nullptr; } - m_hFontOld = NULL; } -/*! ウィンドウ生存中のリリース +void CFontAutoDeleter::SetFont( [[maybe_unused]] HFONT hFontOld, HFONT hFont, [[maybe_unused]] HWND hWnd ) +{ + Clear(); + + m_hFont = hFont; +} + +/*! ウィンドウのリリース(WM_DESTROY用) */ -#if 0 -void CFontAutoDeleter::Release() +void CFontAutoDeleter::ReleaseOnDestroy() { - if( m_hwnd && m_hFont ){ - ::SendMessageAny( m_hwnd, WM_SETFONT, (WPARAM)m_hFontOld, FALSE ); - ::DeleteObject( m_hFont ); - m_hFont = NULL; - m_hwnd = NULL; - } + Clear(); } -#endif /*! システムフォントに準拠したフォントを取得 diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 181af5a245..5cd636f235 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -160,17 +160,23 @@ class CTextWidthCalc class CFontAutoDeleter { +private: + HFONT m_hFont = nullptr; + + using Me = CFontAutoDeleter; + + void Clear(); + public: - CFontAutoDeleter(); - ~CFontAutoDeleter(); - void SetFont( HFONT hfontOld, HFONT hfont, HWND hwnd ); - void ReleaseOnDestroy(); - // void Release(); + CFontAutoDeleter() = default; + CFontAutoDeleter(const Me& other); + Me& operator = (const Me& other); + virtual ~CFontAutoDeleter(); -private: - HFONT m_hFontOld; - HFONT m_hFont; - HWND m_hwnd; + void SetFont( HFONT hFontOld, HFONT hFont, HWND hWnd ); + void ReleaseOnDestroy(); + + [[nodiscard]] HFONT GetFont() const { return m_hFont; } }; class CDCFont diff --git a/tests/unittests/test-window.cpp b/tests/unittests/test-window.cpp new file mode 100644 index 0000000000..43f8b64e58 --- /dev/null +++ b/tests/unittests/test-window.cpp @@ -0,0 +1,66 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#ifndef NOMINMAX +#define NOMINMAX +#endif /* #ifndef NOMINMAX */ + +#include +#include +#include +#include + +#include + +#include "util/window.h" + +/*! + * @brief CFontAutoDeleterのテスト + */ +TEST( CFontAutoDeleter, test ) +{ + CFontAutoDeleter deletor; + ASSERT_EQ(nullptr, deletor.GetFont()); + + if (const auto hGdiFont = GetStockFont(DEFAULT_GUI_FONT)) { + if (LOGFONT lf = {}; + ::GetObject(hGdiFont, sizeof(lf), &lf)) { + if (const auto hFont = ::CreateFontIndirect(&lf)) { + deletor.SetFont(nullptr, hFont, nullptr); + ASSERT_EQ(hFont, deletor.GetFont()); + } + } + } + + ASSERT_NE(nullptr, deletor.GetFont()); + if (const auto hFont = deletor.GetFont()) { + CFontAutoDeleter other(deletor); + ASSERT_NE(hFont, other.GetFont()); + + other.ReleaseOnDestroy(); + ASSERT_EQ(nullptr, other.GetFont()); + } +} diff --git a/tests/unittests/tests1.vcxproj b/tests/unittests/tests1.vcxproj index 9c08a294fa..f45a2273a3 100644 --- a/tests/unittests/tests1.vcxproj +++ b/tests/unittests/tests1.vcxproj @@ -150,6 +150,7 @@ + diff --git a/tests/unittests/tests1.vcxproj.filters b/tests/unittests/tests1.vcxproj.filters index c5ec04926c..2d8cc79a47 100644 --- a/tests/unittests/tests1.vcxproj.filters +++ b/tests/unittests/tests1.vcxproj.filters @@ -157,6 +157,9 @@ Test Files + + Test Files + From 3c2922e7e61d0bea0e7da7299391ceb14edb03eb Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 13 Feb 2022 00:13:12 +0900 Subject: [PATCH 065/129] =?UTF-8?q?Code=20Smells=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/window.cpp | 19 +++++++++++++++++-- sakura_core/util/window.h | 6 ++++-- tests/unittests/test-window.cpp | 4 ++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sakura_core/util/window.cpp b/sakura_core/util/window.cpp index 8cad4618d3..25452414a2 100644 --- a/sakura_core/util/window.cpp +++ b/sakura_core/util/window.cpp @@ -306,12 +306,27 @@ CFontAutoDeleter& CFontAutoDeleter::operator = (const Me& other) return *this; } +CFontAutoDeleter::CFontAutoDeleter(Me&& other) noexcept +{ + operator = (std::forward(other)); +} + +CFontAutoDeleter& CFontAutoDeleter::operator = (Me&& other) noexcept +{ + Clear(); + + m_hFont = other.m_hFont; + other.m_hFont = nullptr; + + return *this; +} + CFontAutoDeleter::~CFontAutoDeleter() { Clear(); } -void CFontAutoDeleter::Clear() +void CFontAutoDeleter::Clear() noexcept { if (m_hFont) { ::DeleteObject(m_hFont); @@ -319,7 +334,7 @@ void CFontAutoDeleter::Clear() } } -void CFontAutoDeleter::SetFont( [[maybe_unused]] HFONT hFontOld, HFONT hFont, [[maybe_unused]] HWND hWnd ) +void CFontAutoDeleter::SetFont( [[maybe_unused]] const HFONT hFontOld, const HFONT hFont, [[maybe_unused]] const HWND hWnd ) { Clear(); diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 5cd636f235..7098870fa9 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -165,15 +165,17 @@ class CFontAutoDeleter using Me = CFontAutoDeleter; - void Clear(); + void Clear() noexcept; public: CFontAutoDeleter() = default; CFontAutoDeleter(const Me& other); Me& operator = (const Me& other); + CFontAutoDeleter(Me&& other) noexcept; + Me& operator = (Me&& other) noexcept; virtual ~CFontAutoDeleter(); - void SetFont( HFONT hFontOld, HFONT hFont, HWND hWnd ); + void SetFont( const HFONT hFontOld, const HFONT hFont, const HWND hWnd ); void ReleaseOnDestroy(); [[nodiscard]] HFONT GetFont() const { return m_hFont; } diff --git a/tests/unittests/test-window.cpp b/tests/unittests/test-window.cpp index 43f8b64e58..32dd0b6425 100644 --- a/tests/unittests/test-window.cpp +++ b/tests/unittests/test-window.cpp @@ -62,5 +62,9 @@ TEST( CFontAutoDeleter, test ) other.ReleaseOnDestroy(); ASSERT_EQ(nullptr, other.GetFont()); + + CFontAutoDeleter another = std::move(deletor); + ASSERT_EQ(hFont, another.GetFont()); + ASSERT_EQ(nullptr, deletor.GetFont()); } } From 3f8715c0d63696ebfac73fa54d811529e7c66ebd Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sat, 12 Feb 2022 00:51:01 +0900 Subject: [PATCH 066/129] =?UTF-8?q?tests1.exe=20=E3=81=AB=20gmock.lib=20?= =?UTF-8?q?=E3=82=92=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gmock.lib をリンクする指定を追加した。 * 不要だった gtest_main.lib のリンクをやめた。 --- tests/CMakeLists.txt | 2 +- tests/googletest.targets | 8 ++++---- tests/unittests/CMakeLists.txt | 4 ++-- tests/unittests/Makefile | 2 +- tests/unittests/code-main.cpp | 6 ++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cbc138fa9d..c6fac32ccc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -33,7 +33,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) # create solution folder if(BUILD_GTEST) set_target_properties(gtest PROPERTIES FOLDER GoogleTest) - set_target_properties(gtest_main PROPERTIES FOLDER GoogleTest) + set_target_properties(gmock PROPERTIES FOLDER GoogleTest) endif() set_target_properties(tests1 PROPERTIES FOLDER Tests) diff --git a/tests/googletest.targets b/tests/googletest.targets index 91c2fae8d0..61cef7edaa 100644 --- a/tests/googletest.targets +++ b/tests/googletest.targets @@ -8,9 +8,9 @@ $(GoogleTestInstallDir)lib64 $(GoogleTestLibInstallDir);$(LibraryPath) gtest.lib - gtest_main.lib $(GoogleTestLibInstallDir)\$(GTestLibName) - $(GoogleTestLibInstallDir)\$(GTestMainLibName) + gmock.lib + $(GoogleTestLibInstallDir)\$(GMockLibName) @@ -20,7 +20,7 @@ $(GTestLibName);%(AdditionalDependencies) - $(GTestMainLibName);%(AdditionalDependencies) + $(GMockLibName);%(AdditionalDependencies) @@ -29,7 +29,7 @@ - + $([System.Text.RegularExpressions.Regex]::Replace('$(VisualStudioVersion)', '^(\d+).*', '$1')) diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt index 8e5fad17f2..43f9ae7c27 100644 --- a/tests/unittests/CMakeLists.txt +++ b/tests/unittests/CMakeLists.txt @@ -52,12 +52,12 @@ endif () if(BUILD_GTEST) # Build GoogleTest from source code. target_link_libraries(${project_name} PRIVATE gtest) - target_link_libraries(${project_name} PRIVATE gtest_main) + target_link_libraries(${project_name} PRIVATE gmock) else() # Build without GoogleTest(use system library). find_package(GTest REQUIRED) target_link_libraries(${project_name} PRIVATE GTest::GTest) - target_link_libraries(${project_name} PRIVATE GTest::Main) + target_link_libraries(${project_name} PRIVATE GTest::GMock) endif() # link libraries diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile index 59c3692614..0c0e266915 100644 --- a/tests/unittests/Makefile +++ b/tests/unittests/Makefile @@ -119,7 +119,7 @@ LIBS= \ -lcomdlg32 \ -L$(GOOGLETEST_INSTALL_DIR)/lib \ -lgtest \ - -lgtest_main \ + -lgmock \ $(MYLIBS) exe= $(or $(OUTDIR),.)/tests1.exe diff --git a/tests/unittests/code-main.cpp b/tests/unittests/code-main.cpp index 863d79e228..ae4d154c33 100644 --- a/tests/unittests/code-main.cpp +++ b/tests/unittests/code-main.cpp @@ -23,6 +23,7 @@ distribution. */ #include +#include #ifndef NOMINMAX #define NOMINMAX @@ -106,8 +107,9 @@ int main(int argc, char **argv) { // コマンドラインに -PROF 指定がある場合、wWinMainを起動して終了する。 InvokeWinMainIfNeeded(::GetCommandLineW()); - // WinMainを起動しない場合、標準のgtest_main同様の処理を実行する + // WinMainを起動しない場合、標準のgmock_main同様の処理を実行する。 + // InitGoogleMock は Google Test の初期化も行うため、InitGoogleTest を別に呼ぶ必要はない。 printf("Running main() from %s\n", __FILE__); - testing::InitGoogleTest(&argc, argv); + testing::InitGoogleMock(&argc, argv); return RUN_ALL_TESTS(); } From 3e6ec6954ced233aad977d0f21a71448a94ac426 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 13 Feb 2022 02:12:37 +0900 Subject: [PATCH 067/129] =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=EF=BC=8B=E5=A4=89=E6=95=B0=E5=90=8D=E8=A8=82=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/window.cpp | 6 +++--- sakura_core/util/window.h | 4 ++-- tests/unittests/test-window.cpp | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sakura_core/util/window.cpp b/sakura_core/util/window.cpp index 25452414a2..e50dcccc33 100644 --- a/sakura_core/util/window.cpp +++ b/sakura_core/util/window.cpp @@ -308,7 +308,7 @@ CFontAutoDeleter& CFontAutoDeleter::operator = (const Me& other) CFontAutoDeleter::CFontAutoDeleter(Me&& other) noexcept { - operator = (std::forward(other)); + operator = (std::move(other)); } CFontAutoDeleter& CFontAutoDeleter::operator = (Me&& other) noexcept @@ -321,7 +321,7 @@ CFontAutoDeleter& CFontAutoDeleter::operator = (Me&& other) noexcept return *this; } -CFontAutoDeleter::~CFontAutoDeleter() +CFontAutoDeleter::~CFontAutoDeleter() noexcept { Clear(); } @@ -334,7 +334,7 @@ void CFontAutoDeleter::Clear() noexcept } } -void CFontAutoDeleter::SetFont( [[maybe_unused]] const HFONT hFontOld, const HFONT hFont, [[maybe_unused]] const HWND hWnd ) +void CFontAutoDeleter::SetFont( [[maybe_unused]] const HFONT& hFontOld, const HFONT& hFont, [[maybe_unused]] const HWND& hWnd ) { Clear(); diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 7098870fa9..146f79cba7 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -173,9 +173,9 @@ class CFontAutoDeleter Me& operator = (const Me& other); CFontAutoDeleter(Me&& other) noexcept; Me& operator = (Me&& other) noexcept; - virtual ~CFontAutoDeleter(); + virtual ~CFontAutoDeleter() noexcept; - void SetFont( const HFONT hFontOld, const HFONT hFont, const HWND hWnd ); + void SetFont( const HFONT& hFontOld, const HFONT& hFont, const HWND& hWnd ); void ReleaseOnDestroy(); [[nodiscard]] HFONT GetFont() const { return m_hFont; } diff --git a/tests/unittests/test-window.cpp b/tests/unittests/test-window.cpp index 32dd0b6425..5a21a232f6 100644 --- a/tests/unittests/test-window.cpp +++ b/tests/unittests/test-window.cpp @@ -42,29 +42,29 @@ */ TEST( CFontAutoDeleter, test ) { - CFontAutoDeleter deletor; - ASSERT_EQ(nullptr, deletor.GetFont()); + CFontAutoDeleter deleter; + ASSERT_EQ(nullptr, deleter.GetFont()); if (const auto hGdiFont = GetStockFont(DEFAULT_GUI_FONT)) { if (LOGFONT lf = {}; ::GetObject(hGdiFont, sizeof(lf), &lf)) { if (const auto hFont = ::CreateFontIndirect(&lf)) { - deletor.SetFont(nullptr, hFont, nullptr); - ASSERT_EQ(hFont, deletor.GetFont()); + deleter.SetFont(nullptr, hFont, nullptr); + ASSERT_EQ(hFont, deleter.GetFont()); } } } - ASSERT_NE(nullptr, deletor.GetFont()); - if (const auto hFont = deletor.GetFont()) { - CFontAutoDeleter other(deletor); + ASSERT_NE(nullptr, deleter.GetFont()); + if (const auto hFont = deleter.GetFont()) { + CFontAutoDeleter other(deleter); ASSERT_NE(hFont, other.GetFont()); other.ReleaseOnDestroy(); ASSERT_EQ(nullptr, other.GetFont()); - CFontAutoDeleter another = std::move(deletor); + CFontAutoDeleter another(std::move(deleter)); ASSERT_EQ(hFont, another.GetFont()); - ASSERT_EQ(nullptr, deletor.GetFont()); + ASSERT_EQ(nullptr, deleter.GetFont()); } } From 733f16e5fe670677fbdc2e97072f6d0dbd6386fa Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sat, 12 Feb 2022 11:05:37 +0900 Subject: [PATCH 068/129] =?UTF-8?q?CClipboard.h=20=E7=B7=A8=E9=9B=86?= =?UTF-8?q?=E6=99=82=E3=81=AE=E5=86=8D=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E7=AF=84=E5=9B=B2=E3=82=92=E7=B8=AE=E5=B0=8F=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CDocEditor.h に実装されていた CClipboard の呼び出しコードを CDocEditor.cpp に移動。 * CDocEditor.h から #include "_os/CClipboard.h" を除去。 * 不足していた #include を追加。 --- sakura_core/cmd/CViewCommander_Clipboard.cpp | 1 + sakura_core/doc/CDocEditor.cpp | 6 ++++++ sakura_core/doc/CDocEditor.h | 6 +----- sakura_core/macro/CMacro.cpp | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 207dc4c04b..031f1b52c0 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -26,6 +26,7 @@ #include "uiparts/CWaitCursor.h" #include "util/os.h" #include "apiwrap/CommonControl.h" +#include "_os/CClipboard.h" /** 切り取り(選択範囲をクリップボードにコピーして削除) diff --git a/sakura_core/doc/CDocEditor.cpp b/sakura_core/doc/CDocEditor.cpp index 29c3ca3fc9..d61c13e2ab 100644 --- a/sakura_core/doc/CDocEditor.cpp +++ b/sakura_core/doc/CDocEditor.cpp @@ -34,6 +34,7 @@ #include "CEol.h" #include "window/CEditWnd.h" #include "debug/CRunningTimer.h" +#include "_os/CClipboard.h" CDocEditor::CDocEditor(CEditDoc* pcDoc) : m_pcDocRef(pcDoc) @@ -166,6 +167,11 @@ void CDocEditor::SetImeMode( int mode ) } // To Here Nov. 20, 2000 genta +bool CDocEditor::IsEnablePaste() const +{ + return CClipboard::HasValidData(); +} + /*! 末尾に行を追加 diff --git a/sakura_core/doc/CDocEditor.h b/sakura_core/doc/CDocEditor.h index 56f2694ae0..1b2c4c33c3 100644 --- a/sakura_core/doc/CDocEditor.h +++ b/sakura_core/doc/CDocEditor.h @@ -28,7 +28,6 @@ #pragma once #include "doc/CDocListener.h" -#include "_os/CClipboard.h" #include "COpeBuf.h" class CEditDoc; @@ -84,10 +83,7 @@ class CDocEditor : public CDocListenerEx{ } //! クリップボードから貼り付け可能か？ - bool IsEnablePaste( void ) const - { - return CClipboard::HasValidData(); - } + bool IsEnablePaste( void ) const; public: CEditDoc* m_pcDocRef; diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp index e8e0e2af43..c9301eb0ca 100644 --- a/sakura_core/macro/CMacro.cpp +++ b/sakura_core/macro/CMacro.cpp @@ -61,6 +61,7 @@ #include "CSelectLang.h" #include "config/app_constants.h" #include "String_define.h" +#include "_os/CClipboard.h" CMacro::CMacro( EFunctionCode nFuncID ) { From e7a0b5c80320f51263a6b9530664841a940ae526 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 13 Feb 2022 15:09:01 +0900 Subject: [PATCH 069/129] =?UTF-8?q?CClipboard=20=E5=86=85=E3=81=AE=20API?= =?UTF-8?q?=20=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E3=82=92=E3=82=AA?= =?UTF-8?q?=E3=83=BC=E3=83=90=E3=83=BC=E3=83=A9=E3=82=A4=E3=83=89=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?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * モックしたい関数を呼び出しているコードから名前空間指定を除去。 * モックしたい関数と同名の仮想メンバ関数をクラスに追加し、元の API へリダイレクトするように実装。 --- sakura_core/_os/CClipboard.cpp | 42 +++++++++++++++++++++++----------- sakura_core/_os/CClipboard.h | 8 +++++++ 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index 8a3bea8f27..b77bc6adbf 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -56,7 +56,7 @@ CClipboard::~CClipboard() void CClipboard::Empty() { - ::EmptyClipboard(); + EmptyClipboard(); } void CClipboard::Close() @@ -112,7 +112,7 @@ bool CClipboard::SetText( ::GlobalUnlock( hgClipText ); //クリップボードに設定 - ::SetClipboardData( CF_UNICODETEXT, hgClipText ); + SetClipboardData( CF_UNICODETEXT, hgClipText ); bUnicodeText = false; } // 1回しか通らない. breakでここまで飛ぶ @@ -142,7 +142,7 @@ bool CClipboard::SetText( ::GlobalUnlock( hgClipSakura ); //クリップボードに設定 - ::SetClipboardData( uFormatSakuraClip, hgClipSakura ); + SetClipboardData( uFormatSakuraClip, hgClipSakura ); bSakuraText = false; } // 1回しか通らない. breakでここまで飛ぶ @@ -160,7 +160,7 @@ bool CClipboard::SetText( BYTE* pClip = GlobalLockBYTE( hgClipMSDEVColumn ); pClip[0] = 0; ::GlobalUnlock( hgClipMSDEVColumn ); - ::SetClipboardData( uFormat, hgClipMSDEVColumn ); + SetClipboardData( uFormat, hgClipMSDEVColumn ); } } } @@ -178,7 +178,7 @@ bool CClipboard::SetText( BYTE* pClip = (BYTE*)::GlobalLock( hgClipMSDEVLine ); pClip[0] = 0x01; ::GlobalUnlock( hgClipMSDEVLine ); - ::SetClipboardData( uFormat, hgClipMSDEVLine ); + SetClipboardData( uFormat, hgClipMSDEVLine ); } } } @@ -194,7 +194,7 @@ bool CClipboard::SetText( BYTE* pClip = (BYTE*)::GlobalLock( hgClipMSDEVLine2 ); pClip[0] = 0x01; // ※ ClipSpy で調べるとデータはこれとは違うが内容には無関係に動くっぽい ::GlobalUnlock( hgClipMSDEVLine2 ); - ::SetClipboardData( uFormat, hgClipMSDEVLine2 ); + SetClipboardData( uFormat, hgClipMSDEVLine2 ); } } } @@ -250,7 +250,7 @@ bool CClipboard::SetHtmlText(const CNativeW& cmemBUf) //クリップボードに設定 UINT uFormat = ::RegisterClipboardFormat( L"HTML Format" ); - ::SetClipboardData( uFormat, hgClipText ); + SetClipboardData( uFormat, hgClipText ); return true; } @@ -299,8 +299,8 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe //サクラ形式のデータがあれば取得 CLIPFORMAT uFormatSakuraClip = CClipboard::GetSakuraFormat(); if( (uGetFormat == -1 || uGetFormat == uFormatSakuraClip) - && ::IsClipboardFormatAvailable( uFormatSakuraClip ) ){ - HGLOBAL hSakura = ::GetClipboardData( uFormatSakuraClip ); + && IsClipboardFormatAvailable( uFormatSakuraClip ) ){ + HGLOBAL hSakura = GetClipboardData( uFormatSakuraClip ); if (hSakura != NULL) { BYTE* pData = (BYTE*)::GlobalLock(hSakura); size_t nLength = *((int*)pData); @@ -315,7 +315,7 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe // From Here 2005/05/29 novice UNICODE TEXT 対応処理を追加 HGLOBAL hUnicode = NULL; if( uGetFormat == -1 || uGetFormat == CF_UNICODETEXT ){ - hUnicode = ::GetClipboardData( CF_UNICODETEXT ); + hUnicode = GetClipboardData( CF_UNICODETEXT ); } if( hUnicode != NULL ){ //DWORD nLen = GlobalSize(hUnicode); @@ -329,7 +329,7 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe //OEMTEXT形式のデータがあれば取得 HGLOBAL hText = NULL; if( uGetFormat == -1 || uGetFormat == CF_OEMTEXT ){ - hText = ::GetClipboardData( CF_OEMTEXT ); + hText = GetClipboardData( CF_OEMTEXT ); } if( hText != NULL ){ char* szData = GlobalLockChar(hText); @@ -348,8 +348,8 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe /* 2008.09.10 bosagami パス貼り付け対応 */ //HDROP形式のデータがあれば取得 if( (uGetFormat == -1 || uGetFormat == CF_HDROP) - && ::IsClipboardFormatAvailable(CF_HDROP) ){ - HDROP hDrop = (HDROP)::GetClipboardData(CF_HDROP); + && IsClipboardFormatAvailable(CF_HDROP) ){ + HDROP hDrop = (HDROP)GetClipboardData(CF_HDROP); if(hDrop != NULL){ WCHAR sTmpPath[_MAX_PATH + 1] = {0}; const int nMaxCnt = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0); @@ -673,3 +673,19 @@ int CClipboard::GetDataType() if(::IsClipboardFormatAvailable(CF_HDROP))return CF_HDROP; return -1; } + +HANDLE CClipboard::SetClipboardData(UINT uFormat, HANDLE hMem) { + return ::SetClipboardData(uFormat, hMem); +} + +HANDLE CClipboard::GetClipboardData(UINT uFormat) { + return ::GetClipboardData(uFormat); +} + +BOOL CClipboard::EmptyClipboard() { + return ::EmptyClipboard(); +} + +BOOL CClipboard::IsClipboardFormatAvailable(UINT format) { + return ::IsClipboardFormatAvailable(format); +} diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index 7dfa2f7c0a..81916fd794 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -66,5 +66,13 @@ class CClipboard{ static bool HasValidData(); //!< クリップボード内に、サクラエディタで扱えるデータがあればtrue static CLIPFORMAT GetSakuraFormat(); //!< サクラエディタ独自のクリップボードデータ形式 static int GetDataType(); //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 + +protected: + // 単体テスト用 + CClipboard(bool openStatus) : m_bOpenResult(openStatus) {} + virtual HANDLE SetClipboardData(UINT uFormat, HANDLE hMem); + virtual HANDLE GetClipboardData(UINT uFormat); + virtual BOOL EmptyClipboard(); + virtual BOOL IsClipboardFormatAvailable(UINT format); }; #endif /* SAKURA_CCLIPBOARD_4E783022_214C_4E51_A2E0_54EC343500F6_H_ */ From a5a85a8edb5e040321dec23593631adaf1313f0b Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 13 Feb 2022 16:21:27 +0900 Subject: [PATCH 070/129] =?UTF-8?q?CClipboard=20=E3=81=AE=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=A7=20Google=20Mock=20=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-cclipboard.cpp | 272 ++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index c4330bc81b..d723639ba7 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -23,11 +23,14 @@ distribution. */ #include +#include #ifndef NOMINMAX #define NOMINMAX #endif /* #ifndef NOMINMAX */ +#include +#include #include #include #include @@ -40,6 +43,9 @@ #include "mem/CNativeW.h" #include "_os/CClipboard.h" +using ::testing::_; +using ::testing::Return; + /*! * HWND型のスマートポインタを実現するためのdeleterクラス */ @@ -159,3 +165,269 @@ TEST_F(CClipboardTestFixture, SetTextAndGetText) EXPECT_STREQ(buffer.GetStringPtr(), text.data()); EXPECT_TRUE(line); } + +// グローバルメモリに書き込まれた特定の Unicode 文字列にマッチする述語関数 +MATCHER_P(WideStringInGlobalMemory, expected_string, "") { + const wchar_t* s = (const wchar_t*)::GlobalLock(arg); + if (!s) return false; + std::wstring_view actual(s); + bool match = actual == expected_string; + ::GlobalUnlock(arg); + return match; +} + +// グローバルメモリに書き込まれた特定の ANSI 文字列にマッチする述語関数 +MATCHER_P(AnsiStringInGlobalMemory, expected_string, "") { + const char* s = (const char*)::GlobalLock(arg); + if (!s) return false; + std::string_view actual(s); + bool match = actual == expected_string; + ::GlobalUnlock(arg); + return match; +} + +// グローバルメモリに書き込まれたサクラ独自形式データにマッチする述語関数 +MATCHER_P(SakuraFormatInGlobalMemory, expected_string, "") { + char* p = (char*)::GlobalLock(arg); + if (!p) return false; + int length = *(int*)p; + p += sizeof(int); + std::wstring_view actual((const wchar_t*)p); + bool match = actual.size() == length && actual == expected_string; + ::GlobalUnlock(arg); + return match; +} + +// グローバルメモリに書き込まれた特定のバイト値にマッチする述語関数 +MATCHER_P(ByteValueInGlobalMemory, value, "") { + unsigned char* p = (unsigned char*)::GlobalLock(arg); + if (!p) return false; + bool match = *p == value; + ::GlobalUnlock(arg); + return match; +} + +class MockCClipboard : public CClipboard { +public: + MockCClipboard(bool openStatus = true) : CClipboard(openStatus) {} + ~MockCClipboard() override {} + MOCK_METHOD2(SetClipboardData, HANDLE (UINT, HANDLE)); + MOCK_METHOD1(GetClipboardData, HANDLE (UINT)); + MOCK_METHOD0(EmptyClipboard, BOOL ()); + MOCK_METHOD1(IsClipboardFormatAvailable, BOOL (UINT)); +}; + +// Empty のテスト。 +// EmptyClipboard が呼ばれることを確認する。 +TEST(CClipboard, Empty) { + MockCClipboard clipboard; + EXPECT_CALL(clipboard, EmptyClipboard()).WillOnce(Return(TRUE)); + clipboard.Empty(); +} + +// SetHtmlTextのテスト。 +// SetClipboardData に渡された引数が期待される結果と一致することを確認する。 +TEST(CClipboard, SetHtmlText1) +{ + constexpr const wchar_t inputData[] = L"test 109"; + constexpr const char expected[] = + "Version:0.9\r\n" + "StartHTML:00000097\r\n" + "EndHTML:00000178\r\n" + "StartFragment:00000134\r\n" + "EndFragment:00000142\r\n" + "\r\n" + "\r\n" + "test 109\r\n" + "\r\n" + "\r\n"; + const UINT uHtmlFormat = ::RegisterClipboardFormat(L"HTML Format"); + + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(uHtmlFormat, AnsiStringInGlobalMemory(expected))); + EXPECT_TRUE(clipboard.SetHtmlText(inputData)); +} + +// クリップボードのオープンに失敗していた場合、SetHtmlText は何もせずに失敗する。 +TEST(CClipboard, SetHtmlText2) { + MockCClipboard clipboard(false); + EXPECT_CALL(clipboard, SetClipboardData(_, _)).Times(0); + EXPECT_FALSE(clipboard.SetHtmlText(L"test")); +} + +// SetText のテスト（フォーマット指定なし・矩形選択なし・行選択なし） +TEST(CClipboard, SetText1) { + constexpr std::wstring_view text = L"てすと"; + const CLIPFORMAT sakuraFormat = CClipboard::GetSakuraFormat(); + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(CF_UNICODETEXT, WideStringInGlobalMemory(text))); + EXPECT_CALL(clipboard, SetClipboardData(sakuraFormat, SakuraFormatInGlobalMemory(text))); + EXPECT_TRUE(clipboard.SetText(text.data(), text.length(), false, false, -1)); +} + +// SetText のテスト（CF_UNICODETEXTのみ・矩形選択あり・行選択なし） +TEST(CClipboard, SetText2) { + constexpr std::wstring_view text = L"てすと"; + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(CF_UNICODETEXT, WideStringInGlobalMemory(text))); + EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"MSDEVColumnSelect"), ByteValueInGlobalMemory(0))); + EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), true, false, CF_UNICODETEXT)); +} + +// SetText のテスト（サクラ独自形式のみ・矩形選択なし・行選択あり） +TEST(CClipboard, SetText3) { + constexpr std::wstring_view text = L"てすと"; + const CLIPFORMAT sakuraFormat = CClipboard::GetSakuraFormat(); + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(sakuraFormat, SakuraFormatInGlobalMemory(text))); + EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"MSDEVLineSelect"), ByteValueInGlobalMemory(1))); + EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"VisualStudioEditorOperationsLineCutCopyClipboardTag"), ByteValueInGlobalMemory(1))); + EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), false, true, sakuraFormat)); +} + +// SetText のテスト。 +// クリップボードのオープンに失敗していた場合、SetText は何もせずに失敗する。 +TEST(CClipboard, SetText4) { + constexpr std::wstring_view text = L"てすと"; + MockCClipboard clipboard(false); + EXPECT_CALL(clipboard, SetClipboardData(_, _)).Times(0); + EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), false, false, -1)); +} + +// グローバルメモリを RAII で管理する簡易ヘルパークラス +class GlobalMemory { +public: + GlobalMemory(UINT flags, SIZE_T bytes) : handle_(::GlobalAlloc(flags, bytes)) {} + GlobalMemory(const GlobalMemory&) = delete; + GlobalMemory& operator=(const GlobalMemory&) = delete; + ~GlobalMemory() { + if (handle_) + ::GlobalFree(handle_); + } + HGLOBAL Get() { return handle_; } + template void Lock(std::function f) { + f(reinterpret_cast(::GlobalLock(handle_))); + ::GlobalUnlock(handle_); + } +private: + HGLOBAL handle_; +}; + +// GetText のテストで使用するダミーデータを準備するためのフィクスチャクラス +class CClipboardGetText : public testing::Test { +protected: + MockCClipboard clipboard; + CNativeW buffer; + const CLIPFORMAT sakuraFormat = CClipboard::GetSakuraFormat(); + const CEol eol{ EEolType::cr_and_lf }; + static constexpr std::wstring_view unicodeText = L"CF_UNICODE"; + static constexpr std::wstring_view sakuraText = L"SAKURAClipW"; + static constexpr std::string_view oemText = "CF_OEMTEXT"; + GlobalMemory unicodeMemory{ GMEM_MOVEABLE, (unicodeText.size() + 1) * sizeof(wchar_t) }; + GlobalMemory sakuraMemory{ GMEM_MOVEABLE, sizeof(int) + (sakuraText.size() + 1) * sizeof(wchar_t) }; + GlobalMemory oemMemory{ GMEM_MOVEABLE, oemText.size() + 1 }; + + CClipboardGetText() { + unicodeMemory.Lock([=](wchar_t* p) { + std::wcscpy(p, unicodeText.data()); + }); + sakuraMemory.Lock([=](unsigned char* p) { + *(int*)p = sakuraText.size(); + std::wcscpy((wchar_t*)(p + sizeof(int)), sakuraText.data()); + }); + oemMemory.Lock([=](char* p) { + std::strcpy(p, oemText.data()); + }); + } +}; + +// CClipboard::GetText のテスト群。 +// +// GetText で取得したいデータ形式が特に指定されていない場合、 +// サクラ形式 -> CF_UNICODETEXT -> CF_OEMTEXT -> CF_HDROP の順で取得を試みる。 + +// サクラ形式を正常に取得するパス。 +TEST_F(CClipboardGetText, NoSpecifiedFormat1) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(sakuraFormat)).WillByDefault(Return(sakuraMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); + EXPECT_STREQ(buffer.GetStringPtr(), sakuraText.data()); +} + +// クリップボードにサクラ形式がなかった場合、CF_UNICODETEXTを取得する。 +TEST_F(CClipboardGetText, NoSpecifiedFormat2) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(FALSE)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(unicodeMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); + EXPECT_STREQ(buffer.GetStringPtr(), unicodeText.data()); +} + +// クリップボードにはサクラ形式があるはずだが、GetClipboardDataが失敗した場合、CF_UNICODETEXTを取得する。 +TEST_F(CClipboardGetText, NoSpecifiedFormat3) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(sakuraFormat)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(unicodeMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); + EXPECT_STREQ(buffer.GetStringPtr(), unicodeText.data()); +} + +// サクラ形式とCF_UNICODETEXTの取得に失敗した場合、CF_OEMTEXTを取得する。 +TEST_F(CClipboardGetText, NoSpecifiedFormat4) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(FALSE)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, GetClipboardData(CF_OEMTEXT)).WillByDefault(Return(oemMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); + EXPECT_STREQ(buffer.GetStringPtr(), L"CF_OEMTEXT"); +} + +// サクラ形式とCF_UNICODETEXTとCF_OEMTEXTが失敗した場合、CF_HDROPを取得する。 +TEST_F(CClipboardGetText, DISABLED_NoSpecifiedFormat5) { + // 適切なダミーデータを用意するのが難しいため未実装 +} + +// GetText で取得したいデータ形式が指定されている場合、他のデータ形式は無視する。 + +// サクラ形式を指定して取得する。 +TEST_F(CClipboardGetText, SakuraFormatSuccess) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(sakuraFormat)).WillByDefault(Return(sakuraMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, sakuraFormat)); + EXPECT_STREQ(buffer.GetStringPtr(), sakuraText.data()); +} + +// サクラ形式が指定されているが取得に失敗した場合。 +TEST_F(CClipboardGetText, SakuraFormatFailure) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(FALSE)); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol, sakuraFormat)); +} + +// CF_UNICODETEXTを指定して取得する。 +TEST_F(CClipboardGetText, UnicodeTextSucces) { + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(unicodeMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_UNICODETEXT)); + EXPECT_STREQ(buffer.GetStringPtr(), unicodeText.data()); +} + +// CF_UNICODETEXTが指定されているが取得に失敗した場合。 +TEST_F(CClipboardGetText, UnicodeTextFailure) { + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_UNICODETEXT)); +} + +// CF_OEMTEXTを指定して取得する。 +TEST_F(CClipboardGetText, OemTextSuccess) { + ON_CALL(clipboard, GetClipboardData(CF_OEMTEXT)).WillByDefault(Return(oemMemory.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_OEMTEXT)); + EXPECT_STREQ(buffer.GetStringPtr(), L"CF_OEMTEXT"); +} + +// CF_OEMTEXTが指定されているが取得に失敗した場合。 +TEST_F(CClipboardGetText, OemTextFailure) { + ON_CALL(clipboard, GetClipboardData(CF_OEMTEXT)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_OEMTEXT)); +} + +// CF_HDROP を指定して取得する。 +TEST_F(CClipboardGetText, DISABLED_HDropSuccess) { + // 適切なダミーデータを用意するのが難しいため未実装 +} From eca61cc5567364899dddc91e6a815923844cbee2 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 13 Feb 2022 18:15:42 +0900 Subject: [PATCH 071/129] =?UTF-8?q?protected=20=E3=82=B3=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=83=BC=E3=82=92=20explic?= =?UTF-8?q?it=20=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/_os/CClipboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index 81916fd794..dedc6a138a 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -69,7 +69,7 @@ class CClipboard{ protected: // 単体テスト用 - CClipboard(bool openStatus) : m_bOpenResult(openStatus) {} + explicit CClipboard(bool openStatus) : m_bOpenResult(openStatus) {} virtual HANDLE SetClipboardData(UINT uFormat, HANDLE hMem); virtual HANDLE GetClipboardData(UINT uFormat); virtual BOOL EmptyClipboard(); From a73255616e89229f0b32dd641ff0cdc07c7becf3 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 14 Feb 2022 12:49:23 +0900 Subject: [PATCH 072/129] =?UTF-8?q?CShareData=E3=81=AE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 言語切り替え時の共有データ書換についてのテストが薄いのでケースを追加する --- tests/unittests/test-csharedata.cpp | 68 ++++++++++++++++++++++++++ tests/unittests/tests1.vcxproj | 1 + tests/unittests/tests1.vcxproj.filters | 3 ++ 3 files changed, 72 insertions(+) create mode 100644 tests/unittests/test-csharedata.cpp diff --git a/tests/unittests/test-csharedata.cpp b/tests/unittests/test-csharedata.cpp new file mode 100644 index 0000000000..0f4652ea9f --- /dev/null +++ b/tests/unittests/test-csharedata.cpp @@ -0,0 +1,68 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#ifndef NOMINMAX +#define NOMINMAX +#endif /* #ifndef NOMINMAX */ + +#include +#include +#include +#include + +#include + +#include "env/CShareData.h" + +#include "_main/CCommandLine.h" +#include "_main/CNormalProcess.h" + +/*! + * @brief CShareDataのテスト + */ +TEST( CShareData, test ) +{ + // 共有メモリをインスタンス化するにはプロセスのインスタンスが必要。 + CNormalProcess cProcess(::GetModuleHandle(nullptr), L""); + + // 共有メモリのインスタンスを取得する + auto pShareData = CShareData::getInstance(); + ASSERT_NE(nullptr, pShareData); + + // 共有メモリを初期化するにはコマンドラインのインスタンスが必要 + CCommandLine cCommandLine; + cCommandLine.ParseCommandLine(L"", false); + + // 共有メモリのインスタンスを初期化する + ASSERT_TRUE(pShareData->InitShareData()); + + // 言語切り替えのテストを実施する + std::vector values; + pShareData->ConvertLangValues(values, true); + CSelectLang::ChangeLang(L"sakura_lang_en_US.dll"); + pShareData->ConvertLangValues(values, false); + pShareData->RefreshString(); +} diff --git a/tests/unittests/tests1.vcxproj b/tests/unittests/tests1.vcxproj index f45a2273a3..821e1e3cba 100644 --- a/tests/unittests/tests1.vcxproj +++ b/tests/unittests/tests1.vcxproj @@ -112,6 +112,7 @@ + diff --git a/tests/unittests/tests1.vcxproj.filters b/tests/unittests/tests1.vcxproj.filters index 2d8cc79a47..d94be58f34 100644 --- a/tests/unittests/tests1.vcxproj.filters +++ b/tests/unittests/tests1.vcxproj.filters @@ -160,6 +160,9 @@ Test Files + + Test Files + From d2a0f7225772015bd177f3f672a927cd742fc440 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Mon, 14 Feb 2022 14:32:55 +0900 Subject: [PATCH 073/129] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 仮想メンバ関数を const にした。 * 仮想メンバ関数の宣言部に目的を説明するコメントを追加した。 --- sakura_core/_os/CClipboard.cpp | 8 ++++---- sakura_core/_os/CClipboard.h | 13 ++++++++----- tests/unittests/test-cclipboard.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index b77bc6adbf..fa0d6806a0 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -674,18 +674,18 @@ int CClipboard::GetDataType() return -1; } -HANDLE CClipboard::SetClipboardData(UINT uFormat, HANDLE hMem) { +HANDLE CClipboard::SetClipboardData(UINT uFormat, HANDLE hMem) const { return ::SetClipboardData(uFormat, hMem); } -HANDLE CClipboard::GetClipboardData(UINT uFormat) { +HANDLE CClipboard::GetClipboardData(UINT uFormat) const { return ::GetClipboardData(uFormat); } -BOOL CClipboard::EmptyClipboard() { +BOOL CClipboard::EmptyClipboard() const { return ::EmptyClipboard(); } -BOOL CClipboard::IsClipboardFormatAvailable(UINT format) { +BOOL CClipboard::IsClipboardFormatAvailable(UINT format) const { return ::IsClipboardFormatAvailable(format); } diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index dedc6a138a..f398c56796 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -68,11 +68,14 @@ class CClipboard{ static int GetDataType(); //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 protected: - // 単体テスト用 + // 単体テスト用コンストラクタ explicit CClipboard(bool openStatus) : m_bOpenResult(openStatus) {} - virtual HANDLE SetClipboardData(UINT uFormat, HANDLE hMem); - virtual HANDLE GetClipboardData(UINT uFormat); - virtual BOOL EmptyClipboard(); - virtual BOOL IsClipboardFormatAvailable(UINT format); + + // 同名の Windows API に引数を転送する仮想メンバ関数。 + // 単体テスト内でオーバーライドすることで副作用のないテストを実施するのが目的。 + virtual HANDLE SetClipboardData(UINT uFormat, HANDLE hMem) const; + virtual HANDLE GetClipboardData(UINT uFormat) const; + virtual BOOL EmptyClipboard() const; + virtual BOOL IsClipboardFormatAvailable(UINT format) const; }; #endif /* SAKURA_CCLIPBOARD_4E783022_214C_4E51_A2E0_54EC343500F6_H_ */ diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index d723639ba7..4db5b13f66 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -211,10 +211,10 @@ class MockCClipboard : public CClipboard { public: MockCClipboard(bool openStatus = true) : CClipboard(openStatus) {} ~MockCClipboard() override {} - MOCK_METHOD2(SetClipboardData, HANDLE (UINT, HANDLE)); - MOCK_METHOD1(GetClipboardData, HANDLE (UINT)); - MOCK_METHOD0(EmptyClipboard, BOOL ()); - MOCK_METHOD1(IsClipboardFormatAvailable, BOOL (UINT)); + MOCK_CONST_METHOD2(SetClipboardData, HANDLE (UINT, HANDLE)); + MOCK_CONST_METHOD1(GetClipboardData, HANDLE (UINT)); + MOCK_CONST_METHOD0(EmptyClipboard, BOOL ()); + MOCK_CONST_METHOD1(IsClipboardFormatAvailable, BOOL (UINT)); }; // Empty のテスト。 From 8ee80cad56f2e5eb542ba57b1b82b40719fd6e68 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 20 Feb 2022 03:17:22 +0900 Subject: [PATCH 074/129] =?UTF-8?q?178=E3=80=8C=E3=81=93=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=80=E5=90=8D=E3=82=92=E3=82=B3=E3=83=94=E3=83=BC=E3=80=8D?= =?UTF-8?q?=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 --- resource/my_icons.bmp | Bin 127798 -> 127798 bytes resource/mytool.bmp | Bin 63478 -> 63478 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resource/my_icons.bmp b/resource/my_icons.bmp index 8c047474de3a3b2c27e9743fe6c59988416913ea..f14523a4d59f657a9536192a039f22555efee1af 100644 GIT binary patch delta 239 zcmdn?jD6cP_J%EtZhF(N=`spTc4RTw-loTRfpPjXeMW)l+cX$Wx6d|UJk2=$n<1mX z@-ibvrs-@ZKvtUxkR@gYWKA;zveYbqtYsEJmYEe$-!dyko$ZgT7_Tr+ce4S?9J2w+ zgxNt%G~Ui>&v=$`dYS`-Z?av=k?{=U^fD)yjoQv28{1r9d}~(_f0`SN@9hraFY|!$ qqdh_V6JCsblSO)rwx@Z6JaEH@k#G7H9Y%-A>z6BSU*^j=VJQF>qE2i8 delta 257 zcmdn?jD6cP_J%EtZhDiiy$YD_z{BXa{f-`E731W#2i}v{EZ5q8+JJF3qrlJq3=9na z{{s<_VEF%Yd6^L-6HpW^0ulvD{#@Q>f)E7@fkmg8p^8FGSZ2Y<#Q1Z%yEUWz_Gea% z7Z|6P#W5O8-sUZ^{hJMt3v_|=c20Z7vmlnsb}2{3GmMkXk{q_HIfG=&?s;u@aAiEk zIQiI%fXN#=*|x{HGwwq0ay;R@y=>2i$S3aiv{K0l+Zi(wx z_^bg@s}+xJK@SL|Ch7#=g$*S+Fw?dy5m3p6vXB9 z@3;d4b8Aj6|E|(@qm?xA}hq ze9GalypeiL0mY5sP)^-Q{wdXeyVnPY{&nN&+kBgTr|MklQ`N84(<&peDI#M{?(71pP-BDh*TzdW+!r{i`k@^oA7pTY^ z(~~|IUpEeGne^oK%MQ6^?{gdsfy-|=nt>7~M4=XV_k7w7Wxaj{*NH)?-i zX?*?bTHEJb|9*4L_E|Tuu1@)}Kd{ldA^QWIZU_hL4>x2#V54;X`%S~q?GL@)4d7t= z{~NFeDgTYwVaSj1cIvwAK%O5v3>e(VxM1ImJ?i@9f&A<@ufIRFZzw}k!RdgUSPAD_>ghQQ^|ac~?y-)|-y(*9!21>^eH zL!a^dm(qswa~wXmM-+AoKe!p<*1LXM{S)$V>mlGZT1#?!v#EC7 zJs$2+YF1=9q@A}DCB*zi+i5%eLGu(JexpV1`N(B_io~x9&z+ybmA@9AH~hr2FXlNc z_Jumtb3EIhv0pbDe%T>NZO{3j_Wao>`>N_QSgs5;ZO1q8HZi|m};Rgq-4;mR%Jk_^N zBdi@sz8NRh9*q}L*|>4)^(K9UTfUt1mOtT{_P`1k7Hrao@^#n0>mvis?rL{RnXetv~x4YBhSM!})( zSN;S1)x7yjxAL*Qu%x|*X7`D?sGs2<9P~l=w z3pa)}zr|;XAJsB`d)N8SPvPPh>7mB2=J)c_zE5e3LXW#SaxWaxcByKwXWu70MO5i? zF{-6Y@p(#+_ML?0mM+3`ueU-iViev?XYpd=={#RMWs7k9{P{)cYT@$M{l-VzJ&RCe zfgOhP_Psv0ZZ^=3B5*-d@{o_n9yHQb{v=O%VmQLV8Rk{HJz<_QRx~jj`6FFUR&S7K z9_g-=ALfA^HZE6o-kyj51i0BiH~cr3JIS2*cA4n#Ct9VC@Pr$H8-o!J9ue}G_TNRa zLyTzEK4+LGoY?<+g$R)2YW}ppr~WBCRj?g2@f)SHe6p)pe(_53Fg`B4cydQFrxgy$ zhx1ZJ^W-0+l;aUGu9IJdE1~KE5fvGudGgn(lAAx-Ny4w}3de7Z5?lERweW}^qebFp zi3)~GXy`+pLqqt501v~>iy0q z^rknunm2FJb#<(-Z#J!PxJCC_vERDc^is9oyfy6)pO!t~Qt9uZd|Kt*s^wJs?%(xs zk>1C-*?QM_BM{(a&bS$*mpjZEN8mPQT`T8YLWN zNT2t2OXH@@IBM8*trj!-I1X{KvM<@R1kN)T+IJ8T|W7uCU%k5W|hrqD< zBT{yD27}@HS+ZoU)}L^WfQQ2N+)q^JBb?re{Q>JkzjWNGH*5rFMN@rY)E^919S7^? zEH;)Dtp4(%51Pl}fXmd+7~@;p4K z*&k?n4TqhCgH!MvcN4~zblS|5HID*60)&;}GB1SkM4-X>`- zp8OGMTCIVNi`#`mE9cw?&(HO~2Gq}qK!=xYTmVK5hjDo*Q|mh!@*qSQ*;8Qf{E!M; zy=|yB^Gl#?TyW*i@l$f?2jP(9q2~@^=q}wOXpK?MjRrJ&a#>gCw%Y$;*Wh?}YIr;G zTfF#j$Ib*59O2M6c_@e9+V0*lfk6D{BUg^tsJk8Uy40HUalrWq8y`9+qH)4G5bRMJ z7`1lnkp~+Mo!z7#p8v^De)3`7dH1)!{jJx#Z}qg=qF2(ms&Kd>9JYqViK5u#!ni11 z9vt6(Sw8d3%nYsSWbfo6B&XtHCx|);sLrj?{G%UVeGB6|u3<#44P7>&RkojT4$)H}@IVm@4 zhx@x!E98L_M7VBt^0&XGLR9A`KUtPS^>D_joSG5i!sUVLs>a3E=7}vX!r@^WYVv@T z2!~$p82~8md8;N5Q-eWQc!=MZXJ%$Q+Z6sGs&@O`iC(Wil85)#`=%creT`w2!B6_3 z96oW!(MKf^zu4M3^8WgAg@e6^r1LX+pGo?`sLqMGvu<#`wnrXJKXl5CUFy{@k%tdI zTyl8`MM!-GQm?lcha?Xt434cW;V>f{(7)0T9h%weJ%}W<-?;~Y=xDad@?vUhi}99l z==Ek*zwLjNK7JlCF2RAZKb)GnV`Y89^uwdC3Cp6Fp&NdRJZM$%#L4U%7p^>h+xoeD zBoEf!z4NBSP}h^=`XS91oe31?DmbXM{eMJ1EbDF<^{(MKE)Ss}s&P@y%%C4ksYt&d z3%zGFg710jop;_UI@=N~a6leJ0p8@raOew%ZNq{2;&p}H@qX_cyJasgkbSxSD)InM zPks-1I69Fp{$gwQ(p~Gz;L!JRu|E#6@2<6DTprZgZgHryEkN@5K5X*mQEQ#Ilm$8U zde`zdaIkV~`oR_uxhWOl06y@{!QmdqK?N=qQKx|=o5M8%9Y`5-Sx9JZJK_t`s|U1eQ+3;2UV*l97LDqk%xZX zqZUP1LEvEF8V|U!^@Gow)L(9-C#5FKT)BGBwov+;35Rz39gPdI0Tt5^(B$STeQ6n~ z5w3H&T)X3+)~7Z$z$@V({h<8W9nT$IzvF1$DKFf0uJ_{E;&#)M%$w#8#=-fI#(DCm zdK@x+nHMe(6w7#ac@SI5wP{~^(z}g-w2q2;$GC7<$bnm&E6^JW2aSxxhgivjhDCDo z6z2LeQN&?)TR8mbqh}>Ik36#ehf3R<;FMf0Bk=$F$od_~L$CMf`Xel)ZfALF>xYlV zA(gj3nV+}y>1uxHkeX#MP-Wd)`zg1YFNWC!BSkpad{HqB95jq<;1jdBXyd{a0mud) zsObl&yF>JYDb(4Z3fH(ew*FV^Iropg<^oa4L;mFY*(VfJ99v&sUy1ePn!&L5J5Mn# zl;J=(f2in~dYCTu;Na?EuN?UTXb;OI-wDd1C4oR!1Ms4lE;>nHhTbGS z`k~y5!zzJrp}|tkM3Eb>7re-fUmfe-I9Av2^^Qf3hrB@~Nq%wzDffYqUSy z?)9d&^H^t9)CGPRe&N8HbT<4!*>8eGzuzx+cC!9<-gb7yXN|f%pbsR^xQYf29&GEc z;+bcX8Xu)&T$J1T5NBBqCOLR-a=^OqvqoJW%b40&JzHhK6AQJ06|lG^)a-=8{7a$q;{6nvoWt070 zZgRkW__Ib`9#~N~)>|$Iw4Lxmb_~V|7SdsrjyY6OK76Dlo_}Yux8nLC2ZwFc&JEI4 ziZ?!qhW} z>U43=X|d^aX4dJ6Da-A}zee!=PH38&QC!oT@sik}x<))^(};E?nCQQ`bv zD4gF*R9W#qM01J0R5-sEFjmX|qr&<9peT&rWa5Y4>i4IK-{bH*nF08U?^CwCjZW0r z0fTVxeV*3rCwK(I8L75R0!4iHKq@@0<#cwzDfRYrb55zZ z`Mv*_i>xib;Q;+n;rw1;r>XFlu(gW*uyB5c1AgL-pW%T22gS$p>tW3-%L%p#Y*;o0 zL{K(l>+1^e^>ojj5^NsN@8qu#V1YwX~})m&@Wh;WzWp0D4YVUG-Qo)T*Re#j~PVg6Rj zDSFKOGc)7!HtlXR@coS*aq{(n;cLN67b{t8u*|2-x&(eOunq`z1=zbx^)nD`w{ z{95pHyZ5X*`aq}kw9TKM0{w96W&TV*P`tUwEIlD@^GQ%y6~t$P8`1DzClwp#!|E7* z;Wz4b?`XvVRL@Cl{!H=5i{t#6C+rXNRo3>do-2$TsPNa$Q-~Tw9Y*oRBU!QVV9kG3 zw_y({ObqKbmygYEHLz4O_8@F;hBymKOq6pFwRsfL4SAS9G(GLsruN1L7M=>1cFC~< zB>dh~T;Fnxkm~gw>-PRqI3zqi8kQ(`%?rLPV-fD~-o_jla@*l-sPuCTr?gPEvrG&?0-QwFL@d!IMd{u(4W5A#1X*_1mE*BV4afc&alX{_J*TA8LdR?f+1Sl=0 zf?pQkZ~|dhIn-Fs@AO`@Q-7|fH=HjA4z}&a{$LQ86nx=^RD1&6?69{eO(zenD$eJ!FFxz1799BlfF;g4-Ogf&}z}~g=8Xy&%9!(2@f2$mI}(T=lV|dp1Zv_@3fAC3^BqX zN^D>J{oRZAx@dq4k3scefxJ_GLGvp66YEIB;otB8sxKTQ5C8jraXjWt9sm-Ci`cnk zzSlB#{`5EwLP0p3egCfB8_2^5hYP&jFC56XKMppII48nVX|sldj|+wCEU4sRYintZ zLk`HVe>X$Vxy_#_auWT*4$JnNoe56$OZ~MsrZ=XC#eAz(EQ0tW6%NCDsW~`ss)ln1 z9hQA9&O>0h@b(J_;ZZ!+o&FynojK%T4jf+E+S0*+>C>lw3N%sfnot0TiL>Qh$ip9w zaCm9!SB8V~z0C0*jK+C8D@+sE1$nsbu+E7TCw>hMF!hUWz@BhmD2{#AaiGosq38QH zF2<;ENb77w!Q??p9%hB2xNG?H=?Bh=;T-dFvAbLj`O7F{BQw$*c+M;i!w6dvyKK3C4w&gMP5`khF1nXV|T7v=Wk@T}>FRqzlFHjRF_nEzVp ze{eW{nmG&w5#{O}iq0Q^1~NEGC%L#1`k{^kjn=vkCmamS+`Q6;?gW)0awyL;zN#3? zK_4FQy$Hq&<*~TZ`#A2vJkMdk+jG;?XORcSh5lVU_xmrt_~PNBb7^N47~HPU@F713 zL^z+;f2`Z@uDnt7-*-HYl^8k6Uo0*?t9HX)@^JiA!a??;nVH!&FZMEZ1bn62!Yy0+ zBoE|69`X(&L#vk)Y5!z63{U>?AOG=TN>O+KAsiz7*zWpQ6&vLoL=6Wdu1xD{(+|i4 z1Nq*c-#bJafI>L@U~ul-IdI@H>1~fp4g0D;T_|}N3>=5m?lw3iJVZKgz-NB$Yw)o4 zt&#z!fuVB0j6E#sH3e+yLgA%jR7&sq0a&CT^tO@4MZ$r(!DONLSGZhU!6yMRGs~Vb zg~Q+*2#4t;4}bs8Tem%O&s(TT=6$sXX+S?n9#*^WGcH8I zDJTXwAY)^F?4v5d2)52kRmW_<2=T`Bx;^N>-E)T$PIAfkP92Q$0x=XI#fB*2x z#9yI56CT3h*je~!_0YiK_)nQg-5yrqu$_N24invW7YR_muWuH9~YLW{c=$rIbuD-BjvQ@Lmp^G;BqnKVQVYP)NWfo(7r1M12`!A`-jmF zj>oaXorz=C|56V{tPicc;`Aw}qxwyCL0U}{<3inm<9y8bw|d{FBN86saO|+I^BT5k zewN?esZ)l4v4# zTro$#Z~NJxdi=s{E&S=HEh@@6h(`W0x$uuuaM5H@b5>7vbaEyXy%XWRY8w0C{Hk-L zgj+T&icYN#br#L=DCZy=c@w*iq*H$%?+#AK(9V?~Y!0Ypojappzv7zg!ymM&XBAK} zjqc&@CK>)${yFS$ z!Xe@@sx$v%f9TnF)iP#zpXld*O0J^q_LqIAr&D)YIhHuL9G+iGfNe!H-znUk0x}6e zZvLmUcl~Brv!V-z0X{apOd60zT?8cLRgH%XTcCk?2*-n&b$JSm0!EuDfW9&&!~rS`{|D% zUcS{H9HRaY2~PgP|8L%zGaSM%94@tnIs@W3XnU$n4~7Dv8|f;_VP@&u+>nhtxhjWI-Nef6$u(ot>$264j$D=9)Mp{GL8%>99*~(Bi;h{t*2?yg*&220v!c zfIM)jSYJH^fw{$mgUf%O3P?2M!Eng(lg@tF-@3rA{PZyVL8G3p(4jeh!n-UdPe=L2 zTzWFpGlRJd38>VJw1QqLbvf(>5iedeQt6f9NMgG$<^O2uk0-I zs?P4^waFFMnH#(1UA&2ww-@IY=S&_3*(B*17h+#ga5&i~92{7_f= z586rfd??MIeQaaHta~cT-&6l)dz$`?s-UM0PA;~O-dP&8Khiho)921jo;&v%IGm;1 zss9&q$6>H_9<9qm(jT9`Yr9;k^g}L5WbfS1?%w*9aDZ+?tksZyZ)HW}3moodT^jgx zO)e&f;SU=1oc*?VkX^>};a^ammtXZ?)I0j|0RN(@*P0vQAV7peQ=YuI>iRTR8Cz=i zCnr~thxS7cf#O#;`i1^@<1yM2k3cClxnpa!fQY-4>N|t zOTSv3JU!A2{U2(Ce`OfB+P<86&YqFF$}*FO5*$+bWA(p^@v&GwaIt&<99lR&V2ba?{l48-dP#sQO||I!FmzgQ~6c>@7Hqz;gH%xMQ2q)@@xLo zy3*v~_mPM6dyB%k&#;Je-1&M+hj8XKk@};ZkvyC&-vGCTGpyG*^-uqA7q7qm`qV&c z5bIYSFXtctQ(Hf%!nvX-L-LSZKZR4rS%Uf--v_^!i-d#x550oFzj2cAN4;;#_ z;m16gYZ_-fEIbUJPz#rSuzI>d?7Z!NUH+{6k)FJtI-jbwhl(yN%vAAdeT_V@{us%_ zXp@-cP3j3FnIX^*k_Xoh?8AK{t_mm~h~ zU-x%dGHr8Nm|d7P!yzfJfhx5Ouk?t~Iiox`q4C(qhlhj0lyr*b*)!`EtB=)>AT5Mc zzwmPxZp|CG=l#5*I2!g6ODg*VkM{V^9^=2Qp!q|ciSCm5jW6M*^f{ws3C8_nI9O$k zt+(rA{fl#!IuV+h^0m-6rQr}1R&#EVtJTBm7v)he{3bkFzGdce&OKmXNbfQG`3H8b z*`39cZ?dg$&5g+ArR}n|ORYQ9OwsmICpQW!3!g}S5;Xlc4Ttad!6DQ7%&0*MUa4L| zC8%<(sIMQdc_ddOd6J&5+4B}V_rTtoouB;B;(vQH>?LHs?XdQm`X0!1k_S=YV1Dp5 z+AYkFJhYqs&<{2)M)DnU{?XJ0J;}RT6Y{`$$O{*4(>VvpgP$9kBOTM1(=B9Mo!k??F^J7#&{z-rv1x_7Y0vNzkLOfdclZ?a~fzAP=I#K@=Oug!z#( zi_hCek-5q*KAZeMe){z6HRy#ovf$`oBTfAP4qK83*6YvA7*(=O{(C)gqpBarq(HAV z7xj(xuHlf~m9NoycBJ;ZCqv;NKi_-!gTH%oD0_+co?sp5=N}jsaJF#)wQ*to3^YdJ ze7SRvUu?8MK7MKe9OzO>fYCXli*%R#L3LlngM+C!;4rEdDLvu+3#FZN=s)~$oOiHt ztUjnOuU96%CPm?I%0oKupzomAd5iE1hYLwRoM0VToqwQoE&b%WIj2zM@;o<+oO}ee zePiHYT`U}w!KizzvI>mZcJT^Qoq(Bz=@|E{yp-L z)y_Xi9+LkL{@*vvULszypGcj^8K2sP)gN;Pf1R{cSxQexmRM@Y1?6^=|Nr{m!%zBw zHi@cgPC3S8ey6IlrQ-%Vr}pphlf92#kVGdOOny~PIPEs|FsFq`Nk2q=oAR)x#__vx zYeq&C9M11{S-5{OAH#v=8I8upBH7WSBVB{`FI=(Fi=H$Z^HQyT z28qUnaF(Y>m9APIz(MvBx1W6B-Wm>SC5`oFrdDfcEO`&aKv+r%g3|Mh1#q|~c^JtH zqU|blDb&8ho=8y+fjB#OE9){&oYfdb++6n>ssT$0uOmIgVT@FDa+# zoQkgLJqA0cE6V;A=jr!S#TCEgDf`yb#Sdby{{2( z_D}0=>U-GmyFM6E6{o}*Vx2iw`^rwcI`p-kt@tfV86Uso^k`Ja7((2Yk?SoDzf+4jez}t5rKw zN|&7YAF+HK^{Z2hSAFTX^uC1I4-gP=w`IZBCW*FAY;H*?|DKE1Yj5**5%0p}d4 z&IAW?DtUNr+XVu?JP41Rmo1&c@$so~aYD-;VvIlXK>91YzpiNHGaS6% zbkIR~_&D@-8*8N<;jnSKEWzO$7yIQG-p?7$lM~Bq&_f<}T_E5CJL6}#nqS|a?D=^Z zb_jRf30s7Gg(E%7oq_aNxy<~{sDaMR7-iooLx%RRqIW9&duRTJ^n;b1Ddiiiu+?AQ zlv;ov`T;Dyf8yliGNWR!tTQ>AIOl)F(*L5oP|?UI{wBX;6nU`5+ogW12Pmg^Bo9Y+ zwud_jhwd^10y$({Jcrohmd5$oKHSRDxZoKG`|h?LKS{{n*x{f{XICS6wUPsHFu4Ff z*OQ`pe}VMx%{)x{@{O_!4x-?(2`{yY{?{Fkg_ju><+8pfC(DiV2M5w$+4}V|gKArp zSj$H_W?vmEPvgS$Vhx9+Cp9iy9==p&JO5p7@{kFKfjz(ObBIrm6`TCR4_fBP*FQ`h zI_Hu+B%0(QPx7#5ovQTjouU0ulLsg#Zqy!=htP}Fd=WT^Kl(xWu1Frrscp$c8EcP zm3}~;3dw_L)F-IYzc-`wJl)=LT2Ae1Tp$G_$9!QULn2aWT!{Y*->`hY*pNI-OXBWC^C_MlS}I?n^q5*~J+}$%Ygp{?EZn+pllObzf9Z&&xAKq&(a6^< zC;ZG3QZSk=Tq^Lxo&s7&ri26Y#g5L!7oB^xerR)0gs;8u))i-Rpuwj}<9Rp3qIkON z@}PcKe~H?A4$pzZ8~C8j{E`EuYf`Hl7wL#CXf-ZUgz!WN>?hjCEOHDt@X;E-rD zf23Mp|z46eG_chB2|A9FT2M)4*j0-+Zis;C7n&Ap;>vHqm!mO8JbiaD+SA}M}8})}g zH06Y{^QnBl8hqkmfrFhS*{2@+7T8R8qkgkLu&!nw?(5jJ->2~G>3rWR>$Wo^HYVVq)Y)I@&;ZMJA3o$;;WUw!q}qWJc=?c{Icw2-`!u0c7xL@f1S zgXQ)C!y(@DNOX4Ai&r}B!^dc4SK$4Ai%)ijDmIXX~!21o_M{>e> z42N_AYQZa_>#W_z5K#lQM00s#)M&gymivGjEuQu=XRs0Zg&tbWKR`+6#Xezbatw!=h1q&5+#>K06 z_Kzo&xa5pON*C#aOTtn0prg#b0ll;6V-+%aI5%({99N}d=U>@D%rAMcaBwhM*-65m z;v?ONf`Qo|z$xqsrZ16)%+B9e^-Qg16ys=iq8}6Q$*T0+ESNq7nS_v12q&ktdYFB~ za^luQb*AUFX2ek3Gc0uhQ@Ntlj8Fb8Akj{XXZICkJEl@JZnidL-z= z7%t6vAP@Xr#xmpL+Z{@7mdWsinbu=3DMbE2fCT=M*Sa!gUdtJZ>gsj)OdHZBDHv1F^tFW zoi}Ugjmr$qZj67kJ>c-L-t$0Dpvsm;^JZzT8pq9i*XlobT=3SQ>xVJ9wHl9KYVog* z$Kb0;hvMX|rB~26F3tK&9`v4v)(@hrAIvq=-Kan84^2MI7yiCh8n+Z)ANgJxzeadk zN7SSCy&t9b=rLTH_0W8=tz}Hm#Il+0M*VUAp~*)FPTVrEZ(H^cv~|S(Q6CXHhRdFM zgkd6RV$@7`qy93v=DzhK>U~qAuC^Y{bT{g^l{5B-@y4~y>(}v^o8ZGLWzJ}`Jy%y= zz9(6ePxzY&BRu3`EZ!{-pO*b0aIj-1P5Bg^9(TVw3aFl!I+#)1#>Bpep)c#PWzv~R#pkR5D)s55I%?t=rlZM|(& z`wjede!^_rRdx$!eXack|N2TM$E-Fp!-lVBe~A7HTJcCXoM5!ODxSwx6z2By)_7`p zBVB{)383w#WdYEBK^BC|MZ^A3*<;$OZElB1x}}*=+d0MJ+Bp}?@B4S-RbXiY|g2$vGjEu zQu=XRtX_OV!syhv{h`%b=DQg>Pcov^Q!nzW{J_D4n*21!_SF~=+^%B#SK(k?v`EJCSGdzB)*&h-PF1HCrl^eH9w)Xk4&v2>Zh&;lO$->@uQS=hzRZ2?ri?nE@|1c_7^I#ExM02&m2# zfrI)dKz3pWCNUGtHTEMv2#It|A&Usc& zXX7JXMFR)N5xW7~Y3T>i5*$YM2giYi`@YNYp`L^EbSTL~#v>crM{b&E_6Ea2e(V~m zsErHiqN-Usmj|;yAVV5(naKluYW9a{iBn+28JtD~ji44iig$12=VmdCd!LC0}f^ZHc#C)&#v$l87Baiitdg$={yisXWN&OC@0 zXYCK#sbs&8ka1s%-#acs4yyLMI3#XS z-=IbR$fYCR?v{^-D_5=<9!{wzr;=1y4TnwS!5dcL8Gh1LIB0xCctLZ*m#Mc>G>H8R>%tE>5FfK{?mZs@oqJCng6_lMCwkW#0$6UZ7Od z6Oq43DTRVb1s-EKq;nvyAEu-qUeTuv&<_utF&wIXOW7BViCyM&t;K8F7@sFWZ7e+? z)zT|@(hJHs$7N5wIp0yYKS(cZn_Xsj_XL!BS~ShivK$7&fqA3JC;V2PCG+_+!s8r> zzEWlD2joFtoXQ-6;$)ZnEfHyW5O;Yc}RQ3k)C9HM*b$H$mp8!adD(H2L$G{uAWu>uE+jh>j-7O zCO3x5o_dGfA!rkq1FR%XKH+cHEW*p=n(_aC`C}g(bWc43kDz-JctGTD(q{6A5Br0i zEb11mrK#ELh5p+Ra~1BZ}@IG5jL5vKM(+iI1Upr3*Z z9ITdB{=_eGD<68*<$FUDkbCiy_|%RiRcveH!q(MsF2AeK&r$lbmsgj^Fo>1AKF<_~_4uAQx z%z=dbi=QD6{18D7^F-_TnVrJ)Lr+!D-2UL%*Vx|5{s)Y*Ka_orqnosao*e0ikXzf= zSG5*Lk6~PFiv7Ovgc6sWrHFk%(BRm%@#uQ;*FDn@6TjwQ^T_^C$Dt#8(a$6gf2ljZ zgTe+Or%EOdl-H+azCYVA+D2Bq-+Ww97gf!0z|KKx)058ugU;p0{P`^1(HIxrB4EVP z>_h{Npb?&^lPWzoZEG(zO$aFkK4Tc=_cUKoKK;kKX_(rRon0=9?{A&wm7LsK|1;(D zJH9E}G8`&-xN?5W_NC{BvQzMZuUy|J!&zxT*J^qaERY8ThsA`656Od)K6>;M!XflX z&~aR%+@P{QB)iLS(%Qv%Mgw%t{LSC|jmyJ7|MNeeS&H!xcz|Cv<@gOH59kkB;AqYs z9MpW9FLYDAH?0bQht0RX$Qs8XeB$W$5i;&e@q5Qb;99lc#UXKva)a_B58u3{KWUfC zIaW65$-f*@Q56E||3B4ui1DEhbPf$Sr)~fKuQF8fFuv~=3idsa16+_Oi??;ecs$xkiQMHvu9n_HsU4xXkgJ7R^QQV> zK_0h1BpmAN2ketEU&j2&c+xL=BS%-x{}MVH7f~EIU{YT*7#J7H4nxrk3rh>CL6eTj ztygjET8rNti;%~gSOv>lORw-IE{*b$hcWxZe(OobudSaZc=JZzN~ALMn47hG^1;Tw|yNkia6kIl-?6Ga3Qc>kLErbTyXgw-jlR{ znf3>5*eQUUzt@#5y2j?u3Ws0E7Ol73!CE3(LU5N+~H;=p^02f9VY@Vd*PltQ2Ot6Y_IB4u`2zyX4yyYS%!a9oZpd*b+x`fIqv2^ zkbnLID0a>H4*;RUK@rKLk6*ge`{ahhwa^zoRvuXY^Q6~LQ31c$y3Kv;lj(xgre2rlz1+~=UjQioSyLpO_aQ9;v|Cf&<54?xCNl}TU!Yg9+ z=3Gb>P~G&3@BHRB;DAIR4?d0Xg+RQ5(%Z{(f3-VHcmxjOw-*P!e^DB)`pjULrdo$g zBMZV|`jRM(c$s0BqYUpn&NnmEDp7rofn^yufao>r2a^Y2q?oNuz{Ht6fOn#_BP;3G zTru=Lbu+P`;Rpo%Mx`VVnjUbxqKJNA>1_G1GdVRpu)mo+7{7gRKs^`^R6;mdUAWMA zps47_$^&{~)#btIzY3T*V#BrnSRiq!bitm1DaG&jK20ys3cOUJ3{P7j{4_~;l%HqFBa!icJ=ga&1zR({?2)Cy2ZVH_dg&8HeZ@wc=VoIU%!uawQw;U zEF*HTKds?lEIb)F=o_R-KcH5KQJbMey`57FKu z)pP1gm#AmIM81q3`FidAJbD-12JVS2@}nW@_n^^^;%%Cqe9@$&P=!7$8og{U-UTC&FOTprun97otfXsI$q#sU#1lk~|29>FsS8 zGG9zfkoqqS!oTu$3nzim7wiEw=`7ybPbUUFKpxt^IZx)~?tWW()aFa{qwCA0A50kX zkH4M7{spf}1c+n$j1?nKY&B8R7kl4{R%A zzbs9!^nY*U|C)tg{F2B2-hC;ZrPs2jO_4!OFGwJ)XY=U4yZ_;BIw;K-zxmGjm@j#$ zzhm=fSw2V6a8|0T!Qtudc3#7wzVD{Gl{A+A0J`|K`s{dc(fO|bx+UQjA94`1s({}F4!Yi_2WoC@WTt5FBoCC$afG`nz}2K ztA~9e_wz3P;$`EaVp@x+!p3ei`s9pi-6|LUh_n>@T_iAwisw4`+RVD-0i9;}C-3KH zgmSp@LnqR-O!)4%`@NUrd<5bM}s!`r#DjZP72jakdl{@sn?|$ly*Vum?l`9^Ym$!r{p`HxfRrVoo?xfy~(`d;N8c~Ct2qbi=f*W&so2P-SR!@214hkUO+`89_iiman5 z91IWPApY%4IM5<#6MnaeXPbJOWjL&rJKW(~t*Ty8zaBquk@YerRmsCDIBdyncG%`V z_`|$VyzsH?E)VQC`TnHrYQiCXuhQgUHOa#&@<1ZPA>yq9SAXfBTVIv8|GXMv4#rOW{C=MJh?p~BUM0~3?2aD0^ z*zmJKvhc+epN?(vEl&>KfJ3j}{qQ_=cbDgG;BbgO&n-s{2lIO%IOvAoTU^$-Kpuwc z>)9*P4<-*PPdKD{1ywu!btTsiEcfJ27!Lm@14{Am0)#n5aBuIaRq{~2;U6$fIK2M7 z|8x{2Bo7ZfARHpT+8HkzpV2AR!UL)U<_-&wtAFy_mA~ko93T!8(8 z*6nOPa;13=d02#Uc4gwV^0og@^9B8xQ!XdR85gNuK?{D^q0~+Zx#L0ka14i;J0Da$ z>#iR8t%BfSZX^%jqWEV}D1#q9`1JR7UK|W;T>N~)%W9(-5L)N!OF7nLNYs^RLT`bMumiyLLC$UtyuN#*5bp2g!riE2!GZFGl

rmDY(hrD96(9N_+8O@9A&t8VhoZl#a{KT8c2e}@)L{gBUB z`r(N9VUJ?I=r6tgI^#>DqLPQ*_4V})mj`B7?81uIsP60eL9q@6$0hxkHw)% z*@s~+c`(Yj5Vc0nkKthJr~*BC3VA>@z@an2e34W7H2T5T4<-*1;J`iV-CLq^hQpr? zr@-N1=1KPbSW$6LQFjjlr$6I|HTL2l1K0XGK$ruE&<`6MNk90D4*r;v(oxcKA^!)B zi&jcU`6U9-`EY2Ib`8ysewa=__-gzb7mW*S9+?a2{IsMY%Soi^uuq=_4xTT12YGmt z| zdWs*GCWpp>#OBPy@1$75)|`2D`GB$VLFJQGX}ajt;%iZ#>@6SL*WbZRY0T1iY}CtW X`hg2?w9-}M!ZTUC3%3FitImG~s5ETU literal 63478 zcmeIbUx+2wo#z<}Y2-w@%2E~x%&xY%6)7vHt5i`<<$#5^@Mzt7Fi6{2hI(rTp@*Vp z={2I7opd)EDTTcDMaoV?KL~o+hngA~7wMD`HGVM8!bGXmt|TjTtLPUu!fLLr)OM~M zeOFrztDZrS^ZEXM=fsU0nW_4dav_a$Dl2|*{{7DHe9!Ov&Yw6D_Z$D~|NmiP?%#3! zm;ApsO_C3ww@Ia?nRCcQ0xtdva^@`9m(GxRp3zFG!7pm9piJeIC}n@Z%^`< zd(kH^zq1cr=nIIOu7~x%u_xN4Cz|!@NA?Xa9kP)}Hns;It}Tw7{)oz&pr$o?4@65{a+M&sE7K+-u4f)5p?r7 zpp07Y8V-BW2V1}I2?ubzdA-*D#a{YF%>N1OKYS|o4{o+!#Ql#i#!W-ui~WaSFTYrC zx;|V8>x-N2Ujfh0dj1Px!TDLQ$6n?C0*BZyT(S3x=Vv{?qfnNg_jPyNfADRHPv7-c zwNKQCPags<(XHxlT6K?@TvKY2B`Ktvb^|5E{8`s&H~J$@Lwxib%~H=tF5{C0esy^2 z{1mSIjqtSPC!TdN&ta3x6I9OuZGFai-DvbfS%v#^MyNf1Hp)7z5pL_-Mm+qq3#0u9 z>W^S17B^1)hR_&p5oxy$Z>NhHorZjPES=bU2InVFU=YLG=?JHuETdS5HL2ER<~JPd zIc*)!V`pD?={$h;H5$~`bMhAQYB zAJauYII#Pmo`K*&-Y%7}dIbHZpICj=Ur1&B#;MCq`WSBcQqo)gfM<$FeyF8WJYM|H zZ%mzEBOUp)E|z}pNQHyq(QA*VULCbB`w^nT!Dt9qfAaW1qo00JRh$DUg+rE_oQ?K2 z`SF|F3OCoFsRHmfDfKcx!NxE8QxYj1eq*F?xh746e@st(-cD!nV&myNUpHin;rRLUi_$g1|DsFw-KsSoOMH-Sv{fOBkjp=HC(5Eyo9OK{&)4JZCFbx@N8W@iK zFOLwg*z!xL#Sm;Nd?3zHOiz{+mmkBu;#}Omy@ITBncU0XG0Q24fsN zBI;vUe`jGIVodA$Im0yI#QNU_B0!F-`NR4i`9pXRup4RMH%@2yw69|M#VhE;WWVs@ z$sLn9t#MF3oR=z^2LA-59FK_oI`~z%5=st;sK^9OgTG0Y-27pmB>I(I;rNYFU@JeN z79Qg#XcqWcqKq!V4#a4}PI`Vc#*@VUaJ~MRF1GtvADkiWpNeygzoy?Af}iJ4G7~WR z!O{3#zu);pyXlpz$IVaaygJUWf7i6e;ZwHnaI4pS@wxw}b=`fdsif+jlLy}~ge84jOB!SBR zW^xaAET~eRk9m1K?>1Lcrqs-=N0p16IDQ~F=@*-LORcv1p{9Midj^ z9O8s<+BL1HlyI0KeOhgl#!Z=Vsd1XP%+E8TPvY>161_2FWnXi=?{qPo`H_R~tB#OGSTusQ`w4@5wAXB;kZZcOLf#*#`nk z=Lkf39v-RfKT!2XJ=V!7Je-1OuQ2JVjSV8??nsg65xeD5si;Q&zVgFhZS9=#A)5Fa z2lU~7^r2iWH%PWgt*m1Cv^qHX+?&m2llCEh9QR0(z4rz#&2C32e+uI}d(&vM;b1L0 znof%8R|W+z3^q}SpU%(stY6$N9OhHbeenFeqw^m;7Uwyz(c-f83&3dC1HaWLFGKC~ z1bq-9gCyyI!FvS)o7@CMdp6c50crh$D|h5`NAP*W0cO&Nk-H&$hj+kM`C>OQzKgoT zzpwhgF)%nD?-aL_bd483?p&Wnz%dS$=|fq3r$4xJ8in}J$1WYSUUxg{bz%Of_XEyH zSpNVAqnrcLK@d8I72ni@hCVE*7Wqc75AS{Nd*6E_%^&~fH^1p}S0<-Po2VN7pbw72 zCE>7EWQVfsEEoDk>H6UKR%Q9lJ2NvXAbB(uaU8@>5ao{3DDO)j{;0^`6CA=}ZEfu} zaOnNL>%-x{)d8q7 z4--xXjmmseZd?!d4-hNr11E@ZgJkoY-$Wq9`QG;yWl%kwzAC3`OyYpJk~mvCduWY| zaJZiamvTwFgu`g`4gh3#JkrpIPOmqRUWniC&CKl2`xO30Re;CzXjF~$;mwuG?895H z(5({q$v%|DlXsqYOA7JhwY6h!t}NC#*n3DiKcn}VWFL&`oR~XnhF$bQ@*>dc269y; z`tZgZL)Qn-VDcg+ZaWS^9}YPlYr;WxQsaf}LryhEqkB^f*`s%$5V=Mh>|keYZ6Inm zj7Iwf|R)2(jSkzq+<(8byd}1(RAL@Ql&dgvZ zsU%K){%xIR!@!-4Qh3YFb)hvT3EhgpYGMY9}T810|S7nvWC zBlJHZcrY)w$~*s3`Y_0{pbusr;E;Xi#Q%Qk#FJ@$=~8jeVC9qzn`R$Oo^ATD0}fUX zs^L^(jf8{fa1MQ_(h*W*0|kMDg{#`Qu^tiN<0kUUHF1!AP_EIt^BDcJ0f%n)QS}S4 zNtqnVK0t$;%Pqs$ZYn&#Tz+)tFIGCMtHT-x*$3rI?tK5m%AF_DygYZ;nbC`5}6y-YLLhoOSH5*aBxbbJ(^)R z0uJgKfe*3L2X%|!<|xPQWuU0TMqfDm$y=wSH*dea^0!Jmn&y;TswwaP_V&u1=)-9A z*2>#Vq;6+=YV(JW$03xrGnt#S`RP)6@}#OY^i&i<`>0+i@)uS?(P?glgV~3gVeA*4 zjvTnzStfioBQbxMtMP%FeX!6BcanB6gDQI|!@6Ig>KBJs{&FSd{;gNMW7PVPKDct~ zNyTJ`S5{V*<9za3`k)NEy1A1~A7maDY~C~UgpPyil_HZs(Rg8mj-w8324IqFhz~5X zc_{=F5IDHA_#rr;YZ34)TgdWYFQeTgHTI$0j>8gxsV#xN<1m2H${BPe@%07KxNZHy zgZ&(-OR~dt4mni6;ljywY?Qkl9st=Eye$A6#JL?l2_og91EvNTP5zYpw92NEr{tm0 zscV>@4ykpTJ(wy0ci6`gLwmP%_s~*iasMH8Zy@xt&y2q-mdk0UGweFM?6XFzqCXmS`e_)q>iJfUOF^%}2?yq+``hVQ zZ-PX{qH}#csrqTx*=3(K>iR%`mp3lk}P16c4^l z511Ez)~M@)?fXs4x9WDMn)@>wXR_>obRx{lSoAAO`w#vtjP>=Ys1FRlrVpPX>iSR& zt$qx!H680kfBymPbKoKlN=LkK=!f$UqfwGfRio7OpkU;Xo%jq<*9T_Qt@)PlFfAZF z(>@0MgdNhNPRAIkDDOV967M}aHClH2kb*-Wv$IFK1oXxy(CGhNP}7HLB#!f}Kx-WE zXY>ow!+8u~%f)r~X8GPX4F~jKIn7S09hcJwtv#31 zqqFWuZjV3U^z0$0$Zg?IJs9HWL>Dv8C_#HCo!|E}=l4S9{9Zz2#XnDv6@4jlelM_D zE&um3=l6pwGk#NnAAXbXPXfP(;kTIp__F4LEakn9PSn^D2I)g#!>7j2Lp*}vj8s=k zy)3@(-z6GG)_#VA*ru7aFLYMzx}2`9Io*H2DRO(dqfU|A{NDbHS<;o?aDaY4bAB(d z(p30M?6rzMpE*Cn0YCA^&v3y1gY4S;M(k#m<@Av1t)XYCW}qy{R#p_?^XZX0B{+K| z-N&Ed7I9#O#!}bq!&o1((7xy~?X#So4f=o{n}03%k=y*}vC)%J9}@Y;`r!O%Z%a?T zE&ubG^8*+28xG_{e~jM`GUwMzQ|CA5`p|pI`Sq+{sGV=K`cCMBLV`Y2rOl`NmPq^E z*#}qoGr(#by2B2D27U1Uy`0AOjrxGxw9j(7KXZCEQ1slwV|wJqpGc3@p5DKEC#2{2 z*@d$7Yr+Bl4EidH-{`#h4gQ#ZK{%}U7Qw;zeRs~}`+n~!_7T@3tA1b*}IW3C*xXS}(0xN1HvyBVUe z4_80n&+G%mn~T}Hh6dx^CqT8UAU@OFh(`ZSQn7J9Bcsu8)c3t(Eq0-LPGaL{h(D4Y z;mwwK06|S?Ohks;&v7Fs#lqb%s z*?Ob$Cw1A_*hskzxO8-^0E_XZ)c9sqhv(+(`G-$+O9`kyj5gtLAXDIl&a5yx~^u2%riS_)h z-~p&pf38P(=W@ismfh?>7zCyTUwUSB^`uL!z<@)ZJZ&{M9Li3SKWgrg(R+{oYOn+j z5sx|WlV<%HdB6JAP;aTvb6Y|=mirOHfiO7S^OoTd)Xd^9e~{(YfFF#jN!y3!2ZscG zn4hQNGwDPKpLxPk6CQC`8)lRvzRTg@W_5O zSol96`BC)YC^)>dwzdQg3tL+s0!=KJ=kJEY^r`YL^x<#EIJ~s>Q^P^|KHzu{o5g82 z$;=Yi1%0^Z3R7<$0{sje)PQ!;4cHSdJ9+q*no$lZhyH**808#LlM08zJ2w6Df>WZpt zD~WM9=Az-=S~+=$e&OX{AFMnyZIbTGNA6Gs(+A2Lr3239tR@#13feE=uzn_)I)gdP z`}4)q31fk09OlgT-hH?S4*yv8r;1Z%AC|yFIM^`yn{4i@q5Z+($QEN51|pWLb13w< z%b#fvY#cqPj(tSbjBzY3qZqnHP;pX>up9Yf`60vzS)0Gpan zcsPf zVj-j9c|QAUcCq(e*9Ty@k}ysh4zu&Q)EHM)Z(doR{!8pWVS3OVpaE+46>zYr(^0mWULE05N@(Xrc-dxcvKh=+i1)d zsisbvNmi??t7M&Uno!o^H-f{}>}u>6&d{_##u?|h9DMObGe^1AntBI)uq0fl{yLg* zR-0b97+llbg2&-Uva7bxjX0q2=3=@wtr>+IrcOthDP`~Xw-=@fWgY&|LzW|!vm1^4 zy}frk{{Su;EE>+_9F7A<=Csp!V=k_P(;LgCsgt@zmJfH%*ba~7>_#J(z%G||>hIca z_jG7>s{BAR6#aNdZ`i50Hv8z0w3f3DsEdi^*8$gm*+R*of3Er;jV6riu@!8m~#LxM=Aq*?Y*^0?nDlFGt8rdx|~;JBoZ{z$VVB&Y+# z?VlwwAy{ye{_0r%0~k-96V>&Y{ln}KuJ)^R+K>GQo_BN3yr>26je<^D@|VW_hnmLn zH#MJJln}TtJ&)_YOTD2H+T@P`mD-=qhJDF1zelfUTySC1Yw9HL)1T$nF(2E=io z6#i_ZKqmTX}8~bPL`q4(}7wkXq#GCzx$Y0~7HY!=RtKKzrInu*dA`Ud; zQotd5?n7WXb?K#zq60kt+}r3^)S9BfLDk)k!vk-;t_TKRrG(G^77n(})EndA>RRLQ zm2bHm?~}XS*!Ns4-=!B0F2C5I4Ygk{qZ~CHLj4kiLm#yNfKHV8dZ(Pi^eBtDHVz%{ zCl8&mbcrS`PC4NC-u|rEKl7Ghh8#8daQt(*FeEx zvmzXQVB&uEePcgWY$ht^#UlD6&4Zlxh4HguZ>&fLS7Z6xX<&?mO2i-wb!t^JS6?$)?NK_SlfqGn#kI@O733! zsc?Xvg;=d2)o6Kn$#J-wd1=INV0tlCM1Q1F&i!8z53+0Xy!c1T^YXXJ->y%~KP&N= zr%S8ka$ST&Tc517@#P_QWo)WlO-(JK58eCj1&1#Bxmv6*7HI2gIkntpzCB1feHr|y z57g3dfWD@IQngk^cn!$)Va9NH>8DFmTVuOWJ+B`A7sgH8Me>^!S**N4t(pDF%r$Dc?KW%pb` z&PA-E&WA5``opa1aYALeOvm8OPzyVkSeqo$Qs`5T8egbt|qn!8M zHlNl=qa=Bq?0TL_eO9aKjea2uiIaV}dkr&cIAmQ- z9#m@_`e5OblNn^y`|WG%%UkKd$A`39d*}G^-`h&7-sa-^axaZ?9*8)o5s@R7U(5fT zo)cUh*9SrOtAvi%PvfWNm8K7Wfj(R?My3zd5V=A+?tDI_LpXEx#Lpf`jrHMF`6{>_ zIL>^HQ~$JoKRbQ;bjMDYQJ-?a-O*0ZqsjOdlk6`DRK*S5f~gyHC;|{#)9AcrbhYU}v?HZV_$>|$nujSS~GU=a{Kem(4A@kKn zeGv2j2M42_4D)OBf%(T+AI6JBMl~PUe7%J}@Q@FlZXZ~O`$Aj-s4hS(hhB0$O>-m% zEuei-`c#1rJ>Jj;0p{W1>14z&ANcaO_6J;RIela3wOC9nAJBvRbmocmmIT%R7=Kg; z%FfQNUIYkm2rlxwCOzo;GVOGESZa5Z^z`X=WM$Y6{!?eZa&KE$7|kBRY{(tr*_W5&pQ;%9CQxCX!dVkj{7BK zzvqh9nykC4g`f|j!omFDYjlvAAARVy{n0*HzZmPcx9he1uIM}H1LuU#ox4Zp9Hb9^ zZiqfHtH%lGYdY<6nLe1F%tv|S{HDf1wbu6@M1_OV;_|Qm`eoZM5r~JF2Z93oQGJf~ z(ZA3KQQ;t(Gc`0n`epHH*J!ul7oW5IKeDxTiym7v3I3#zaoOdW$k?u1p9OUO*%%A`D%Z2t!#P<;MKtKOLzksv#3#j!A z^CzG&4(H3A+x%jq3G$Jv2fzUZl_nUa{h((08q_R6j0XoZap=2I)yPbx^r5tK4%Pkl z$MX(Wj>&`ha=8-mH>(o;ZG8ym9rPWP4qHv}{Da|eF4%`d%meH54~Va+pWGnrf-}xe z0zlCdb30R8H%1(+iB(T!FzOx?R)O)q-N;T7VCK@&*+r?UmzM0DL%>0j`TCTbS{~$^ z7trDCvwK8abb!wwAn=-rYgf6KW@lWqe;0x z%m07aVG&%(s2COEvdF<|0;TRMS5ZuO>=I7JK9Wui5-vhx5y#3fQ9B_H-d2bQgEMGXg|)VDzm zC;Wm;;k(gl?dLY`frqH{!OB5S-7+7ye};oSl#!pPZTg@_-r+rF*$3^H#Ql@F-i-Cl zW3^*>H4c>Hm{>hh~Zs0Iky@oz`3k*ZZ&~eBjrRC`h;BZ6wFxD6P3H50E ztF@mNNiv(!FO0@{3V4{D(uN^|(Ju}e{z#`Ld&rvq&3YcSYrg;o?U(re$#Wm>hQlcK z6Vo<|Ccp%U;gN=U-jRR$*VfNW?@4I&GK&5;sAAkt{U_2*`q77?9L^sV4x$kU)mBdO zsU^U{aFpM4C9H?LXdjMo)7-Xs^`HOspOz*2CBA`R1{#1eS00*NHhum93>X1n_34)!x+(`ZXY5JA#%?|`>rWZJ|fNIx;An~K5wZg zPRk#Hchv{fp&XvB_fJe~xP(zLmLh;}$VEN4p-dl>nD(5`-aV>zHM%WnTR!~lAm!O@ z-Tm+ANYT_N-B6buSulvZ>UxTBZS$Ro+`)rto7*0xVDC%KxHkW`znOOO-a7)5DT4KX zJOwaMxU~62f7A!t%e&glaZE1|ZF6ls+m@gmz^BwEXFxH5_;1Id&A;t;YwA2S&P2bO zceJ@Yz+xoH?WrOLw){Y$SPsb}lC}9ozrH@H^``dnY&#DIp5xf1@`7@j&8g`}39C0d zrz^^Nd7P);P8FB^oTuz-zdbY{k(`CuMg0FD)h)p_6@R8q%zwwUE>G`k*jr`F)i^-M zy*=OQ^9_sa>np3i5t?i+CqoQOseSVi=WlfYcS3&nnVbmdcnX$Tt_J#eW0(GS|fm)W}Ur2t=t zivj{q{n?Ld;ILs2vX5Q5bYXQ->IS4Wwffg`6|_&rIUpYJS(8jqf^fot<0qABwcb&> z;Kcu!(*3Wxmy{VpJ0-#>61d|sd)v3BSz6Il0C-^*JcEp38Bx!&WPBjQYR zAZHl$;r+fV1pIg)+A*9H$3YLcg+ryS7_+Qb$xf#_BYjAYm6y;5&K0b3LZYVdL1WP; zQSvMOf0&seJ>QL5S3W)u+gV>!GfCJCS#=C&fL_Tlc_NA!(Yl~ z>-}Oq;4oNBYkffNal=Xewhp)Q(1$+HKuYk_<0mQktLq$e$v4!Kmufu#2h$7ib2}-D zeNp=JGxw9ee6<{agD7}N7legPo@xK8vq-Nf7xg_k?c6wja3KAqwVy50zx$%_=iHX- zTcG3e%pM8d1`g3~(l1;ezFQ{i|2{Q+NQ6Vro?llS;?rZr3Hd|6kp9tY&5^INUUequ zL!dz)(x4C9=BYX9&L5}#P}2t}Pnd;+=|i-O1M3y^i-?2xV;_|7lJueM^raVZ9NUe; zwuOWIxTp_bTQ8?gA7m$8AN2hCePGx~KW5y#5OJ8+@IpIn^w0D*Xs53km3=^;GUfKcn;;=%drJv!QgSQ;cJ%f$E(tZ&h#Z{n}6Hy-2CcV z5ke}}!|cOS=QrvX`Sfzn?Sq~RR~zaTAA>_U|Bz+VuUqbQ+KDg8j(Ki3KpHV^vMx#ZrlU57` z%pdCr2gZwaor}-%r!{}*Rz)#lf4Mud_gQx3AD?&AEwYC&5NcPoyV^^%dX?+@;1FnA zu5tR9&nZU9=g#7nzve$ij*YuPx%0RusQ-LOGD(5ipt#U3w7L>lu&+D;$+ zp}N*LgvG$Sg;<-jbgb25disSuT#9^mqtx4boaQAs`R%5nBAv~_;jhoHtX`Q;IR4m8 zm_Dfb2@l{R-HmV9egKEpv#gLlpqwy{lye2i;s!Vb+U66}wW-O*CECk@bqh8GgR}I) zA(ls5q{OxPxBZ$uMSU<v_94@l?cT=uB=94|>^63orvC##mZGO?u9Kl?T zgOn4OkLj6d7~(e?^F`W7H<3>~p^+$bZ>kDP4opdJ&KJl=KgPkPVL5>{@ zY^U3+-}WDvSF;ZH`7Em_%`+)Hc_`gcgzbUHk57bs#k|MAJrTIOC*WYG;p?uD(n0)9b>v~P>S)Pe%c@GX&D(N}_2dLE> z8tWDJEuufrn9li=KBntvKWfCn+i(c`GzAOMeXRdF#rjb74LG>os%EwG+XMT*t){Qz zzhe4u9DN{uW-@&PhnPO{_mgI-U)bO1NWXnTFC5C%^M-?qBfQjaoH}l%?+VxV9*m;* zP3ky!zp(I-kNRr=K|0Y`m!l8tE3EfAQxiDM9N6Eeg<;_$(J!PAJI51R!$ysTjPt2! z#39-T;ZWNC26SImo#AzQ;c%wsI7kTkPlEdD_bZH2A5rOp`N6@%+cd<-bYltzeeFMh zo7oHDmtaTGhs4g`*ZL6TRX3JKM|zETPgbYrrmY9g&Ka70h;pEpoad4rXxk1t^B?FJ zp+*X(D{r@PlXJ{d_CCfn>PgeY7Izx)3Dijwhx(*tv?uZHO3U9K z|Ih<|AHnqD{Fk9M4lek%=a%jK*Xxh#takeR{P8Dt)Q4DWDW~7ZkV#*N-`+1GZna)a z*vqyYJn%k$zw5({wuARu=e+hhq|N7A{`j1?olZEoKE(bU<)>| zKGMk7XLA0JnebP7_bB68m887^Ot!M?tRKho1&=d69<`K=P9q-5KJ$eF{wj3HK`a=>% z8d$c|?bRR8KeYMiz=`h+go3Y!*gWET5>BLK>T>t(<{NhK6(7J(rf@JsohbHIl)DAe1+veLwwcfyQ=O=8ByUuRm%&)b+;9sR=hJ%K4 zCiac}huB_`);z)uCm8Lnj^}X|h53GZ>u8a@F*kLCCEwefL&tlKy+!(Knc5AwxyV4w&8!hvOMSumP|1K*n*?>|I& z!*MAN&qhc4;fOZ@>iDxdm!QW^#B=yLrq&lzn>d8@lem~%iLILoR{j(F5A*Yj^?ppm z1v&L1ugZuxm{P+>3s9}QVB`BLwtf{3)96!$EH|7s< z{~_SudK+N$x_M*I9<^sGb-bSI>$%$@)jFP^v<&WP@vCt#TnvX!&glZ+Fy}(&!u&! z>BF@0OCRjyNo^lOf0*3Qpdd>fsLIhk7U-IzQ*;Ez0qMhS;4t2Q_}F^F^JC+^_Dvk9 zunQ9CBrb6ri&Xm$^Iq=@4;wAl&aDcE@{;Mp`I(t}@#3uhk;eROO8g`aUi~o+rVoYN z2UbJ8SAT!lf0(Ri^r>XOk0F!35Wl@&MBM87M_erbHo2=~7mj(o=e<8%x^&6#aEhFq zN>X7B9O$NPKG9FQ8VB`{7#`Q%K_3d~gBCvM!_17?htTh1t!p-sVGJ>UIm+C&ob-HsWnqo{Zlzy{)6m7-*74Jo`xc) zMN|E78dY}UY~9YWo{^#sQU7fGjN$PdNWw!4?1SlpzC48;4*F2{=YWF=-@HV=#G{Zc z*U%2d$lFM-ph;Y!T#-s2n)?svfmb|GBG?ZjO`@-Gv;qo zlE$W)>=(z}U;=?T?Z=}I_QH$zJ1^wAt~QUju9VG06S!=XJMKF~+QwzHvy^Q<(cdgs z_c7d2__*^A?VP_`e_RJgx~;T`N2J>lctFhGrtRc0e&`W=egl`9wV9ype7^(#Sf63u zH93-+ep2Nb-)KP^Od}3aAL6#J0T*SeowDPBaoLc$N>n`6b8h{KI zvyoZq(>Rt?$29td&8y?N{DD5VMCtEdV0?jIm)qO^L%@NGP@a{4*NW0^z>@5Yy?nY`y=`Y8iQBx)xRSgabr4sC?nDN&On_Qc{lPAYWI>?%}%+ zz23v3ZT!OLg_I`=I7k+=lO5Lg@a&Jkp$g~nYaHfLh*T+SxkK;jTA*E0yHX$OU60>g za0vSk#M9F)kzG=}+xXS|4Hql_?w_4{SLH*S>+B?1)Ve}0&GK(a4^qy5(eLvhD_=OMe8Zt!jqB{9iNim93&oKnkbm(l^no8DNMRmm6F=Lh zF#F&WaNmFM>>shLWeY0c02tw1er+em_94g}=I_BL2|^9%7t)8F;|WztceVnE>wrij z4vvf4$)AnPK1~0NgUx5^^AAlNa_tv=OZxB+y5l=2928Fx$@GEZDq7grXO3f6V~~mA z{Xz#zNpCo?&q39sXmm!2uKPr(Pi z?E7RYNV#xEn|2Z`&<7M}7^acwn36uW=qH4O>%Zi1fw~j8nEE!$Xa6DWyA)GaFZweU zAV2=cfBeU;4}bGFe{*~o`$NP7{F092S4c0gAKICt*ljqd`qBq;xpf`Z6%u4PrsSK% zA^OD8?_wZ!5p*@Xgyr=|$pt&Muqm>v6- zXJNQG?Uq_ePU0}J{}9jH>%p_wZlmpf?5$`i?Y0qb^N7j#?RGMzk2K;^(@8n1Bw1F4 z!}$mB00wZF7%zskeT;fx=>mSj5!B_>b`I4@xks&hU+L;dkk^pF;@; zzk*_7am*vwQm^Ne_4_z{m2h}K^0euM-YP-MHR5d^F%j)mtb^ojq*r(wmsa`c!^Hl> zfO;5`-SK>K2p7$trg`&5(*`JbP3%*Q?PNDeRV;E$>_3e4ffE|P=P4#>Y^O*)&G;I_ z!#rXfvCG{!y(ehlLSVCe#*2yb58&cBw75@E|3&H_X*Ib|0o?qZR;JiAHhzxvL5lPV zt-Eh-|Dlb`WCe5VphBQSQM@?2mA7_X!^hN%JNiQlKP5cPzm}_Ua2R-h^S?8fgO;ik zDYpl+(+AtNjO*^9N967J8}?g!q@g{omrlKPt#YEA*Ge}qbx5TBypEP7G2d>q%`d3K z$LWJ@K=ZoG$&go{_N!gZuM($4>En&iSL*!Zn~8oB^_FN0kC8O!z@zt%zftbHd$Hn;_LNl+{_a`Ua-0Sksy$)qxbMAFOsBut4@aW^0?ken*;cz4L z#cS#V^M9Un@_euD^m(A4{9NGh?))&T9+!JWI}#ch6U(RPgJFNcDC;Sw@Z%@)4qr)Y zuHaDV0E7i#UTSk{KyaC3;(io*BxLCZ8vVZaaHDz<(yzS9Mune7VC{a^ibuB-iQ!c3 z*zxDH7VeS6=cvPDj}1weW)F<@fq43bzo*&Z{DiNg0@e9-rV+-Ep8-7FPhsTFaOm?r z5V^q+{?m4wWzRtEKl%VYf(mNr?ef`>Bm52)Kk#dmYOLwUoT{xYTkoS6TU(3Nb8Rj9 z^}BhBkKyiTWBh-33w_`{L;(;;D7+>nH|Ij?fcj>XJ@AvCfCCzVK42Abd?8Q@f}mbs z&QYk|Nec(@+m6FX5B?3;E*K1`sx`<0x*!}DE{IZz5AjhXm8d?yz_bh; zK=g*~gXse>Qq0;}KS*SH0N#O8kA!*PAAUIcUwEMz z-h23AONTyuS@z-D`k?x-QEA- z<`jR8!|iq~M&Dhu{fCUtG}Sl^;Ef_&lsW{e?+MD$9!8_zKki1*Z)$zG=z5_KrK|pY zPUC_o!R{x*!|}gDB_{2|tcpl^+~-v7$%^yxW9i+GC|r>byw?4R38DIDq2PFF| zud)%Fm_BH{@O)+$YkMgid|!5q10~@ky&PHxGuH>ccdDp4Q-?s0962KUkno;iq_ zh*8!mvJY$7Z@$}m*48z>A3QsHmU=(@@Ur`RFT6X#|AX%?KP%dM`0F8@`0e9Ge7Y5$ zzR6DFE7E0jVTn%(ojoT=vsnX&?V~^5f!j ze{RV?WV|poidt9*{X#V81G1VvTn+kgHRywISm^i3g?(6%B2_Q+qJR187ES`AFW3WW z(pkLKALWj87k%jdyr5>Z`zra$DiDoe8~)t`<1U$yXy-}U%Edp4xA z^qTf`DKgSoYf%)!X>8BCzwsCi6vm66Jn&i^FL|jyxAC(q-=}CeE7kSj@X(;2HgIUJ zyR(Knj21`{BE5Q5_910Z@_B>0hUO7x^+5`Tyxf~x0~lWf$8J8mfHeSJ{F;5{9-QUB z@n5$j+~T7iMA{HRw-JY*WDktTi*IC)#qqM9PlfT~`t{*DagcKVlK+9y52S7s-_@^5 zsGk_so{kB~uVheLIlnuJ3;sENS|$cFJ+C7ajed2fu@8}&cF?4OrV)p4WZ5GG%TyjIzz~)p zmS7yQJEw6>#9!M)iG5eJ!HwPKz4_5#dcZmUNy_gKE$oQHmT zGPujvS@9J9T|$Pn8ixm8UJdxn^CAE^u>Vk%_I!LXwP}=T(K|CsOEb?4hoz+x-+!`x zes1c~mg?I6oR5Vr52jP2Nuc;Mwz&)kU8EL>uJRd;a9dY}Lt5+0f~mDok^TFiq3%)p zBhC1M3$zcx@^WLNEPR`UkE4FM*SptX{kJc(Ff1gwrts<)whvQrQ-DMGUgb7@P(16S zI$jKJz*U>Q<>k?pRCMu;#HjrIkcCujXka)FhKFzv`)(o}sFAD-zuVN27^&m%QMt|? zj+2K`u1H7xz(q1j7*wSXOW9w1zA0X z!)j27cK{CPvS0t=1P&Z7Zd{Z;#Q6BJ;dlx(`dJ{sTFj3c4aYY5mS@=)4x?)D#%s`x z4W7G!!%5mawUiAUJg2TqGgDE1Z*h?kn8#9Ov9gjpA^TwZpz?%6kSkKv(_dF|`@nQh z?vUZ||Iwio53eXE_x7Gztq>;Sl5NbE#or6xPX9+XLzY z<{rW0>hFDX`5yFKExy z%2U4xaz&c)!wx0g%?t|mZ~}*!efKJ!dDn>iCLlPN8|wqODE=J`O7Ho5ANuwBi@l!p ziyy6;K7{xi#3BEGd0l_7Jiv~<@fx&ZmrQ>DjVjgDEQDyHi|oS|gJ*Qr>gwX`(K+eE zT^p+_PcVO=YhWLQyXk|=m9GZ*s3&i*`S`%bWsQR>ciwSWm7&>&gMYU(FT-f^&X>Ul z`|zL6td^zW5cDC$NBs}Y@2Dd6Hhl>ClG8B?#?9|7PK#D0yT_Nn#whwVbp;}V8)#Kls z65Z_d3Q;!-w(tnuLpWe3uV&!z`~OAuA?eCKm_D5B+_iyAo}eS(qCU_sg51#mc;Qug zP_Pd+PO{qZcS^NEARKO^U&ubBbG3b_ap>`Tj;Bx4zfc_E;QFw!va+)3`oQ=)R6q1% zsnH(PIFLs!;!xX%h(o@vVT$KYQ=;k@qF(t49O`kCHSHD&*!z)vKp(QXXVC{7>u#Ap zt+7IRQEuqFUmr0L8V<;7#vUBZP9Ee+^+uK9K=wKEyM3r}z+h&lNj9W1j3n>ezwY|5 z%J3_FV4i`#%snfaiN9_f>Xa1>Q|W`zlGh^fTcz!nJp&|gxBh{hyox@c8sLymGhU>W zzR-~xaA*1;1&+8!xkp0{gTmoYiw-#4&p63?mt9ocK{9%f#g{wakb}<3%4sFUfkU(p ztE<62_=^tyn3K|5<74b6QLfl8ICkeOksJlc-zbbyufqJ;hlTKiuOZz8QNLi%BcTxq zpIeYNBq_JjhiW*+fgoHg3mjhNxNyXQ!CBj82T!kXHE4+M6(w6FLC*R+oZ=#Vz|Cgw z&YJpA_`wnTpAsV11qTimulpNx#)ozj#SL_6j2DyKen0!Gzxu1+H#?c44ywJH(un!KKv;OA`a-V_X{P?tz6=Z()yz@Ah9{~@H;7@d7J`q|2o*buE5~5d(e!J p;h#9=WBdBsoiDW+PR2&LjD{b$@JcIP-7h?o#k+DVVCbRwe*>@DcEtby From 6e3c673c2dc5623a8b7abce6cee53b48c76b7189 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 20 Feb 2022 15:41:50 +0900 Subject: [PATCH 075/129] =?UTF-8?q?ToolBarImageSplitter=E3=82=92=E6=89=8B?= =?UTF-8?q?=E8=BB=BD=E3=81=AB=E5=AE=9F=E8=A1=8C=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=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 --- tools/ToolBarTools/split_my_icons.bat | 34 +++++++++++++++++++++++++++ tools/ToolBarTools/split_mytool.bat | 34 +++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tools/ToolBarTools/split_my_icons.bat create mode 100644 tools/ToolBarTools/split_mytool.bat diff --git a/tools/ToolBarTools/split_my_icons.bat b/tools/ToolBarTools/split_my_icons.bat new file mode 100644 index 0000000000..c9daca8dbf --- /dev/null +++ b/tools/ToolBarTools/split_my_icons.bat @@ -0,0 +1,34 @@ +@echo off + +:: ToolBarImageSplitter.exeの生成チェック +if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( + call :BuildToolBarTools + if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( + pause + exit /b + ) +) + +:: ツール実行 +pushd "%~dp0" +.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\my_icons.bmp .\my_icons + +:: 実行結果を表示するため一時停止 +pause + +:: バッチ終了 +exit /b + +:: ツールのビルド +:BuildToolBarTools +echo ToolBarImageSplitter.exe was not found. +echo . + +if not defined CMD_MSBUILD call %~dp0..\find-tools.bat +if not defined CMD_MSBUILD ( + echo msbuild.exe was not found. + exit /b +) + +echo "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet + "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet diff --git a/tools/ToolBarTools/split_mytool.bat b/tools/ToolBarTools/split_mytool.bat new file mode 100644 index 0000000000..a6982b8756 --- /dev/null +++ b/tools/ToolBarTools/split_mytool.bat @@ -0,0 +1,34 @@ +@echo off + +:: ToolBarImageSplitter.exeの生成チェック +if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( + call :BuildToolBarTools + if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( + pause + exit /b + ) +) + +:: ツール実行 +pushd "%~dp0" +.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\mytool.bmp .\mytool + +:: 実行結果を表示するため一時停止 +pause + +:: バッチ終了 +exit /b + +:: ツールのビルド +:BuildToolBarTools +echo ToolBarImageSplitter.exe was not found. +echo . + +if not defined CMD_MSBUILD call %~dp0..\find-tools.bat +if not defined CMD_MSBUILD ( + echo msbuild.exe was not found. + exit /b +) + +echo "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet + "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet From fb6a564914399fb68c2e695e52077e435aa684af Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 20 Feb 2022 19:10:37 +0900 Subject: [PATCH 076/129] =?UTF-8?q?=E5=87=A6=E7=90=86=E5=AF=BE=E8=B1=A1?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E3=82=92=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/ToolBarTools/split_my_icons.bat | 6 +++++- tools/ToolBarTools/split_mytool.bat | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/ToolBarTools/split_my_icons.bat b/tools/ToolBarTools/split_my_icons.bat index c9daca8dbf..9e6040bca9 100644 --- a/tools/ToolBarTools/split_my_icons.bat +++ b/tools/ToolBarTools/split_my_icons.bat @@ -1,5 +1,9 @@ @echo off +:: バッチファイル名から、処理対象のファイル名を取得する +set IMAGE_NAME=%~n0 +set IMAGE_NAME=%IMAGE_NAME:~6% + :: ToolBarImageSplitter.exeの生成チェック if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( call :BuildToolBarTools @@ -11,7 +15,7 @@ if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( :: ツール実行 pushd "%~dp0" -.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\my_icons.bmp .\my_icons +.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\%IMAGE_NAME%.bmp .\%IMAGE_NAME% :: 実行結果を表示するため一時停止 pause diff --git a/tools/ToolBarTools/split_mytool.bat b/tools/ToolBarTools/split_mytool.bat index a6982b8756..9e6040bca9 100644 --- a/tools/ToolBarTools/split_mytool.bat +++ b/tools/ToolBarTools/split_mytool.bat @@ -1,5 +1,9 @@ @echo off +:: バッチファイル名から、処理対象のファイル名を取得する +set IMAGE_NAME=%~n0 +set IMAGE_NAME=%IMAGE_NAME:~6% + :: ToolBarImageSplitter.exeの生成チェック if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( call :BuildToolBarTools @@ -11,7 +15,7 @@ if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( :: ツール実行 pushd "%~dp0" -.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\mytool.bmp .\mytool +.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\%IMAGE_NAME%.bmp .\%IMAGE_NAME% :: 実行結果を表示するため一時停止 pause From 8a85ee3c1de46a0066caea4f656ee4b02919036d Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 21 Feb 2022 12:58:03 +0900 Subject: [PATCH 077/129] =?UTF-8?q?=E5=85=B1=E9=80=9A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=82=92=E5=88=A5=E3=83=90=E3=83=83=E3=83=81=E3=81=AB=E5=88=87?= =?UTF-8?q?=E3=82=8A=E5=87=BA=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runToolBarImageSplitter.bat | 45 +++++++++++++++++++ tools/ToolBarTools/split_my_icons.bat | 34 +------------- tools/ToolBarTools/split_mytool.bat | 34 +------------- 3 files changed, 49 insertions(+), 64 deletions(-) create mode 100644 tools/ToolBarTools/ToolBarImageSplitter/runToolBarImageSplitter.bat diff --git a/tools/ToolBarTools/ToolBarImageSplitter/runToolBarImageSplitter.bat b/tools/ToolBarTools/ToolBarImageSplitter/runToolBarImageSplitter.bat new file mode 100644 index 0000000000..0595381a6c --- /dev/null +++ b/tools/ToolBarTools/ToolBarImageSplitter/runToolBarImageSplitter.bat @@ -0,0 +1,45 @@ +@echo off + +set IMAGE_NAME=%1 +if not defined IMAGE_NAME ( + set /p IMAGE_NAME="Enter file name of bitmap to be splited>>>" +) +if not defined IMAGE_NAME ( + echo file name must not be empty. + pause + exit /b 1 +) + +:: ToolBarImageSplitter.exeの生成チェック +if not exist "%~dp0bin\Debug\ToolBarImageSplitter.exe" ( + call :BuildToolBarTools + if not exist "%~dp0bin\Debug\ToolBarImageSplitter.exe" ( + pause + exit /b + ) +) + +:: ツール実行 +pushd "%~dp0../" +"%~dp0bin\Debug\ToolBarImageSplitter.exe" ..\..\resource\%IMAGE_NAME%.bmp .\%IMAGE_NAME% + +:: 実行結果を表示するため一時停止 +pause + +:: バッチ終了 +exit /b + +:: ツールのビルド +:BuildToolBarTools +echo ToolBarImageSplitter.exe was not found. +echo . + +if not defined CMD_MSBUILD call %~dp0..\..\find-tools.bat +if not defined CMD_MSBUILD ( + echo msbuild.exe was not found. + exit /b +) + +pushd "%~dp0../" +echo "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet + "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet diff --git a/tools/ToolBarTools/split_my_icons.bat b/tools/ToolBarTools/split_my_icons.bat index 9e6040bca9..2006a8301a 100644 --- a/tools/ToolBarTools/split_my_icons.bat +++ b/tools/ToolBarTools/split_my_icons.bat @@ -4,35 +4,5 @@ set IMAGE_NAME=%~n0 set IMAGE_NAME=%IMAGE_NAME:~6% -:: ToolBarImageSplitter.exeの生成チェック -if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( - call :BuildToolBarTools - if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( - pause - exit /b - ) -) - -:: ツール実行 -pushd "%~dp0" -.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\%IMAGE_NAME%.bmp .\%IMAGE_NAME% - -:: 実行結果を表示するため一時停止 -pause - -:: バッチ終了 -exit /b - -:: ツールのビルド -:BuildToolBarTools -echo ToolBarImageSplitter.exe was not found. -echo . - -if not defined CMD_MSBUILD call %~dp0..\find-tools.bat -if not defined CMD_MSBUILD ( - echo msbuild.exe was not found. - exit /b -) - -echo "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet - "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet +:: 共通バッチを呼び出す +call %~dp0ToolBarImageSplitter\runToolBarImageSplitter.bat %IMAGE_NAME% diff --git a/tools/ToolBarTools/split_mytool.bat b/tools/ToolBarTools/split_mytool.bat index 9e6040bca9..2006a8301a 100644 --- a/tools/ToolBarTools/split_mytool.bat +++ b/tools/ToolBarTools/split_mytool.bat @@ -4,35 +4,5 @@ set IMAGE_NAME=%~n0 set IMAGE_NAME=%IMAGE_NAME:~6% -:: ToolBarImageSplitter.exeの生成チェック -if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( - call :BuildToolBarTools - if not exist "%~dp0ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe" ( - pause - exit /b - ) -) - -:: ツール実行 -pushd "%~dp0" -.\ToolBarImageSplitter\bin\Debug\ToolBarImageSplitter.exe ..\..\resource\%IMAGE_NAME%.bmp .\%IMAGE_NAME% - -:: 実行結果を表示するため一時停止 -pause - -:: バッチ終了 -exit /b - -:: ツールのビルド -:BuildToolBarTools -echo ToolBarImageSplitter.exe was not found. -echo . - -if not defined CMD_MSBUILD call %~dp0..\find-tools.bat -if not defined CMD_MSBUILD ( - echo msbuild.exe was not found. - exit /b -) - -echo "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet - "%CMD_MSBUILD%" ToolBarTools.sln /p:Platform="Any CPU" /p:Configuration=Debug /verbosity:quiet +:: 共通バッチを呼び出す +call %~dp0ToolBarImageSplitter\runToolBarImageSplitter.bat %IMAGE_NAME% From 11e78f497620bdea1d6255c954f07bc3f102110c Mon Sep 17 00:00:00 2001 From: dep5 Date: Mon, 21 Feb 2022 23:00:34 +0900 Subject: [PATCH 078/129] =?UTF-8?q?=E8=A4=87=E6=95=B0=E3=81=AEVisual=20Stu?= =?UTF-8?q?dio=E3=82=92=E5=85=A5=E3=82=8C=E3=81=9F=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=81=AE=E5=95=8F=E9=A1=8C=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 2 +- tools/find-tools.bat | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index c033d57d66..1873251b35 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -912,10 +912,10 @@ + - diff --git a/tools/find-tools.bat b/tools/find-tools.bat index 9113ecfeb0..a8e0e1c15f 100644 --- a/tools/find-tools.bat +++ b/tools/find-tools.bat @@ -257,6 +257,7 @@ exit /b exit /b :cmake +set /a NUM_VSVERSION_NEXT=NUM_VSVERSION + 1 for /f "usebackq delims=" %%a in (`"%CMD_VSWHERE%" -property installationPath -version [%NUM_VSVERSION%^,%NUM_VSVERSION_NEXT%^)`) do ( pushd "%%a" call "%%a\Common7\Tools\vsdevcmd\ext\cmake.bat" From a47d95b5e3177dbf45544bc5d4cd645f3c4dde19 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Thu, 24 Feb 2022 23:33:04 +0900 Subject: [PATCH 079/129] =?UTF-8?q?strprintf=E3=82=92=E6=94=B9=E8=89=AF?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=83=8A=E3=83=AD=E3=83=BC=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=82=82=E6=89=B1=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.cpp | 159 ++++++++++++++++++++++++----- sakura_core/util/string_ex.h | 8 +- tests/unittests/test-string_ex.cpp | 93 +++++++++++++++++ 3 files changed, 230 insertions(+), 30 deletions(-) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index efab81d74b..602418d5e5 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -240,81 +240,184 @@ const char* stristr_j( const char* s1, const char* s2 ) /*! @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut フォーマットされたテキストを受け取る変数 @param[in] pszFormat フォーマット文字列 @param[in] argList 引数リスト - @returns フォーマットされた文字列 + @returns 出力された文字数。NUL終端を含まない。 + @retval >= 0 正常終了 + @retval < 0 異常終了 */ -std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) +int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) { // _vscwprintf() はフォーマットに必要な文字数を返す。 const int cchOut = ::_vscwprintf(pszFormat, argList); - if (cchOut == 0) { - // 出力文字数が0なら後続処理は要らない。 - return std::wstring(); + // 出力文字数が0なら後続処理は要らない。 + if (!cchOut) { + return 0; + } + + // 必要なバッファを確保する + if (const size_t required = cchOut + 1; + strOut.capacity() <= required) + { + strOut.resize(required, L'0'); } - // 必要なバッファを確保してフォーマットする - std::wstring strOut(cchOut + 1, L'0'); + // フォーマットする ::vswprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); - strOut.resize(cchOut); - return strOut; + + // NUL終端する + strOut.assign(strOut.data(), cchOut); + + return cchOut; } /*! @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut フォーマットされたテキストを受け取る変数 @param[in] pszFormat フォーマット文字列 - @param[in] ... 引数リスト - @returns フォーマットされた文字列 + @param[in] argList 引数リスト + @returns 出力された文字数。NUL終端を含まない。 + @retval >= 0 正常終了 + @retval < 0 異常終了 */ -std::wstring strprintf(const WCHAR* pszFormat, ...) +int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) { - va_list argList; - va_start(argList, pszFormat); + // _vscwprintf() はフォーマットに必要な文字数を返す。 + const int cchOut = ::_vscprintf(pszFormat, argList); + // 出力文字数が0なら後続処理は要らない。 + if (!cchOut) { + return 0; + } + + // 必要なバッファを確保する + if (const size_t required = cchOut + 1; + strOut.capacity() <= required) + { + strOut.resize(required, L'0'); + } - const auto strRet = vstrprintf(pszFormat, argList); + // フォーマットする + ::vsprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); - va_end(argList); + // NUL終端する + strOut.assign(strOut.data(), cchOut); - return strRet; + return cchOut; } /*! @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 - @param[out] strOut フォーマットされたテキストを受け取る変数 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut フォーマットされたテキストを受け取る変数 @param[in] pszFormat フォーマット文字列 @param[in] argList 引数リスト @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 */ -int vstrprintf( std::wstring& strOut, const WCHAR* pszFormat, va_list& argList ) +int strprintf(std::wstring& strOut, const WCHAR* pszFormat, ...) { - // オーバーロードバージョンを呼び出す - strOut = vstrprintf(pszFormat, argList); - return static_cast(strOut.length()); + va_list argList; + va_start(argList, pszFormat); + + const auto nRet = vstrprintf(strOut, pszFormat, argList); + + va_end(argList); + + return nRet; } /*! @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 - @param[out] strOut フォーマットされたテキストを受け取る変数 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut フォーマットされたテキストを受け取る変数 @param[in] pszFormat フォーマット文字列 - @param[in] ... 引数リスト + @param[in] argList 引数リスト @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 */ -int strprintf( std::wstring& strOut, const WCHAR* pszFormat, ... ) +int strprintf(std::string& strOut, const CHAR* pszFormat, ...) { va_list argList; - va_start( argList, pszFormat ); + va_start(argList, pszFormat); - const int nRet = vstrprintf( strOut, pszFormat, argList ); + const auto nRet = vstrprintf(strOut, pszFormat, argList); - va_end( argList ); + va_end(argList); return nRet; } +/*! + @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 動的にバッファを確保する簡易バージョン + @param[in] pszFormat フォーマット文字列 + @param[in] ... 引数リスト + @returns フォーマットされた文字列 +*/ +std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) +{ + std::wstring strOut; + vstrprintf(strOut, pszFormat, argList); + return strOut; +} + +/*! + @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 動的にバッファを確保する簡易バージョン + @param[in] pszFormat フォーマット文字列 + @param[in] ... 引数リスト + @returns フォーマットされた文字列 +*/ +std::string vstrprintf(const CHAR* pszFormat, va_list& argList) +{ + std::string strOut; + vstrprintf(strOut, pszFormat, argList); + return strOut; +} + +/*! + @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 動的にバッファを確保する簡易バージョン + @param[in] pszFormat フォーマット文字列 + @param[in] ... 引数リスト + @returns フォーマットされた文字列 +*/ +std::wstring strprintf(const WCHAR* pszFormat, ...) +{ + va_list argList; + va_start(argList, pszFormat); + + const auto strOut = vstrprintf(pszFormat, argList); + + va_end(argList); + + return strOut; +} + +/*! + @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 + 動的にバッファを確保する簡易バージョン + @param[in] pszFormat フォーマット文字列 + @param[in] ... 引数リスト + @returns フォーマットされた文字列 +*/ +std::string strprintf(const CHAR* pszFormat, ...) +{ + va_list argList; + va_start(argList, pszFormat); + + const auto strOut = vstrprintf(pszFormat, argList); + + va_end(argList); + + return strOut; +} + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // 文字コード変換 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index 5656caf2d6..3755815e16 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -205,10 +205,14 @@ inline int auto_vsprintf_s(WCHAR* buf, size_t nBufCount, const WCHAR* format, va #define auto_sprintf_s(buf, nBufCount, format, ...) ::_sntprintf_s((buf), nBufCount, _TRUNCATE, (format), __VA_ARGS__) #define auto_snprintf_s(buf, nBufCount, format, ...) ::_sntprintf_s((buf), nBufCount, _TRUNCATE, (format), __VA_ARGS__) +int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList); +int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList); +int strprintf(std::wstring& strOut, const WCHAR* pszFormat, ...); +int strprintf(std::string& strOut, const CHAR* pszFormat, ...); std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList); +std::string vstrprintf(const CHAR* pszFormat, va_list& argList); std::wstring strprintf(const WCHAR* pszFormat, ...); -int vstrprintf( std::wstring& strOut, const WCHAR* pszFormat, va_list& argList ); -int strprintf( std::wstring& strOut, const WCHAR* pszFormat, ... ); +std::string strprintf(const CHAR* pszFormat, ...); // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // 文字コード変換 // diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index e85ac41075..59be313ec7 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -135,6 +135,99 @@ TEST(string_ex, strprintfEmpty) ASSERT_TRUE(text.empty()); } +/*! + @brief 独自定義のフォーマット関数(C-Style風)。 + + バッファが極端に小さい場合の確認。 + wtd::wstringのスモールバッファは7文字分。 + */ +TEST(string_ex, strprintfW_small_output) +{ + std::wstring text = strprintf(L""); + EXPECT_STREQ(L"", text.c_str()); + + text = strprintf(L"%d", 1); + EXPECT_STREQ(L"1", text.c_str()); + + text = strprintf(L"%d", 12); + EXPECT_STREQ(L"12", text.c_str()); + + text = strprintf(L"%d", 123); + EXPECT_STREQ(L"123", text.c_str()); + + text = strprintf(L"%d", 1234); + EXPECT_STREQ(L"1234", text.c_str()); + + text = strprintf(L"%d", 12345); + EXPECT_STREQ(L"12345", text.c_str()); + + text = strprintf(L"%d", 123456); + EXPECT_STREQ(L"123456", text.c_str()); + + text = strprintf(L"%d", 1234567); + EXPECT_STREQ(L"1234567", text.c_str()); +} + +/*! + @brief 独自定義のフォーマット関数(C-Style風)。 + + バッファが極端に小さい場合の確認 + wtd::stringのスモールバッファは15文字分。 + */ +TEST(string_ex, strprintfA_small_output) +{ + std::string text = strprintf(""); + EXPECT_STREQ("", text.c_str()); + + text = strprintf("%d", 1); + EXPECT_STREQ("1", text.c_str()); + + text = strprintf("%d", 12); + EXPECT_STREQ("12", text.c_str()); + + text = strprintf("%d", 123); + EXPECT_STREQ("123", text.c_str()); + + text = strprintf("%d", 1234); + EXPECT_STREQ("1234", text.c_str()); + + text = strprintf("%d", 12345); + EXPECT_STREQ("12345", text.c_str()); + + text = strprintf("%d", 123456); + EXPECT_STREQ("123456", text.c_str()); + + text = strprintf("%d", 1234567); + EXPECT_STREQ("1234567", text.c_str()); + + text = strprintf("%d", 12345678); + EXPECT_STREQ("12345678", text.c_str()); + + text = strprintf("%d", 123456789); + EXPECT_STREQ("123456789", text.c_str()); + + text = strprintf("%d", 1234567890); + EXPECT_STREQ("1234567890", text.c_str()); + + text = strprintf("1234567890%d", 1); + EXPECT_STREQ("12345678901", text.c_str()); + + text = strprintf("1234567890%d", 12); + EXPECT_STREQ("123456789012", text.c_str()); + + text = strprintf("1234567890%d", 123); + EXPECT_STREQ("1234567890123", text.c_str()); + + text = strprintf("1234567890%d", 1234); + EXPECT_STREQ("12345678901234", text.c_str()); + + text = strprintf("1234567890%d", 12345); + EXPECT_STREQ("123456789012345", text.c_str()); + + text = strprintf("1234567890%d", 123456); + EXPECT_STREQ("1234567890123456", text.c_str()); +} + /*! @brief 独自定義の文字列比較関数。 */ From c1b0547bb84836b3db08dbeb39783d51a5e167db Mon Sep 17 00:00:00 2001 From: dep5 Date: Fri, 25 Feb 2022 00:59:28 +0900 Subject: [PATCH 080/129] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E9=A0=86?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E3=82=84=E3=82=81=E3=80=81?= =?UTF-8?q?targets=E3=81=AB=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E3=82=92?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.targets | 4 ++++ sakura/sakura.vcxproj | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sakura/githash.targets b/sakura/githash.targets index c08156e2bd..3c6f1e1a65 100644 --- a/sakura/githash.targets +++ b/sakura/githash.targets @@ -7,6 +7,10 @@ Outputs="$(GeneratedGitHash)" AfterTargets="SelectClCompile" BeforeTargets="ClCompile"> + + $([System.Text.RegularExpressions.Regex]::Replace('$(VisualStudioVersion)', '^(\d+).*', '$1')) + + \ No newline at end of file diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 1873251b35..c033d57d66 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -912,10 +912,10 @@ - + From 0981b8af93c9b2f4d2ac43c652fc7ee7af23cd6d Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 25 Feb 2022 01:01:28 +0900 Subject: [PATCH 081/129] =?UTF-8?q?MinGW=E3=81=AE=E3=82=B9=E3=83=A2?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=AE?= =?UTF-8?q?=E6=89=B1=E3=81=84=E3=81=8CMSVC=E3=81=A8=E7=95=B0=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=B8=E3=81=AE=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index 602418d5e5..ed87fd27fc 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -26,6 +26,7 @@ #include "string_ex.h" #include +#include #include "charset/charcode.h" #include "charset/codechecker.h" @@ -268,7 +269,14 @@ int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) ::vswprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); // NUL終端する - strOut.assign(strOut.data(), cchOut); + if (strOut.empty() && cchOut < 8) { + std::array buf; + ::wcsncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } return cchOut; } @@ -303,7 +311,15 @@ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) ::vsprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); // NUL終端する - strOut.assign(strOut.data(), cchOut); + if (strOut.empty() && cchOut < 16) { + std::array buf; + ::strncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } + return cchOut; } From ba7cb213781ad1ad50136d5b3257f7e5999da030 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Fri, 25 Feb 2022 02:07:32 +0900 Subject: [PATCH 082/129] =?UTF-8?q?=E7=A2=BA=E4=BF=9D=E6=B8=88=E3=81=BF?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=AB=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=B1=E3=83=BC=E3=82=B9=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 --- tests/unittests/test-string_ex.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index 59be313ec7..f213eb283b 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -119,13 +119,23 @@ TEST(string_ex, strprintf) /*! @brief 独自定義のフォーマット関数(C-Style風)。 */ -TEST(string_ex, strprintfOutputToArg) +TEST(string_ex, strprintfWOutputToArg) { - std::wstring text; + std::wstring text(1024, L'\0'); strprintf(text, L"%s-%d", L"test", 101); ASSERT_STREQ(L"test-101", text.c_str()); } +/*! + @brief 独自定義のフォーマット関数(C-Style風)。 + */ +TEST(string_ex, strprintfAOutputToArg) +{ + std::string text(1024, '\0'); + strprintf(text, "%ls-of-active-codepage-%d", L"test", 101); + ASSERT_STREQ("test-of-active-codepage-101", text.c_str()); +} + /*! @brief 独自定義のフォーマット関数(空文字出力テスト)。 */ From faad1e4014251aea17760b43ba96ae262d45c4a0 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 26 Feb 2022 15:48:39 +0900 Subject: [PATCH 083/129] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E6=94=B9=E5=96=84=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.cpp | 60 ++++++++++++++++++++++-------- tests/unittests/test-string_ex.cpp | 21 +++++++++++ 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index ed87fd27fc..5b840943cb 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -25,8 +25,11 @@ #include "StdAfx.h" #include "string_ex.h" +#include #include #include +#include +#include #include "charset/charcode.h" #include "charset/codechecker.h" @@ -36,6 +39,21 @@ int __cdecl my_internal_icmp( const char *s1, const char *s2, unsigned int n, unsigned int dcount, bool flag ); +/*! + * va_list型のスマートポインタを実現するためのdeleterクラス + */ +struct vaList_ender +{ + void operator()(va_list argList) const + { + va_end(argList); + } +}; + +//! va_list型のスマートポインタ +using vaListHolder = std::unique_ptr::type, vaList_ender>; + + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // 文字 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // @@ -253,9 +271,8 @@ int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) { // _vscwprintf() はフォーマットに必要な文字数を返す。 const int cchOut = ::_vscwprintf(pszFormat, argList); - // 出力文字数が0なら後続処理は要らない。 - if (!cchOut) { - return 0; + if (cchOut <= 0) { + return cchOut; } // 必要なバッファを確保する @@ -295,9 +312,8 @@ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) { // _vscwprintf() はフォーマットに必要な文字数を返す。 const int cchOut = ::_vscprintf(pszFormat, argList); - // 出力文字数が0なら後続処理は要らない。 - if (!cchOut) { - return 0; + if (cchOut <= 0) { + return cchOut; } // 必要なバッファを確保する @@ -374,11 +390,16 @@ int strprintf(std::string& strOut, const CHAR* pszFormat, ...) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 + @throws invalid_argument フォーマット文字列が正しくないとき */ std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) { + // 出力バッファを確保する std::wstring strOut; + + // 戻り値が0未満ならエラーだが、再現させられないのでハンドルしない vstrprintf(strOut, pszFormat, argList); + return strOut; } @@ -388,11 +409,22 @@ std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 + @throws invalid_argument フォーマット文字列が正しくないとき */ std::string vstrprintf(const CHAR* pszFormat, va_list& argList) { + // 出力バッファを確保する std::string strOut; - vstrprintf(strOut, pszFormat, argList); + + // 戻り値が0未満ならエラー + if (const int nRet = vstrprintf(strOut, pszFormat, argList); + 0 > nRet) + { + std::array msg; + ::strerror_s(msg.data(), msg.size(), nRet); + throw std::invalid_argument(msg.data()); + } + return strOut; } @@ -402,17 +434,16 @@ std::string vstrprintf(const CHAR* pszFormat, va_list& argList) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 + @throws invalid_argument フォーマット文字列が正しくないとき */ std::wstring strprintf(const WCHAR* pszFormat, ...) { va_list argList; va_start(argList, pszFormat); - const auto strOut = vstrprintf(pszFormat, argList); - - va_end(argList); + vaListHolder holder(argList); - return strOut; + return vstrprintf(pszFormat, argList); } /*! @@ -421,17 +452,16 @@ std::wstring strprintf(const WCHAR* pszFormat, ...) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 + @throws invalid_argument フォーマット文字列が正しくないとき */ std::string strprintf(const CHAR* pszFormat, ...) { va_list argList; va_start(argList, pszFormat); - const auto strOut = vstrprintf(pszFormat, argList); + vaListHolder holder(argList); - va_end(argList); - - return strOut; + return vstrprintf(pszFormat, argList); } // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index f213eb283b..771070bf8e 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -31,6 +31,8 @@ #include #include +#include + #include "basis/primitive.h" #include "util/string_ex.h" @@ -238,6 +240,25 @@ TEST(string_ex, strprintfA_small_output) EXPECT_STREQ("1234567890123456", text.c_str()); } +/*! + @brief 独自定義のフォーマット関数(C-Style風)。 + + Cロケールを設定し忘れた場合、SJISバイナリから標準文字列への変換は失敗する。 + テスト作成時に混乱する可能性があるので、例外を投げるようにしてある。 + CRT関数が「フォーマットが不正ならクラッシュさせる」という設計なので、 + フォーマットチェック機構としては役立たずである点に注意すること。 + */ +TEST(string_ex, strprintfA_throws) +{ + // Cのロケールを設定し忘れた場合、エラーが返る + setlocale(LC_ALL, "English"); + EXPECT_THROW(strprintf("%ls", L"てすと"), std::invalid_argument); + + // Cのロケールを日本語にした場合、正しく変換できる + setlocale(LC_ALL, "Japanese"); + EXPECT_STREQ("てすと", strprintf("%ls", L"てすと").data()); +} + /*! @brief 独自定義の文字列比較関数。 */ From 04ae8aa718e9875ac67f7679f46324f6c77adca2 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sun, 27 Feb 2022 16:36:53 +0900 Subject: [PATCH 084/129] =?UTF-8?q?=E4=BE=8B=E5=A4=96=E3=82=92=E6=8A=95?= =?UTF-8?q?=E3=81=92=E3=82=8B=E6=A7=8B=E9=80=A0=E3=82=92=E3=82=84=E3=82=81?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.cpp | 64 ++++++++++-------------------- tests/unittests/test-string_ex.cpp | 19 --------- 2 files changed, 22 insertions(+), 61 deletions(-) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index 5b840943cb..0ff4a1a628 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -39,21 +39,6 @@ int __cdecl my_internal_icmp( const char *s1, const char *s2, unsigned int n, unsigned int dcount, bool flag ); -/*! - * va_list型のスマートポインタを実現するためのdeleterクラス - */ -struct vaList_ender -{ - void operator()(va_list argList) const - { - va_end(argList); - } -}; - -//! va_list型のスマートポインタ -using vaListHolder = std::unique_ptr::type, vaList_ender>; - - // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // 文字 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // @@ -266,12 +251,13 @@ const char* stristr_j( const char* s1, const char* s2 ) @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 -*/ + */ int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) { // _vscwprintf() はフォーマットに必要な文字数を返す。 const int cchOut = ::_vscwprintf(pszFormat, argList); if (cchOut <= 0) { + strOut.clear(); return cchOut; } @@ -307,12 +293,13 @@ int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 -*/ + */ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) { // _vscwprintf() はフォーマットに必要な文字数を返す。 const int cchOut = ::_vscprintf(pszFormat, argList); if (cchOut <= 0) { + strOut.clear(); return cchOut; } @@ -336,7 +323,6 @@ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) strOut.assign(strOut.data(), cchOut); } - return cchOut; } @@ -349,7 +335,7 @@ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 -*/ + */ int strprintf(std::wstring& strOut, const WCHAR* pszFormat, ...) { va_list argList; @@ -371,7 +357,7 @@ int strprintf(std::wstring& strOut, const WCHAR* pszFormat, ...) @returns 出力された文字数。NUL終端を含まない。 @retval >= 0 正常終了 @retval < 0 異常終了 -*/ + */ int strprintf(std::string& strOut, const CHAR* pszFormat, ...) { va_list argList; @@ -390,15 +376,14 @@ int strprintf(std::string& strOut, const CHAR* pszFormat, ...) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 - @throws invalid_argument フォーマット文字列が正しくないとき -*/ + */ std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) { // 出力バッファを確保する std::wstring strOut; - // 戻り値が0未満ならエラーだが、再現させられないのでハンドルしない - vstrprintf(strOut, pszFormat, argList); + const auto nRet = vstrprintf(strOut, pszFormat, argList); + assert(nRet >= 0); return strOut; } @@ -409,21 +394,14 @@ std::wstring vstrprintf(const WCHAR* pszFormat, va_list& argList) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 - @throws invalid_argument フォーマット文字列が正しくないとき -*/ + */ std::string vstrprintf(const CHAR* pszFormat, va_list& argList) { // 出力バッファを確保する std::string strOut; - // 戻り値が0未満ならエラー - if (const int nRet = vstrprintf(strOut, pszFormat, argList); - 0 > nRet) - { - std::array msg; - ::strerror_s(msg.data(), msg.size(), nRet); - throw std::invalid_argument(msg.data()); - } + const int nRet = vstrprintf(strOut, pszFormat, argList); + assert(nRet >= 0); return strOut; } @@ -434,16 +412,17 @@ std::string vstrprintf(const CHAR* pszFormat, va_list& argList) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 - @throws invalid_argument フォーマット文字列が正しくないとき -*/ + */ std::wstring strprintf(const WCHAR* pszFormat, ...) { va_list argList; va_start(argList, pszFormat); - vaListHolder holder(argList); + const auto strOut = vstrprintf(pszFormat, argList); - return vstrprintf(pszFormat, argList); + va_end(argList); + + return strOut; } /*! @@ -452,16 +431,17 @@ std::wstring strprintf(const WCHAR* pszFormat, ...) @param[in] pszFormat フォーマット文字列 @param[in] ... 引数リスト @returns フォーマットされた文字列 - @throws invalid_argument フォーマット文字列が正しくないとき -*/ + */ std::string strprintf(const CHAR* pszFormat, ...) { va_list argList; va_start(argList, pszFormat); - vaListHolder holder(argList); + const auto strOut = vstrprintf(pszFormat, argList); + + va_end(argList); - return vstrprintf(pszFormat, argList); + return strOut; } // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index 771070bf8e..8cc6c9b5b8 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -240,25 +240,6 @@ TEST(string_ex, strprintfA_small_output) EXPECT_STREQ("1234567890123456", text.c_str()); } -/*! - @brief 独自定義のフォーマット関数(C-Style風)。 - - Cロケールを設定し忘れた場合、SJISバイナリから標準文字列への変換は失敗する。 - テスト作成時に混乱する可能性があるので、例外を投げるようにしてある。 - CRT関数が「フォーマットが不正ならクラッシュさせる」という設計なので、 - フォーマットチェック機構としては役立たずである点に注意すること。 - */ -TEST(string_ex, strprintfA_throws) -{ - // Cのロケールを設定し忘れた場合、エラーが返る - setlocale(LC_ALL, "English"); - EXPECT_THROW(strprintf("%ls", L"てすと"), std::invalid_argument); - - // Cのロケールを日本語にした場合、正しく変換できる - setlocale(LC_ALL, "Japanese"); - EXPECT_STREQ("てすと", strprintf("%ls", L"てすと").data()); -} - /*! @brief 独自定義の文字列比較関数。 */ From c8cb64d288ea54b98a5d9d36761408cad58d546b Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 28 Feb 2022 22:23:12 +0900 Subject: [PATCH 085/129] =?UTF-8?q?wcs=E3=81=A8u8s=E3=82=92=E7=9B=B8?= =?UTF-8?q?=E4=BA=92=E5=A4=89=E6=8F=9B=E3=81=99=E3=82=8B=E9=96=A2=E6=95=B0?= =?UTF-8?q?=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 --- sakura_core/util/string_ex.cpp | 136 +++++++++++++++++++++++++++++ sakura_core/util/string_ex.h | 6 ++ tests/unittests/test-string_ex.cpp | 24 +++++ 3 files changed, 166 insertions(+) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index 0ff4a1a628..c0e72ed9d5 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -626,6 +626,142 @@ void wcstombs_vector(const wchar_t* pSrc, int nSrcLen, std::vector* ret) (*ret)[nNewLen]='\0'; } +/*! + @brief u8文字列を標準文字列に変換する。 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut 変換された標準文字列を受け取る変数 + @param[in] strInput u8文字列 + @returns 標準文字列 + */ +std::wstring u8stowcs(std::wstring& strOut, std::string_view strInput) +{ + // 必要なバッファのサイズを確認する + const auto cchOut = ::MultiByteToWideChar( + CP_UTF8, + 0, + strInput.data(), + (int)strInput.length(), + nullptr, + 0 + ); + + if (cchOut <= 0) { + strOut.clear(); + return strOut; + } + + // 必要なバッファを確保する + if (const size_t required = cchOut + 1; + strOut.capacity() <= required) + { + strOut.resize(required, L'0'); + } + + // 変換する + ::MultiByteToWideChar( + CP_UTF8, + 0, + strInput.data(), + (int)strInput.length(), + strOut.data(), + (int)strOut.capacity() + ); + + // NUL終端する + if (strOut.empty() && cchOut < 16) { + std::array buf; + ::wcsncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } + + return strOut; +} + +/*! + @brief 標準文字列をu8文字列に変換する。 + 事前に確保したバッファに結果を書き込む高速バージョン + @param[in, out] strOut 変換されたu8文字列を受け取る変数 + @param[in] strInput 標準文字列 + @returns u8文字列 + */ +std::string wcstou8s(std::string& strOut, std::wstring_view strInput) +{ + // 必要なバッファのサイズを確認する + const auto cchOut= ::WideCharToMultiByte( + CP_UTF8, + 0, + strInput.data(), + (int)strInput.length(), + nullptr, + 0, + nullptr, + nullptr + ); + + if (cchOut <= 0) { + strOut.clear(); + return strOut; + } + + // 必要なバッファを確保する + if (const size_t required = cchOut + 1; + strOut.capacity() <= required) + { + strOut.resize(required, L'0'); + } + + // 変換する + ::WideCharToMultiByte( + CP_UTF8, + 0, + strInput.data(), + (int)strInput.length(), + strOut.data(), + (int)strOut.capacity(), + nullptr, + nullptr + ); + + // NUL終端する + if (strOut.empty() && cchOut < 16) { + std::array buf; + ::strncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } + + return strOut; +} + +/*! + @brief u8文字列を標準文字列に変換する。 + 動的にバッファを確保する簡易バージョン + @param[in] strInput u8文字列 + @returns 標準文字列 + */ +std::wstring u8stowcs(std::string_view strInput) +{ + std::wstring strOut; + return u8stowcs(strOut, strInput); +} + +/*! + @brief 標準文字列をu8文字列に変換する。 + 動的にバッファを確保する簡易バージョン + @param[in] strInput 標準文字列 + @returns u8文字列 + */ +std::string wcstou8s(std::wstring_view strInput) +{ + std::string strOut; + return wcstou8s(strOut, strInput); +} + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // メモリ // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index 3755815e16..8bca50dc0e 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -29,6 +29,7 @@ #include #include +#include #include "basis/primitive.h" #include "debug/Debug2.h" @@ -239,6 +240,11 @@ char* wcstombs_new(const wchar_t* pSrc,int nSrcLen); //戻り値はnew[]で確 void wcstombs_vector(const wchar_t* pSrc, std::vector* ret); //戻り値はvectorとして返す。 void wcstombs_vector(const wchar_t* pSrc, int nSrcLen, std::vector* ret); //戻り値はvectorとして返す。 +std::string wcstombs(std::string& strOut, std::wstring_view strInput); +std::wstring u8stowcs(std::wstring& strOut, std::string_view strInput); +std::wstring u8stowcs(std::string_view strInput); +std::string wcstou8s(std::wstring_view strInput); + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // リテラル比較 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/tests/unittests/test-string_ex.cpp b/tests/unittests/test-string_ex.cpp index 8cc6c9b5b8..a7abbd838e 100644 --- a/tests/unittests/test-string_ex.cpp +++ b/tests/unittests/test-string_ex.cpp @@ -240,6 +240,30 @@ TEST(string_ex, strprintfA_small_output) EXPECT_STREQ("1234567890123456", text.c_str()); } +/*! + @brief 標準文字列をu8文字列に変換する。 + */ +TEST(string_ex, wcstou8s) +{ + // wcs→u8変換ができること + ASSERT_STREQ(wcstou8s(L"This is 運命").data(), u8"This is 運命"); + + // 空文字列も問題なく変換できること + ASSERT_STREQ(wcstou8s(L"").data(), u8""); +} + +/*! + @brief u8文字列を標準文字列に変換する。 + */ +TEST(string_ex, u8stowcs) +{ + // u8→wcs変換ができること + ASSERT_STREQ(u8stowcs(u8"This is 運命").data(), L"This is 運命"); + + // 空文字列も問題なく変換できること + ASSERT_STREQ(u8stowcs(u8"").data(), L""); +} + /*! @brief 独自定義の文字列比較関数。 */ From 179ee79ea517c647a54b252c7d1d4be511fae2bd Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 28 Feb 2022 22:23:46 +0900 Subject: [PATCH 086/129] =?UTF-8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=81=AE?= =?UTF-8?q?=E7=B5=82=E7=AB=AF=E4=BD=8D=E7=BD=AE=E3=82=92=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E3=81=99=E3=82=8B=E9=96=A2=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.cpp | 74 +++++++++++++++++++--------------- sakura_core/util/string_ex.h | 3 ++ 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index c0e72ed9d5..d3195add81 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -242,6 +242,44 @@ const char* stristr_j( const char* s1, const char* s2 ) return NULL; } +/*! + @brief 文字列の終端位置を調整する + @param[in, out] strOut 終端位置修正対象のインスタンス + @param[in] cchOut 終端位置 + @returns 終端位置を調整されたインスタンス。 + */ +std::wstring& eos(std::wstring& strOut, size_t cchOut) +{ + if (strOut.empty() && cchOut < 8) { + std::wstring buf(strOut.data()); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } + + return strOut; +} + +/*! + @brief 文字列の終端位置を調整する + @param[in, out] strOut 終端位置修正対象のインスタンス + @param[in] cchOut 終端位置 + @returns 終端位置を調整されたインスタンス。 + */ +std::string& eos(std::string& strOut, size_t cchOut) +{ + if (strOut.empty() && cchOut < 16) { + std::string buf(strOut.data()); + strOut.assign(buf.data(), cchOut); + } + else { + strOut.assign(strOut.data(), cchOut); + } + + return strOut; +} + /*! @brief C-Styleのフォーマット文字列を使ってデータを文字列化する。 事前に確保したバッファに結果を書き込む高速バージョン @@ -272,14 +310,7 @@ int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList) ::vswprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); // NUL終端する - if (strOut.empty() && cchOut < 8) { - std::array buf; - ::wcsncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); - strOut.assign(buf.data(), cchOut); - } - else { - strOut.assign(strOut.data(), cchOut); - } + eos(strOut, cchOut); return cchOut; } @@ -314,14 +345,7 @@ int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList) ::vsprintf_s(strOut.data(), strOut.capacity(), pszFormat, argList); // NUL終端する - if (strOut.empty() && cchOut < 16) { - std::array buf; - ::strncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); - strOut.assign(buf.data(), cchOut); - } - else { - strOut.assign(strOut.data(), cchOut); - } + eos(strOut, cchOut); return cchOut; } @@ -668,14 +692,7 @@ std::wstring u8stowcs(std::wstring& strOut, std::string_view strInput) ); // NUL終端する - if (strOut.empty() && cchOut < 16) { - std::array buf; - ::wcsncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); - strOut.assign(buf.data(), cchOut); - } - else { - strOut.assign(strOut.data(), cchOut); - } + eos(strOut, cchOut); return strOut; } @@ -726,14 +743,7 @@ std::string wcstou8s(std::string& strOut, std::wstring_view strInput) ); // NUL終端する - if (strOut.empty() && cchOut < 16) { - std::array buf; - ::strncpy_s(buf.data(), buf.size(), strOut.data(), cchOut); - strOut.assign(buf.data(), cchOut); - } - else { - strOut.assign(strOut.data(), cchOut); - } + eos(strOut, cchOut); return strOut; } diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index 8bca50dc0e..c5a3a4a209 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -206,6 +206,9 @@ inline int auto_vsprintf_s(WCHAR* buf, size_t nBufCount, const WCHAR* format, va #define auto_sprintf_s(buf, nBufCount, format, ...) ::_sntprintf_s((buf), nBufCount, _TRUNCATE, (format), __VA_ARGS__) #define auto_snprintf_s(buf, nBufCount, format, ...) ::_sntprintf_s((buf), nBufCount, _TRUNCATE, (format), __VA_ARGS__) +std::wstring& eos(std::wstring& strOut, size_t cchOut); +std::string& eos(std::string& strOut, size_t cchOut); + int vstrprintf(std::wstring& strOut, const WCHAR* pszFormat, va_list& argList); int vstrprintf(std::string& strOut, const CHAR* pszFormat, va_list& argList); int strprintf(std::wstring& strOut, const WCHAR* pszFormat, ...); From f4fbe9fae66a5f6442287a0410a93629eef31282 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 28 Feb 2022 22:30:17 +0900 Subject: [PATCH 087/129] =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=A8=E3=81=97=E3=81=9F=E3=83=A1=E3=83=83=E3=82=BB?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=82=92=E5=8F=96=E5=BE=97=E3=81=A7=E3=81=8D?= =?UTF-8?q?=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 元から仕組みがあったがgtestで使えないので改良。 gtestではワイド文字列を扱えないのでUTF8で書き出して読み出した文字列をUTF16LEに戻してから評価する。 --- sakura_core/util/MessageBoxF.cpp | 16 ++--- sakura_core/util/MessageBoxF.h | 5 ++ tests/unittests/eval_outputs.hpp | 33 ++++++++++ tests/unittests/test-messageboxf.cpp | 88 ++++++++++++++++++++++++++ tests/unittests/tests1.vcxproj | 2 + tests/unittests/tests1.vcxproj.filters | 6 ++ 6 files changed, 140 insertions(+), 10 deletions(-) create mode 100644 tests/unittests/eval_outputs.hpp create mode 100644 tests/unittests/test-messageboxf.cpp diff --git a/sakura_core/util/MessageBoxF.cpp b/sakura_core/util/MessageBoxF.cpp index ec60da392c..e41abeb5ae 100644 --- a/sakura_core/util/MessageBoxF.cpp +++ b/sakura_core/util/MessageBoxF.cpp @@ -33,9 +33,10 @@ */ #include "StdAfx.h" -#include -#include #include "MessageBoxF.h" + +#include + #include "_main/CProcess.h" #include "window/CEditWnd.h" #include "CSelectLang.h" @@ -50,15 +51,10 @@ int Wrap_MessageBox(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType) // 選択中の言語IDを取得する LANGID wLangId = CSelectLang::getDefaultLangId(); - // 標準エラー出力を取得する - HANDLE hStdErr = ::GetStdHandle( STD_ERROR_HANDLE ); - if( hStdErr ){ - // lpTextの文字列長を求める - DWORD dwTextLen = lpText ? ::wcslen( lpText ) : 0; - + // 標準エラー出力が存在する場合 + if(::GetStdHandle(STD_ERROR_HANDLE)){ // lpText を標準エラー出力に書き出す - DWORD dwWritten = 0; - ::WriteConsoleW( hStdErr, lpText, dwTextLen, &dwWritten, NULL ); + std::clog << (lpText ? wcstou8s(lpText) : "") << std::endl; // いい加減な戻り値を返す。(返り値0は未定義なので本来返らない値を返している) return 0; diff --git a/sakura_core/util/MessageBoxF.h b/sakura_core/util/MessageBoxF.h index 06a3dff475..36a6242a80 100644 --- a/sakura_core/util/MessageBoxF.h +++ b/sakura_core/util/MessageBoxF.h @@ -34,6 +34,11 @@ #define SAKURA_MESSAGEBOXF_542C25FF_34EB_4920_AC1A_DA32919E101B_H_ #pragma once +#include +#include + +#include + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // メッセージボックス：実装 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/tests/unittests/eval_outputs.hpp b/tests/unittests/eval_outputs.hpp new file mode 100644 index 0000000000..da5b3864a7 --- /dev/null +++ b/tests/unittests/eval_outputs.hpp @@ -0,0 +1,33 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#include "util/string_ex.h" + +// 標準エラー出力に吐き出されたメッセージを評価します +#define EXPECT_ERROUT(statementExpression, expected) \ + testing::internal::CaptureStderr(); \ + statementExpression; \ + EXPECT_STREQ(strprintf(L"%s\n", expected).data(), u8stowcs(testing::internal::GetCapturedStderr()).data()) diff --git a/tests/unittests/test-messageboxf.cpp b/tests/unittests/test-messageboxf.cpp new file mode 100644 index 0000000000..fbbf43d774 --- /dev/null +++ b/tests/unittests/test-messageboxf.cpp @@ -0,0 +1,88 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#include "eval_outputs.hpp" + +#include "util/MessageBoxF.h" + +#include "_main/CCommandLine.h" +#include "_main/CControlProcess.h" + +/*! + MessageBoxFのテスト + */ +TEST(MessageBoxF, test) +{ + const HWND hWnd = nullptr; + EXPECT_ERROUT(MessageBoxF(hWnd, MB_OK, L"caption", L"%d行をマージしました。", 2), L"2行をマージしました。"); +} + +/*! + 独自仕様メッセージボックス関数群のテスト + */ +TEST(MessageBoxF, customMessageBoxFunctions) +{ + const HWND hWnd = nullptr; + + // コマンドラインのインスタンスを用意する + CCommandLine cCommandLine; + auto pCommandLine = &cCommandLine; + pCommandLine->ParseCommandLine(LR"(-PROF="profile1")", false); + + // プロセスのインスタンスを用意する + CControlProcess dummy(nullptr, LR"(-PROF="profile1")"); + + //エラー：赤丸に「×」[OK] + EXPECT_ERROUT(ErrorMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopErrorMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //警告：三角に「！」[OK] + EXPECT_ERROUT(WarningMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopWarningMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //情報：青丸に「i」[OK] + EXPECT_ERROUT(InfoMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopInfoMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //確認：吹き出しの「？」 [はい][いいえ] 戻り値:IDYES,IDNO + EXPECT_ERROUT(ConfirmMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopConfirmMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //三択：吹き出しの「？」 [はい][いいえ][キャンセル] 戻り値:ID_YES,ID_NO,ID_CANCEL + EXPECT_ERROUT(Select3Message(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopSelect3Message(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //その他メッセージ表示用ボックス[OK] + EXPECT_ERROUT(OkMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopOkMessage(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //タイプ指定メッセージ表示用ボックス + EXPECT_ERROUT(CustomMessage(hWnd, MB_OK, L"%d行をマージしました。", 2), L"2行をマージしました。"); + EXPECT_ERROUT(TopCustomMessage(hWnd, MB_OK, L"%d行をマージしました。", 2), L"2行をマージしました。"); + + //作者に教えて欲しいエラー + EXPECT_ERROUT(PleaseReportToAuthor(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); +} \ No newline at end of file diff --git a/tests/unittests/tests1.vcxproj b/tests/unittests/tests1.vcxproj index 821e1e3cba..fb1c104c4f 100644 --- a/tests/unittests/tests1.vcxproj +++ b/tests/unittests/tests1.vcxproj @@ -142,6 +142,7 @@ + @@ -156,6 +157,7 @@ + diff --git a/tests/unittests/tests1.vcxproj.filters b/tests/unittests/tests1.vcxproj.filters index d94be58f34..7a5fa430b1 100644 --- a/tests/unittests/tests1.vcxproj.filters +++ b/tests/unittests/tests1.vcxproj.filters @@ -163,11 +163,17 @@ Test Files + + Test Files + Other Files + + Other Files + From dfcafad60964c24c953317ce4dd310214e1d7fc7 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 28 Feb 2022 22:32:37 +0900 Subject: [PATCH 088/129] =?UTF-8?q?VMessageBoxF=E3=81=AE=E3=83=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit パフォーマンスに悪影響が出るほどに膨大なテキスト出力に耐える固定長バッファを確保していたのをやめて、動的にバッファ確保するよう変更する。 --- sakura_core/util/MessageBoxF.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sakura_core/util/MessageBoxF.cpp b/sakura_core/util/MessageBoxF.cpp index e41abeb5ae..8869608d95 100644 --- a/sakura_core/util/MessageBoxF.cpp +++ b/sakura_core/util/MessageBoxF.cpp @@ -105,12 +105,11 @@ int VMessageBoxF( va_list& v //!< [in,out] 引数リスト ) { - hwndOwner=GetMessageBoxOwner(hwndOwner); - //整形 - static WCHAR szBuf[16000]; - auto_vsprintf_s(szBuf,_countof(szBuf),lpText,v); - //API呼び出し - return ::MessageBox( hwndOwner, szBuf, lpCaption, uType); + const auto buf = vstrprintf(lpText,v); + if (!hwndOwner) { + hwndOwner = GetMessageBoxOwner(hwndOwner); + } + return ::MessageBox(hwndOwner, buf.data(), lpCaption, uType); } int MessageBoxF( HWND hwndOwner, UINT uType, LPCWSTR lpCaption, LPCWSTR lpText, ... ) From 2c79076646308841ad452bc142a2ce1c138fed5e Mon Sep 17 00:00:00 2001 From: berryzplus Date: Wed, 2 Mar 2022 01:29:26 +0900 Subject: [PATCH 089/129] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C(=E9=96=A2=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E3=81=AE=E8=AA=A4=E8=A8=98=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/util/string_ex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index c5a3a4a209..7d9cd12053 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -243,8 +243,8 @@ char* wcstombs_new(const wchar_t* pSrc,int nSrcLen); //戻り値はnew[]で確 void wcstombs_vector(const wchar_t* pSrc, std::vector* ret); //戻り値はvectorとして返す。 void wcstombs_vector(const wchar_t* pSrc, int nSrcLen, std::vector* ret); //戻り値はvectorとして返す。 -std::string wcstombs(std::string& strOut, std::wstring_view strInput); std::wstring u8stowcs(std::wstring& strOut, std::string_view strInput); +std::string wcstou8s(std::string& strOut, std::wstring_view strInput); std::wstring u8stowcs(std::string_view strInput); std::string wcstou8s(std::wstring_view strInput); From 8afbd8ad2c3d1fdb0161b49bbef100cfb9c9f586 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Wed, 2 Mar 2022 01:32:06 +0900 Subject: [PATCH 090/129] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C(=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E6=9C=AB=E5=B0=BE=E3=81=AB=E6=94=B9=E8=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BB=98=E5=8A=A0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-messageboxf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/test-messageboxf.cpp b/tests/unittests/test-messageboxf.cpp index fbbf43d774..b739a63a1d 100644 --- a/tests/unittests/test-messageboxf.cpp +++ b/tests/unittests/test-messageboxf.cpp @@ -85,4 +85,4 @@ TEST(MessageBoxF, customMessageBoxFunctions) //作者に教えて欲しいエラー EXPECT_ERROUT(PleaseReportToAuthor(hWnd, L"%d行をマージしました。", 2), L"2行をマージしました。"); -} \ No newline at end of file +} From 93f45cdd90d05102c4528ee8c282bc911cfa6acf Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 7 Mar 2022 12:47:34 +0900 Subject: [PATCH 091/129] =?UTF-8?q?=E4=BF=9D=E5=AE=88:=20=E9=99=A4?= =?UTF-8?q?=E5=A4=96=E8=A8=AD=E5=AE=9A(tests/build/**)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 作らなくなったので削除 --- .github/workflows/sonarscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml index b8e316a8fb..f84773f43b 100644 --- a/.github/workflows/sonarscan.yml +++ b/.github/workflows/sonarscan.yml @@ -149,4 +149,4 @@ jobs: -D"sonar.cfamily.threads=2" ` -D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tools\**\*.js" ` -D"sonar.coverageReportPaths=tests1-coverage.xml" ` - -D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\build\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml" + -D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml" From dfb84bd20f81c556e04344d0bc252069002fa897 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 7 Mar 2022 12:58:35 +0900 Subject: [PATCH 092/129] =?UTF-8?q?=E4=BF=9D=E5=AE=88:=20=E9=99=A4?= =?UTF-8?q?=E5=A4=96=E8=A8=AD=E5=AE=9A(tests/stub/**)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit スタブDLLのソースコードを静的解析対象から外す。 --- .github/workflows/sonarscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml index f84773f43b..b2cc0cb852 100644 --- a/.github/workflows/sonarscan.yml +++ b/.github/workflows/sonarscan.yml @@ -147,6 +147,6 @@ jobs: -D"sonar.cfamily.cache.path=.sonar\analysis-cache" ` -D"sonar.cfamily.cppunit.reportPath=tests1-googletest.xml" ` -D"sonar.cfamily.threads=2" ` - -D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tools\**\*.js" ` + -D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tests\stubs\**\*.cpp,tools\**\*.js" ` -D"sonar.coverageReportPaths=tests1-coverage.xml" ` - -D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\googletest\**\*,**\test-*,tests*-*.xml" + -D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\googletest\**\,**\test-*,tests\stubs\**\*,tests*-*.xml*" From 372519254835b1d06443a9948a45ad78372d36b3 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 7 Mar 2022 13:04:26 +0900 Subject: [PATCH 093/129] =?UTF-8?q?=E9=9D=99=E7=9A=84=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E3=81=AEPython=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=923=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sonarscan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml index b2cc0cb852..9921c643d9 100644 --- a/.github/workflows/sonarscan.yml +++ b/.github/workflows/sonarscan.yml @@ -147,6 +147,7 @@ jobs: -D"sonar.cfamily.cache.path=.sonar\analysis-cache" ` -D"sonar.cfamily.cppunit.reportPath=tests1-googletest.xml" ` -D"sonar.cfamily.threads=2" ` + -D"sonar.python.version=3" ` -D"sonar.coverage.exclusions=help\**\*.js,tests\unittests\coverage.cpp,tests\stubs\**\*.cpp,tools\**\*.js" ` -D"sonar.coverageReportPaths=tests1-coverage.xml" ` -D"sonar.exclusions=.sonar\**\*,build\**\*,bw-output\**\*,HeaderMake\**\*,tests\googletest\**\,**\test-*,tests\stubs\**\*,tests*-*.xml*" From c9ac16983a95f279723fd253a201cc07a2cb13c4 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Tue, 8 Mar 2022 19:26:10 +0900 Subject: [PATCH 094/129] =?UTF-8?q?CPPA=E3=81=AE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本体改修なしで実現できるテストを実装。 --- tests/unittests/test-cppa.cpp | 96 ++++++++++++++++++++++++++ tests/unittests/tests1.vcxproj | 1 + tests/unittests/tests1.vcxproj.filters | 3 + 3 files changed, 100 insertions(+) create mode 100644 tests/unittests/test-cppa.cpp diff --git a/tests/unittests/test-cppa.cpp b/tests/unittests/test-cppa.cpp new file mode 100644 index 0000000000..f0ff474472 --- /dev/null +++ b/tests/unittests/test-cppa.cpp @@ -0,0 +1,96 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#include "macro/CPPA.h" + +/*! + CPPA::GetDllNameImpのテスト + */ +TEST(CPPA, GetDllNameImp) +{ + CPPA cPpa; + EXPECT_STREQ(L"PPA.DLL", cPpa.GetDllNameImp(0)); +} + +/*! + CPPA::GetDeclarationsのテスト + + PPAに渡す関数名を作る関数 + 戻り値があればfunction、なければprocedureとみなす。 + 対応する型はintとstringのみ。（PPA1.2は実数型にも対応しているが未対応） + 引数は最大8個まで指定できる。(PPAは32個まで対応しているが未対応） + */ +TEST(CPPA, GetDeclarations) +{ + setlocale(LC_ALL, "Japanese"); + + CPPA cPpa; + + // バッファ + std::string buffer(1024, L'\0'); + + // 引数型 int + MacroFuncInfo funcInfo1 = { 1, L"Cmd1", { VT_I4, }, VT_EMPTY }; + cPpa.GetDeclarations(funcInfo1, buffer.data()); + EXPECT_STREQ("procedure S_Cmd1(i0: Integer); index 1;", buffer.data()); + + // 引数型 string + MacroFuncInfo funcInfo2 = { 2, L"Cmd2", { VT_BSTR, }, VT_EMPTY }; + cPpa.GetDeclarations(funcInfo2, buffer.data()); + EXPECT_STREQ("procedure S_Cmd2(s0: string); index 2;", buffer.data()); + + // 引数型 なし + MacroFuncInfo funcInfo3 = { 3, L"Cmd3", { VT_EMPTY, }, VT_EMPTY }; + cPpa.GetDeclarations(funcInfo3, buffer.data()); + EXPECT_STREQ("procedure S_Cmd3; index 3;", buffer.data()); + + // 引数型 不明（intでもstringでもない） + MacroFuncInfo funcInfo4 = { 4, L"Cmd4", { VT_BOOL, }, VT_EMPTY }; + cPpa.GetDeclarations(funcInfo4, buffer.data()); + EXPECT_STREQ("procedure S_Cmd4(u0: Unknown); index 4;", buffer.data()); + + // 戻り型 int + MacroFuncInfo funcInfo5 = { 5, L"Func1", { VT_EMPTY }, VT_I4 }; + cPpa.GetDeclarations(funcInfo5, buffer.data()); + EXPECT_STREQ("function S_Func1: Integer; index 5;", buffer.data()); + + // 戻り型 string + MacroFuncInfo funcInfo6 = { 6, L"Func2", { VT_EMPTY }, VT_BSTR }; + cPpa.GetDeclarations(funcInfo6, buffer.data()); + EXPECT_STREQ("function S_Func2: string; index 6;", buffer.data()); + + // 戻り型 不明（intでもstringでもない） + MacroFuncInfo funcInfo7 = { 7, L"Func3", { VT_EMPTY }, VT_BOOL }; + cPpa.GetDeclarations(funcInfo7, buffer.data()); + EXPECT_STREQ("function S_Func3; index 7;", buffer.data()); + + // 引数をたくさん指定する + VARTYPE varArgEx8[] = { VT_I4, VT_BSTR, VT_I4, VT_BSTR }; + MacroFuncInfoEx funcInfoEx8 = { 8, 8, varArgEx8 }; + MacroFuncInfo funcInfo8 = { 8, L"Func4", { VT_I4, VT_BSTR, VT_I4, VT_BSTR }, VT_BSTR, &funcInfoEx8 }; + cPpa.GetDeclarations(funcInfo8, buffer.data()); + EXPECT_STREQ("function S_Func4(i0: Integer; s1: string; i2: Integer; s3: string; i4: Integer; s5: string; i6: Integer; s7: string): string; index 8;", buffer.data()); +} diff --git a/tests/unittests/tests1.vcxproj b/tests/unittests/tests1.vcxproj index fb1c104c4f..81f209b6b1 100644 --- a/tests/unittests/tests1.vcxproj +++ b/tests/unittests/tests1.vcxproj @@ -110,6 +110,7 @@ + diff --git a/tests/unittests/tests1.vcxproj.filters b/tests/unittests/tests1.vcxproj.filters index 7a5fa430b1..862ad65ed9 100644 --- a/tests/unittests/tests1.vcxproj.filters +++ b/tests/unittests/tests1.vcxproj.filters @@ -166,6 +166,9 @@ Test Files + + Test Files + From f7ff50d455cfae92d2f91af9c6711f8b6c4729aa Mon Sep 17 00:00:00 2001 From: berryzplus Date: Thu, 10 Mar 2022 00:46:42 +0900 Subject: [PATCH 095/129] =?UTF-8?q?MinGW=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=81=E3=81=AE=E5=87=BA=E5=8A=9B=E5=85=88?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=8C=87=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=A8=82=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・定義がカレントフォルダからの相対指定になっていたのを修正。 ・出力フォルダが作成済みかどうかチェックするように修正。 ・パスに空白を含む場合の考慮の有無が混在していたのを「考慮あり」に統一。 --- build-gnu.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-gnu.bat b/build-gnu.bat index 99ae970ca2..e16df24521 100644 --- a/build-gnu.bat +++ b/build-gnu.bat @@ -33,21 +33,21 @@ path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=% if not defined CMD_NINJA call %~dp0tools\find-tools.bat @rem create output directory, all executables will be placed here. -set OUTDIR=../../../../%platform%/%configuration% -mkdir "%~dp0%platform%\%configuration%" > NUL 2>&1 +set OUTDIR=%~dp0%platform%\%configuration% +if not exist "%OUTDIR%" mkdir /p "%OUTDIR%" > NUL 2>&1 @rem build "sakura_core". set SAKURA_CORE_MAKEFILE=%~dp0sakura_core\Makefile set SAKURA_CORE_BUILD_DIR=%~dp0build\%platform%\%configuration%\sakura_core mkdir "%SAKURA_CORE_BUILD_DIR%" > NUL 2>&1 pushd "%SAKURA_CORE_BUILD_DIR%" -mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% StdAfx.h.gch sakura_rc.o +mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR="%OUTDIR%" StdAfx.h.gch sakura_rc.o if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd exit /b 1 ) -mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% -j4 +mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR="%OUTDIR%" -j4 if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd @@ -60,7 +60,7 @@ set SAKURA_LANG_EN_US_MAKEFILE=%~dp0sakura_lang_en_US\Makefile set SAKURA_LANG_EN_US_BUILD_DIR=%~dp0build\%platform%\%configuration%\sakura_lang_en_US mkdir "%SAKURA_LANG_EN_US_BUILD_DIR%" > NUL 2>&1 pushd "%SAKURA_LANG_EN_US_BUILD_DIR%" -mingw32-make -f "%SAKURA_LANG_EN_US_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR% +mingw32-make -f "%SAKURA_LANG_EN_US_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR="%OUTDIR%" if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd @@ -93,7 +93,7 @@ if errorlevel 1 ( popd exit /b 1 ) -mingw32-make -f "%TESTS1_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR% -j4 +mingw32-make -f "%TESTS1_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR="%OUTDIR%" -j4 if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd From 62f60b4229b29bd7acbf65b20bee07e310e95026 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 12 Mar 2022 13:06:17 +0900 Subject: [PATCH 096/129] =?UTF-8?q?DLL=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E5=A4=B1=E6=95=97=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/TExtModule.hpp | 101 ++++++++++++++++++++++++ tests/unittests/test-extmodules.cpp | 103 +++++++++++++++++++++++++ tests/unittests/tests1.vcxproj | 2 + tests/unittests/tests1.vcxproj.filters | 6 ++ 4 files changed, 212 insertions(+) create mode 100644 tests/unittests/TExtModule.hpp create mode 100644 tests/unittests/test-extmodules.cpp diff --git a/tests/unittests/TExtModule.hpp b/tests/unittests/TExtModule.hpp new file mode 100644 index 0000000000..3e34e3cb70 --- /dev/null +++ b/tests/unittests/TExtModule.hpp @@ -0,0 +1,101 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#include "extmodule/CDllHandler.h" + +#include + +/*! + 外部DLL読み込みをテストするためのテンプレートクラス + + CDllImp派生クラスを指定して使う。 + テストではロード処理後の挙動をチェックするので、コンストラクタでinitしてしまう。 + */ +template, std::nullptr_t> = nullptr> +class TExtModule : public T { +private: + std::wstring_view dllName = L""; + +protected: + //! DLLパスを返す + LPCWSTR GetDllNameImp(int index) override { + return dllName.empty() ? T::GetDllNameImp(index) : dllName.data(); + } + +public: + //! コンストラクタ + explicit TExtModule(std::wstring_view path = L"") + : dllName(path) { + // この関数の戻り値型はC++では推奨されない。 + // あちこちで警告が出るとうっとおしいので呼出箇所をまとめておく + // 将来的には、適切な戻り値型に変更したい。 + this->InitDll(nullptr); + } +}; + +/*! + 外部DLLの読み込み失敗をテストするためのテンプレートクラス + + CDllImp派生クラスを指定して使う。 + DLL読み込み失敗をテストするために「あり得ないパス」を指定する。 + */ +template +class TUnresolvedExtModule : public TExtModule { +private: + // あり得ないパス + static constexpr auto& BadDllName = LR"(>\(^o^)\<)"; + + // 基底クラスの型 + using Base = TExtModule; + +public: + TUnresolvedExtModule() + : Base(BadDllName) { + } +}; + +/*! + 外部DLLの読み込み失敗をテストするためのテンプレートクラス + + CDllImp派生クラスを指定して使う。 + エクスポート関数のアドレス取得失敗をテストするためにMSHTMLを指定する。 + MSHTMLは、Windowsには必ず存在していてサクラエディタでは使わないもの。 + 将来的にMSHTMLを使いたくなったら他のDLLを選定して定義を修正すること。 + */ +template +class TUnsufficientExtModule : public TExtModule { +private: + // サクラエディタでは利用しないWindowsのDLL名 + static constexpr auto& UnusedWindowsDllName = L"MSHTML.DLL"; + + // 基底クラスの型 + using Base = TExtModule; + +public: + TUnsufficientExtModule() + : Base(UnusedWindowsDllName) { + } +}; diff --git a/tests/unittests/test-extmodules.cpp b/tests/unittests/test-extmodules.cpp new file mode 100644 index 0000000000..b6e02f2d1c --- /dev/null +++ b/tests/unittests/test-extmodules.cpp @@ -0,0 +1,103 @@ +/*! @file */ +/* + Copyright (C) 2022, Sakura Editor Organization + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ +#include + +#include "TExtModule.hpp" + +#include // CHtmlHelp.hで必要 + +#include "extmodule/CBregexpDll2.h" +#include "extmodule/CHtmlHelp.h" +//#include "extmodule/CIcu4cI18n.h" //継承不可なのでテストできない +//#include "extmodule/CMigemo.h" //TSingletonなのでテストできない +//#include "extmodule/CUchardet.h" //継承不可なのでテストできない +//#include "extmodule/CUxTheme.h" //TSingletonなのでテストできない +#include "macro/CPPA.h" +//#include "plugin/CDllPlugin.h" //継承不可なのでテストできない + +/*! + 外部DLLの読み込みテスト + */ +template +class LoadTest : public ::testing::Test { +}; + +//! パラメータテストであるとマークする +TYPED_TEST_CASE_P(LoadTest); + +/*! + 読み込み失敗のテスト + + DLLが見つからなくて失敗するケース + */ +TYPED_TEST_P(LoadTest, FailedToLoadLibrary) +{ + // テスト対象のCDllImpl派生クラスをテストするための型を定義する + using ExtModule = TUnresolvedExtModule; + + // テストクラスをインスタンス化する + ExtModule extModule; + + // DLLが見つからなくてIsAvailableはfalseになる + EXPECT_FALSE(extModule.IsAvailable()); +} + +/*! + 読み込み失敗のテスト + + エクスポート関数が取得できなくて失敗するケース + */ +TYPED_TEST_P(LoadTest, FailedToGetProcAddress) +{ + // テスト対象のCDllImpl派生クラスをテストするための型を定義する + using ExtModule = TUnsufficientExtModule; + + // テストクラスをインスタンス化する + ExtModule extModule; + + // エクスポート関数の一部が見つからなくてIsAvailableはfalseになる + EXPECT_FALSE(extModule.IsAvailable()); +} + +// test suiteを登録する +REGISTER_TYPED_TEST_SUITE_P( + LoadTest, + FailedToLoadLibrary, FailedToGetProcAddress); + +/*! + テスト対象（外部DLLを読み込むクラス） + + CDllImp派生クラスである必要がある。 + */ +using ExtModuleImplementations = ::testing::Types< + CBregexpDll2, + CHtmlHelp, + CPPA>; + +//! パラメータテストをインスタンス化する +INSTANTIATE_TYPED_TEST_SUITE_P( + ExtModule, + LoadTest, + ExtModuleImplementations); diff --git a/tests/unittests/tests1.vcxproj b/tests/unittests/tests1.vcxproj index 81f209b6b1..4cb4a8f04e 100644 --- a/tests/unittests/tests1.vcxproj +++ b/tests/unittests/tests1.vcxproj @@ -115,6 +115,7 @@ + @@ -159,6 +160,7 @@ + diff --git a/tests/unittests/tests1.vcxproj.filters b/tests/unittests/tests1.vcxproj.filters index 862ad65ed9..01cb428f20 100644 --- a/tests/unittests/tests1.vcxproj.filters +++ b/tests/unittests/tests1.vcxproj.filters @@ -169,6 +169,9 @@ Test Files + + Test Files + @@ -177,6 +180,9 @@ Other Files + + Other Files + From 3b06a42a11e8c056f419522ce87f338d1934bf38 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 12 Mar 2022 13:46:07 +0900 Subject: [PATCH 097/129] =?UTF-8?q?=E6=97=A2=E5=AD=98=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AE=E4=B8=8D=E9=83=BD=E5=90=88=E3=82=92=E8=A7=A3?= =?UTF-8?q?=E6=B6=88=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 比較的簡単に対処できる不都合を解消する ・ヘッダーの参照不足で、利用側コードにincludeを書かないといけない ・クラス宣言が継承不可になってるためにテストを書けない --- sakura_core/extmodule/CHtmlHelp.h | 2 ++ sakura_core/extmodule/CIcu4cI18n.h | 2 +- sakura_core/extmodule/CUchardet.h | 2 +- tests/unittests/test-extmodules.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sakura_core/extmodule/CHtmlHelp.h b/sakura_core/extmodule/CHtmlHelp.h index ab42f3a766..c5d37b5fa8 100644 --- a/sakura_core/extmodule/CHtmlHelp.h +++ b/sakura_core/extmodule/CHtmlHelp.h @@ -35,6 +35,8 @@ #define SAKURA_CHTMLHELP_7003298B_3900_42FD_9A02_1BCD4E9A8546_H_ #pragma once +#include + #include "CDllHandler.h" /*! diff --git a/sakura_core/extmodule/CIcu4cI18n.h b/sakura_core/extmodule/CIcu4cI18n.h index cef065fa1d..7787221f76 100644 --- a/sakura_core/extmodule/CIcu4cI18n.h +++ b/sakura_core/extmodule/CIcu4cI18n.h @@ -39,7 +39,7 @@ typedef enum UErrorCode { /*! * ICU4C の i18n ライブラリ(icuin.dll) をラップするクラス */ -class CIcu4cI18n final : public CDllImp +class CIcu4cI18n : public CDllImp { // DLL関数型定義 typedef UCharsetDetector* (__cdecl *ucsdet_open_t)(UErrorCode *status); diff --git a/sakura_core/extmodule/CUchardet.h b/sakura_core/extmodule/CUchardet.h index 7b2ae68b6f..e5e2f6a655 100644 --- a/sakura_core/extmodule/CUchardet.h +++ b/sakura_core/extmodule/CUchardet.h @@ -31,7 +31,7 @@ typedef struct uchardet * uchardet_t; /*! * uchardet ライブラリ(uchardet.dll) をラップするクラス */ -class CUchardet final : public CDllImp +class CUchardet : public CDllImp { public: // DLL関数ポインタ diff --git a/tests/unittests/test-extmodules.cpp b/tests/unittests/test-extmodules.cpp index b6e02f2d1c..b81e495f27 100644 --- a/tests/unittests/test-extmodules.cpp +++ b/tests/unittests/test-extmodules.cpp @@ -26,13 +26,11 @@ #include "TExtModule.hpp" -#include // CHtmlHelp.hで必要 - #include "extmodule/CBregexpDll2.h" #include "extmodule/CHtmlHelp.h" -//#include "extmodule/CIcu4cI18n.h" //継承不可なのでテストできない +#include "extmodule/CIcu4cI18n.h" //#include "extmodule/CMigemo.h" //TSingletonなのでテストできない -//#include "extmodule/CUchardet.h" //継承不可なのでテストできない +#include "extmodule/CUchardet.h" //#include "extmodule/CUxTheme.h" //TSingletonなのでテストできない #include "macro/CPPA.h" //#include "plugin/CDllPlugin.h" //継承不可なのでテストできない @@ -94,6 +92,8 @@ REGISTER_TYPED_TEST_SUITE_P( using ExtModuleImplementations = ::testing::Types< CBregexpDll2, CHtmlHelp, + CIcu4cI18n, + CUchardet, CPPA>; //! パラメータテストをインスタンス化する From c8a993a9232c6e6a2b02f4205cd5a858ae9799b0 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 14 Mar 2022 10:51:47 +0900 Subject: [PATCH 098/129] =?UTF-8?q?CMigemo=E3=82=92=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit プロセス内に1つのみ存在するシングルインスタンスにする --- sakura_core/_main/CNormalProcess.h | 1 + sakura_core/extmodule/CMigemo.h | 6 ++---- tests/unittests/test-extmodules.cpp | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sakura_core/_main/CNormalProcess.h b/sakura_core/_main/CNormalProcess.h index 96e170d49f..d517594b4c 100644 --- a/sakura_core/_main/CNormalProcess.h +++ b/sakura_core/_main/CNormalProcess.h @@ -50,5 +50,6 @@ class CNormalProcess final : public CProcess { private: CEditApp* m_pcEditApp; //2007.10.23 kobake + CMigemo m_cMigemo; }; #endif /* SAKURA_CNORMALPROCESS_F2808B31_61DC_4BE0_8661_9626478AC7F9_H_ */ diff --git a/sakura_core/extmodule/CMigemo.h b/sakura_core/extmodule/CMigemo.h index 87a8fdb1ee..d9d5587ce9 100644 --- a/sakura_core/extmodule/CMigemo.h +++ b/sakura_core/extmodule/CMigemo.h @@ -55,11 +55,9 @@ typedef struct _migemo migemo; #include "CDllHandler.h" #include "util/design_template.h" -class CMigemo : public TSingleton, public CDllImp { - friend class TSingleton; - CMigemo(){} - +class CMigemo : public CDllImp, public TSingleInstance { public: + CMigemo() noexcept = default; virtual ~CMigemo(); // Entry Point diff --git a/tests/unittests/test-extmodules.cpp b/tests/unittests/test-extmodules.cpp index b81e495f27..957ef4f04d 100644 --- a/tests/unittests/test-extmodules.cpp +++ b/tests/unittests/test-extmodules.cpp @@ -29,7 +29,7 @@ #include "extmodule/CBregexpDll2.h" #include "extmodule/CHtmlHelp.h" #include "extmodule/CIcu4cI18n.h" -//#include "extmodule/CMigemo.h" //TSingletonなのでテストできない +#include "extmodule/CMigemo.h" //TSingletonなのでテストできない #include "extmodule/CUchardet.h" //#include "extmodule/CUxTheme.h" //TSingletonなのでテストできない #include "macro/CPPA.h" @@ -93,6 +93,7 @@ using ExtModuleImplementations = ::testing::Types< CBregexpDll2, CHtmlHelp, CIcu4cI18n, + CMigemo, CUchardet, CPPA>; From 22b2a51fd2a8da467951ca83f24005daf15f4592 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 14 Mar 2022 12:44:53 +0900 Subject: [PATCH 099/129] =?UTF-8?q?CDllImp=E3=81=AE=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=82=92noexcept?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/extmodule/CDllHandler.cpp | 3 +-- sakura_core/extmodule/CDllHandler.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sakura_core/extmodule/CDllHandler.cpp b/sakura_core/extmodule/CDllHandler.cpp index 492fe89cb7..6528a9551c 100644 --- a/sakura_core/extmodule/CDllHandler.cpp +++ b/sakura_core/extmodule/CDllHandler.cpp @@ -37,8 +37,7 @@ // 生成と破棄 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // -CDllImp::CDllImp() - : m_hInstance( NULL ) +CDllImp::CDllImp() noexcept { } diff --git a/sakura_core/extmodule/CDllHandler.h b/sakura_core/extmodule/CDllHandler.h index 40d4f86fc2..f41e1be18e 100644 --- a/sakura_core/extmodule/CDllHandler.h +++ b/sakura_core/extmodule/CDllHandler.h @@ -109,7 +109,7 @@ class CDllImp{ // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // public: //コンストラクタ・デストラクタ - CDllImp(); + CDllImp()noexcept; CDllImp(const Me&) = delete; Me& operator = (const Me&) = delete; CDllImp(Me&&) noexcept = delete; @@ -210,7 +210,7 @@ class CDllImp{ // メンバ変数 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // private: - HINSTANCE m_hInstance; + HINSTANCE m_hInstance = nullptr; std::wstring m_strLoadedDllName; }; #endif /* SAKURA_CDLLHANDLER_B27A5A93_E49F_4618_8958_6883D63BBABB_H_ */ From bb10431620c46297a7f476fbdbfa3ea084cc89da Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 14 Mar 2022 12:58:11 +0900 Subject: [PATCH 100/129] =?UTF-8?q?Revert=20"CDllImp=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=82=92?= =?UTF-8?q?noexcept=E3=81=AB=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 22b2a51fd2a8da467951ca83f24005daf15f4592. --- sakura_core/extmodule/CDllHandler.cpp | 3 ++- sakura_core/extmodule/CDllHandler.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sakura_core/extmodule/CDllHandler.cpp b/sakura_core/extmodule/CDllHandler.cpp index 6528a9551c..492fe89cb7 100644 --- a/sakura_core/extmodule/CDllHandler.cpp +++ b/sakura_core/extmodule/CDllHandler.cpp @@ -37,7 +37,8 @@ // 生成と破棄 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // -CDllImp::CDllImp() noexcept +CDllImp::CDllImp() + : m_hInstance( NULL ) { } diff --git a/sakura_core/extmodule/CDllHandler.h b/sakura_core/extmodule/CDllHandler.h index f41e1be18e..40d4f86fc2 100644 --- a/sakura_core/extmodule/CDllHandler.h +++ b/sakura_core/extmodule/CDllHandler.h @@ -109,7 +109,7 @@ class CDllImp{ // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // public: //コンストラクタ・デストラクタ - CDllImp()noexcept; + CDllImp(); CDllImp(const Me&) = delete; Me& operator = (const Me&) = delete; CDllImp(Me&&) noexcept = delete; @@ -210,7 +210,7 @@ class CDllImp{ // メンバ変数 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // private: - HINSTANCE m_hInstance = nullptr; + HINSTANCE m_hInstance; std::wstring m_strLoadedDllName; }; #endif /* SAKURA_CDLLHANDLER_B27A5A93_E49F_4618_8958_6883D63BBABB_H_ */ From 586d0e2fb19c8d4170ebda88b048e5419649b1b1 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 14 Mar 2022 12:59:20 +0900 Subject: [PATCH 101/129] =?UTF-8?q?CMigemo=E3=82=B3=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=81=AEnoexcept=E3=82=92?= =?UTF-8?q?=E5=A4=96=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/extmodule/CMigemo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/extmodule/CMigemo.h b/sakura_core/extmodule/CMigemo.h index d9d5587ce9..ddf3fb5fa2 100644 --- a/sakura_core/extmodule/CMigemo.h +++ b/sakura_core/extmodule/CMigemo.h @@ -57,7 +57,7 @@ typedef struct _migemo migemo; class CMigemo : public CDllImp, public TSingleInstance { public: - CMigemo() noexcept = default; + CMigemo() = default; virtual ~CMigemo(); // Entry Point From 49523cbea2030f13df1043e57dc9f757f085a602 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 19 Mar 2022 14:59:53 +0900 Subject: [PATCH 102/129] =?UTF-8?q?Revert=20"MinGW=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=83=90=E3=83=83=E3=83=81=E3=81=AE=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E5=85=88=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E8=A8=82=E6=AD=A3=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f7ff50d455cfae92d2f91af9c6711f8b6c4729aa. --- build-gnu.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-gnu.bat b/build-gnu.bat index e16df24521..99ae970ca2 100644 --- a/build-gnu.bat +++ b/build-gnu.bat @@ -33,21 +33,21 @@ path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=% if not defined CMD_NINJA call %~dp0tools\find-tools.bat @rem create output directory, all executables will be placed here. -set OUTDIR=%~dp0%platform%\%configuration% -if not exist "%OUTDIR%" mkdir /p "%OUTDIR%" > NUL 2>&1 +set OUTDIR=../../../../%platform%/%configuration% +mkdir "%~dp0%platform%\%configuration%" > NUL 2>&1 @rem build "sakura_core". set SAKURA_CORE_MAKEFILE=%~dp0sakura_core\Makefile set SAKURA_CORE_BUILD_DIR=%~dp0build\%platform%\%configuration%\sakura_core mkdir "%SAKURA_CORE_BUILD_DIR%" > NUL 2>&1 pushd "%SAKURA_CORE_BUILD_DIR%" -mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR="%OUTDIR%" StdAfx.h.gch sakura_rc.o +mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% StdAfx.h.gch sakura_rc.o if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd exit /b 1 ) -mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR="%OUTDIR%" -j4 +mingw32-make -f "%SAKURA_CORE_MAKEFILE%" MYDEFINES="%MYDEFINES%" MYCFLAGS="%MYCFLAGS%" MYLIBS="%MYLIBS%" OUTDIR=%OUTDIR% -j4 if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd @@ -60,7 +60,7 @@ set SAKURA_LANG_EN_US_MAKEFILE=%~dp0sakura_lang_en_US\Makefile set SAKURA_LANG_EN_US_BUILD_DIR=%~dp0build\%platform%\%configuration%\sakura_lang_en_US mkdir "%SAKURA_LANG_EN_US_BUILD_DIR%" > NUL 2>&1 pushd "%SAKURA_LANG_EN_US_BUILD_DIR%" -mingw32-make -f "%SAKURA_LANG_EN_US_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR="%OUTDIR%" +mingw32-make -f "%SAKURA_LANG_EN_US_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR% if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd @@ -93,7 +93,7 @@ if errorlevel 1 ( popd exit /b 1 ) -mingw32-make -f "%TESTS1_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR="%OUTDIR%" -j4 +mingw32-make -f "%TESTS1_MAKEFILE%" MYDEFINES="%MYDEFINES%" SAKURA_CORE=../sakura_core OUTDIR=%OUTDIR% -j4 if errorlevel 1 ( echo error 2 errorlevel %errorlevel% popd From 090c6a4aaa59b8a63165562f1f859c1ef66c93ac Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 19 Mar 2022 15:10:22 +0900 Subject: [PATCH 103/129] =?UTF-8?q?MinGW=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=81=E3=81=AE=E5=87=BA=E5=8A=9B=E5=85=88?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=8C=87=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=A8=82=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・定義がカレントフォルダからの相対指定になっていたのを修正。 --- build-gnu.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-gnu.bat b/build-gnu.bat index 99ae970ca2..7834a03f1c 100644 --- a/build-gnu.bat +++ b/build-gnu.bat @@ -33,7 +33,7 @@ path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=% if not defined CMD_NINJA call %~dp0tools\find-tools.bat @rem create output directory, all executables will be placed here. -set OUTDIR=../../../../%platform%/%configuration% +set OUTDIR=%~dp0%platform%\%configuration% mkdir "%~dp0%platform%\%configuration%" > NUL 2>&1 @rem build "sakura_core". From 05c2674e5383362747bb07dd764b41944c6a8f29 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 19 Mar 2022 15:35:23 +0900 Subject: [PATCH 104/129] =?UTF-8?q?MinGW=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=81=E3=81=AE=E5=87=BA=E5=8A=9B=E5=85=88?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E6=8C=87=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・出力フォルダの作成に変数OUTDIRを使うように修正。 ・パスに空白を含む場合の考慮の有無が混在していたのを「考慮なし」に統一。 --- build-gnu.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-gnu.bat b/build-gnu.bat index 7834a03f1c..3c4aa390ca 100644 --- a/build-gnu.bat +++ b/build-gnu.bat @@ -34,7 +34,7 @@ if not defined CMD_NINJA call %~dp0tools\find-tools.bat @rem create output directory, all executables will be placed here. set OUTDIR=%~dp0%platform%\%configuration% -mkdir "%~dp0%platform%\%configuration%" > NUL 2>&1 +mkdir %OUTDIR% > NUL 2>&1 @rem build "sakura_core". set SAKURA_CORE_MAKEFILE=%~dp0sakura_core\Makefile From cff81c14b8e2b36f055e34be8937fa1dca6fddb7 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 19 Mar 2022 22:55:14 +0900 Subject: [PATCH 105/129] Update tests/unittests/test-extmodules.cpp --- tests/unittests/test-extmodules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/test-extmodules.cpp b/tests/unittests/test-extmodules.cpp index 957ef4f04d..f097b439cb 100644 --- a/tests/unittests/test-extmodules.cpp +++ b/tests/unittests/test-extmodules.cpp @@ -29,7 +29,7 @@ #include "extmodule/CBregexpDll2.h" #include "extmodule/CHtmlHelp.h" #include "extmodule/CIcu4cI18n.h" -#include "extmodule/CMigemo.h" //TSingletonなのでテストできない +#include "extmodule/CMigemo.h" #include "extmodule/CUchardet.h" //#include "extmodule/CUxTheme.h" //TSingletonなのでテストできない #include "macro/CPPA.h" From 89d6456cdcd98d4aed7631b5e162029d23e3470a Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Mon, 21 Mar 2022 13:41:31 +0900 Subject: [PATCH 106/129] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/view/CRuler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/view/CRuler.cpp b/sakura_core/view/CRuler.cpp index b565850514..d565832eae 100644 --- a/sakura_core/view/CRuler.cpp +++ b/sakura_core/view/CRuler.cpp @@ -123,7 +123,7 @@ void CRuler::DrawRulerBg(CGraphics& gr) } if (m_hFont == NULL) { LOGFONT lf = {0}; - lf.lfHeight = 1 - DpiScaleY(pCommon->m_sWindow.m_nRulerHeight); // 2002/05/13 ai + lf.lfHeight = DpiScaleY(1 - pCommon->m_sWindow.m_nRulerHeight); // 2002/05/13 ai lf.lfWidth = 0; lf.lfEscapement = 0; lf.lfOrientation = 0; From 7048b81e7e4b932d375e8ea79ce52d1c33d865be Mon Sep 17 00:00:00 2001 From: katsuhisa yuasa Date: Sun, 17 Apr 2022 14:46:37 +0900 Subject: [PATCH 107/129] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E8=A1=8C=E3=81=B8?= =?UTF-8?q?=E3=82=B8=E3=83=A3=E3=83=B3=E3=83=97=E3=81=99=E3=82=8B=20IDD=5F?= =?UTF-8?q?JUMP=20=E3=81=AE=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 行番号入力のEDITTEXTの横幅を広くして6桁より多い桁数を入力できるように変更、ES_NUMBERスタイルを付加して数値入力に限定 --- sakura_core/sakura_rc.rc | 4 ++-- sakura_lang_en_US/sakura_lang_rc.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 79e4d6f6c7..fc3d499df3 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -89,8 +89,8 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "指定行へジャンプ" FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x1 BEGIN - LTEXT "行番号(&N)",IDC_STATIC,5,6,34,10 - EDITTEXT IDC_EDIT_LINENUM,43,4,40,12 + LTEXT "行番号(&N)",IDC_STATIC,5,4,34,10 + EDITTEXT IDC_EDIT_LINENUM,40,4,50,12, ES_NUMBER CONTROL "Spin1",IDC_SPIN_LINENUM,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,82,4,9,12 CONTROL "折り返し単位の行番号(&R)",IDC_RADIO_LINENUM_LAYOUT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,94,5,97,10 CONTROL "改行単位の行番号(&W)",IDC_RADIO_LINENUM_CRLF,"Button",BS_AUTORADIOBUTTON,94,20,87,10 diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 4928a3a56b..49b95a4944 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -93,10 +93,10 @@ CAPTION "Jump to Line" FONT 9, "Tahoma", 0, 0, 0x1 BEGIN LTEXT "Line &Number",IDC_STATIC,5,6,34,8 - EDITTEXT IDC_EDIT_LINENUM,43,4,40,12 + EDITTEXT IDC_EDIT_LINENUM,34,4,54,12, ES_NUMBER CONTROL "Spin1",IDC_SPIN_LINENUM,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,82,4,9,12 CONTROL "Use Layout(&R)",IDC_RADIO_LINENUM_LAYOUT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,94,5,97,10 - CONTROL "Use CRLF(&W)",IDC_RADIO_LINENUM_CRLF,"Button",BS_AUTORADIOBUTTON,102,20,87,10 + CONTROL "Use CRLF(&W)",IDC_RADIO_LINENUM_CRLF,"Button",BS_AUTORADIOBUTTON,94,20,87,10 CONTROL "&PL/SQL Compiler Error Processing",IDC_CHECK_PLSQL, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,10,50,137,10 LTEXT "Line as a block of &1 Line",IDC_LABEL_PLSQL2,92,66,92,8,NOT WS_GROUP From 50443a078c0033dd575dc304ac15c23ef7916559 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Sat, 30 Apr 2022 14:19:17 +0900 Subject: [PATCH 108/129] Revert change at #1512 partially MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit N_SHAREDATA_VERSIONの修正ミスを訂正します。 SonarCloudの指摘に従ってdefineをconstexprに置換しましたが、既存のCマクロに悪影響が出るので元に戻します。 --- sakura_core/config/system_constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/config/system_constants.h b/sakura_core/config/system_constants.h index 2e9ed365ab..c66120078c 100644 --- a/sakura_core/config/system_constants.h +++ b/sakura_core/config/system_constants.h @@ -555,7 +555,7 @@ -- バージョン1000以降を本家統合までの間、使わせてください。かなり頻繁に構成が変更されると思われるので。by kobake 2008.03.02 */ -constexpr unsigned N_SHAREDATA_VERSION = 177; +#define N_SHAREDATA_VERSION 177 #define STR_SHAREDATA_VERSION NUM_TO_STR(N_SHAREDATA_VERSION) #define GSTR_SHAREDATA (L"SakuraShareData" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION)) From cb15f71eb343c95b292010a630b73ba1eb6bdb99 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Mon, 2 May 2022 12:12:31 +0900 Subject: [PATCH 109/129] =?UTF-8?q?MinGW=E5=90=91=E3=81=91=5Fcom=5Fraise?= =?UTF-8?q?=5Ferror=E3=81=AE=E5=AE=9F=E8=A3=85=E3=82=92=E9=99=A4=E5=8E=BB?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MinGWに未実装のSDK関数を独自に定義して利用していましたが、 C:/msys64/mingw64/include/comdef.hにインライン実装されるようになったので独自定義を削除します。 --- sakura_core/basis/_com_raise_error.cpp | 35 -------------------------- 1 file changed, 35 deletions(-) delete mode 100644 sakura_core/basis/_com_raise_error.cpp diff --git a/sakura_core/basis/_com_raise_error.cpp b/sakura_core/basis/_com_raise_error.cpp deleted file mode 100644 index b0f281a852..0000000000 --- a/sakura_core/basis/_com_raise_error.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/*! @file */ -/* - Copyright (C) 2021-2022, Sakura Editor Organization - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; - you must not claim that you wrote the original software. - If you use this software in a product, an acknowledgment - in the product documentation would be appreciated but is - not required. - - 2. Altered source versions must be plainly marked as such, - and must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*/ -#include "StdAfx.h" -#include -#include - -/*! - MinGW向け_com_raise_error実装 - */ -void _com_raise_error(HRESULT hr, IErrorInfo* pErrorInfo) -{ - throw _com_error(hr, pErrorInfo, true); -} From a6f272bbff592d19707030bcb071bddee1673ad1 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Tue, 3 May 2022 12:41:06 +0900 Subject: [PATCH 110/129] =?UTF-8?q?=E3=83=88=E3=83=AC=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=8B=E3=82=89=E3=80=8C=E5=B1=A5?= =?UTF-8?q?=E6=AD=B4=E3=81=A8=E3=81=8A=E6=B0=97=E3=81=AB=E5=85=A5=E3=82=8A?= =?UTF-8?q?=E3=81=AE=E7=AE=A1=E7=90=86=E3=80=8D=E3=83=80=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=92=E9=96=8B=E3=81=91=E3=82=8B=E3=82=88?= =?UTF-8?q?=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 https://github.com/sakura-editor/sakura/pull/551 で追加したメニュー項目が機能していなかったのを修正します。 --- sakura_core/_main/CControlTray.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index b92e36eed8..81d8f250e1 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -33,6 +33,7 @@ #include "debug/CRunningTimer.h" #include "dlg/CDlgOpenFile.h" #include "dlg/CDlgAbout.h" //Nov. 21, 2000 JEPROtest +#include "dlg/CDlgFavorite.h" #include "dlg/CDlgWindowList.h" #include "plugin/CPluginManager.h" #include "plugin/CJackManager.h" @@ -900,6 +901,13 @@ LRESULT CControlTray::DispatchEvent( /* Grep */ DoGrep(); //Stonee, 2001/03/21 Grepを別関数に break; + case F_FAVORITE: + if (CDlgFavorite cDlgFavorite; + cDlgFavorite.GetHwnd() == nullptr) + { + cDlgFavorite.DoModal(m_hInstance, GetTrayHwnd(), (LPARAM)NULL); + } + break; case F_FILESAVEALL: // Jan. 24, 2005 genta 全て上書き保存 CAppNodeGroupHandle(0).PostMessageToAllEditors( WM_COMMAND, From 663a4afd3f11043263528b77384538cab34b7700 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Tue, 3 May 2022 14:41:42 +0900 Subject: [PATCH 111/129] =?UTF-8?q?memory=20leak=E3=81=AE=E8=AA=A4?= =?UTF-8?q?=E8=A8=98=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit コメントやドキュメントにある「メモリーリーク」を「メモリリーク」に修正します。 --- help/sakura/res/HLP_UR009.html | 2 +- help/sakura/res/HLP_UR010.html | 2 +- help/sakura/res/HLP_UR011.html | 2 +- help/sakura/res/HLP_UR014.html | 2 +- help/sakura/res/HLP_UR015.html | 2 +- help/sakura/res/HLP_UR016.html | 6 +++--- help/sakura/res/HLP_UR017.html | 2 +- installer/sinst_src/keyword/php.khp | 2 +- sakura_core/CGrepAgent.cpp | 2 +- sakura_core/config/build_config.h | 4 ++-- sakura_core/io/CFileLoad.cpp | 4 ++-- sakura_core/macro/CPPA.cpp | 4 ++-- sakura_core/view/CEditView.cpp | 2 +- sakura_core/view/CEditView_Mouse.cpp | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/help/sakura/res/HLP_UR009.html b/help/sakura/res/HLP_UR009.html index 7dbbf6de50..fb624e5587 100644 --- a/help/sakura/res/HLP_UR009.html +++ b/help/sakura/res/HLP_UR009.html @@ -275,7 +275,7 @@

変更履歴(2002/05/01～)

・GREPで巨大なファイルでも検索できるように(2GBまで)
・GREPで、ファイル検索またはキャンセルをすると、ファイルを閉じない
-・同上でメモリーを解放しない
+・同上でメモリを解放しない
・GREPで[単語単位]と[該当行]を選択した場合、ヒットしないことがまれにある
・GREP結果の該当する内容に NULL を含んでいる場合、NULLの前までしか表示しない
・GREP実行中ダイアログでファイル名の欄が変なときがある
diff --git a/help/sakura/res/HLP_UR010.html b/help/sakura/res/HLP_UR010.html index 9434db0615..9477e09601 100644 --- a/help/sakura/res/HLP_UR010.html +++ b/help/sakura/res/HLP_UR010.html @@ -36,7 +36,7 @@

変更履歴(2003/01/14～)

・Grepダイアログの「ファイル」欄が空欄の状態で検索したら「*.*」が指定されているとみなして全ファイル検索．(by もかさん)
・文字コードセットを自動選択にしたGrepでファイルが読み込みエラーになった場合にも読み込めなかったファイルがファイル数にカウントされるように．(by もかさん)
・CShareData::GetMacroName()の戻り値がローカル変数へのポインタを返すことがあったのを修正．(by もかさん)
-・CPPAのメモリーリークの修正とメモリー使用量削減．(by もかさん)
+・CPPAのメモリリークの修正とメモリ使用量削減．(by もかさん)
タスクトレイから新規エディタを開いたときのカレントディレクトリを最後に使われた存在するディレクトリに．(by げんた)
・改行コードにかかわらず(\rを入れなくても)正規表現の行末指定$がヒットするように．(by かろとさん)

diff --git a/help/sakura/res/HLP_UR011.html b/help/sakura/res/HLP_UR011.html index e6a9d11fd9..24862a8503 100644 --- a/help/sakura/res/HLP_UR011.html +++ b/help/sakura/res/HLP_UR011.html @@ -23,7 +23,7 @@

変更履歴(2003/06/26～)

・ALT+?にカーソルキーを割り当てるとALTを離すまで入力が二重になるのを修正．(もかさん)
・アクセス権限なし・フォルダを開きキャンセルをするとタブだけ残って消えるのを修正．(もかさん)
・D&Dでクリップボードが書き換わらないように．(もかさん)
-・D&Dでのグローバルメモリーのメモリーリークを修正．(もかさん)
+・D&Dでのグローバルメモリのメモリリークを修正．(もかさん)
・タブ表示，ファンクションキー上部表示でツールバーを表示すると画面にTABの残骸が残るのを修正．(もかさん)

[その他変更]
diff --git a/help/sakura/res/HLP_UR014.html b/help/sakura/res/HLP_UR014.html index f8348020c4..cde24a8979 100644 --- a/help/sakura/res/HLP_UR014.html +++ b/help/sakura/res/HLP_UR014.html @@ -42,7 +42,7 @@

Oct 17, 2010 (1.6.6.0)

  • 不要なコードの存在によりコンパイル時に警告が発生する (svn:1749 patches:2989036 dev:5671 なすこじ)
  • アウトライン解析（トグル）で「C 関数一覧」画面が閉じない (svn:1831 patches:3009187 dev:5675 ryoji)
  • 折り返し行インデントで折り返すとメモリを食い尽くす (svn:1832 patches:3025944 dev:5677 もか)
    • -
  • Undo/Redoでのメモリーリーク修正 (svn:1834 patches:3055719 もか)
    • +
  • Undo/Redoでのメモリリーク修正 (svn:1834 patches:3055719 もか)
  • チップウィンドウのリソースリーク修正 (svn:1835 patches:3056634 もか)
  • Grep結果画面の強調表示に単語単位が適用されていない (svn:1836 patches:3056638 dev:5685 unicode:1334 もか)
  • Grepの出力順が不正になることがある (svn:1836 patches:3056638 dev:5685 もか)
    • diff --git a/help/sakura/res/HLP_UR015.html b/help/sakura/res/HLP_UR015.html index 32e87fa6ef..a42b177f34 100644 --- a/help/sakura/res/HLP_UR015.html +++ b/help/sakura/res/HLP_UR015.html @@ -383,7 +383,7 @@

    Feb. 11, 2011 (2.0.0.0)

  • 行頭以外からの選択だと[折り返し位置に改行を付けてコピー]で最初の折り返しに改行が付かない (svn:1855 unicode:1418 ryoji)
  • [選択範囲内全行コピー]等の全行選択の挙動が不正 (svn:1854 unicode:1417 ryoji)
  • 画面上端よりも上にある矩形選択を解除するとルーラーが反転表示になる (svn:1851 unicode:1414 ryoji)
    • -
  • Grepでのメモリーリーク等の修正 (svn:1850 upatch:3064380 unicode:1413 ryoji, もか)
    • +
  • Grepでのメモリリーク等の修正 (svn:1850 upatch:3064380 unicode:1413 ryoji, もか)
  • 変換不具合の修正 (svn:1849 unicode:1412 ryoji)
  • 通常検索・置換で大文字小文字を区別しないと U+00e0-U+00fcとU+0020が同一視される (svn:1826 unicode:1397 wiki:BugReport/64 ryoji)
  • 標準ルール(テキスト)のアウトライン解析が行われない (svn:1823 unicode:1393 もか)
    • diff --git a/help/sakura/res/HLP_UR016.html b/help/sakura/res/HLP_UR016.html index d7e8212106..b22299afe4 100644 --- a/help/sakura/res/HLP_UR016.html +++ b/help/sakura/res/HLP_UR016.html @@ -76,7 +76,7 @@

    May. 18, 2014 (2.1.1.3)

    May. 5, 2014 (2.1.1.2)

    [バグ修正]
     [バグ修正]
      @@ -172,7 +172,7 @@

      Jan. 25, 2014 (2.1.1.0)

    • FUNCLISTの無駄な余白 (svn:3474 upatchid:698 LR4,novice)
    • リソーススクリプトのミスを修正(windressでエラー) (svn:3461 Moca)
    • 長いPATHでGrepするとバッファオーバーラン (svn:3467 upatchid:691 Moca)
      • -
    • 開く(ドロップダウン)の最近使ったフォルダのラベルがファイルになっている(r3447-) (svn:3478 upatchid:700 LR4,Moca)
      • +
    • 開く(ドロップダウン)の最近使ったフォルダーのラベルがファイルになっている(r3447-) (svn:3478 upatchid:700 LR4,Moca)
    • 下線が残ることがある (svn:3479 upatchid:696 Moca)
    • 「終了時、改行の一致を検査する」を「保存時…」に変更 (svn:3491 upatchid:471 Moca)
    • 保存時に改行コードの混在を警告するが欠けている (svn:3492 upatchid:471 Moca)
      • @@ -192,9 +192,9 @@

      Jan. 25, 2014 (2.1.1.0)

    • タブを閉じた後のウィンドウの変更 (svn:3545 upatchid:689 Moca)
    • MRUのタイプ別設定が基本だと適用されない (svn:3549 upatchid:732 Moca)
    • TypeIdがマイナスになることがある (svn:3550 upatchid:733 Moca)
      • -
    • Grepフォルダに;が含まれているとGrepフォルダがおかしい (svn:3551 upatchid:734 Moca)
      • +
    • Grepフォルダーに;が含まれているとGrepフォルダーがおかしい (svn:3551 upatchid:734 Moca)
    • ヘルプIDの修正 (svn:3552 upatchid:737 Moca)
      • -
    • 複数フォルダ指定時、カレントディレクトリ移動がおかしい (svn:3562 upatchid:742 Moca)
      • +
    • 複数フォルダー指定時、カレントディレクトリ移動がおかしい (svn:3562 upatchid:742 Moca)
    • OnMinMaxInfoの修正 (svn:3563 upatchid:740 Moca)
    • FileMapppingのハンドルが閉じられていない (svn:3564 upatchid:741 Moca)
    • PageUp/?PageDownの修正 (svn:3573 upatchid:749 Moca)
      • @@ -255,7 +255,7 @@

      Jul. 20, 2013 (2.1.0.0)

    • 矩形選択をメインメニューへ追加 (svn:3167 upatchid:602 Uchi)
    • TAB表示対応(文字指定/短い矢印/長い矢印) (svn:3168 upatchid:571 Request/436 novice)
    • ファイル比較/Diffでデフォルト選択をファイル名により決める (svn:3201 upatchid:623 Moca)
      • -
    • タグファイル作成/Grepのフォルダを1つ上にするボタンを追加 (svn:3202 upatchid:624 Moca)
      • +
    • タグファイル作成/Grepのフォルダーを1つ上にするボタンを追加 (svn:3202 upatchid:624 Moca)
    • 座標変換マクロで異常値のときマクロを中止する (svn:3235 upatchid:639 Moca)
    [バグ修正]
    @@ -268,7 +268,7 @@

    Jul. 20, 2013 (2.1.0.0)

  • 折り返し行でEOF直前で改行したときEOFが再描画されない(r2368-) (svn:3069 upatchid:503 BugReport/118 Moca)
  • 再帰時のOpeBlk問題（メモリリークとUndo/Redoバッファ破壊）の修正 (svn:3082 upatchid:479 Moca)
  • 背景画像表示とカーソル行背景色を設定しているとき対括弧強調表示がおかしい (svn:3083 upatchid:556 Moca)
    • -
  • Grepダイアログのファイル・フォルダの値修正 (svn:3084 upatchid:551 Request/267 Moca)
    • +
  • Grepダイアログのファイル・フォルダーの値修正 (svn:3084 upatchid:551 Request/267 Moca)
  • カラータブの色分け/表示が太字にかぶってる (svn:3085 upatchid:557 Moca)
  • 検索マーク無効にしたあとの検索で再描画が必要 (svn:3086 upatchid:561 Moca)
  • インデントプラグイン実行時に画面が更新されない (svn:3092 data:7657 syat)
    • @@ -296,7 +296,7 @@

    Jul. 20, 2013 (2.1.0.0)

  • コントロールコード入力のマクロ記録対応 (svn:3151 upatchid:598 Moca)
  • マクロ文字列のNUL文字列の修正 (svn:3161 svn:3165 upatchid:582 Moca)
  • ５つ以上の引数の修正 (svn:3161 upatchid:582 Moca)
    • -
  • ファイルダイアログ初期位置の指定フォルダに長いパスが編集できない (svn:3164 upatchid:601 Moca)
    • +
  • ファイルダイアログ初期位置の指定フォルダーに長いパスが編集できない (svn:3164 upatchid:601 Moca)
  • プログレスバーの進捗を正確にする (svn:3180 upatchid:592 Moca)
  • MinGW-W64コンパイルサポート (svn:3182 upatchid:591 Moca)
  • 最近使ったファイルに更新マークがつく (svn:3187 upatchid:609 Moca)
    • @@ -306,7 +306,7 @@

    Jul. 20, 2013 (2.1.0.0)

  • ソート・uniqの修正その2 (svn:3195 upatchid:610 Moca)
  • マクロExecCommandの引数がおかしい (svn:3196 upatchid:619 Moca)
  • ファイルを開いたときタイプ別フォントが適用されない (svn:3197 upatchid:620 Moca)
    • -
  • Grepフォルダの文字列長チェックが不正 (svn:3198 upatchid:625 Moca)
    • +
  • Grepフォルダーの文字列長チェックが不正 (svn:3198 upatchid:625 Moca)
  • 逆インデントでhwndProgressが初期化されていない (svn:3199 upatchid:626 Moca)
  • 印刷のロックで複数待機しているとデッドロック状態になる (svn:3200 upatchid:628 Moca)
  • 選択範囲の半透明で太線指定のときタブ文字等が太くなる (svn:3205 upatchid:631 Moca)
    • @@ -348,7 +348,7 @@

    May. 13, 2013 (2.0.8.1)

    May. 13, 2013 (2.0.8.0)

    [機能追加]
      -
    • バックアップ-指定フォルダのメタ文字列サポート (svn:2850 upatchid:422 novice)
      • +
    • バックアップ-指定フォルダーのメタ文字列サポート (svn:2850 upatchid:422 novice)
    • お気に入りダイアログで除外リストに追加を追加 (svn:2884 upatchid:395 Moca)
    • 「終了時、改行の一致を検査する」を追加 (svn:2887 upatchid:423 Uchi)
    • フォントサイズの拡大or縮小 (svn:2904 upatchid:398 novice)
      • diff --git a/help/sakura/res/HLP_UR017.html b/help/sakura/res/HLP_UR017.html index 81aecfc6f2..a94c7b27c0 100644 --- a/help/sakura/res/HLP_UR017.html +++ b/help/sakura/res/HLP_UR017.html @@ -23,7 +23,7 @@

      May. 2, 2017 (2.3.2.0)

    • アウトラインのツリーの逆順ソート追加 (svn:4138 upatchid:1038 Moca)
    • アウトライン解析ツリー表示の高速化 (svn:4156 upatchid:1056 Moca)
    • アウトラインメニューにすべて展開・縮小・ブックマーク削除・全削除を追加 (svn:4159 upatchid:1049 Moca)
      • -
    • Grepファイル・フォルダ長を512に拡張 (svn:4161 upatchid:1076 Moca)
      • +
    • Grepファイル・フォルダー長を512に拡張 (svn:4161 upatchid:1076 Moca)
    • マクロ保存でS_を追加しない (svn:4173 upatchid:943 Moca)
    • キーワードヘルプメニューのオプション (svn:4175 upatchid:1066 Moca)
      • @@ -35,7 +35,7 @@

      May. 2, 2017 (2.3.2.0)

    • Grepダイアログが言語切替でウィンドウサイズが変わらない (svn:4137 upatchid:1071 Moca)
    • キーボードでCPをチェックするとキーボードで操作できなくなる (svn:4139 upatchid:1084 Moca)
    • IO_ProfileのコマンドIDプラグイン名処理をまとめる (svn:4142 upatchid:1064 Moca)
      • -
    • 編集中ファイルからGrepのときサブフォルダ共通設定を上書きしない (svn:4147 upatchid:1032 Moca)
      • +
    • 編集中ファイルからGrepのときサブフォルダー共通設定を上書きしない (svn:4147 upatchid:1032 Moca)
    • アウトライン解析KR対策以降でANSIビルドエラーが出る (svn:4153 upatchid:1088 Moca)
    • Win10で無題のタブアイコンがGrepになる (svn:4154 upatchid:1080 LR4, Moca)
    • CUxThemeの保守修正パッチ (svn:4158 upatchid:1091 berryzplus)
      • @@ -285,7 +285,7 @@

      Feb. 22, 2015 (2.2.0.0)

    • DiffのSJIS以外に対応 (svn:3861 upatchid:636 Moca)
    • MinGWでのコンパイルエラー(-r3863) (svn:3863 upatchid:906 Moca)
    • VC2003プロジェクトファイル更新 (svn:3866 upatchid:915 Moca)
      • -
    • Diffのフォルダ名に.が含まれる場合のファイル選択の修正 (svn:3867 upatchid:910 Moca)
      • +
    • Diffのフォルダー名に.が含まれる場合のファイル選択の修正 (svn:3867 upatchid:910 Moca)
    • メインメニューのファイルツリーがundefinedになっている(r3865-) (svn:3868 upatchid:922 Moca)
    • 同一ウィンドウでGrepするとエラーになる(r3862-) (svn:3869 upatchid:918 Moca)
    • キャレットの更新でGetDrawSwitchフラグを見るように (svn:3871 upatchid:913 Moca)
      • diff --git a/installer/externals/readme.txt b/installer/externals/readme.txt index 324e906a79..6fd7ec1871 100644 --- a/installer/externals/readme.txt +++ b/installer/externals/readme.txt @@ -1,6 +1,6 @@ -外部の依存モジュールを入れるためのフォルダです。 +外部の依存モジュールを入れるためのフォルダーです。 -このフォルダ以下に入れるモジュールに対して readme を書く際には +このフォルダー以下に入れるモジュールに対して readme を書く際には GitHub での文字化けを防ぐため UTF-8 BOM 付きで保存してください。 Website アドレス、ライセンス、バイナリのアドレス、(オープンソースなら)ソースコード入手先を diff --git a/installer/sakura-common.iss b/installer/sakura-common.iss index 8852ea717c..8c83c126da 100644 --- a/installer/sakura-common.iss +++ b/installer/sakura-common.iss @@ -148,7 +148,7 @@ zh_hans.residentStartup=开机时启动(&R) zh_hant.residentStartup=開機時啟動(&R) en.IconPreferencefolder=Preference folder -ja.IconPreferencefolder=設定フォルダ +ja.IconPreferencefolder=設定フォルダー zh_hans.IconPreferencefolder=文件夹设置 zh_hant.IconPreferencefolder=資料夾設定 @@ -464,7 +464,7 @@ begin ( MultiUserPage.Values[0] = False ) then begin { - Program Files等のシステムフォルダへインストールする場合はUACを無効にしないと設定が保存できません。 + Program Files等のシステムフォルダーへインストールする場合はUACを無効にしないと設定が保存できません。 } selected := MsgBox( CustomMessage('MultiUser'), diff --git a/installer/sinst_src/keyword/HSP.KHP b/installer/sinst_src/keyword/HSP.KHP index a76e8ce679..da98544596 100644 --- a/installer/sinst_src/keyword/HSP.KHP +++ b/installer/sinst_src/keyword/HSP.KHP @@ -399,7 +399,7 @@ fxtget /// fxtget p1,"file" [hspext.dll]\np1=変数名 : 情報が格納され fxtset /// fxtset p1,"file" [hspext.dll]\np1=変数名 : 設定する情報が格納されている数値型の配列変数名\n"file"　　: ファイル名指定\n"file"で指定したファイルのタイムスタンプ情報を、\np1で指定した変数のものに変更します。 lzcopy /// lzcopy "name" [hspext.dll]\n"name" :圧縮ファイル名\nMicrosoftのcompress.exe形式の圧縮ファイルを解凍しながらコピーを\n行ないます。 lzdist /// lzdist "path" [hspext.dll]\n"path" :lzcopy命令の解凍コピー先ディレクトリ\nlzcopy命令の解凍コピー先ディレクトリを指定します。 -selfolder /// selfolder p1,"message" [hspext.dll]\np1=変数名 : 選択されたパス名が格納される文字列型の変数名\n"message" : ダイアログに表示される文字列\nWindowsのシステムで使用されている、フォルダ選択ダイアログを表示して、\nフォルダ名を取得します。 +selfolder /// selfolder p1,"message" [hspext.dll]\np1=変数名 : 選択されたパス名が格納される文字列型の変数名\n"message" : ダイアログに表示される文字列\nWindowsのシステムで使用されている、フォルダー選択ダイアログを表示して、\nフォルダー名を取得します。 ★ 拡張画面制御命令[hspext] gfcopy /// gfcopy p1 [hspext.dll]\np1=0～100(0) : 半透明コピーレート(%)\np1で指定したレートで画面イメージをコピーします。 diff --git a/installer/sinst_src/keyword/MortScript-readme.txt b/installer/sinst_src/keyword/MortScript-readme.txt index 92891fddbd..903e4396a4 100644 --- a/installer/sinst_src/keyword/MortScript-readme.txt +++ b/installer/sinst_src/keyword/MortScript-readme.txt @@ -40,7 +40,7 @@ MortScript.col 色設定ファイル ■使い方 同梱のファイルをサクラエディタのインストール先(C:\Program Files\sakura等) -の下の「keyword」フォルダに、すべてまとめてコピーしてください。 +の下の「keyword」フォルダーに、すべてまとめてコピーしてください。 以下、サクラエディタ上での設定例です。 メニューの「設定(&O)」から「共通設定(&C)」や「タイプ別設定一覧(&L)」など diff --git a/installer/sinst_src/keyword/MortScript.khp b/installer/sinst_src/keyword/MortScript.khp index 1c2de05d4a..f744239df3 100644 --- a/installer/sinst_src/keyword/MortScript.khp +++ b/installer/sinst_src/keyword/MortScript.khp @@ -27,7 +27,7 @@ CurrentCursor /// 現在のカーソルの種類を取得する DelTree /// サブディレクトリ以下のものを含む複数のファイルを消去する Delete /// デリートキー送信 Delete /// 複数のファイルを消去する -DirContents /// ディレクトリ中のファイル／フォルダ名を取得する +DirContents /// ディレクトリ中のファイル／フォルダー名を取得する Documents /// 「My Documents」。PPC2002機では働きません。 Download /// ダウンロード EULER /// "2.7182818284590452353602874713527"（e） で初期化されています。 diff --git a/installer/sinst_src/keyword/S_MACPPA.KHP b/installer/sinst_src/keyword/S_MACPPA.KHP index 2d1251d91f..d4dd022c9e 100644 --- a/installer/sinst_src/keyword/S_MACPPA.KHP +++ b/installer/sinst_src/keyword/S_MACPPA.KHP @@ -249,7 +249,7 @@ S_Replace /// void S_Replace ( S1 ， S2 ， i1 ) ；\n置換(実行)\n※ 置 S_ReplaceAll /// void S_ReplaceAll ( S1 ， S2 ， i1 ) ；\nすべて置換(実行)\n※ 置換ダイアログで [すべて置換(&A)] ボタンを押した時の動作。\n・[置換(&R)] ボタンを押した時の動作 → S_Replace ( ) ；\n・[上検索(&U)] ボタンを押した時の動作 → S_SearchPrev ( ) ；\n・[下検索(&D)] ボタンを押した時の動作 → S_SearchNext ( ) ；\n・[該当行マーク(&B)] ボタンを押した時の動作 → S_BookmarkPattern ( ) ；\n\nS1：文字列：置換前の文字列。※空文字列 (’’) は受け付けない。\nS2：文字列：置換後の文字列。\n\ni1：整数数値：置換ダイアログの状態を10進数数値で指定する。\n{\n それぞれの bit が 0=チェックOFF / 1=チェックON\n bit0：単語単位で探す\n bit1：英大文字と小文字を区別する\n bit2：正規表現\n bit3：見つからないときにメッセージを表示\n bit4：置換ダイアログを自動的に閉じる\n bit5：先頭（末尾）から再検索する\n bit6：クリップボードから貼り付ける\n\n bit7：0=ファイル全体 / 1=選択範囲\n bit9,8：00=選択文字 / 01=選択始点挿入 / 10=選択終点追加\n}\n※PPAのマクロ中では $41 などの 16進数表記や変数・数式・関数の\n　 使用も可能だが、MACのマクロ中では 65 などの 10進数の定数\n　 表記しか受け付けない。\n※bitでの指定方法が分からない場合は、文字列「bit」のキーワード\n　 ヘルプを参照して下さい。(「bit」と文字入力し、範囲選択する) S_SearchClearMark /// void S_SearchClearMark ( ) ；\n検索マークのクリア S_SearchStartPos /// void S_SearchStartPos ( ) ；\n検索開始位置へ戻る -S_Grep /// void S_Grep ( S1 ， S2 ， S3 ， i1 ) ；\nGrep\n\nS1：文字列：検索文字列\nS2：文字列：検索対象ファイル\nS3：文字列：検索対象フォルダ\n\ni1：整数数値：Grep ダイアログの状態を10進数数値で指定する。\n{\n それぞれの bit が 0=チェックOFF / 1=チェックON\n bit0：サブフォルダからも検索する\n bit1：- No Use -\n bit2：英大文字と小文字を区別する\n bit3：正規表現\n bit4：文字コードセット自動判別\n\n bit5：0=該当行 / 1=該当部分\n bit6：0=ノーマル / 1=ファイル毎\n}\n※PPAのマクロ中では $41 などの 16進数表記や変数・数式・関数の\n　 使用も可能だが、MACのマクロ中では 65 などの 10進数の定数\n　 表記しか受け付けない。\n※bitでの指定方法が分からない場合は、文字列「bit」のキーワード\n　 ヘルプを参照して下さい。(「bit」と文字入力し、範囲選択する) +S_Grep /// void S_Grep ( S1 ， S2 ， S3 ， i1 ) ；\nGrep\n\nS1：文字列：検索文字列\nS2：文字列：検索対象ファイル\nS3：文字列：検索対象フォルダー\n\ni1：整数数値：Grep ダイアログの状態を10進数数値で指定する。\n{\n それぞれの bit が 0=チェックOFF / 1=チェックON\n bit0：サブフォルダーからも検索する\n bit1：- No Use -\n bit2：英大文字と小文字を区別する\n bit3：正規表現\n bit4：文字コードセット自動判別\n\n bit5：0=該当行 / 1=該当部分\n bit6：0=ノーマル / 1=ファイル毎\n}\n※PPAのマクロ中では $41 などの 16進数表記や変数・数式・関数の\n　 使用も可能だが、MACのマクロ中では 65 などの 10進数の定数\n　 表記しか受け付けない。\n※bitでの指定方法が分からない場合は、文字列「bit」のキーワード\n　 ヘルプを参照して下さい。(「bit」と文字入力し、範囲選択する) S_Jump /// void S_Jump ( i1 ， i2 ) ；\n指定行ヘジャンプ\n\ni1：整数数値：ジャンプ先の行番号を10進数数値で指定する。\n\ni2：整数数値：指定行へジャンプ ダイアログの状態を10進数数値で指定する。\n{\n bit0：0=折り返し単位の行番号 / 1=改行単位の行番号\n bit1：PL/SQLコンパイルエラー行を処理する - 0=OFF / 1=ON\n}\n※PPAのマクロ中では $41 などの 16進数表記や変数・数式・関数の\n　 使用も可能だが、MACのマクロ中では 65 などの 10進数の定数\n　 表記しか受け付けない。\n※bitでの指定方法が分からない場合は、文字列「bit」のキーワード\n　 ヘルプを参照して下さい。(「bit」と文字入力し、範囲選択する) S_Outline /// void S_Outline ( ) ；\nアウトライン解析 S_TagJump /// void S_TagJump ( ) ；\nタグジャンプ機能 diff --git a/installer/sinst_src/keyword/bat_win2k.khp b/installer/sinst_src/keyword/bat_win2k.khp index 842863a6da..b614e3735e 100644 --- a/installer/sinst_src/keyword/bat_win2k.khp +++ b/installer/sinst_src/keyword/bat_win2k.khp @@ -4,12 +4,12 @@ ADDDRV /// キャラクタ型デバイスドライバを組み込みます.\n\nADDDRV [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 定義ファイルを指定します.\n ASSOC /// ファイル拡張子の関連付けを表示または変更します。\n\nASSOC [.拡張子[=[ファイルタイプ]]]\n\n .拡張子 ファイル タイプに関連付ける拡張子を指定します。\n ファイルタイプ 拡張子に関連付けるファイル タイプを指定します。\n\nパラメータを指定しないで ASSOC と入力すると、現在のファイルの関連付け\nを表示します。ファイル拡張子を指定して ASSOC を実行すると、そのファイル\n拡張子の現在のファイルの関連付けを表示します。ファイル タイプやコマンド\nを指定しないと、そのファイル拡張子の関連付けを削除します。\n AT /// AT コマンドは、指定された日時にコマンドとプログラムがコンピュータで\n実行されるようにスケジュールします。AT コマンドを使用するには、\nSchedule サービスが実行中でなければなりません。\n\nAT [\\コンピュータ名] [ [id] [/DELETE] | /DELETE [/YES]]\nAT [\\コンピュータ名] 時刻 [/INTERACTIVE]\n [ /EVERY:日付[,...] | /NEXT:日付[,...]] "コマンド"\n\n\\コンピュータ名 リモート コンピュータを指定します。このパラメータを\n 省略したときは、ローカル コンピュータでコマンドが\n スケジュールされます。\nid スケジュールされたコマンドに割り当てられた識別番号です。\n/delete スケジュールされたコマンドを取り消します。\n id を指定しなかったときは、コンピュータでスケジュール\n されているすべてのコマンドが取り消されます。\n/yes 確認せずにすべてのジョブ コマンドを取り消すときに\n 使用します。\n時刻 コマンドが実行される時刻を指定します。\n/interactive ジョブの実行中、ジョブはログオンしているユーザーの\n デスクトップとの対話を許可します。\n/every:日付[,...] 毎週指定した曜日に、または毎月指定した日にコマンドが\n 実行されます。\n 日付を省略したときは、その月の今日の日付が使用されます。\n/next:日付[,...] 指定したコマンドが次の日付 (たとえば、次の火曜日) に\n 実行されます。日付を省略したときは、その月の今日の日付が\n 使用されます。\n"コマンド" 実行する Windows NT コマンド、またはバッチ プログラム\n です。\n\n -ATTRIB /// ファイル属性を表示または変更します。\n\nATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [[ドライブ:] [パス] ファイル名]\n [/S [/D]]\n\n + 属性を設定します。\n - 属性を解除します。\n R 読み取り専用属性。\n A アーカイブ属性。\n S システム ファイル属性。\n H 隠しファイル属性。\n /S 現在のディレクトリとすべてのサブフォルダの一致するファイルを\n 処理します。\n /D フォルダも処理します。\n\n +ATTRIB /// ファイル属性を表示または変更します。\n\nATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [[ドライブ:] [パス] ファイル名]\n [/S [/D]]\n\n + 属性を設定します。\n - 属性を解除します。\n R 読み取り専用属性。\n A アーカイブ属性。\n S システム ファイル属性。\n H 隠しファイル属性。\n /S 現在のディレクトリとすべてのサブフォルダーの一致するファイルを\n 処理します。\n /D フォルダーも処理します。\n\n BREAK /// DOS システム上で Ctrl+C キーの拡張チェック機能を設定または解除します。\n\nこの機能は DOS システムとの互換性を維持するために用意されています。Windows 2000\n上では何も効果はありません。\n\nWindows 2000 プラットフォームでコマンド拡張機能を有効にして実行中の場合、\nデバッガによるデバッグ時に BREAK コマンドはハードコード ブレークポイント\nを入力します。\n CACLS /// ファイルのアクセス制御リスト(ACL) を表示または変更します。\n\nCACLS ファイル名 [/T] [/E] [/C] [/G ユーザー名:アクセス権] [/R ユーザー名 [...]]\n[/P ユーザー名:アクセス権 [...]] [/D ユーザー名 [...]]\n ファイル名 ACL を表示します。\n /T 現在のディレクトリとすべてのサブディレクトリにある\n 指定されたファイルの ACL を変更します。\n /E ACL を置き換えずに、ACL を編集します。\n /C アクセス拒否エラーを無視して、ACL の変更を続行します。\n /G ユーザー:アクセス権 \n 指定されたユーザーにアクセス権を与えます。\n アクセス権: R 読み取り\n W 書き込み\n C 変更 (書き込み)\n F フル コントロール\n /R ユーザー名 指定されたユーザーのアクセス権を失効させます。\n (/E オプションと共に使用)。\n /P ユーザー名:アクセス権\n 指定されたユーザーのアクセス権を置き換えます。\n アクセス権: N なし\n W 書き込み\n R 読み取り\n C 変更 (書き込み)\n F フル コントロール\n /D ユーザー名 指定されたユーザーのアクセスを拒否します。\n複数のファイルを指定するには、ワイルドカードを使用できます。\n複数のユーザーを指定できます。\nCALL /// バッチ プログラムを別のバッチ プログラムから呼び出します。\n\nCALL [ドライブ:][パス]ファイル名 [バッチパラメータ]\n\n バッチパラメータ バッチ プログラムで必要なコマンド ライン情報を指定します。\n\nコマンド拡張機能を有効にすると、CALL は次のように変更されます:\n\nCALL コマンドは、CALL のターゲットとしてラベルを受け付けるようになります。\n構文は、次のとおりです:\n\n CALL :ラベル 引数\n\n指定された引数で新しいバッチ ファイル コンテキストが作成され、指定\nされたラベルの次の文に制御が渡されます。バッチ スクリプト ファイルの\n最後に 2 回到達することによって、2 回 "終了" する必要があります。\n1 回目に最後に到達したときには、制御は CALL 文の次の行に返されます。\n2 回目に、バッチ スクリプトが終了します。バッチ スクリプトから "戻る"\nための GOTO :EOF 拡張機能の説明については、GOTO /? と入力してください。\n\nまた、バッチ スクリプトの引数参照 (%0、%1 など) の展開は、次のように\n変更されました:\n\n\n %* バッチ スクリプト内では、すべての引数 (%1、%2、%3、%4、\n %5 など) を参照します。\n\n バッチ パラメータ (%n) の置換は拡張されました。次のオプション構文\n を使うことができます:\n\n %~1 - すべての引用句 (") を削除して、\n %1 を展開します。\n %~f1 - %1 を完全修飾パス名に展開します。\n %~d1 - %1 をドライブ文字だけに展開します。\n %~p1 - %1 をパスだけに展開します。\n %~n1 - %1 をファイル名だけに展開します。\n %~x1 - %1 をファイル拡張子だけに展開します。\n %~s1 - 展開されたパスは、短い名前だけを含みます。\n %~a1 - %1 をファイル属性に展開します。\n %~t1 - %1 をファイルの日付/時刻に展開します。\n %~z1 - %1 をファイルのサイズに展開します。\n %~$PATH:1 - PATH 環境変数に指定されているディレクトリを\n 検索し、最初に見つかった完全修飾名に %1 を\n 展開します。環境変数名が定義されていない場合、\n または検索してもファイルが見つからなかった\n 場合は、この修飾子を指定すると空の文字列に\n 展開されます。\n\n 修飾子を組み合わせて、複合結果を得ることもできます:\n\n %~dp1 - %1 をドライブ文字とパスだけに展開します。\n %~nx1 - %1 をファイル名と拡張子だけに展開します。\n %~dp$PATH:1 - PATH 環境変数に指定されているディレクトリを\n 検索して %1 を探し、最初に見つかったファイル\n のドライブ文字とパスだけに展開します。\n %~ftza1 - %1 を DIR の出力行のように展開します。\n\n 上の例の %1 と PATH は、ほかの有効な値で置き換えることができ\n ます。%~ 構文は有効な引数の数によって区切られます。%~ 修飾子\n は %* と同時には使用できません。\n CHCP /// 現在のコード ページ番号を表示または設定します。\n\nCHCP [nnn]\n\n nnn コード ページ番号を指定します。\n\n現在のコード ページ番号を表示するときは、パラメータを指定せずに CHCP と入力してください。\n CHDIR,CD /// 現在のディレクトリを変更したり、ディレクトリ名を変更したりします。\n\nCHDIR [/D] [ドライブ:][パス]\nCHDIR [..]\nCD [/D] [ドライブ:][パス]\nCD [..]\n\n .. 親ディレクトリに変更するときに指定します。\n\nCD ドライブ: と入力すると指定されたドライブの現在のディレクトリが表示\nされます。パラメータを指定しないで CD と入力すると、現在のドライブと\nディレクトリが表示されます。\n\n現在のディレクトリだけでなく、現在のドライブも変更するには /D オプショ\nンを使用してください。\n\nコマンド拡張機能を有効にすると、CHDIR は次のように変更されます:\n\n現在のディレクトリの文字列に入力された大文字と小文字は、ディスク上の名前\nと同じになるように変換されます。たとえば、ディスク上のディレクトリ名が\nTemp である場合、CD C:\TEMP と入力すると、現在のディレクトリは C:\Temp\nに設定されます。\n\nCHDIR コマンドは空白を区切り文字として扱わなくなるため、空白文字を\n含むサブディレクトリ名を引用符で囲まなくても、そのサブディレクトリ\nに CD できるようになります。たとえば、\n\n cd \winnt\profiles\username\programs\start menu\n\nは、次と同じです:\n\n cd "\winnt\profiles\username\programs\start menu"\n\n拡張機能が無効である場合は、こちらを入力します。\n -CHKDSK /// ディスクをチェックし、現在の状態を表示します。\n\n\nCHKDSK [ボリューム[[パス]ファイル名]]] [/F] [/V] [/R] [/X] [/I] [/C] [/L[:サイズ]]\n\n\n ボリューム ドライブ文字 (文字の後にはコロンを付ける)、マウント\n ポイント、ボリューム名を指定します。\n ファイル名 FAT のみ: 断片化をチェックするファイルを\n 指定します。\n /F ディスクのエラーを修復します。\n /V FAT/FAT32:ディスクの全ファイルの完全なパスと名前を表示しま\n す。\n NTFS: クリーン アップ メッセージがあればそれも表示します。\n /R 不良セクタを見つけ、読み取り可能な情報を回復します。\n (/F を意味します)\n /L:サイズ NTFS のみ: ログ ファイル サイズを指定された KB 数に\n 変更します。サイズが指定されていないときは、現在のサイズ\n を表示します。\n /X 必要であれば、最初にボリュームを強制的にマウントを解除\n します。ボリュームへ開かれているすべてのハンドルは、無効\n になります。\n /I NTFS のみ: インデックス エントリのチェックを抑制して実施\n します。\n /C NTFS のみ; フォルダ構造内の周期的なチェックをスキップ\n します。\n\n/I または /C スイッチは、ボリュームのあるチェックをスキップして、Chkdsk の実\n行時間を短くします。\n\n +CHKDSK /// ディスクをチェックし、現在の状態を表示します。\n\n\nCHKDSK [ボリューム[[パス]ファイル名]]] [/F] [/V] [/R] [/X] [/I] [/C] [/L[:サイズ]]\n\n\n ボリューム ドライブ文字 (文字の後にはコロンを付ける)、マウント\n ポイント、ボリューム名を指定します。\n ファイル名 FAT のみ: 断片化をチェックするファイルを\n 指定します。\n /F ディスクのエラーを修復します。\n /V FAT/FAT32:ディスクの全ファイルの完全なパスと名前を表示しま\n す。\n NTFS: クリーン アップ メッセージがあればそれも表示します。\n /R 不良セクタを見つけ、読み取り可能な情報を回復します。\n (/F を意味します)\n /L:サイズ NTFS のみ: ログ ファイル サイズを指定された KB 数に\n 変更します。サイズが指定されていないときは、現在のサイズ\n を表示します。\n /X 必要であれば、最初にボリュームを強制的にマウントを解除\n します。ボリュームへ開かれているすべてのハンドルは、無効\n になります。\n /I NTFS のみ: インデックス エントリのチェックを抑制して実施\n します。\n /C NTFS のみ; フォルダー構造内の周期的なチェックをスキップ\n します。\n\n/I または /C スイッチは、ボリュームのあるチェックをスキップして、Chkdsk の実\n行時間を短くします。\n\n CHKNTFS /// CHKNTFS ボリューム [...]\nCHKNTFS /D\nCHKNTFS /T[:時間]\nCHKNTFS /X ボリューム [...]\nCHKNTFS /C ボリューム [...]\n\n ボリューム ドライブ文字 (文字の後にはコロンを付ける)、マウント\n ポイント、ボリューム名を指定します。\n /D コンピュータを既定の動作に戻します。\n 起動時にすべてのドライブを検査し、エラーがあったドライブに\n 対して CHKDSK を実行します。\n /T:時間 指定された時間を秒に変換して、AUTOCHK を開始するカウント\n ダウン時間へ設定します。\n 時間が指定されていなければ、現在の設定を表示します。\n /X ドライブを既定の起動時の検査から除外します。\n 除外するドライブは、このコマンドを実行するたびに指定する\n 必要があります。\n /C ブート時にドライブを検査するようにスケジュールします。\n ドライブにエラーがある場合、chkdsk が起動されます。\n\nスイッチが指定されていない場合、指定されたドライブにエラーがあるかどうか、\n次回の再起動で確認を行うようスケジュールされているかどうかを表示します。\n CIPHER /// NTFS パーティション上のディレクトリ [ファイル] の暗号化を表示または変更します。\n\n CIPHER [/E | /D] [/S:ディレクトリ] [/A] [/I] [/F] [/Q] [/H] [/K]\n [パス名 [...]]\n\n CIPHER /W:ディレクトリ\n\n /E 指定されたディレクトリを暗号化します。後で追加された\n ファイルが暗号化されるようにディレクトリをマークします。\n /D 指定されたディレクトリの暗号化を解除します。後で追加された\n ファイルが暗号化されないようにディレクトリをマークします。\n /S 指定されたディレクトリとすべてのサブディレクトリに\n 対して指定された操作を実行します。\n /A ファイルおよびディレクトリに対して操作を実行します。\n 親ディレクトリが暗号化されていない場合、暗号はファイルが\n 修正されると解除されます。ファイルと親ディレクトリの両方を\n 暗号化することをお勧めします。\n /I エラーが発生しても指定された操作を実行し続けます。既定では、\n エラーが発生すると CIPHER は停止されます。\n /F 暗号化済みのオブジェクトも含めて、指定されたすべてのオブジェ\n クトを強制的に暗号化します。既定では暗号化済みのオブジェ\n クトはスキップされます。\n /Q 重要な情報だけを報告します。\n /H 隠しファイルやシステム属性のファイルを表示します。\n 既定ではこれらのファイルは省略されます。\n /K CIPHER を実行しているユーザー用に新しいファイル暗号化キーを\n 作成します。このオプションが指定されると、その他のオプションは\n すべて無視されます。\n /W ボリュームで利用可能な未使用のディスクから、データを削除します。\n このオプションを選んだ場合は、ほかのオプションはすべて無視されま\n す。ローカル ボリューム上のどの場所にあるディレクトリでも指定す\n ることができます。ディレクトリがマウント ポイントである場合、\n または別のボリュームのディレクトリを指し示す場合は、そのボリュー\n ムのデータが削除されます。\n\n ディレクトリ ディレクトリのパスです。\n パス名 パターン、ファイル、またはディレクトリを指定します。\n\n パラメータを指定せずに CIPHER を実行すると、現在のディレクトリと\n ディレクトリに含まれるすべてのファイルの暗号化状態を表示します。\n 複数のディレクトリ名やワイルドカードを指定できます。複数のパラメータ\n を指定する場合は、パラメータをスペースで区切ってください。\n CLS /// 画面を消去します。\n\n @@ -84,7 +84,7 @@ START /// 指定されたプログラムまたはコマンドを実行するた SUBST /// パスをドライブ名に関連付けます。\n\nSUBST [ドライブ1: [ドライブ2:]パス]\nSUBST ドライブ1: /D\n\n ドライブ1: パスを割り当てる仮想ドライブを指定します。\n [ドライブ2:]パス 仮想ドライブに割り当てる物理ドライブとパスを指定します。\n /D 置換した (仮想) ドライブを削除します。\n\n現在の仮想ドライブ一覧を表示するときは、パラメータを指定せずに SUBST と入力してください。\n TIME /// システム時刻を表示または設定します。\n\nTIME [/T | 時刻]\n\nパラメータの指定がなければ、現在の設定が表示され、新しい時刻を入力できる\nプロンプトになります。変更しない場合は、Enter キーを押してください。\n\nコマンド拡張機能を有効にすると、TIME コマンドは、/T スイッチを\nサポートするようになります。このスイッチを指定すると、現在の時刻\nだけが表示され、新しい時刻を入力するためのプロンプトは表示されません。\n TITLE /// コマンド プロンプト ウィンドウのウィンドウ タイトルを設定します。\n\nTITLE [文字列]\n\n 文字列 コマンド プロンプト ウィンドウのタイトルを指定します。\n -TREE /// ドライブやパスのフォルダ構造を図式表示します。\n\nTREE [ドライブ:][パス] [/F] [/A]\n\n /F 各フォルダのファイル名を表示します。\n /A 拡張文字ではなく、ASCII 文字で表示します。\n\n +TREE /// ドライブやパスのフォルダー構造を図式表示します。\n\nTREE [ドライブ:][パス] [/F] [/A]\n\n /F 各フォルダーのファイル名を表示します。\n /A 拡張文字ではなく、ASCII 文字で表示します。\n\n TYPE /// テキスト ファイルまたはファイルの内容を表示します。\n\nTYPE [ドライブ:][パス]ファイル名\n VER /// Windows 2000 のバージョンを表示します。\n\nVER\n VERIFY /// ファイルがディスクに正しく書き込まれたことを照合するかどうかを\ncmd.exe に指示します。\n\nVERIFY [ON | OFF]\n\n現在の設定を表示するときは、パラメータを指定せずに VERIFY と入力してください。\n diff --git a/remove-redundant-blank-lines.py b/remove-redundant-blank-lines.py index 969663762c..2c7512cc44 100644 --- a/remove-redundant-blank-lines.py +++ b/remove-redundant-blank-lines.py @@ -37,7 +37,7 @@ def checkExtension(fileName): base, ext = os.path.splitext(fileName) return (ext in extensions) -# 引数で指定したフォルダ以下のすべての対象ファイルを yield で返す +# 引数で指定したフォルダー以下のすべての対象ファイルを yield で返す def checkAll(topDir): for rootdir, dirs, files in os.walk(topDir): for fileName in files: diff --git a/sakura_core/CBackupAgent.cpp b/sakura_core/CBackupAgent.cpp index 0643b1755b..eb9c80f689 100644 --- a/sakura_core/CBackupAgent.cpp +++ b/sakura_core/CBackupAgent.cpp @@ -297,7 +297,7 @@ int CBackupAgent::MakeBackUp( @date 2005.11.29 aroka MakeBackUpから分離．書式を元にバックアップファイル名を作成する機能追加 - @date 2013.04.15 novice 指定フォルダのメタ文字列展開サポート + @date 2013.04.15 novice 指定フォルダーのメタ文字列展開サポート @todo Advanced modeでの世代管理 */ @@ -319,21 +319,21 @@ bool CBackupAgent::FormatBackUpPath( _wsplitpath( target_file, szDrive, szDir, szFname, szExt ); if( bup_setting.m_bBackUpFolder - && (!bup_setting.m_bBackUpFolderRM || !IsLocalDrive( target_file ))) { /* 指定フォルダにバックアップを作成する */ // m_bBackUpFolderRM 追加 2010/5/27 Uchi + && (!bup_setting.m_bBackUpFolderRM || !IsLocalDrive( target_file ))) { /* 指定フォルダーにバックアップを作成する */ // m_bBackUpFolderRM 追加 2010/5/27 Uchi WCHAR selDir[_MAX_PATH]; CFileNameManager::ExpandMetaToFolder( bup_setting.m_szBackUpFolder, selDir, _countof(selDir) ); if (GetFullPathName(selDir, _MAX_PATH, szNewPath, &psNext) == 0) { // うまく取れなかった wcscpy( szNewPath, selDir ); } - /* フォルダの最後が半角かつ'\\'でない場合は、付加する */ + /* フォルダーの最後が半角かつ'\\'でない場合は、付加する */ AddLastYenFromDirectoryPath( szNewPath ); } else{ auto_sprintf( szNewPath, L"%s%s", szDrive, szDir ); } - /* 相対フォルダを挿入 */ + /* 相対フォルダーを挿入 */ if( !bup_setting.m_bBackUpPathAdvanced ){ __time64_t ltime = 0; struct tm result = {0}; @@ -463,7 +463,7 @@ bool CBackupAgent::FormatBackUpPath( { // make keys - // $0-$9に対応するフォルダ名を切り出し + // $0-$9に対応するフォルダー名を切り出し WCHAR keybuff[1024]; wcscpy( keybuff, szDir ); CutLastYenFromDirectoryPath( keybuff ); diff --git a/sakura_core/CGrepAgent.cpp b/sakura_core/CGrepAgent.cpp index b24fe97a61..da4c5e0a29 100644 --- a/sakura_core/CGrepAgent.cpp +++ b/sakura_core/CGrepAgent.cpp @@ -259,7 +259,7 @@ std::wstring CGrepAgent::ChopYen( const std::wstring& str ) std::wstring dst = str; size_t nPathLen = dst.length(); - // 最後のフォルダ区切り記号を削除する + // 最後のフォルダー区切り記号を削除する // [A:\]などのルートであっても削除 for(size_t i = 0; i < nPathLen; i++ ){ #ifdef _MBCS @@ -355,7 +355,7 @@ int GetHwndTitle(HWND& hWndTarget, CNativeW* pmemTitle, WCHAR* pszWindowName, WC @param[in] pcmGrepKey 検索パターン @param[in] pcmGrepFile 検索対象ファイルパターン(!で除外指定)) - @param[in] pcmGrepFolder 検索対象フォルダ + @param[in] pcmGrepFolder 検索対象フォルダー @date 2008.12.07 nasukoji ファイル名パターンのバッファオーバラン対策 @date 2008.12.13 genta 検索パターンのバッファオーバラン対策 @@ -626,9 +626,9 @@ DWORD CGrepAgent::DoGrep( cmemMessage += cmemWork; cmemMessage.AppendString( L"\r\n" ); - cmemMessage.AppendString( LS( STR_GREP_SEARCH_FOLDER ) ); //L"フォルダ " + cmemMessage.AppendString( LS( STR_GREP_SEARCH_FOLDER ) ); //L"フォルダー " { - // フォルダリストから末尾のバックスラッシュを削ったパスリストを作る + // フォルダーリストから末尾のバックスラッシュを削ったパスリストを作る std::list folders; std::transform( vPaths.cbegin(), vPaths.cend(), std::back_inserter( folders ), []( const auto& path ) { return ChopYen( path ); } ); std::wstring strPatterns = FormatPathList( folders ); @@ -645,9 +645,9 @@ DWORD CGrepAgent::DoGrep( } cmemMessage.AppendString(L"\r\n"); - cmemMessage.AppendString(LS(STR_GREP_EXCLUDE_FOLDER)); //L"除外フォルダ " + cmemMessage.AppendString(LS(STR_GREP_EXCLUDE_FOLDER)); //L"除外フォルダー " { - // 除外フォルダの解析済みリストを取得する + // 除外フォルダーの解析済みリストを取得する auto excludeFolders = cGrepEnumKeys.GetExcludeFolders(); std::wstring strPatterns = FormatPathList( excludeFolders ); cmemMessage.AppendString( strPatterns.c_str(), strPatterns.length() ); @@ -656,9 +656,9 @@ DWORD CGrepAgent::DoGrep( const wchar_t* pszWork; if( sGrepOption.bGrepSubFolder ){ - pszWork = LS( STR_GREP_SUBFOLDER_YES ); //L" (サブフォルダも検索)\r\n" + pszWork = LS( STR_GREP_SUBFOLDER_YES ); //L" (サブフォルダーも検索)\r\n" }else{ - pszWork = LS( STR_GREP_SUBFOLDER_NO ); //L" (サブフォルダを検索しない)\r\n" + pszWork = LS( STR_GREP_SUBFOLDER_NO ); //L" (サブフォルダーを検索しない)\r\n" } cmemMessage.AppendString( pszWork ); @@ -874,7 +874,7 @@ DWORD CGrepAgent::DoGrep( pCEditWnd->RedrawAllViews( NULL ); if( !bGrepCurFolder ){ - // 現行フォルダを検索したフォルダに変更 + // 現行フォルダーを検索したフォルダーに変更 if( 0 < vPaths.size() ){ ::SetCurrentDirectory( vPaths[0].c_str() ); } @@ -886,7 +886,7 @@ DWORD CGrepAgent::DoGrep( /*! @brief Grep実行 @date 2001.06.27 genta 正規表現ライブラリの差し替え - @date 2003.06.23 Moca サブフォルダ→ファイルだったのをファイル→サブフォルダの順に変更 + @date 2003.06.23 Moca サブフォルダー→ファイルだったのをファイル→サブフォルダーの順に変更 @date 2003.06.23 Moca ファイル名から""を取り除くように @date 2003.03.27 みく 除外ファイル指定の導入と重複検索防止の追加． 大部分が変更されたため，個別の変更点記入は無し． @@ -898,15 +898,15 @@ int CGrepAgent::DoGrepTree( const CNativeW& cmGrepReplace, CGrepEnumKeys& cGrepEnumKeys, //!< [in] 検索対象ファイルパターン CGrepEnumFiles& cGrepExceptAbsFiles, //!< [in] 除外ファイル絶対パス - CGrepEnumFolders& cGrepExceptAbsFolders, //!< [in] 除外フォルダ絶対パス + CGrepEnumFolders& cGrepExceptAbsFolders, //!< [in] 除外フォルダー絶対パス const WCHAR* pszPath, //!< [in] 検索対象パス - const WCHAR* pszBasePath, //!< [in] 検索対象パス(ベースフォルダ) + const WCHAR* pszBasePath, //!< [in] 検索対象パス(ベースフォルダー) const SSearchOption& sSearchOption, //!< [in] 検索オプション const SGrepOption& sGrepOption, //!< [in] Grepオプション const CSearchStringPattern& pattern, //!< [in] 検索パターン CBregexp* pRegexp, //!< [in] 正規表現コンパイルデータ。既にコンパイルされている必要がある int nNest, //!< [in] ネストレベル - bool& bOutputBaseFolder, //!< [i/o] ベースフォルダ名出力 + bool& bOutputBaseFolder, //!< [i/o] ベースフォルダー名出力 int* pnHitCount, //!< [i/o] ヒット数の合計 CNativeW& cmemMessage, //!< [i/o] Grep結果文字列 CNativeW& cUnicodeBuffer @@ -924,7 +924,7 @@ int CGrepAgent::DoGrepTree( cGrepEnumFilterFiles.Enumerates( pszPath, cGrepEnumKeys, cGrepEnumOptions, cGrepExceptAbsFiles ); /* - * カレントフォルダのファイルを探索する。 + * カレントフォルダーのファイルを探索する。 */ count = cGrepEnumFilterFiles.GetCount(); for( i = 0; i < count; i++ ){ @@ -1034,7 +1034,7 @@ int CGrepAgent::DoGrepTree( } /* - * サブフォルダを検索する。 + * サブフォルダーを検索する。 */ if( sGrepOption.bGrepSubFolder ){ CGrepEnumOptions cGrepEnumOptionsDir; @@ -1048,7 +1048,7 @@ int CGrepAgent::DoGrepTree( DWORD dwNow = ::GetTickCount(); if( dwNow - m_dwTickUICheck > UICHECK_INTERVAL_MILLISEC ) { m_dwTickUICheck = dwNow; - //サブフォルダの探索を再帰呼び出し。 + //サブフォルダーの探索を再帰呼び出し。 /* 処理中のユーザー操作を可能にする */ if( !::BlockingHook( pcDlgCancel->GetHwnd() ) ){ goto cancel_return; @@ -1063,7 +1063,7 @@ int CGrepAgent::DoGrepTree( ); } - //フォルダ名を作成する。 + //フォルダー名を作成する。 // 2010.08.01 キャンセルでメモリリークしてました std::wstring currentPath = pszPath; currentPath += L"\\"; @@ -1092,7 +1092,7 @@ int CGrepAgent::DoGrepTree( if( -1 == nGrepTreeResult ){ goto cancel_return; } - ::DlgItem_SetText( pcDlgCancel->GetHwnd(), IDC_STATIC_CURPATH, pszPath ); //@@@ 2002.01.10 add サブフォルダから戻ってきたら... + ::DlgItem_SetText( pcDlgCancel->GetHwnd(), IDC_STATIC_CURPATH, pszPath ); //@@@ 2002.01.10 add サブフォルダーから戻ってきたら... } } @@ -1319,8 +1319,8 @@ int CGrepAgent::DoGrepFile( CBregexp* pRegexp, //!< [in] 正規表現コンパイルデータ。既にコンパイルされている必要がある int* pnHitCount, //!< [i/o] ヒット数の合計．元々の値に見つかった数を加算して返す． const WCHAR* pszFullPath, //!< [in] 処理対象ファイルパス C:\Folder\SubFolder\File.ext - const WCHAR* pszBaseFolder, //!< [in] 検索フォルダ C:\Folder - const WCHAR* pszFolder, //!< [in] サブフォルダ SubFolder (!bGrepSeparateFolder) または C:\Folder\SubFolder (!bGrepSeparateFolder) + const WCHAR* pszBaseFolder, //!< [in] 検索フォルダー C:\Folder + const WCHAR* pszFolder, //!< [in] サブフォルダー SubFolder (!bGrepSeparateFolder) または C:\Folder\SubFolder (!bGrepSeparateFolder) const WCHAR* pszRelPath, //!< [in] 相対パス File.ext(bGrepSeparateFolder) または SubFolder\File.ext(!bGrepSeparateFolder) bool& bOutputBaseFolder, //!< bool& bOutputFolderName, //!< diff --git a/sakura_core/CGrepAgent.h b/sakura_core/CGrepAgent.h index b52f3b0a34..fc72db81c7 100644 --- a/sakura_core/CGrepAgent.h +++ b/sakura_core/CGrepAgent.h @@ -37,15 +37,15 @@ class CGrepEnumFolders; struct SGrepOption{ bool bGrepReplace; //!< Grep置換 - bool bGrepSubFolder; //!< サブフォルダからも検索する + bool bGrepSubFolder; //!< サブフォルダーからも検索する bool bGrepStdout; //!< 標準出力モード bool bGrepHeader; //!< ヘッダー・フッター表示 ECodeType nGrepCharSet; //!< 文字コードセット選択 int nGrepOutputLineType; //!< 0:ヒット部分を出力, 1: ヒット行を出力, 2: 否ヒット行を出力 int nGrepOutputStyle; //!< 出力形式 1: Normal, 2: WZ風(ファイル単位) 3: 結果のみ bool bGrepOutputFileOnly; //!< ファイル毎最初のみ検索 - bool bGrepOutputBaseFolder; //!< ベースフォルダ表示 - bool bGrepSeparateFolder; //!< フォルダ毎に表示 + bool bGrepOutputBaseFolder; //!< ベースフォルダー表示 + bool bGrepSeparateFolder; //!< フォルダー毎に表示 bool bGrepPaste; //!< Grep置換：クリップボードから貼り付ける bool bGrepBackup; //!< Grep置換：バックアップ @@ -96,8 +96,8 @@ class CGrepAgent : public CDocListenerEx{ int nGrepOutputLineType, int nGrepOutputStyle, bool bGrepOutputFileOnly, //!< [in] ファイル毎最初のみ出力 - bool bGrepOutputBaseFolder, //!< [in] ベースフォルダ表示 - bool bGrepSeparateFolder, //!< [in] フォルダ毎に表示 + bool bGrepOutputBaseFolder, //!< [in] ベースフォルダー表示 + bool bGrepSeparateFolder, //!< [in] フォルダー毎に表示 bool bGrepPaste, bool bGrepBackup ); diff --git a/sakura_core/CGrepEnumFileBase.h b/sakura_core/CGrepEnumFileBase.h index 11374a9e4f..88a8229332 100644 --- a/sakura_core/CGrepEnumFileBase.h +++ b/sakura_core/CGrepEnumFileBase.h @@ -122,7 +122,7 @@ class CGrepEnumFileBase { wcscpy( lpPath, lpBaseFolder ); wcscpy( lpPath + baseLen, L"\\" ); wcscpy( lpPath + baseLen + 1, vecKeys[ i ] ); - // vecKeys[ i ] ==> "subdir\*.h" 等の場合に後で(ファイル|フォルダ)名に "subdir\" を連結する + // vecKeys[ i ] ==> "subdir\*.h" 等の場合に後で(ファイル|フォルダー)名に "subdir\" を連結する const WCHAR* keyDirYen = wcsrchr( vecKeys[ i ], L'\\' ); const WCHAR* keyDirSlash = wcsrchr( vecKeys[ i ], L'/' ); const WCHAR* keyDir; @@ -166,7 +166,7 @@ class CGrepEnumFileBase { m_vpItems.push_back( PairGrepEnumItem( lpName, w32fd.nFileSizeLow ) ); found++; // 2011.11.19 if( pExceptItems && nKeyDirLen ){ - // フォルダを含んだパスなら検索済みとして除外指定に追加する + // フォルダーを含んだパスなら検索済みとして除外指定に追加する pExceptItems->m_vpItems.push_back( PairGrepEnumItem( lpFullPath, w32fd.nFileSizeLow ) ); }else{ delete [] lpFullPath; diff --git a/sakura_core/CGrepEnumKeys.h b/sakura_core/CGrepEnumKeys.h index 2cd02358de..798ff6456e 100644 --- a/sakura_core/CGrepEnumKeys.h +++ b/sakura_core/CGrepEnumKeys.h @@ -78,7 +78,7 @@ class CGrepEnumKeys { return excludeFiles; } - // 除外フォルダの2つの解析済み配列から1つのリストを作る + // 除外フォルダーの2つの解析済み配列から1つのリストを作る auto GetExcludeFolders() const -> std::list { std::list excludeFolders; const auto& folderKeys = m_vecExceptFolderKeys; @@ -89,7 +89,7 @@ class CGrepEnumKeys { } int SetFileKeys( LPCWSTR lpKeys ){ - const WCHAR* WILDCARD_ANY = L"*.*"; //サブフォルダ探索用 + const WCHAR* WILDCARD_ANY = L"*.*"; //サブフォルダー探索用 ClearItems(); std::vector< wstring > patterns = SplitPattern(lpKeys); @@ -158,8 +158,8 @@ class CGrepEnumKeys { } /*! - @brief 除外フォルダパターンを追加する - @param[in] lpKeys 除外フォルダパターン + @brief 除外フォルダーパターンを追加する + @param[in] lpKeys 除外フォルダーパターン */ int AddExceptFolder(LPCWSTR lpKeys) { return ParseAndAddException(lpKeys, m_vecExceptFolderKeys, m_vecExceptAbsFolderKeys); @@ -242,7 +242,7 @@ class CGrepEnumKeys { /* @retval 0 正常終了 - @retval 1 *\file.exe などのフォルダ部分でのワイルドカードはエラー + @retval 1 *\file.exe などのフォルダー部分でのワイルドカードはエラー */ int ValidateKey( LPCWSTR key ){ // diff --git a/sakura_core/CLoadAgent.cpp b/sakura_core/CLoadAgent.cpp index b045f43012..a2d2b4bcb6 100644 --- a/sakura_core/CLoadAgent.cpp +++ b/sakura_core/CLoadAgent.cpp @@ -48,13 +48,13 @@ ECallbackResult CLoadAgent::OnCheckLoad(SLoadInfo* pLoadInfo) // リロード要求の場合は、継続。 if(pLoadInfo->bRequestReload)goto next; - //フォルダが指定された場合は「ファイルを開く」ダイアログを表示し、実際のファイル入力を促す + //フォルダーが指定された場合は「ファイルを開く」ダイアログを表示し、実際のファイル入力を促す if( IsDirectory(pLoadInfo->cFilePath) ){ std::vector files; SLoadInfo sLoadInfo(L"", CODE_AUTODETECT, false); bool bDlgResult = pcDoc->m_cDocFileOperation.OpenFileDialog( CEditWnd::getInstance()->GetHwnd(), - pLoadInfo->cFilePath, //指定されたフォルダ + pLoadInfo->cFilePath, //指定されたフォルダー &sLoadInfo, files ); diff --git a/sakura_core/CProfile.cpp b/sakura_core/CProfile.cpp index fb3eba5242..3c98157985 100644 --- a/sakura_core/CProfile.cpp +++ b/sakura_core/CProfile.cpp @@ -53,11 +53,11 @@ void EnsureDirectoryExist( const std::wstring& strProfileName ) { const size_t cchLastYen = strProfileName.find_last_of( L'\\' ); if( cchLastYen != std::wstring::npos && cchLastYen < strProfileName.length() && cchLastYen + 1 < _MAX_PATH ){ - // フォルダのパスを取得する + // フォルダーのパスを取得する WCHAR szProfileFolder[_MAX_PATH]{ 0 }; ::wcsncpy_s( szProfileFolder, strProfileName.data(), cchLastYen + 1 ); - // フォルダが存在しなければ作成する + // フォルダーが存在しなければ作成する if( !IsDirectory( szProfileFolder ) ){ MakeSureDirectoryPathExistsW( szProfileFolder ); } diff --git a/sakura_core/CSelectLang.cpp b/sakura_core/CSelectLang.cpp index 8a246b0206..ed04c34239 100644 --- a/sakura_core/CSelectLang.cpp +++ b/sakura_core/CSelectLang.cpp @@ -131,7 +131,7 @@ HINSTANCE CSelectLang::InitializeLanguageEnvironment( void ) //カレントディレクトリを保存。関数から抜けるときに自動でカレントディレクトリは復元される。 CCurrentDirectoryBackupPoint cCurDirBackup; ChangeCurrentDirectoryToExeDir(); -// ★iniまたはexeフォルダとなるように改造が必要 +// ★iniまたはexeフォルダーとなるように改造が必要 WIN32_FIND_DATA w32fd; WCHAR szPath[] = L"sakura_lang_*.dll"; // サーチするメッセージリソースDLL @@ -139,7 +139,7 @@ HINSTANCE CSelectLang::InitializeLanguageEnvironment( void ) BOOL result = (INVALID_HANDLE_VALUE != handle) ? TRUE : FALSE; while( result ){ - if( ! (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ){ //フォルダでない + if( ! (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ){ //フォルダーでない // バッファに登録する。 psLangInfo = new SSelLangInfo(); wcscpy( psLangInfo->szDllName, w32fd.cFileName ); diff --git a/sakura_core/CSortedTagJumpList.cpp b/sakura_core/CSortedTagJumpList.cpp index 4780df477b..fcdc2b9d38 100644 --- a/sakura_core/CSortedTagJumpList.cpp +++ b/sakura_core/CSortedTagJumpList.cpp @@ -86,7 +86,7 @@ void CSortedTagJumpList::Empty( void ) } /* - 基準フォルダを登録し、基準フォルダIDを取得 + 基準フォルダーを登録し、基準フォルダーIDを取得 @date 2010.07.23 Moca 新規追加 */ int CSortedTagJumpList::AddBaseDir( const WCHAR* baseDir ) @@ -106,7 +106,7 @@ int CSortedTagJumpList::AddBaseDir( const WCHAR* baseDir ) @param[in] type 種類 @param[in] note 備考 @param[in] depth (さかのぼる)階層 - @param[in] baseDirId 基準フォルダID。0で空文字列指定 (AddBaseDirの戻り値) + @param[in] baseDirId 基準フォルダーID。0で空文字列指定 (AddBaseDirの戻り値) @retval TRUE 追加した @retval FALSE 追加失敗 @date 2010.07.23 Moca baseDirId 追加 @@ -168,7 +168,7 @@ BOOL CSortedTagJumpList::AddParamA( const ACHAR* keyword, const ACHAR* filename, @param[out] type 種類 @param[out] note 備考 @param[out] depth (さかのぼる)階層 - @param[out] baseDir ファイル名の基準フォルダ + @param[out] baseDir ファイル名の基準フォルダー @return 処理結果 @note 不要な情報の場合は引数に NULL を指定する。 diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 61892ca740..631616153e 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -19,7 +19,7 @@ // [参考] // 10000- : ウィンドウ一覧で使用する // 11000- : 最近使ったファイルで使用する -// 12000- : 最近使ったフォルダで使用する +// 12000- : 最近使ったフォルダーで使用する //enum EFunctionCode{ @@ -49,7 +49,7 @@ F_PLUGCOMMAND_LAST = 21999, // Main Menu 特殊機能 F_WINDOW_LIST = 29001, // ウィンドウリスト F_FILE_USED_RECENTLY = 29002, // 最近使ったファイル -F_FOLDER_USED_RECENTLY = 29003, // 最近使ったフォルダ +F_FOLDER_USED_RECENTLY = 29003, // 最近使ったフォルダー F_CUSTMENU_LIST = 29004, // カスタムメニューリスト F_USERMACRO_LIST = 29005, // 登録済みマクロリスト F_PLUGIN_LIST = 29006, // プラグインコマンドリスト @@ -260,7 +260,7 @@ F_COPYPATH = 30620, //このファイルのパス名をクリップボード F_COPYTAG = 30621, //このファイルのパス名とカーソル位置をコピー なし F_COPYFNAME = 30622, //このファイル名をクリップボードにコピー なし F_CREATEKEYBINDLIST = 30630, //キー割り当て一覧をコピー なし -F_COPYDIRPATH = 30631, //このファイルのフォルダ名をクリップボードにコピー なし +F_COPYDIRPATH = 30631, //このファイルのフォルダー名をクリップボードにコピー なし // 挿入系 @@ -269,7 +269,7 @@ 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, // 最近使ったフォルダ挿入 +F_INS_FOLDER_USED_RECENTLY = 30795, // 最近使ったフォルダー挿入 // 変換系 @@ -552,7 +552,7 @@ F_COMPAREVERSION = 40029, // バージョン番号の比較 F_MACROSLEEP = 40030, // 指定した時間（ミリ秒）停止 F_FILEOPENDIALOG = 40031, // ファイルを開くダイアログの表示 F_FILESAVEDIALOG = 40032, // ファイルを保存ダイアログの表示 -F_FOLDERDIALOG = 40033, // フォルダを開くダイアログの表示 +F_FOLDERDIALOG = 40033, // フォルダーを開くダイアログの表示 F_GETCLIPBOARD = 40034, // クリップボードの文字列を取得 F_SETCLIPBOARD = 40035, // クリップボードに文字列を設定 F_LAYOUTTOLOGICLINENUM = 40036, // ロジック行番号取得 diff --git a/sakura_core/GrepInfo.h b/sakura_core/GrepInfo.h index 5f24537af0..f568d8b876 100644 --- a/sakura_core/GrepInfo.h +++ b/sakura_core/GrepInfo.h @@ -42,18 +42,18 @@ struct GrepInfo { CNativeW cmGrepKey; //!< 検索キー CNativeW cmGrepRep; //!< 置換キー CNativeW cmGrepFile; //!< 検索対象ファイル - CNativeW cmGrepFolder; //!< 検索対象フォルダ + CNativeW cmGrepFolder; //!< 検索対象フォルダー SSearchOption sGrepSearchOption; //!< 検索オプション bool bGrepCurFolder; //!< カレントディレクトリを維持 bool bGrepStdout; //!< 標準出力モード bool bGrepHeader; //!< ヘッダー情報表示 - bool bGrepSubFolder; //!< サブフォルダを検索する + bool bGrepSubFolder; //!< サブフォルダーを検索する ECodeType nGrepCharSet; //!< 文字コードセット int nGrepOutputStyle; //!< 結果出力形式 int nGrepOutputLineType; //!< 結果出力：行を出力/該当部分/否マッチ行 bool bGrepOutputFileOnly; //!< ファイル毎最初のみ検索 - bool bGrepOutputBaseFolder; //!< ベースフォルダ表示 - bool bGrepSeparateFolder; //!< フォルダ毎に表示 + bool bGrepOutputBaseFolder; //!< ベースフォルダー表示 + bool bGrepSeparateFolder; //!< フォルダー毎に表示 bool bGrepReplace; //!< Grep置換 bool bGrepPaste; //!< クリップボードから貼り付け bool bGrepBackup; //!< 置換でバックアップを保存 diff --git a/sakura_core/_main/CCommandLine.cpp b/sakura_core/_main/CCommandLine.cpp index 3b39bfdd47..f6950a5be4 100644 --- a/sakura_core/_main/CCommandLine.cpp +++ b/sakura_core/_main/CCommandLine.cpp @@ -54,7 +54,7 @@ #define CMDLINEOPT_WY 10 //!< ウィンドウ左上のY座標 #define CMDLINEOPT_GKEY 101 //!< Grepの検索文字列 #define CMDLINEOPT_GFILE 102 //!< Grepの検索対象のファイル -#define CMDLINEOPT_GFOLDER 103 //!< Grepの検索対象のフォルダ +#define CMDLINEOPT_GFOLDER 103 //!< Grepの検索対象のフォルダー #define CMDLINEOPT_GOPT 104 //!< Grepの条件 #define CMDLINEOPT_GCODE 105 //!< Grepでの文字コードを指定 #define CMDLINEOPT_M 106 //!< 起動時に実行するマクロのファイル名を指定 @@ -446,7 +446,7 @@ void CCommandLine::ParseCommandLine( LPCWSTR pszCmdLineSrc, bool bResponse ) case 'H': m_gi.bGrepHeader = false; break; case 'S': - // サブフォルダからも検索する + // サブフォルダーからも検索する m_gi.bGrepSubFolder = true; break; case 'L': // 英大文字と英小文字を区別する diff --git a/sakura_core/_main/CControlProcess.cpp b/sakura_core/_main/CControlProcess.cpp index dfbe16133e..64a058f0c9 100644 --- a/sakura_core/_main/CControlProcess.cpp +++ b/sakura_core/_main/CControlProcess.cpp @@ -42,7 +42,7 @@ std::filesystem::path CControlProcess::GetIniFileName() const auto iniPath = GetExeFileName().replace_extension(L".ini"); // マルチユーザー用のiniファイルパス - // exeと同じフォルダに置かれたマルチユーザー構成設定ファイル（sakura.exe.ini）の内容 + // exeと同じフォルダーに置かれたマルチユーザー構成設定ファイル（sakura.exe.ini）の内容 // に従ってマルチユーザー用のiniファイルパスを決める auto exeIniPath = GetExeFileName().concat(L".ini"); if (bool isMultiUserSeggings = ::GetPrivateProfileInt(L"Settings", L"MultiUser", 0, exeIniPath.c_str()); isMultiUserSeggings) { @@ -67,16 +67,16 @@ std::filesystem::path CControlProcess::GetPrivateIniFileName(const std::wstring& KNOWNFOLDERID refFolderId; switch (int nFolder = ::GetPrivateProfileInt(L"Settings", L"UserRootFolder", 0, exeIniPath.c_str())) { case 1: - refFolderId = FOLDERID_Profile; // ユーザーのルートフォルダ + refFolderId = FOLDERID_Profile; // ユーザーのルートフォルダー break; case 2: - refFolderId = FOLDERID_Documents; // ユーザーのドキュメントフォルダ + refFolderId = FOLDERID_Documents; // ユーザーのドキュメントフォルダー break; case 3: - refFolderId = FOLDERID_Desktop; // ユーザーのデスクトップフォルダ + refFolderId = FOLDERID_Desktop; // ユーザーのデスクトップフォルダー break; default: - refFolderId = FOLDERID_RoamingAppData; // ユーザーのアプリケーションデータフォルダ + refFolderId = FOLDERID_RoamingAppData; // ユーザーのアプリケーションデータフォルダー break; } diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index 81d8f250e1..6132f84002 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -87,13 +87,13 @@ void CControlTray::DoGrep() wcscpy( m_cDlgGrep.m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* 検索ファイル */ } if( 0 < m_pShareData->m_sSearchKeywords.m_aGrepFolders.size() ){ - wcscpy( m_cDlgGrep.m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダ */ + wcscpy( m_cDlgGrep.m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダー */ } if (0 < m_pShareData->m_sSearchKeywords.m_aExcludeFiles.size()) { wcscpy(m_cDlgGrep.m_szExcludeFile, m_pShareData->m_sSearchKeywords.m_aExcludeFiles[0]); /* 除外ファイル */ } if (0 < m_pShareData->m_sSearchKeywords.m_aExcludeFolders.size()) { - wcscpy(m_cDlgGrep.m_szExcludeFolder, m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0]); /* 除外フォルダ */ + wcscpy(m_cDlgGrep.m_szExcludeFolder, m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0]); /* 除外フォルダー */ } /* Grepダイアログの表示 */ @@ -138,7 +138,7 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep& //GOPTオプション WCHAR pOpt[64] = L""; - if( cDlgGrep.m_bSubFolder )wcscat( pOpt, L"S" ); // サブフォルダからも検索する + if( cDlgGrep.m_bSubFolder )wcscat( pOpt, L"S" ); // サブフォルダーからも検索する if( cDlgGrep.m_sSearchOption.bLoHiCase )wcscat( pOpt, L"L" ); // 英大文字と英小文字を区別する if( cDlgGrep.m_sSearchOption.bRegularExp )wcscat( pOpt, L"R" ); // 正規表現 if( cDlgGrep.m_nGrepOutputLineType == 1 )wcscat( pOpt, L"P" ); // 行を出力する @@ -1544,7 +1544,7 @@ int CControlTray::CreatePopUpMenu_L( void ) int nEnable = (cMRU.MenuLength() > 0 ? 0 : MF_GRAYED); m_cMenuDrawer.MyAppendMenu( hMenu, MF_BYPOSITION | MF_STRING | MF_POPUP | nEnable, (UINT_PTR)hMenuPopUp , LS( F_FILE_RCNTFILE_SUBMENU ), L"F" ); - /* 最近使ったフォルダのメニューを作成 */ + /* 最近使ったフォルダーのメニューを作成 */ //@@@ 2001.12.26 YAZAKI OPENFOLDERリストは、CMRUFolderにすべて依頼する const CMRUFolder cMRUFolder; hMenuPopUp = cMRUFolder.CreateMenu( &m_cMenuDrawer ); diff --git a/sakura_core/_main/CNormalProcess.cpp b/sakura_core/_main/CNormalProcess.cpp index ef01557d5d..90a0a3320a 100644 --- a/sakura_core/_main/CNormalProcess.cpp +++ b/sakura_core/_main/CNormalProcess.cpp @@ -245,7 +245,7 @@ bool CNormalProcess::InitializeProcess() CNativeW cmemGrepFolder = gi.cmGrepFolder; if( gi.cmGrepFolder.GetStringLength() < MAX_GREP_PATH ){ CSearchKeywordManager().AddToGrepFolderArr( gi.cmGrepFolder.GetStringPtr() ); - // 2013.05.21 指定なしの場合はカレントフォルダにする + // 2013.05.21 指定なしの場合はカレントフォルダーにする if( cmemGrepFolder.GetStringLength() == 0 ){ WCHAR szCurDir[_MAX_PATH]; ::GetCurrentDirectory( _countof(szCurDir), szCurDir ); @@ -272,7 +272,7 @@ bool CNormalProcess::InitializeProcess() wcsncpy( pEditWnd->m_cDlgGrep.m_szFile, gi.cmGrepFile.GetStringPtr(), nSize ); /* 検索ファイル */ pEditWnd->m_cDlgGrep.m_szFile[nSize-1] = L'\0'; nSize = _countof2(pEditWnd->m_cDlgGrep.m_szFolder); - wcsncpy( pEditWnd->m_cDlgGrep.m_szFolder, cmemGrepFolder.GetStringPtr(), nSize ); /* 検索フォルダ */ + wcsncpy( pEditWnd->m_cDlgGrep.m_szFolder, cmemGrepFolder.GetStringPtr(), nSize ); /* 検索フォルダー */ pEditWnd->m_cDlgGrep.m_szFolder[nSize-1] = L'\0'; // Feb. 23, 2003 Moca Owner windowが正しく指定されていなかった diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 41a3b7af35..0a7359c1c7 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -382,7 +382,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_COPYDIRPATH: Command_COPYDIRPATH();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; //選択範囲内全行引用符付きコピー @@ -398,7 +398,7 @@ BOOL CViewCommander::HandleCommand( 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_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 fecbda581f..d11a419d6e 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -229,7 +229,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_COPYDIRPATH( void ); /* このファイルのフォルダ名をクリップボードにコピー */ + void Command_COPYDIRPATH( void ); /* このファイルのフォルダー名をクリップボードにコピー */ void Command_COPYTAG( void ); /* このファイルのパス名とカーソル位置をコピー */ void Command_COPYLINES( void ); /* 選択範囲内全行コピー */ void Command_COPYLINESASPASSAGE( void ); /* 選択範囲内全行引用符付きコピー */ @@ -244,7 +244,7 @@ class CViewCommander{ 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_INS_FOLDER_USED_RECENTLY( void ); //最近使ったフォルダー挿入 /* 変換系 */ void Command_TOLOWER( void ); /* 小文字 */ diff --git a/sakura_core/cmd/CViewCommander_Clipboard.cpp b/sakura_core/cmd/CViewCommander_Clipboard.cpp index 031f1b52c0..8c383f804c 100644 --- a/sakura_core/cmd/CViewCommander_Clipboard.cpp +++ b/sakura_core/cmd/CViewCommander_Clipboard.cpp @@ -1121,7 +1121,7 @@ void CViewCommander::Command_COPYPATH( void ) } } -/* 現在編集中のファイルのフォルダ名をクリップボードにコピー */ +/* 現在編集中のファイルのフォルダー名をクリップボードにコピー */ void CViewCommander::Command_COPYDIRPATH( void ) { if (!GetDocument()->m_cDocFile.GetFilePathClass().IsValidPath()) { @@ -1138,7 +1138,7 @@ void CViewCommander::Command_COPYDIRPATH( void ) strFolder.erase(itrClear); } - /* クリップボードにフォルダ名をコピー */ + /* クリップボードにフォルダー名をコピー */ m_pCommanderView->MySetClipboardData( strFolder.c_str(), strFolder.size(), false ); } diff --git a/sakura_core/cmd/CViewCommander_File.cpp b/sakura_core/cmd/CViewCommander_File.cpp index 0fc84c8c7c..2b74ada4cf 100644 --- a/sakura_core/cmd/CViewCommander_File.cpp +++ b/sakura_core/cmd/CViewCommander_File.cpp @@ -122,18 +122,18 @@ void CViewCommander::Command_FILEOPEN( const WCHAR* filename, ECodeType nCharCod my_splitpath_t(defName.c_str(), szPath, szDir, szName, szExt); wcscat(szPath, szDir); if( 0 == wmemicmp(defName.c_str(), szPath) ){ - // defNameはフォルダ名だった + // defNameはフォルダー名だった }else{ CFilePath path = defName.c_str(); if( 0 == wmemicmp(path.GetDirPath().c_str(), szPath) ){ - // フォルダ名までは実在している + // フォルダー名までは実在している sLoadInfo.cFilePath = defName.c_str(); } } } bool bDlgResult = GetDocument()->m_cDocFileOperation.OpenFileDialog( CEditWnd::getInstance()->GetHwnd(), //[in] オーナーウィンドウ - defName.length()==0 ? NULL : defName.c_str(), //[in] フォルダ + defName.length()==0 ? NULL : defName.c_str(), //[in] フォルダー &sLoadInfo, //[out] ロード情報受け取り files //[out] ファイル名 ); diff --git a/sakura_core/cmd/CViewCommander_Grep.cpp b/sakura_core/cmd/CViewCommander_Grep.cpp index 4c8bf0a871..9761adca6b 100644 --- a/sakura_core/cmd/CViewCommander_Grep.cpp +++ b/sakura_core/cmd/CViewCommander_Grep.cpp @@ -236,7 +236,7 @@ void CViewCommander::Command_GREP_REPLACE( void ) //GOPTオプション WCHAR pOpt[64]; pOpt[0] = L'\0'; - if( cDlgGrepRep.m_bSubFolder )wcscat( pOpt, L"S" ); // サブフォルダからも検索する + if( cDlgGrepRep.m_bSubFolder )wcscat( pOpt, L"S" ); // サブフォルダーからも検索する if( cDlgGrepRep.m_sSearchOption.bWordOnly )wcscat( pOpt, L"W" ); // 単語単位で探す if( cDlgGrepRep.m_sSearchOption.bLoHiCase )wcscat( pOpt, L"L" ); // 英大文字と英小文字を区別する if( cDlgGrepRep.m_sSearchOption.bRegularExp )wcscat( pOpt, L"R" ); // 正規表現 diff --git a/sakura_core/cmd/CViewCommander_Insert.cpp b/sakura_core/cmd/CViewCommander_Insert.cpp index c8b0f0285f..31c1fc1878 100644 --- a/sakura_core/cmd/CViewCommander_Insert.cpp +++ b/sakura_core/cmd/CViewCommander_Insert.cpp @@ -80,7 +80,7 @@ void CViewCommander::Command_INS_FILE_USED_RECENTLY( void ) 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(); diff --git a/sakura_core/cmd/CViewCommander_Macro.cpp b/sakura_core/cmd/CViewCommander_Macro.cpp index 71fec1a930..a4850d4d53 100644 --- a/sakura_core/cmd/CViewCommander_Macro.cpp +++ b/sakura_core/cmd/CViewCommander_Macro.cpp @@ -40,7 +40,7 @@ void CViewCommander::Command_RECKEYMACRO( void ) if( GetDllShareData().m_sFlags.m_bRecordingKeyMacro ){ /* キーボードマクロの記録中 */ GetDllShareData().m_sFlags.m_bRecordingKeyMacro = FALSE; GetDllShareData().m_sFlags.m_hwndRecordingKeyMacro = NULL; /* キーボードマクロを記録中のウィンドウ */ - //@@@ 2002.1.24 YAZAKI キーマクロをマクロ用フォルダに「RecKey.mac」という名で保存 + //@@@ 2002.1.24 YAZAKI キーマクロをマクロ用フォルダーに「RecKey.mac」という名で保存 WCHAR szInitDir[MAX_PATH]; int nRet; // 2003.06.23 Moca 記録用キーマクロのフルパスをCShareData経由で取得 @@ -98,7 +98,7 @@ void CViewCommander::Command_SAVEKEYMACRO( void ) if( _IS_REL_PATH( GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER ) ){ GetInidirOrExedir( szInitDir, GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER ); }else{ - wcscpy( szInitDir, GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER ); /* マクロ用フォルダ */ + wcscpy( szInitDir, GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER ); /* マクロ用フォルダー */ } /* ファイルオープンダイアログの初期化 */ cDlgOpenFile.Create( @@ -110,7 +110,7 @@ void CViewCommander::Command_SAVEKEYMACRO( void ) if( !cDlgOpenFile.DoModal_GetSaveFileName( szPath ) ){ return; } - /* ファイルのフルパスを、フォルダとファイル名に分割 */ + /* ファイルのフルパスを、フォルダーとファイル名に分割 */ /* [c:\work\test\aaa.txt] → [c:\work\test] + [aaa.txt] */ // ::SplitPath_FolderAndFile( szPath, GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER, NULL ); // wcscat( GetDllShareData().m_Common.m_sMacro.m_szMACROFOLDER, L"\\" ); @@ -143,7 +143,7 @@ void CViewCommander::Command_LOADKEYMACRO( void ) if( _IS_REL_PATH( pszFolder ) ){ GetInidirOrExedir( szInitDir, pszFolder ); }else{ - wcscpy( szInitDir, pszFolder ); /* マクロ用フォルダ */ + wcscpy( szInitDir, pszFolder ); /* マクロ用フォルダー */ } /* ファイルオープンダイアログの初期化 */ cDlgOpenFile.Create( @@ -208,8 +208,8 @@ void CViewCommander::Command_EXECEXTMACRO( const WCHAR* pszPath, const WCHAR* ps { CDlgOpenFile cDlgOpenFile; WCHAR szPath[_MAX_PATH + 1]; - WCHAR szInitDir[_MAX_PATH + 1]; //ファイル選択ダイアログの初期フォルダ - const WCHAR* pszFolder; //マクロフォルダ + WCHAR szInitDir[_MAX_PATH + 1]; //ファイル選択ダイアログの初期フォルダー + const WCHAR* pszFolder; //マクロフォルダー HWND hwndRecordingKeyMacro = NULL; if ( !pszPath ) { @@ -219,7 +219,7 @@ void CViewCommander::Command_EXECEXTMACRO( const WCHAR* pszPath, const WCHAR* ps if( _IS_REL_PATH( pszFolder ) ){ GetInidirOrExedir( szInitDir, pszFolder ); }else{ - wcscpy( szInitDir, pszFolder ); /* マクロ用フォルダ */ + wcscpy( szInitDir, pszFolder ); /* マクロ用フォルダー */ } /* ファイルオープンダイアログの初期化 */ cDlgOpenFile.Create( diff --git a/sakura_core/cmd/CViewCommander_TagJump.cpp b/sakura_core/cmd/CViewCommander_TagJump.cpp index 92bea00b2f..da72712da7 100644 --- a/sakura_core/cmd/CViewCommander_TagJump.cpp +++ b/sakura_core/cmd/CViewCommander_TagJump.cpp @@ -137,7 +137,7 @@ static int GetLineColumnPos(const wchar_t* pLine) @date 2003.04.03 genta 元ウィンドウを閉じるかどうかの引数を追加 @date 2004.05.13 Moca 行桁位置の指定が無い場合は、行桁を移動しない - @date 2011.11.24 Moca Grepフォルダ毎表示対応 + @date 2011.11.24 Moca Grepフォルダー毎表示対応 */ bool CViewCommander::Command_TAGJUMP( bool bClose ) { @@ -186,7 +186,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) // :HWND:[01234567] 無題1(1234,56): str // :HWND:[01234567] 無題1(1234,56) [SJIS]: str - // ノーマル/ベースフォルダ/フォルダ毎 + // ノーマル/ベースフォルダー/フォルダー毎 // ◎"C:\RootFolder" // ■ // ・FileName.ext(5395,11): str @@ -195,14 +195,14 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) // ・FileName.ext(5396,11): str // ・FileName2.ext(123,12): str - // ノーマル/ベースフォルダ + // ノーマル/ベースフォルダー // ■"C:\RootFolder" // ・FileName.ext(5395,11): str // ・SubFolders\FileName2.ext(5395,11): str // ・SubFolders\FileName2.ext(5396,11): str // ・SubFolders\FileName3.ext(123,11): str - // ノーマル/フォルダ毎 + // ノーマル/フォルダー毎 // ■"C:\RootFolder" // ・FileName.cpp(5395,11): str // ■"C:\RootFolder\SubFolders" @@ -219,7 +219,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) // ■"C:\RootFolder\SubFolders\FileName3.ext" // ・( 123,12 ): str - // ファイル毎/ベースフォルダ + // ファイル毎/ベースフォルダー // ◎"C:\RootFolder" // ■"FileName.ext" // ・( 5395,11 ): str @@ -229,7 +229,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) // ■"SubFolders\FileName3.ext" // ・( 123,12 ): str - // ファイル毎/ベースフォルダ/フォルダ毎 + // ファイル毎/ベースフォルダー/フォルダー毎 // ◎"C:\RootFolder" // ■ // ◆"FileName.ext" @@ -241,7 +241,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) // ◆"FileName3.ext" // ・( 123,12 ): str - // ファイル毎/フォルダ毎 + // ファイル毎/フォルダー毎 // ■"C:\RootFolder" // ◆"FileName.ext" // ・( 5395,11 ): str @@ -351,14 +351,14 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) if( IsHWNDTag(&pLine[2], strJumpToFile) ){ break; } - // フォルダ毎：ファイル名 + // フォルダー毎：ファイル名 if (GetQuoteFilePath(&pLine[2], strFile, MAX_TAG_PATH)) { searchMode = TAGLIST_SUBPATH; continue; } break; }else if( 2 <= nLineLen && pLine[0] == L'■' && (pLine[1] == L'\r' || pLine[1] == L'\n') ){ - // ルートフォルダ + // ルートフォルダー if( searchMode == TAGLIST_ROOT ){ continue; } @@ -375,7 +375,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose ) strJumpToFile.assign(&pLine[2 + nBgn], nPathLen); break; } - // 相対フォルダorファイル名 + // 相対フォルダーorファイル名 std::wstring strPath; if (GetQuoteFilePath(&pLine[2], strPath, MAX_TAG_PATH)) { if (strFile.empty() == false) { @@ -503,7 +503,7 @@ void CViewCommander::Command_TAGJUMPBACK( void ) @author MIK @date 2003.04.13 新規作成 - @date 2003.05.12 ダイアログ表示でフォルダ等を細かく指定できるようにした。 + @date 2003.05.12 ダイアログ表示でフォルダー等を細かく指定できるようにした。 @date 2008.05.05 novice GetModuleHandle(NULL)→NULLに変更 */ bool CViewCommander::Command_TagsMake( void ) @@ -518,7 +518,7 @@ bool CViewCommander::Command_TagsMake( void ) } else { - // 20100722 Moca サクラのフォルダからカレントディレクトリに変更 + // 20100722 Moca サクラのフォルダーからカレントディレクトリに変更 ::GetCurrentDirectory( _countof(szTargetPath), szTargetPath ); } @@ -527,7 +527,7 @@ bool CViewCommander::Command_TagsMake( void ) if( !cDlgTagsMake.DoModal( G_AppInstance(), m_pCommanderView->GetHwnd(), 0, szTargetPath ) ) return false; WCHAR cmdline[1024]; - /* exeのあるフォルダ */ + /* exeのあるフォルダー */ WCHAR szExeFolder[_MAX_PATH + 1]; GetExedir( cmdline, CTAGS_COMMAND ); @@ -579,7 +579,7 @@ bool CViewCommander::Command_TagsMake( void ) WCHAR options[1024]; wcscpy( options, L"--excmd=n" ); //デフォルトのオプション - if( cDlgTagsMake.m_nTagsOpt & 0x0001 ) wcscat( options, L" -R" ); //サブフォルダも対象 + if( cDlgTagsMake.m_nTagsOpt & 0x0001 ) wcscat( options, L" -R" ); //サブフォルダーも対象 if( cDlgTagsMake.m_szTagsCmdLine[0] != L'\0' ) //個別指定のコマンドライン { wcscat( options, L" " ); @@ -724,7 +724,7 @@ bool CViewCommander::Command_TagJumpByTagsFileMsg( bool bMsg ) @author MIK @date 2003.04.13 新規作成 - @date 2003.05.12 フォルダ階層も考慮して探す + @date 2003.05.12 フォルダー階層も考慮して探す @date */ bool CViewCommander::Command_TagJumpByTagsFile( bool bClose ) diff --git a/sakura_core/config/maxdata.h b/sakura_core/config/maxdata.h index c6baa7298b..3f92ef550e 100644 --- a/sakura_core/config/maxdata.h +++ b/sakura_core/config/maxdata.h @@ -35,9 +35,9 @@ enum maxdata{ MAX_SEARCHKEY = 30, //!< 検索キー MAX_REPLACEKEY = 30, //!< 置換キー MAX_GREPFILE = 30, //!< Grepファイル - MAX_GREPFOLDER = 30, //!< Grepフォルダ + MAX_GREPFOLDER = 30, //!< Grepフォルダー MAX_EXCLUDEFILE = 30, //!< 除外ファイル - MAX_EXCLUDEFOLDER = 30, //!< 除外フォルダ + MAX_EXCLUDEFOLDER = 30, //!< 除外フォルダー MAX_GREP_PATH = 512, //!< Grepファイルパス長 MAX_EXCLUDE_PATH = 512, //!< 除外ファイルパス長 MAX_TYPES = 60, //!< タイプ別設定 diff --git a/sakura_core/config/system_constants.h b/sakura_core/config/system_constants.h index 1eda1fc6e8..bd62f5f85d 100644 --- a/sakura_core/config/system_constants.h +++ b/sakura_core/config/system_constants.h @@ -143,7 +143,7 @@ STypeConfigに独自TABマークフラグ追加 2003.03.28 MIK Version 43: - 最近使ったファイル・フォルダにお気に入りを追加 2003.04.08 MIK + 最近使ったファイル・フォルダーにお気に入りを追加 2003.04.08 MIK Version 44: Window Caption文字列領域をCommonに追加 2003.04.05 genta @@ -200,7 +200,7 @@ 改行で行末の空白を削除するオプション(タイプ別設定) 2005/10/11 ryoji Version 62: - バックアップフォルダ 2005.11.07 aroka + バックアップフォルダー 2005.11.07 aroka Version 63: 指定桁縦線表示追加 2005.11.08 Moca @@ -248,7 +248,7 @@ タブのグループ化 2007.06.20 ryoji Version 77: - iniフォルダ設定 2007.05.31 ryoji + iniフォルダー設定 2007.05.31 ryoji Version 78: エディタ－トレイ間でのUI特権分離確認のためのバージョン合わせ 2007.06.07 ryoji @@ -530,7 +530,7 @@ ini読み取り専用オプション 2014.12.08 Moca Version 171: - Grepファイル・フォルダ長を512(MAX_GREP_PATH)に変更 + Grepファイル・フォルダー長を512(MAX_GREP_PATH)に変更 Version 172: キーワードヘルプの右クリックメニュー表示選択 @@ -539,7 +539,7 @@ STypeConfigにm_backImgOpacity 追加 Version 174: - 除外ファイル、除外フォルダを追加 + 除外ファイル、除外フォルダーを追加 Version 175: Vistaスタイルのファイルダイアログ（CommonSetting_Edit::m_bVistaStyleFileDialog）を追加 diff --git a/sakura_core/dlg/CDlgFavorite.cpp b/sakura_core/dlg/CDlgFavorite.cpp index 1ad281e505..6c4604cd2d 100644 --- a/sakura_core/dlg/CDlgFavorite.cpp +++ b/sakura_core/dlg/CDlgFavorite.cpp @@ -52,12 +52,12 @@ const DWORD p_helpids[] = { IDC_TAB_FAVORITE, HIDC_TAB_FAVORITE, //タブ IDC_LIST_FAVORITE_FILE, HIDC_LIST_FAVORITE_FILE, //ファイル - IDC_LIST_FAVORITE_FOLDER, HIDC_LIST_FAVORITE_FOLDER, //フォルダ + IDC_LIST_FAVORITE_FOLDER, HIDC_LIST_FAVORITE_FOLDER, //フォルダー IDC_LIST_FAVORITE_EXCEPTMRU, HIDC_LIST_FAVORITE_EXCEPTMRU, //MRU除外 IDC_LIST_FAVORITE_SEARCH, HIDC_LIST_FAVORITE_SEARCH, //検索 IDC_LIST_FAVORITE_REPLACE, HIDC_LIST_FAVORITE_REPLACE, //置換 IDC_LIST_FAVORITE_GREP_FILE, HIDC_LIST_FAVORITE_GREPFILE, //GREPファイル - IDC_LIST_FAVORITE_GREP_FOLDER, HIDC_LIST_FAVORITE_GREPFOLDER, //GREPフォルダ + IDC_LIST_FAVORITE_GREP_FOLDER, HIDC_LIST_FAVORITE_GREPFOLDER, //GREPフォルダー IDC_LIST_FAVORITE_CMD, HIDC_LIST_FAVORITE_CMD, //コマンド IDC_LIST_FAVORITE_CUR_DIR, HIDC_LIST_FAVORITE_CUR_DIR, //カレントディレクトリ // IDC_STATIC_BUTTONS, -1, diff --git a/sakura_core/dlg/CDlgFavorite.h b/sakura_core/dlg/CDlgFavorite.h index 39c65fbfcf..b2508a0087 100644 --- a/sakura_core/dlg/CDlgFavorite.h +++ b/sakura_core/dlg/CDlgFavorite.h @@ -114,7 +114,7 @@ class CDlgFavorite final : public CDialog int m_nId; //コントロールのID bool m_bHaveFavorite; //お気に入りを持っているか？ bool m_bHaveView; //表示数変更機能をもっているか？ - bool m_bFilePath; //ファイル/フォルダか？ + bool m_bFilePath; //ファイル/フォルダーか？ bool m_bEditable; //編集可能 bool m_bAddExcept; //除外へ追加 int m_nViewCount; //カレントの表示数 diff --git a/sakura_core/dlg/CDlgGrep.cpp b/sakura_core/dlg/CDlgGrep.cpp index 478e5bc617..4b24971f45 100644 --- a/sakura_core/dlg/CDlgGrep.cpp +++ b/sakura_core/dlg/CDlgGrep.cpp @@ -39,13 +39,13 @@ //GREP CDlgGrep.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12000 - IDC_BUTTON_FOLDER, HIDC_GREP_BUTTON_FOLDER, //フォルダ - IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_BUTTON_CURRENTFOLDER, //現フォルダ + IDC_BUTTON_FOLDER, HIDC_GREP_BUTTON_FOLDER, //フォルダー + IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_BUTTON_CURRENTFOLDER, //現フォルダー IDOK, HIDOK_GREP, //検索 IDCANCEL, HIDCANCEL_GREP, //キャンセル IDC_BUTTON_HELP, HIDC_GREP_BUTTON_HELP, //ヘルプ IDC_CHK_WORD, HIDC_GREP_CHK_WORD, //単語単位 - IDC_CHK_SUBFOLDER, HIDC_GREP_CHK_SUBFOLDER, //サブフォルダも検索 + IDC_CHK_SUBFOLDER, HIDC_GREP_CHK_SUBFOLDER, //サブフォルダーも検索 IDC_CHK_FROMTHISTEXT, HIDC_GREP_CHK_FROMTHISTEXT, //編集中のテキストから検索 IDC_CHK_LOHICASE, HIDC_GREP_CHK_LOHICASE, //大文字小文字 IDC_CHK_REGULAREXP, HIDC_GREP_CHK_REGULAREXP, //正規表現 @@ -53,9 +53,9 @@ const DWORD p_helpids[] = { //12000 IDC_CHECK_CP, HIDC_GREP_CHECK_CP, //コードページ IDC_COMBO_TEXT, HIDC_GREP_COMBO_TEXT, //条件 IDC_COMBO_FILE, HIDC_GREP_COMBO_FILE, //ファイル - IDC_COMBO_FOLDER, HIDC_GREP_COMBO_FOLDER, //フォルダ + IDC_COMBO_FOLDER, HIDC_GREP_COMBO_FOLDER, //フォルダー IDC_COMBO_EXCLUDE_FILE, HIDC_GREP_COMBO_EXCLUDE_FILE, //除外ファイル - IDC_COMBO_EXCLUDE_FOLDER, HIDC_GREP_COMBO_EXCLUDE_FOLDER, //除外フォルダ + IDC_COMBO_EXCLUDE_FOLDER, HIDC_GREP_COMBO_EXCLUDE_FOLDER, //除外フォルダー IDC_BUTTON_FOLDER_UP, HIDC_GREP_BUTTON_FOLDER_UP, //上 IDC_RADIO_OUTPUTLINE, HIDC_GREP_RADIO_OUTPUTLINE, //結果出力：行単位 IDC_RADIO_OUTPUTMARKED, HIDC_GREP_RADIO_OUTPUTMARKED, //結果出力：該当部分 @@ -63,10 +63,10 @@ const DWORD p_helpids[] = { //12000 IDC_RADIO_OUTPUTSTYLE2, HIDC_GREP_RADIO_OUTPUTSTYLE2, //結果出力形式：ファイル毎 IDC_RADIO_OUTPUTSTYLE3, HIDC_RADIO_OUTPUTSTYLE3, //結果出力形式：結果のみ IDC_STATIC_JRE32VER, HIDC_GREP_STATIC_JRE32VER, //正規表現バージョン - IDC_CHK_DEFAULTFOLDER, HIDC_GREP_CHK_DEFAULTFOLDER, //フォルダの初期値をカレントフォルダにする + IDC_CHK_DEFAULTFOLDER, HIDC_GREP_CHK_DEFAULTFOLDER, //フォルダーの初期値をカレントフォルダーにする IDC_CHECK_FILE_ONLY, HIDC_CHECK_FILE_ONLY, //ファイル毎最初のみ検索 - IDC_CHECK_BASE_PATH, HIDC_CHECK_BASE_PATH, //ベースフォルダ表示 - IDC_CHECK_SEP_FOLDER, HIDC_CHECK_SEP_FOLDER, //フォルダ毎に表示 + IDC_CHECK_BASE_PATH, HIDC_CHECK_BASE_PATH, //ベースフォルダー表示 + IDC_CHECK_SEP_FOLDER, HIDC_CHECK_SEP_FOLDER, //フォルダー毎に表示 // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK @@ -77,7 +77,7 @@ CDlgGrep::CDlgGrep() { m_bEnableThisText = true; m_bSelectOnceThisText = false; - m_bSubFolder = FALSE; // サブフォルダからも検索する + m_bSubFolder = FALSE; // サブフォルダーからも検索する m_bFromThisText = FALSE; // この編集中のテキストから検索する m_sSearchOption.Reset(); // 検索オプション m_nGrepCharSet = CODE_SJIS; // 文字コードセット @@ -96,7 +96,7 @@ CDlgGrep::CDlgGrep() } /* - @brief ファイル/フォルダの除外パターンをエスケープする必要があるか判断する + @brief ファイル/フォルダーの除外パターンをエスケープする必要があるか判断する @param[in] pattern チェックするパターン @return true エスケープする必要がある @return false エスケープする必要がない @@ -135,9 +135,9 @@ static LPCWSTR GetEscapePattern(const std::wstring& pattern) } /* - @brief フォルダの除外パターンを詰める + @brief フォルダーの除外パターンを詰める @param[in,out] cFilePattern "-GFILE=" に指定する引数用のバッファ (このバッファの末尾に追加する) - @param[in] cmWorkExcludeFolder Grep ダイアログで指定されたフォルダの除外パターン + @param[in] cmWorkExcludeFolder Grep ダイアログで指定されたフォルダーの除外パターン @author m-tmatma */ static void AppendExcludeFolderPatterns(CNativeW& cFilePattern, const CNativeW& cmWorkExcludeFolder) @@ -169,7 +169,7 @@ static void AppendExcludeFilePatterns(CNativeW& cFilePattern, const CNativeW& cm } /*! - * 除外ファイル、除外フォルダの設定を "-GFILE=" の設定に pack する + * 除外ファイル、除外フォルダーの設定を "-GFILE=" の設定に pack する */ CNativeW CDlgGrep::GetPackedGFileString() const { @@ -178,7 +178,7 @@ CNativeW CDlgGrep::GetPackedGFileString() const CNativeW cmExcludeFiles( m_szExcludeFile ); CNativeW cmExcludeFolders( m_szExcludeFolder ); - // 除外ファイル、除外フォルダの設定を "-GFILE=" の設定に pack するためにデータを作る。 + // 除外ファイル、除外フォルダーの設定を "-GFILE=" の設定に pack するためにデータを作る。 CNativeW cmGFileString( std::move( cmFilePattern ) ); AppendExcludeFolderPatterns( cmGFileString, cmExcludeFolders ); AppendExcludeFilePatterns( cmGFileString, cmExcludeFiles ); @@ -241,7 +241,7 @@ BOOL CDlgGrep::OnCbnDropDown( HWND hwndCtl, int wID ) /* モーダルダイアログの表示 */ int CDlgGrep::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* pszCurrentFilePath ) { - m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: サブフォルダも検索 + m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: サブフォルダーも検索 m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // 検索オプション m_nGrepCharSet = m_pShareData->m_Common.m_sSearch.m_nGrepCharSet; // 文字コードセット m_nGrepOutputLineType = m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType; // 行を出力/該当部分/否マッチ行 を出力 @@ -256,7 +256,7 @@ int CDlgGrep::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* pszCur wcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* 検索ファイル */ } if( m_szFolder[0] == L'\0' && m_pShareData->m_sSearchKeywords.m_aGrepFolders.size() ){ - wcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダ */ + wcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダー */ } /* 除外ファイル */ @@ -273,14 +273,14 @@ int CDlgGrep::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* pszCur } } - /* 除外フォルダ */ + /* 除外フォルダー */ if (m_szExcludeFolder[0] == L'\0') { if (m_pShareData->m_sSearchKeywords.m_aExcludeFolders.size()) { wcscpy(m_szExcludeFolder, m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0]); } else { - /* ユーザーの利便性向上のために除外フォルダに対して初期値を設定する */ - wcscpy(m_szExcludeFolder, DEFAULT_EXCLUDE_FOLDER_PATTERN); /* 除外フォルダ */ + /* ユーザーの利便性向上のために除外フォルダーに対して初期値を設定する */ + wcscpy(m_szExcludeFolder, DEFAULT_EXCLUDE_FOLDER_PATTERN); /* 除外フォルダー */ /* 履歴に残して後で選択できるようにする */ m_pShareData->m_sSearchKeywords.m_aExcludeFolders.push_back(DEFAULT_EXCLUDE_FOLDER_PATTERN); @@ -362,7 +362,7 @@ BOOL CDlgGrep::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) return bRet; } -/*! @brief フォルダ指定EditBoxのコールバック関数 +/*! @brief フォルダー指定EditBoxのコールバック関数 @date 2007.02.09 bosagami 新規作成 @date 2007.09.02 genta ディレクトリチェックを強化 @@ -383,8 +383,8 @@ LRESULT CALLBACK OnFolderProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam) //ファイルパスの解決 CSakuraEnvironment::ResolvePath(sPath); - // ファイルがドロップされた場合はフォルダを切り出す - // フォルダの場合は最後が失われるのでsplitしてはいけない． + // ファイルがドロップされた場合はフォルダーを切り出す + // フォルダーの場合は最後が失われるのでsplitしてはいけない． if( IsFileExists( sPath, true )){ // 第2引数がtrueだとディレクトリは対象外 SFilePath szWork; SplitPath_FolderAndFile( sPath, szWork, NULL ); @@ -418,7 +418,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) // 2010.05.30 関数化 SetDataFromThisText( 0 != ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_FROMTHISTEXT ) ); return TRUE; - case IDC_BUTTON_CURRENTFOLDER: /* 現在編集中のファイルのフォルダ */ + case IDC_BUTTON_CURRENTFOLDER: /* 現在編集中のファイルのフォルダー */ /* ファイルを開いているか */ if( m_szCurrentFilePath[0] != L'\0' ){ WCHAR szWorkFolder[MAX_PATH]; @@ -507,11 +507,11 @@ BOOL CDlgGrep::OnBnClicked( int wID ) return TRUE; case IDC_BUTTON_FOLDER: - /* フォルダ参照ボタン */ + /* フォルダー参照ボタン */ { const int nMaxPath = MAX_GREP_PATH; WCHAR szFolder[nMaxPath]; - /* 検索フォルダ */ + /* 検索フォルダー */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_FOLDER, szFolder, nMaxPath - 1 ); if( szFolder[0] == L'\0' ){ ::GetCurrentDirectory( nMaxPath, szFolder ); @@ -532,7 +532,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) } return TRUE; case IDC_CHK_DEFAULTFOLDER: - /* フォルダの初期値をカレントフォルダにする */ + /* フォルダーの初期値をカレントフォルダーにする */ { m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_DEFAULTFOLDER ); } @@ -564,13 +564,13 @@ BOOL CDlgGrep::OnBnClicked( int wID ) wcsncpy_s(m_szFile, _countof2(m_szFile), m_pShareData->m_sSearchKeywords.m_aGrepFiles[0], _TRUNCATE); /* 検索ファイル */ } if (m_pShareData->m_sSearchKeywords.m_aGrepFolders.size()) { - wcsncpy_s(m_szFolder, _countof2(m_szFolder), m_pShareData->m_sSearchKeywords.m_aGrepFolders[0], _TRUNCATE); /* 検索フォルダ */ + wcsncpy_s(m_szFolder, _countof2(m_szFolder), m_pShareData->m_sSearchKeywords.m_aGrepFolders[0], _TRUNCATE); /* 検索フォルダー */ } if (m_pShareData->m_sSearchKeywords.m_aExcludeFiles.size()) { wcsncpy_s(m_szExcludeFile, _countof2(m_szExcludeFile), m_pShareData->m_sSearchKeywords.m_aExcludeFiles[0], _TRUNCATE); /* 除外ファイル */ } if (m_pShareData->m_sSearchKeywords.m_aExcludeFolders.size()) { - wcsncpy_s(m_szExcludeFolder, _countof2(m_szExcludeFolder), m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0], _TRUNCATE); /* 除外フォルダ */ + wcsncpy_s(m_szExcludeFolder, _countof2(m_szExcludeFolder), m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0], _TRUNCATE); /* 除外フォルダー */ } } CloseDialog( FALSE ); @@ -590,13 +590,13 @@ void CDlgGrep::SetData( void ) /* 検索ファイル */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_FILE, m_szFile ); - /* 検索フォルダ */ + /* 検索フォルダー */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_FOLDER, m_szFolder ); /* 除外ファイル */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_EXCLUDE_FILE, m_szExcludeFile); - /* 除外フォルダ */ + /* 除外フォルダー */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_EXCLUDE_FOLDER, m_szExcludeFolder); if((m_szFolder[0] == L'\0' || m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder) && @@ -608,7 +608,7 @@ void CDlgGrep::SetData( void ) SetGrepFolder( GetItemHwnd(IDC_COMBO_FOLDER), szWorkFolder ); } - /* サブフォルダからも検索する */ + /* サブフォルダーからも検索する */ ::CheckDlgButton( GetHwnd(), IDC_CHK_SUBFOLDER, m_bSubFolder ); // この編集中のテキストから検索する @@ -711,7 +711,7 @@ void CDlgGrep::SetData( void ) CheckDlgButtonBool( GetHwnd(), IDC_CHECK_BASE_PATH, m_bGrepOutputBaseFolder ); CheckDlgButtonBool( GetHwnd(), IDC_CHECK_SEP_FOLDER, m_bGrepSeparateFolder ); - // フォルダの初期値をカレントフォルダにする + // フォルダーの初期値をカレントフォルダーにする ::CheckDlgButton( GetHwnd(), IDC_CHK_DEFAULTFOLDER, m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder ); return; @@ -763,7 +763,7 @@ void CDlgGrep::SetDataFromThisText( bool bChecked ) */ int CDlgGrep::GetData( void ) { - /* サブフォルダからも検索する*/ + /* サブフォルダーからも検索する*/ m_bSubFolder = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_SUBFOLDER ); /* この編集中のテキストから検索する */ @@ -835,11 +835,11 @@ int CDlgGrep::GetData( void ) return FALSE; } } - /* 検索フォルダ */ + /* 検索フォルダー */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_FOLDER, m_szFolder, _countof2(m_szFolder) ); /* 除外ファイル */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_EXCLUDE_FILE, m_szExcludeFile, _countof2(m_szExcludeFile)); - /* 除外フォルダ */ + /* 除外フォルダー */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_EXCLUDE_FOLDER, m_szExcludeFolder, _countof2(m_szExcludeFolder)); m_pShareData->m_Common.m_sSearch.m_nGrepCharSet = m_nGrepCharSet; // 文字コード自動判別 @@ -878,7 +878,7 @@ int CDlgGrep::GetData( void ) //カレントディレクトリを保存。このブロックから抜けるときに自動でカレントディレクトリは復元される。 CCurrentDirectoryBackupPoint cCurDirBackup; - // 2011.11.24 Moca 複数フォルダ指定 + // 2011.11.24 Moca 複数フォルダー指定 std::vector vPaths; CGrepAgent::CreateFolders( m_szFolder, vPaths ); int nFolderLen = 0; @@ -893,7 +893,7 @@ int CDlgGrep::GetData( void ) } WCHAR szFolderItem[nMaxPath]; ::GetCurrentDirectory( nMaxPath, szFolderItem ); - // ;がフォルダ名に含まれていたら""で囲う + // ;がフォルダー名に含まれていたら""で囲う if( wcschr( szFolderItem, L';' ) ){ szFolderItem[0] = L'"'; ::GetCurrentDirectory( nMaxPath, szFolderItem + 1 ); @@ -934,21 +934,21 @@ int CDlgGrep::GetData( void ) } // この編集中のテキストから検索する場合、履歴に残さない Uchi 2008/5/23 - // 2016.03.08 Moca 「このファイルから検索」の場合はサブフォルダ共通設定を更新しない + // 2016.03.08 Moca 「このファイルから検索」の場合はサブフォルダー共通設定を更新しない if (!m_bFromThisText) { /* 検索ファイル */ CSearchKeywordManager().AddToGrepFileArr( m_szFile ); - /* 検索フォルダ */ + /* 検索フォルダー */ CSearchKeywordManager().AddToGrepFolderArr( m_szFolder ); /* 除外ファイル */ CSearchKeywordManager().AddToExcludeFileArr(m_szExcludeFile); - /* 除外フォルダ */ + /* 除外フォルダー */ CSearchKeywordManager().AddToExcludeFolderArr(m_szExcludeFolder); - // Grep：サブフォルダも検索 + // Grep：サブフォルダーも検索 m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder = m_bSubFolder; } diff --git a/sakura_core/dlg/CDlgGrep.h b/sakura_core/dlg/CDlgGrep.h index cfb1f1fe51..2d88b161c2 100644 --- a/sakura_core/dlg/CDlgGrep.h +++ b/sakura_core/dlg/CDlgGrep.h @@ -41,14 +41,14 @@ class CDlgGrep : public CDialog /* || Attributes & Operations */ - CNativeW GetPackedGFileString() const; //!< 除外ファイル、除外フォルダの設定を "-GFILE=" の設定に pack する + CNativeW GetPackedGFileString() const; //!< 除外ファイル、除外フォルダーの設定を "-GFILE=" の設定に pack する BOOL OnCbnDropDown( HWND hwndCtl, int wID ) override; int DoModal( HINSTANCE, HWND, const WCHAR* ); /* モーダルダイアログの表示 */ // HWND DoModeless( HINSTANCE, HWND, const char* ); /* モードレスダイアログの表示 */ bool m_bEnableThisText; bool m_bSelectOnceThisText; - BOOL m_bSubFolder;/*!< サブフォルダからも検索する */ + BOOL m_bSubFolder;/*!< サブフォルダーからも検索する */ BOOL m_bFromThisText;/*!< この編集中のテキストから検索する */ SSearchOption m_sSearchOption; //!< 検索オプション @@ -57,15 +57,15 @@ class CDlgGrep : public CDialog int m_nGrepOutputStyle; /*!< Grep: 出力形式 */ int m_nGrepOutputLineType; //!< 結果出力：行を出力/該当部分/否マッチ行 bool m_bGrepOutputFileOnly; /*!< ファイル毎最初のみ検索 */ - bool m_bGrepOutputBaseFolder; /*!< ベースフォルダ表示 */ - bool m_bGrepSeparateFolder; /*!< フォルダ毎に表示 */ + bool m_bGrepOutputBaseFolder; /*!< ベースフォルダー表示 */ + bool m_bGrepSeparateFolder; /*!< フォルダー毎に表示 */ std::wstring m_strText; /*!< 検索文字列 */ bool m_bSetText; //!< 検索文字列を設定したか SFilePathLong m_szFile; //!< 検索ファイル - SFilePathLong m_szFolder; //!< 検索フォルダ + SFilePathLong m_szFolder; //!< 検索フォルダー SFilePathLong m_szExcludeFile; //!< 除外ファイル - SFilePathLong m_szExcludeFolder; //!< 除外フォルダ + SFilePathLong m_szExcludeFolder; //!< 除外フォルダー SFilePath m_szCurrentFilePath; protected: CRecentSearch m_cRecentSearch; diff --git a/sakura_core/dlg/CDlgGrepReplace.cpp b/sakura_core/dlg/CDlgGrepReplace.cpp index d27b3dfe95..ca84d1e208 100644 --- a/sakura_core/dlg/CDlgGrepReplace.cpp +++ b/sakura_core/dlg/CDlgGrepReplace.cpp @@ -34,14 +34,14 @@ #include "String_define.h" const DWORD p_helpids[] = { - IDC_BUTTON_FOLDER, HIDC_GREP_REP_BUTTON_FOLDER, //フォルダ - IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_REP_BUTTON_CURRENTFOLDER, //現フォルダ + IDC_BUTTON_FOLDER, HIDC_GREP_REP_BUTTON_FOLDER, //フォルダー + IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_REP_BUTTON_CURRENTFOLDER, //現フォルダー IDOK, HIDOK_GREP_REP, //置換開始 IDCANCEL, HIDCANCEL_GREP_REP, //キャンセル IDC_BUTTON_HELP, HIDC_GREP_REP_BUTTON_HELP, //ヘルプ IDC_CHK_PASTE, HIDC_GREP_REP_CHK_PASTE, //クリップボードから貼り付け IDC_CHK_WORD, HIDC_GREP_REP_CHK_WORD, //単語単位 - IDC_CHK_SUBFOLDER, HIDC_GREP_REP_CHK_SUBFOLDER, //サブフォルダも検索 + IDC_CHK_SUBFOLDER, HIDC_GREP_REP_CHK_SUBFOLDER, //サブフォルダーも検索 IDC_CHK_FROMTHISTEXT, HIDC_GREP_REP_CHK_FROMTHISTEXT, //編集中のテキストから検索 IDC_CHK_LOHICASE, HIDC_GREP_REP_CHK_LOHICASE, //大文字小文字 IDC_CHK_REGULAREXP, HIDC_GREP_REP_CHK_REGULAREXP, //正規表現 @@ -51,7 +51,7 @@ const DWORD p_helpids[] = { IDC_COMBO_TEXT, HIDC_GREP_REP_COMBO_TEXT, //置換前 IDC_COMBO_TEXT2, HIDC_GREP_REP_COMBO_TEXT2, //置換後 IDC_COMBO_FILE, HIDC_GREP_REP_COMBO_FILE, //ファイル - IDC_COMBO_FOLDER, HIDC_GREP_REP_COMBO_FOLDER, //フォルダ + IDC_COMBO_FOLDER, HIDC_GREP_REP_COMBO_FOLDER, //フォルダー IDC_BUTTON_FOLDER_UP, HIDC_GREP_REP_BUTTON_FOLDER_UP, //上 IDC_RADIO_OUTPUTLINE, HIDC_GREP_REP_RADIO_OUTPUTLINE, //結果出力：行単位 IDC_RADIO_OUTPUTMARKED, HIDC_GREP_REP_RADIO_OUTPUTMARKED, //結果出力：該当部分 @@ -59,10 +59,10 @@ const DWORD p_helpids[] = { IDC_RADIO_OUTPUTSTYLE2, HIDC_GREP_REP_RADIO_OUTPUTSTYLE2, //結果出力形式：ファイル毎 IDC_RADIO_OUTPUTSTYLE3, HIDC_GREP_REP_RADIO_OUTPUTSTYLE3, //結果出力形式：結果のみ IDC_STATIC_JRE32VER, HIDC_GREP_REP_STATIC_JRE32VER, //正規表現バージョン - IDC_CHK_DEFAULTFOLDER, HIDC_GREP_REP_CHK_DEFAULTFOLDER, //フォルダの初期値をカレントフォルダにする + IDC_CHK_DEFAULTFOLDER, HIDC_GREP_REP_CHK_DEFAULTFOLDER, //フォルダーの初期値をカレントフォルダーにする IDC_CHECK_FILE_ONLY, HIDC_GREP_REP_CHECK_FILE_ONLY, //ファイル毎最初のみ検索 - IDC_CHECK_BASE_PATH, HIDC_GREP_REP_CHECK_BASE_PATH, //ベースフォルダ表示 - IDC_CHECK_SEP_FOLDER, HIDC_GREP_REP_CHECK_SEP_FOLDER, //フォルダ毎に表示 + IDC_CHECK_BASE_PATH, HIDC_GREP_REP_CHECK_BASE_PATH, //ベースフォルダー表示 + IDC_CHECK_SEP_FOLDER, HIDC_GREP_REP_CHECK_SEP_FOLDER, //フォルダー毎に表示 0, 0 }; @@ -77,7 +77,7 @@ CDlgGrepReplace::CDlgGrepReplace() /* モーダルダイアログの表示 */ int CDlgGrepReplace::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* pszCurrentFilePath, LPARAM lParam ) { - m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: サブフォルダも検索 + m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: サブフォルダーも検索 m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // 検索オプション m_nGrepCharSet = m_pShareData->m_Common.m_sSearch.m_nGrepCharSet; // 文字コードセット m_nGrepOutputLineType = m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType; // 行を出力するか該当部分だけ出力するか @@ -89,7 +89,7 @@ int CDlgGrepReplace::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* wcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* 検索ファイル */ } if( m_szFolder[0] == L'\0' && m_pShareData->m_sSearchKeywords.m_aGrepFolders.size() ){ - wcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダ */ + wcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダー */ } /* 除外ファイル */ @@ -106,14 +106,14 @@ int CDlgGrepReplace::DoModal( HINSTANCE hInstance, HWND hwndParent, const WCHAR* } } - /* 除外フォルダ */ + /* 除外フォルダー */ if (m_szExcludeFolder[0] == L'\0') { if (m_pShareData->m_sSearchKeywords.m_aExcludeFolders.size()) { wcscpy(m_szExcludeFolder, m_pShareData->m_sSearchKeywords.m_aExcludeFolders[0]); } else { - /* ユーザーの利便性向上のために除外フォルダに対して初期値を設定する */ - wcscpy(m_szExcludeFolder, DEFAULT_EXCLUDE_FOLDER_PATTERN); /* 除外フォルダ */ + /* ユーザーの利便性向上のために除外フォルダーに対して初期値を設定する */ + wcscpy(m_szExcludeFolder, DEFAULT_EXCLUDE_FOLDER_PATTERN); /* 除外フォルダー */ /* 履歴に残して後で選択できるようにする */ m_pShareData->m_sSearchKeywords.m_aExcludeFolders.push_back(DEFAULT_EXCLUDE_FOLDER_PATTERN); diff --git a/sakura_core/dlg/CDlgOpenFile.h b/sakura_core/dlg/CDlgOpenFile.h index ba9bedb34f..1a6d6993ef 100644 --- a/sakura_core/dlg/CDlgOpenFile.h +++ b/sakura_core/dlg/CDlgOpenFile.h @@ -110,7 +110,7 @@ class CDlgOpenFile final : public IDlgOpenFile bool bOptions = true) override; bool DoModalSaveDlg(SSaveInfo* pSaveInfo, bool bSimpleMode) override; - // 設定フォルダ相対ファイル選択(共有データ,ini位置依存) + // 設定フォルダー相対ファイル選択(共有データ,ini位置依存) static BOOL SelectFile(HWND parent, HWND hwndCtl, const WCHAR* filter, bool resolvePath, EFilter eAddFilter = EFITER_TEXT); diff --git a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp index 5984b458b6..f86b9e1226 100644 --- a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp +++ b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp @@ -51,7 +51,7 @@ static const DWORD p_helpids[] = { //13100 // IDC_BUTTON_HELP, HIDC_OPENDLG_BUTTON_HELP, //ヘルプボタン IDC_COMBO_CODE, HIDC_OPENDLG_COMBO_CODE, //文字コードセット IDC_COMBO_MRU, HIDC_OPENDLG_COMBO_MRU, //最近のファイル - IDC_COMBO_OPENFOLDER, HIDC_OPENDLG_COMBO_OPENFOLDER, //最近のフォルダ + IDC_COMBO_OPENFOLDER, HIDC_OPENDLG_COMBO_OPENFOLDER, //最近のフォルダー IDC_COMBO_EOL, HIDC_OPENDLG_COMBO_EOL, //改行コード IDC_CHECK_BOM, HIDC_OPENDLG_CHECK_BOM, //BOM // 2006.08.06 ryoji IDC_CHECK_CP, HIDC_OPENDLG_CHECK_CP, //CP @@ -249,7 +249,7 @@ UINT_PTR CALLBACK OFNHookProc( hwndFrame = ::GetParent( hdlg ); ::GetWindowRect( hwndFrame, &pData->m_pcDlgOpenFile->m_pShareData->m_Common.m_sOthers.m_rcOpenDialog ); - // 2005.10.29 ryoji 最近のファイル／フォルダ コンボの右端を子ダイアログの右端に合わせる + // 2005.10.29 ryoji 最近のファイル／フォルダー コンボの右端を子ダイアログの右端に合わせる ::GetWindowRect( pData->m_hwndComboMRU, &rc ); po.x = rc.left; po.y = rc.top; @@ -585,7 +585,7 @@ UINT_PTR CALLBACK OFNHookProc( case IDC_COMBO_OPENFOLDER: if ( Combo_GetCount( pData->m_hwndComboOPENFOLDER ) == 0) { - /* 最近開いたフォルダ コンボボックス初期値設定 */ + /* 最近開いたフォルダー コンボボックス初期値設定 */ // 2003.06.22 Moca m_vOPENFOLDER がNULLの場合を考慮する int nSize = (int)pData->m_pcDlgOpenFile->m_vOPENFOLDER.size(); for( i = 0; i < nSize; i++ ){ @@ -687,7 +687,7 @@ void CDlgOpenFile_CommonFileDialog::Create( m_strDefaultWildCard = pszUserWildCard; } - /* 「開く」での初期フォルダ */ + /* 「開く」での初期フォルダー */ if( pszDefaultPath && pszDefaultPath[0] != L'\0' ){ //現在編集中のファイルのパス //@@@ 2002.04.18 WCHAR szDrive[_MAX_DRIVE]; WCHAR szDir[_MAX_DIR]; @@ -751,7 +751,7 @@ bool CDlgOpenFile_CommonFileDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi pData->m_ofn.hInstance = CSelectLang::getLangRsrcInstance(); pData->m_ofn.lpstrFilter = cFileExt.GetExtFilter(); // From Here Jun. 23, 2002 genta - // 「開く」での初期フォルダチェック強化 + // 「開く」での初期フォルダーチェック強化 // 2005/02/20 novice デフォルトのファイル名は何も設定しない { WCHAR szDrive[_MAX_DRIVE]; @@ -1171,7 +1171,7 @@ void CDlgOpenFile_CommonFileDialog::InitLayout( HWND hwndOpenDlg, HWND hwndDlg, hwndCtrl = ::GetWindow( hwndCtrl, GW_HWNDNEXT ); } - // 標準コントロールのプレースフォルダ（stc32）と子ダイアログの幅をオープンダイアログの幅にあわせる + // 標準コントロールのプレースフォルダー（stc32）と子ダイアログの幅をオープンダイアログの幅にあわせる // WM_INITDIALOG を抜けるとさらにオープンダイアログ側で現在の位置関係からレイアウト調整が行われる // ここで以下の処理をやっておかないとコントロールが意図しない場所に動いてしまうことがある // （例えば、BOM のチェックボックスが画面外に飛んでしまうなど） @@ -1180,7 +1180,7 @@ void CDlgOpenFile_CommonFileDialog::InitLayout( HWND hwndOpenDlg, HWND hwndDlg, ::GetClientRect( hwndOpenDlg, &rc ); nWidth = rc.right - rc.left; - // 標準コントロールプレースフォルダの幅を変更する + // 標準コントロールプレースフォルダーの幅を変更する hwndCtrl = ::GetDlgItem( hwndDlg, stc32 ); ::GetWindowRect( hwndCtrl, &rc ); ::SetWindowPos( hwndCtrl, 0, 0, 0, nWidth, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER ); diff --git a/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp index 3cd6ae2134..81e4d6b6a0 100644 --- a/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp +++ b/sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp @@ -439,7 +439,7 @@ void CDlgOpenFile_CommonItemDialog::Create( m_strDefaultWildCard = pszUserWildCard; } - /* 「開く」での初期フォルダ */ + /* 「開く」での初期フォルダー */ if( pszDefaultPath && pszDefaultPath[0] != L'\0' ){ //現在編集中のファイルのパス //@@@ 2002.04.18 WCHAR szDrive[_MAX_DRIVE]; WCHAR szDir[_MAX_DIR]; diff --git a/sakura_core/dlg/CDlgPluginOption.cpp b/sakura_core/dlg/CDlgPluginOption.cpp index f1b903e631..d188b5f33c 100644 --- a/sakura_core/dlg/CDlgPluginOption.cpp +++ b/sakura_core/dlg/CDlgPluginOption.cpp @@ -710,7 +710,7 @@ void CDlgPluginOption::SelectDirectory( int iLine ) { WCHAR szDir[_MAX_PATH+1]; - /* 検索フォルダ */ + /* 検索フォルダー */ ::DlgItem_GetText( GetHwnd(), IDC_EDIT_PLUGIN_OPTION_DIR, szDir, _countof(szDir) ); if (_IS_REL_PATH( szDir )) { diff --git a/sakura_core/dlg/CDlgTagJumpList.cpp b/sakura_core/dlg/CDlgTagJumpList.cpp index 02f31d6741..6e5c69abed 100644 --- a/sakura_core/dlg/CDlgTagJumpList.cpp +++ b/sakura_core/dlg/CDlgTagJumpList.cpp @@ -1136,7 +1136,7 @@ int CDlgTagJumpList::find_key_core( } WCHAR szTagFile[1024]; //タグファイル - WCHAR szNextPath[1024]; //次検索フォルダ + WCHAR szNextPath[1024]; //次検索フォルダー szNextPath[0] = L'\0'; vector_ex seachDirs; @@ -1616,7 +1616,7 @@ int CDlgTagJumpList::CalcMaxUpDirectory( const WCHAR* p ) { int loop = CalcDirectoryDepth( p ); if( loop < 0 ) loop = 0; - if( loop > (_MAX_PATH/2) ) loop = (_MAX_PATH/2); //\A\B\C...のようなとき1フォルダで2文字消費するので... + if( loop > (_MAX_PATH/2) ) loop = (_MAX_PATH/2); //\A\B\C...のようなとき1フォルダーで2文字消費するので... return loop; } @@ -1675,7 +1675,7 @@ WCHAR* CDlgTagJumpList::CopyDirDir( WCHAR* dest, const WCHAR* target, const WCHA } /* - @param dir [in,out] フォルダのパス + @param dir [in,out] フォルダーのパス in == C:\dir\subdir\ out == C:\dir\ */ diff --git a/sakura_core/dlg/CDlgTagsMake.cpp b/sakura_core/dlg/CDlgTagsMake.cpp index dec592d1e0..b737a5957c 100644 --- a/sakura_core/dlg/CDlgTagsMake.cpp +++ b/sakura_core/dlg/CDlgTagsMake.cpp @@ -45,11 +45,11 @@ #include "String_define.h" const DWORD p_helpids[] = { //13700 - IDC_EDIT_TAG_MAKE_FOLDER, HIDC_EDIT_TAG_MAKE_FOLDER, //タグ作成フォルダ + IDC_EDIT_TAG_MAKE_FOLDER, HIDC_EDIT_TAG_MAKE_FOLDER, //タグ作成フォルダー IDC_BUTTON_TAG_MAKE_REF, HIDC_BUTTON_TAG_MAKE_REF, //参照 IDC_BUTTON_FOLDER_UP, HIDC_BUTTON_TAG_MAKE_FOLDER_UP, // 上 IDC_EDIT_TAG_MAKE_CMDLINE, HIDC_EDIT_TAG_MAKE_CMDLINE, //コマンドライン - IDC_CHECK_TAG_MAKE_RECURSE, HIDC_CHECK_TAG_MAKE_RECURSE, //サブフォルダも対象 + IDC_CHECK_TAG_MAKE_RECURSE, HIDC_CHECK_TAG_MAKE_RECURSE, //サブフォルダーも対象 IDOK, HIDC_TAG_MAKE_IDOK, IDCANCEL, HIDC_TAG_MAKE_IDCANCEL, IDC_BUTTON_HELP, HIDC_BUTTON_TAG_MAKE_HELP, @@ -117,7 +117,7 @@ BOOL CDlgTagsMake::OnBnClicked( int wID ) } /*! - フォルダを選択する + フォルダーを選択する @param hwndDlg [in] ダイアログボックスのウィンドウハンドル */ @@ -125,7 +125,7 @@ void CDlgTagsMake::SelectFolder( HWND hwndDlg ) { WCHAR szPath[_MAX_PATH + 1]; - /* フォルダ */ + /* フォルダー */ ::DlgItem_GetText( hwndDlg, IDC_EDIT_TAG_MAKE_FOLDER, szPath, _MAX_PATH ); if( SelectDir( hwndDlg, LS(STR_DLGTAGMAK_SELECTDIR), szPath, szPath ) ) @@ -140,7 +140,7 @@ void CDlgTagsMake::SelectFolder( HWND hwndDlg ) /* ダイアログデータの設定 */ void CDlgTagsMake::SetData( void ) { - //作成フォルダ + //作成フォルダー Combo_LimitText( GetItemHwnd( IDC_EDIT_TAG_MAKE_FOLDER ), _countof( m_szPath ) ); ::DlgItem_SetText( GetHwnd(), IDC_EDIT_TAG_MAKE_FOLDER, m_szPath ); @@ -160,7 +160,7 @@ void CDlgTagsMake::SetData( void ) /* TRUE==正常 FALSE==入力エラー */ int CDlgTagsMake::GetData( void ) { - //フォルダ + //フォルダー ::DlgItem_GetText( GetHwnd(), IDC_EDIT_TAG_MAKE_FOLDER, m_szPath, _countof( m_szPath ) ); int length = wcslen( m_szPath ); if( length > 0 ) diff --git a/sakura_core/dlg/CDlgTagsMake.h b/sakura_core/dlg/CDlgTagsMake.h index 397c549094..1f88b910d9 100644 --- a/sakura_core/dlg/CDlgTagsMake.h +++ b/sakura_core/dlg/CDlgTagsMake.h @@ -52,7 +52,7 @@ class CDlgTagsMake final : public CDialog */ int DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam, const WCHAR* pszPath ); /* モーダルダイアログの表示 */ - WCHAR m_szPath[_MAX_PATH+1]; /* フォルダ */ + WCHAR m_szPath[_MAX_PATH+1]; /* フォルダー */ WCHAR m_szTagsCmdLine[_MAX_PATH]; /* コマンドラインオプション(個別) */ int m_nTagsOpt; /* CTAGSオプション(チェック) */ diff --git a/sakura_core/doc/CDocFileOperation.cpp b/sakura_core/doc/CDocFileOperation.cpp index b155ed596a..9cd51c6f0d 100644 --- a/sakura_core/doc/CDocFileOperation.cpp +++ b/sakura_core/doc/CDocFileOperation.cpp @@ -80,10 +80,10 @@ void CDocFileOperation::DoFileUnlock() // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // /* 「ファイルを開く」ダイアログ */ -// Mar. 30, 2003 genta ファイル名未定時の初期ディレクトリをカレントフォルダに +// Mar. 30, 2003 genta ファイル名未定時の初期ディレクトリをカレントフォルダーに bool CDocFileOperation::OpenFileDialog( HWND hwndParent, //!< [in] - const WCHAR* pszOpenFolder, //!< [in] NULL以外を指定すると初期フォルダを指定できる + const WCHAR* pszOpenFolder, //!< [in] NULL以外を指定すると初期フォルダーを指定できる SLoadInfo* pLoadInfo, //!< [in,out] ロード情報 std::vector& files ) @@ -97,7 +97,7 @@ bool CDocFileOperation::OpenFileDialog( G_AppInstance(), hwndParent, L"*.*", - pszOpenFolder ? pszOpenFolder : CSakuraEnvironment::GetDlgInitialDir().c_str(), // 初期フォルダ + pszOpenFolder ? pszOpenFolder : CSakuraEnvironment::GetDlgInitialDir().c_str(), // 初期フォルダー CMRUFile().GetPathList(), // MRUリストのファイルのリスト CMRUFolder().GetPathList() // OPENFOLDERリストのファイルのリスト ); @@ -216,7 +216,7 @@ void CDocFileOperation::ReloadCurrentFile( /*! 「ファイル名を付けて保存」ダイアログ @date 2001.02.09 genta 改行コードを示す引数追加 - @date 2003.03.30 genta ファイル名未定時の初期ディレクトリをカレントフォルダに + @date 2003.03.30 genta ファイル名未定時の初期ディレクトリをカレントフォルダーに @date 2003.07.20 ryoji BOMの有無を示す引数追加 @date 2006.11.10 ryoji ユーザー指定の拡張子を状況依存で変化させる */ @@ -284,9 +284,9 @@ bool CDocFileOperation::SaveFileDialog( G_AppInstance(), CEditWnd::getInstance()->GetHwnd(), strDefaultWildCard.c_str(), - CSakuraEnvironment::GetDlgInitialDir().c_str(), // 初期フォルダ + CSakuraEnvironment::GetDlgInitialDir().c_str(), // 初期フォルダー CMRUFile().GetPathList(), // 最近のファイル - CMRUFolder().GetPathList() // 最近のフォルダ + CMRUFolder().GetPathList() // 最近のフォルダー ); return cDlgOpenFile.DoModalSaveDlg( pSaveInfo, pSaveInfo->eCharCode == CODE_CODEMAX ); } diff --git a/sakura_core/doc/CDocFileOperation.h b/sakura_core/doc/CDocFileOperation.h index 404366a70c..9f4d0f7066 100644 --- a/sakura_core/doc/CDocFileOperation.h +++ b/sakura_core/doc/CDocFileOperation.h @@ -44,7 +44,7 @@ class CDocFileOperation{ //ロードUI bool OpenFileDialog( HWND hwndParent, - const WCHAR* pszOpenFolder, //!< [in] NULL以外を指定すると初期フォルダを指定できる + const WCHAR* pszOpenFolder, //!< [in] NULL以外を指定すると初期フォルダーを指定できる SLoadInfo* pLoadInfo, //!< [in,out] ロード情報 std::vector& files ); diff --git a/sakura_core/env/CFileNameManager.cpp b/sakura_core/env/CFileNameManager.cpp index 914d9a76be..848f25e989 100644 --- a/sakura_core/env/CFileNameManager.cpp +++ b/sakura_core/env/CFileNameManager.cpp @@ -117,7 +117,7 @@ int CFileNameManager::TransformFileName_MakeCache( void ){ return nCount; } -/*! ファイル・フォルダ名を置換して、簡易表示名を取得する +/*! ファイル・フォルダー名を置換して、簡易表示名を取得する @date 2002.11.27 Moca 新規作成 @note 大小文字を区別しない。nDestLenに達したときは後ろを切り捨てられる */ @@ -213,13 +213,13 @@ bool CFileNameManager::ExpandMetaToFolder( LPCWSTR pszSrc, LPWSTR pszDes, int nD ps++; // %SAKURA% if( 0 == wmemicmp( L"SAKURA%", ps, 7 ) ){ - // exeのあるフォルダ + // exeのあるフォルダー GetExedir( szPath ); nMetaLen = 6; } // %SAKURADATA% // 2007.06.06 ryoji else if( 0 == wmemicmp( L"SAKURADATA%", ps, 11 ) ){ - // iniのあるフォルダ + // iniのあるフォルダー GetInidir( szPath ); nMetaLen = 10; } @@ -298,7 +298,7 @@ bool CFileNameManager::ExpandMetaToFolder( LPCWSTR pszSrc, LPWSTR pszDes, int nD } } - // 最後のフォルダ区切り記号を削除する + // 最後のフォルダー区切り記号を削除する // [A:\]などのルートであっても削除 for(nPathLen = 0; pStr2[nPathLen] != L'\0'; nPathLen++ ){ #ifdef _MBCS diff --git a/sakura_core/env/CSakuraEnvironment.cpp b/sakura_core/env/CSakuraEnvironment.cpp index 93c085a38b..a8472a4474 100644 --- a/sakura_core/env/CSakuraEnvironment.cpp +++ b/sakura_core/env/CSakuraEnvironment.cpp @@ -85,8 +85,8 @@ wchar_t* ExParam_LongName( wchar_t* q, wchar_t* q_max, EExpParamName eLongParam @li / 開いているファイルの名前（フルパス。パスの区切りが/） @li N 開いているファイルの名前(簡易表示) @li n 無題の通し番号 - @li E 開いているファイルのあるフォルダの名前(簡易表示) - @li e 開いているファイルのあるフォルダの名前 + @li E 開いているファイルのあるフォルダーの名前(簡易表示) + @li e 開いているファイルのあるフォルダーの名前 @li B タイプ別設定の名前 @li b 開いているファイルの拡張子 @li Q 印刷ページ設定の名前 @@ -241,7 +241,7 @@ void CSakuraEnvironment::ExpandParameter(const wchar_t* pszSource, wchar_t* pszB } ++p; break; - case L'E': // 開いているファイルのあるフォルダの名前(簡易表示) 2012/12/2 Uchi + case L'E': // 開いているファイルのあるフォルダーの名前(簡易表示) 2012/12/2 Uchi if( !pcDoc->m_cDocFile.GetFilePathClass().IsValidPath() ){ q = wcs_pushW( q, q_max - q, NO_TITLE.c_str(), NO_TITLE_LEN ); } @@ -273,7 +273,7 @@ void CSakuraEnvironment::ExpandParameter(const wchar_t* pszSource, wchar_t* pszB } ++p; break; - case L'e': // 開いているファイルのあるフォルダの名前 2012/12/2 Uchi + case L'e': // 開いているファイルのあるフォルダーの名前 2012/12/2 Uchi if( !pcDoc->m_cDocFile.GetFilePathClass().IsValidPath() ){ q = wcs_pushW( q, q_max - q, NO_TITLE.c_str(), NO_TITLE_LEN ); } @@ -706,10 +706,10 @@ wchar_t* ExParam_LongName( wchar_t* q, wchar_t* q_max, EExpParamName eLongParam return q; } -/*! @brief 初期フォルダ取得 +/*! @brief 初期フォルダー取得 @param bControlProcess [in] trueのときはOPENDIALOGDIR_CUR->OPENDIALOGDIR_MRUに変更 - @return 初期フォルダ + @return 初期フォルダー */ std::wstring CSakuraEnvironment::GetDlgInitialDir(bool bControlProcess) { diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index 39d4b36613..6b0329b2fb 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -183,7 +183,7 @@ bool CShareData::InitShareData() auto iniPath = GetExeFileName().replace_extension(L".ini"); m_pShareData->m_szIniFile = iniPath.c_str(); - // 設定ファイルフォルダ + // 設定ファイルフォルダー WCHAR szIniFolder[_MAX_PATH]; GetInidir(szIniFolder); @@ -235,7 +235,7 @@ bool CShareData::InitShareData() CommonSetting_General& sGeneral = m_pShareData->m_Common.m_sGeneral; sGeneral.m_nMRUArrNum_MAX = 15; /* ファイルの履歴MAX */ //Oct. 14, 2000 JEPRO 少し増やした(10→15) - sGeneral.m_nOPENFOLDERArrNum_MAX = 15; /* フォルダの履歴MAX */ //Oct. 14, 2000 JEPRO 少し増やした(10→15) + sGeneral.m_nOPENFOLDERArrNum_MAX = 15; /* フォルダーの履歴MAX */ //Oct. 14, 2000 JEPRO 少し増やした(10→15) sGeneral.m_nCaretType = 0; /* カーソルのタイプ 0=win 1=dos */ sGeneral.m_bIsINSMode = true; /* 挿入／上書きモード */ @@ -401,8 +401,8 @@ bool CShareData::InitShareData() sBackup.m_bBackUp = false; /* バックアップの作成 */ sBackup.m_bBackUpDialog = true; /* バックアップの作成前に確認 */ - sBackup.m_bBackUpFolder = false; /* 指定フォルダにバックアップを作成する */ - sBackup.m_szBackUpFolder[0] = L'\0'; /* バックアップを作成するフォルダ */ + sBackup.m_bBackUpFolder = false; /* 指定フォルダーにバックアップを作成する */ + sBackup.m_szBackUpFolder[0] = L'\0'; /* バックアップを作成するフォルダー */ sBackup.m_nBackUpType = 2; /* バックアップファイル名のタイプ 1=(.bak) 2=*_日付.* */ sBackup.m_nBackUpType_Opt1 = BKUP_YEAR | BKUP_MONTH | BKUP_DAY; /* バックアップファイル名：日付 */ sBackup.m_nBackUpType_Opt2 = ('b' << 16 ) + 10; /* バックアップファイル名：連番の数と先頭文字 */ @@ -411,8 +411,8 @@ bool CShareData::InitShareData() sBackup.m_nBackUpType_Opt5 = 0; /* バックアップファイル名：Option5 */ sBackup.m_nBackUpType_Opt6 = 0; /* バックアップファイル名：Option6 */ sBackup.m_bBackUpDustBox = false; /* バックアップファイルをごみ箱に放り込む */ //@@@ 2001.12.11 add MIK - sBackup.m_bBackUpPathAdvanced = false; /* 20051107 aroka バックアップ先フォルダを詳細設定する */ - sBackup.m_szBackUpPathAdvanced[0] = L'\0'; /* 20051107 aroka バックアップを作成するフォルダの詳細設定 */ + sBackup.m_bBackUpPathAdvanced = false; /* 20051107 aroka バックアップ先フォルダーを詳細設定する */ + sBackup.m_szBackUpPathAdvanced[0] = L'\0'; /* 20051107 aroka バックアップを作成するフォルダーの詳細設定 */ } // [書式]タブ @@ -443,7 +443,7 @@ bool CShareData::InitShareData() sSearch.m_bSelectedArea = FALSE; // 選択範囲内置換 sSearch.m_bNOTIFYNOTFOUND = TRUE; /* 検索／置換 見つからないときメッセージを表示 */ - sSearch.m_bGrepSubFolder = TRUE; /* Grep: サブフォルダも検索 */ + sSearch.m_bGrepSubFolder = TRUE; /* Grep: サブフォルダーも検索 */ sSearch.m_nGrepOutputLineType = 1; // Grep: 行を出力/該当部分/否マッチ行 を出力 sSearch.m_nGrepOutputStyle = 1; /* Grep: 出力形式 */ sSearch.m_bGrepOutputFileOnly = false; @@ -451,7 +451,7 @@ bool CShareData::InitShareData() sSearch.m_bGrepSeparateFolder = false; sSearch.m_bGrepBackup = true; - sSearch.m_bGrepDefaultFolder=FALSE; /* Grep: フォルダの初期値をカレントフォルダにする */ + sSearch.m_bGrepDefaultFolder=FALSE; /* Grep: フォルダーの初期値をカレントフォルダーにする */ sSearch.m_nGrepCharSet = CODE_AUTODETECT; /* Grep: 文字コードセット */ sSearch.m_bGrepRealTimeView = FALSE; /* 2003.06.28 Moca Grep結果のリアルタイム表示 */ sSearch.m_bCaretTextForSearch = TRUE; /* 2006.08.23 ryoji カーソル位置の文字列をデフォルトの検索文字列にする */ @@ -583,7 +583,7 @@ bool CShareData::InitShareData() } // To Here Sep. 14, 2001 genta - wcscpy( sMacro.m_szMACROFOLDER, szIniFolder ); /* マクロ用フォルダ */ + wcscpy( sMacro.m_szMACROFOLDER, szIniFolder ); /* マクロ用フォルダー */ sMacro.m_nMacroOnOpened = -1; /* オープン後自動実行マクロ番号 */ //@@@ 2006.09.01 ryoji sMacro.m_nMacroOnTypeChanged = -1; /* タイプ変更後自動実行マクロ番号 */ //@@@ 2006.09.01 ryoji @@ -712,7 +712,7 @@ bool CShareData::InitShareData() m_pShareData->m_sHistory.m_aExceptMRU.clear(); - wcscpy( m_pShareData->m_sHistory.m_szIMPORTFOLDER, szIniFolder ); /* 設定インポート用フォルダ */ + wcscpy( m_pShareData->m_sHistory.m_szIMPORTFOLDER, szIniFolder ); /* 設定インポート用フォルダー */ m_pShareData->m_sHistory.m_aCommands.clear(); m_pShareData->m_sHistory.m_aCurDirs.clear(); @@ -918,7 +918,7 @@ BOOL CShareData::IsPathOpened( const WCHAR* pszPath, HWND* phwndOwner ) @note CEditDoc::FileLoadに先立って実行されることもあるが、 CEditDoc::FileLoadからも実行される必要があることに注意。 - (フォルダ指定の場合やCEditDoc::FileLoadが直接実行される場合もあるため) + (フォルダー指定の場合やCEditDoc::FileLoadが直接実行される場合もあるため) @retval TRUE すでに開いていた @retval FALSE 開いていなかった @@ -1066,9 +1066,9 @@ bool CShareData::OpenDebugWindow( HWND hwnd, bool bAllwaysActive ) } /*! - 設定フォルダがEXEフォルダと別かどうかを返す + 設定フォルダーがEXEフォルダーと別かどうかを返す - iniファイルの保存先がユーザー別設定フォルダかどうか 2007.05.25 ryoji + iniファイルの保存先がユーザー別設定フォルダーかどうか 2007.05.25 ryoji */ [[nodiscard]] bool CShareData::IsPrivateSettings( void ) const noexcept { @@ -1078,7 +1078,7 @@ bool CShareData::OpenDebugWindow( HWND hwnd, bool bAllwaysActive ) /* CShareData::CheckMRUandOPENFOLDERList MRUとOPENFOLDERリストの存在チェックなど - 存在しないファイルやフォルダはMRUやOPENFOLDERリストから削除する + 存在しないファイルやフォルダーはMRUやOPENFOLDERリストから削除する @note 現在は使われていないようだ。 @par History @@ -1124,21 +1124,21 @@ int CShareData::GetMacroFilename( int idx, WCHAR *pszPath, int nBufLen ) int nLen = wcslen( ptr ); // Jul. 21, 2003 genta wcslen対象が誤っていたためマクロ実行ができない if( !_IS_REL_PATH( pszFile ) // 絶対パス - || m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER[0] == L'\0' ){ // フォルダ指定なし + || m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER[0] == L'\0' ){ // フォルダー指定なし if( pszPath == NULL || nBufLen <= nLen ){ return -nLen; } wcscpy( pszPath, pszFile ); return nLen; } - else { // フォルダ指定あり + else { // フォルダー指定あり // 相対パス→絶対パス int nFolderSep = AddLastChar( m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER, _countof2(m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER), L'\\' ); int nAllLen; WCHAR *pszDir; WCHAR szDir[_MAX_PATH + _countof2( m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER )]; - // 2003.06.24 Moca フォルダも相対パスなら実行ファイルからのパス + // 2003.06.24 Moca フォルダーも相対パスなら実行ファイルからのパス // 2007.05.19 ryoji 相対パスは設定ファイルからのパスを優先 if( _IS_REL_PATH( m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER ) ){ GetInidirOrExedir( szDir, m_pShareData->m_Common.m_sMacro.m_szMACROFOLDER ); diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index d679f81e86..2481ee42ee 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -362,7 +362,7 @@ void CShareData_IO::ShareData_IO_Grep( CDataProfile& cProfile ) cProfile.IOProfileData(pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aExcludeFiles[i]); } - /* 除外フォルダパターン */ + /* 除外フォルダーパターン */ cProfile.IOProfileData(pszSecName, LTEXT("_GREPEXCLUDEFOLDER_Counts"), pShare->m_sSearchKeywords.m_aExcludeFolders._GetSizeRef()); pShare->m_sSearchKeywords.m_aExcludeFolders.SetSizeLimit(); nSize = pShare->m_sSearchKeywords.m_aExcludeFolders.size(); @@ -383,9 +383,9 @@ void CShareData_IO::ShareData_IO_Folders( CDataProfile& cProfile ) DLLSHAREDATA* pShare = &GetDllShareData(); const WCHAR* pszSecName = LTEXT("Folders"); - /* マクロ用フォルダ */ + /* マクロ用フォルダー */ cProfile.IOProfileData( pszSecName, LTEXT("szMACROFOLDER"), pShare->m_Common.m_sMacro.m_szMACROFOLDER ); - /* 設定インポート用フォルダ */ + /* 設定インポート用フォルダー */ cProfile.IOProfileData( pszSecName, LTEXT("szIMPORTFOLDER"), pShare->m_sHistory.m_szIMPORTFOLDER ); } @@ -559,7 +559,7 @@ void CShareData_IO::ShareData_IO_Common( CDataProfile& cProfile ) int nDummy; int nCharChars; nDummy = wcslen( common.m_sBackup.m_szBackUpFolder ); - /* フォルダの最後が「半角かつ'\\'」でない場合は、付加する */ + /* フォルダーの最後が「半角かつ'\\'」でない場合は、付加する */ nCharChars = &common.m_sBackup.m_szBackUpFolder[nDummy] - CNativeW::GetCharPrev( common.m_sBackup.m_szBackUpFolder, nDummy, &common.m_sBackup.m_szBackUpFolder[nDummy] ); if( 1 == nCharChars && common.m_sBackup.m_szBackUpFolder[nDummy - 1] == '\\' ){ @@ -572,7 +572,7 @@ void CShareData_IO::ShareData_IO_Common( CDataProfile& cProfile ) int nDummy; int nCharChars; nDummy = wcslen( common.m_sBackup.m_szBackUpFolder ); - /* フォルダの最後が「半角かつ'\\'」でない場合は、付加する */ + /* フォルダーの最後が「半角かつ'\\'」でない場合は、付加する */ nCharChars = &common.m_sBackup.m_szBackUpFolder[nDummy] - CNativeW::GetCharPrev( common.m_sBackup.m_szBackUpFolder, nDummy, &common.m_sBackup.m_szBackUpFolder[nDummy] ); if( 1 == nCharChars && common.m_sBackup.m_szBackUpFolder[nDummy - 1] == '\\' ){ diff --git a/sakura_core/env/CommonSetting.h b/sakura_core/env/CommonSetting.h index 1e5349d251..7d5bd46e45 100644 --- a/sakura_core/env/CommonSetting.h +++ b/sakura_core/env/CommonSetting.h @@ -86,7 +86,7 @@ struct CommonSetting_General //履歴 int m_nMRUArrNum_MAX; //!< ファイルの履歴MAX - int m_nOPENFOLDERArrNum_MAX; //!< フォルダの履歴MAX + int m_nOPENFOLDERArrNum_MAX; //!< フォルダーの履歴MAX //ノーカテゴリ BOOL m_bCloseAllConfirm; //!< [すべて閉じる]で他に編集用のウィンドウがあれば確認する // 2006.12.25 ryoji @@ -206,9 +206,9 @@ struct CommonSetting_TabBar // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // //! ファイルダイアログの初期位置 enum EOpenDialogDir{ - OPENDIALOGDIR_CUR, //!< カレントフォルダ - OPENDIALOGDIR_MRU, //!< 最近使ったフォルダ - OPENDIALOGDIR_SEL, //!< 指定フォルダ + OPENDIALOGDIR_CUR, //!< カレントフォルダー + OPENDIALOGDIR_MRU, //!< 最近使ったフォルダー + OPENDIALOGDIR_SEL, //!< 指定フォルダー }; struct CommonSetting_Edit @@ -234,7 +234,7 @@ struct CommonSetting_Edit BOOL m_bSelectClickedURL; //!< URLがクリックされたら選択するか EOpenDialogDir m_eOpenDialogDir; //!< ファイルダイアログの初期位置 - SFilePath m_OpenDialogSelDir; //!< 指定フォルダ + SFilePath m_OpenDialogSelDir; //!< 指定フォルダー bool m_bEnableExtEol; //!< NEL,PS,LSを改行コードとして利用する bool m_bBoxSelectLock; //!< (矩形選択)移動でロックする @@ -350,9 +350,9 @@ struct CommonSetting_Backup public: bool m_bBackUp; //!< 保存時にバックアップを作成する bool m_bBackUpDialog; //!< バックアップの作成前に確認 - bool m_bBackUpFolder; //!< 指定フォルダにバックアップを作成する - bool m_bBackUpFolderRM; //!< 指定フォルダにバックアップを作成する(リムーバブルメディアのみ) - SFilePath m_szBackUpFolder; //!< バックアップを作成するフォルダ + bool m_bBackUpFolder; //!< 指定フォルダーにバックアップを作成する + bool m_bBackUpFolderRM; //!< 指定フォルダーにバックアップを作成する(リムーバブルメディアのみ) + SFilePath m_szBackUpFolder; //!< バックアップを作成するフォルダー int m_nBackUpType; //!< バックアップファイル名のタイプ 1=(.bak) 2=*_日付.* int m_nBackUpType_Opt1; //!< バックアップファイル名：オプション1 int m_nBackUpType_Opt2; //!< バックアップファイル名：オプション2 @@ -361,8 +361,8 @@ struct CommonSetting_Backup int m_nBackUpType_Opt5; //!< バックアップファイル名：オプション5 int m_nBackUpType_Opt6; //!< バックアップファイル名：オプション6 bool m_bBackUpDustBox; //!< バックアップファイルをごみ箱に放り込む //@@@ 2001.12.11 add MIK - bool m_bBackUpPathAdvanced; //!< バックアップ先フォルダを詳細設定する 20051107 aroka - SFilePath m_szBackUpPathAdvanced; //!< バックアップを作成するフォルダの詳細設定 20051107 aroka + bool m_bBackUpPathAdvanced; //!< バックアップ先フォルダーを詳細設定する 20051107 aroka + SFilePath m_szBackUpPathAdvanced; //!< バックアップを作成するフォルダーの詳細設定 20051107 aroka }; // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // @@ -398,14 +398,14 @@ struct CommonSetting_Search int m_bNOTIFYNOTFOUND; //!< 検索／置換 見つからないときメッセージを表示 int m_bSelectedArea; //!< 置換 選択範囲内置換 - int m_bGrepSubFolder; //!< Grep: サブフォルダも検索 + int m_bGrepSubFolder; //!< Grep: サブフォルダーも検索 int m_nGrepOutputLineType; //!< Grep: 行を出力/該当部分/否マッチ行 を出力 int m_nGrepOutputStyle; //!< Grep: 出力形式 - int m_bGrepDefaultFolder; //!< Grep: フォルダの初期値をカレントフォルダにする + int m_bGrepDefaultFolder; //!< Grep: フォルダーの初期値をカレントフォルダーにする ECodeType m_nGrepCharSet; //!< Grep: 文字コードセット // 2002/09/20 Moca Add bool m_bGrepOutputFileOnly; //!< Grep: ファイル毎最初のみ検索 - bool m_bGrepOutputBaseFolder; //!< Grep: ベースフォルダ表示 - bool m_bGrepSeparateFolder; //!< Grep: フォルダ毎に表示 + bool m_bGrepOutputBaseFolder; //!< Grep: ベースフォルダー表示 + bool m_bGrepSeparateFolder; //!< Grep: フォルダー毎に表示 bool m_bGrepBackup; //!< Grep: バックアップ作成 BOOL m_bCaretTextForSearch; //!< カーソル位置の文字列をデフォルトの検索文字列にする 2006.08.23 ryoji @@ -508,7 +508,7 @@ struct CommonSetting_Macro { WCHAR m_szKeyMacroFileName[MAX_PATH]; //!< キーボードマクロのファイル名 MacroRec m_MacroTable[MAX_CUSTMACRO]; //!< キー割り当て用マクロテーブル Sep. 14, 2001 genta - SFilePath m_szMACROFOLDER; //!< マクロ用フォルダ + SFilePath m_szMACROFOLDER; //!< マクロ用フォルダー int m_nMacroOnOpened; //!< オープン後自動実行マクロ番号 @@@ 2006.09.01 ryoji int m_nMacroOnTypeChanged; //!< タイプ変更後自動実行マクロ番号 @@@ 2006.09.01 ryoji int m_nMacroOnSave; //!< 保存前自動実行マクロ番号 @@@ 2006.09.01 ryoji @@ -550,7 +550,7 @@ enum EFileTreeItemType{ struct SFileTreeItem{ public: EFileTreeItemType m_eFileTreeItemType; - SFilePath m_szTargetPath; //!< フォルダorファイルパス + SFilePath m_szTargetPath; //!< フォルダーorファイルパス StaticString m_szLabelName; //!< ラベル名(""のときはファイル名を使う) int m_nDepth; //!< 階層 @@ -673,7 +673,7 @@ enum EPluginState { struct PluginRec { WCHAR m_szId[MAX_PLUGIN_ID]; //!< プラグインID - WCHAR m_szName[MAX_PLUGIN_NAME]; //!< プラグインフォルダ/設定ファイル名 + WCHAR m_szName[MAX_PLUGIN_NAME]; //!< プラグインフォルダー/設定ファイル名 EPluginState m_state; //!< プラグイン状態。設定ファイルに保存せずメモリ上のみ。 int m_nCmdNum; //!< プラグイン コマンドの数 // 2010/7/3 Uchi }; diff --git a/sakura_core/func/CKeyBind.cpp b/sakura_core/func/CKeyBind.cpp index 7349da80a1..826ce2f593 100644 --- a/sakura_core/func/CKeyBind.cpp +++ b/sakura_core/func/CKeyBind.cpp @@ -461,7 +461,7 @@ WCHAR* CKeyBind::GetMenuLabel( if( bKeyStr ){ CNativeW cMemAccessKey; // 2010.07.11 Moca メニューラベルの「\t」の付加条件変更 - // [ファイル/フォルダ/ウィンドウ一覧以外]から[アクセスキーがあるときのみ]に付加するように変更 + // [ファイル/フォルダー/ウィンドウ一覧以外]から[アクセスキーがあるときのみ]に付加するように変更 /* 機能に対応するキー名の取得 */ if( GetKeyStr( hInstance, nKeyNameArrNum, pKeyNameArr, cMemAccessKey, nFuncId, bGetDefFuncCode ) ){ // バッファが足りないときは入れない diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index a9eceab666..e46e5f4f01 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -281,7 +281,7 @@ const EFunctionCode pnFuncList_Clip[] = { //Oct. 16, 2000 JEPRO 変数名変更( F_COPY_COLOR_HTML_LINENUMBER, //選択範囲内行番号色付きHTMLコピー F_COPYFNAME , //このファイル名をクリップボードにコピー //2002/2/3 aroka F_COPYPATH , //このファイルのパス名をクリップボードにコピー - F_COPYDIRPATH , //このファイルのフォルダ名をクリップボードにコピー + F_COPYDIRPATH , //このファイルのフォルダー名をクリップボードにコピー F_COPYTAG , //このファイルのパス名とカーソル位置をコピー //Sept. 14, 2000 JEPRO メニューに合わせて下に移動 F_CREATEKEYBINDLIST //キー割り当て一覧をコピー //Sept. 15, 2000 JEPRO IDM_TESTのままではうまくいかないのでFに変えて登録 //Dec. 25, 2000 復活 }; @@ -293,7 +293,7 @@ const EFunctionCode pnFuncList_Insert[] = { F_INS_TIME , // 時刻挿入 F_CTRL_CODE_DIALOG , // コントロールコードの入力 F_INS_FILE_USED_RECENTLY, // 最近使ったファイル挿入 - F_INS_FOLDER_USED_RECENTLY, // 最近使ったフォルダ挿入 + F_INS_FOLDER_USED_RECENTLY, // 最近使ったフォルダー挿入 }; const int nFincList_Insert_Num = _countof( pnFuncList_Insert ); @@ -751,7 +751,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_COPYDIRPATH: 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「リスト」を「一覧」に変更 @@ -970,7 +970,7 @@ int FuncID_To_HelpContextID( EFunctionCode nFuncID ) if( IDM_SELMRU <= nFuncID && nFuncID < IDM_SELMRU + MAX_MRU ){ return HLP000029; //最近使ったファイル }else if( IDM_SELOPENFOLDER <= nFuncID && nFuncID < IDM_SELOPENFOLDER + MAX_OPENFOLDER ){ - return HLP000023; //最近使ったフォルダ + return HLP000023; //最近使ったフォルダー }else if( IDM_SELWINDOW <= nFuncID && nFuncID < IDM_SELWINDOW + MAX_EDITWINDOWS ){ return HLP000097; //ウィンドウリスト }else if( F_USERMACRO_0 <= nFuncID && nFuncID < F_USERMACRO_0 + MAX_CUSTMACRO ){ diff --git a/sakura_core/io/CZipFile.cpp b/sakura_core/io/CZipFile.cpp index 80dd3d6f10..143b38f689 100644 --- a/sakura_core/io/CZipFile.cpp +++ b/sakura_core/io/CZipFile.cpp @@ -77,7 +77,7 @@ bool CZipFile::SetZip(const std::wstring& sZipPath) return true; } -// ZIP File 内 フォルダ名取得と定義ファイル検査(Plugin用) +// ZIP File 内 フォルダー名取得と定義ファイル検査(Plugin用) bool CZipFile::ChkPluginDef(const std::wstring& sDefFile, std::wstring& sFolderName) { HRESULT hr; diff --git a/sakura_core/io/CZipFile.h b/sakura_core/io/CZipFile.h index c9733bab80..309b9b26a2 100644 --- a/sakura_core/io/CZipFile.h +++ b/sakura_core/io/CZipFile.h @@ -51,7 +51,7 @@ class CZipFile { public: bool IsOk() { return (psd != NULL); } // Zip Folderが使用できるか? bool SetZip(const std::wstring& sZipPath); // Zip File名 設定 - bool ChkPluginDef(const std::wstring& sDefFile, std::wstring& sFolderName); // ZIP File 内 フォルダ名取得と定義ファイル検査(Plugin用) + bool ChkPluginDef(const std::wstring& sDefFile, std::wstring& sFolderName); // ZIP File 内 フォルダー名取得と定義ファイル検査(Plugin用) bool Unzip(const std::wstring sOutPath); // Zip File 解凍 }; #endif /* SAKURA_CZIPFILE_EA7F9762_A67F_449D_B346_EAB3075A9E2C_H_ */ diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp index 27427f68f2..8a2f2fc1c5 100644 --- a/sakura_core/macro/CMacro.cpp +++ b/sakura_core/macro/CMacro.cpp @@ -1021,10 +1021,10 @@ bool CMacro::HandleCommand( case F_GREP: // Argument[0] 検索文字列 // Argument[1] 検索対象にするファイル名 - // Argument[2] 検索対象にするフォルダ名 + // Argument[2] 検索対象にするフォルダー名 // Argument[3]: // 次の数値の和。 - // 0x01 サブフォルダからも検索する + // 0x01 サブフォルダーからも検索する // 0x02 この編集中のテキストから検索する（未実装） // 0x04 英大文字と英小文字を区別する // 0x08 正規表現 @@ -1044,8 +1044,8 @@ bool CMacro::HandleCommand( // 0x0100 ～ 0xff00 文字コードセット番号 * 0x100 // 0x010000 単語単位で探す // 0x020000 ファイル毎最初のみ検索 - // 0x040000 ベースフォルダ表示 - // 0x080000 フォルダ毎に表示 + // 0x040000 ベースフォルダー表示 + // 0x080000 フォルダー毎に表示 { if( Argument[0] == NULL ){ ::MYMESSAGEBOX( NULL, MB_OK | MB_ICONSTOP | MB_TOPMOST, EXEC_ERROR_TITLE, @@ -1086,7 +1086,7 @@ bool CMacro::HandleCommand( cmWork4.SetString( Argument[1] ); cmWork4.Replace( L"\"", L"\"\"" ); // 置換後 } CNativeW cmWork2; cmWork2.SetString( Argument[ArgIndex+1] ); cmWork2.Replace( L"\"", L"\"\"" ); // ファイル名 - CNativeW cmWork3; cmWork3.SetString( Argument[ArgIndex+2] ); cmWork3.Replace( L"\"", L"\"\"" ); // フォルダ名 + CNativeW cmWork3; cmWork3.SetString( Argument[ArgIndex+2] ); cmWork3.Replace( L"\"", L"\"\"" ); // フォルダー名 LPARAM lFlag = wtoi_def(Argument[ArgIndex+3], 5); @@ -1127,7 +1127,7 @@ bool CMacro::HandleCommand( //GOPTオプション pOpt[0] = '\0'; - if( lFlag & 0x01 )wcscat( pOpt, L"S" ); /* サブフォルダからも検索する */ + if( lFlag & 0x01 )wcscat( pOpt, L"S" ); /* サブフォルダーからも検索する */ if( lFlag & 0x04 )wcscat( pOpt, L"L" ); /* 英大文字と英小文字を区別する */ if( lFlag & 0x08 )wcscat( pOpt, L"R" ); /* 正規表現 */ if( 0x20 == (lFlag & 0x400020) )wcscat( pOpt, L"P" ); // 行を出力する @@ -1904,7 +1904,7 @@ bool CMacro::HandleFunction(CEditView *View, EFunctionCode ID, const VARIANT *Ar } return true; case F_FOLDERDIALOG: - // 2011.03.18 syat フォルダダイアログの表示 + // 2011.03.18 syat フォルダーダイアログの表示 { WCHAR *Source; int SourceLength; diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index 9fa706f255..7c93c0eac7 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -220,7 +220,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_COPYDIRPATH, LTEXT("CopyDirPath"), {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 復活 @@ -231,7 +231,7 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoCommandArr[] = {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_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}, //小文字 @@ -450,7 +450,7 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoArr[] = {F_MACROSLEEP, LTEXT("Sleep"), {VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_I4, NULL }, //指定した時間（ミリ秒）停止 {F_FILEOPENDIALOG, LTEXT("FileOpenDialog"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //ファイルを開くダイアログの表示 {F_FILESAVEDIALOG, LTEXT("FileSaveDialog"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //ファイルを保存ダイアログの表示 - {F_FOLDERDIALOG, LTEXT("FolderDialog"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //フォルダを開くダイアログの表示 + {F_FOLDERDIALOG, LTEXT("FolderDialog"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //フォルダーを開くダイアログの表示 {F_GETCLIPBOARD, LTEXT("GetClipboard"), {VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //クリップボードの文字列を取得 {F_SETCLIPBOARD, LTEXT("SetClipboard"), {VT_I4, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_I4, NULL }, //クリップボードに文字列を設定 {F_LAYOUTTOLOGICLINENUM,LTEXT("LayoutToLogicLineNum"), {VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_I4, NULL }, //ロジック行番号取得 @@ -1048,7 +1048,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_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 復活 @@ -1059,7 +1059,7 @@ BOOL CSMacroMgr::CanFuncIsKeyMacro( int nFuncID ) // 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_INS_FOLDER_USED_RECENTLY :// 最近使ったフォルダー挿入 /* 変換系 */ case F_TOLOWER ://小文字 diff --git a/sakura_core/macro/CWSH.cpp b/sakura_core/macro/CWSH.cpp index 5ccd809bcd..dee0726634 100644 --- a/sakura_core/macro/CWSH.cpp +++ b/sakura_core/macro/CWSH.cpp @@ -242,7 +242,7 @@ class CWSHSite: public IActiveScriptSite, public IActiveScriptSiteWindow CWSHClient::CWSHClient(const wchar_t *AEngine, ScriptErrorHandler AErrorHandler, void *AData): m_OnError(AErrorHandler), m_Data(AData), m_Valid(false), m_Engine(NULL) { - // 2010.08.28 DLL インジェクション対策としてEXEのフォルダに移動する + // 2010.08.28 DLL インジェクション対策としてEXEのフォルダーに移動する CCurrentDirectoryBackupPoint dirBack; ChangeCurrentDirectoryToExeDir(); diff --git a/sakura_core/outline/CDlgFuncList.cpp b/sakura_core/outline/CDlgFuncList.cpp index 7996231c27..0a3e1c3663 100644 --- a/sakura_core/outline/CDlgFuncList.cpp +++ b/sakura_core/outline/CDlgFuncList.cpp @@ -1573,8 +1573,8 @@ void CDlgFuncList::SetTreeFile() // lvis.item.lParam // 0 以下(nFuncInfo): m_pcFuncInfoArr->At(nFuncInfo)にファイル名 // -1: Grepのファイル名要素 - // -2: Grepのサブフォルダ要素 - // -(nFuncInfo * 10 + 3): Grepルートフォルダ要素 + // -2: Grepのサブフォルダー要素 + // -(nFuncInfo * 10 + 3): Grepルートフォルダー要素 // -4: データ・追加操作なし TVINSERTSTRUCT tvis; tvis.hParent = hParentTree.back(); @@ -1642,7 +1642,7 @@ void CDlgFuncList::SetTreeFileSub( HTREEITEM hParent, const WCHAR* pszFile ) CGrepEnumFolders cGrepExceptAbsFolders; cGrepExceptAbsFolders.Enumerates(L"", cGrepEnumKeys.m_vecExceptAbsFolderKeys, cGrepEnumOptions); - //フォルダ一覧作成 + //フォルダー一覧作成 CGrepEnumFilterFolders cGrepEnumFilterFolders; cGrepEnumFilterFolders.Enumerates( basePath.c_str(), cGrepEnumKeys, cGrepEnumOptions, cGrepExceptAbsFolders ); int nItemCount = cGrepEnumFilterFolders.GetCount(); @@ -3867,7 +3867,7 @@ void CDlgFuncList::LoadFileTreeSetting( CFileTreeSetting& data, SFilePath& IniDi data.m_szDefaultProjectIni = pFileTree->m_szProjectIni; data.m_szLoadProjectIni = L""; if( data.m_bProject ){ - // 各フォルダのプロジェクトファイル読み込み + // 各フォルダーのプロジェクトファイル読み込み WCHAR szPath[_MAX_PATH]; ::GetLongFileName( L".", szPath ); wcscat( szPath, L"\\" ); diff --git a/sakura_core/plugin/CPlugin.cpp b/sakura_core/plugin/CPlugin.cpp index c0f45d4a64..20c428ea7c 100644 --- a/sakura_core/plugin/CPlugin.cpp +++ b/sakura_core/plugin/CPlugin.cpp @@ -219,7 +219,7 @@ bool CPlugin::ReadPluginDefOption( CDataProfile *cProfile, CDataProfile *cProfil return true; } -//プラグインフォルダ基準の相対パスをフルパスに変換 +//プラグインフォルダー基準の相対パスをフルパスに変換 std::wstring CPlugin::GetFilePath( const wstring& sFileName ) const { return m_sBaseDir + L"\\" + sFileName; diff --git a/sakura_core/plugin/CPlugin.h b/sakura_core/plugin/CPlugin.h index e3412d9c28..b125037832 100644 --- a/sakura_core/plugin/CPlugin.h +++ b/sakura_core/plugin/CPlugin.h @@ -45,7 +45,7 @@ typedef int PlugId; #define PII_L10NDIR L"local" #define PII_L10NFILEBASE L"plugin_" #define PII_L10NFILEEXT L".def" -//オプションファイル拡張子（オプションファイル＝個別フォルダ名＋拡張子） +//オプションファイル拡張子（オプションファイル＝個別フォルダー名＋拡張子） #define PII_OPTFILEEXT L".ini" //プラグイン定義ファイル・キー文字列 @@ -277,10 +277,10 @@ class CPlugin //属性 public: - wstring GetFilePath( const wstring& sFileName ) const; //プラグインフォルダ基準の相対パスをフルパスに変換 + wstring GetFilePath( const wstring& sFileName ) const; //プラグインフォルダー基準の相対パスをフルパスに変換 wstring GetPluginDefPath() const{ return GetFilePath( PII_FILENAME ); } //プラグイン定義ファイルのパス wstring GetOptionPath() const{ return m_sOptionDir + PII_OPTFILEEXT; } //オプションファイルのパス - wstring GetFolderName() const; //プラグインのフォルダ名を取得 + wstring GetFolderName() const; //プラグインのフォルダー名を取得 virtual CPlug::Array GetPlugs() const = 0; //プラグの一覧 //メンバ変数 diff --git a/sakura_core/plugin/CPluginIfObj.h b/sakura_core/plugin/CPluginIfObj.h index af5b8cef7c..d97b975c20 100644 --- a/sakura_core/plugin/CPluginIfObj.h +++ b/sakura_core/plugin/CPluginIfObj.h @@ -45,7 +45,7 @@ class CPluginIfObj : public CWSHIfObj { F_PL_SETOPTION, //オプションファイルに値を書く F_PL_ADDCOMMAND, //コマンドを追加する F_PL_FUNCTION_FIRST = F_FUNCTION_FIRST, //↓関数は以下に追加する - F_PL_GETPLUGINDIR, //プラグインフォルダパスを取得する + F_PL_GETPLUGINDIR, //プラグインフォルダーパスを取得する F_PL_GETDEF, //設定ファイルから値を読む F_PL_GETOPTION, //オプションファイルから値を読む F_PL_GETCOMMANDNO, //実行中プラグの番号を取得する @@ -88,7 +88,7 @@ class CPluginIfObj : public CWSHIfObj { switch(LOWORD(ID)) { - case F_PL_GETPLUGINDIR: //プラグインフォルダパスを取得する + case F_PL_GETPLUGINDIR: //プラグインフォルダーパスを取得する { SysString S(m_cPlugin.m_sBaseDir.c_str(), m_cPlugin.m_sBaseDir.size()); Wrap(&Result)->Receive(S); @@ -205,7 +205,7 @@ MacroFuncInfo CPluginIfObj::m_MacroFuncInfoCommandArr[] = MacroFuncInfo CPluginIfObj::m_MacroFuncInfoArr[] = { //ID 関数名 引数 戻り値の型 m_pszData - {EFunctionCode(F_PL_GETPLUGINDIR), LTEXT("GetPluginDir"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //プラグインフォルダパスを取得する + {EFunctionCode(F_PL_GETPLUGINDIR), LTEXT("GetPluginDir"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //プラグインフォルダーパスを取得する {EFunctionCode(F_PL_GETDEF), LTEXT("GetDef"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //設定ファイルから値を読む {EFunctionCode(F_PL_GETOPTION), LTEXT("GetOption"), {VT_BSTR, VT_BSTR, VT_EMPTY, VT_EMPTY}, VT_BSTR, NULL }, //オプションファイルから値を読む {EFunctionCode(F_PL_GETCOMMANDNO), LTEXT("GetCommandNo"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_I4, NULL }, //オプションファイルから値を読む diff --git a/sakura_core/plugin/CPluginManager.cpp b/sakura_core/plugin/CPluginManager.cpp index f2b0af9dc6..bfaa818c55 100644 --- a/sakura_core/plugin/CPluginManager.cpp +++ b/sakura_core/plugin/CPluginManager.cpp @@ -39,12 +39,12 @@ //コンストラクタ CPluginManager::CPluginManager() { - //pluginsフォルダの場所を取得 + //pluginsフォルダーの場所を取得 WCHAR szPluginPath[_MAX_PATH]; - GetInidir( szPluginPath, L"plugins\\" ); //iniと同じ階層のpluginsフォルダを検索 + GetInidir( szPluginPath, L"plugins\\" ); //iniと同じ階層のpluginsフォルダーを検索 m_sBaseDir.append(szPluginPath); - //Exeフォルダ配下pluginsフォルダのパスを取得 + //Exeフォルダー配下pluginsフォルダーのパスを取得 WCHAR szPath[_MAX_PATH]; WCHAR szFolder[_MAX_PATH]; WCHAR szFname[_MAX_PATH]; @@ -79,11 +79,11 @@ bool CPluginManager::SearchNewPlugin( CommonSetting& common, HWND hWndOwner ) HANDLE hFind; CZipFile cZipFile; - //プラグインフォルダの配下を検索 + //プラグインフォルダーの配下を検索 WIN32_FIND_DATA wf; hFind = FindFirstFile( (m_sBaseDir + L"*").c_str(), &wf ); if (hFind == INVALID_HANDLE_VALUE) { - //プラグインフォルダが存在しない + //プラグインフォルダーが存在しない if (!CreateDirectory(m_sBaseDir.c_str(), NULL)) { InfoMessage( hWndOwner, L"%s", LS(STR_PLGMGR_FOLDER)); return true; @@ -92,7 +92,7 @@ bool CPluginManager::SearchNewPlugin( CommonSetting& common, HWND hWndOwner ) ::FindClose(hFind); bool bCancel = false; - //プラグインフォルダの配下を検索 + //プラグインフォルダーの配下を検索 bool bFindNewDir = SearchNewPluginDir(common, hWndOwner, m_sBaseDir, bCancel); if (!bCancel && m_sBaseDir != m_sExePluginDir) { bFindNewDir |= SearchNewPluginDir(common, hWndOwner, m_sExePluginDir, bCancel); @@ -125,7 +125,7 @@ bool CPluginManager::SearchNewPluginDir( CommonSetting& common, HWND hWndOwner, WIN32_FIND_DATA wf; hFind = FindFirstFile( (sSearchDir + L"*").c_str(), &wf ); if (hFind == INVALID_HANDLE_VALUE) { - //プラグインフォルダが存在しない + //プラグインフォルダーが存在しない return false; } bool bFindNewDir = false; @@ -135,7 +135,7 @@ bool CPluginManager::SearchNewPluginDir( CommonSetting& common, HWND hWndOwner, wcscmp(wf.cFileName, L".")!=0 && wcscmp(wf.cFileName, L"..")!=0 && wmemicmp(wf.cFileName, L"unuse") !=0 ) { - //インストール済みチェック。フォルダ名＝プラグインテーブルの名前ならインストールしない + //インストール済みチェック。フォルダー名＝プラグインテーブルの名前ならインストールしない // 2010.08.04 大文字小文字同一視にする bool isNotInstalled = true; for( int iNo=0; iNo < MAX_PLUGIN; iNo++ ){ @@ -146,7 +146,7 @@ bool CPluginManager::SearchNewPluginDir( CommonSetting& common, HWND hWndOwner, } if( !isNotInstalled ){ continue; } - // 2011.08.20 syat plugin.defが存在しないフォルダは飛ばす + // 2011.08.20 syat plugin.defが存在しないフォルダーは飛ばす if( ! IsFileExists( (sSearchDir + wf.cFileName + L"\\" + PII_FILENAME).c_str(), true ) ){ continue; } @@ -220,11 +220,11 @@ bool CPluginManager::InstZipPlugin( CommonSetting& common, HWND hWndOwner, const return false; } - //プラグインフォルダの存在を確認 + //プラグインフォルダーの存在を確認 WIN32_FIND_DATA wf; HANDLE hFind; if ((hFind = ::FindFirstFile( (m_sBaseDir + L"*").c_str(), &wf )) == INVALID_HANDLE_VALUE) { - //プラグインフォルダが存在しない + //プラグインフォルダーが存在しない if (m_sBaseDir == m_sExePluginDir) { InfoMessage( hWndOwner, LS(STR_PLGMGR_ERR_FOLDER)); ::FindClose(hFind); @@ -256,14 +256,14 @@ bool CPluginManager::InstZipPluginSub( CommonSetting& common, HWND hWndOwner, co bool bSkip = false; bool bNewPlugin = false; - // Plugin フォルダ名の取得,定義ファイルの確認 + // Plugin フォルダー名の取得,定義ファイルの確認 if (bOk && !cZipFile.SetZip(sZipFile)) { auto_snprintf_s( msg, _countof(msg), LS(STR_PLGMGR_INST_ZIP_ACCESS), sDispName.c_str() ); bOk = false; bSkip = bInSearch; } - // Plgin フォルダ名の取得,定義ファイルの確認 + // Plgin フォルダー名の取得,定義ファイルの確認 if (bOk && !cZipFile.ChkPluginDef(PII_FILENAME, sFolderName)) { auto_snprintf_s( msg, _countof(msg), LS(STR_PLGMGR_INST_ZIP_DEF), sDispName.c_str() ); bOk = false; @@ -295,8 +295,8 @@ bool CPluginManager::InstZipPluginSub( CommonSetting& common, HWND hWndOwner, co } } else { - // pluginsフォルダ検索中 - // フォルダ チェック。すでに解凍されていたならインストールしない(前段でインストール済み或は可否を確認済み) + // pluginsフォルダー検索中 + // フォルダー チェック。すでに解凍されていたならインストールしない(前段でインストール済み或は可否を確認済み) if (bOk && (fexist((m_sBaseDir + sFolderName).c_str()) || fexist((m_sExePluginDir + sFolderName).c_str())) ) { bOk = false; diff --git a/sakura_core/plugin/CPluginManager.h b/sakura_core/plugin/CPluginManager.h index 42571ab021..e28adc92ab 100644 --- a/sakura_core/plugin/CPluginManager.h +++ b/sakura_core/plugin/CPluginManager.h @@ -60,7 +60,7 @@ class CPluginManager final : public TSingleton{ //属性 public: - //pluginsフォルダのパス + //pluginsフォルダーのパス const wstring GetBaseDir() { return m_sBaseDir; } const wstring GetExePluginDir() { return m_sExePluginDir; } bool SearchNewPluginDir( CommonSetting& common, HWND hWndOwner, const wstring& sSearchDir, bool& bCancel ); //新規プラグインを追加する(下請け) @@ -70,7 +70,7 @@ class CPluginManager final : public TSingleton{ // メンバ変数 private: CPlugin::List m_plugins; - wstring m_sBaseDir; //pluginsフォルダのパス - wstring m_sExePluginDir; //Exeフォルダ配下pluginsフォルダのパス + wstring m_sBaseDir; //pluginsフォルダーのパス + wstring m_sExePluginDir; //Exeフォルダー配下pluginsフォルダーのパス }; #endif /* SAKURA_CPLUGINMANAGER_CE705DAD_1876_4B21_9052_07A9BFD292DE_H_ */ diff --git a/sakura_core/prop/CPropComBackup.cpp b/sakura_core/prop/CPropComBackup.cpp index 77a9bff167..cd8ad3e1e5 100644 --- a/sakura_core/prop/CPropComBackup.cpp +++ b/sakura_core/prop/CPropComBackup.cpp @@ -31,7 +31,7 @@ //@@@ 2001.02.04 Start by MIK: Popup Help static const DWORD p_helpids[] = { //10000 - IDC_BUTTON_BACKUP_FOLDER_REF, HIDC_BUTTON_BACKUP_FOLDER_REF, //バックアップフォルダ参照 + IDC_BUTTON_BACKUP_FOLDER_REF, HIDC_BUTTON_BACKUP_FOLDER_REF, //バックアップフォルダー参照 IDC_CHECK_BACKUP, HIDC_CHECK_BACKUP, //バックアップの作成 IDC_CHECK_BACKUP_YEAR, HIDC_CHECK_BACKUP_YEAR, //バックアップファイル名（西暦年） IDC_CHECK_BACKUP_MONTH, HIDC_CHECK_BACKUP_MONTH, //バックアップファイル名（月） @@ -40,10 +40,10 @@ static const DWORD p_helpids[] = { //10000 IDC_CHECK_BACKUP_MIN, HIDC_CHECK_BACKUP_MIN, //バックアップファイル名（分） IDC_CHECK_BACKUP_SEC, HIDC_CHECK_BACKUP_SEC, //バックアップファイル名（秒） IDC_CHECK_BACKUPDIALOG, HIDC_CHECK_BACKUPDIALOG, //作成前に確認 - IDC_CHECK_BACKUPFOLDER, HIDC_CHECK_BACKUPFOLDER, //指定フォルダに作成 - IDC_CHECK_BACKUP_FOLDER_RM, HIDC_CHECK_BACKUP_FOLDER_RM, //指定フォルダに作成(リムーバブルメディアのみ) + IDC_CHECK_BACKUPFOLDER, HIDC_CHECK_BACKUPFOLDER, //指定フォルダーに作成 + IDC_CHECK_BACKUP_FOLDER_RM, HIDC_CHECK_BACKUP_FOLDER_RM, //指定フォルダーに作成(リムーバブルメディアのみ) IDC_CHECK_BACKUP_DUSTBOX, HIDC_CHECK_BACKUP_DUSTBOX, //バックアップファイルをごみ箱に放り込む //@@@ 2001.12.11 add MIK - IDC_EDIT_BACKUPFOLDER, HIDC_EDIT_BACKUPFOLDER, //保存フォルダ名 + IDC_EDIT_BACKUPFOLDER, HIDC_EDIT_BACKUPFOLDER, //保存フォルダー名 IDC_EDIT_BACKUP_3, HIDC_EDIT_BACKUP_3, //世代数 IDC_RADIO_BACKUP_TYPE1, HIDC_RADIO_BACKUP_TYPE1, //バックアップの種類（拡張子） // IDC_RADIO_BACKUP_TYPE2, HIDC_RADIO_BACKUP_TYPE2NEWHID, //バックアップの種類（日付・時刻） // 2002.11.09 Moca HIDが.._TYPE3と逆だった // Jun. 5, 2004 genta 廃止 @@ -97,7 +97,7 @@ INT_PTR CPropBackup::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR ::SetWindowLongPtr( hwndDlg, DWLP_USER, lParam ); /* ユーザーがエディット コントロールに入力できるテキストの長さを制限する */ - // Oct. 5, 2002 genta バックアップフォルダ名の入力サイズを指定 + // Oct. 5, 2002 genta バックアップフォルダー名の入力サイズを指定 // Oct. 8, 2002 genta 最後に付加される\の領域を残すためバッファサイズ-1しか入力させない EditCtl_LimitText( ::GetDlgItem( hwndDlg, IDC_EDIT_BACKUPFOLDER ), _countof2(m_Common.m_sBackup.m_szBackUpFolder) - 1 - 1 ); // 20051107 aroka @@ -171,9 +171,9 @@ INT_PTR CPropBackup::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR UpdateBackupFile( hwndDlg ); EnableBackupInput(hwndDlg); return TRUE; - case IDC_BUTTON_BACKUP_FOLDER_REF: /* フォルダ参照 */ + case IDC_BUTTON_BACKUP_FOLDER_REF: /* フォルダー参照 */ { - /* バックアップを作成するフォルダ */ + /* バックアップを作成するフォルダー */ WCHAR szFolder[_MAX_PATH]; ::DlgItem_GetText( hwndDlg, IDC_EDIT_BACKUPFOLDER, szFolder, _countof( szFolder )); @@ -189,7 +189,7 @@ INT_PTR CPropBackup::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR UpdateBackupFile( hwndDlg ); } break; /* BN_CLICKED */ - case EN_CHANGE: // 20051107 aroka フォルダが変更されたらリアルタイムにエディットボックス内を更新 + case EN_CHANGE: // 20051107 aroka フォルダーが変更されたらリアルタイムにエディットボックス内を更新 switch( wID ){ case IDC_EDIT_BACKUPFOLDER: // 2009.02.21 ryoji 後ろに\が追加されるので，1文字余裕をみる必要がある． @@ -238,7 +238,7 @@ void CPropBackup::SetData( HWND hwndDlg ) ::CheckDlgButtonBool( hwndDlg, IDC_CHECK_BACKUP, m_Common.m_sBackup.m_bBackUp ); /* バックアップの作成前に確認 */ ::CheckDlgButtonBool( hwndDlg, IDC_CHECK_BACKUPDIALOG, m_Common.m_sBackup.m_bBackUpDialog ); -// /* 指定フォルダにバックアップを作成する */ // 20051107 aroka 「バックアップの作成」に連動させる +// /* 指定フォルダーにバックアップを作成する */ // 20051107 aroka 「バックアップの作成」に連動させる // ::CheckDlgButton( hwndDlg, IDC_CHECK_BACKUPFOLDER, .m_sBackup.m_bBackUpFolder ); /* バックアップファイル名のタイプ 1=(.bak) 2=*_日付.* */ @@ -279,23 +279,23 @@ void CPropBackup::SetData( HWND hwndDlg ) /* バックアップファイル名：日付の秒 */ ::CheckDlgButtonBool( hwndDlg, IDC_CHECK_BACKUP_SEC, m_Common.m_sBackup.GetBackupOpt(BKUP_SEC) ); - /* 指定フォルダにバックアップを作成する */ // 20051107 aroka 移動：連動対象にする。 + /* 指定フォルダーにバックアップを作成する */ // 20051107 aroka 移動：連動対象にする。 ::CheckDlgButtonBool( hwndDlg, IDC_CHECK_BACKUPFOLDER, m_Common.m_sBackup.m_bBackUpFolder ); ::CheckDlgButtonBool( hwndDlg, IDC_CHECK_BACKUP_FOLDER_RM, m_Common.m_sBackup.m_bBackUpFolderRM ); // 2010/5/27 Uchi - /* バックアップを作成するフォルダ */ + /* バックアップを作成するフォルダー */ ::DlgItem_SetText( hwndDlg, IDC_EDIT_BACKUPFOLDER, m_Common.m_sBackup.m_szBackUpFolder ); /* バックアップファイルをごみ箱に放り込む */ //@@@ 2001.12.11 add MIK ::CheckDlgButton( hwndDlg, IDC_CHECK_BACKUP_DUSTBOX, m_Common.m_sBackup.m_bBackUpDustBox?BST_CHECKED:BST_UNCHECKED ); //@@@ 2001.12.11 add MIK - /* バックアップ先フォルダを詳細設定する */ // 20051107 aroka + /* バックアップ先フォルダーを詳細設定する */ // 20051107 aroka ::CheckDlgButton( hwndDlg, IDC_CHECK_BACKUP_ADVANCED, m_Common.m_sBackup.m_bBackUpPathAdvanced?BST_CHECKED:BST_UNCHECKED ); - /* バックアップを作成するフォルダの詳細設定 */ // 20051107 aroka + /* バックアップを作成するフォルダーの詳細設定 */ // 20051107 aroka ::DlgItem_SetText( hwndDlg, IDC_EDIT_BACKUPFILE, m_Common.m_sBackup.m_szBackUpPathAdvanced ); - /* バックアップを作成するフォルダの詳細設定 */ // 20051128 aroka + /* バックアップを作成するフォルダーの詳細設定 */ // 20051128 aroka switch( m_Common.m_sBackup.GetBackupTypeAdv() ){ case 2: ::CheckDlgButton( hwndDlg, IDC_RADIO_BACKUP_DATETYPE1A, 1 ); // 付加する日付のタイプ(現時刻) @@ -329,7 +329,7 @@ int CPropBackup::GetData( HWND hwndDlg ) m_Common.m_sBackup.m_bBackUp = ::IsDlgButtonCheckedBool( hwndDlg, IDC_CHECK_BACKUP ); /* バックアップの作成前に確認 */ m_Common.m_sBackup.m_bBackUpDialog = ::IsDlgButtonCheckedBool( hwndDlg, IDC_CHECK_BACKUPDIALOG ); -// /* 指定フォルダにバックアップを作成する */ // 20051107 aroka 「バックアップの作成」に連動させる +// /* 指定フォルダーにバックアップを作成する */ // 20051107 aroka 「バックアップの作成」に連動させる // m_Common.m_sBackup.m_bBackUpFolder = ::IsDlgButtonChecked( hwndDlg, IDC_CHECK_BACKUPFOLDER ); /* バックアップファイル名のタイプ 1=(.bak) 2=*_日付.* */ @@ -377,11 +377,11 @@ int CPropBackup::GetData( HWND hwndDlg ) /* バックアップファイル名：日付の秒 */ m_Common.m_sBackup.SetBackupOpt(BKUP_SEC, ::IsDlgButtonChecked( hwndDlg, IDC_CHECK_BACKUP_SEC ) == BST_CHECKED); - /* 指定フォルダにバックアップを作成する */ // 20051107 aroka 移動 + /* 指定フォルダーにバックアップを作成する */ // 20051107 aroka 移動 m_Common.m_sBackup.m_bBackUpFolder = ::IsDlgButtonCheckedBool( hwndDlg, IDC_CHECK_BACKUPFOLDER ); m_Common.m_sBackup.m_bBackUpFolderRM = ::IsDlgButtonCheckedBool( hwndDlg, IDC_CHECK_BACKUP_FOLDER_RM ); // 2010/5/27 Uchi - /* バックアップを作成するフォルダ */ + /* バックアップを作成するフォルダー */ // Oct. 5, 2002 genta サイズをsizeof()で指定 // Oct. 8, 2002 genta 後ろに\が追加されるので，1文字余裕を見る必要がある． ::DlgItem_GetText( hwndDlg, IDC_EDIT_BACKUPFOLDER, m_Common.m_sBackup.m_szBackUpFolder, _countof2(m_Common.m_sBackup.m_szBackUpFolder) - 1); @@ -389,9 +389,9 @@ int CPropBackup::GetData( HWND hwndDlg ) /* バックアップファイルをごみ箱に放り込む */ //@@@ 2001.12.11 add MIK m_Common.m_sBackup.m_bBackUpDustBox = (BST_CHECKED==::IsDlgButtonChecked( hwndDlg, IDC_CHECK_BACKUP_DUSTBOX )); //@@@ 2001.12.11 add MIK - /* 指定フォルダにバックアップを作成する詳細設定 */ // 20051107 aroka + /* 指定フォルダーにバックアップを作成する詳細設定 */ // 20051107 aroka m_Common.m_sBackup.m_bBackUpPathAdvanced = (BST_CHECKED==::IsDlgButtonChecked( hwndDlg, IDC_CHECK_BACKUP_ADVANCED )); - /* バックアップを作成するフォルダ */ // 20051107 aroka + /* バックアップを作成するフォルダー */ // 20051107 aroka ::DlgItem_GetText( hwndDlg, IDC_EDIT_BACKUPFILE, m_Common.m_sBackup.m_szBackUpPathAdvanced, _countof2( m_Common.m_sBackup.m_szBackUpPathAdvanced ) - 1); // 20051128 aroka 詳細設定の日付のタイプ @@ -480,7 +480,7 @@ void CPropBackup::EnableBackupInput(HWND hwndDlg) SHOWENABLE( IDC_RADIO_BACKUP_DATETYPE2A, bAdvanced, bBackup ); SHOWENABLE( IDC_CHECK_BACKUPFOLDER, TRUE, bBackup ); - SHOWENABLE( IDC_LABEL_BACKUP_4, TRUE, bBackup && bFolder ); // added Sept. 6, JEPRO フォルダ指定したときだけEnableになるように変更 + SHOWENABLE( IDC_LABEL_BACKUP_4, TRUE, bBackup && bFolder ); // added Sept. 6, JEPRO フォルダー指定したときだけEnableになるように変更 SHOWENABLE( IDC_CHECK_BACKUP_FOLDER_RM, TRUE, bBackup && bFolder ); // 2010/5/27 Uchi SHOWENABLE( IDC_EDIT_BACKUPFOLDER, TRUE, bBackup && bFolder ); SHOWENABLE( IDC_BUTTON_BACKUP_FOLDER_REF, TRUE, bBackup && bFolder ); diff --git a/sakura_core/prop/CPropComEdit.cpp b/sakura_core/prop/CPropComEdit.cpp index 7fb4b44dbe..8a1c73d7ae 100644 --- a/sakura_core/prop/CPropComEdit.cpp +++ b/sakura_core/prop/CPropComEdit.cpp @@ -43,11 +43,11 @@ static const DWORD p_helpids[] = { //10210 // 2007.02.11 genta クリッカブルURLをこのページに移動 IDC_CHECK_bSelectClickedURL, HIDC_CHECK_bSelectClickedURL, //クリッカブルURL IDC_CHECK_CONVERTEOLPASTE, HIDC_CHECK_CONVERTEOLPASTE, //改行コードを変換して貼り付ける - IDC_RADIO_CURDIR, HIDC_RADIO_CURDIR, //カレントフォルダ - IDC_RADIO_MRUDIR, HIDC_RADIO_MRUDIR, //最近使ったフォルダ - IDC_RADIO_SELDIR, HIDC_RADIO_SELDIR, //指定フォルダ - IDC_EDIT_FILEOPENDIR, HIDC_EDIT_FILEOPENDIR, //指定フォルダパス - IDC_BUTTON_FILEOPENDIR, HIDC_EDIT_FILEOPENDIR, //指定フォルダパス + IDC_RADIO_CURDIR, HIDC_RADIO_CURDIR, //カレントフォルダー + IDC_RADIO_MRUDIR, HIDC_RADIO_MRUDIR, //最近使ったフォルダー + IDC_RADIO_SELDIR, HIDC_RADIO_SELDIR, //指定フォルダー + IDC_EDIT_FILEOPENDIR, HIDC_EDIT_FILEOPENDIR, //指定フォルダーパス + IDC_BUTTON_FILEOPENDIR, HIDC_EDIT_FILEOPENDIR, //指定フォルダーパス IDC_CHECK_ENABLEEXTEOL, HIDC_CHECK_ENABLEEXTEOL, //改行コードNEL,PS,LSを有効にする IDC_CHECK_BOXSELECTLOCK, HIDC_CHECK_BOXSELECTLOCK, //矩形選択移動で選択をロックする // IDC_STATIC, -1, @@ -302,7 +302,7 @@ int CPropEdit::GetData( HWND hwndDlg ) */ void CPropEdit::EnableEditPropInput( HWND hwndDlg ) { - // 指定フォルダ + // 指定フォルダー if( ::IsDlgButtonChecked( hwndDlg, IDC_RADIO_SELDIR ) ){ ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_EDIT_FILEOPENDIR ), TRUE ); ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_FILEOPENDIR ), TRUE ); diff --git a/sakura_core/prop/CPropComGeneral.cpp b/sakura_core/prop/CPropComGeneral.cpp index a097ce61fd..a28e995907 100644 --- a/sakura_core/prop/CPropComGeneral.cpp +++ b/sakura_core/prop/CPropComGeneral.cpp @@ -41,7 +41,7 @@ TYPE_NAME_ID SpecialScrollModeArr[] = { static const DWORD p_helpids[] = { //10900 IDC_BUTTON_CLEAR_MRU_FILE, HIDC_BUTTON_CLEAR_MRU_FILE, //履歴をクリア（ファイル） - IDC_BUTTON_CLEAR_MRU_FOLDER, HIDC_BUTTON_CLEAR_MRU_FOLDER, //履歴をクリア（フォルダ） + IDC_BUTTON_CLEAR_MRU_FOLDER, HIDC_BUTTON_CLEAR_MRU_FOLDER, //履歴をクリア（フォルダー） IDC_CHECK_FREECARET, HIDC_CHECK_FREECARET, //フリーカーソル //DEL IDC_CHECK_INDENT, HIDC_CHECK_INDENT, //自動インデント ：タイプ別へ移動 //DEL IDC_CHECK_INDENT_WSPACE, HIDC_CHECK_INDENT_WSPACE, //全角空白もインデント ：タイプ別へ移動 @@ -56,7 +56,7 @@ static const DWORD p_helpids[] = { //10900 IDC_HOTKEY_TRAYMENU, HIDC_HOTKEY_TRAYMENU, //左クリックメニューのショートカットキー IDC_EDIT_REPEATEDSCROLLLINENUM, HIDC_EDIT_REPEATEDSCROLLLINENUM, //スクロール行数 IDC_EDIT_MAX_MRU_FILE, HIDC_EDIT_MAX_MRU_FILE, //ファイル履歴の最大数 - IDC_EDIT_MAX_MRU_FOLDER, HIDC_EDIT_MAX_MRU_FOLDER, //フォルダ履歴の最大数 + IDC_EDIT_MAX_MRU_FOLDER, HIDC_EDIT_MAX_MRU_FOLDER, //フォルダー履歴の最大数 IDC_RADIO_CARETTYPE0, HIDC_RADIO_CARETTYPE0, //カーソル形状（Windows風） IDC_RADIO_CARETTYPE1, HIDC_RADIO_CARETTYPE1, //カーソル形状（MS-DOS風） IDC_SPIN_REPEATEDSCROLLLINENUM, HIDC_EDIT_REPEATEDSCROLLLINENUM, @@ -166,7 +166,7 @@ INT_PTR CPropGeneral::DispatchEvent( InfoMessage( hwndDlg, LS(STR_PROPCOMGEN_FILE2) ); return TRUE; case IDC_BUTTON_CLEAR_MRU_FOLDER: - /* フォルダの履歴をクリア */ + /* フォルダーの履歴をクリア */ if( IDCANCEL == ::MYMESSAGEBOX( hwndDlg, MB_OKCANCEL | MB_ICONQUESTION, GSTR_APPNAME, LS(STR_PROPCOMGEN_DIR1) ) ){ return TRUE; @@ -259,7 +259,7 @@ INT_PTR CPropGeneral::DispatchEvent( ::SetDlgItemInt( hwndDlg, IDC_EDIT_MAX_MRU_FILE, nVal, FALSE ); return TRUE; case IDC_SPIN_MAX_MRU_FOLDER: - /* フォルダの履歴MAX */ + /* フォルダーの履歴MAX */ // MYTRACE( L"IDC_SPIN_MAX_MRU_FOLDER\n" ); nVal = ::GetDlgItemInt( hwndDlg, IDC_EDIT_MAX_MRU_FOLDER, NULL, FALSE ); if( pMNUD->iDelta < 0 ){ @@ -393,7 +393,7 @@ void CPropGeneral::SetData( HWND hwndDlg ) /* ファイルの履歴MAX */ ::SetDlgItemInt( hwndDlg, IDC_EDIT_MAX_MRU_FILE, m_Common.m_sGeneral.m_nMRUArrNum_MAX, FALSE ); - /* フォルダの履歴MAX */ + /* フォルダーの履歴MAX */ ::SetDlgItemInt( hwndDlg, IDC_EDIT_MAX_MRU_FOLDER, m_Common.m_sGeneral.m_nOPENFOLDERArrNum_MAX, FALSE ); /* タスクトレイを使う */ @@ -487,7 +487,7 @@ int CPropGeneral::GetData( HWND hwndDlg ) cRecentFile.Terminate(); } - /* フォルダの履歴MAX */ + /* フォルダーの履歴MAX */ m_Common.m_sGeneral.m_nOPENFOLDERArrNum_MAX = ::GetDlgItemInt( hwndDlg, IDC_EDIT_MAX_MRU_FOLDER, NULL, FALSE ); if( m_Common.m_sGeneral.m_nOPENFOLDERArrNum_MAX < 0 ){ m_Common.m_sGeneral.m_nOPENFOLDERArrNum_MAX = 0; diff --git a/sakura_core/prop/CPropComHelper.cpp b/sakura_core/prop/CPropComHelper.cpp index ab7ed1a68b..a4bdd4a66a 100644 --- a/sakura_core/prop/CPropComHelper.cpp +++ b/sakura_core/prop/CPropComHelper.cpp @@ -164,7 +164,7 @@ INT_PTR CPropHelper::DispatchEvent( case IDC_BUTTON_OPENMDICT: /* MigemoDict場所指定「参照...」ボタン */ { WCHAR szPath[_MAX_PATH]; - /* 検索フォルダ */ + /* 検索フォルダー */ // 2007.05.27 ryoji 相対パスは設定ファイルからのパスを優先 if( _IS_REL_PATH( m_Common.m_sHelper.m_szMigemoDict ) ){ GetInidirOrExedir( szPath, m_Common.m_sHelper.m_szMigemoDict, TRUE ); diff --git a/sakura_core/prop/CPropComMacro.cpp b/sakura_core/prop/CPropComMacro.cpp index 228d913e27..8740983926 100644 --- a/sakura_core/prop/CPropComMacro.cpp +++ b/sakura_core/prop/CPropComMacro.cpp @@ -178,7 +178,7 @@ INT_PTR CPropMacro::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA break; } break; /* CBN_DROPDOWN */ - // From Here 2003.06.23 Moca マクロフォルダの最後の\がなければ付ける + // From Here 2003.06.23 Moca マクロフォルダーの最後の\がなければ付ける case EN_SETFOCUS: if (isImeUndesirable(wID)) ImeSetOpen(hwndCtl, FALSE, &s_isImmOpenBkup); @@ -374,7 +374,7 @@ int CPropMacro::GetData( HWND hwndDlg ) // マクロディレクトリ //@@@ 2002.01.03 YAZAKI 共通設定『マクロ』がタブを切り替えるだけで設定が保存されないように。 ::DlgItem_GetText( hwndDlg, IDC_MACRODIR, m_Common.m_sMacro.m_szMACROFOLDER, _MAX_PATH ); - // 2003.06.23 Moca マクロフォルダの最後の\がなければ付ける + // 2003.06.23 Moca マクロフォルダーの最後の\がなければ付ける AddLastChar( m_Common.m_sMacro.m_szMACROFOLDER, _MAX_PATH, L'\\' ); // マクロ停止ダイアログ表示待ち時間 @@ -573,7 +573,7 @@ void CPropMacro::SelectBaseDir_Macro( HWND hwndDlg ) { WCHAR szDir[_MAX_PATH]; - /* 検索フォルダ */ + /* 検索フォルダー */ ::DlgItem_GetText( hwndDlg, IDC_MACRODIR, szDir, _countof(szDir) ); // 2003.06.23 Moca 相対パスは実行ファイルからのパス @@ -629,7 +629,7 @@ void CPropMacro::OnFileDropdown_Macro( HWND hwndDlg ) // コンボボックスに設定 // でも.と..は勘弁。 //if (wcscmp( wf.cFileName, L"." ) != 0 && wcscmp( wf.cFileName, L".." ) != 0){ - if( (wf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0 ){ // 2009.02.12 ryoji フォルダを除外 + if( (wf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0 ){ // 2009.02.12 ryoji フォルダーを除外 int result = Combo_AddString( hCombo, wf.cFileName ); if( result == CB_ERR || result == CB_ERRSPACE ) break; diff --git a/sakura_core/prop/CPropComPlugin.cpp b/sakura_core/prop/CPropComPlugin.cpp index b1e2db3dd7..9f124f5d67 100644 --- a/sakura_core/prop/CPropComPlugin.cpp +++ b/sakura_core/prop/CPropComPlugin.cpp @@ -54,7 +54,7 @@ static const DWORD p_helpids[] = { //11700 IDC_PLUGINLIST, HIDC_PLUGINLIST, //プラグインリスト IDC_PLUGIN_INST_ZIP, HIDC_PLUGIN_INST_ZIP, //Zipプラグインを追加 // 2011/11/2 Uchi IDC_PLUGIN_SearchNew, HIDC_PLUGIN_SearchNew, //新規プラグインを追加 - IDC_PLUGIN_OpenFolder, HIDC_PLUGIN_OpenFolder, //フォルダを開く + IDC_PLUGIN_OpenFolder, HIDC_PLUGIN_OpenFolder, //フォルダーを開く IDC_PLUGIN_Remove, HIDC_PLUGIN_Remove, //プラグインを削除 IDC_PLUGIN_OPTION, HIDC_PLUGIN_OPTION, //プラグイン設定 // 2010/3/22 Uchi IDC_PLUGIN_README, HIDC_PLUGIN_README, //ReadMe表示 // 2011/11/2 Uchi @@ -195,7 +195,7 @@ INT_PTR CPropPlugin::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR } SetData_LIST( hwndDlg ); //リストの再構築 } - // フォルダを記憶 + // フォルダーを記憶 WCHAR szFolder[_MAX_PATH + 1]; WCHAR szFname[_MAX_PATH + 1]; SplitPath_FolderAndFile(szPath, szFolder, szFname); @@ -223,7 +223,7 @@ INT_PTR CPropPlugin::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR HWND hListView = ::GetDlgItem( hwndDlg, IDC_PLUGINLIST ); int sel = ListView_GetNextItem( hListView, -1, LVNI_SELECTED ); if( sel >= 0 && m_Common.m_sPlugin.m_PluginTable[sel].m_state == PLS_LOADED ){ - // 2010.08.21 プラグイン名(フォルダ名)の同一性の確認 + // 2010.08.21 プラグイン名(フォルダー名)の同一性の確認 CPlugin* plugin = CPluginManager::getInstance()->GetPlugin(sel); wstring sDirName = plugin->GetFolderName().c_str(); if( plugin && 0 == wmemicmp(sDirName.c_str(), m_Common.m_sPlugin.m_PluginTable[sel].m_szName ) ){ @@ -235,7 +235,7 @@ INT_PTR CPropPlugin::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR } } break; - case IDC_PLUGIN_OpenFolder: // フォルダを開く + case IDC_PLUGIN_OpenFolder: // フォルダーを開く { std::wstring sBaseDir = CPluginManager::getInstance()->GetBaseDir() + L"."; if( ! IsDirectory(sBaseDir.c_str()) ){ @@ -250,7 +250,7 @@ INT_PTR CPropPlugin::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR { HWND hListView = ::GetDlgItem( hwndDlg, IDC_PLUGINLIST ); int sel = ListView_GetNextItem( hListView, -1, LVNI_SELECTED ); - std::wstring sName = m_Common.m_sPlugin.m_PluginTable[sel].m_szName; // 個別フォルダ名 + std::wstring sName = m_Common.m_sPlugin.m_PluginTable[sel].m_szName; // 個別フォルダー名 std::wstring sReadMeName = GetReadMeFile(sName); if (!sReadMeName.empty()) { if (!BrowseReadMe(sReadMeName)) { @@ -403,7 +403,7 @@ void CPropPlugin::SetData_LIST( HWND hwndDlg ) } ListView_SetItem( hListView, &sItem ); - //フォルダ + //フォルダー memset_raw( &sItem, 0, sizeof( sItem )); sItem.iItem = index; sItem.mask = LVIF_TEXT; @@ -531,7 +531,7 @@ std::wstring CPropPlugin::GetReadMeFile(const std::wstring& sName) fl = new CFile(sReadMeName.c_str()); } if (!fl->IsFileExist()) { - // exeフォルダ配下 + // exeフォルダー配下 sReadMeName = CPluginManager::getInstance()->GetExePluginDir() + sName + L"\\ReadMe.txt"; delete fl; diff --git a/sakura_core/recent/CMRUFile.cpp b/sakura_core/recent/CMRUFile.cpp index 22d32c8b6a..7396e75b04 100644 --- a/sakura_core/recent/CMRUFile.cpp +++ b/sakura_core/recent/CMRUFile.cpp @@ -214,9 +214,9 @@ void CMRUFile::Add( EditInfo* pEditInfo ) WCHAR szDrive[_MAX_DRIVE]; WCHAR szDir[_MAX_DIR]; - WCHAR szFolder[_MAX_PATH + 1]; // ドライブ＋フォルダ + WCHAR szFolder[_MAX_PATH + 1]; // ドライブ＋フォルダー - _wsplitpath( pEditInfo->m_szPath, szDrive, szDir, NULL, NULL ); // ドライブとフォルダを取り出す。 + _wsplitpath( pEditInfo->m_szPath, szDrive, szDir, NULL, NULL ); // ドライブとフォルダーを取り出す。 // Jan. 10, 2006 genta USBメモリはRemovable mediaと認識されるようなので， // 一応無効化する． diff --git a/sakura_core/recent/CMRUFolder.cpp b/sakura_core/recent/CMRUFolder.cpp index 844471e4ae..293da5cdc0 100644 --- a/sakura_core/recent/CMRUFolder.cpp +++ b/sakura_core/recent/CMRUFolder.cpp @@ -40,7 +40,7 @@ CMRUFolder::~CMRUFolder() } /*! - フォルダ履歴メニューの作成 + フォルダー履歴メニューの作成 @param pCMenuDrawer [in] (out?) メニュー作成で用いるMenuDrawer @@ -57,7 +57,7 @@ HMENU CMRUFolder::CreateMenu( CMenuDrawer* pCMenuDrawer ) const } /*! - フォルダ履歴メニューの作成 + フォルダー履歴メニューの作成 @param 追加するメニューのハンドル @param pCMenuDrawer [in] (out?) メニュー作成で用いるMenuDrawer @@ -98,7 +98,7 @@ std::vector CMRUFolder::GetPathList() const { std::vector ret; for( int i = 0; i < m_cRecentFolder.GetItemCount(); ++i ){ - // 「共通設定」→「全般」→「フォルダの履歴MAX」を反映 + // 「共通設定」→「全般」→「フォルダーの履歴MAX」を反映 if ( i >= m_cRecentFolder.GetViewCount() ) break; ret.push_back(m_cRecentFolder.GetItemText(i)); } @@ -115,7 +115,7 @@ void CMRUFolder::ClearAll() m_cRecentFolder.DeleteAllItem(); } -/* @brief 開いたフォルダ リストへの登録 +/* @brief 開いたフォルダー リストへの登録 @date 2001.12.26 CShareData::AddOPENFOLDERListから移動した。（YAZAKI） */ diff --git a/sakura_core/recent/CMRUFolder.h b/sakura_core/recent/CMRUFolder.h index 390e754d15..0ed7ca0ab8 100644 --- a/sakura_core/recent/CMRUFolder.h +++ b/sakura_core/recent/CMRUFolder.h @@ -1,5 +1,5 @@ /*! @file - @brief MRUリストと呼ばれるリストを管理する。フォルダ版。 + @brief MRUリストと呼ばれるリストを管理する。フォルダー版。 @author YAZAKI @date 2001/12/23 新規作成 @@ -59,7 +59,7 @@ class CMRUFolder { HMENU CreateMenu( HMENU hMenu, CMenuDrawer* pCMenuDrawer ) const; // 2010/5/21 Uchi BOOL DestroyMenu( HMENU hMenu ) const; - // フォルダ名の一覧を教えて + // フォルダー名の一覧を教えて std::vector GetPathList() const; // アクセス関数 diff --git a/sakura_core/recent/CRecentExceptMru.h b/sakura_core/recent/CRecentExceptMru.h index 1df935f8f9..3a4bd53cac 100644 --- a/sakura_core/recent/CRecentExceptMru.h +++ b/sakura_core/recent/CRecentExceptMru.h @@ -32,7 +32,7 @@ typedef StaticString CMetaPath; -//! フォルダの履歴を管理 (RECENT_FOR_FOLDER) +//! フォルダーの履歴を管理 (RECENT_FOR_FOLDER) class CRecentExceptMRU final : public CRecentImp{ public: //生成 diff --git a/sakura_core/recent/CRecentExcludeFolder.h b/sakura_core/recent/CRecentExcludeFolder.h index 6922e9d12b..9a9447085d 100644 --- a/sakura_core/recent/CRecentExcludeFolder.h +++ b/sakura_core/recent/CRecentExcludeFolder.h @@ -32,7 +32,7 @@ typedef StaticString CExcludeFolderString; -//! Excludeフォルダの履歴を管理 (RECENT_FOR_Exclude_FOLDER) +//! Excludeフォルダーの履歴を管理 (RECENT_FOR_Exclude_FOLDER) class CRecentExcludeFolder final : public CRecentImp{ public: //生成 diff --git a/sakura_core/recent/CRecentFolder.h b/sakura_core/recent/CRecentFolder.h index 6399adc250..1c13dcf836 100644 --- a/sakura_core/recent/CRecentFolder.h +++ b/sakura_core/recent/CRecentFolder.h @@ -32,7 +32,7 @@ typedef StaticString CPathString; -//! フォルダの履歴を管理 (RECENT_FOR_FOLDER) +//! フォルダーの履歴を管理 (RECENT_FOR_FOLDER) class CRecentFolder final : public CRecentImp{ public: //生成 diff --git a/sakura_core/recent/CRecentGrepFolder.h b/sakura_core/recent/CRecentGrepFolder.h index 25fafc8ed7..b6780297d6 100644 --- a/sakura_core/recent/CRecentGrepFolder.h +++ b/sakura_core/recent/CRecentGrepFolder.h @@ -33,7 +33,7 @@ typedef StaticString CGrepFolderString; -//! GREPフォルダの履歴を管理 (RECENT_FOR_GREP_FOLDER) +//! GREPフォルダーの履歴を管理 (RECENT_FOR_GREP_FOLDER) class CRecentGrepFolder final : public CRecentImp{ public: //生成 diff --git a/sakura_core/sakura.hh b/sakura_core/sakura.hh index 1bd1bd54f0..07e2da3875 100644 --- a/sakura_core/sakura.hh +++ b/sakura_core/sakura.hh @@ -62,10 +62,10 @@ #define HLP000377 377 //管理者としてコマンドプロンプトを開く #define HLP000378 378 //PowerShellを開く #define HLP000379 379 //管理者としてPowerShellを開く -#define HLP000380 380 //このファイルのフォルダ名をコピー +#define HLP000380 380 //このファイルのフォルダー名をコピー #define HLP000363 363 //プロファイルマネージャ #define HLP000029 29 //最近使ったファイル -#define HLP000023 23 //最近使ったフォルダ +#define HLP000023 23 //最近使ったフォルダー #define HLP000030 30 //編集の全終了 // 2007.02.13 ryoji #define HLP000028 28 //サクラエディタの全終了 #define HLP000031 31 //「編集(E)」メニューの一覧 @@ -215,7 +215,7 @@ #define HLP000197 197 //タイプ別設定 『支援』プロパティ #define HLP000203 203 //タイプ別設定 『正規表現キーワード』プロパティ //@@@ 2001.11.17 add MIK #define HLP000315 315 //タイプ別設定 『キーワードヘルプ』プロパティ // 2006.10.06 ryoji -#define HLP000077 77 //設定フォルダ（iniフォルダ） // 2007.09.09 maru +#define HLP000077 77 //設定フォルダー（iniフォルダー） // 2007.09.09 maru #define HLP000078 78 //ユーザー別設定 // 2007.09.23 maru #define HLP000079 79 //Visual Style // 2007.09.30 maru #define HLP000080 80 //Virtual Store // 2007.09.30 maru @@ -408,7 +408,7 @@ #define HLP_HISTORY 4001 //ヘルプファイル更新履歴 -#define HIDC_BUTTON_BACKUP_FOLDER_REF 10000 //バックアップフォルダ参照 +#define HIDC_BUTTON_BACKUP_FOLDER_REF 10000 //バックアップフォルダー参照 #define HIDC_CHECK_BACKUP 10010 //バックアップの作成 #define HIDC_CHECK_BACKUP_YEAR 10011 //バックアップファイル名（西暦年） #define HIDC_CHECK_BACKUP_MONTH 10012 //バックアップファイル名（月） @@ -417,10 +417,10 @@ #define HIDC_CHECK_BACKUP_MIN 10015 //バックアップファイル名（分） #define HIDC_CHECK_BACKUP_SEC 10016 //バックアップファイル名（秒） #define HIDC_CHECK_BACKUPDIALOG 10017 //作成前に確認 -#define HIDC_CHECK_BACKUPFOLDER 10018 //指定フォルダに作成 +#define HIDC_CHECK_BACKUPFOLDER 10018 //指定フォルダーに作成 #define HIDC_CHECK_BACKUP_DUSTBOX 10019 //バックアップをごみ箱に放り込む //@@@ 2002.01.03 -#define HIDC_CHECK_BACKUP_FOLDER_RM 10020 //指定フォルダに作成(リムーバブルメディアのみ) // 2010/5/27 Uchi -#define HIDC_EDIT_BACKUPFOLDER 10040 //保存フォルダ名 +#define HIDC_CHECK_BACKUP_FOLDER_RM 10020 //指定フォルダーに作成(リムーバブルメディアのみ) // 2010/5/27 Uchi +#define HIDC_EDIT_BACKUPFOLDER 10040 //保存フォルダー名 #define HIDC_EDIT_BACKUP_3 10041 //世代数 #define HIDC_EDIT_BACKUPFILE 10042 //保存ファイル名 #define HIDC_RADIO_BACKUP_TYPE1 10060 //バックアップの種類（拡張子） @@ -460,10 +460,10 @@ #define HIDC_CHECK_bOverWriteFixMode 10218 //文字幅に合わせてスペースを詰める #define HIDC_CHECK_bOverWriteBoxDelete 10219 //矩形入力で選択範囲を削除する #define HIDC_CHECK_CONVERTEOLPASTE 10217 //改行コードを変換して貼り付ける // 2009.02.28 salarm -#define HIDC_RADIO_CURDIR 10220 //カレントフォルダ -#define HIDC_RADIO_MRUDIR 10221 //最近使ったフォルダ -#define HIDC_RADIO_SELDIR 10222 //指定フォルダ -#define HIDC_EDIT_FILEOPENDIR 10223 //指定フォルダパス +#define HIDC_RADIO_CURDIR 10220 //カレントフォルダー +#define HIDC_RADIO_MRUDIR 10221 //最近使ったフォルダー +#define HIDC_RADIO_SELDIR 10222 //指定フォルダー +#define HIDC_EDIT_FILEOPENDIR 10223 //指定フォルダーパス #define HIDC_CHECK_ENABLEEXTEOL 10224 //改行コードNEL,PS,LSを有効にする #define HIDC_CHECK_BOXSELECTLOCK 10225 //矩形選択移動で選択をロックする #define HIDC_CHECK_EXCVLUSIVE_NO 10310 //ファイルの排他制御（排他制御しない） @@ -552,7 +552,7 @@ #define HIDC_BUTTON_KEYSETRENAME 10831 //セットの名称変更 // 2006.08.06 ryoji #define HIDC_LIST_KEYWORD 10840 //キーワード一覧 #define HIDC_BUTTON_CLEAR_MRU_FILE 10900 //履歴をクリア（ファイル） -#define HIDC_BUTTON_CLEAR_MRU_FOLDER 10901 //履歴をクリア（フォルダ） +#define HIDC_BUTTON_CLEAR_MRU_FOLDER 10901 //履歴をクリア（フォルダー） #define HIDC_CHECK_FREECARET 10910 //フリーカーソル #define HIDC_CHECK_INDENT 10911 //自動インデント #define HIDC_CHECK_INDENT_WSPACE 10912 //全角空白もインデント @@ -569,7 +569,7 @@ #define HIDC_HOTKEY_TRAYMENU 10940 //左クリックメニューのショートカットキー #define HIDC_EDIT_REPEATEDSCROLLLINENUM 10941 //スクロール行数 #define HIDC_EDIT_MAX_MRU_FILE 10942 //ファイル履歴の最大数 -#define HIDC_EDIT_MAX_MRU_FOLDER 10943 //フォルダ履歴の最大数 +#define HIDC_EDIT_MAX_MRU_FOLDER 10943 //フォルダー履歴の最大数 #define HIDC_RADIO_CARETTYPE0 10960 //カーソル形状（Windows風） #define HIDC_RADIO_CARETTYPE1 10961 //カーソル形状（MS-DOS風） #define HIDC_BUTTON_DELETE_TOOLBAR 11000 //ツールバーから機能削除 @@ -753,7 +753,7 @@ #define HIDC_LIST_PLUGIN_OPTIONS 11761 //プラグインオプションリスト // 2010/3/22 Uchi #define HIDC_EDIT_PLUGIN_OPTION 11762 //プラグインオプション編集 // 2010/3/22 Uchi #define HIDC_MACROCANCELTIMER 11763 //マクロ停止ダイアログ表示待ち時間 // 2011.08.04 syat -#define HIDC_PLUGIN_OpenFolder 11764 //プラグインフォルダを開く +#define HIDC_PLUGIN_OpenFolder 11764 //プラグインフォルダーを開く #define HIDC_EDIT_AUTOLOAD_DELAY 11765 //自動読込時遅延 #define HIDC_CHECK_KINSOKUHIDE 11766 //ぶら下げを隠す // 2012.11.30 Uchi #define HIDC_PLUGIN_README 11767 //ReadMe表示 // 2011/11/2 Uchi @@ -803,13 +803,13 @@ #define HIDC_REP_RADIO_LINEDELETE 11923 //置換対象：行削除 //GREP -#define HIDC_GREP_BUTTON_FOLDER 12000 //フォルダ -#define HIDC_GREP_BUTTON_CURRENTFOLDER 12001 //現フォルダ +#define HIDC_GREP_BUTTON_FOLDER 12000 //フォルダー +#define HIDC_GREP_BUTTON_CURRENTFOLDER 12001 //現フォルダー #define HIDOK_GREP 12002 //検索 #define HIDCANCEL_GREP 12003 //キャンセル #define HIDC_GREP_BUTTON_HELP 12004 //ヘルプ #define HIDC_GREP_CHK_WORD 12005 //単語単位 -#define HIDC_GREP_CHK_SUBFOLDER 12006 //サブフォルダも検索 +#define HIDC_GREP_CHK_SUBFOLDER 12006 //サブフォルダーも検索 #define HIDC_GREP_CHK_FROMTHISTEXT 12007 //編集中のテキストから検索 #define HIDC_GREP_CHK_LOHICASE 12008 //大文字小文字 #define HIDC_GREP_CHK_REGULAREXP 12009 //正規表現 @@ -817,21 +817,21 @@ #define HIDC_GREP_COMBO_CHARSET 12010 //文字コードセット #define HIDC_GREP_COMBO_TEXT 12011 //条件 #define HIDC_GREP_COMBO_FILE 12012 //ファイル -#define HIDC_GREP_COMBO_FOLDER 12013 //フォルダ +#define HIDC_GREP_COMBO_FOLDER 12013 //フォルダー #define HIDC_GREP_RADIO_OUTPUTLINE 12014 //結果出力：行単位 #define HIDC_GREP_RADIO_OUTPUTMARKED 12015 //結果出力：該当部分 #define HIDC_GREP_RADIO_OUTPUTSTYLE1 12016 //結果出力形式：ノーマル #define HIDC_GREP_RADIO_OUTPUTSTYLE2 12017 //結果出力形式：ファイル毎 #define HIDC_GREP_STATIC_JRE32VER 12018 //正規表現バージョン -#define HIDC_GREP_CHK_DEFAULTFOLDER 12019 //フォルダの初期値をカレントフォルダにする +#define HIDC_GREP_CHK_DEFAULTFOLDER 12019 //フォルダーの初期値をカレントフォルダーにする #define HIDC_RADIO_OUTPUTSTYLE3 12020 //結果出力形式：結果のみ #define HIDC_CHECK_FILE_ONLY 12021 //ファイル毎最初のみ検索 -#define HIDC_CHECK_BASE_PATH 12022 //ベースフォルダ表示 -#define HIDC_CHECK_SEP_FOLDER 12023 //フォルダ毎に表示 +#define HIDC_CHECK_BASE_PATH 12022 //ベースフォルダー表示 +#define HIDC_CHECK_SEP_FOLDER 12023 //フォルダー毎に表示 #define HIDC_GREP_BUTTON_FOLDER_UP 12024 //Up #define HIDC_GREP_CHECK_CP 12025 //コードページ #define HIDC_GREP_COMBO_EXCLUDE_FILE 12026 //除外ファイル -#define HIDC_GREP_COMBO_EXCLUDE_FOLDER 12027 //除外フォルダ +#define HIDC_GREP_COMBO_EXCLUDE_FOLDER 12027 //除外フォルダー //外部コマンド #define HIDC_EXEC_BUTTON_REFERENCE 12100 //参照 @@ -975,7 +975,7 @@ #define HIDC_OPENDLG_BUTTON_HELP 13102 //ヘルプ //@@@ 2002.01.10 #define HIDC_OPENDLG_COMBO_CODE 13103 //文字コードセット #define HIDC_OPENDLG_COMBO_MRU 13104 //最近のファイル -#define HIDC_OPENDLG_COMBO_OPENFOLDER 13105 //最近のフォルダ +#define HIDC_OPENDLG_COMBO_OPENFOLDER 13105 //最近のフォルダー #define HIDC_OPENDLG_COMBO_EOL 13106 //改行コード #define HIDC_OPENDLG_CHECK_BOM 13107 //BOM // 2006.08.06 ryoji #define HIDC_OPENDLG_CHECK_CP 13108 //CP @@ -1140,14 +1140,14 @@ #define HIDC_BUTTON_TREE_INITIALIZE 14413 //メニューを初期状態に戻す #define HIDC_CHECK_KEY_PARENTHESES 14414 //アクセスキーを必ず( )付で表示(&P) -#define HIDC_GREP_REP_BUTTON_FOLDER 14500 //フォルダ -#define HIDC_GREP_REP_BUTTON_CURRENTFOLDER 14501 //現フォルダ +#define HIDC_GREP_REP_BUTTON_FOLDER 14500 //フォルダー +#define HIDC_GREP_REP_BUTTON_CURRENTFOLDER 14501 //現フォルダー #define HIDOK_GREP_REP 14502 //置換開始 #define HIDCANCEL_GREP_REP 14503 //キャンセル #define HIDC_GREP_REP_BUTTON_HELP 14504 //ヘルプ #define HIDC_GREP_REP_CHK_PASTE 14505 //クリップボードから貼り付け #define HIDC_GREP_REP_CHK_WORD 14506 //単語単位 -#define HIDC_GREP_REP_CHK_SUBFOLDER 14507 //サブフォルダも検索 +#define HIDC_GREP_REP_CHK_SUBFOLDER 14507 //サブフォルダーも検索 #define HIDC_GREP_REP_CHK_FROMTHISTEXT 14804 //編集中のテキストから検索 #define HIDC_GREP_REP_CHK_LOHICASE 14509 //大文字小文字 #define HIDC_GREP_REP_CHK_REGULAREXP 14510 //正規表現 @@ -1156,7 +1156,7 @@ #define HIDC_GREP_REP_COMBO_TEXT 14513 //置換前 #define HIDC_GREP_REP_COMBO_TEXT2 14514 //置換後 #define HIDC_GREP_REP_COMBO_FILE 14515 //ファイル -#define HIDC_GREP_REP_COMBO_FOLDER 14516 //フォルダ +#define HIDC_GREP_REP_COMBO_FOLDER 14516 //フォルダー #define HIDC_GREP_REP_BUTTON_FOLDER_UP 14517 //上 #define HIDC_GREP_REP_RADIO_OUTPUTLINE 14518 //結果出力：行単位 #define HIDC_GREP_REP_RADIO_OUTPUTMARKED 14519 //結果出力：該当部分 @@ -1164,10 +1164,10 @@ #define HIDC_GREP_REP_RADIO_OUTPUTSTYLE2 14521 //結果出力形式：ファイル毎 #define HIDC_GREP_REP_RADIO_OUTPUTSTYLE3 14522 //結果出力形式：結果のみ #define HIDC_GREP_REP_STATIC_JRE32VER 14523 //正規表現バージョン -#define HIDC_GREP_REP_CHK_DEFAULTFOLDER 14524 //フォルダの初期値をカレントフォルダにする +#define HIDC_GREP_REP_CHK_DEFAULTFOLDER 14524 //フォルダーの初期値をカレントフォルダーにする #define HIDC_GREP_REP_CHECK_FILE_ONLY 14525 //ファイル毎最初のみ検索 -#define HIDC_GREP_REP_CHECK_BASE_PATH 14526 //ベースフォルダ表示 -#define HIDC_GREP_REP_CHECK_SEP_FOLDER 14527 //フォルダ毎に表示 +#define HIDC_GREP_REP_CHECK_BASE_PATH 14526 //ベースフォルダー表示 +#define HIDC_GREP_REP_CHECK_SEP_FOLDER 14527 //フォルダー毎に表示 #define HIDC_GREP_REP_CHECK_CP 14528 //CP //プロファイル一覧 diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 51c7a69785..bb66fb768b 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -144,15 +144,15 @@ BEGIN COMBOBOX IDC_COMBO_FOLDER,60,50,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&...",IDC_BUTTON_FOLDER,316,50,16,10 CONTROL "編集中のテキストから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,64,120,8 - CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,74,120,8 - CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,84,120,8 + CONTROL "サブフォルダーも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,74,120,8 + CONTROL "カレントフォルダーが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,84,120,8 PUSHBUTTON "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,64,50,14 - PUSHBUTTON "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,64,50,14,BS_MULTILINE + PUSHBUTTON "現フォルダー(&G)",IDC_BUTTON_CURRENTFOLDER,282,64,50,14,BS_MULTILINE RTEXT "対象ファイル(&I):",IDC_STATIC,4,96,52,8,NOT WS_GROUP COMBOBOX IDC_COMBO_FILE,60,96,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP RTEXT "除外ファイル(&J):",IDC_STATIC,4,110,52,8,NOT WS_GROUP COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - RTEXT "除外フォルダ(&K):",IDC_STATIC,4,124,53,8 + RTEXT "除外フォルダー(&K):",IDC_STATIC,4,124,53,8 COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP GROUPBOX "結果出力",IDC_STATIC,60,140,68,44,WS_GROUP CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,152,56,8 @@ -164,8 +164,8 @@ BEGIN CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,172,56,8 GROUPBOX "その他",IDC_STATIC,204,140,180,44,WS_GROUP CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,152,96,8 - CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,162,96,8 - CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,172,96,8 + CONTROL "フォルダー毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,162,96,8 + CONTROL "ベースフォルダー表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,172,96,8 LTEXT "文字コードセット(&A):",IDC_STATIC,312,148,66,8 COMBOBOX IDC_COMBO_CHARSET,312,158,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,172,30,8 @@ -194,15 +194,15 @@ BEGIN COMBOBOX IDC_COMBO_FOLDER,60,64,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&...",IDC_BUTTON_FOLDER,316,64,16,10 CONTROL "編集中のテキストから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,78,120,8 - CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,120,8 - CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,120,8 + CONTROL "サブフォルダーも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,120,8 + CONTROL "カレントフォルダーが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,120,8 PUSHBUTTON "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,78,50,14 - PUSHBUTTON "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,78,50,14,BS_MULTILINE + PUSHBUTTON "現フォルダー(&G)",IDC_BUTTON_CURRENTFOLDER,282,78,50,14,BS_MULTILINE RTEXT "対象ファイル(&I):",IDC_STATIC,4,110,52,8,NOT WS_GROUP COMBOBOX IDC_COMBO_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP RTEXT "除外ファイル(&J):",IDC_STATIC,4,124,52,8,NOT WS_GROUP COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - RTEXT "除外フォルダ(&K):",IDC_STATIC,4,138,52,8 + RTEXT "除外フォルダー(&K):",IDC_STATIC,4,138,52,8 COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,138,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP GROUPBOX "結果出力",IDC_STATIC,60,154,68,44,WS_GROUP CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,166,56,8 @@ -213,8 +213,8 @@ BEGIN CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,186,56,8 GROUPBOX "その他",IDC_STATIC,204,154,180,44,WS_GROUP CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,166,96,8 - CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,96,8 - CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,186,96,8 + CONTROL "フォルダー毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,96,8 + CONTROL "ベースフォルダー表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,186,96,8 LTEXT "文字コードセット(&A):",IDC_STATIC,312,162,62,8 COMBOBOX IDC_COMBO_CHARSET,312,172,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,186,30,8 @@ -231,7 +231,7 @@ BEGIN LTEXT "検索しています・・・",IDC_STATIC,5,5,61,10,NOT WS_GROUP LTEXT "ファイル",IDC_STATIC,5,21,26,10,NOT WS_GROUP LTEXT "IDC_STATIC_CURPATH",IDC_STATIC_CURFILE,36,20,252,10,NOT WS_GROUP - LTEXT "フォルダ",IDC_STATIC,5,34,27,10,NOT WS_GROUP + LTEXT "フォルダー",IDC_STATIC,5,34,27,10,NOT WS_GROUP EDITTEXT IDC_STATIC_CURPATH,36,35,252,20,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP PUSHBUTTON "キャンセル(&X)",IDCANCEL,238,60,50,14 LTEXT "0",IDC_STATIC_HITCOUNT,76,5,44,10,NOT WS_GROUP,WS_EX_RIGHT @@ -512,7 +512,7 @@ BEGIN COMBOBOX IDC_COMBO_EOL,226,13,50,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "最近のファイル(&F):",IDC_STATIC,5,32,59,10 COMBOBOX IDC_COMBO_MRU,71,30,185,236,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "最近のフォルダ(&D):",IDC_STATIC,5,49,61,10 + LTEXT "最近のフォルダー(&D):",IDC_STATIC,5,49,61,10 COMBOBOX IDC_COMBO_OPENFOLDER,71,46,185,236,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -583,11 +583,11 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "タグファイルの作成" FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x1 BEGIN - LTEXT "タグ作成フォルダ",IDC_STATIC,7,7,65,10 + LTEXT "タグ作成フォルダー",IDC_STATIC,7,7,65,10 EDITTEXT IDC_EDIT_TAG_MAKE_FOLDER,7,18,201,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BUTTON_TAG_MAKE_REF,211,17,15,12 PUSHBUTTON "上(&B)",IDC_BUTTON_FOLDER_UP,186,31,25,14 - CONTROL "サブフォルダも対象にする",IDC_CHECK_TAG_MAKE_RECURSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,107,10 + CONTROL "サブフォルダーも対象にする",IDC_CHECK_TAG_MAKE_RECURSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,107,10 LTEXT "コマンドラインオプション",IDC_STATIC,7,49,86,10 EDITTEXT IDC_EDIT_TAG_MAKE_CMDLINE,96,47,130,12,ES_AUTOHSCROLL DEFPUSHBUTTON "作成(&O)",IDOK,68,64,50,14 @@ -1052,7 +1052,7 @@ BEGIN EDITTEXT IDC_EDIT_MAX_MRU_FILE,168,184,28,12,ES_AUTOHSCROLL | WS_GROUP CONTROL "Spin1",IDC_SPIN_MAX_MRU_FILE,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,184,9,12 PUSHBUTTON "履歴をクリア(&C)...",IDC_BUTTON_CLEAR_MRU_FILE,208,184,61,14 - LTEXT "フォルダの履歴MA&X",IDC_STATIC,163,202,74,10 + LTEXT "フォルダーの履歴MA&X",IDC_STATIC,163,202,74,10 EDITTEXT IDC_EDIT_MAX_MRU_FOLDER,168,214,28,12,ES_AUTOHSCROLL | WS_GROUP CONTROL "Spin1",IDC_SPIN_MAX_MRU_FOLDER,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,214,9,12 PUSHBUTTON "履歴をクリア(&L)...",IDC_BUTTON_CLEAR_MRU_FOLDER,208,214,61,14 @@ -1203,9 +1203,9 @@ BEGIN GROUPBOX "上書きモード",IDC_STATIC,3,143,137,58,WS_GROUP CONTROL "クリックで&URLを選択する",IDC_CHECK_bSelectClickedURL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,18,120,10 GROUPBOX "クリッカブルURL",IDC_STATIC,144,3,142,35,WS_GROUP - CONTROL "カレントフォルダ(&U)",IDC_RADIO_CURDIR,"Button",BS_AUTORADIOBUTTON,149,54,90,10 - CONTROL "最近使ったフォルダ(&M)",IDC_RADIO_MRUDIR,"Button",BS_AUTORADIOBUTTON,149,69,90,10 - CONTROL "指定フォルダ(&F)",IDC_RADIO_SELDIR,"Button",BS_AUTORADIOBUTTON,149,84,90,10 + CONTROL "カレントフォルダー(&U)",IDC_RADIO_CURDIR,"Button",BS_AUTORADIOBUTTON,149,54,90,10 + CONTROL "最近使ったフォルダー(&M)",IDC_RADIO_MRUDIR,"Button",BS_AUTORADIOBUTTON,149,69,90,10 + CONTROL "指定フォルダー(&F)",IDC_RADIO_SELDIR,"Button",BS_AUTORADIOBUTTON,149,84,90,10 EDITTEXT IDC_EDIT_FILEOPENDIR,149,100,111,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BUTTON_FILEOPENDIR,261,100,9,12 GROUPBOX "ファイルダイアログの初期位置",IDC_STATIC,144,41,142,79,WS_GROUP @@ -1321,10 +1321,10 @@ BEGIN LTEXT "",IDC_STATIC,12,60,271,83,NOT WS_VISIBLE CONTROL "保存時の日付・時刻を使用",IDC_RADIO_BACKUP_DATETYPE1A,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,104,111,10 CONTROL "前回のファイル更新時の日付・時刻を使用",IDC_RADIO_BACKUP_DATETYPE2A,"Button",BS_AUTORADIOBUTTON,12,118,149,10 - LTEXT "$x : x個上のフォルダ名(0-9)\r* : 拡張子\r\r%Y/%m/%d : 年月日 %y西暦(2桁) \r%H:%M:%S: 時分秒 \r%% : '%'記号\r",IDC_LABEL_BACKUP_HELP2,165,75,115,50,SS_SUNKEN - CONTROL "指定フォルダに作成する(&P)",IDC_CHECK_BACKUPFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,148,107,10 + LTEXT "$x : x個上のフォルダー名(0-9)\r* : 拡張子\r\r%Y/%m/%d : 年月日 %y西暦(2桁) \r%H:%M:%S: 時分秒 \r%% : '%'記号\r",IDC_LABEL_BACKUP_HELP2,165,75,115,50,SS_SUNKEN + CONTROL "指定フォルダーに作成する(&P)",IDC_CHECK_BACKUPFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,148,107,10 CONTROL "リムーバブルメディアのみ(&L)",IDC_CHECK_BACKUP_FOLDER_RM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,148,133,10 - LTEXT "フォルダ名(&F)",IDC_LABEL_BACKUP_4,24,162,87,10 + LTEXT "フォルダー名(&F)",IDC_LABEL_BACKUP_4,24,162,87,10 EDITTEXT IDC_EDIT_BACKUPFOLDER,73,160,195,12,ES_AUTOHSCROLL PUSHBUTTON "&...",IDC_BUTTON_BACKUP_FOLDER_REF,271,160,9,12 CONTROL "バックアップファイルをごみ箱に放り込む(&X)",IDC_CHECK_BACKUP_DUSTBOX, @@ -1522,7 +1522,7 @@ FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x1 BEGIN CONTROL "プラグインを有効にする(&E)",IDC_CHECK_PluginEnable,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,9,100,10 PUSHBUTTON "ZIPプラグインを導入(&Z)",IDC_PLUGIN_INST_ZIP,192,6,96,14 - PUSHBUTTON "フォルダを開く(&F)",IDC_PLUGIN_OpenFolder,120,20,70,14 + PUSHBUTTON "フォルダーを開く(&F)",IDC_PLUGIN_OpenFolder,120,20,70,14 PUSHBUTTON "新規プラグインを追加(&I)",IDC_PLUGIN_SearchNew,192,20,96,14 LTEXT "プラグイン一覧",IDC_STATIC,4,28,50,10 CONTROL "List1",IDC_PLUGINLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,41,285,108 @@ -1648,14 +1648,14 @@ CAPTION "ファイルツリー設定" FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x1 BEGIN LTEXT "設定：共通設定",IDC_STATIC_SETTFING_FROM,4,4,282,10 - CONTROL "各フォルダの設定を読み込む(&I)",IDC_CHECK_LOADINI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,16,120,9 + CONTROL "各フォルダーの設定を読み込む(&I)",IDC_CHECK_LOADINI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,16,120,9 LTEXT "デフォルト設定ファイル名(&J)",IDC_STATIC,4,28,110,10 EDITTEXT IDC_EDIT_DEFINI,13,39,124,13,ES_AUTOHSCROLL PUSHBUTTON "...(&1)",IDC_BUTTON_REF1,137,39,17,13 PUSHBUTTON "読み込み(&V)",IDC_BUTTON_LOAD,108,53,47,14 CONTROL "Grep(&G)",IDC_RADIO_GREP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,72,56,10 CONTROL "ファイル(&F)",IDC_RADIO_FILE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,85,56,10 - CONTROL "フォルダ(&2)",IDC_RADIO_FOLDER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,98,56,10 + CONTROL "フォルダー(&2)",IDC_RADIO_FOLDER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,98,56,10 GROUPBOX "種類",IDC_STATIC,1,61,89,50,WS_GROUP LTEXT "パス(&T)",IDC_STATIC_PATH,3,119,22,10 EDITTEXT IDC_EDIT_PATH,38,117,122,13,ES_AUTOHSCROLL @@ -2239,7 +2239,7 @@ BEGIN F_TOPMOST_SET "常に手前に表示" F_FILE_REOPEN_SUBMENU "開き直す" F_FILE_RCNTFILE_SUBMENU "最近使ったファイル" - F_FILE_RCNTFLDR_SUBMENU "最近使ったフォルダ" + F_FILE_RCNTFLDR_SUBMENU "最近使ったフォルダー" F_EDIT_INS_SUBMENU "挿入" F_EDIT_COS_SUBMENU "整形" F_EDIT_MOV_SUBMENU "移動" @@ -2513,7 +2513,7 @@ END STRINGTABLE BEGIN F_CREATEKEYBINDLIST "キー割り当て一覧をコピー" - F_COPYDIRPATH "このファイルのフォルダ名をコピー" + F_COPYDIRPATH "このファイルのフォルダー名をコピー" END STRINGTABLE @@ -2522,7 +2522,7 @@ BEGIN F_INS_TIME "時刻挿入" F_CTRL_CODE_DIALOG "コントロールコード入力..." F_INS_FILE_USED_RECENTLY "最近使ったファイル挿入" - F_INS_FOLDER_USED_RECENTLY "最近使ったフォルダ挿入" + F_INS_FOLDER_USED_RECENTLY "最近使ったフォルダー挿入" END STRINGTABLE @@ -2886,7 +2886,7 @@ STRINGTABLE BEGIN F_WINDOW_LIST "ウィンドウリスト" F_FILE_USED_RECENTLY "最近使ったファイル" - F_FOLDER_USED_RECENTLY "最近使ったフォルダ" + F_FOLDER_USED_RECENTLY "最近使ったフォルダー" F_CUSTMENU_LIST "カスタムメニューリスト" F_USERMACRO_LIST "登録済みマクロリスト" F_PLUGIN_LIST "プラグインコマンドリスト" @@ -2921,8 +2921,8 @@ BEGIN STR_SHELL_INFO "情報" STR_SHELL_MENU_OPEN "開く(&O)..." STR_SHELL_MENU_IMPEXP "インポート／エクスポートの起点リセット(&R)" - STR_SHELL_IMPEXPDIR "各種設定のインポート／エクスポート用ファイル選択画面の\n初期表示フォルダを設定フォルダに戻します。" - STR_SHELL_INIFOLDER "設定フォルダ(&/) >>" + STR_SHELL_IMPEXPDIR "各種設定のインポート／エクスポート用ファイル選択画面の\n初期表示フォルダーを設定フォルダーに戻します。" + STR_SHELL_INIFOLDER "設定フォルダー(&/) >>" STR_ERR_GLOBAL01 "自動選択" STR_PREVIEW_ONLY "(印刷プレビューでのみ使用できます)" STR_NOT_SAVED "(保存されていません)" @@ -3000,11 +3000,11 @@ BEGIN STR_ERR_DLGCTL36 "ユニット区切" STR_ERR_DLGCTL37 "削除" STR_DLGFAV_FILE "ファイル" - STR_DLGFAV_FOLDER "フォルダ" + STR_DLGFAV_FOLDER "フォルダー" STR_DLGFAV_SEARCH "検索" STR_DLGFAV_REPLACE "置換" STR_DLGFAV_GREP_FILE "GREPファイル" - STR_DLGFAV_GREP_FOLDER "GREPフォルダ" + STR_DLGFAV_GREP_FOLDER "GREPフォルダー" STR_DLGFAV_EXT_COMMAND "コマンド" STR_DLGFAV_HIDDEN "(非表示)" STR_DLGFAV_FAVORITE "お気に入り" @@ -3017,7 +3017,7 @@ BEGIN STR_DLGFAV_CONF_DEL_PATH "最近使った%sの存在しないパスを削除します。\nよろしいですか？" STR_DLGFAV_DELIMITER "、" STR_DLGFAV_FAV_REFRESH "履歴(%s)が更新されたため編集中情報を破棄し再表示しました。" - STR_DLGFAV_FF_EXCLUDE "ファイル・フォルダ除外" + STR_DLGFAV_FF_EXCLUDE "ファイル・フォルダー除外" STR_DLGFAV_CURRENT_DIR "カレントディレクトリ" STR_DLGFAV_ADD "追加" STR_DLGFAV_ADD_PROMPT "追加する文字列を入力してください。" @@ -3086,7 +3086,7 @@ BEGIN STR_LOADAGENT_BIG_ERROR "'%s'\nというファイルを開けません。\nファイルサイズが大きすぎます。\n\n指定ファイルのサイズ: %s\nファイルサイズの上限: %s" STR_ERR_FILEPATH_TOO_LONG "%ls\nというファイルを開けません。\nファイルのパスが長すぎます。" STR_GREP_EXCLUDE_FILE "除外ファイル " - STR_GREP_EXCLUDE_FOLDER "除外フォルダ " + STR_GREP_EXCLUDE_FOLDER "除外フォルダー " STR_FILEDIALOG_READONLY "読み取り専用ファイルとして開く(&R)" STR_FILEDIALOG_CODE "文字コードセット(&C):" STR_FILEDIALOG_EOL "改行コード(&E):" @@ -3127,8 +3127,8 @@ BEGIN STR_DLGFNCLST_LIST_COL "桁" STR_DLGFNCLST_LIST_COL_M "桁 *" STR_DLGFNCLST_LIST_M "*" - STR_DLGGREP1 "検索するフォルダを選んでください" - STR_DLGGREP2 "ファイル指定のフォルダ部分にはワイルドカードは使えません。" + STR_DLGGREP1 "検索するフォルダーを選んでください" + STR_DLGGREP2 "ファイル指定のフォルダー部分にはワイルドカードは使えません。" STR_DLGGREP3 "ファイル指定にはフルパスは使えません" END @@ -3166,15 +3166,15 @@ BEGIN STR_DLLPLG_TITLE "DLLプラグイン" STR_DLLPLG_INIT_ERR1 "DLLの読み込みに失敗しました\n%s\n%ls" STR_DLLPLG_INIT_ERR2 "DLLの読み込みに失敗しました" - STR_PLGMGR_FOLDER "プラグインフォルダを作成出来ません" + STR_PLGMGR_FOLDER "プラグインフォルダーを作成出来ません" STR_PLGMGR_CANCEL "キャンセルされました" END STRINGTABLE BEGIN - STR_DLGGREP4 "検索対象フォルダを指定してください。" - STR_DLGGREP5 "検索対象フォルダが正しくありません。" - STR_DLGGREP6 "検索対象フォルダが長すぎます。" + STR_DLGGREP4 "検索対象フォルダーを指定してください。" + STR_DLGGREP5 "検索対象フォルダーが正しくありません。" + STR_DLGGREP6 "検索対象フォルダーが長すぎます。" STR_DLGGREP_THISDOC "(現在のドキュメント)" STR_DLGGREP_THISDOC_ERROR "対象ファイルに:HWND:は入力できません" STR_DLGJUMP1 "正しく行番号を入力してください。" @@ -3254,7 +3254,7 @@ BEGIN STR_DLGFLPROP_ATTRIBUTES "ファイル属性 " STR_DLGFLPROP_AT_ARCHIVE "/アーカイブ" STR_DLGFLPROP_AT_COMPRESS "/圧縮" - STR_DLGFLPROP_AT_FOLDER "/フォルダ" + STR_DLGFLPROP_AT_FOLDER "/フォルダー" STR_DLGFLPROP_AT_HIDDEN "/隠し" STR_DLGFLPROP_AT_NORMAL "/ノーマル" STR_DLGFLPROP_AT_OFFLINE "/オフライン" @@ -3286,7 +3286,7 @@ BEGIN STR_DLGTAGJMP_LIST5 "ファイル名" STR_DLGTAGJMP_LIST6 "備考" STR_DLGTAGJMP3 "キーワード 検索中..." - STR_DLGTAGMAK_SELECTDIR "タグ作成フォルダの選択" + STR_DLGTAGMAK_SELECTDIR "タグ作成フォルダーの選択" END STRINGTABLE @@ -3422,16 +3422,16 @@ BEGIN STR_GREP_SEARCH_CONDITION "\r\n□検索条件 " STR_GREP_SEARCH_FILE "「ファイル検索」\r\n" STR_GREP_SEARCH_TARGET "検索対象 " - STR_GREP_SEARCH_FOLDER "フォルダ " - STR_GREP_SUBFOLDER_YES " (サブフォルダも検索)\r\n" - STR_GREP_SUBFOLDER_NO " (サブフォルダを検索しない)\r\n" + STR_GREP_SEARCH_FOLDER "フォルダー " + STR_GREP_SUBFOLDER_YES " (サブフォルダーも検索)\r\n" + STR_GREP_SUBFOLDER_NO " (サブフォルダーを検索しない)\r\n" STR_GREP_COMPLETE_WORD " (単語単位で探す)\r\n" END STRINGTABLE BEGIN STR_FILEDIALOG_MRU "最近のファイル(&F):" - STR_FILEDIALOG_OPENFOLDER "最近のフォルダ(&D):" + STR_FILEDIALOG_OPENFOLDER "最近のフォルダー(&D):" STR_IMPEXP_REGEX4 "キーワードが長過ぎるため切り捨てました。" STR_STATUS_FONTZOOM_0 "%4.0f %%" STR_STATUS_FONTZOOM_1 "%4.1f %%" @@ -3452,7 +3452,7 @@ BEGIN STR_GREP_TIMER "処理時間: %dミリ秒\r\n" STR_GREP_SHOW_FIRST_MATCH " (ファイル毎最初のみ検索)\r\n" STR_GREP_ERR_ENUMKEYS0 "(不明)" - STR_GREP_ERR_ENUMKEYS1 "ファイル指定のフォルダ部分にはワイルドカードは使えません" + STR_GREP_ERR_ENUMKEYS1 "ファイル指定のフォルダー部分にはワイルドカードは使えません" STR_GREP_ERR_ENUMKEYS2 "ファイル指定にはフルパスは使えません" STR_GREP_ERR_FILEOPEN "file open error [%s]\r\n" END @@ -3468,7 +3468,7 @@ BEGIN STR_FILETREE_FROM_COMMON "設定: 共通設定" STR_FILETREE_FROM_TYPE "設定: タイプ別設定" STR_FILETREE_FROM_FILE "設定: %s" - STR_FILETREE_CURDIR "<カレントフォルダ>" + STR_FILETREE_CURDIR "<カレントフォルダー>" STR_FILETREE_MAXCOUNT "最大数(%d)を超えたため切り捨てました" STR_FILETREE_MENU_ROOT "INIルート(&I)" STR_FILETREE_MENU_MYDOC "マイ ドキュメント(&Y)" @@ -3631,7 +3631,7 @@ BEGIN STR_ERR_DLGMACRO10 "置換先パターンが指定されていません．" STR_ERR_DLGMACRO11 "GREPパターンが指定されていません．" STR_ERR_DLGMACRO12 "ファイル種別が指定されていません．" - STR_ERR_DLGMACRO13 "検索先フォルダが指定されていません．" + STR_ERR_DLGMACRO13 "検索先フォルダーが指定されていません．" STR_ERR_DLGMACRO14 "読み込みファイル名が指定されていません．" STR_ERR_DLGMACRO15 "保存ファイル名が指定されていません．" END @@ -3669,7 +3669,7 @@ BEGIN STR_ERR_DLGPROCFACT3 "'%s'\nプロセスの起動に失敗しました。\n%s" STR_ERR_DLGPROCFACT4 "'%ls'\nコントロールプロセスの起動に失敗しました。" STR_ERR_DLGPROCFACT5 "エディタまたはシステムがビジー状態です。\nしばらく待って開きなおしてください。" - STR_PROPCOMBK_SEL_FOLDER "バックアップを作成するフォルダを選んでください" + STR_PROPCOMBK_SEL_FOLDER "バックアップを作成するフォルダーを選んでください" STR_PROPCOMBK_DUSTBOX "(ゴミ箱)" STR_PROPCOMCUSTMENU_SEP " ─────────────" STR_PROPCOMCUSTMENU_AC1 "メニューアイテムのアクセスキー設定" @@ -3680,7 +3680,7 @@ STRINGTABLE BEGIN STR_DLGABOUT_APPNAME "サクラエディタ" STR_DLGEXEC_SELECT_CURDIR "カレントディレクトリを選んでください" - STR_PROPEDIT_SELECT_DIR "ファイルダイアログの指定フォルダの選択" + STR_PROPEDIT_SELECT_DIR "ファイルダイアログの指定フォルダーの選択" STR_DLGTYPEASC_IMPORT "--そのままインポート--" STR_PROPCOMMAINMENU_EDIT "編集してください" STR_PROPCOMMAINMENU_SEP "――――――――――" @@ -3702,7 +3702,7 @@ BEGIN STR_PROPCOMFNM_LIST2 "置換後" STR_PROPCOMFNM_ERR_REG "これ以上登録できません。" STR_PROPCOMGREP_DLL "正規表現は使用できません" - STR_PROPCOMHELP_MIGEMODIR "検索するフォルダを選んでください" + STR_PROPCOMHELP_MIGEMODIR "検索するフォルダーを選んでください" STR_PROPCOMKEYBIND_UNASSIGN "未割付" STR_PROPCOMKEYWORD_ERR_LEN "キーワードの長さは%dバイトまでです。" STR_PROPCOMKEYWORD_SETMAX "セットは%d個までしか登録できません。\n" @@ -3722,8 +3722,8 @@ BEGIN STR_ERR_DLGPROPCOMMON24 "CPropCommon::DoPropertySheet()内でエラーが出ました。\npsh.nStartPage=[%d]\n::PropertySheet()失敗\n\n%s\n" STR_PROPCOMGEN_FILE1 "最近使ったファイルの履歴を削除します。\nよろしいですか？\n" STR_PROPCOMGEN_FILE2 "最近使ったファイルの履歴を削除しました。\n" - STR_PROPCOMGEN_DIR1 "最近使ったフォルダの履歴を削除します。\nよろしいですか？\n" - STR_PROPCOMGEN_DIR2 "最近使ったフォルダの履歴を削除しました。\n" + STR_PROPCOMGEN_DIR1 "最近使ったフォルダーの履歴を削除します。\nよろしいですか？\n" + STR_PROPCOMGEN_DIR2 "最近使ったフォルダーの履歴を削除しました。\n" STR_PROPCOMTOOL_ERR01 "Toolbar Dialog: 要素の挿入に失敗しました。(%d:%d)" STR_PROPCOMTOOL_ERR02 "Toolbar Dialog: INS: 値の設定に失敗しました。:%d" STR_PROPCOMTOOL_ERR03 "Toolbar Dialog: 要素の追加に失敗しました。(%d:%d)" @@ -3761,7 +3761,7 @@ STRINGTABLE BEGIN STR_PROPCOMMAINMENU_ERR5 "重複したアクセスキーがあります。\n" STR_PROPCOMMAINMENU_ERR6 "未設定のアクセスキーがあります。\n" - STR_PROPCOMPLG_ERR1 "プラグインはこのウィンドウで読み込まれていないか、フォルダが異なるため\n設定を変更できません" + STR_PROPCOMPLG_ERR1 "プラグインはこのウィンドウで読み込まれていないか、フォルダーが異なるため\n設定を変更できません" STR_PROPCOMPLG_ERR2 "ReadMeファイルが開けません" STR_PROPCOMPLG_ERR3 "ReadMeファイルが見つかりません " STR_PROPCOMPLG_STATE1 "追加" @@ -3799,7 +3799,7 @@ END STRINGTABLE BEGIN - STR_PROPCOMPLG_LIST5 "フォルダ" + STR_PROPCOMPLG_LIST5 "フォルダー" STR_PROPCOMPLG_DELETE "%ls を削除しますか" STR_DLGTYPELIST_ERR1 "関連付けに失敗しました\n" STR_DLGTYPELIST_ERR2 "関連付け解除に失敗しました\n" @@ -4056,8 +4056,8 @@ BEGIN STR_PLGMGR_INSTALL "プラグイン「%s」をインストールしますか？" STR_PLGMGR_INSTALL_ERR "プラグイン「%s」をインストールできませんでした\n理由：%ls" STR_PLGMGR_ERR_ZIP "ZIPファイルは扱えません" - STR_PLGMGR_ERR_FOLDER "プラグインフォルダがありません" - STR_PLGMGR_ERR_CREATEDIR "プラグインフォルダを作成出来ません" + STR_PLGMGR_ERR_FOLDER "プラグインフォルダーがありません" + STR_PLGMGR_ERR_CREATEDIR "プラグインフォルダーを作成出来ません" STR_PLGMGR_INST_ZIP_ACCESS "ZIPファイル「%s」にアクセス出来ません" STR_PLGMGR_INST_ZIP_DEF "ZIPファイル「%s」にはプラグイン定義ファイル（plugin.def）がありません" STR_PLGMGR_INST_ZIP_ALREADY "「%s」は既にインストールされています\n上書きしますか？" diff --git a/sakura_core/typeprop/CImpExpManager.cpp b/sakura_core/typeprop/CImpExpManager.cpp index 8d5910770c..16fac0eaf9 100644 --- a/sakura_core/typeprop/CImpExpManager.cpp +++ b/sakura_core/typeprop/CImpExpManager.cpp @@ -133,7 +133,7 @@ bool CImpExpManager::ImportUI( HINSTANCE hInstance, HWND hwndParent ) hInstance, hwndParent, GetDefaultExtension(), - GetDllShareData().m_sHistory.m_szIMPORTFOLDER // インポート用フォルダ + GetDllShareData().m_sHistory.m_szIMPORTFOLDER // インポート用フォルダー ); WCHAR szPath[_MAX_PATH + 1]; szPath[0] = L'\0'; @@ -180,7 +180,7 @@ bool CImpExpManager::ExportUI( HINSTANCE hInstance, HWND hwndParent ) hInstance, hwndParent, GetDefaultExtension(), - GetDllShareData().m_sHistory.m_szIMPORTFOLDER // インポート用フォルダ + GetDllShareData().m_sHistory.m_szIMPORTFOLDER // インポート用フォルダー ); WCHAR szPath[_MAX_PATH + 1]; szPath[0] = L'\0'; diff --git a/sakura_core/typeprop/CImpExpManager.h b/sakura_core/typeprop/CImpExpManager.h index cae39085ea..1ef6c9a66f 100644 --- a/sakura_core/typeprop/CImpExpManager.h +++ b/sakura_core/typeprop/CImpExpManager.h @@ -65,7 +65,7 @@ class CImpExpManager // Import Folderの設定 inline void SetImportFolder( const WCHAR* szPath ) { - /* ファイルのフルパスをフォルダとファイル名に分割 */ + /* ファイルのフルパスをフォルダーとファイル名に分割 */ /* [c:\work\test\aaa.txt] → [c:\work\test] + [aaa.txt] */ ::SplitPath_FolderAndFile( szPath, GetDllShareData().m_sHistory.m_szIMPORTFOLDER, NULL ); wcscat( GetDllShareData().m_sHistory.m_szIMPORTFOLDER, L"\\" ); diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index eb12a77163..d5bbeb3f26 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -294,7 +294,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_COPYDIRPATH /* , 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 */, //ダミー @@ -307,7 +307,7 @@ CMenuDrawer::CMenuDrawer() /* 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_INS_FILE_USED_RECENTLY /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //最近使ったファイル挿入 -/* 189 */ F_INS_FOLDER_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_core/util/file.cpp b/sakura_core/util/file.cpp index c198ab0d2d..5acb616072 100644 --- a/sakura_core/util/file.cpp +++ b/sakura_core/util/file.cpp @@ -255,7 +255,7 @@ FILE* _wfopen_absini(LPCWSTR fname, LPCWSTR mode, BOOL bOrExedir/*=TRUE*/ ) return _wfopen( fname, mode ); } -/* フォルダの最後が半角かつ'\\'の場合は、取り除く "c:\\"等のルートは取り除かない */ +/* フォルダーの最後が半角かつ'\\'の場合は、取り除く "c:\\"等のルートは取り除かない */ void CutLastYenFromDirectoryPath( WCHAR* pszFolder ) { if( 3 == wcslen( pszFolder ) @@ -264,7 +264,7 @@ void CutLastYenFromDirectoryPath( WCHAR* pszFolder ) ){ /* ドライブ名:\ */ }else{ - /* フォルダの最後が半角かつ'\\'の場合は、取り除く */ + /* フォルダーの最後が半角かつ'\\'の場合は、取り除く */ int nFolderLen; int nCharChars; nFolderLen = wcslen( pszFolder ); @@ -286,7 +286,7 @@ void AddLastYenFromDirectoryPath( WCHAR* pszFolder ) ){ /* ドライブ名:\ */ }else{ - /* フォルダの最後が半角かつ'\\'でない場合は、付加する */ + /* フォルダーの最後が半角かつ'\\'でない場合は、付加する */ int nFolderLen; nFolderLen = wcslen( pszFolder ); if( 0 < nFolderLen ){ @@ -313,7 +313,7 @@ std::wstring AddLastYenPath(std::wstring_view path) return ret; } -/* ファイルのフルパスを、フォルダとファイル名に分割 */ +/* ファイルのフルパスを、フォルダーとファイル名に分割 */ /* [c:\work\test\aaa.txt] → [c:\work\test] + [aaa.txt] */ void SplitPath_FolderAndFile( const WCHAR* pszFilePath, WCHAR* pszFolder, WCHAR* pszFile ) { @@ -327,7 +327,7 @@ void SplitPath_FolderAndFile( const WCHAR* pszFilePath, WCHAR* pszFolder, WCHAR* if( NULL != pszFolder ){ wcscpy( pszFolder, szDrive ); wcscat( pszFolder, szDir ); - /* フォルダの最後が半角かつ'\\'の場合は、取り除く */ + /* フォルダーの最後が半角かつ'\\'の場合は、取り除く */ nFolderLen = wcslen( pszFolder ); if( 0 < nFolderLen ){ nCharChars = &pszFolder[nFolderLen] - CNativeW::GetCharPrev( pszFolder, nFolderLen, &pszFolder[nFolderLen] ); @@ -343,16 +343,16 @@ void SplitPath_FolderAndFile( const WCHAR* pszFilePath, WCHAR* pszFolder, WCHAR* return; } -/* フォルダ、ファイル名から、結合したパスを作成 +/* フォルダー、ファイル名から、結合したパスを作成 * [c:\work\test] + [aaa.txt] → [c:\work\test\aaa.txt] - * フォルダ末尾に円記号があってもなくても良い。 + * フォルダー末尾に円記号があってもなくても良い。 */ void Concat_FolderAndFile( const WCHAR* pszDir, const WCHAR* pszTitle, WCHAR* pszPath ) { WCHAR* out=pszPath; const WCHAR* in; - //フォルダをコピー + //フォルダーをコピー for( in=pszDir ; *in != '\0'; ){ *out++ = *in++; } @@ -526,7 +526,7 @@ void GetExedir( partialPath.insert(partialPath.cbegin(), L'\\'); } - // exeフォルダのフルパス、またはexe基準のファイルパスを取得 + // exeフォルダーのフルパス、またはexe基準のファイルパスを取得 auto path = GetExeFileName().parent_path().concat(partialPath); ::wcsncpy_s(pDir, decltype(DLLSHAREDATA::m_szIniFile)::BUFFER_COUNT, path.c_str(), _TRUNCATE); } @@ -564,7 +564,7 @@ void GetInidir( partialPath.insert(partialPath.cbegin(), L'\\'); } - // 設定フォルダのフルパス、またはini基準のファイルパスを取得 + // 設定フォルダーのフルパス、またはini基準のファイルパスを取得 auto path = GetIniFileName().parent_path().concat(partialPath); ::wcsncpy_s(pDir, decltype(DLLSHAREDATA::m_szPrivateIniFile)::BUFFER_COUNT, path.c_str(), _TRUNCATE); } @@ -634,7 +634,7 @@ LPCWSTR GetRelPath( LPCWSTR pszPath ) } //! パスに使えない文字が含まれていないかチェックする -// ファイル名、フォルダ名には「<>*|"?」が使えない +// ファイル名、フォルダー名には「<>*|"?」が使えない // しかし「\\?\C:\Program files\」の形式では?が3文字目にあるので除外 // ストリーム名とのセパレータにはfilename.ext:streamの形式でコロンが使われる // コロンは除外文字に入っていない @@ -997,7 +997,7 @@ void my_splitpath_w ( int FileMatchScore( const WCHAR *file1, const WCHAR *file2 ); // フルパスからファイル名と拡張子（ファイル名の.以降）を分離する -// @date 2014/06/15 moca_skr フォルダ名に.が含まれた場合、フォルダが分離されたのを修正した対応で新規作成 +// @date 2014/06/15 moca_skr フォルダー名に.が含まれた場合、フォルダーが分離されたのを修正した対応で新規作成 static void FileNameSepExt( std::wstring_view file, std::wstring& szFile, std::wstring& szExt ) { const WCHAR* folderPos; @@ -1179,7 +1179,7 @@ void GetShortViewPath( WCHAR* dest, int nSize, const WCHAR* path, HDC hDC, int n nNext += t_max(1, (int)(Int)CNativeW::GetSizeOfChar(path, nPathLen, nNext)); } if( path[nNext] != L'\0' ){ - // サブフォルダ省略 + // サブフォルダー省略 // C:\...\dir\file.ext std::wstring strTemp(path, nLeft + 1); if( nLeft + 1 < nRight ){ @@ -1190,7 +1190,7 @@ void GetShortViewPath( WCHAR* dest, int nSize, const WCHAR* path, HDC hDC, int n wcsncpy_s(dest, nSize, strTemp.c_str(), _TRUNCATE); return; } - // C:\...\dir\ フォルダパスだった。最後のフォルダを表示 + // C:\...\dir\ フォルダーパスだった。最後のフォルダーを表示 if( path[nNext+1] == L'\0' ){ if( bFitMode ){ GetStrTrancateWidth(dest, nSize, strTemp.c_str(), hDC, nPxWidth); diff --git a/sakura_core/util/file.h b/sakura_core/util/file.h index 77a065a4e7..0d718da701 100644 --- a/sakura_core/util/file.h +++ b/sakura_core/util/file.h @@ -53,11 +53,11 @@ FILE *_wfopen_absexe(LPCWSTR fname, LPCWSTR mode); // 2003.06.23 Moca FILE *_wfopen_absini(LPCWSTR fname, LPCWSTR mode, BOOL bOrExedir = TRUE); // 2007.05.19 ryoji //パス文字列処理 -void CutLastYenFromDirectoryPath( WCHAR* pszFolder ); /* フォルダの最後が半角かつ'\\'の場合は、取り除く "c:\\"等のルートは取り除かない*/ -void AddLastYenFromDirectoryPath( WCHAR* pszFolder ); /* フォルダの最後が半角かつ'\\'でない場合は、付加する */ +void CutLastYenFromDirectoryPath( WCHAR* pszFolder ); /* フォルダーの最後が半角かつ'\\'の場合は、取り除く "c:\\"等のルートは取り除かない*/ +void AddLastYenFromDirectoryPath( WCHAR* pszFolder ); /* フォルダーの最後が半角かつ'\\'でない場合は、付加する */ std::wstring AddLastYenPath(std::wstring_view path); -void SplitPath_FolderAndFile( const WCHAR* pszFilePath, WCHAR* pszFolder, WCHAR* pszFile ); /* ファイルのフルパスを、フォルダとファイル名に分割 */ -void Concat_FolderAndFile( const WCHAR* pszDir, const WCHAR* pszTitle, WCHAR* pszPath );/* フォルダ、ファイル名から、結合したパスを作成 */ +void SplitPath_FolderAndFile( const WCHAR* pszFilePath, WCHAR* pszFolder, WCHAR* pszFile ); /* ファイルのフルパスを、フォルダーとファイル名に分割 */ +void Concat_FolderAndFile( const WCHAR* pszDir, const WCHAR* pszTitle, WCHAR* pszPath );/* フォルダー、ファイル名から、結合したパスを作成 */ BOOL GetLongFileName( const WCHAR* pszFilePathSrc, WCHAR* pszFilePathDes ); /* ロングファイル名を取得する */ BOOL CheckEXT( const WCHAR* pszPath, const WCHAR* pszExt ); /* 拡張子を調べる */ const WCHAR* GetFileTitlePointer(const WCHAR* pszPath); //!< ファイルフルパス内のファイル名を指すポインタを取得。2007.09.20 kobake 作成 diff --git a/sakura_core/util/module.cpp b/sakura_core/util/module.cpp index 5f653f87e3..ab3498d84c 100644 --- a/sakura_core/util/module.cpp +++ b/sakura_core/util/module.cpp @@ -57,7 +57,7 @@ void ChangeCurrentDirectoryToExeDir() HMODULE LoadLibraryExedir(LPCWSTR pszDll) { CCurrentDirectoryBackupPoint dirBack; - // DLL インジェクション対策としてEXEのフォルダに移動する + // DLL インジェクション対策としてEXEのフォルダーに移動する ChangeCurrentDirectoryToExeDir(); return ::LoadLibrary( pszDll ); } diff --git a/sakura_core/util/shell.cpp b/sakura_core/util/shell.cpp index b86213526f..c168c2c65f 100644 --- a/sakura_core/util/shell.cpp +++ b/sakura_core/util/shell.cpp @@ -53,7 +53,7 @@ #pragma comment(lib, "urlmon.lib") -/* フォルダ選択ダイアログ */ +/* フォルダー選択ダイアログ */ BOOL SelectDir( HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WCHAR* strFolderName, size_t nMaxCount ) { if ( nullptr == strFolderName ) { @@ -77,13 +77,13 @@ BOOL SelectDir( HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WC return FALSE; } - // オプションをフォルダを選択可能に変更 + // オプションをフォルダーを選択可能に変更 hres = pDialog->SetOptions( dwOptions | FOS_PICKFOLDERS | FOS_NOCHANGEDIR | FOS_FORCEFILESYSTEM ); if ( FAILED(hres) ) { return FALSE; } - // 初期フォルダを設定 + // 初期フォルダーを設定 ComPtr psiFolder; hres = SHCreateItemFromParsingName( pszInitFolder, nullptr, IID_PPV_ARGS(&psiFolder) ); if ( SUCCEEDED(hres) ) { @@ -96,7 +96,7 @@ BOOL SelectDir( HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WC return FALSE; } - // フォルダ選択ダイアログを表示 + // フォルダー選択ダイアログを表示 hres = pDialog->Show( hWnd ); if ( FAILED(hres) ) { return FALSE; @@ -126,11 +126,11 @@ BOOL SelectDir( HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WC return bRet; } -/*! 特殊フォルダのパスを取得する +/*! 特殊フォルダーのパスを取得する SHGetSpecialFolderPath API（shell32.dll version 4.71以上が必要）と同等の処理をする @param [in] nFolder CSIDL (constant special item ID list) - @param [out] pszPath 特殊フォルダのパス + @param [out] pszPath 特殊フォルダーのパス @author ryoji @date 2007.05.19 新規 @@ -224,11 +224,11 @@ static LRESULT CALLBACK PropSheetWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, L // 選択されたメニューの処理 switch( nId ){ - case 100: // 設定フォルダを開く + case 100: // 設定フォルダーを開く OpenWithExplorer(hwnd, GetIniFileName()); break; - case 101: // インポート／エクスポートの起点リセット（起点を設定フォルダにする） + case 101: // インポート／エクスポートの起点リセット（起点を設定フォルダーにする） int nMsgResult = MYMESSAGEBOX( hwnd, MB_OKCANCEL | MB_ICONINFORMATION, @@ -266,7 +266,7 @@ static int CALLBACK PropSheetProc( HWND hwndDlg, UINT uMsg, LPARAM lParam ) HFONT hFont = UpdateDialogFont( hwndDlg, TRUE ); if( CShareData::getInstance()->IsPrivateSettings() ){ - // 個人設定フォルダを使用するときは「設定フォルダ」ボタンを追加する + // 個人設定フォルダーを使用するときは「設定フォルダー」ボタンを追加する s_pOldPropSheetWndProc = (WNDPROC)::SetWindowLongPtr( hwndDlg, GWLP_WNDPROC, (LONG_PTR)PropSheetWndProc ); HINSTANCE hInstance = (HINSTANCE)::GetModuleHandle( NULL ); HWND hwndBtn = ::CreateWindowEx( 0, WC_BUTTON, LS(STR_SHELL_INIFOLDER), BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, 140, 20, hwndDlg, (HMENU)0x02000, hInstance, NULL ); @@ -408,7 +408,7 @@ BOOL ResolveShortcutLink( HWND hwnd, LPCWSTR lpszLinkFile, LPWSTR lpszPath ) return FALSE; } - // 2010.08.28 DLL インジェクション対策としてEXEのフォルダに移動する + // 2010.08.28 DLL インジェクション対策としてEXEのフォルダーに移動する CCurrentDirectoryBackupPoint dirBack; ChangeCurrentDirectoryToExeDir(); @@ -644,7 +644,7 @@ bool OpenWithExplorer(HWND hWnd, const std::filesystem::path& path) // ファイル名（最後の'\'に続く部分）がドット('.')でない場合、 // Windowsエクスプローラーのコマンドを指定してファイルを選択させる。 - // ※ドットは「フォルダ自身」を表す特殊なファイル名。 + // ※ドットは「フォルダー自身」を表す特殊なファイル名。 if (path.filename() != L".") { std::wstring buf(_MAX_PATH, wchar_t()); size_t requiredSize; diff --git a/sakura_core/util/shell.h b/sakura_core/util/shell.h index da105d639a..8cea219c51 100644 --- a/sakura_core/util/shell.h +++ b/sakura_core/util/shell.h @@ -37,7 +37,7 @@ BOOL MyWinHelp(HWND hwndCaller, UINT uCommand, DWORD_PTR dwData); /* WinHelp のかわりに HtmlHelp を呼び出す */ // 2006.07.22 ryoji /* Shell Interface系(?) */ -BOOL SelectDir(HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WCHAR* strFolderName, size_t nMaxCount ); /* フォルダ選択ダイアログ */ +BOOL SelectDir(HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WCHAR* strFolderName, size_t nMaxCount ); /* フォルダー選択ダイアログ */ template BOOL SelectDir(HWND hWnd, const WCHAR* pszTitle, const WCHAR* pszInitFolder, WCHAR(&strFolderName)[nMaxCount]) @@ -53,7 +53,7 @@ DWORD NetConnect ( const WCHAR strNetWorkPass[] ); /* ヘルプの目次を表示 */ void ShowWinHelpContents( HWND hwnd ); -BOOL GetSpecialFolderPath( int nFolder, LPWSTR pszPath ); // 特殊フォルダのパスを取得する // 2007.05.19 ryoji +BOOL GetSpecialFolderPath( int nFolder, LPWSTR pszPath ); // 特殊フォルダーのパスを取得する // 2007.05.19 ryoji INT_PTR MyPropertySheet( LPPROPSHEETHEADER lppsph ); // 独自拡張プロパティシート // 2007.05.24 ryoji diff --git a/sakura_core/view/CEditView_Diff.cpp b/sakura_core/view/CEditView_Diff.cpp index 675b2757ac..12fb6f4a43 100644 --- a/sakura_core/view/CEditView_Diff.cpp +++ b/sakura_core/view/CEditView_Diff.cpp @@ -130,7 +130,7 @@ void CEditView::ViewDiffInfo( CWaitCursor cWaitCursor( this->GetHwnd() ); int nFlgFile12 = 1; - /* exeのあるフォルダ */ + /* exeのあるフォルダー */ WCHAR szExeFolder[_MAX_PATH + 1]; WCHAR cmdline[1024]; diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index b3912fef0a..24546cf639 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -892,7 +892,7 @@ void CEditWnd::LayoutMainMenu() nCount = cRecentFile.GetViewCount(); } break; - case F_FOLDER_USED_RECENTLY: // 最近使ったフォルダ + case F_FOLDER_USED_RECENTLY: // 最近使ったフォルダー { CRecentFolder cRecentFolder; nCount = cRecentFolder.GetViewCount(); @@ -2221,9 +2221,9 @@ void CEditWnd::OnCommand( WORD wNotifyCode, WORD wID , HWND hwndCtl ) SLoadInfo sLoadInfo(checkEditInfo.m_szPath, checkEditInfo.m_nCharCode, false); GetDocument()->m_cDocFileOperation.FileLoad( &sLoadInfo ); // Oct. 9, 2004 genta 共通関数化 } - //最近使ったフォルダ + //最近使ったフォルダー else if( wID - IDM_SELOPENFOLDER >= 0 && wID - IDM_SELOPENFOLDER < 999){ - //フォルダ取得 + //フォルダー取得 const CMRUFolder cMRUFolder; LPCWSTR pszFolderPath = cMRUFolder.GetPath( wID - IDM_SELOPENFOLDER ); @@ -2595,8 +2595,8 @@ bool CEditWnd::InitMenu_Special(HMENU hMenu, EFunctionCode eFunc) bInList = (cMRU.MenuLength() > 0); } break; - case F_FOLDER_USED_RECENTLY: // 最近使ったフォルダ - /* 最近使ったフォルダのメニューを作成 */ + case F_FOLDER_USED_RECENTLY: // 最近使ったフォルダー + /* 最近使ったフォルダーのメニューを作成 */ { //@@@ 2001.12.26 YAZAKI OPENFOLDERリストは、CMRUFolderにすべて依頼する const CMRUFolder cMRUFolder; @@ -3774,7 +3774,7 @@ int CEditWnd::CreateFileDropDownMenu( HWND hwnd ) m_cMenuDrawer.MyAppendMenuSep( hMenu, MF_BYPOSITION | MF_SEPARATOR, 0, NULL, FALSE ); } - /* 最近使ったフォルダのメニューを作成 */ + /* 最近使ったフォルダーのメニューを作成 */ const CMRUFolder cMRUFolder; hMenuPopUp = cMRUFolder.CreateMenu( &m_cMenuDrawer ); if ( cMRUFolder.MenuLength() > 0 ) diff --git a/sakura_core/window/CTabWnd.cpp b/sakura_core/window/CTabWnd.cpp index 64a7db2501..d6f928b98a 100644 --- a/sakura_core/window/CTabWnd.cpp +++ b/sakura_core/window/CTabWnd.cpp @@ -2385,7 +2385,7 @@ HIMAGELIST CTabWnd::InitImageList( void ) { // システムイメージリストを取得する // 注：複製後に差し替えて利用するアイコンには事前にアクセスしておかないとイメージが入らない - // ここでは「フォルダを閉じたアイコン」、「フォルダを開いたアイコン」を差し替え用として利用 + // ここでは「フォルダーを閉じたアイコン」、「フォルダーを開いたアイコン」を差し替え用として利用 // WinNT4.0 では SHGetFileInfo() の第一引数に同名を指定すると同じインデックスを返してくることがある？ // 2016.08.06 ".0" の場合に Win10で同じインデックスが返ってくるので、"C:\\"に変更 diff --git a/tests/unittest.md b/tests/unittest.md index 4e3e1dd012..d47aabd3d7 100644 --- a/tests/unittest.md +++ b/tests/unittest.md @@ -39,11 +39,11 @@ GUI でステップ実行することができます。 - tests - compiletests (コンパイルテスト用のファイルを置くディレクトリ) - - googletest (googletest 用のフォルダ。git submodule) + - googletest (googletest 用のフォルダー。git submodule) - unittests (単体テストの実体を置く。中の構成は要検討) - - build (ビルド時に生成されるフォルダ。git には登録しない) - - Win32 (Win32 用のプロジェクトを格納するフォルダ) - - x64 (x64 用のプロジェクトを格納するフォルダ) + - build (ビルド時に生成されるフォルダー。git には登録しない) + - Win32 (Win32 用のプロジェクトを格納するフォルダー) + - x64 (x64 用のプロジェクトを格納するフォルダー) ## 単体テスト関連のバッチファイル diff --git a/tests/unittests/test-cdlgprofilemgr.cpp b/tests/unittests/test-cdlgprofilemgr.cpp index 9bdbc46cc8..d89dd4969d 100644 --- a/tests/unittests/test-cdlgprofilemgr.cpp +++ b/tests/unittests/test-cdlgprofilemgr.cpp @@ -232,7 +232,7 @@ TEST(file, GetProfileMgrFileName_DefaultProfile1) // プロセスのインスタンスを用意する CControlProcess dummy(nullptr, LR"(-PROF="")"); - // 設定フォルダのパスが返る + // 設定フォルダーのパスが返る const auto iniDir = GetExeFileName().replace_filename(L"").append("a.txt").remove_filename(); ASSERT_STREQ(iniDir.c_str(), GetProfileMgrFileName(L"").c_str()); } @@ -250,7 +250,7 @@ TEST(file, GetProfileMgrFileName_DefaultProfile2) // プロセスのインスタンスを用意する CControlProcess dummy(nullptr, LR"(-PROF="profile1")"); - // 設定フォルダのパスが返る + // 設定フォルダーのパスが返る const auto iniDir = GetIniFileName().parent_path().parent_path().append("a.txt").remove_filename(); ASSERT_STREQ(iniDir.c_str(), GetProfileMgrFileName(L"").c_str()); } @@ -271,7 +271,7 @@ TEST(file, GetProfileMgrFileName_NamedProfile1) // テスト用プロファイル名 constexpr auto profile = L"profile1"; - // 指定したプロファイルの設定保存先フォルダのパスが返る + // 指定したプロファイルの設定保存先フォルダーのパスが返る const auto profileDir = GetExeFileName().replace_filename(profile).append("a.txt").remove_filename(); ASSERT_STREQ(profileDir.c_str(), GetProfileMgrFileName(profile).c_str()); } @@ -292,7 +292,7 @@ TEST(file, GetProfileMgrFileName_NamedProfile2) // テスト用プロファイル名 constexpr auto profile = L"profile1"; - // 指定したプロファイルの設定保存先フォルダのパスが返る + // 指定したプロファイルの設定保存先フォルダーのパスが返る const auto profileDir = GetIniFileName().parent_path().parent_path().append(profile).append("a.txt").remove_filename(); ASSERT_STREQ(profileDir.c_str(), GetProfileMgrFileName(profile).c_str()); } diff --git a/tests/unittests/test-cprofile.cpp b/tests/unittests/test-cprofile.cpp index 07aafe6e84..516935f184 100644 --- a/tests/unittests/test-cprofile.cpp +++ b/tests/unittests/test-cprofile.cpp @@ -60,12 +60,12 @@ TEST( CProfile, WriteProfileMakesSubDirectories ) // ファイルを削除 std::filesystem::remove( szIniName ); - // フォルダを削除 + // フォルダーを削除 p = ::PathFindFileNameW( szIniName ); p[0] = L'\0'; std::filesystem::remove( szIniName ); - // フォルダを削除 + // フォルダーを削除 p = ::PathFindFileNameW( szIniName ); p[0] = L'\0'; std::filesystem::remove( szIniName ); diff --git a/tests/unittests/test-czipfile.cpp b/tests/unittests/test-czipfile.cpp index 07e1ef9744..19d31ab0ad 100644 --- a/tests/unittests/test-czipfile.cpp +++ b/tests/unittests/test-czipfile.cpp @@ -117,11 +117,11 @@ bool WriteBinaryToFile(BinarySequenceView bin, std::filesystem::path path) */ std::filesystem::path GetTempFilePath(std::wstring_view prefix) { - // 一時フォルダのパスを取得する + // 一時フォルダーのパスを取得する const std::wstring tempDir = std::filesystem::temp_directory_path(); // パス生成に必要なバッファを確保する - // （一時フォルダのパス＋接頭辞(3文字)＋4桁の16進数＋拡張子＋NUL終端） + // （一時フォルダーのパス＋接頭辞(3文字)＋4桁の16進数＋拡張子＋NUL終端） std::wstring buf(tempDir.length() + 3 + 4 + 4 + 1, L'\0'); // Windows API関数を呼び出す。 diff --git a/tests/unittests/test-file.cpp b/tests/unittests/test-file.cpp index d4ab3c2b7d..b9c166343d 100644 --- a/tests/unittests/test-file.cpp +++ b/tests/unittests/test-file.cpp @@ -149,7 +149,7 @@ TEST(file, Deprecated_GetExedir) // 戻り値取得用のバッファを指定しない場合、何も起きない GetExedir(nullptr); - // exeフォルダの取得 + // exeフォルダーの取得 GetExedir(szBuf); ::wcscat_s(szBuf, filename); ASSERT_STREQ(exeBasePath.c_str(), szBuf); @@ -203,7 +203,7 @@ TEST(file, GetIniFileName_InProcessNamedProfileUnInitialized) // プロセスのインスタンスを用意する CControlProcess dummy(nullptr, LR"(-PROF="profile1")"); - // exeファイルの拡張子をiniに変えたパスの最後のフォルダにプロファイル名を加えたパスが返る + // exeファイルの拡張子をiniに変えたパスの最後のフォルダーにプロファイル名を加えたパスが返る auto iniPath = GetExeFileName().replace_extension(L".ini"); auto path = iniPath.parent_path().append(L"profile1").append(iniPath.filename().c_str()); ASSERT_STREQ(path.c_str(), GetIniFileName().c_str()); @@ -386,7 +386,7 @@ TEST(file, Deprecated_GetInidir) // 戻り値取得用のバッファを指定しない場合、何も起きない GetInidir(nullptr); - // iniフォルダの取得 + // iniフォルダーの取得 GetInidir(szBuf); ::wcscat_s(szBuf, filename); ASSERT_STREQ(iniBasePath.c_str(), szBuf); @@ -503,7 +503,7 @@ TEST(file, CalcDirectoryDepth) // ドライブ文字を含むフルパス EXPECT_EQ(1, CalcDirectoryDepth(LR"(C:\Temp\test.txt)")); - // 共有フォルダを含むフルパス + // 共有フォルダーを含むフルパス EXPECT_EQ(1, CalcDirectoryDepth(LR"(\\host\Temp\test.txt)")); // ドライブなしのフルパス @@ -529,7 +529,7 @@ TEST(file, FileMatchScoreSepExt) LR"(C:\TEMP\TEST.TXT)"); ASSERT_EQ(_countof(LR"(test.txt)") - 1, result); - // FileNameSepExtのテストパターン（パスにフォルダが含まれない） + // FileNameSepExtのテストパターン（パスにフォルダーが含まれない） result = FileMatchScoreSepExt( LR"(TEST.TXT)", LR"(test.txt)"); diff --git a/tests/unittests/test-winmain.cpp b/tests/unittests/test-winmain.cpp index bc4a2350e4..ef1c5a21fc 100644 --- a/tests/unittests/test-winmain.cpp +++ b/tests/unittests/test-winmain.cpp @@ -119,7 +119,7 @@ class WinMainTest : public ::testing::TestWithParam { std::filesystem::remove(iniPath); } - // プロファイル指定がある場合、フォルダも削除しておく + // プロファイル指定がある場合、フォルダーも削除しておく if (const std::wstring_view profileName(GetParam()); profileName.length() > 0) { std::filesystem::remove(iniPath.parent_path()); } diff --git a/tools/macro/CopyDirPath/CopyDirPath.js b/tools/macro/CopyDirPath/CopyDirPath.js index 70049ececc..e233933552 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.js +++ b/tools/macro/CopyDirPath/CopyDirPath.js @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -// 「現在編集中のファイルのフォルダ名をクリップボードにコピー」のマクロ機能を +// 「現在編集中のファイルのフォルダー名をクリップボードにコピー」のマクロ機能を // テストするためのサンプルのキーボードマクロです。 // // 前提条件 @@ -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 70049ececc..e233933552 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.mac +++ b/tools/macro/CopyDirPath/CopyDirPath.mac @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -// 「現在編集中のファイルのフォルダ名をクリップボードにコピー」のマクロ機能を +// 「現在編集中のファイルのフォルダー名をクリップボードにコピー」のマクロ機能を // テストするためのサンプルのキーボードマクロです。 // // 前提条件 @@ -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 e1a1f8694a..7e1de34764 100644 --- a/tools/macro/CopyDirPath/CopyDirPath.vbs +++ b/tools/macro/CopyDirPath/CopyDirPath.vbs @@ -20,7 +20,7 @@ ' OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ' SOFTWARE. ' -' 「現在編集中のファイルのフォルダ名をクリップボードにコピー」のマクロ機能を +' 「現在編集中のファイルのフォルダー名をクリップボードにコピー」のマクロ機能を ' テストするためのサンプルのキーボードマクロです。 ' ' 前提条件 @@ -31,5 +31,5 @@ ' 3. [ツール] メニューから [キーマクロの読み込み] を選ぶ ' 4. このマクロファイルのパスを指定する ' 5. [ツール] メニューから [キーマクロの実行] を選ぶ -' 6. クリップボードに開いたテキストファイルのフォルダパスがコピーされるので、エディタ等に貼り付ける。 +' 6. クリップボードに開いたテキストファイルのフォルダーパスがコピーされるので、エディタ等に貼り付ける。 CopyDirPath() diff --git a/tools/macro/macro.md b/tools/macro/macro.md index 4117362906..07b690bae2 100644 --- a/tools/macro/macro.md +++ b/tools/macro/macro.md @@ -5,6 +5,6 @@ |主な関数名|テストする機能|対応バージョン|マクロパス|タイプ| |--|--|--|--|--| -|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)| +|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)| diff --git a/tools/zip/readme.md b/tools/zip/readme.md index dbdd17bcb2..a028ae4912 100644 --- a/tools/zip/readme.md +++ b/tools/zip/readme.md @@ -31,7 +31,7 @@ ### 圧縮 ``` -zip.bat <圧縮先Zipファイル> <圧縮するフォルダパス> +zip.bat <圧縮先Zipファイル> <圧縮するフォルダーパス> ``` 例 @@ -45,7 +45,7 @@ zip.bat hogehoge.zip temp ### 解凍 ``` -unzip.bat <解凍するZipファイル> <展開先フォルダパス> +unzip.bat <解凍するZipファイル> <展開先フォルダーパス> ``` 例 diff --git a/vcx-props/project-PlatformToolset.md b/vcx-props/project-PlatformToolset.md index 97272b6ba5..5873f0f288 100644 --- a/vcx-props/project-PlatformToolset.md +++ b/vcx-props/project-PlatformToolset.md @@ -27,7 +27,7 @@ Visual Studio 2017 で作成したソリューション/プロジェクトを Vi 確認するダイアログが出ます。一度ソリューションを開くとユーザーの選択がローカルに保存されるので同じソリューションを再度開いても再度確認される ことはありません。 -しかしながら別のフォルダにソースコードを clone した場合などには再度ユーザーに確認するダイアログが出るので煩雑です。 +しかしながら別のフォルダーにソースコードを clone した場合などには再度ユーザーに確認するダイアログが出るので煩雑です。 ## 解決策 From d01be224f2d80065d33fe2719ade338cefbd305f Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Thu, 5 May 2022 15:53:12 +0900 Subject: [PATCH 119/129] =?UTF-8?q?=E3=80=8C=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=80=E3=83=BC=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E4=BC=B4=E3=81=86=E3=83=80=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=AE=E4=BD=8D=E7=BD=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/sakura_rc.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index bb66fb768b..bbaa8ae8d3 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -229,10 +229,10 @@ CAPTION "Grep実行中" FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x1 BEGIN LTEXT "検索しています・・・",IDC_STATIC,5,5,61,10,NOT WS_GROUP - LTEXT "ファイル",IDC_STATIC,5,21,26,10,NOT WS_GROUP - LTEXT "IDC_STATIC_CURPATH",IDC_STATIC_CURFILE,36,20,252,10,NOT WS_GROUP - LTEXT "フォルダー",IDC_STATIC,5,34,27,10,NOT WS_GROUP - EDITTEXT IDC_STATIC_CURPATH,36,35,252,20,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "ファイル",IDC_STATIC,7,21,36,10,NOT WS_GROUP + LTEXT "IDC_STATIC_CURPATH",IDC_STATIC_CURFILE,46,21,238,10,NOT WS_GROUP + LTEXT "フォルダー",IDC_STATIC,7,34,36,10,NOT WS_GROUP + EDITTEXT IDC_STATIC_CURPATH,46,34,238,20,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP PUSHBUTTON "キャンセル(&X)",IDCANCEL,238,60,50,14 LTEXT "0",IDC_STATIC_HITCOUNT,76,5,44,10,NOT WS_GROUP,WS_EX_RIGHT LTEXT "件みつかりました。",IDC_STATIC,122,5,60,10,NOT WS_GROUP @@ -512,7 +512,7 @@ BEGIN COMBOBOX IDC_COMBO_EOL,226,13,50,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "最近のファイル(&F):",IDC_STATIC,5,32,59,10 COMBOBOX IDC_COMBO_MRU,71,30,185,236,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "最近のフォルダー(&D):",IDC_STATIC,5,49,61,10 + LTEXT "最近のフォルダー(&D):",IDC_STATIC,5,49,69,10 COMBOBOX IDC_COMBO_OPENFOLDER,71,46,185,236,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -1324,7 +1324,7 @@ BEGIN LTEXT "$x : x個上のフォルダー名(0-9)\r* : 拡張子\r\r%Y/%m/%d : 年月日 %y西暦(2桁) \r%H:%M:%S: 時分秒 \r%% : '%'記号\r",IDC_LABEL_BACKUP_HELP2,165,75,115,50,SS_SUNKEN CONTROL "指定フォルダーに作成する(&P)",IDC_CHECK_BACKUPFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,148,107,10 CONTROL "リムーバブルメディアのみ(&L)",IDC_CHECK_BACKUP_FOLDER_RM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,148,133,10 - LTEXT "フォルダー名(&F)",IDC_LABEL_BACKUP_4,24,162,87,10 + LTEXT "フォルダー名(&F)",IDC_LABEL_BACKUP_4,20,162,52,10 EDITTEXT IDC_EDIT_BACKUPFOLDER,73,160,195,12,ES_AUTOHSCROLL PUSHBUTTON "&...",IDC_BUTTON_BACKUP_FOLDER_REF,271,160,9,12 CONTROL "バックアップファイルをごみ箱に放り込む(&X)",IDC_CHECK_BACKUP_DUSTBOX, @@ -1657,13 +1657,13 @@ BEGIN CONTROL "ファイル(&F)",IDC_RADIO_FILE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,85,56,10 CONTROL "フォルダー(&2)",IDC_RADIO_FOLDER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,98,56,10 GROUPBOX "種類",IDC_STATIC,1,61,89,50,WS_GROUP - LTEXT "パス(&T)",IDC_STATIC_PATH,3,119,22,10 + LTEXT "パス(&T)",IDC_STATIC_PATH,3,119,35,10 EDITTEXT IDC_EDIT_PATH,38,117,122,13,ES_AUTOHSCROLL PUSHBUTTON "&...",IDC_BUTTON_REF2,161,117,10,13 PUSHBUTTON "▼(&3)",IDC_BUTTON_PATH_MENU,171,117,21,14 - LTEXT "ラベル(&E)",IDC_STATIC,3,136,32,10 + LTEXT "ラベル(&E)",IDC_STATIC,3,136,35,10 EDITTEXT IDC_EDIT_LABEL,38,134,111,13,ES_AUTOHSCROLL - LTEXT "ファイル(&K)",IDC_STATIC_FILE,3,154,32,10 + LTEXT "ファイル(&K)",IDC_STATIC_FILE,3,154,35,10 EDITTEXT IDC_EDIT_FILE,38,151,111,13,ES_AUTOHSCROLL CONTROL "隠しファイル(&W)",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,181,87,10 CONTROL "読み取り専用(&Z)",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,193,87,10 From d21ce67634f1f469ad227b174b71f3b8d34da3e6 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Thu, 5 May 2022 16:01:28 +0900 Subject: [PATCH 120/129] =?UTF-8?q?=E3=80=8C=E3=83=97=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=80=8D=E3=81=A8=E3=80=8C=E3=83=89=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=90=E3=83=BC=E3=80=8D=E3=81=AE=E3=82=AB=E3=82=BF?= =?UTF-8?q?=E3=82=AB=E3=83=8A=E8=A1=A8=E8=A8=98=E3=82=92OS=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E7=B5=B1=E4=B8=80=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit printerのカタカナ表記を「プリンター」に変更します。 「プリンタードライバー」と表記する機会の多い「ドライバー」についても同時に対応します。 --- help/sakura/res/HLP000081.html | 2 +- help/sakura/res/HLP000120.html | 2 +- help/sakura/res/HLP000162.html | 2 +- help/sakura/res/HLP_UR008.html | 4 +- help/sakura/res/HLP_UR010.html | 6 +- help/sakura/res/HLP_UR011.html | 2 +- installer/sinst_src/keyword/HSP.KHP | 2 +- installer/sinst_src/keyword/bat.khp | 4 +- installer/sinst_src/keyword/bat_win2k.khp | 8 +- installer/sinst_src/keyword/batch.kwd | 2 +- installer/sinst_src/keyword/php.khp | 14 ++-- sakura_core/print/CPrint.cpp | 90 +++++++++++------------ sakura_core/print/CPrint.h | 18 ++--- sakura_core/print/CPrintPreview.cpp | 16 ++-- sakura_core/print/CPrintPreview.h | 4 +- sakura_core/sakura_rc.rc | 10 +-- sakura_core/uiparts/CMenuDrawer.cpp | 2 +- sakura_core/window/CEditWnd.cpp | 4 +- 18 files changed, 96 insertions(+), 96 deletions(-) diff --git a/help/sakura/res/HLP000081.html b/help/sakura/res/HLP000081.html index 4c47335a20..b4ed5328f3 100644 --- a/help/sakura/res/HLP000081.html +++ b/help/sakura/res/HLP000081.html @@ -87,7 +87,7 @@

      共通設定 『全般』プロパティ

      組み合わせてホイール操作した時横スクロールする … マウス中ボタン、マウスサイドボタン1、マウスサイドボタン2、CONTROLキー、SHIFTキーのいずれかを指定します。

      note注意
      - マウスの各操作を独自に割り当て可能なドライバ・ユーティリティ類を使用していると、サイドボタンなどとの組み合わせで期待通り動作しない場合があります。
      + マウスの各操作を独自に割り当て可能なドライバー・ユーティリティ類を使用していると、サイドボタンなどとの組み合わせで期待通り動作しない場合があります。
      hintヒント
      マウスホイールでのスクロール行数は、Windowsの設定にしたがっています。 コントロールパネルのマウスで設定できます。ページスクロールにも対応しています。
      diff --git a/help/sakura/res/HLP000120.html b/help/sakura/res/HLP000120.html index 9142b9866f..d9039f39cf 100644 --- a/help/sakura/res/HLP000120.html +++ b/help/sakura/res/HLP000120.html @@ -24,7 +24,7 @@

      印刷プレビュー

    • [ヘルプ] でここを表示します。
    • □滑らか なめらかなプレビュー表示をします。(Win2000以降)
      プレビューと実際の印刷のイメージの違いが改善されます。
    • [戻る]でプレビューを終了し、編集ウィンドウに戻ります。
      • -
    • [プリンタ] でプリンタの設定を行えます。
      • +
    • [プリンター] でプリンターの設定を行えます。
    • ヘッダー及びフッターは印刷ページ設定で指定できます。
    • 印刷中は[キャンセル]で中断できます。
      PrintCancel
    diff --git a/help/sakura/res/HLP000162.html b/help/sakura/res/HLP000162.html index a92b6f582a..908915403b 100644 --- a/help/sakura/res/HLP000162.html +++ b/help/sakura/res/HLP000162.html @@ -12,7 +12,7 @@

    印刷

    -現在開いているファイルをデフォルトプリンタの現在の設定で印刷をします。
    +現在開いているファイルをデフォルトプリンターの現在の設定で印刷をします。

    ■マクロ構文
    ・構文: Print( );
    diff --git a/help/sakura/res/HLP_UR008.html b/help/sakura/res/HLP_UR008.html index 1e76299a20..c5f7f7c79c 100644 --- a/help/sakura/res/HLP_UR008.html +++ b/help/sakura/res/HLP_UR008.html @@ -330,7 +330,7 @@

    変更履歴(2002/02/23～)

    ・INIファイル内に記述された印刷ページ設定のヘッダー,フッターが古い形式で設定されてたら新しい形式に読み替えるように．(by horさん)
    ・EOF周辺で矩形選択した時に反転表示の残像が残るのを対策するコードを見直してちらつきを抑止
    ・存在しないマクロを呼んだときにエラーがでるように (BY やざきさん)
    -・印刷時にプリンタを選択できるように (BY やざきさん)
    +・印刷時にプリンターを選択できるように (BY やざきさん)
    ・マクロにファイル系を追加(S_FileCloseOpenを除く)(BY やざきさん)
    S_FileSaveAs(ファイル名, 文字コード, 改行コード)
    @@ -365,7 +365,7 @@

    変更履歴(2002/02/23～)

    ・「すべて置換」の後の「元に戻す」を少しだけ快適に (BY horさん)
    ・使用されてないダイアログを削除してバイナリのサイズを縮小 (BY horさん)
    ・CPrintからできるかぎりstaticをはずす。(BY やざきさん)
    -・起動時にプリンタを探しに行かないように。(BY やざきさん)
    +・起動時にプリンターを探しに行かないように。(BY やざきさん)
    ・CShareDataのインスタンスを作ることが許されるのはCProcessのみ。
    ・ほかの場所では、getInstanceするように変更。→新しくかかわった人がわかりやすいように。(BY やざきさん)
    ・上のとあわせて、GetShareDataから、ドキュメントタイプを返す部分を取りはずして、GetDocumentTypeとした。(BY やざきさん)
    diff --git a/help/sakura/res/HLP_UR010.html b/help/sakura/res/HLP_UR010.html index 9477e09601..7a88485e9c 100644 --- a/help/sakura/res/HLP_UR010.html +++ b/help/sakura/res/HLP_UR010.html @@ -44,7 +44,7 @@

    変更履歴(2003/01/14～)


    [機能追加]
    -・印刷ダイアログボックスをWindows標準のものにして，プリンタ設定ができるように．(by かろとさん)
    +・印刷ダイアログボックスをWindows標準のものにして，プリンター設定ができるように．(by かろとさん)
    ・階層付きテキスト，HTMLのアウトライン解析 (by (全略)さん)

    [バグ修正]
    @@ -55,14 +55,14 @@

    変更履歴(2003/01/14～)

    ・正規表現の行頭文字(^)を検索すると全部の文字が検索文字の色になる不具合修正
    ・[EOF]位置から行末文字($)を検索すると、最下位行の行末にマッチしない不具合修正
    ・「全て置換」時に始点挿入、終点追加が動くように
    -・プリンタダイアログで用紙サイズや固有の設定を変更した場合に結果が保存されるように．(by かろとさん)
    +・プリンターダイアログで用紙サイズや固有の設定を変更した場合に結果が保存されるように．(by かろとさん)
    ・フリーカーソルでない時に行削除した場合にEOLよりキャレットが右に来ないようにキャレット位置を調整．(by かろとさん)
    ・「ファイルを開く」ダイアログボックスでメモリリークしていたのを修正．(by みくさん)

    [その他変更]
    ・全角ひらがな・かたかな→半角変換で，長音，濁点，半濁点を直前の文字に応じて変換対象とするように．(by かろとさん)
    -・プリンタの設定をプロセス終了まで記憶するように．(by かろとさん)
    +・プリンターの設定をプロセス終了まで記憶するように．(by かろとさん)
    ・お気に入りダイアログボックスで，履歴が更新されたときのメッセージの出し方をメッセージボックスからダイアログボックス中の文字列に．(by みくさん)
    ・sakura.ini中の強調キーワード区切りを\0からTABに変更．バイナリを扱えないエディタでsakura.iniを開いたときにもキーワード設定が破壊されないように．(by げんた)

    diff --git a/help/sakura/res/HLP_UR011.html b/help/sakura/res/HLP_UR011.html index 32932dc153..048ae0c412 100644 --- a/help/sakura/res/HLP_UR011.html +++ b/help/sakura/res/HLP_UR011.html @@ -335,7 +335,7 @@

    変更履歴(2003/06/26～)

    [バグ修正]
    ・ファンクションキー表示時Ctrl+1でツールバーを消すと表示が崩れるのを修正．(by みくさん)
    -・プリンタによっては印刷時に用紙を縦にしても横のサイズで印刷されてしまうことがあったのを修正．(by かろとさん)
    +・プリンターによっては印刷時に用紙を縦にしても横のサイズで印刷されてしまうことがあったのを修正．(by かろとさん)

    [その他変更]
    diff --git a/installer/sinst_src/keyword/HSP.KHP b/installer/sinst_src/keyword/HSP.KHP index a76e8ce679..1c183b0ab1 100644 --- a/installer/sinst_src/keyword/HSP.KHP +++ b/installer/sinst_src/keyword/HSP.KHP @@ -324,7 +324,7 @@ es_area /// es_area p1,p2,p3,p4 [hspdx.dll]\np1=有効エリアの左上X座標 es_boxf /// es_boxf p1,p2,p3,p4 [hspdx.dll]\np1=塗りつぶし左上X座標\np2=塗りつぶし左上Y座標\np3=塗りつぶし右下X座標\np4=塗りつぶし右下Y座標\n(p1,p2)-(p3,p4)の矩形範囲を現在選択されている色で塗りつぶします。 es_buffer /// es_buffer p1,p2 [hspdx.dll]\np1=オフスクリーンバッファID(0～63)\np2=属性スイッチ(0～2)\np3=透明色(パレットモード時:-1～255、ハイカラー以上:0～$ffffff)\n 属性スイッチ=0 : オフスクリーンバッファをVRAMに取る、\n 失敗した場合は、メインメモリに取る\n 属性スイッチ=1 : オフスクリーンバッファをメインメモリに取る\n 属性スイッチ=2 : オフスクリーンバッファをVRAMに取る\n現在gsel命令で選択されているHSPのバッファ内容を、DirectXのオフ\nスクリーンバッファにすべて転送します。 es_bye /// es_bye [hspdx.dll]\nHSPDX.DLLシステムの切り離しをします。 -es_caps /// es_caps p1,p2,p3,p4 [hspdx.dll]\np1=情報が代入される変数名(数値型)\np2=情報ID\np3=情報ビット(1～32)\np4=対象となるレイヤー( 0=HAL / 1=HEL )\nDirectXのドライバが、どのような機能を持っているかを調べて、結果をp1で\n指定する変数に代入します。 +es_caps /// es_caps p1,p2,p3,p4 [hspdx.dll]\np1=情報が代入される変数名(数値型)\np2=情報ID\np3=情報ビット(1～32)\np4=対象となるレイヤー( 0=HAL / 1=HEL )\nDirectXのドライバーが、どのような機能を持っているかを調べて、結果をp1で\n指定する変数に代入します。 es_check /// es_check p1,p2,p3 [hspdx.dll]\np1=結果が代入される変数名\np2=チェックの対象となるスプライトNo.(0～511)\np3=検索対象となるtype値\nスプライト同士の衝突判定を行ないます。 es_chr /// es_chr p1,p2 [hspdx.dll]\np1=スプライトNo.(0～511)\np2=キャラクタNo.(0～1023)\np1で指定したスプライトのキャラクタNo.を変更します。 es_clear /// es_clear p1,p2 [hspdx.dll]\np1=スプライトNo.(0～511)\np2=削除される個数\np1で指定したスプライトNo.以降のスプライトが削除され未登録になり\nます。p2で削除されるスプライトの数を指定することができます。 diff --git a/installer/sinst_src/keyword/bat.khp b/installer/sinst_src/keyword/bat.khp index 11ad23d112..b9fd597872 100644 --- a/installer/sinst_src/keyword/bat.khp +++ b/installer/sinst_src/keyword/bat.khp @@ -1,7 +1,7 @@ ;バッチファイルのキーワードヘルプ定義 % /// 変数を表します\n\n%n バッチファイルに渡された引数\n 第一引数: %1\n 第二引数: %2\n 第ｎ引数: %n\n\n関連項目:SHIFT\n\n特殊な環境変数\n\n%CONFIG% config.sysでmenuitemで指定された値\n%PROMPT% プロンプトの表示形式\n%COMSPEC% Command.comの場所\n%PATH% 環境変数PATH\n%CMDLINE% 最後に実行されたコマンドを格納\n\n関連項目:SET >,>>,<,| /// 標準出力をリダイレクトまたはパイプします。\n\nコマンド > TEST.TXT TEST.TXTに出力\nコマンド >> TEST.TXT TEST.TXTに追加保存\nECHO Y | DEL *.* DELコマンドにYキーを渡して実行\nDIR | MORE 一画面ずつ表示 -ADDDRV /// キャラクタ型デバイスドライバを組み込みます.\n\nADDDRV [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 定義ファイルを指定します. +ADDDRV /// キャラクタ型デバイスドライバーを組み込みます.\n\nADDDRV [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 定義ファイルを指定します. ATTRIB /// ファイル属性(アトリビュート)を表示したり, 変更します.\n\nATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [[ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名] [/S]\n\n + 属性を設定します.\n - 属性を解除します.\n R 読み取り専用属性.\n A アーカイブ属性.\n S システムファイル属性.\n H 隠しファイル属性.\n /S 指定されたパスのすべてのディレクトリのファイルを処理します. BREAK /// Ctrl+C キーの拡張チェック機能の設定と解除をします.\n\nBREAK [ON | OFF]\n\nパラメータの指定がなければ, 現在の BREAK 設定が表示されます. CALL /// バッチ ファイルの中から別のバッチファイルを呼び出します.\n\CALL [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 [ﾊﾞｯﾁﾊﾟﾗﾒｰﾀ]\n\n ﾊﾞｯﾁﾊﾟﾗﾒｰﾀ バッチファイルに必要なコマンド ライン情報を指定します.\n\nCALLを指定しない場合、元のバッチに制御が戻りません。 @@ -31,7 +31,7 @@ IF,ERRORLEVEL,EXIST /// バッチファイル中で条件処理を実行しま LABEL /// ディスクのボリュームラベルを作成, 変更, または削除します.\n\nLABEL [ﾄﾞﾗｲﾌﾞ:][ﾗﾍﾞﾙ] LOADHIGH /// プログラムを上位メモリ領域に読み込みます.\n\nLOADHIGH [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 [ﾊﾟﾗﾒｰﾀ]\nLOADHIGH [/L:領域1[,最小ｻｲｽﾞ1][;領域2[,最小ｻｲｽﾞ2]...] [/S]]\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 [ﾊﾟﾗﾒｰﾀ]]\n\n /L:領域1[,最小ｻｲｽﾞ1][;領域2[,最小ｻｲｽﾞ2]]...\n プログラムが読み込まれるメモリの領域を指定します.\n 領域1 には最初のメモリ領域の番号を指定します.\n 最小ｻｲｽﾞ1 には領域1 の最小サイズを指定します.\n 領域2 と最小ｻｲｽﾞ2 には 2つめの領域の番号と最小サイズを\n 指定します.\n 領域の数は好きなだけ指定できます.\n\n /S プログラムが読み込まれている間, UMB を最小サイズに縮小し\n ます. /S は通常 MemMaker だけに使います.\n\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n プログラムの位置と名前を指定します. MKDIR,MDディレクトリを作ります.\n\nMKDIR [ﾄﾞﾗｲﾌﾞ:]ﾊﾟｽ\nMD [ﾄﾞﾗｲﾌﾞ:]ﾊﾟｽ\n\n関連項目:RMDIR -MODE /// システムデバイスの設定をします.\n\nプリンタポート: MODE LPTn[:] [COLS=c] [LINES=l] [RETRY=r]\nシリアルポート: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s] [RETRY=r]\nデバイス状態: MODE [ﾃﾞﾊﾞｲｽ] [/STATUS]\nリダイレクト印刷: MODE LPTn[:]=COMm[:]\nコード ページ準備: MODE ﾃﾞﾊﾞｲｽ CP PREPARE=((yyy[...]) [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名)\nコード ページ選択: MODE ﾃﾞﾊﾞｲｽ CP SELECT=yyy\nコード ページリフレッシュ:\n MODE ﾃﾞﾊﾞｲｽ CP REFRESH\nコード ページ状態: MODE ﾃﾞﾊﾞｲｽ CP [/STATUS]\n表示モード: MODE [ﾃﾞｨｽﾌﾟﾚｲ ｱﾀﾞﾌﾟﾀ][,n]\n MODE CON[:] [COLS=c] [LINES=n]\nタイプマチック率: MODE CON[:] [RATE=r DELAY=d]\n\n関連項目:CTTY +MODE /// システムデバイスの設定をします.\n\nプリンターポート: MODE LPTn[:] [COLS=c] [LINES=l] [RETRY=r]\nシリアルポート: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s] [RETRY=r]\nデバイス状態: MODE [ﾃﾞﾊﾞｲｽ] [/STATUS]\nリダイレクト印刷: MODE LPTn[:]=COMm[:]\nコード ページ準備: MODE ﾃﾞﾊﾞｲｽ CP PREPARE=((yyy[...]) [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名)\nコード ページ選択: MODE ﾃﾞﾊﾞｲｽ CP SELECT=yyy\nコード ページリフレッシュ:\n MODE ﾃﾞﾊﾞｲｽ CP REFRESH\nコード ページ状態: MODE ﾃﾞﾊﾞｲｽ CP [/STATUS]\n表示モード: MODE [ﾃﾞｨｽﾌﾟﾚｲ ｱﾀﾞﾌﾟﾀ][,n]\n MODE CON[:] [COLS=c] [LINES=n]\nタイプマチック率: MODE CON[:] [RATE=r DELAY=d]\n\n関連項目:CTTY MORE /// 出力を一度に 1画面ずつ表示します.\n\nMORE [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\nMORE < [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\nｺﾏﾝﾄﾞ名 | MORE [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ][ﾌｧｲﾙ名]\n\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 一度に 1画面ずつ出力するファイルを指定します.\n ｺﾏﾝﾄﾞ名 実行結果の出力を表示するコマンドを指定します. MOVE /// ファイルを移動したり, ファイルやディレクトリの名前を変更します.\n\nファイル(複数可)を移動するには:\nMOVE [/Y | /-Y] [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名1[,...] 受け側\n\nファイルやディレクトリの名前を変更するには:\nMOVE [/Y | /-Y] [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾃﾞｨﾚｸﾄﾘ名1 ﾃﾞｨﾚｸﾄﾘ名2\n\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名1\n 移動したいファイルの位置と名前を指定します.\n 受け側 ファイルの移動先を指定します. 受け側にはドライブ名とコロン, \n ディレクトリ名, またはそれらの組み合わせを指定できます. \n ファイルを 1つだけ移動する場合には, ファイル名も指定して移動\n するときにファイル名の変更をすることもできます.\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾃﾞｨﾚｸﾄﾘ名1\n 名前を変更したいディレクトリを指定します.\n ﾃﾞｨﾚｸﾄﾘ名2 ディレクトリの新しい名前を指定します.\n\n /Y ディレクトリを作成するか, 受け側を上書きするか確認するための\n プロンプトを表示しません.\n /-Y ディレクトリを作成するか, 受け側を上書きするか確認するための\n プロンプトを表示します.\n\n環境変数 COPYCMD に /Y スイッチを設定することもできます.\nこれは, コマンド ラインで /-Y スイッチを指定すると無効になります. MSCDEX /// 使い方: MSCDEX [/E/K/S/V] [/D:<ﾄﾞﾗｲﾊﾞ> ... ] [/L:<文字>] [/M:<ﾊﾞｯﾌｧ>] diff --git a/installer/sinst_src/keyword/bat_win2k.khp b/installer/sinst_src/keyword/bat_win2k.khp index 842863a6da..1930348b73 100644 --- a/installer/sinst_src/keyword/bat_win2k.khp +++ b/installer/sinst_src/keyword/bat_win2k.khp @@ -1,7 +1,7 @@ ;バッチファイルのキーワードヘルプ定義 % /// 変数を表します\n\n%n バッチファイルに渡された引数\n 第一引数: %1\n 第二引数: %2\n 第ｎ引数: %n\n\n関連項目:SHIFT\n\n特殊な環境変数\n\n%CONFIG% config.sysでmenuitemで指定された値\n%PROMPT% プロンプトの表示形式\n%COMSPEC% Command.comの場所\n%PATH% 環境変数PATH\n%CMDLINE% 最後に実行されたコマンドを格納\n\n関連項目:SET >,>>,<,| /// 標準出力をリダイレクトまたはパイプします。\n\nコマンド > TEST.TXT TEST.TXTに出力\nコマンド >> TEST.TXT TEST.TXTに追加保存\nECHO Y | DEL *.* DELコマンドにYキーを渡して実行\nDIR | MORE 一画面ずつ表示 -ADDDRV /// キャラクタ型デバイスドライバを組み込みます.\n\nADDDRV [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 定義ファイルを指定します.\n +ADDDRV /// キャラクタ型デバイスドライバーを組み込みます.\n\nADDDRV [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 定義ファイルを指定します.\n ASSOC /// ファイル拡張子の関連付けを表示または変更します。\n\nASSOC [.拡張子[=[ファイルタイプ]]]\n\n .拡張子 ファイル タイプに関連付ける拡張子を指定します。\n ファイルタイプ 拡張子に関連付けるファイル タイプを指定します。\n\nパラメータを指定しないで ASSOC と入力すると、現在のファイルの関連付け\nを表示します。ファイル拡張子を指定して ASSOC を実行すると、そのファイル\n拡張子の現在のファイルの関連付けを表示します。ファイル タイプやコマンド\nを指定しないと、そのファイル拡張子の関連付けを削除します。\n AT /// AT コマンドは、指定された日時にコマンドとプログラムがコンピュータで\n実行されるようにスケジュールします。AT コマンドを使用するには、\nSchedule サービスが実行中でなければなりません。\n\nAT [\\コンピュータ名] [ [id] [/DELETE] | /DELETE [/YES]]\nAT [\\コンピュータ名] 時刻 [/INTERACTIVE]\n [ /EVERY:日付[,...] | /NEXT:日付[,...]] "コマンド"\n\n\\コンピュータ名 リモート コンピュータを指定します。このパラメータを\n 省略したときは、ローカル コンピュータでコマンドが\n スケジュールされます。\nid スケジュールされたコマンドに割り当てられた識別番号です。\n/delete スケジュールされたコマンドを取り消します。\n id を指定しなかったときは、コンピュータでスケジュール\n されているすべてのコマンドが取り消されます。\n/yes 確認せずにすべてのジョブ コマンドを取り消すときに\n 使用します。\n時刻 コマンドが実行される時刻を指定します。\n/interactive ジョブの実行中、ジョブはログオンしているユーザーの\n デスクトップとの対話を許可します。\n/every:日付[,...] 毎週指定した曜日に、または毎月指定した日にコマンドが\n 実行されます。\n 日付を省略したときは、その月の今日の日付が使用されます。\n/next:日付[,...] 指定したコマンドが次の日付 (たとえば、次の火曜日) に\n 実行されます。日付を省略したときは、その月の今日の日付が\n 使用されます。\n"コマンド" 実行する Windows NT コマンド、またはバッチ プログラム\n です。\n\n ATTRIB /// ファイル属性を表示または変更します。\n\nATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [[ドライブ:] [パス] ファイル名]\n [/S [/D]]\n\n + 属性を設定します。\n - 属性を解除します。\n R 読み取り専用属性。\n A アーカイブ属性。\n S システム ファイル属性。\n H 隠しファイル属性。\n /S 現在のディレクトリとすべてのサブフォルダの一致するファイルを\n 処理します。\n /D フォルダも処理します。\n\n @@ -23,9 +23,9 @@ COUNTRY /// MS-DOS サブシステムで、各国対応の時刻、日付、通 DATE /// 日付を表示または設定します。\n\nDATE [/T | 日付]\n\nパラメータの指定がない場合は、現在の日付が表示され、新しい日付の入力を\n求められます。変更しない場合は、Enter キーを押します。\n\nコマンド拡張機能を有効にすると、DATE コマンドは、/T スイッチを\nサポートするようになります。このスイッチを指定すると、現在の日付\nだけが表示され、新しい日付を入力するためのプロンプトは表示されません。\n DEBUG /// プログラムのテスト/編集ツールであるデバッガを起動します.\n\nDEBUG [[ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名 [ﾃｽﾄﾌｧｲﾙ-ﾊﾟﾗﾒｰﾀ]]\n\n [ﾄﾞﾗｲﾌﾞ:][ﾊﾟｽ]ﾌｧｲﾙ名\n テストするファイルを指定します.\n ﾃｽﾄﾌｧｲﾙ-ﾊﾟﾗﾒｰﾀ テストするファイルが必要とするコマンドライン情報を\n 指定します.\n\nDEBUG 起動後に, ? を入力するとデバッガのコマンド一覧が表示されます.\n DEL,ERASE /// ファイル (複数可) を削除します。\n\nDEL [/P] [/F] [/S] [/Q] [/A[[:]属性]] 名前\nERASE [/P] [/F] [/S] [/Q] [/A[[:]属性]] 名前\n\n 名前 ファイルまたはディレクトリ (複数可) の一覧を指定します。\n 複数のファイルを削除するときはワイルドカードを使用します。\n ディレクトリが指定されたときはディレクトリ内のすべてのファ\n イルは削除されます。\n\n /P 各ファイルを削除する前に確認のメッセージを表示します。\n /F 読み取り専用ファイルを強制的に削除します。\n /S 指定されたファイルをすべてのサブディレクトリから削除します。\n /Q ワイルドカードを使用して一括削除するときに、確認のメッセージ\n を表示しません。(QUIET モード)\n /A 属性により削除するファイルを選択します。\n 属性 R 読み取り専用 S システム ファイル\n H 隠しファイル A アーカイブ\n - その属性以外\n\nコマンド拡張機能を有効にすると、DEL と ERASE は次のように変更されます:\n\n/S スイッチの表示形式が逆になり、見つからなかったファイルではなく\n削除されたファイルだけが表示されるようになります。\n -DELDRV /// ADDDRV で組み込んだデバイスドライバを取り外します.\n\nDELDRV\n\n -DEVICE /// 指定したデバイス ドライバをメモリに読み込みます。\n\nMS-DOS 用のデバイス ドライバを読み込むには、systemroot\System32\Config.nt ファイルを使うか、またはプログラムの PIF で指定された同等の起動ファイルを使います。\n\nパラメータ\n\n[[drive:][path] filename\n\n 読み込みたいデバイス ドライバの場所と名前を指定します。\n\n[dd-parameters]\n\n デバイス ドライバに必要なコマンド ライン情報を指定します。\n\n詳細については、"関連項目" の一覧の "Devicehigh" を参照してください。\n -DEVICEHIGH /// デバイス ドライバをアッパー メモリ領域に読み込みます。ほかのプログラムが使用できるメイン メモリの容量を増加させます。MS-DOS 用のデバイス ドライバを読み込むには、systemroot\System32\Config.nt ファイルを使うか、またはプログラムの PIF で指定された同等の起動ファイルを使います。\n\n\ndevicehigh=[drive:][path] filename [dd-parameters]\n\ndevicehigh でデバイス ドライバをアッパー メモリ領域に読み込む前に、利用可能にしなければならないメモリの最小容量を指定するには、次の構文を使います。\n\ndevicehigh size=hexsize [drive:][path] filename [dd-parameters]\n\nパラメータ\n\n[drive:][path]\n アッパー メモリ領域に読み込みたいデバイス ドライバの場所と名前を指定します。 \n\ndd-parameters\n デバイス ドライバに必要なコマンド ライン情報を指定します。 \n\nhexsize\n devicehigh コマンドがデバイス ドライバをアッパー メモリ領域に読み込む前に、利用可能にしなければならないメモリの最小容量 (16 進形式によるバイト数) を指定します。第 2 の構文行のように、size = 16進サイズ を使わなければなりません。 \n\n詳細については、"関連項目" の一覧で "Loadhigh" または "Device" をクリックしてください。\n +DELDRV /// ADDDRV で組み込んだデバイスドライバーを取り外します.\n\nDELDRV\n\n +DEVICE /// 指定したデバイス ドライバーをメモリに読み込みます。\n\nMS-DOS 用のデバイス ドライバーを読み込むには、systemroot\System32\Config.nt ファイルを使うか、またはプログラムの PIF で指定された同等の起動ファイルを使います。\n\nパラメータ\n\n[[drive:][path] filename\n\n 読み込みたいデバイス ドライバーの場所と名前を指定します。\n\n[dd-parameters]\n\n デバイス ドライバーに必要なコマンド ライン情報を指定します。\n\n詳細については、"関連項目" の一覧の "Devicehigh" を参照してください。\n +DEVICEHIGH /// デバイス ドライバーをアッパー メモリ領域に読み込みます。ほかのプログラムが使用できるメイン メモリの容量を増加させます。MS-DOS 用のデバイス ドライバーを読み込むには、systemroot\System32\Config.nt ファイルを使うか、またはプログラムの PIF で指定された同等の起動ファイルを使います。\n\n\ndevicehigh=[drive:][path] filename [dd-parameters]\n\ndevicehigh でデバイス ドライバーをアッパー メモリ領域に読み込む前に、利用可能にしなければならないメモリの最小容量を指定するには、次の構文を使います。\n\ndevicehigh size=hexsize [drive:][path] filename [dd-parameters]\n\nパラメータ\n\n[drive:][path]\n アッパー メモリ領域に読み込みたいデバイス ドライバーの場所と名前を指定します。 \n\ndd-parameters\n デバイス ドライバーに必要なコマンド ライン情報を指定します。 \n\nhexsize\n devicehigh コマンドがデバイス ドライバーをアッパー メモリ領域に読み込む前に、利用可能にしなければならないメモリの最小容量 (16 進形式によるバイト数) を指定します。第 2 の構文行のように、size = 16進サイズ を使わなければなりません。 \n\n詳細については、"関連項目" の一覧で "Loadhigh" または "Device" をクリックしてください。\n DIR /// ディレクトリ中のファイルとサブディレクトリを一覧表示します。\n\nDIR [ドライブ:][パス][ファイル名] [/A[[:]属性]] [/B] [/C] [/D] [/L] [/N]\n [/O[[:]ソート順]] [/P] [/Q] [/S] [/T[[:]タイムフィールド]] [/W] [/X] [/4]\n\n [ドライブ:][パス][ファイル名]\n 一覧表示するドライブ、ディレクトリ、またはファイルを指定します。\n\n /A 指定された属性のファイルを表示します。\n 属性 D ディレクトリ R 読み取り専用\n H 隠しファイル A アーカイブ\n S システム ファイル - その属性以外\n /B ファイル名のみを表示します (見出しや要約が付きません)。\n /C ファイル サイズを桁区切り表示します。これは\n 既定の設定です。/-C とすると桁区切り表示されません。\n /D /W と同じですが、ファイルを列で並べ替えた一覧を表示します。\n /L 小文字で表示します。\n /N ファイル名を右端に表示する一覧形式を使用します。\n /O ファイルを並べ替えて表示します。\n ソート順 N 名前順 (アルファベット) S サイズ順 (小さいほうから)\n E 拡張子順 (アルファベット) D 日時順 (古いほうから)\n G グループ (ディレクトリから) - 降順\n /P 1 画面ごとに停止して表示します。\n /Q ファイルの所有者を表示します。\n /S 指定されたディレクトリおよびそのサブディレクトリのすべての\n ファイルを表示します。\n /T どのタイムフィールドを表示するか、または並べ替えに使用するかを\n 指定します。\n タイムフィールド C 作成\n A 最終アクセス\n W 最終更新\n /W ワイド一覧形式で表示します。\n /X このオプションは MS-DOS 形式以外のファイル名に対する短い名前を\n 表示します。長い名前の前に短い名前を表示する点を除けば、\n /N オプションと同じです。短い名前がない場合は、ブランクに\n なります。\n /4 4 つの数字で年を表示します。\n\n環境変数 DIRCMD にスイッチを設定できます。\n/-W のように - (ハイフン) を前につけると、そのスイッチは無効になります。\n DISKCOMP /// 2 枚のフロッピー ディスクの内容を比較します。\n\nDISKCOMP [ドライブ1: [ドライブ2:]]\n\n DISKCOPY /// フロッピー ディスクの内容を別のディスクにコピーします。\n\nDISKCOPY [ドライブ1: [ドライブ2:]] [/V]\n\n /V 正しくコピーされたかどうか照合します。\n\n同じ種類のフロッピー ディスクを使わなければなりません。\nドライブ1 とドライブ2 には同じドライブを指定することもできます。\n diff --git a/installer/sinst_src/keyword/batch.kwd b/installer/sinst_src/keyword/batch.kwd index a3c992be35..bd5693fb00 100644 --- a/installer/sinst_src/keyword/batch.kwd +++ b/installer/sinst_src/keyword/batch.kwd @@ -197,7 +197,7 @@ OFF @TYPE -// ******************** システムデバイスドライバ ******************** // +// ******************** システムデバイスドライバー ******************** // NUL CON AUX diff --git a/installer/sinst_src/keyword/php.khp b/installer/sinst_src/keyword/php.khp index 644175d83b..b961b8da8a 100644 --- a/installer/sinst_src/keyword/php.khp +++ b/installer/sinst_src/keyword/php.khp @@ -2315,8 +2315,8 @@ proc_close /// int proc_close ( resource process)\n Close a process opened by pr proc_open /// resource proc_open ( string cmd, array descriptorspec, array pipes)\n Execute a command and open file pointers for input/output shell_exec /// string shell_exec ( string cmd)\n シェルによりコマンドを実行し、文字列として出力全体を返す system /// string system ( string command, int [return_var])\n外部プログラムの実行と表示 -printer_abort /// void printer_abort ( resource handle)\nプリンタのスプールファイルを削除する -printer_close /// void printer_close ( resource handle)\nプリンタへの接続を閉じる +printer_abort /// void printer_abort ( resource handle)\nプリンターのスプールファイルを削除する +printer_close /// void printer_close ( resource handle)\nプリンターへの接続を閉じる printer_create_brush /// mixed printer_create_brush ( int style, string color)\n新規ブラシを作成する printer_create_dc /// void printer_create_dc ( resource handle)\n新規デバイスコンテキストを作成する printer_create_font /// mixed printer_create_font ( string face, int height, int width, int font_weight, bool italic, bool underline, bool strikeout, int orientaton)\n新規フォントを作成する @@ -2335,17 +2335,17 @@ printer_draw_roundrect /// void printer_draw_roundrect ( resource handle, int ul printer_draw_text /// void printer_draw_text ( resource printer_handle, string text, int x, int y)\nテキストを描画する printer_end_doc /// bool printer_end_doc ( resource handle)\nドキュメントを閉じる printer_end_page /// bool printer_end_page ( resource handle)\nアクティブなページを閉じる -printer_get_option /// mixed printer_get_option ( resource handle, string option)\nプリンタ設定データを取得する -printer_list /// array printer_list ( int enumtype [, string name [, int level]])\nサーバで付加されたプリンタの配列を返す +printer_get_option /// mixed printer_get_option ( resource handle, string option)\nプリンター設定データを取得する +printer_list /// array printer_list ( int enumtype [, string name [, int level]])\nサーバで付加されたプリンターの配列を返す printer_logical_fontheight /// int printer_logical_fontheight ( resource handle, int height)\n論理フォントの高さを取得する -printer_open /// mixed printer_open ( [string devicename])\nプリンタへの接続をオープンする +printer_open /// mixed printer_open ( [string devicename])\nプリンターへの接続をオープンする printer_select_brush /// void printer_select_brush ( resource printer_handle, resource brush_handle)\nブラシを選択する printer_select_font /// void printer_select_font ( resource printer_handle, resource font_handle)\nフォントを選択する printer_select_pen /// void printer_select_pen ( resource printer_handle, resource pen_handle)\nペンを選択する -printer_set_option /// bool printer_set_option ( resource handle, int option, mixed value)\nプリンタの接続を設定する +printer_set_option /// bool printer_set_option ( resource handle, int option, mixed value)\nプリンターの接続を設定する printer_start_doc /// bool printer_start_doc ( resource handle [, string document])\n新規ドキュメントを開始する printer_start_page /// bool printer_start_page ( resource handle)\n新規ページを開始する -printer_write /// bool printer_write ( resource handle, string content)\nプリンタへデータを書き込む +printer_write /// bool printer_write ( resource handle, string content)\nプリンターへデータを書き込む pspell_add_to_personal /// int pspell_add_to_personal ( int dictionary_link, string word)\nユーザーの単語リストに単語を追加 pspell_add_to_session /// int pspell_add_to_session ( int dictionary_link, string word)\n カレントのセッションの単語リストに単語を追加 pspell_check /// bool pspell_check ( int dictionary_link, string word)\n単語をチェックする diff --git a/sakura_core/print/CPrint.cpp b/sakura_core/print/CPrint.cpp index 6c38e2463f..d4b16d60e9 100644 --- a/sakura_core/print/CPrint.cpp +++ b/sakura_core/print/CPrint.cpp @@ -112,9 +112,9 @@ CPrint::~CPrint( void ) return; } -/*! @brief プリンタダイアログを表示して、プリンタを選択する +/*! @brief プリンターダイアログを表示して、プリンターを選択する ** -** @param pPD [i/o] プリンタダイアログ構造体 +** @param pPD [i/o] プリンターダイアログ構造体 ** @param pMYDEVMODE [i/o] 印刷設定 @author かろと @@ -123,9 +123,9 @@ CPrint::~CPrint( void ) BOOL CPrint::PrintDlg( PRINTDLG *pPD, MYDEVMODE *pMYDEVMODE ) { DEVMODE* pDEVMODE; - DEVNAMES* pDEVNAMES; /* プリンタ設定 DEVNAMES用*/ + DEVNAMES* pDEVNAMES; /* プリンター設定 DEVNAMES用*/ - // デフォルトプリンタが選択されていなければ、選択する + // デフォルトプリンターが選択されていなければ、選択する if ( m_hDevMode == NULL ) { if ( !GetDefaultPrinter( pMYDEVMODE ) ) { return FALSE; @@ -133,7 +133,7 @@ BOOL CPrint::PrintDlg( PRINTDLG *pPD, MYDEVMODE *pMYDEVMODE ) } // - // 現在のプリンタ設定の必要部分を変更 + // 現在のプリンター設定の必要部分を変更 // pDEVMODE = (DEVMODE*)::GlobalLock( m_hDevMode ); pDEVMODE->dmOrientation = pMYDEVMODE->dmOrientation; @@ -143,12 +143,12 @@ BOOL CPrint::PrintDlg( PRINTDLG *pPD, MYDEVMODE *pMYDEVMODE ) // PrintDlg()でReAllocされる事を考えて、呼び出す前にUnlock ::GlobalUnlock( m_hDevMode ); - /* プリンタダイアログを表示して、プリンタを選択 */ + /* プリンターダイアログを表示して、プリンターを選択 */ pPD->lStructSize = sizeof(*pPD); pPD->hDevMode = m_hDevMode; pPD->hDevNames = m_hDevNames; if( !::PrintDlg( pPD ) ){ - // プリンタを変更しなかった + // プリンターを変更しなかった return FALSE; } @@ -158,29 +158,29 @@ BOOL CPrint::PrintDlg( PRINTDLG *pPD, MYDEVMODE *pMYDEVMODE ) pDEVMODE = (DEVMODE*)::GlobalLock( m_hDevMode ); pDEVNAMES = (DEVNAMES*)::GlobalLock( m_hDevNames ); - // プリンタドライバ名 + // プリンタードライバー名 wcscpy_s( pMYDEVMODE->m_szPrinterDriverName, _countof(pMYDEVMODE->m_szPrinterDriverName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); - // プリンタデバイス名 + // プリンターデバイス名 wcscpy_s( pMYDEVMODE->m_szPrinterDeviceName, _countof(pMYDEVMODE->m_szPrinterDeviceName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wDeviceOffset ); - // プリンタポート名 + // プリンターポート名 wcscpy_s( pMYDEVMODE->m_szPrinterOutputName, _countof(pMYDEVMODE->m_szPrinterOutputName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wOutputOffset ); - // プリンタから得られた、dmFieldsは変更しない - // プリンタがサポートしないbitをセットすると、プリンタドライバによっては、不安定な動きをする場合がある + // プリンターから得られた、dmFieldsは変更しない + // プリンターがサポートしないbitをセットすると、プリンタードライバーによっては、不安定な動きをする場合がある // pMYDEVMODEは、コピーしたいbitで１のものだけセットする - // →プリンタから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタドライバでは、 + // →プリンターから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタードライバーでは、 // 縦・横が正しく印刷されない不具合となっていた(2003.07.03 かろと) pMYDEVMODE->dmFields = pDEVMODE->dmFields & (DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH); pMYDEVMODE->dmOrientation = pDEVMODE->dmOrientation; @@ -188,17 +188,17 @@ BOOL CPrint::PrintDlg( PRINTDLG *pPD, MYDEVMODE *pMYDEVMODE ) pMYDEVMODE->dmPaperLength = pDEVMODE->dmPaperLength; pMYDEVMODE->dmPaperWidth = pDEVMODE->dmPaperWidth; - DEBUG_TRACE( L" (入力/出力) デバイス ドライバ=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); + DEBUG_TRACE( L" (入力/出力) デバイス ドライバー=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); DEBUG_TRACE( L" (入力/出力) デバイス名=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDeviceOffset ); DEBUG_TRACE( L"物理出力メディア (出力ポート) =[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wOutputOffset ); - DEBUG_TRACE( L"デフォルトのプリンタか=[%d]\n", pDEVNAMES->wDefault ); + DEBUG_TRACE( L"デフォルトのプリンターか=[%d]\n", pDEVNAMES->wDefault ); ::GlobalUnlock( m_hDevMode ); ::GlobalUnlock( m_hDevNames ); return TRUE; } -/*! @brief デフォルトのプリンタを取得し、MYDEVMODE に設定 +/*! @brief デフォルトのプリンターを取得し、MYDEVMODE に設定 ** ** @param pMYDEVMODE [out] 印刷設定 */ @@ -206,7 +206,7 @@ BOOL CPrint::GetDefaultPrinter( MYDEVMODE* pMYDEVMODE ) { PRINTDLG pd; DEVMODE* pDEVMODE; - DEVNAMES* pDEVNAMES; /* プリンタ設定 DEVNAMES用*/ + DEVNAMES* pDEVNAMES; /* プリンター設定 DEVNAMES用*/ // 2009.08.08 印刷で用紙サイズ、横指定が効かない問題対応 syat //// すでに DEVMODEを取得済みなら、何もしない @@ -218,16 +218,16 @@ BOOL CPrint::GetDefaultPrinter( MYDEVMODE* pMYDEVMODE ) if( m_hDevMode == NULL ){ // // PRINTDLG構造体を初期化する（ダイアログは表示しないように） - // PrintDlg()でデフォルトプリンタのデバイス名などを取得する + // PrintDlg()でデフォルトプリンターのデバイス名などを取得する // memset_raw ( &pd, 0, sizeof(pd) ); pd.lStructSize = sizeof(pd); pd.Flags = PD_RETURNDEFAULT; if( !::PrintDlg( &pd ) ){ - pMYDEVMODE->m_bPrinterNotFound = TRUE; /* プリンタがなかったフラグ */ + pMYDEVMODE->m_bPrinterNotFound = TRUE; /* プリンターがなかったフラグ */ return FALSE; } - pMYDEVMODE->m_bPrinterNotFound = FALSE; /* プリンタがなかったフラグ */ + pMYDEVMODE->m_bPrinterNotFound = FALSE; /* プリンターがなかったフラグ */ /* 初期化 */ memset_raw( pMYDEVMODE, 0, sizeof(*pMYDEVMODE) ); @@ -239,29 +239,29 @@ BOOL CPrint::GetDefaultPrinter( MYDEVMODE* pMYDEVMODE ) pDEVMODE = (DEVMODE*)::GlobalLock( m_hDevMode ); pDEVNAMES = (DEVNAMES*)::GlobalLock( m_hDevNames ); - // プリンタドライバ名 + // プリンタードライバー名 wcscpy_s( pMYDEVMODE->m_szPrinterDriverName, _countof(pMYDEVMODE->m_szPrinterDriverName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); - // プリンタデバイス名 + // プリンターデバイス名 wcscpy_s( pMYDEVMODE->m_szPrinterDeviceName, _countof(pMYDEVMODE->m_szPrinterDeviceName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wDeviceOffset ); - // プリンタポート名 + // プリンターポート名 wcscpy_s( pMYDEVMODE->m_szPrinterOutputName, _countof(pMYDEVMODE->m_szPrinterOutputName), (const WCHAR*)pDEVNAMES + pDEVNAMES->wOutputOffset ); - // プリンタから得られた、dmFieldsは変更しない - // プリンタがサポートしないbitをセットすると、プリンタドライバによっては、不安定な動きをする場合がある + // プリンターから得られた、dmFieldsは変更しない + // プリンターがサポートしないbitをセットすると、プリンタードライバーによっては、不安定な動きをする場合がある // pMYDEVMODEは、コピーしたいbitで１のものだけコピーする - // →プリンタから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタドライバでは、 + // →プリンターから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタードライバーでは、 // 縦・横が正しく印刷されない不具合となっていた(2003.07.03 かろと) pMYDEVMODE->dmFields = pDEVMODE->dmFields & (DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH); pMYDEVMODE->dmOrientation = pDEVMODE->dmOrientation; @@ -269,10 +269,10 @@ BOOL CPrint::GetDefaultPrinter( MYDEVMODE* pMYDEVMODE ) pMYDEVMODE->dmPaperLength = pDEVMODE->dmPaperLength; pMYDEVMODE->dmPaperWidth = pDEVMODE->dmPaperWidth; - DEBUG_TRACE( L" (入力/出力) デバイス ドライバ=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); + DEBUG_TRACE( L" (入力/出力) デバイス ドライバー=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDriverOffset ); DEBUG_TRACE( L" (入力/出力) デバイス名=[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wDeviceOffset ); DEBUG_TRACE( L"物理出力メディア (出力ポート) =[%s]\n", (WCHAR*)pDEVNAMES + pDEVNAMES->wOutputOffset ); - DEBUG_TRACE( L"デフォルトのプリンタか=[%d]\n", pDEVNAMES->wDefault ); + DEBUG_TRACE( L"デフォルトのプリンターか=[%d]\n", pDEVNAMES->wDefault ); ::GlobalUnlock( m_hDevMode ); ::GlobalUnlock( m_hDevNames ); @@ -280,7 +280,7 @@ BOOL CPrint::GetDefaultPrinter( MYDEVMODE* pMYDEVMODE ) } /*! -** @brief プリンタをオープンし、hDCを作成する +** @brief プリンターをオープンし、hDCを作成する */ HDC CPrint::CreateDC( MYDEVMODE* pMYDEVMODE, @@ -291,23 +291,23 @@ HDC CPrint::CreateDC( HANDLE hPrinter = NULL; DEVMODE* pDEVMODE; - // プリンタが選択されていなければ、NULLを返す + // プリンターが選択されていなければ、NULLを返す if ( m_hDevMode == NULL ) { return NULL; } // - // OpenPrinter()で、デバイス名でプリンタハンドルを取得 + // OpenPrinter()で、デバイス名でプリンターハンドルを取得 // if( !::OpenPrinter( - pMYDEVMODE->m_szPrinterDeviceName, /* プリンタデバイス名 */ - &hPrinter, /* プリンタハンドルのポインタ */ + pMYDEVMODE->m_szPrinterDeviceName, /* プリンターデバイス名 */ + &hPrinter, /* プリンターハンドルのポインタ */ NULL ) ){ auto_sprintf( pszErrMsg, LS(STR_ERR_CPRINT01), - pMYDEVMODE->m_szPrinterDeviceName /* プリンタデバイス名 */ + pMYDEVMODE->m_szPrinterDeviceName /* プリンターデバイス名 */ ); goto end_of_func; } @@ -319,26 +319,26 @@ HDC CPrint::CreateDC( pDEVMODE->dmPaperWidth = pMYDEVMODE->dmPaperWidth; // - //DocumentProperties()でアプリケーション独自のプリンタ設定に変更する + //DocumentProperties()でアプリケーション独自のプリンター設定に変更する // ::DocumentProperties( NULL, hPrinter, - pMYDEVMODE->m_szPrinterDeviceName /* プリンタデバイス名 */, + pMYDEVMODE->m_szPrinterDeviceName /* プリンターデバイス名 */, pDEVMODE, pDEVMODE, DM_OUT_BUFFER | DM_IN_BUFFER ); /* 指定デバイスに対するデバイス コンテキストを作成します。 */ hdc = ::CreateDC( - pMYDEVMODE->m_szPrinterDriverName, /* プリンタドライバ名 */ - pMYDEVMODE->m_szPrinterDeviceName, /* プリンタデバイス名 */ - pMYDEVMODE->m_szPrinterOutputName, /* プリンタポート名 */ + pMYDEVMODE->m_szPrinterDriverName, /* プリンタードライバー名 */ + pMYDEVMODE->m_szPrinterDeviceName, /* プリンターデバイス名 */ + pMYDEVMODE->m_szPrinterOutputName, /* プリンターポート名 */ pDEVMODE ); // pMYDEVMODEは、コピーしたいbitで１のものだけコピーする - // →プリンタから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタドライバでは、 + // →プリンターから得られた dmFieldsが1でないLength,Width情報に、間違った長さが入っているプリンタードライバーでは、 // 縦・横が正しく印刷されない不具合となっていた(2003.07.03 かろと) pMYDEVMODE->dmFields = pDEVMODE->dmFields & (DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH); pMYDEVMODE->dmOrientation = pDEVMODE->dmOrientation; @@ -383,7 +383,7 @@ BOOL CPrint::GetPrintMetrics( return FALSE; } - /* CreateDC実行によって得られた実際のプリンタの用紙の幅、高さを取得 */ + /* CreateDC実行によって得られた実際のプリンターの用紙の幅、高さを取得 */ if( !GetPaperSize( pnPaperAllWidth, pnPaperAllHeight, pMYDEVMODE ) ){ *pnPaperAllWidth = *pnPaperWidth + 2 * (*pnPaperOffsetLeft); *pnPaperAllHeight = *pnPaperHeight + 2 * (*pnPaperOffsetTop); @@ -495,7 +495,7 @@ BOOL CPrint::PrintOpen( auto_sprintf( pszErrMsg, LS(STR_ERR_CPRINT02), - pMYDEVMODE->m_szPrinterDeviceName /* プリンタデバイス名 */ + pMYDEVMODE->m_szPrinterDeviceName /* プリンターデバイス名 */ ); bRet = FALSE; goto end_of_func; @@ -556,7 +556,7 @@ const PAPER_INFO* CPrint::FindPaperInfo( int id ) /*! @brief PRINTSETTINGの初期化 - ここではm_mdmDevModeの プリンタ設定は取得・初期化しない + ここではm_mdmDevModeの プリンター設定は取得・初期化しない @date 2006.08.14 Moca Initializeから名称変更。初期化単位をShareDate全てからPRINTSETTING単位に変更． 本関数からDLLSHAREDATAへアクセスする代わりに，CShareDataからPPRINTSETTING単位で逐一渡してもらう． @@ -584,8 +584,8 @@ void CPrint::SettingInitialize( PRINTSETTING& pPrintSetting, const WCHAR* settin pPrintSetting.m_nPrintMarginRX = 100; /* 印刷用紙マージン 右(1/10mm単位) */ pPrintSetting.m_nPrintPaperOrientation = DMORIENT_PORTRAIT; /* 用紙方向 DMORIENT_PORTRAIT (1) または DMORIENT_LANDSCAPE (2) */ pPrintSetting.m_nPrintPaperSize = DMPAPER_A4; /* 用紙サイズ */ - /* プリンタ設定 DEVMODE用 */ - /* プリンタ設定を取得するのはコストがかかるので、後ほど */ + /* プリンター設定 DEVMODE用 */ + /* プリンター設定を取得するのはコストがかかるので、後ほど */ // m_cPrint.GetDefaultPrinterInfo( &(pPrintSetting.m_mdmDevMode) ); pPrintSetting.m_bHeaderUse[0] = TRUE; pPrintSetting.m_bHeaderUse[1] = FALSE; diff --git a/sakura_core/print/CPrint.h b/sakura_core/print/CPrint.h index 3b544d50e1..5b67d8b184 100644 --- a/sakura_core/print/CPrint.h +++ b/sakura_core/print/CPrint.h @@ -39,10 +39,10 @@ #include "basis/primitive.h" struct MYDEVMODE { - BOOL m_bPrinterNotFound; /* プリンタがなかったフラグ */ - WCHAR m_szPrinterDriverName[_MAX_PATH + 1]; // プリンタドライバ名 - WCHAR m_szPrinterDeviceName[_MAX_PATH + 1]; // プリンタデバイス名 - WCHAR m_szPrinterOutputName[_MAX_PATH + 1]; // プリンタポート名 + BOOL m_bPrinterNotFound; /* プリンターがなかったフラグ */ + WCHAR m_szPrinterDriverName[_MAX_PATH + 1]; // プリンタードライバー名 + WCHAR m_szPrinterDeviceName[_MAX_PATH + 1]; // プリンターデバイス名 + WCHAR m_szPrinterOutputName[_MAX_PATH + 1]; // プリンターポート名 DWORD dmFields; short dmOrientation; short dmPaperSize; @@ -109,7 +109,7 @@ struct PRINTSETTING { bool m_bPrintKinsokuKuto; //!< 句読点のぶらさげ //@@@ 2002.04.17 MIK bool m_bPrintLineNumber; /*!< 行番号を印刷する */ - MYDEVMODE m_mdmDevMode; /*!< プリンタ設定 DEVMODE用 */ + MYDEVMODE m_mdmDevMode; /*!< プリンター設定 DEVMODE用 */ BOOL m_bHeaderUse[3]; /* ヘッダーが使われているか？ */ EDIT_CHAR m_szHeaderForm[3][HEADER_MAX]; /* 0:左寄せヘッダー。1:中央寄せヘッダー。2:右寄せヘッダー。*/ BOOL m_bFooterUse[3]; /* フッターが使われているか？ */ @@ -171,8 +171,8 @@ class CPrint /* || Attributes & Operations */ - BOOL GetDefaultPrinter( MYDEVMODE *pMYDEVMODE ); /* デフォルトのプリンタ情報を取得 */ - BOOL PrintDlg( PRINTDLG *pd, MYDEVMODE *pMYDEVMODE ); /* プリンタ情報を取得 */ + BOOL GetDefaultPrinter( MYDEVMODE *pMYDEVMODE ); /* デフォルトのプリンター情報を取得 */ + BOOL PrintDlg( PRINTDLG *pd, MYDEVMODE *pMYDEVMODE ); /* プリンター情報を取得 */ /* 印刷/プレビューに必要な情報を取得 */ BOOL GetPrintMetrics( MYDEVMODE* pMYDEVMODE, @@ -208,7 +208,7 @@ class CPrint /* || メンバ変数 */ - HGLOBAL m_hDevMode; //!< 現在プリンタのDEVMODEへのメモリハンドル - HGLOBAL m_hDevNames; //!< 現在プリンタのDEVNAMESへのメモリハンドル + HGLOBAL m_hDevMode; //!< 現在プリンターのDEVMODEへのメモリハンドル + HGLOBAL m_hDevNames; //!< 現在プリンターのDEVNAMESへのメモリハンドル }; #endif /* SAKURA_CPRINT_CB147282_3673_4A39_9B0A_C5C323C39C56_H_ */ diff --git a/sakura_core/print/CPrintPreview.cpp b/sakura_core/print/CPrintPreview.cpp index 05bf6451b3..3c58e8a6e0 100644 --- a/sakura_core/print/CPrintPreview.cpp +++ b/sakura_core/print/CPrintPreview.cpp @@ -71,7 +71,7 @@ using namespace std; #define COMPAT_BMP_BASE 1 /* COMPAT_BMP_SCALEピクセル幅を複写する画面ピクセル幅 */ #define COMPAT_BMP_SCALE 2 /* 互換BMPのCOMPAT_BMP_BASEに対する倍率(1以上の整数倍) */ -CPrint CPrintPreview::m_cPrint; //!< 現在のプリンタ情報 2003.05.02 かろと +CPrint CPrintPreview::m_cPrint; //!< 現在のプリンター情報 2003.05.02 かろと /*! コンストラクタ 印刷プレビューを表示するために必要な情報を初期化、領域確保。 @@ -163,7 +163,7 @@ LRESULT CPrintPreview::OnPaint( nToolBarHeight = rc.bottom - rc.top; } - // プリンタ情報の表示 -> IDD_PRINTPREVIEWBAR右上のSTATICへ + // プリンター情報の表示 -> IDD_PRINTPREVIEWBAR右上のSTATICへ WCHAR szText[1024]; ::DlgItem_SetText( m_hwndPrintPreviewBar, @@ -723,7 +723,7 @@ void CPrintPreview::OnChangePrintSetting( void ) m_bLockSetting = true; // 2009.08.08 印刷で用紙サイズ、横指定が効かない問題対応 syat - /* DEVMODE構造体が設定されていなかったら既定のプリンタを設定 */ + /* DEVMODE構造体が設定されていなかったら既定のプリンターを設定 */ if( m_pPrintSetting->m_mdmDevMode.m_szPrinterDeviceName[0] == L'\0' ){ GetDefaultPrinterInfo(); } @@ -748,7 +748,7 @@ void CPrintPreview::OnChangePrintSetting( void ) /* 印刷/プレビューに必要な情報を取得 */ WCHAR szErrMsg[1024]; if( !m_cPrint.GetPrintMetrics( - &m_pPrintSetting->m_mdmDevMode, /* プリンタ設定 DEVMODE用*/ + &m_pPrintSetting->m_mdmDevMode, /* プリンター設定 DEVMODE用*/ &m_nPreview_PaperAllWidth, /* 用紙幅 */ &m_nPreview_PaperAllHeight, /* 用紙高さ */ &m_nPreview_PaperWidth, /* 用紙印刷有効幅 */ @@ -791,7 +791,7 @@ void CPrintPreview::OnChangePrintSetting( void ) m_pPrintSetting->m_nPrintPaperSize = m_pPrintSetting->m_mdmDevMode.dmPaperSize; m_pPrintSetting->m_nPrintPaperOrientation = m_pPrintSetting->m_mdmDevMode.dmOrientation; // 用紙方向の反映忘れを修正 2003/07/03 かろと - // プリンタ設定はここで変更されるがそれぞれのウィンドウで再設定するので更新メッセージは投げない + // プリンター設定はここで変更されるがそれぞれのウィンドウで再設定するので更新メッセージは投げない *m_pPrintSettingOrg = *m_pPrintSetting; m_nPreview_ViewMarginLeft = 8 * 10; /* 印刷プレビュー：ビュー左端と用紙の間隔(1/10mm単位) */ @@ -1047,7 +1047,7 @@ void CPrintPreview::OnPrint( void ) return; } - /* プリンタに渡すジョブ名を生成 */ + /* プリンターに渡すジョブ名を生成 */ if( ! m_pParentWnd->GetDocument()->m_cDocFile.GetFilePathClass().IsValidPath() ){ /* 現在編集中のファイルのパス */ wcscpy( szJobName, LS(STR_NO_TITLE2) ); }else{ @@ -1057,7 +1057,7 @@ void CPrintPreview::OnPrint( void ) auto_snprintf_s( szJobName, _countof(szJobName), L"%s%s", szFileName, szExt ); } - /* 印刷範囲を指定できるプリンタダイアログを作成 */ + /* 印刷範囲を指定できるプリンターダイアログを作成 */ // 2003.05.02 かろと PRINTDLG pd; memset_raw( &pd, 0, sizeof(pd) ); @@ -1117,7 +1117,7 @@ void CPrintPreview::OnPrint( void ) /* 印刷 ジョブ開始 */ if( !m_cPrint.PrintOpen( szJobName, - &m_pPrintSetting->m_mdmDevMode, /* プリンタ設定 DEVMODE用*/ + &m_pPrintSetting->m_mdmDevMode, /* プリンター設定 DEVMODE用*/ &hdc, szErrMsg /* エラーメッセージ格納場所 */ ) ){ diff --git a/sakura_core/print/CPrintPreview.h b/sakura_core/print/CPrintPreview.h index 110774bd47..f3b94c996f 100644 --- a/sakura_core/print/CPrintPreview.h +++ b/sakura_core/print/CPrintPreview.h @@ -268,8 +268,8 @@ class CPrintPreview { protected: STypeConfig m_typePrint; - // プレビューから出ても現在のプリンタ情報を記憶しておけるようにstaticにする 2003.05.02 かろと - static CPrint m_cPrint; //!< 現在のプリンタ情報 + // プレビューから出ても現在のプリンター情報を記憶しておけるようにstaticにする 2003.05.02 かろと + static CPrint m_cPrint; //!< 現在のプリンター情報 bool m_bLockSetting; // 設定のロック bool m_bDemandUpdateSetting; // 設定の更新要求 diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 51c7a69785..65a995671d 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -340,7 +340,7 @@ BEGIN PUSHBUTTON "ヘルプ(&H)",IDC_BUTTON_HELP,167,1,39,14 CONTROL "滑らか(&A)",IDC_CHECK_ANTIALIAS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,207,3,43,10 PUSHBUTTON "戻る(&Q)",IDCANCEL,167,16,39,14 - PUSHBUTTON "プリンタ(&R)",IDC_BUTTON_PRINTERSELECT,208,16,40,14 + PUSHBUTTON "プリンター(&R)",IDC_BUTTON_PRINTERSELECT,208,16,40,14 ICON IDI_PRINTER,IDC_STATIC,251,3,11,9,SS_REALSIZEIMAGE LTEXT "Static",IDC_STATIC_PRNDEV,263,4,137,10 LTEXT "Static",IDC_STATIC_PAPER,251,19,149,10 @@ -3569,7 +3569,7 @@ BEGIN STR_EDITWND_MENU_LS "入力改行コード指定(L&S)" STR_EDITWND_MENU_PS "入力改行コード指定(&PS)" STR_ERR_DLGEDITWND13 "文字:\t\t%ls (%s)\n\nSJIS:\t\t%s\nJIS:\t\t%s\nEUC:\t\t%s\nLatin1:\t\t%s\nUTF-16:\t\t%s\nUTF-8:\t\t%s\nCESU-8:\t\t%s" - STR_ERR_DLGEDITWND14 "印刷プレビューを実行する前に、プリンタをインストールしてください。\n" + STR_ERR_DLGEDITWND14 "印刷プレビューを実行する前に、プリンターをインストールしてください。\n" STR_MENU_OUTPUT "%s アウトプット" STR_ERR_DLGEDITWND20 "99999 L 9999 C" STR_ERR_DLGEDITWND21 "CFLF" @@ -3648,12 +3648,12 @@ BEGIN STR_ERR_DLGPPA5 "未定義のエラー\nError_CD=%d\n%s" STR_ERR_DLGPPA6 "エラー情報が不正" STR_ERR_DLGPPA7 "PPA実行エラー" - STR_ERR_CPRINT01 "OpenPrinter()に失敗。\nプリンタデバイス名=[%s]" - STR_ERR_CPRINT02 "StartDoc()に失敗。\nプリンタデバイス名=[%s]" + STR_ERR_CPRINT01 "OpenPrinter()に失敗。\nプリンターデバイス名=[%s]" + STR_ERR_CPRINT02 "StartDoc()に失敗。\nプリンターデバイス名=[%s]" STR_ERR_CPRINT03 "不明" STR_ERR_DLGPRNPRVW1 "横" STR_ERR_DLGPRNPRVW2 "縦" - STR_ERR_DLGPRNPRVW3 "現在のプリンタ %s では、\n指定された用紙 %s は使用できません。\n利用可能な用紙 %s に変更しました。" + STR_ERR_DLGPRNPRVW3 "現在のプリンター %s では、\n指定された用紙 %s は使用できません。\n利用可能な用紙 %s に変更しました。" END STRINGTABLE diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index eb12a77163..8941fa56a3 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -67,7 +67,7 @@ CMenuDrawer::CMenuDrawer() // 以下の登録はツールバーだけでなくアイコンをもつすべてのメニューで利用されている // 数字はビットマップリソースのIDB_MYTOOLに登録されているアイコンの先頭からの順番のようである // アイコンをもっと登録できるように横幅を16dotsx218=2048dotsに拡大 -// 縦も15dotsから16dotsにして「プリンタ」アイコンや「ヘルプ1」の、下が欠けている部分を補ったが15dotsまでしか表示されないらしく効果なし +// 縦も15dotsから16dotsにして「プリンター」アイコンや「ヘルプ1」の、下が欠けている部分を補ったが15dotsまでしか表示されないらしく効果なし // → // Sept. 17, 2000 縦16dot目を表示できるようにした // 修正したファイルにはJEPRO_16thdotとコメントしてあるのでもし間違っていたらそれをキーワードにして検索してください(Sept. 28, 2000現在 6箇所変更) diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index b3912fef0a..f29fa35ad2 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -2999,9 +2999,9 @@ void CEditWnd::PrintPreviewModeONOFF( void ) GetDocument()->m_cDocType.GetDocumentAttribute().m_nCurrentPrintSetting] ); - // プリンタの情報を取得。 + // プリンターの情報を取得。 - /* 現在のデフォルトプリンタの情報を取得 */ + /* 現在のデフォルトプリンターの情報を取得 */ BOOL bRes; bRes = m_pPrintPreview->GetDefaultPrinterInfo(); if( !bRes ){ From d8cfd63fc40e31ef2b8f6c303e355c471cd38c77 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Thu, 5 May 2022 16:09:58 +0900 Subject: [PATCH 121/129] =?UTF-8?q?=E3=80=8C=E3=83=97=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=80=8D=E3=81=AE=E3=82=AB=E3=82=BF=E3=82=AB?= =?UTF-8?q?=E3=83=8A=E8=A1=A8=E8=A8=98=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BC=B4?= =?UTF-8?q?=E3=81=86=E3=80=81=E5=8D=B0=E5=88=B7=E3=83=97=E3=83=AC=E3=83=93?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/sakura_rc.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 65a995671d..351629970e 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -338,12 +338,12 @@ BEGIN PUSHBUTTON "拡大(&I)",IDC_BUTTON_ZOOMUP,90,16,30,14 LTEXT "999/999",IDC_STATIC_ZOOM,131,19,35,10 PUSHBUTTON "ヘルプ(&H)",IDC_BUTTON_HELP,167,1,39,14 - CONTROL "滑らか(&A)",IDC_CHECK_ANTIALIAS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,207,3,43,10 + CONTROL "滑らか(&A)",IDC_CHECK_ANTIALIAS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,208,3,44,10 PUSHBUTTON "戻る(&Q)",IDCANCEL,167,16,39,14 - PUSHBUTTON "プリンター(&R)",IDC_BUTTON_PRINTERSELECT,208,16,40,14 - ICON IDI_PRINTER,IDC_STATIC,251,3,11,9,SS_REALSIZEIMAGE - LTEXT "Static",IDC_STATIC_PRNDEV,263,4,137,10 - LTEXT "Static",IDC_STATIC_PAPER,251,19,149,10 + PUSHBUTTON "プリンター(&R)",IDC_BUTTON_PRINTERSELECT,208,16,44,14 + ICON IDI_PRINTER,IDC_STATIC,254,3,11,9,SS_REALSIZEIMAGE + LTEXT "Static",IDC_STATIC_PRNDEV,266,4,137,10 + LTEXT "Static",IDC_STATIC_PAPER,254,19,149,10 END IDD_PRINTSETTING DIALOGEX 0, 0, 302, 257 From 6b863bf8f68c17b11f8c865ea383567489d76b4a Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sat, 7 May 2022 22:23:55 +0900 Subject: [PATCH 122/129] =?UTF-8?q?GlobalLock=20=E3=81=AE=E5=9E=8B?= =?UTF-8?q?=E5=A4=89=E6=8F=9B=E3=83=9E=E3=82=AF=E3=83=AD=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/StdAfx.h | 4 ---- sakura_core/_os/CClipboard.cpp | 16 ++++++++-------- sakura_core/dlg/CDlgProperty.cpp | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sakura_core/StdAfx.h b/sakura_core/StdAfx.h index 3b6c3c027d..39061c43de 100644 --- a/sakura_core/StdAfx.h +++ b/sakura_core/StdAfx.h @@ -109,10 +109,6 @@ //その他 #define malloc_char (char*)malloc -#define GlobalLockChar (char*)::GlobalLock -#define GlobalLockUChar (unsigned char*)::GlobalLock -#define GlobalLockWChar (wchar_t*)::GlobalLock -#define GlobalLockBYTE (BYTE*)::GlobalLock //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ は前行の直前に追加の宣言を挿入します。 diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index fa0d6806a0..6353f7fe79 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -86,7 +86,7 @@ bool CClipboard::SetText( nTextLen + 1 ); if( hgClipText ){ - char* pszClip = GlobalLockChar( hgClipText ); + char* pszClip = static_cast(::GlobalLock(hgClipText)); memcpy( pszClip, pszText, nTextLen ); pszClip[nTextLen] = '\0'; ::GlobalUnlock( hgClipText ); @@ -106,7 +106,7 @@ bool CClipboard::SetText( if( !hgClipText )break; //確保した領域にデータをコピー - wchar_t* pszClip = GlobalLockWChar( hgClipText ); + wchar_t* pszClip = static_cast(::GlobalLock(hgClipText)); wmemcpy( pszClip, pData, nDataLen ); //データ pszClip[nDataLen] = L'\0'; //終端ヌル ::GlobalUnlock( hgClipText ); @@ -135,7 +135,7 @@ bool CClipboard::SetText( if( !hgClipSakura )break; //確保した領域にデータをコピー - BYTE* pClip = GlobalLockBYTE( hgClipSakura ); + BYTE* pClip = static_cast(::GlobalLock(hgClipSakura)); *((int*)pClip) = nDataLen; pClip += sizeof(int); //データの長さ wmemcpy( (wchar_t*)pClip, pData, nDataLen ); pClip += nDataLen*sizeof(wchar_t); //データ *((wchar_t*)pClip) = L'\0'; pClip += sizeof(wchar_t); //終端ヌル @@ -157,7 +157,7 @@ bool CClipboard::SetText( 1 ); if( hgClipMSDEVColumn ){ - BYTE* pClip = GlobalLockBYTE( hgClipMSDEVColumn ); + BYTE* pClip = static_cast(::GlobalLock(hgClipMSDEVColumn)); pClip[0] = 0; ::GlobalUnlock( hgClipMSDEVColumn ); SetClipboardData( uFormat, hgClipMSDEVColumn ); @@ -241,7 +241,7 @@ bool CClipboard::SetHtmlText(const CNativeW& cmemBUf) if( !hgClipText ) return false; //確保した領域にデータをコピー - char* pszClip = GlobalLockChar( hgClipText ); + char* pszClip = static_cast(::GlobalLock(hgClipText)); memcpy_raw( pszClip, cmemHeader.GetStringPtr(), cmemHeader.GetStringLength() ); //データ memcpy_raw( pszClip + cmemHeader.GetStringLength(), cmemUtf8.GetStringPtr(), cmemUtf8.GetStringLength() ); //データ memcpy_raw( pszClip + cmemHeader.GetStringLength() + cmemUtf8.GetStringLength(), cmemFooter.GetStringPtr(), cmemFooter.GetStringLength() ); //データ @@ -319,7 +319,7 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe } if( hUnicode != NULL ){ //DWORD nLen = GlobalSize(hUnicode); - wchar_t* szData = GlobalLockWChar(hUnicode); + wchar_t* szData = static_cast(::GlobalLock(hUnicode)); cmemBuf->SetString( szData ); ::GlobalUnlock(hUnicode); return true; @@ -332,7 +332,7 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe hText = GetClipboardData( CF_OEMTEXT ); } if( hText != NULL ){ - char* szData = GlobalLockChar(hText); + char* szData = static_cast(::GlobalLock(hText)); //SJIS→UNICODE CMemory cmemSjis( szData, GlobalSize(hText) ); CNativeW cmemUni; @@ -515,7 +515,7 @@ bool CClipboard::SetClipboradByFormat(const CStringRef& cstr, const wchar_t* pFo if( !hgClipText ){ return false; } - char* pszClip = GlobalLockChar( hgClipText ); + char* pszClip = static_cast(::GlobalLock(hgClipText)); memcpy( pszClip, pBuf, nTextByteLen ); if( nulLen ){ memset( &pszClip[nTextByteLen], 0, nulLen ); diff --git a/sakura_core/dlg/CDlgProperty.cpp b/sakura_core/dlg/CDlgProperty.cpp index ea85c49a24..ca8eed667b 100644 --- a/sakura_core/dlg/CDlgProperty.cpp +++ b/sakura_core/dlg/CDlgProperty.cpp @@ -259,7 +259,7 @@ void CDlgProperty::SetData( void ) in.Close(); goto end_of_CodeTest; } - pBuf = GlobalLockChar( hgData ); + pBuf = static_cast(::GlobalLock(hgData)); in.Read( pBuf, nBufLen ); in.Close(); From 968427d256e871be700f0c16c38e19d63ab03548 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sat, 7 May 2022 22:27:17 +0900 Subject: [PATCH 123/129] =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=84=E3=83=9E=E3=82=AF=E3=83=AD=20malloc?= =?UTF-8?q?=5Fchar=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/StdAfx.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/sakura_core/StdAfx.h b/sakura_core/StdAfx.h index 39061c43de..971b0809ab 100644 --- a/sakura_core/StdAfx.h +++ b/sakura_core/StdAfx.h @@ -107,8 +107,5 @@ // プリコンパイルの有無がビルドパフォーマンスに大きく影響するため。 #include "env/DLLSHAREDATA.h" -//その他 -#define malloc_char (char*)malloc - //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ は前行の直前に追加の宣言を挿入します。 From e669c884161288e0726687b6bb76ba2fef746d2e Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 8 May 2022 14:23:07 +0900 Subject: [PATCH 124/129] =?UTF-8?q?CClipboard=20=E5=8D=98=E4=BD=93?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E6=BA=96=E5=82=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * EnumClipboardFormats, GlobalAlloc, GlobalLock の呼び出しを仮想メンバ関数でラップする。 * GetDataType を private で non-static なメンバ関数に変更する。 --- sakura_core/_os/CClipboard.cpp | 44 ++++++++++++++++++++-------------- sakura_core/_os/CClipboard.h | 6 ++++- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index 6353f7fe79..0824bee384 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -152,7 +152,7 @@ bool CClipboard::SetText( if( bColumnSelect ){ UINT uFormat = ::RegisterClipboardFormat( L"MSDEVColumnSelect" ); if( 0 != uFormat ){ - hgClipMSDEVColumn = ::GlobalAlloc( + hgClipMSDEVColumn = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, 1 ); @@ -170,7 +170,7 @@ bool CClipboard::SetText( if( bLineSelect ){ UINT uFormat = ::RegisterClipboardFormat( L"MSDEVLineSelect" ); if( 0 != uFormat ){ - hgClipMSDEVLine = ::GlobalAlloc( + hgClipMSDEVLine = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, 1 ); @@ -186,7 +186,7 @@ bool CClipboard::SetText( if( bLineSelect ){ UINT uFormat = ::RegisterClipboardFormat( L"VisualStudioEditorOperationsLineCutCopyClipboardTag" ); if( 0 != uFormat ){ - hgClipMSDEVLine2 = ::GlobalAlloc( + hgClipMSDEVLine2 = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, 1 ); @@ -276,7 +276,7 @@ bool CClipboard::GetText(CNativeW* cmemBuf, bool* pbColumnSelect, bool* pbLineSe //矩形選択や行選択のデータがあれば取得 if( NULL != pbColumnSelect || NULL != pbLineSelect ){ UINT uFormat = 0; - while( ( uFormat = ::EnumClipboardFormats( uFormat ) ) != 0 ){ + while( ( uFormat = EnumClipboardFormats( uFormat ) ) != 0 ){ // Jul. 2, 2005 genta : check return value of GetClipboardFormatName WCHAR szFormatName[128]; if( ::GetClipboardFormatName( uFormat, szFormatName, _countof(szFormatName) - 1 ) ){ @@ -425,7 +425,7 @@ static CLIPFORMAT GetClipFormat(const wchar_t* pFormatName) bool CClipboard::IsIncludeClipboradFormat(const wchar_t* pFormatName) { CLIPFORMAT uFormat = GetClipFormat(pFormatName); - if( ::IsClipboardFormatAvailable(uFormat) ){ + if( IsClipboardFormatAvailable(uFormat) ){ return true; } return false; @@ -508,7 +508,7 @@ bool CClipboard::SetClipboradByFormat(const CStringRef& cstr, const wchar_t* pFo case 0: nulLen = 0; break; default: nulLen = 0; break; } - HGLOBAL hgClipText = ::GlobalAlloc( + HGLOBAL hgClipText = GlobalAlloc( GMEM_MOVEABLE | GMEM_DDESHARE, nTextByteLen + nulLen ); @@ -521,7 +521,7 @@ bool CClipboard::SetClipboradByFormat(const CStringRef& cstr, const wchar_t* pFo memset( &pszClip[nTextByteLen], 0, nulLen ); } ::GlobalUnlock( hgClipText ); - ::SetClipboardData( uFormat, hgClipText ); + SetClipboardData( uFormat, hgClipText ); return true; } @@ -563,7 +563,7 @@ bool CClipboard::GetClipboradByFormat(CNativeW& mem, const wchar_t* pFormatName, if( uFormat == (CLIPFORMAT)-1 ){ return false; } - if( !::IsClipboardFormatAvailable(uFormat) ){ + if( !IsClipboardFormatAvailable(uFormat) ){ return false; } if( nMode == -2 ){ @@ -576,10 +576,10 @@ bool CClipboard::GetClipboradByFormat(CNativeW& mem, const wchar_t* pFormatName, } return bret; } - HGLOBAL hClipData = ::GetClipboardData( uFormat ); + HGLOBAL hClipData = GetClipboardData( uFormat ); if( hClipData != NULL ){ bool retVal = true; - const BYTE* pData = (BYTE*)::GlobalLock( hClipData ); + const BYTE* pData = (BYTE*)GlobalLock( hClipData ); if( pData == NULL ){ return false; } @@ -633,10 +633,6 @@ bool CClipboard::GetClipboradByFormat(CNativeW& mem, const wchar_t* pFormatName, return false; } -// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // -// staticインターフェース // -// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // - //! クリップボード内に、サクラエディタで扱えるデータがあればtrue bool CClipboard::HasValidData() { @@ -667,10 +663,10 @@ int CClipboard::GetDataType() { //扱える形式が１つでもあればtrue // 2013.06.11 GetTextの取得順に変更 - if(::IsClipboardFormatAvailable(GetSakuraFormat()))return GetSakuraFormat(); - if(::IsClipboardFormatAvailable(CF_UNICODETEXT))return CF_UNICODETEXT; - if(::IsClipboardFormatAvailable(CF_OEMTEXT))return CF_OEMTEXT; - if(::IsClipboardFormatAvailable(CF_HDROP))return CF_HDROP; + if(IsClipboardFormatAvailable(GetSakuraFormat()))return GetSakuraFormat(); + if(IsClipboardFormatAvailable(CF_UNICODETEXT))return CF_UNICODETEXT; + if(IsClipboardFormatAvailable(CF_OEMTEXT))return CF_OEMTEXT; + if(IsClipboardFormatAvailable(CF_HDROP))return CF_HDROP; return -1; } @@ -689,3 +685,15 @@ BOOL CClipboard::EmptyClipboard() const { BOOL CClipboard::IsClipboardFormatAvailable(UINT format) const { return ::IsClipboardFormatAvailable(format); } + +UINT CClipboard::EnumClipboardFormats(UINT format) const { + return ::EnumClipboardFormats(format); +} + +HGLOBAL CClipboard::GlobalAlloc(UINT uFlags, SIZE_T dwBytes) const { + return ::GlobalAlloc(uFlags, dwBytes); +} + +LPVOID CClipboard::GlobalLock(HGLOBAL hMem) const { + return ::GlobalLock(hMem); +} diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index f398c56796..bea0996e5f 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -57,6 +57,8 @@ class CClipboard{ //演算子 operator bool() const{ return m_bOpenResult!=FALSE; } //!< クリップボードを開けたならtrue + int GetDataType(); //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 + private: HWND m_hwnd; BOOL m_bOpenResult; @@ -65,7 +67,6 @@ class CClipboard{ public: static bool HasValidData(); //!< クリップボード内に、サクラエディタで扱えるデータがあればtrue static CLIPFORMAT GetSakuraFormat(); //!< サクラエディタ独自のクリップボードデータ形式 - static int GetDataType(); //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 protected: // 単体テスト用コンストラクタ @@ -77,5 +78,8 @@ class CClipboard{ virtual HANDLE GetClipboardData(UINT uFormat) const; virtual BOOL EmptyClipboard() const; virtual BOOL IsClipboardFormatAvailable(UINT format) const; + virtual UINT EnumClipboardFormats(UINT format) const; + virtual HGLOBAL GlobalAlloc(UINT uFlags, SIZE_T dwBytes) const; + virtual LPVOID GlobalLock(HGLOBAL hMem) const; }; #endif /* SAKURA_CCLIPBOARD_4E783022_214C_4E51_A2E0_54EC343500F6_H_ */ From 011ff3be6fc2140b6bee66c44e927459db6318b1 Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 8 May 2022 14:24:16 +0900 Subject: [PATCH 125/129] =?UTF-8?q?CClipboard=20=E3=81=AE=E5=8D=98?= =?UTF-8?q?=E4=BD=93=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E6=8B=A1=E5=85=85?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-cclipboard.cpp | 406 +++++++++++++++++++++++++++- 1 file changed, 400 insertions(+), 6 deletions(-) diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index 4db5b13f66..c643f3a1cc 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -29,6 +29,7 @@ #define NOMINMAX #endif /* #ifndef NOMINMAX */ +#include #include #include #include @@ -38,12 +39,14 @@ #include #include +#include #include "CEol.h" #include "mem/CNativeW.h" #include "_os/CClipboard.h" using ::testing::_; +using ::testing::Invoke; using ::testing::Return; /*! @@ -64,7 +67,7 @@ using windowHolder = std::unique_ptr::type, window_clo /*! * @brief SetHtmlTextのテスト */ -TEST(CClipboard, SetHtmlText) +TEST(CClipboard, DISABLED_SetHtmlText) { constexpr const wchar_t inputData[] = L"test 109"; constexpr const char expected[] = @@ -131,7 +134,7 @@ class CClipboardTestFixture : public testing::Test { HWND hWnd = nullptr; }; -TEST_F(CClipboardTestFixture, SetTextAndGetText) +TEST_F(CClipboardTestFixture, DISABLED_SetTextAndGetText) { const std::wstring_view text = L"てすと"; CClipboard clipboard(hWnd); @@ -207,6 +210,17 @@ MATCHER_P(ByteValueInGlobalMemory, value, "") { return match; } +// グローバルメモリに書き込まれた特定のバイト列にマッチする述語関数 +MATCHER_P2(BytesInGlobalMemory, bytes, size, "") { + if (size != ::GlobalSize(arg)) + return false; + void* p = ::GlobalLock(arg); + if (!p) return false; + bool match = std::memcmp(p, bytes, size) == 0; + ::GlobalUnlock(arg); + return match; +} + class MockCClipboard : public CClipboard { public: MockCClipboard(bool openStatus = true) : CClipboard(openStatus) {} @@ -215,6 +229,9 @@ class MockCClipboard : public CClipboard { MOCK_CONST_METHOD1(GetClipboardData, HANDLE (UINT)); MOCK_CONST_METHOD0(EmptyClipboard, BOOL ()); MOCK_CONST_METHOD1(IsClipboardFormatAvailable, BOOL (UINT)); + MOCK_CONST_METHOD1(EnumClipboardFormats, UINT (UINT)); + MOCK_CONST_METHOD2(GlobalAlloc, HGLOBAL (UINT, SIZE_T)); + MOCK_CONST_METHOD1(GlobalLock, LPVOID (HGLOBAL)); }; // Empty のテスト。 @@ -269,6 +286,7 @@ TEST(CClipboard, SetText1) { TEST(CClipboard, SetText2) { constexpr std::wstring_view text = L"てすと"; MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, _)).WillByDefault(Invoke(::GlobalAlloc)); EXPECT_CALL(clipboard, SetClipboardData(CF_UNICODETEXT, WideStringInGlobalMemory(text))); EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"MSDEVColumnSelect"), ByteValueInGlobalMemory(0))); EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), true, false, CF_UNICODETEXT)); @@ -279,6 +297,7 @@ TEST(CClipboard, SetText3) { constexpr std::wstring_view text = L"てすと"; const CLIPFORMAT sakuraFormat = CClipboard::GetSakuraFormat(); MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, _)).WillByDefault(Invoke(::GlobalAlloc)); EXPECT_CALL(clipboard, SetClipboardData(sakuraFormat, SakuraFormatInGlobalMemory(text))); EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"MSDEVLineSelect"), ByteValueInGlobalMemory(1))); EXPECT_CALL(clipboard, SetClipboardData(::RegisterClipboardFormat(L"VisualStudioEditorOperationsLineCutCopyClipboardTag"), ByteValueInGlobalMemory(1))); @@ -294,6 +313,22 @@ TEST(CClipboard, SetText4) { EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), false, false, -1)); } +// SetText のテスト。矩形選択マークの設定に失敗した場合。 +TEST(CClipboard, SetText5) { + constexpr std::wstring_view text = L"てすと"; + MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, 1)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), true, false, 0)); +} + +// SetText のテスト。行選択マークの設定に失敗した場合。 +TEST(CClipboard, SetText6) { + constexpr std::wstring_view text = L"てすと"; + MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, 1)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.SetText(text.data(), text.length(), false, true, 0)); +} + // グローバルメモリを RAII で管理する簡易ヘルパークラス class GlobalMemory { public: @@ -381,8 +416,30 @@ TEST_F(CClipboardGetText, NoSpecifiedFormat4) { } // サクラ形式とCF_UNICODETEXTとCF_OEMTEXTが失敗した場合、CF_HDROPを取得する。 -TEST_F(CClipboardGetText, DISABLED_NoSpecifiedFormat5) { - // 適切なダミーデータを用意するのが難しいため未実装 +TEST_F(CClipboardGetText, NoSpecifiedFormat5) { + constexpr std::array files = {"CF_HDROP\0"}; + GlobalMemory mem(GMEM_MOVEABLE, sizeof(DROPFILES) + files.size()); + mem.Lock([=](DROPFILES* d) { + d->pFiles = sizeof(DROPFILES); + d->fWide = FALSE; + memcpy((char*)d + sizeof(DROPFILES), files.data(), files.size()); + }); + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(FALSE)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, GetClipboardData(CF_OEMTEXT)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_HDROP)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(CF_HDROP)).WillByDefault(Return(mem.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); + EXPECT_STREQ(buffer.GetStringPtr(), L"CF_HDROP"); +} + +// ここまでのすべてに失敗した場合、falseを返す。 +TEST_F(CClipboardGetText, NoSpecifiedFormat6) { + ON_CALL(clipboard, IsClipboardFormatAvailable(sakuraFormat)).WillByDefault(Return(FALSE)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, GetClipboardData(CF_OEMTEXT)).WillByDefault(Return(nullptr)); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_HDROP)).WillByDefault(Return(FALSE)); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol, -1)); } // GetText で取得したいデータ形式が指定されている場合、他のデータ形式は無視する。 @@ -428,6 +485,343 @@ TEST_F(CClipboardGetText, OemTextFailure) { } // CF_HDROP を指定して取得する。 -TEST_F(CClipboardGetText, DISABLED_HDropSuccess) { - // 適切なダミーデータを用意するのが難しいため未実装 +// 取得したファイルが1つであれば末尾に改行を付加しない。 +TEST_F(CClipboardGetText, HDropSuccessSingleFile) { + constexpr std::array files = {"file\0"}; + GlobalMemory mem(GMEM_MOVEABLE, sizeof(DROPFILES) + files.size()); + mem.Lock([=](DROPFILES* d) { + d->pFiles = sizeof(DROPFILES); + d->fWide = FALSE; + memcpy((char*)d + sizeof(DROPFILES), files.data(), files.size()); + }); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_HDROP)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(CF_HDROP)).WillByDefault(Return(mem.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_HDROP)); + EXPECT_STREQ(buffer.GetStringPtr(), L"file"); +} + +// CF_HDROP を指定して取得する。 +// 取得したファイルが複数であればすべてのファイル名の末尾に改行を付加する。 +TEST_F(CClipboardGetText, HDropSuccessMultipleFiles) { + constexpr std::array files = {"file1\0file2\0"}; + GlobalMemory mem(GMEM_MOVEABLE, sizeof(DROPFILES) + files.size()); + mem.Lock([=](DROPFILES* d) { + d->pFiles = sizeof(DROPFILES); + d->fWide = FALSE; + memcpy((char*)d + sizeof(DROPFILES), files.data(), files.size()); + }); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_HDROP)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(CF_HDROP)).WillByDefault(Return(mem.Get())); + EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_HDROP)); + EXPECT_STREQ(buffer.GetStringPtr(), L"file1\r\nfile2\r\n"); +} + +// CF_HDROP が指定されているが取得に失敗した場合。 +TEST_F(CClipboardGetText, HDropFailure) { + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_HDROP)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(CF_HDROP)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol, CF_HDROP)); +} + +// 矩形選択マーク取得のテスト。 +TEST_F(CClipboardGetText, ColumnSelectIsFalse) { + ON_CALL(clipboard, EnumClipboardFormats(0)).WillByDefault(Return(0)); + bool column; + clipboard.GetText(&buffer, &column, nullptr, eol); + EXPECT_FALSE(column); +} + +TEST_F(CClipboardGetText, ColumnSelectIsTrue) { + UINT format = RegisterClipboardFormatW(L"MSDEVColumnSelect"); + ON_CALL(clipboard, EnumClipboardFormats(0)).WillByDefault(Return(format)); + bool column; + clipboard.GetText(&buffer, &column, nullptr, eol); + EXPECT_TRUE(column); +} + +// 行選択マーク取得のテスト。 +TEST_F(CClipboardGetText, LineSelectIsFalse) { + ON_CALL(clipboard, EnumClipboardFormats(0)).WillByDefault(Return(0)); + bool line; + clipboard.GetText(&buffer, &line, nullptr, eol); + EXPECT_FALSE(line); +} + +TEST_F(CClipboardGetText, LineSelectIsTrue1) { + UINT format = RegisterClipboardFormatW(L"MSDEVLineSelect"); + ON_CALL(clipboard, EnumClipboardFormats(0)).WillByDefault(Return(format)); + bool line; + clipboard.GetText(&buffer, nullptr, &line, eol); + EXPECT_TRUE(line); +} + +TEST_F(CClipboardGetText, LineSelectIsTrue2) { + UINT format = RegisterClipboardFormatW(L"VisualStudioEditorOperationsLineCutCopyClipboardTag"); + ON_CALL(clipboard, EnumClipboardFormats(0)).WillByDefault(Return(format)); + bool line; + clipboard.GetText(&buffer, nullptr, &line, eol); + EXPECT_TRUE(line); +} + +// GetClipboardByFormatのモード-2のテスト。GetTextと同じ処理が行われることを期待する。 +// CF_UNICODETEXTの取得に成功した場合。 +TEST_F(CClipboardGetText, GetClipboardByFormatSuccess) { + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_UNICODETEXT)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(CF_UNICODETEXT)).WillByDefault(Return(unicodeMemory.Get())); + EXPECT_TRUE(clipboard.GetClipboradByFormat(buffer, L"CF_UNICODETEXT", -2, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), unicodeText.data()); +} + +// GetClipboardDataが失敗した場合。 +TEST_F(CClipboardGetText, GetClipboardByFormatFailure1) { + buffer.SetString(L"dummy"); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_UNICODETEXT)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(_)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"CF_UNICODETEXT", -2, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// 取得できるフォーマットがクリップボード内になかった場合。 +TEST_F(CClipboardGetText, GetClipboardByFormatFailure2) { + buffer.SetString(L"dummy"); + ON_CALL(clipboard, IsClipboardFormatAvailable(CF_UNICODETEXT)).WillByDefault(Return(FALSE)); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"CF_UNICODETEXT", -2, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// OpenClipboard が失敗していた場合。 +TEST(CClipboard, GetTextNoClipboard) { + CNativeW buffer; + CEol eol; + MockCClipboard clipboard(false); + EXPECT_FALSE(clipboard.GetText(&buffer, nullptr, nullptr, eol)); +} + +struct ClipboardFormatDefinition { + CLIPFORMAT id; + const wchar_t* const name; +}; + +const std::array KNOWN_FORMATS = { + { + {CF_TEXT ,L"CF_TEXT"}, + {CF_BITMAP ,L"CF_BITMAP"}, + {CF_METAFILEPICT,L"CF_METAFILEPICT"}, + {CF_SYLK ,L"CF_SYLK"}, + {CF_DIF ,L"CF_DIF"}, + {CF_TIFF ,L"CF_TIFF"}, + {CF_OEMTEXT ,L"CF_OEMTEXT"}, + {CF_DIB ,L"CF_DIB"}, + {CF_PALETTE ,L"CF_PALETTE"}, + {CF_PENDATA ,L"CF_PENDATA"}, + {CF_RIFF ,L"CF_RIFF"}, + {CF_WAVE ,L"CF_WAVE"}, + {CF_UNICODETEXT ,L"CF_UNICODETEXT"}, + {CF_ENHMETAFILE ,L"CF_ENHMETAFILE"}, + {CF_HDROP ,L"CF_HDROP"}, + {CF_LOCALE ,L"CF_LOCALE"}, + {CF_DIBV5 ,L"CF_DIBV5"} + } +}; + +const wchar_t* const UNITTEST_FORMAT_NAME = L"123SakuraUnittest"; + +// 標準フォーマットを指定した場合 +TEST(CClipboard, IsIncludeClipboardFormat1) { + for (auto format : KNOWN_FORMATS) { + MockCClipboard clipboard; + ON_CALL(clipboard, IsClipboardFormatAvailable(format.id)).WillByDefault(Return(TRUE)); + EXPECT_TRUE(clipboard.IsIncludeClipboradFormat(format.name)); + } +} + +// 数値を指定した場合 +TEST(CClipboard, IsIncludeClipboardFormat2) { + MockCClipboard clipboard; + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + EXPECT_TRUE(clipboard.IsIncludeClipboradFormat(L"12345")); +} + +// 標準フォーマット以外の文字列を指定した場合 +TEST(CClipboard, IsIncludeClipboardFormat3) { + const UINT format = ::RegisterClipboardFormatW(UNITTEST_FORMAT_NAME); + + MockCClipboard clipboard; + ON_CALL(clipboard, IsClipboardFormatAvailable(format)).WillByDefault(Return(TRUE)); + EXPECT_TRUE(clipboard.IsIncludeClipboradFormat(UNITTEST_FORMAT_NAME)); +} + +// 対象フォーマットのデータが存在しなかった場合に失敗することを確認するテスト +TEST(CClipboard, IsIncludeClipboardFormat4) { + MockCClipboard clipboard; + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(FALSE)); + EXPECT_FALSE(clipboard.IsIncludeClipboradFormat(L"12345")); +} + +// フォーマット文字列が空だった場合は失敗する。 +TEST(CClipboard, IsIncludeClipboardFormat5) { + MockCClipboard clipboard; + EXPECT_FALSE(clipboard.IsIncludeClipboradFormat(L"")); +} + +// 不明なモード値を指定すると失敗する。 +TEST(CClipboard, SetClipboardByFormat1) { + MockCClipboard clipboard; + EXPECT_FALSE(clipboard.SetClipboradByFormat({L"テスト", 3}, L"12345", 99999, 1)); +} + +// フォーマット名が空文字列だと失敗する。 +TEST(CClipboard, SetClipboardByFormat2) { + MockCClipboard clipboard; + EXPECT_FALSE(clipboard.SetClipboradByFormat({L"テスト", 3}, L"", 99999, 1)); +} + +// モード-1（バイナリデータ）のテスト。 +// UTF-16 の符号単位（0x0000～0x00ff）を 0x00～0xff のバイト値にマップする。 +// 終端モード0では文字列中の \0 をバイナリとして扱う（終端として認識しない）。 +TEST(CClipboard, SetClipboardByFormat3) { + MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, _)).WillByDefault(Invoke(::GlobalAlloc)); + EXPECT_CALL(clipboard, SetClipboardData(12345, BytesInGlobalMemory("\x00\x01\xfe\xff", 4))); + EXPECT_TRUE(clipboard.SetClipboradByFormat({L"\x00\x01\xfe\xff", 4}, L"12345", -1, 0)); +} + +// モード-1（バイナリデータ）のテスト。 +// 0x100以上の値が含まれている場合は失敗する。 +TEST(CClipboard, SetClipboardByFormat4) { + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(_, _)).Times(0); + EXPECT_FALSE(clipboard.SetClipboradByFormat({L"\x100", 1}, L"12345", -1, 0)); +} + +// モード3（UTF-16）のテスト。コード変換を行わないパターン。 +// 終端モードの自動判定を要求する。期待されるモードは2（2バイトの0値で終端する）。 +TEST(CClipboard, SetClipboardByFormat5) { + MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, _)).WillByDefault(Invoke(::GlobalAlloc)); + EXPECT_CALL(clipboard, SetClipboardData(12345, WideStringInGlobalMemory(L"テスト"))); + EXPECT_TRUE(clipboard.SetClipboradByFormat({L"テスト", 3}, L"12345", 3, -1)); +} + +// モード4（UTF-8）のテスト。コード変換を行う。 +// 終端モードの自動判定を要求する。期待されるモードは1（1バイトの0値で終端する）。 +// +// 共有データに依存するためテスト不能。 +TEST(CClipboard, DISABLED_SetClipboardByFormat6) { + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(12345, AnsiStringInGlobalMemory("テスト"))); + EXPECT_TRUE(clipboard.SetClipboradByFormat({L"テスト", 3}, L"12345", 4, -1)); +} + +// モード-2のテスト。SetTextと同じ処理を行う。 +TEST(CClipboard, SetClipboardByFormat7) { + constexpr std::wstring_view text = L"テスト"; + MockCClipboard clipboard; + EXPECT_CALL(clipboard, SetClipboardData(CF_UNICODETEXT, WideStringInGlobalMemory(text))); + + // 既存のコードに実装ミスがあり、成功してもfalseを返してしまう…。 +// EXPECT_TRUE(clipboard.SetClipboradByFormat({text.data(), text.size()}, L"CF_UNICODETEXT", -2, 0)); + EXPECT_FALSE(clipboard.SetClipboradByFormat({text.data(), text.size()}, L"CF_UNICODETEXT", -2, 0)); +} + +// モード-2以外でGlobalAllocが失敗した場合。 +TEST(CClipboard, SetClipboardByFormat8) { + MockCClipboard clipboard; + ON_CALL(clipboard, GlobalAlloc(_, _)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.SetClipboradByFormat({L"テスト", 3}, L"12345", 3, -1)); +} + +// フォーマット名が空文字列だった場合は即失敗する。 +TEST(CClipboard, GetClipboardByFormat1) { + MockCClipboard clipboard; + CNativeW buffer(L"dummy"); + CEol eol(EEolType::cr_and_lf); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"", -1, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// 要求されたフォーマットのデータがクリップボードに存在しなければ失敗する。 +TEST(CClipboard, GetClipboardByFormat2) { + MockCClipboard clipboard; + CNativeW buffer(L"dummy"); + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(FALSE)); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"12345", -1, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// GetClipboardDataが失敗した場合。 +TEST(CClipboard, GetClipboardByFormat3) { + MockCClipboard clipboard; + CNativeW buffer(L"dummy"); + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(12345)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"12345", -1, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// GlobalLockが失敗した場合。 +TEST(CClipboard, GetClipboardByFormat4) { + MockCClipboard clipboard; + CNativeW buffer(L"dummy"); + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(12345)).WillByDefault(Return((HANDLE)67890)); + ON_CALL(clipboard, GlobalLock((HANDLE)67890)).WillByDefault(Return(nullptr)); + EXPECT_FALSE(clipboard.GetClipboradByFormat(buffer, L"12345", -1, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L""); +} + +// モード-1（バイナリデータ）のテスト。 +// 0x00～0xff のバイト値を UTF-16 の符号単位（0x0000～0x00ff）にマップする。 +// 終端モード0ではデータ中の \0 をバイナリとして扱う（終端として認識しない）。 +TEST(CClipboard, GetClipboardByFormat5) { + GlobalMemory memory(GMEM_MOVEABLE, 2); + memory.Lock([=](char* p) { + std::memcpy(p, "\x00\xff", 2); + }); + MockCClipboard clipboard; + CNativeW buffer; + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(12345)).WillByDefault(Return(memory.Get())); + ON_CALL(clipboard, GlobalLock(_)).WillByDefault(Invoke(::GlobalLock)); + EXPECT_TRUE(clipboard.GetClipboradByFormat(buffer, L"12345", -1, 0, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L"\x00\xff"); +} + +// モード3（UTF-16）のテスト。コード変換を行わないパターン。 +// 終端モードには2を設定する（2バイトの0値で終端されていることを期待する）。 +TEST(CClipboard, GetClipboardByFormat6) { + GlobalMemory memory(GMEM_MOVEABLE, sizeof(wchar_t) * 8); + memory.Lock([=](wchar_t* p) { + std::memcpy(p, L"テスト\x00データ", 8); + }); + MockCClipboard clipboard; + CNativeW buffer; + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(12345)).WillByDefault(Return(memory.Get())); + ON_CALL(clipboard, GlobalLock(_)).WillByDefault(Invoke(::GlobalLock)); + EXPECT_TRUE(clipboard.GetClipboradByFormat(buffer, L"12345", 3, 2, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L"テスト"); +} + +// モード4（UTF-8）のテスト。コード変換を行う。 +// 終端モードには1を設定する（1バイトの0値で終端されていることを期待する）。 +// +// CEditDoc のインスタンスに依存するためテスト不能。 +TEST(CClipboard, DISABLED_GetClipboardByFormat7) { + GlobalMemory memory(GMEM_MOVEABLE, 14); + memory.Lock([=](char* p) { + std::memcpy(p, "テスト\x00データ", 14); + }); + MockCClipboard clipboard; + CNativeW buffer; + CEol eol(EEolType::cr_and_lf); + ON_CALL(clipboard, IsClipboardFormatAvailable(12345)).WillByDefault(Return(TRUE)); + ON_CALL(clipboard, GetClipboardData(12345)).WillByDefault(Return(memory.Get())); + EXPECT_TRUE(clipboard.GetClipboradByFormat(buffer, L"12345", 4, 1, eol)); + EXPECT_STREQ(buffer.GetStringPtr(), L"テスト"); } From eed2fec5a555a486f33d05f9eacb2bb2a9b1604c Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 8 May 2022 14:28:22 +0900 Subject: [PATCH 126/129] =?UTF-8?q?Windows=20API=20=E3=81=AE=E5=91=BC?= =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=97=E3=82=92=E4=BC=B4=E3=81=86=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unittests/test-cclipboard.cpp | 120 ---------------------------- 1 file changed, 120 deletions(-) diff --git a/tests/unittests/test-cclipboard.cpp b/tests/unittests/test-cclipboard.cpp index c643f3a1cc..def98f0b78 100644 --- a/tests/unittests/test-cclipboard.cpp +++ b/tests/unittests/test-cclipboard.cpp @@ -49,126 +49,6 @@ using ::testing::_; using ::testing::Invoke; using ::testing::Return; -/*! - * HWND型のスマートポインタを実現するためのdeleterクラス - */ -struct window_closer -{ - void operator()(HWND hWnd) const - { - ::DestroyWindow(hWnd); - } -}; - -//! HWND型のスマートポインタ -using windowHolder = std::unique_ptr::type, window_closer>; - - -/*! - * @brief SetHtmlTextのテスト - */ -TEST(CClipboard, DISABLED_SetHtmlText) -{ - constexpr const wchar_t inputData[] = L"test 109"; - constexpr const char expected[] = - "Version:0.9\r\n" - "StartHTML:00000097\r\n" - "EndHTML:00000178\r\n" - "StartFragment:00000134\r\n" - "EndFragment:00000142\r\n" - "\r\n" - "\r\n" - "test 109\r\n" - "\r\n" - "\r\n"; - - const UINT uHtmlFormat = ::RegisterClipboardFormat(L"HTML Format"); - - auto hInstance = ::GetModuleHandleW(nullptr); - if (HWND hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); hWnd) { - // HWNDをスマートポインタに入れる - windowHolder holder(hWnd); - - // クリップボード操作クラスでSetHtmlTextする - CClipboard cClipBoard(hWnd); - - // 操作は失敗しないはず。 - ASSERT_TRUE(cClipBoard.SetHtmlText(inputData)); - - // 操作に成功するとHTML形式のデータを利用できるはず。 - ASSERT_TRUE(::IsClipboardFormatAvailable(uHtmlFormat)); - - // クリップボード操作クラスが対応してないので生APIを呼んで確認する。 - - // グローバルメモリをロックできた場合のみ中身を取得しに行く - if (HGLOBAL hClipData = ::GetClipboardData(uHtmlFormat); hClipData != nullptr) { - // データをstd::stringにコピーする - const size_t cchData = ::GlobalSize(hClipData); - const char* pData = (char*)::GlobalLock(hClipData); - std::string strClipData(pData, cchData); - - // 使い終わったらロック解除する - ::GlobalUnlock(hClipData); - - ASSERT_STREQ(expected, strClipData.c_str()); - } - else { - FAIL(); - } - } -} - -class CClipboardTestFixture : public testing::Test { -protected: - void SetUp() override { - hInstance = ::GetModuleHandle(nullptr); - hWnd = ::CreateWindowExW(0, WC_STATICW, L"test", 0, 1, 1, 1, 1, nullptr, nullptr, hInstance, nullptr); - if (!hWnd) FAIL(); - } - void TearDown() override { - if (hWnd) - ::DestroyWindow(hWnd); - } - - HINSTANCE hInstance = nullptr; - HWND hWnd = nullptr; -}; - -TEST_F(CClipboardTestFixture, DISABLED_SetTextAndGetText) -{ - const std::wstring_view text = L"てすと"; - CClipboard clipboard(hWnd); - CNativeW buffer; - bool column; - bool line; - CEol eol(EEolType::cr_and_lf); - - // テストを実行する前にクリップボードの内容を破棄しておく。 - clipboard.Empty(); - - // テキストを設定する（矩形選択フラグなし・行選択フラグなし） - EXPECT_TRUE(clipboard.SetText(text.data(), text.length(), false, false, -1)); - EXPECT_TRUE(CClipboard::HasValidData()); - // Unicode文字列を取得する - EXPECT_TRUE(clipboard.GetText(&buffer, &column, &line, eol, CF_UNICODETEXT)); - EXPECT_STREQ(buffer.GetStringPtr(), text.data()); - EXPECT_FALSE(column); - EXPECT_FALSE(line); - - clipboard.Empty(); - - // テキストを設定する（矩形選択あり・行選択あり） - EXPECT_TRUE(clipboard.SetText(text.data(), text.length(), true, true, -1)); - EXPECT_TRUE(CClipboard::HasValidData()); - // サクラエディタ独自形式データを取得する - EXPECT_TRUE(clipboard.GetText(&buffer, &column, nullptr, eol, CClipboard::GetSakuraFormat())); - EXPECT_STREQ(buffer.GetStringPtr(), text.data()); - EXPECT_TRUE(column); - EXPECT_TRUE(clipboard.GetText(&buffer, nullptr, &line, eol, CClipboard::GetSakuraFormat())); - EXPECT_STREQ(buffer.GetStringPtr(), text.data()); - EXPECT_TRUE(line); -} - // グローバルメモリに書き込まれた特定の Unicode 文字列にマッチする述語関数 MATCHER_P(WideStringInGlobalMemory, expected_string, "") { const wchar_t* s = (const wchar_t*)::GlobalLock(arg); From 98652eb3b8b6a54289e37d5f0890674d81f6dbbd Mon Sep 17 00:00:00 2001 From: Kengo Ide Date: Sun, 8 May 2022 15:14:57 +0900 Subject: [PATCH 127/129] =?UTF-8?q?CClipboard::GetDataType=20=E3=82=92=20c?= =?UTF-8?q?onst=20=E9=96=A2=E6=95=B0=E3=81=AB=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/_os/CClipboard.cpp | 2 +- sakura_core/_os/CClipboard.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index 0824bee384..d5d94f5b65 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -659,7 +659,7 @@ CLIPFORMAT CClipboard::GetSakuraFormat() } //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 -int CClipboard::GetDataType() +int CClipboard::GetDataType() const { //扱える形式が１つでもあればtrue // 2013.06.11 GetTextの取得順に変更 diff --git a/sakura_core/_os/CClipboard.h b/sakura_core/_os/CClipboard.h index bea0996e5f..7ceadf8159 100644 --- a/sakura_core/_os/CClipboard.h +++ b/sakura_core/_os/CClipboard.h @@ -57,7 +57,7 @@ class CClipboard{ //演算子 operator bool() const{ return m_bOpenResult!=FALSE; } //!< クリップボードを開けたならtrue - int GetDataType(); //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 + int GetDataType() const; //!< クリップボードデータ形式(CF_UNICODETEXT等)の取得 private: HWND m_hwnd; From 4acd5375d03791ca64299418b3a978705af1301c Mon Sep 17 00:00:00 2001 From: dep5 Date: Sat, 28 May 2022 21:03:01 +0900 Subject: [PATCH 128/129] =?UTF-8?q?=E3=80=8C=E5=89=B2=E4=BB=98=E3=80=8D?= =?UTF-8?q?=E3=82=92=E3=80=8C=E5=89=B2=E5=BD=93=E3=80=8D=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/macro/source/usage/ExecMacro.html | 4 ++-- help/sakura/res/HLP000084.html | 2 +- installer/sinst_src/keyword/php.khp | 2 +- sakura_core/prop/CPropComKeybind.cpp | 4 ++-- sakura_core/sakura_rc.rc | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/help/macro/source/usage/ExecMacro.html b/help/macro/source/usage/ExecMacro.html index 8abe783376..3b46f6f8e7 100644 --- a/help/macro/source/usage/ExecMacro.html +++ b/help/macro/source/usage/ExecMacro.html @@ -39,8 +39,8 @@

    実行方法

    「登録済みマクロ」から実行

    特徴

    -登録したマクロはメニューやツールバーに割り付けができます
    -※割り付け可能なのは20番までに登録したマクロのみ +登録したマクロはメニューやツールバーに割り当てができます
    +※割り当て可能なのは20番までに登録したマクロのみ

    設定方法

    1. [設定]-[共通設定]のマクロタブを選択
      2. diff --git a/help/sakura/res/HLP000084.html b/help/sakura/res/HLP000084.html index 92c9b99dfb..791fcd3eab 100644 --- a/help/sakura/res/HLP000084.html +++ b/help/sakura/res/HLP000084.html @@ -38,7 +38,7 @@

      共通設定 『キー割り当て』プロパティ

      ①右枠の「キー」の一覧から、変更したいキーを選択。
      必要ならば [Shift], [Ctrl], [Alt] の組み合わせを変える。
      ②左枠上部の「種別」を選択し、枠内から機能を選択する。
      -③[割付]ボタンを押せば、現在選択しているキーの機能が、種別・機能で選択しているものに変わります。
      +③[割当]ボタンを押せば、現在選択しているキーの機能が、種別・機能で選択しているものに変わります。
      ④[解除]ボタンを押せば、現在選択しているキーの機能が [未定義] の状態になります。

    [インポート]ボタン
    diff --git a/installer/sinst_src/keyword/php.khp b/installer/sinst_src/keyword/php.khp index b961b8da8a..9d90edf7a9 100644 --- a/installer/sinst_src/keyword/php.khp +++ b/installer/sinst_src/keyword/php.khp @@ -1833,7 +1833,7 @@ ncurses_timeout /// void ncurses_timeout ( int millisec)\n特別なキーシー ncurses_typeahead /// int ncurses_typeahead ( int fd)\n typeahead確認用に別のファイル記述子を指定する ncurses_ungetch /// int ncurses_ungetch ( int keycode)\n入力ストリームに1文字戻す ncurses_ungetmouse /// bool ncurses_ungetmouse ( array mevent)\nマウスイベントをキーにプッシュする -ncurses_use_default_colors /// bool ncurses_use_default_colors ( void)\n 端末のデフォルト色をカラーID -1に割り付ける +ncurses_use_default_colors /// bool ncurses_use_default_colors ( void)\n 端末のデフォルト色をカラーID -1に割り当てる ncurses_use_env /// void ncurses_use_env ( bool flag)\n端末の大きさに関する環境情報の使用を制御する ncurses_use_extended_names /// int ncurses_use_extended_names ( bool flag)\n terminfo記述において拡張名の使用を制御する ncurses_vidattr /// int ncurses_vidattr ( int intarg)\n diff --git a/sakura_core/prop/CPropComKeybind.cpp b/sakura_core/prop/CPropComKeybind.cpp index 0b5e216abf..975945d798 100644 --- a/sakura_core/prop/CPropComKeybind.cpp +++ b/sakura_core/prop/CPropComKeybind.cpp @@ -199,7 +199,7 @@ INT_PTR CPropKeybind::DispatchEvent( /* Keybind:キー割り当て設定をエクスポートする */ Export( hwndDlg ); return TRUE; - case IDC_BUTTON_ASSIGN: /* 割付 */ + case IDC_BUTTON_ASSIGN: /* 割当 */ nIndex = List_GetCurSel( hwndKeyList ); nIndex2 = Combo_GetCurSel( hwndCombo ); nIndex3 = List_GetCurSel( hwndFuncList ); @@ -271,7 +271,7 @@ INT_PTR CPropKeybind::DispatchEvent( } nFuncCode = m_Common.m_sKeyBind.m_pKeyNameArr[nIndex].m_nFuncCodeArr[i]; // Oct. 2, 2001 genta - // 2007.11.02 ryoji F_DISABLEなら未割付 + // 2007.11.02 ryoji F_DISABLEなら未割当 if( nFuncCode == F_DISABLE ){ wcsncpy( pszLabel, LS(STR_PROPCOMKEYBIND_UNASSIGN), _countof(pszLabel) - 1 ); pszLabel[_countof(pszLabel) - 1] = L'\0'; diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index c499c1348a..2734d6664c 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -1403,7 +1403,7 @@ BEGIN CONTROL "A&Lt",IDC_CHECK_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,68,25,10 LTEXT "キーに割り当てられている機能",IDC_LABEL_KEYtoFUNC,166,194,120,10 EDITTEXT IDC_EDIT_KEYSFUNC,164,205,118,12,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP | NOT WS_TABSTOP - PUSHBUTTON "割付(&B)",IDC_BUTTON_ASSIGN,129,190,34,14,WS_GROUP + PUSHBUTTON "割当(&B)",IDC_BUTTON_ASSIGN,129,190,34,14,WS_GROUP PUSHBUTTON "解除(&R)",IDC_BUTTON_RELEASE,129,204,34,14 END @@ -3703,7 +3703,7 @@ BEGIN STR_PROPCOMFNM_ERR_REG "これ以上登録できません。" STR_PROPCOMGREP_DLL "正規表現は使用できません" STR_PROPCOMHELP_MIGEMODIR "検索するフォルダーを選んでください" - STR_PROPCOMKEYBIND_UNASSIGN "未割付" + STR_PROPCOMKEYBIND_UNASSIGN "未割当" STR_PROPCOMKEYWORD_ERR_LEN "キーワードの長さは%dバイトまでです。" STR_PROPCOMKEYWORD_SETMAX "セットは%d個までしか登録できません。\n" STR_PROPCOMKEYWORD_SETNAME1 "キーワードのセット追加" From d7a18ee4bf0cb37e2d3e66caa6fe90aee8b0a29a Mon Sep 17 00:00:00 2001 From: dep5 Date: Sat, 28 May 2022 21:03:55 +0900 Subject: [PATCH 129/129] =?UTF-8?q?MousePouse=E3=82=92MousePause=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/cmd/CViewCommander_Edit.cpp | 8 ++++---- sakura_core/view/CEditView.cpp | 6 +++--- sakura_core/view/CEditView.h | 4 ++-- sakura_core/view/CEditView_Mouse.cpp | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sakura_core/cmd/CViewCommander_Edit.cpp b/sakura_core/cmd/CViewCommander_Edit.cpp index 16b029d3f1..fffba6d3e1 100644 --- a/sakura_core/cmd/CViewCommander_Edit.cpp +++ b/sakura_core/cmd/CViewCommander_Edit.cpp @@ -42,8 +42,8 @@ void CViewCommander::Command_WCHAR( wchar_t wcChar, bool bConvertEOL ) GetDocument()->m_cDocEditor.SetModified(true,true); // Jan. 22, 2002 genta - if( m_pCommanderView->m_bHideMouse && 0 <= m_pCommanderView->m_nMousePouse ){ - m_pCommanderView->m_nMousePouse = -1; + if( m_pCommanderView->m_bHideMouse && 0 <= m_pCommanderView->m_nMousePause ){ + m_pCommanderView->m_nMousePause = -1; ::SetCursor( NULL ); } @@ -234,8 +234,8 @@ void CViewCommander::Command_IME_CHAR( WORD wChar ) } GetDocument()->m_cDocEditor.SetModified(true,true); // Jan. 22, 2002 genta - if( m_pCommanderView->m_bHideMouse && 0 <= m_pCommanderView->m_nMousePouse ){ - m_pCommanderView->m_nMousePouse = -1; + if( m_pCommanderView->m_bHideMouse && 0 <= m_pCommanderView->m_nMousePause ){ + m_pCommanderView->m_nMousePause = -1; ::SetCursor( NULL ); } diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 488d7cc842..b78da3282e 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -151,7 +151,7 @@ CEditView::CEditView( void ) , m_bActivateByMouse( FALSE ) // 2007.10.02 nasukoji , m_nWheelDelta(0) , m_eWheelScroll(F_0) -, m_nMousePouse(0) +, m_nMousePause(0) , m_nAutoScrollMode(0) , m_cHistory(NULL) , m_cRegexKeyword(NULL) @@ -569,8 +569,8 @@ LRESULT CEditView::DispatchEvent( /* テキストを貼り付け */ BOOL bHokan; bHokan = m_bHokan; - if( m_bHideMouse && 0 <= m_nMousePouse ){ - m_nMousePouse = -1; + if( m_bHideMouse && 0 <= m_nMousePause ){ + m_nMousePause = -1; ::SetCursor( NULL ); } GetCommander().HandleCommand( F_INSTEXT_W, true, (LPARAM)pszText, (LPARAM)wcslen(pszText), TRUE, 0 ); diff --git a/sakura_core/view/CEditView.h b/sakura_core/view/CEditView.h index 7d0533e8f7..3796feed19 100644 --- a/sakura_core/view/CEditView.h +++ b/sakura_core/view/CEditView.h @@ -693,8 +693,8 @@ class CEditView CMyPoint m_cMouseDownPos; //!< クリック時のマウス座標 int m_nWheelDelta; //!< ホイール変化量 EFunctionCode m_eWheelScroll; //!< スクロールの種類 - int m_nMousePouse; // マウス停止時間 - CMyPoint m_cMousePousePos; // マウスの停止位置 + int m_nMousePause; // マウス停止時間 + CMyPoint m_cMousePausePos; // マウスの停止位置 bool m_bHideMouse; int m_nAutoScrollMode; //!< オートスクロールモード diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 953e00f4fe..a6dffed35e 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -944,10 +944,10 @@ void CEditView::OnMOUSEMOVE( WPARAM fwKeys, int xPos_, int yPos_ ) { CMyPoint ptMouse(xPos_, yPos_); - if( m_cMousePousePos != ptMouse ){ - m_cMousePousePos = ptMouse; - if( m_nMousePouse < 0 ){ - m_nMousePouse = 0; + if( m_cMousePausePos != ptMouse ){ + m_cMousePausePos = ptMouse; + if( m_nMousePause < 0 ){ + m_nMousePause = 0; } } @@ -1103,7 +1103,7 @@ void CEditView::OnMOUSEMOVE( WPARAM fwKeys, int xPos_, int yPos_ ) } }else /* アイビーム */ - if( 0 <= m_nMousePouse ){ + if( 0 <= m_nMousePause ){ ::SetCursor( ::LoadCursor( NULL, IDC_IBEAM ) ); } } @@ -1112,7 +1112,7 @@ void CEditView::OnMOUSEMOVE( WPARAM fwKeys, int xPos_, int yPos_ ) } // 以下、マウスでの選択中(ドラッグ中) - if( 0 <= m_nMousePouse ){ + if( 0 <= m_nMousePause ){ ::SetCursor( ::LoadCursor( NULL, IDC_IBEAM ) ); }
      -
    • 印刷プレビューで設定変更するとメモリーリーク (svn:3623 upatchid:769 unicode:2111 Moca)
      • +
    • 印刷プレビューで設定変更するとメモリリーク (svn:3623 upatchid:769 unicode:2111 Moca)
    • 整数オーバーフローの修正 (svn:3624 upatchid:755 Moca)
    • ファイル読み込み進捗で改行コード長が抜けていた (svn:3626 upatchid:736 Moca)
    • CTipWndクラスのメンバ変数の初期化 (svn:3638 upatchid:779 novice)
      • @@ -108,7 +108,7 @@

      May. 5, 2014 (2.1.1.2)

    • CFileLoadの変換でEOLも含めるように (svn:3626 upatchid:736 Moca)
    • 文字コード変換の高速化 (svn:3627 upatchid:727 Moca)
    • 色を変えない時の表示速度改善 (svn:3628 upatchid:745 Moca)
      • -
    • 改行コード変換のメモリー使用量削減 (svn:3629 upatchid:746 Moca)
      • +
    • 改行コード変換のメモリ使用量削減 (svn:3629 upatchid:746 Moca)
    • 改行コードのないファイルの読み込み高速化 (svn:3630 upatchid:747 Moca)
    • 大きいファイルのときのカーソル移動の高速化 (svn:3631 upatchid:748 Moca)
    • CDocLine,CLayoutのconst付加 (svn:3632 upatchid:752 Moca)
      • @@ -375,7 +375,7 @@

      May. 13, 2013 (2.0.8.0)

    • TAB矢印の色設定の太字が反映されていない (svn:2868 upatchid:409 Uchi)
    • WSHマクロの中断ダイアログ表示後に固まる (svn:2881 upatchid:408 upatchid:425 Moca)
    • 2.0.6.0以降のWSHマクロの実行速度改善 (svn:2881 upatchid:408 upatchid:425 Moca)
      • -
    • WSHマクロのハンドルリーク・メモリーリーク解消 (svn:2881 upatchid:408 upatchid:425 Moca)
      • +
    • WSHマクロのハンドルリーク・メモリリーク解消 (svn:2881 upatchid:408 upatchid:425 Moca)
    • ソート・uniqの修正 (svn:2883 upatchid:393 Moca)
    • ファイル履歴の文字コード設定が正しく表示されないのを修正 (svn:2900 upatchid:434 Uchi)
    • 編集ウィンドウに設定されたフォントの幅で描画されていた (svn:2909 upatchid:439 aroka)
      • diff --git a/help/sakura/res/HLP_UR017.html b/help/sakura/res/HLP_UR017.html index 60dd29d9c8..9a43082d34 100644 --- a/help/sakura/res/HLP_UR017.html +++ b/help/sakura/res/HLP_UR017.html @@ -135,7 +135,7 @@

      Aug. 14, 2016 (2.3.1.0)

    • C++インデントでコメント行を改行するとRuntime Error (svn:4082 upatchid:1021 ds14050,Moca)
    • 単語種別のキリル文字の範囲修正 (svn:4083 upatchid:1022 Moca)
    • CDCFontでフォント削除がおかしい (svn:4084 upatchid:1026 Moca)
      • -
    • ソートコマンドでメモリーリーク (svn:4085 upatchid:1027 Moca)
      • +
    • ソートコマンドでメモリリーク (svn:4085 upatchid:1027 Moca)
    • TSV,CSVモードコンボボックスの縦幅を広げる (svn:4086 upatchid:1033 Moca)
    • C++アウトライン解析で異常終了する (svn:4087 upatchid:1007 Moca)
    • WCODE::IsCtrlCode()でNUL文字がfalseになるためコントロールコードとして描画されない (svn:4090 upatchid:1035 Moca,novice123)
      • diff --git a/installer/sinst_src/keyword/php.khp b/installer/sinst_src/keyword/php.khp index cc698eafbe..4c0c157983 100644 --- a/installer/sinst_src/keyword/php.khp +++ b/installer/sinst_src/keyword/php.khp @@ -1556,7 +1556,7 @@ get_browser /// object get_browser ( string [user_agent])\n ユーザのブラ highlight_file /// bool highlight_file ( string filename)\nファイルの構文ハイライト表示 highlight_string /// bool highlight_string ( string str)\n文字列の構文ハイライト化 ignore_user_abort /// int ignore_user_abort ( int [setting])\n クライアント接続が断となった時にスクリプトの実行を中断するかどう かを設定する -leak /// void leak ( int bytes)\nメモリーをリークする +leak /// void leak ( int bytes)\nメモリをリークする pack /// string pack ( string format [, mixed args])\nデータをバイナリ文字列にパックする show_source /// bool show_source ( string filename)\nファイルの構文ハイライト表示 sleep /// void sleep ( int seconds)\n実行を遅延させる diff --git a/sakura_core/CGrepAgent.cpp b/sakura_core/CGrepAgent.cpp index 12703d54d9..b24fe97a61 100644 --- a/sakura_core/CGrepAgent.cpp +++ b/sakura_core/CGrepAgent.cpp @@ -1064,7 +1064,7 @@ int CGrepAgent::DoGrepTree( } //フォルダ名を作成する。 - // 2010.08.01 キャンセルでメモリーリークしてました + // 2010.08.01 キャンセルでメモリリークしてました std::wstring currentPath = pszPath; currentPath += L"\\"; currentPath += lpFileName; diff --git a/sakura_core/config/build_config.h b/sakura_core/config/build_config.h index 770b4d335b..bbaaaaa86f 100644 --- a/sakura_core/config/build_config.h +++ b/sakura_core/config/build_config.h @@ -65,7 +65,7 @@ static const bool UNICODE_BOOL=true; #define FILL_STRANGE_IN_NEW_MEMORY #endif -//crtdbg.hによるメモリーリークチェックを使うかどうか (デバッグ用) +//crtdbg.hによるメモリリークチェックを使うかどうか (デバッグ用) #if defined(_MSC_VER) && defined(_DEBUG) #define USE_LEAK_CHECK_WITH_CRTDBG #endif @@ -92,7 +92,7 @@ static const bool UNICODE_BOOL=true; ); #endif -//crtdbg.hによるメモリーリークチェックを使うかどうか (デバッグ用) +//crtdbg.hによるメモリリークチェックを使うかどうか (デバッグ用) #ifdef USE_LEAK_CHECK_WITH_CRTDBG //Cランタイムの機能を使ってメモリリークを検出する // メモリリークチェックの結果出力を得るには diff --git a/sakura_core/io/CFileLoad.cpp b/sakura_core/io/CFileLoad.cpp index 2c679993d2..8bdf8d281c 100644 --- a/sakura_core/io/CFileLoad.cpp +++ b/sakura_core/io/CFileLoad.cpp @@ -426,7 +426,7 @@ void CFileLoad::Buffering( void ) { DWORD ReadSize; - // メモリー確保 + // メモリ確保 if( NULL == m_pReadBuf ){ int nBufSize; nBufSize = ( m_nFileSize < gm_nBufSizeDef )?( static_cast(m_nFileSize) ):( gm_nBufSizeDef ); @@ -438,7 +438,7 @@ void CFileLoad::Buffering( void ) m_pReadBuf = (char *)malloc( nBufSize ); if( NULL == m_pReadBuf ){ - throw CError_FileRead(); // メモリー確保に失敗 + throw CError_FileRead(); // メモリ確保に失敗 } m_nReadDataLen = 0; m_nReadBufSize = nBufSize; diff --git a/sakura_core/macro/CPPA.cpp b/sakura_core/macro/CPPA.cpp index 0c9d9b90c3..a256e5d10a 100644 --- a/sakura_core/macro/CPPA.cpp +++ b/sakura_core/macro/CPPA.cpp @@ -187,7 +187,7 @@ bool CPPA::InitDllImp() char buf[1024]; // コマンドに置き換えられない関数 ＝ PPA無しでは使えない。。。 for (i=0; CSMacroMgr::m_MacroFuncInfoArr[i].m_pszFuncName != NULL; i++) { - // 2003.06.08 Moca メモリーリークの修正 + // 2003.06.08 Moca メモリリークの修正 // 2003.06.16 genta バッファを外から与えるように // 関数登録用文字列を作成する GetDeclarations( CSMacroMgr::m_MacroFuncInfoArr[i], buf ); @@ -196,7 +196,7 @@ bool CPPA::InitDllImp() // コマンドに置き換えられる関数 ＝ PPA無しでも使える。 for (i=0; CSMacroMgr::m_MacroFuncInfoCommandArr[i].m_pszFuncName != NULL; i++) { - // 2003.06.08 Moca メモリーリークの修正 + // 2003.06.08 Moca メモリリークの修正 // 2003.06.16 genta バッファを外から与えるように // 関数登録用文字列を作成する GetDeclarations( CSMacroMgr::m_MacroFuncInfoCommandArr[i], buf ); diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index c422bd916a..488d7cc842 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -490,7 +490,7 @@ LRESULT CEditView::DispatchEvent( // From Here 2007.09.09 Moca 互換BMPによる画面バッファ case WM_SHOWWINDOW: - // ウィンドウ非表示の再に互換BMPを廃棄してメモリーを節約する + // ウィンドウ非表示の再に互換BMPを廃棄してメモリを節約する if( hwnd == GetHwnd() && (BOOL)wParam == FALSE ){ DeleteCompatibleBitmap(); } diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 8939ca2e2c..f2245291f2 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -2052,7 +2052,7 @@ STDMETHODIMP CEditView::Drop( LPDATAOBJECT pDataObject, DWORD dwKeyState, POINTL SetUndoBuffer(); ::GlobalUnlock( hData ); - // 2004.07.12 fotomo/もか メモリーリークの修正 + // 2004.07.12 fotomo/もか メモリリークの修正 if( 0 == (GMEM_LOCKCOUNT & ::GlobalFlags(hData)) ){ ::GlobalFree( hData ); } From 33c657c9c9d3a69423185bc6766e5971a8cd6544 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Tue, 3 May 2022 14:46:14 +0900 Subject: [PATCH 112/129] =?UTF-8?q?=E3=80=8C=E3=83=9E=E3=82=A6=E3=82=B9?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=97=E3=83=81=E3=83=A3=E3=83=BC=E3=80=8D?= =?UTF-8?q?=E3=81=AE=E9=95=B7=E9=9F=B3=E8=A8=98=E5=8F=B7=E3=82=92=E5=89=8A?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit コメントやドキュメントでcaptureを「キャプチャー」と書いているのを修正します。 --- sakura_core/view/CEditView_Mouse.cpp | 8 ++++---- sakura_core/window/CEditWnd.cpp | 2 +- sakura_core/window/CMainToolBar.cpp | 2 +- sakura_core/window/CTabWnd.cpp | 16 ++++++++-------- sakura_core/window/CTabWnd.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 8939ca2e2c..377fc6589c 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -212,7 +212,7 @@ normal_action:; } GetSelectionInfo().m_ptMouseRollPosOld = ptMouse; // マウス範囲選択前回位置(XY座標) - /* 範囲選択開始 & マウスキャプチャー */ + /* 範囲選択開始 & マウスキャプチャ */ GetSelectionInfo().SelectBeginBox(); ::SetCapture( GetHwnd() ); @@ -248,7 +248,7 @@ normal_action:; /* マウスのキャプチャなど */ GetSelectionInfo().m_ptMouseRollPosOld = ptMouse; // マウス範囲選択前回位置(XY座標) - /* 範囲選択開始 & マウスキャプチャー */ + /* 範囲選択開始 & マウスキャプチャ */ GetSelectionInfo().SelectBeginNazo(); ::SetCapture( GetHwnd() ); GetCaret().HideCaret_( GetHwnd() ); // 2002/07/22 novice @@ -1513,7 +1513,7 @@ void CEditView::OnLBUTTONUP( WPARAM fwKeys, int xPos , int yPos ) { // MYTRACE( L"OnLBUTTONUP()\n" ); - /* 範囲選択終了 & マウスキャプチャーおわり */ + /* 範囲選択終了 & マウスキャプチャおわり */ if( GetSelectionInfo().IsMouseSelecting() ){ /* 範囲選択中 */ /* マウス キャプチャを解放 */ ::ReleaseCapture(); @@ -1671,7 +1671,7 @@ void CEditView::OnLBUTTONDBLCLK( WPARAM fwKeys, int _xPos , int _yPos ) */ if(F_SELECTWORD != nFuncID) return; - /* 範囲選択開始 & マウスキャプチャー */ + /* 範囲選択開始 & マウスキャプチャ */ GetSelectionInfo().SelectBeginWord(); if( GetDllShareData().m_Common.m_sView.m_bFontIs_FIXED_PITCH ){ /* 現在のフォントは固定幅フォントである */ diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index 728581afaa..b3912fef0a 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -3376,7 +3376,7 @@ LRESULT CEditWnd::OnHScroll( WPARAM wParam, LPARAM lParam ) LRESULT CEditWnd::OnLButtonDown( WPARAM wParam, LPARAM lParam ) { - //by 鬼(2) キャプチャーして押されたら非クライアントでもこっちに来る + //by 鬼(2) キャプチャして押されたら非クライアントでもこっちに来る if(m_IconClicked != icNone) return 0; diff --git a/sakura_core/window/CMainToolBar.cpp b/sakura_core/window/CMainToolBar.cpp index 1a232d94c7..354209a576 100644 --- a/sakura_core/window/CMainToolBar.cpp +++ b/sakura_core/window/CMainToolBar.cpp @@ -106,7 +106,7 @@ static LRESULT CALLBACK ToolBarWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPAR switch( msg ) { // WinXP Visual Style のときにツールバー上でのマウス左右ボタン同時押しで無応答になる - //（マウスをキャプチャーしたまま放さない） 問題を回避するために右ボタンを無視する + //（マウスをキャプチャしたまま放さない） 問題を回避するために右ボタンを無視する case WM_RBUTTONDOWN: case WM_RBUTTONUP: return 0L; // 右ボタンの UP/DOWN は本来のウィンドウプロシージャに渡さない diff --git a/sakura_core/window/CTabWnd.cpp b/sakura_core/window/CTabWnd.cpp index 084a198969..64a7db2501 100644 --- a/sakura_core/window/CTabWnd.cpp +++ b/sakura_core/window/CTabWnd.cpp @@ -200,7 +200,7 @@ LRESULT CTabWnd::OnTabLButtonDown( WPARAM wParam, LPARAM lParam ) TabCtrl_GetItemRect(m_hwndTab, nSrcTab, &rcItem); GetTabCloseBtnRect(&rcItem, &rcClose, nSrcTab == TabCtrl_GetCurSel(m_hwndTab)); if( ::PtInRect(&rcClose, hitinfo.pt) ){ - // 閉じるボタン上ならキャプチャー開始 + // 閉じるボタン上ならキャプチャ開始 m_nTabCloseCapture = nSrcTab; ::SetCapture( m_hwndTab ); return 0L; @@ -238,7 +238,7 @@ LRESULT CTabWnd::OnTabLButtonUp( WPARAM wParam, LPARAM lParam ) if( ::PtInRect(&rcClose, hitinfo.pt) ){ ExecTabCommand( F_WINCLOSE, MAKEPOINTS(lParam) ); } - // キャプチャー解除 + // キャプチャ解除 BreakDrag(); return 0L; } @@ -1110,7 +1110,7 @@ LRESULT CTabWnd::OnCaptureChanged( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l /*! WM_LBUTTONDOWN処理 @date 2006.02.01 ryoji 新規作成 @date 2006.11.30 ryoji タブ一覧ボタンクリック関数を廃止して処理取り込み - 閉じるボタン上ならキャプチャー開始 + 閉じるボタン上ならキャプチャ開始 */ LRESULT CTabWnd::OnLButtonDown( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -1133,11 +1133,11 @@ LRESULT CTabWnd::OnLButtonDown( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar } else { - // 閉じるボタン上ならキャプチャー開始 + // 閉じるボタン上ならキャプチャ開始 GetCloseBtnRect( &rc, &rcBtn ); if( ::PtInRect( &rcBtn, pt ) ) { - m_eCaptureSrc = CAPT_CLOSE; // キャプチャー元は閉じるボタン + m_eCaptureSrc = CAPT_CLOSE; // キャプチャ元は閉じるボタン ::SetCapture( GetHwnd() ); } } @@ -1158,9 +1158,9 @@ LRESULT CTabWnd::OnLButtonUp( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam pt.y = HIWORD(lParam); ::GetClientRect( GetHwnd(), &rc ); - if( ::GetCapture() == GetHwnd() ) // 自ウィンドウがマウスキャプチャーしている? + if( ::GetCapture() == GetHwnd() ) // 自ウィンドウがマウスキャプチャしている? { - if( m_eCaptureSrc == CAPT_CLOSE ) // キャプチャー元は閉じるボタン? + if( m_eCaptureSrc == CAPT_CLOSE ) // キャプチャ元は閉じるボタン? { // 閉じるボタン上ならタブを閉じる GetCloseBtnRect( &rc, &rcBtn ); @@ -1186,7 +1186,7 @@ LRESULT CTabWnd::OnLButtonUp( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam } } - // キャプチャー解除 + // キャプチャ解除 m_eCaptureSrc = CAPT_NONE; ::ReleaseCapture(); } diff --git a/sakura_core/window/CTabWnd.h b/sakura_core/window/CTabWnd.h index b9101ff62c..27b30d9228 100644 --- a/sakura_core/window/CTabWnd.h +++ b/sakura_core/window/CTabWnd.h @@ -192,7 +192,7 @@ class CTabWnd final : public CWnd BOOL m_bHovering; BOOL m_bListBtnHilighted; BOOL m_bCloseBtnHilighted; //!< 閉じるボタンハイライト状態 // 2006.10.21 ryoji - CaptureSrc m_eCaptureSrc; //!< キャプチャー元 + CaptureSrc m_eCaptureSrc; //!< キャプチャ元 BOOL m_bTabSwapped; //!< ドラッグ中にタブの入れ替えがあったかどうか LONG* m_nTabBorderArray; //!< ドラッグ前のタブ境界位置配列 LOGFONT m_lf; //!< 表示フォントの特性情報 From 29181a57dec5c247bdb978468bc3a2026cc971d9 Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Tue, 3 May 2022 14:52:30 +0900 Subject: [PATCH 113/129] =?UTF-8?q?=E3=80=8C=E3=82=A4=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=83=97=E3=83=AA=E3=82=BF=E3=80=8D=E3=81=AE=E3=82=AB?= =?UTF-8?q?=E3=82=BF=E3=82=AB=E3=83=8A=E8=A1=A8=E8=A8=98=E3=82=92=E7=B5=B1?= =?UTF-8?q?=E4=B8=80=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit interpreterに対するカタカナ表記を統一します。 --- sakura_core/macro/CPPA.h | 4 ++-- tools/find-tools.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sakura_core/macro/CPPA.h b/sakura_core/macro/CPPA.h index 7183937902..12e3761342 100644 --- a/sakura_core/macro/CPPA.h +++ b/sakura_core/macro/CPPA.h @@ -33,7 +33,7 @@ distribution. */ /* -PPA(Poor-Pascal for Application)はDelphi/C++Builder用のPascalインタプリタコンポーネントです。 +PPA(Poor-Pascal for Application)はDelphi/C++Builder用のPascalインタープリタコンポーネントです。 */ #ifndef SAKURA_CPPA_FB41BBAE_DFBC_449D_9342_5D9424CFE086_H_ @@ -50,7 +50,7 @@ PPA(Poor-Pascal for Application)はDelphi/C++Builder用のPascalインタプリ /* PPA(Poor-Pascal for Application)はDelphi/C++Builder用の -Pascalインタプリタコンポーネントです。 +Pascalインタープリタコンポーネントです。 アプリケーションにマクロ機能を搭載する事を目的に作成されています。 */ diff --git a/tools/find-tools.md b/tools/find-tools.md index 4caae98260..88c3d23e6f 100644 --- a/tools/find-tools.md +++ b/tools/find-tools.md @@ -73,10 +73,10 @@ MSBuild以外の探索手順は同一であり、7-Zipを例に説明する。 ## python -ビルドバッチで利用する Python インタープリターの存在確認をします。 -適切な Python インタープリターが見つかると、環境変数 `CMD_PYTHON` が定義されます。 -適切な Python インタープリターが見つからない場合、 `CMD_PYTHON` は定義されません。 -Python インタープリターはビルド要件ではないので、 Python を利用するバッチには `CMD_PYTHON` チェックを挟む必要があります。 +ビルドバッチで利用する Python インタープリタの存在確認をします。 +適切な Python インタープリタが見つかると、環境変数 `CMD_PYTHON` が定義されます。 +適切な Python インタープリタが見つからない場合、 `CMD_PYTHON` は定義されません。 +Python インタープリタはビルド要件ではないので、 Python を利用するバッチには `CMD_PYTHON` チェックを挟む必要があります。 1. Python Launcher (py.exe) が存在し、 `py.exe --version` でバージョンが取れたら、それを使う。 1. パスが通っているpython.exeで`python.exe --version`してバージョンが取れたら、それを使う。 From 41575bf5a4d2c2c29dc4cde9304e65f7f7a9865b Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Tue, 3 May 2022 14:56:46 +0900 Subject: [PATCH 114/129] =?UTF-8?q?=E3=80=8C=E3=82=A4=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E3=80=8D=E3=81=AE?= =?UTF-8?q?=E3=82=AB=E3=82=BF=E3=82=AB=E3=83=8A=E8=A1=A8=E8=A8=98=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit interfaceに対するカタカナ表記を統一します。 --- help/macro/source/usage/popup.html | 2 +- help/plugin/Text/implementation02.html | 6 +++--- help/plugin/Text/implementation03.html | 2 +- help/plugin/Text/index.html | 2 +- help/plugin/Text/overview.html | 2 +- help/plugin/Text/renovation.html | 6 +++--- installer/sinst_src/keyword/ActionScript.kwd | 2 +- sakura_core/CHokanMgr.cpp | 2 +- sakura_core/cmd/CViewCommander.cpp | 2 +- sakura_core/cmd/CViewCommander_Edit.cpp | 2 +- sakura_core/cmd/CViewCommander_Outline.cpp | 2 +- sakura_core/dlg/CDlgExec.cpp | 2 +- sakura_core/dlg/CDlgFind.cpp | 2 +- sakura_core/dlg/CDlgGrep.cpp | 2 +- sakura_core/dlg/CDlgGrepReplace.cpp | 2 +- sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp | 2 +- sakura_core/dlg/CDlgPrintSetting.cpp | 2 +- sakura_core/dlg/CDlgReplace.cpp | 2 +- sakura_core/dlg/CDlgSetCharSet.cpp | 2 +- sakura_core/extmodule/CBregexpDll2.h | 2 +- sakura_core/extmodule/CIcu4cI18n.h | 2 +- sakura_core/extmodule/CUchardet.h | 2 +- sakura_core/macro/CIfObj.cpp | 4 ++-- sakura_core/macro/CIfObj.h | 6 +++--- sakura_core/macro/CWSH.cpp | 8 ++++---- sakura_core/macro/CWSH.h | 6 +++--- sakura_core/macro/CWSHIfObj.cpp | 2 +- sakura_core/macro/CWSHIfObj.h | 2 +- sakura_core/macro/CWSHManager.cpp | 8 ++++---- sakura_core/macro/CWSHManager.h | 6 +++--- sakura_core/outline/CFuncInfoArr.h | 2 +- sakura_core/typeprop/CDlgTypeAscertain.h | 2 +- 32 files changed, 49 insertions(+), 49 deletions(-) diff --git a/help/macro/source/usage/popup.html b/help/macro/source/usage/popup.html index f9525225b1..d941e02233 100644 --- a/help/macro/source/usage/popup.html +++ b/help/macro/source/usage/popup.html @@ -46,7 +46,7 @@

      Popupメソッド

      解説
      - Popup メソッドを呼び出すと、実行中のホスト実行可能ファイルの種類 (WScript.exe または CScript.exe) に関係なく、メッセージ ボックスが表示されます。nSecondsToWait にゼロ (既定値) を指定した場合、ポップアップ メッセージ ボックスはユーザーがウィンドウを閉じるまでずっと表示されます。natSecondsToWait に正の値を指定した場合、指定した秒数が経過すると、メッセージ ボックスのウィンドウが閉じます。strTitle を省略すると、ウィンドウ タイトルは "Windows Script Host" となります。natType の意味は、Microsoft Win32R アプリケーション プログラミング インターフェイスの MessageBox 関数で指定するものと同じです。次の表は、natType の値とその意味です。表の値は組み合わせて使用できます。 + Popup メソッドを呼び出すと、実行中のホスト実行可能ファイルの種類 (WScript.exe または CScript.exe) に関係なく、メッセージ ボックスが表示されます。nSecondsToWait にゼロ (既定値) を指定した場合、ポップアップ メッセージ ボックスはユーザーがウィンドウを閉じるまでずっと表示されます。natSecondsToWait に正の値を指定した場合、指定した秒数が経過すると、メッセージ ボックスのウィンドウが閉じます。strTitle を省略すると、ウィンドウ タイトルは "Windows Script Host" となります。natType の意味は、Microsoft Win32R アプリケーション プログラミング インターフェースの MessageBox 関数で指定するものと同じです。次の表は、natType の値とその意味です。表の値は組み合わせて使用できます。
      戻り値
      diff --git a/help/plugin/Text/implementation02.html b/help/plugin/Text/implementation02.html index c64f7bfae3..9e668f46f4 100644 --- a/help/plugin/Text/implementation02.html +++ b/help/plugin/Text/implementation02.html @@ -4,8 +4,8 @@ -インタフェースオブジェクト - +インターフェースオブジェクト + @@ -18,7 +18,7 @@ -

      インタフェースオブジェクト

      +

      インターフェースオブジェクト

      JScriptやVBScript等から参照してエディタの情報取得・操作を行うオブジェクト。
      diff --git a/help/plugin/Text/implementation03.html b/help/plugin/Text/implementation03.html index f02cacf6eb..2d7cfd9547 100644 --- a/help/plugin/Text/implementation03.html +++ b/help/plugin/Text/implementation03.html @@ -54,7 +54,7 @@

      アウトライン解析(ジャック名：Outline)

      5: 列挙体 6: 共用体 7: 名前空間… 前述 -8: インタフェース +8: インターフェース 9: グローバル… トップレベルに 3 や 7 以外が来ると生成 ・タイプ 8:VB関数一覧 の場合　 1: 宣言 diff --git a/help/plugin/Text/index.html b/help/plugin/Text/index.html index 46987fc6e6..fb554bbf0f 100644 --- a/help/plugin/Text/index.html +++ b/help/plugin/Text/index.html @@ -44,7 +44,7 @@

      プラグイン仕様

      ●プラグイン定義ファイル(plugin.def)
      ●ReadMeファイル
      ●ZIPプラグイン
      - ●インタフェースオブジェクト
      + ●インターフェースオブジェクト
      ・Editor
      ・Plugin
      diff --git a/help/plugin/Text/overview.html b/help/plugin/Text/overview.html index 0b25d71ba1..82f656523d 100644 --- a/help/plugin/Text/overview.html +++ b/help/plugin/Text/overview.html @@ -122,7 +122,7 @@

      ジャック一覧

      - + diff --git a/help/plugin/Text/renovation.html b/help/plugin/Text/renovation.html index d1ce9cc33e..f6b4acecfd 100644 --- a/help/plugin/Text/renovation.html +++ b/help/plugin/Text/renovation.html @@ -17,15 +17,15 @@

      エディタでの実装

      マクロ関連クラスの改造

      -WSHマクロで使用できるインタフェースオブジェクトを、Editorだけではなく複数扱えるように修正した。
      +WSHマクロで使用できるインターフェースオブジェクトを、Editorだけではなく複数扱えるように修正した。
       CWSHManager                   WSHマクロ実行の入り口。
                               .ExecKeyMacro関数の中でCWSHClientを作成する。
 CWSHClient                    WSH呼び出しの入り口。
-CIfObj                        純粋なインタフェースオブジェクト
-  - CWSHIfObj                   WSHマクロに特化したインタフェースオブジェクト
+CIfObj                        純粋なインターフェースオブジェクト
+  - CWSHIfObj                   WSHマクロに特化したインターフェースオブジェクト
       - CEditorIfObj              今までのEditorオブジェクト
       - plugin/CPluginIfObj       プラグイン共通機能を提供するPluginオブジェクト
       - plugin/COutlineIfObj      アウトライン解析機能を提供するOutlineオブジェクト
diff --git a/installer/sinst_src/keyword/ActionScript.kwd b/installer/sinst_src/keyword/ActionScript.kwd
index bfbdf6c90a..bc8e49b116 100644
--- a/installer/sinst_src/keyword/ActionScript.kwd
+++ b/installer/sinst_src/keyword/ActionScript.kwd
@@ -90,7 +90,7 @@ void
 while
 with
 
-// ビルトインクラス名、コンポーネントクラス名、インターフェイス名
+// ビルトインクラス名、コンポーネントクラス名、インターフェース名
 Accessibility
 Accordion
 Alert
diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp
index ad16aabc90..cdef97152f 100644
--- a/sakura_core/CHokanMgr.cpp
+++ b/sakura_core/CHokanMgr.cpp
@@ -177,7 +177,7 @@ int CHokanMgr::Search(
 		}
 
 		for( auto it = plugs.begin(); it != plugs.end(); ++it ){
-			//インタフェースオブジェクト準備
+			//インターフェースオブジェクト準備
 			CWSHIfObj::List params;
 			std::wstring curWord = pszCurWord;
 			CComplementIfObj* objComp = new CComplementIfObj( curWord , this, nOption );
diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp
index 168a6493cf..faa191b1fb 100644
--- a/sakura_core/cmd/CViewCommander.cpp
+++ b/sakura_core/cmd/CViewCommander.cpp
@@ -647,7 +647,7 @@ BOOL CViewCommander::HandleCommand(
 
 			if( plugs.size() > 0 ){
 				assert_warning( 1 == plugs.size() );
-				//インタフェースオブジェクト準備
+				//インターフェースオブジェクト準備
 				CWSHIfObj::List params;
 				//プラグイン呼び出し
 				( *plugs.begin() )->Invoke( m_pCommanderView, params );
diff --git a/sakura_core/cmd/CViewCommander_Edit.cpp b/sakura_core/cmd/CViewCommander_Edit.cpp
index 20a9c70cfb..16b029d3f1 100644
--- a/sakura_core/cmd/CViewCommander_Edit.cpp
+++ b/sakura_core/cmd/CViewCommander_Edit.cpp
@@ -176,7 +176,7 @@ end_of_for:;
 
 			if( plugs.size() > 0 ){
 				assert_warning( 1 == plugs.size() );
-				//インタフェースオブジェクト準備
+				//インターフェースオブジェクト準備
 				CWSHIfObj::List params;
 				CSmartIndentIfObj* objIndent = new CSmartIndentIfObj( wcChar );	//スマートインデントオブジェクト
 				objIndent->AddRef();
diff --git a/sakura_core/cmd/CViewCommander_Outline.cpp b/sakura_core/cmd/CViewCommander_Outline.cpp
index feb44fb99e..09612e9356 100644
--- a/sakura_core/cmd/CViewCommander_Outline.cpp
+++ b/sakura_core/cmd/CViewCommander_Outline.cpp
@@ -140,7 +140,7 @@ BOOL CViewCommander::Command_FUNCLIST(
 
 			if( plugs.size() > 0 ){
 				assert_warning( 1 == plugs.size() );
-				//インタフェースオブジェクト準備
+				//インターフェースオブジェクト準備
 				CWSHIfObj::List params;
 				COutlineIfObj* objOutline = new COutlineIfObj( cFuncInfoArr );
 				objOutline->AddRef();
diff --git a/sakura_core/dlg/CDlgExec.cpp b/sakura_core/dlg/CDlgExec.cpp
index 678c1f7dc1..9192d7ba9f 100644
--- a/sakura_core/dlg/CDlgExec.cpp
+++ b/sakura_core/dlg/CDlgExec.cpp
@@ -103,7 +103,7 @@ void CDlgExec::SetData( void )
 	/* ユーザーがコンボ ボックスのエディット コントロールに入力できるテキストの長さを制限する */
 	Combo_LimitText( GetItemHwnd( IDC_COMBO_m_szCommand ), _countof( m_szCommand ) - 1 );
 	Combo_LimitText( GetItemHwnd( IDC_COMBO_CUR_DIR ), _countof2( m_szCurDir ) - 1 );
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_m_szCommand ), TRUE );
 
 	{	//	From Here 2007.01.02 maru 引数を拡張のため
diff --git a/sakura_core/dlg/CDlgFind.cpp b/sakura_core/dlg/CDlgFind.cpp
index 95728cedb6..5b1537a239 100644
--- a/sakura_core/dlg/CDlgFind.cpp
+++ b/sakura_core/dlg/CDlgFind.cpp
@@ -124,7 +124,7 @@ void CDlgFind::SetData( void )
 	/* ユーザーがコンボ ボックスのエディット コントロールに入力できるテキストの長さを制限する */
 	// 2011.12.18 長さ制限撤廃
 	// Combo_LimitText( GetItemHwnd( IDC_COMBO_TEXT ), _MAX_PATH - 1 );
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_TEXT ), TRUE );
 
 	/*****************************
diff --git a/sakura_core/dlg/CDlgGrep.cpp b/sakura_core/dlg/CDlgGrep.cpp
index 68bf0bc016..478e5bc617 100644
--- a/sakura_core/dlg/CDlgGrep.cpp
+++ b/sakura_core/dlg/CDlgGrep.cpp
@@ -309,7 +309,7 @@ BOOL CDlgGrep::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 	Combo_LimitText( GetItemHwnd( IDC_COMBO_EXCLUDE_FILE ), _countof2(m_szExcludeFile) - 1);
 	Combo_LimitText( GetItemHwnd( IDC_COMBO_EXCLUDE_FOLDER ), _countof2(m_szExcludeFolder) - 1);
 
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_TEXT ), TRUE );
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_FILE ), TRUE );
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_FOLDER ), TRUE );
diff --git a/sakura_core/dlg/CDlgGrepReplace.cpp b/sakura_core/dlg/CDlgGrepReplace.cpp
index 9694add5cb..d27b3dfe95 100644
--- a/sakura_core/dlg/CDlgGrepReplace.cpp
+++ b/sakura_core/dlg/CDlgGrepReplace.cpp
@@ -131,7 +131,7 @@ BOOL CDlgGrepReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 {
 	_SetHwnd( hwndDlg );
 
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_TEXT2 ), TRUE );
 
 	SetComboBoxDeleter(GetItemHwnd(IDC_COMBO_TEXT2), &m_cRecentReplace);
diff --git a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
index fa4ded52c7..706d5566fb 100644
--- a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
+++ b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
@@ -282,7 +282,7 @@ UINT_PTR CALLBACK OFNHookProc(
 			// 2005.11.02 ryoji 初期レイアウト設定
 			CDlgOpenFile_CommonFileDialog::InitLayout( pData->m_hwndOpenDlg, hdlg, pData->m_hwndComboCODES );
 
-			/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+			/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 			Combo_SetExtendedUI( pData->m_hwndComboCODES, TRUE );
 			Combo_SetExtendedUI( pData->m_hwndComboMRU, TRUE );
 			Combo_SetExtendedUI( pData->m_hwndComboOPENFOLDER, TRUE );
diff --git a/sakura_core/dlg/CDlgPrintSetting.cpp b/sakura_core/dlg/CDlgPrintSetting.cpp
index 20eb77aa65..05b896a3b2 100644
--- a/sakura_core/dlg/CDlgPrintSetting.cpp
+++ b/sakura_core/dlg/CDlgPrintSetting.cpp
@@ -149,7 +149,7 @@ BOOL CDlgPrintSetting::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam
 {
 	_SetHwnd( hwndDlg );
 
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_SETTINGNAME ), TRUE );
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_FONT_HAN ), TRUE );
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_FONT_ZEN ), TRUE );
diff --git a/sakura_core/dlg/CDlgReplace.cpp b/sakura_core/dlg/CDlgReplace.cpp
index 09700e0458..1b6040c7c4 100644
--- a/sakura_core/dlg/CDlgReplace.cpp
+++ b/sakura_core/dlg/CDlgReplace.cpp
@@ -331,7 +331,7 @@ BOOL CDlgReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 	//	Combo_LimitText( GetItemHwnd( IDC_COMBO_TEXT ), _MAX_PATH - 1 );
 	//	Combo_LimitText( GetItemHwnd( IDC_COMBO_TEXT2 ), _MAX_PATH - 1 );
 
-	/* コンボボックスのユーザー インターフェイスを拡張インターフェースにする */
+	/* コンボボックスのユーザー インターフェースを拡張インターフェースにする */
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_TEXT ), TRUE );
 	Combo_SetExtendedUI( GetItemHwnd( IDC_COMBO_TEXT2 ), TRUE );
 
diff --git a/sakura_core/dlg/CDlgSetCharSet.cpp b/sakura_core/dlg/CDlgSetCharSet.cpp
index fd04ccdce1..da4a916421 100644
--- a/sakura_core/dlg/CDlgSetCharSet.cpp
+++ b/sakura_core/dlg/CDlgSetCharSet.cpp
@@ -54,7 +54,7 @@ BOOL CDlgSetCharSet::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
 	m_hwndCharSet = GetItemHwnd( IDC_COMBO_CHARSET );	// 文字コードセットコンボボックス
 	m_hwndCheckBOM = GetItemHwnd( IDC_CHECK_BOM );		// BOMチェックボックス
 
-	// コンボボックスのユーザー インターフェイスを拡張インターフェースにする
+	// コンボボックスのユーザー インターフェースを拡張インターフェースにする
 	Combo_SetExtendedUI( m_hwndCharSet, TRUE );
 
 	// 文字コードセット選択コンボボックス初期化
diff --git a/sakura_core/extmodule/CBregexpDll2.h b/sakura_core/extmodule/CBregexpDll2.h
index 4058bfe45d..79a2cc4427 100644
--- a/sakura_core/extmodule/CBregexpDll2.h
+++ b/sakura_core/extmodule/CBregexpDll2.h
@@ -51,7 +51,7 @@ class CBregexpDll2 : public CDllImp{
 	virtual ~CBregexpDll2();
 
 protected:
-	// CDllImpインタフェース
+	// CDllImpインターフェース
 	virtual LPCWSTR GetDllNameImp(int nIndex); // Jul. 5, 2001 genta インターフェース変更に伴う引数追加
 	virtual bool InitDllImp();
 
diff --git a/sakura_core/extmodule/CIcu4cI18n.h b/sakura_core/extmodule/CIcu4cI18n.h
index 7787221f76..1d31b7bc61 100644
--- a/sakura_core/extmodule/CIcu4cI18n.h
+++ b/sakura_core/extmodule/CIcu4cI18n.h
@@ -59,7 +59,7 @@ class CIcu4cI18n : public CDllImp
 	CIcu4cI18n() noexcept;
 
 protected:
-	// CDllImpインタフェース
+	// CDllImpインターフェース
 	LPCWSTR GetDllNameImp(int nIndex) override;
 	bool InitDllImp() override;
 
diff --git a/sakura_core/extmodule/CUchardet.h b/sakura_core/extmodule/CUchardet.h
index e5e2f6a655..016b696bbd 100644
--- a/sakura_core/extmodule/CUchardet.h
+++ b/sakura_core/extmodule/CUchardet.h
@@ -43,7 +43,7 @@ class CUchardet : public CDllImp
 	const char * (*_uchardet_get_charset)(uchardet_t ud) = nullptr;
 
 protected:
-	// CDllImpインタフェース
+	// CDllImpインターフェース
 	LPCWSTR GetDllNameImp(int nIndex) override;
 	bool InitDllImp() override;
 
diff --git a/sakura_core/macro/CIfObj.cpp b/sakura_core/macro/CIfObj.cpp
index cdace73d92..5255fdbea0 100644
--- a/sakura_core/macro/CIfObj.cpp
+++ b/sakura_core/macro/CIfObj.cpp
@@ -1,5 +1,5 @@
 /*!	@file
-	@brief WSHインタフェースオブジェクト基本クラス
+	@brief WSHインターフェースオブジェクト基本クラス
 
 	@date 2009.10.29 syat CWSH.cppから切り出し
 
@@ -257,7 +257,7 @@ HRESULT STDMETHODCALLTYPE CIfObjTypeInfo::GetNames(
 }
 
 /////////////////////////////////////////////
-//インタフェースオブジェクト
+//インターフェースオブジェクト
 
 //コンストラクタ
 CIfObj::CIfObj(const wchar_t* name, bool isGlobal)
diff --git a/sakura_core/macro/CIfObj.h b/sakura_core/macro/CIfObj.h
index a9cfdcd9a6..1a11cc1d31 100644
--- a/sakura_core/macro/CIfObj.h
+++ b/sakura_core/macro/CIfObj.h
@@ -1,5 +1,5 @@
 /*!	@file
-	@brief WSHインタフェースオブジェクト基本クラス
+	@brief WSHインターフェースオブジェクト基本クラス
 
 	@date 2009.10.29 syat CWSH.hから切り出し
 
@@ -67,7 +67,7 @@ class ImplementsIUnknown: public Base
 class CIfObj;
 typedef HRESULT (CIfObj::*CIfObjMethod)(int ID, DISPPARAMS *Arguments, VARIANT* Result, void *Data);
 
-//CIfObjが必要とするWSHClientのインタフェース
+//CIfObjが必要とするWSHClientのインターフェース
 class IWSHClient
 {
 public:
@@ -96,7 +96,7 @@ class CIfObj
 	virtual ~CIfObj();
 
 	// フィールド・アクセサ
-	const std::wstring::value_type* Name() const { return this->m_sName.c_str(); } // インタフェースオブジェクト名
+	const std::wstring::value_type* Name() const { return this->m_sName.c_str(); } // インターフェースオブジェクト名
 	bool IsGlobal() const { return this->m_isGlobal; } //オブジェクト名の省略可否
 	IWSHClient* Owner() const { return this->m_Owner; } // オーナーIWSHClient
 	std::wstring m_sName;
diff --git a/sakura_core/macro/CWSH.cpp b/sakura_core/macro/CWSH.cpp
index 2e1c76c804..5ccd809bcd 100644
--- a/sakura_core/macro/CWSH.cpp
+++ b/sakura_core/macro/CWSH.cpp
@@ -60,7 +60,7 @@ const GUID CLSID_JSScript9 =
 };
 #endif
 
-/* 2009.10.29 syat インタフェースオブジェクト部分をCWSHIfObj.hに分離
+/* 2009.10.29 syat インターフェースオブジェクト部分をCWSHIfObj.hに分離
 class CInterfaceObjectTypeInfo: public ImplementsIUnknown
  */
 
@@ -126,7 +126,7 @@ class CWSHSite: public IActiveScriptSite, public IActiveScriptSiteWindow
 #ifdef TEST
 		wcout << L"GetItemInfo:" << pstrName << endl;
 #endif
-		//指定された名前のインタフェースオブジェクトを検索
+		//指定された名前のインターフェースオブジェクトを検索
 		const CWSHClient::List& objects = m_Client->GetInterfaceObjects();
 		for( CWSHClient::ListIter it = objects.begin(); it != objects.end(); it++ )
 		{
@@ -276,7 +276,7 @@ CWSHClient::CWSHClient(const wchar_t *AEngine, ScriptErrorHandler AErrorHandler,
 
 CWSHClient::~CWSHClient()
 {
-	//インタフェースオブジェクトを解放
+	//インターフェースオブジェクトを解放
 	for( ListIter it = m_IfObjArr.begin(); it != m_IfObjArr.end(); it++ ){
 		(*it)->Release();
 	}
@@ -441,7 +441,7 @@ void CWSHClient::Error(const wchar_t* Description)
 	SysFreeString(D);
 }
 
-//インタフェースオブジェクトの追加
+//インターフェースオブジェクトの追加
 void CWSHClient::AddInterfaceObject( CIfObj* obj )
 {
 	if( !obj ) return;
diff --git a/sakura_core/macro/CWSH.h b/sakura_core/macro/CWSH.h
index a064642ead..1cd7bea5ce 100644
--- a/sakura_core/macro/CWSH.h
+++ b/sakura_core/macro/CWSH.h
@@ -5,7 +5,7 @@
 	@date 2002年4月28日,5月3日,5月5日,5月6日,5月13日,5月16日
 	@date 2002.08.25 genta リンクエラー回避のためCWSHManager.hにエディタの
 		マクロインターフェース部を分離．
-	@date 2009.10.29 syat インタフェースオブジェクト部分をCWSHIfObj.hに分離
+	@date 2009.10.29 syat インターフェースオブジェクト部分をCWSHIfObj.hに分離
 */
 /*
 	Copyright (C) 2002, 鬼, genta
@@ -25,7 +25,7 @@
 //↑Microsoft Platform SDK より
 #include "macro/CIfObj.h"
 
-/* 2009.10.29 syat インタフェースオブジェクト部分をCWSHIfObj.hに分離
+/* 2009.10.29 syat インターフェースオブジェクト部分をCWSHIfObj.hに分離
 template
 class ImplementsIUnknown: public Base
 
@@ -39,7 +39,7 @@ class CWSHClient final : IWSHClient
 
 public:
 	// 型定義
-	typedef std::vector List;      // 所有しているインタフェースオブジェクトのリスト
+	typedef std::vector List;      // 所有しているインターフェースオブジェクトのリスト
 	typedef List::const_iterator ListIter;	// そのイテレータ
 
 	// コンストラクタ・デストラクタ
diff --git a/sakura_core/macro/CWSHIfObj.cpp b/sakura_core/macro/CWSHIfObj.cpp
index da1cd602a2..3f62684f0a 100644
--- a/sakura_core/macro/CWSHIfObj.cpp
+++ b/sakura_core/macro/CWSHIfObj.cpp
@@ -1,5 +1,5 @@
 /*!	@file
-	@brief WSHインタフェースオブジェクト基本クラス
+	@brief WSHインターフェースオブジェクト基本クラス
 
 	@date 2009.10.29 syat CWSH.cppから切り出し
 */
diff --git a/sakura_core/macro/CWSHIfObj.h b/sakura_core/macro/CWSHIfObj.h
index a830747897..09c5fc0565 100644
--- a/sakura_core/macro/CWSHIfObj.h
+++ b/sakura_core/macro/CWSHIfObj.h
@@ -1,5 +1,5 @@
 /*!	@file
-	@brief WSHインタフェースオブジェクト基本クラス
+	@brief WSHインターフェースオブジェクト基本クラス
 
 	@date 2009.10.29 syat CWSH.hから切り出し
 
diff --git a/sakura_core/macro/CWSHManager.cpp b/sakura_core/macro/CWSHManager.cpp
index 04ad09baf8..ee811dd6e5 100644
--- a/sakura_core/macro/CWSHManager.cpp
+++ b/sakura_core/macro/CWSHManager.cpp
@@ -68,7 +68,7 @@ bool CWSHMacroManager::ExecKeyMacro(CEditView *EditView, int flags) const
 	bool bRet = false;
 	if(Engine->m_Valid)
 	{
-		//インタフェースオブジェクトの登録
+		//インターフェースオブジェクトの登録
 		CWSHIfObj* objEditor = new CEditorIfObj();
 		objEditor->ReadyMethods( EditView, flags );
 		Engine->AddInterfaceObject( objEditor );
@@ -141,19 +141,19 @@ void CWSHMacroManager::declare()
 	CMacroFactory::getInstance()->RegisterCreator(Creator);
 }
 
-//インタフェースオブジェクトを追加する
+//インターフェースオブジェクトを追加する
 void CWSHMacroManager::AddParam( CWSHIfObj* param )
 {
 	m_Params.push_back( param );
 }
 
-//インタフェースオブジェクト達を追加する
+//インターフェースオブジェクト達を追加する
 void CWSHMacroManager::AddParam( CWSHIfObj::List& params )
 {
 	m_Params.insert( m_Params.end(), params.begin(), params.end() );
 }
 
-//インタフェースオブジェクトを削除する
+//インターフェースオブジェクトを削除する
 void CWSHMacroManager::ClearParam()
 {
 	m_Params.clear();
diff --git a/sakura_core/macro/CWSHManager.h b/sakura_core/macro/CWSHManager.h
index 6c092aa08b..9da6ebc619 100644
--- a/sakura_core/macro/CWSHManager.h
+++ b/sakura_core/macro/CWSHManager.h
@@ -47,9 +47,9 @@ class CWSHMacroManager final : public CMacroManagerBase
 	static CMacroManagerBase* Creator(const WCHAR* FileExt);
 	static void declare();
 
-	void AddParam( CWSHIfObj* param );				//インタフェースオブジェクトを追加する
-	void AddParam( CWSHIfObj::List& params );		//インタフェースオブジェクト達を追加する
-	void ClearParam();								//インタフェースオブジェクトを削除する
+	void AddParam( CWSHIfObj* param );				//インターフェースオブジェクトを追加する
+	void AddParam( CWSHIfObj::List& params );		//インターフェースオブジェクト達を追加する
+	void ClearParam();								//インターフェースオブジェクトを削除する
 protected:
 	std::wstring m_Source;
 	std::wstring m_EngineName;
diff --git a/sakura_core/outline/CFuncInfoArr.h b/sakura_core/outline/CFuncInfoArr.h
index bdc291bbae..86cc2c8e89 100644
--- a/sakura_core/outline/CFuncInfoArr.h
+++ b/sakura_core/outline/CFuncInfoArr.h
@@ -33,7 +33,7 @@ class CFuncInfo;
 #define FL_OBJ_ENUM			5	// 列挙体
 #define FL_OBJ_UNION		6	// 共用体
 #define FL_OBJ_NAMESPACE	7	// 名前空間
-#define FL_OBJ_INTERFACE	8	// インタフェース
+#define FL_OBJ_INTERFACE	8	// インターフェース
 #define FL_OBJ_GLOBAL		9	// グローバル（組み込み解析では使用しない）
 #define FL_OBJ_ELEMENT_MAX	30	// プラグインで追加可能な定数の上限
 
diff --git a/sakura_core/typeprop/CDlgTypeAscertain.h b/sakura_core/typeprop/CDlgTypeAscertain.h
index b3fe4de9a5..48594af924 100644
--- a/sakura_core/typeprop/CDlgTypeAscertain.h
+++ b/sakura_core/typeprop/CDlgTypeAscertain.h
@@ -70,6 +70,6 @@ class CDlgTypeAscertain final : public CDialog
 	LPVOID GetHelpIdTable(void) override;
 
 private:
-	SAscertainInfo* m_psi;			// インターフェイス
+	SAscertainInfo* m_psi;			// インターフェース
 };
 #endif /* SAKURA_CDLGTYPEASCERTAIN_7000A035_D26C_4FB2_AE75_6A63F3F806B9_H_ */

From e79c737c8a6dfadfb27631af890ee102edf36208 Mon Sep 17 00:00:00 2001
From: Mari Sano 
Date: Tue, 3 May 2022 15:25:28 +0900
Subject: [PATCH 115/129] =?UTF-8?q?=E3=80=8C=E3=83=98=E3=83=83=E3=83=80?=
 =?UTF-8?q?=E3=83=BC=E3=80=8D=E3=81=BE=E3=81=9F=E3=81=AF=E3=80=8C=E3=83=95?=
 =?UTF-8?q?=E3=83=83=E3=82=BF=E3=83=BC=E3=80=8D=E3=81=AE=E3=82=AB=E3=82=BF?=
 =?UTF-8?q?=E3=82=AB=E3=83=8A=E8=A1=A8=E8=A8=98=E3=82=92=E7=B5=B1=E4=B8=80?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

コメントやドキュメントに現れる「ヘッダー」または「フッター」のカタカナ表記を統一します。
変更対象に共通設定「ファイル」タブのチェックボックスのテキストを含んでいるため、画面表示にも影響があります。
---
 CHANGELOG.md                                  |  2 +-
 HeaderMake/HeaderMake.cpp                     |  2 +-
 .../source/reference/file/S_OpenHfromtoC.html |  2 +-
 help/macro/source/usage/keymacro.html         |  2 +-
 help/sakura/res/HLP000052.html                |  2 +-
 help/sakura/res/HLP000058.html                |  2 +-
 help/sakura/res/HLP000083.html                |  4 ++--
 help/sakura/res/HLP000107.html                |  4 ++--
 help/sakura/res/HLP000109.html                |  2 +-
 help/sakura/res/HLP000192.html                | 12 +++++-----
 help/sakura/res/HLP000193.html                |  2 +-
 help/sakura/res/HLP000284.html                |  6 ++---
 help/sakura/res/HLP_UR004.html                |  4 ++--
 help/sakura/res/HLP_UR007.html                |  8 +++----
 help/sakura/res/HLP_UR008.html                |  2 +-
 help/sakura/res/HLP_UR009.html                |  2 +-
 help/sakura/res/HLP_UR011.html                |  2 +-
 help/sakura/res/HLP_UR012.html                |  2 +-
 help/sakura/res/HLP_UR014.html                |  2 +-
 help/sakura/res/HLP_UR016.html                |  4 ++--
 installer/sinst_src/keyword/CSS2.khp          |  2 +-
 installer/sinst_src/keyword/S_MACPPA.KHP      |  4 ++--
 installer/sinst_src/keyword/php.khp           | 24 +++++++++----------
 parse-buildlog.py                             |  4 ++--
 sakura_core/CDicMgr.cpp                       |  2 +-
 sakura_core/CGrepAgent.h                      |  2 +-
 sakura_core/Funccode_x.hsrc                   |  4 ++--
 sakura_core/GrepInfo.h                        |  2 +-
 sakura_core/_main/CCommandLine.h              |  2 +-
 sakura_core/_main/CControlProcess.cpp         |  2 +-
 sakura_core/_main/CControlProcess.h           |  2 +-
 sakura_core/_main/CNormalProcess.h            |  2 +-
 sakura_core/_main/CProcess.h                  |  2 +-
 sakura_core/_main/CProcessFactory.h           |  2 +-
 sakura_core/_os/CDropTarget.h                 |  2 +-
 sakura_core/apiwrap/StdApi.h                  |  2 +-
 sakura_core/charset/CCodeFactory.cpp          |  2 +-
 sakura_core/charset/CCodeFactory.h            |  2 +-
 sakura_core/cmd/CViewCommander.cpp            |  4 ++--
 sakura_core/cmd/CViewCommander.h              |  4 ++--
 sakura_core/cmd/CViewCommander_File.cpp       |  8 +++----
 sakura_core/config/system_constants.h         |  2 +-
 sakura_core/dlg/CDialog.h                     |  2 +-
 sakura_core/dlg/CDlgAbout.cpp                 |  2 +-
 sakura_core/dlg/CDlgCtrlCode.cpp              |  2 +-
 sakura_core/dlg/CDlgFavorite.cpp              |  4 ++--
 sakura_core/dlg/CDlgJump.cpp                  |  2 +-
 sakura_core/dlg/CDlgPrintSetting.cpp          |  8 +++----
 sakura_core/doc/CDocOutline.cpp               |  2 +-
 sakura_core/doc/logic/CDocLineMgr.cpp         |  2 +-
 sakura_core/env/CShareData_IO.cpp             |  4 ++--
 sakura_core/func/CKeyBind.cpp                 |  4 ++--
 sakura_core/func/Funccode.cpp                 | 12 +++++-----
 sakura_core/io/CIoBridge.cpp                  |  2 +-
 sakura_core/io/CIoBridge.h                    |  2 +-
 sakura_core/macro/CMacro.cpp                  |  2 +-
 sakura_core/macro/CSMacroMgr.cpp              |  8 +++----
 sakura_core/mem/CPoolResource.h               |  2 +-
 sakura_core/outline/CDlgFuncList.cpp          |  4 ++--
 sakura_core/parse/CWordParse.cpp              |  4 ++--
 sakura_core/print/CPrint.cpp                  |  4 ++--
 sakura_core/print/CPrint.h                    | 22 ++++++++---------
 sakura_core/print/CPrintPreview.cpp           | 12 +++++-----
 sakura_core/print/CPrintPreview.h             |  2 +-
 sakura_core/sakura.hh                         |  4 ++--
 sakura_core/sakura_rc.rc                      |  8 +++----
 sakura_core/typeprop/CImpExpManager.cpp       | 18 +++++++-------
 sakura_core/types/CType_Html.cpp              |  2 +-
 sakura_core/types/CType_Text.cpp              |  2 +-
 sakura_core/uiparts/CMenuDrawer.cpp           |  4 ++--
 sakura_core/util/std_macro.h                  |  2 +-
 sakura_core/util/window.h                     |  2 +-
 sakura_core/view/CEditView.h                  |  8 +++----
 sakura_core/view/CEditView_Command.cpp        |  2 +-
 sakura_core/view/CEditView_Command_New.cpp    |  2 +-
 tests/unittest.md                             |  2 +-
 tests/unittests/test-is_mailaddress.cpp       |  2 +-
 77 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a789a3d1a0..88358a2455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -175,7 +175,7 @@
 
 - 最近使ったファイル挿入 と 最近使ったフォルダ挿入 を行う機能追加 [\#1063](https://github.com/sakura-editor/sakura/pull/1063) ([beru](https://github.com/beru))
 - PlatformToolset 指定をプロパティーシートに分離して VS2017 および VS2019 で両対応できるようにする [\#866](https://github.com/sakura-editor/sakura/pull/866) ([m-tmatma](https://github.com/m-tmatma))
-- 「同名のC/C++ヘッダ\(ソース\)を開く」機能が利用可能か調べる処理で拡張子の確認が行われるように記述追加 [\#812](https://github.com/sakura-editor/sakura/pull/812) ([beru](https://github.com/beru))
+- 「同名のC/C++ヘッダー\(ソース\)を開く」機能が利用可能か調べる処理で拡張子の確認が行われるように記述追加 [\#812](https://github.com/sakura-editor/sakura/pull/812) ([beru](https://github.com/beru))
 
 ### バグ修正
 
diff --git a/HeaderMake/HeaderMake.cpp b/HeaderMake/HeaderMake.cpp
index a599ed141d..e843ec5437 100644
--- a/HeaderMake/HeaderMake.cpp
+++ b/HeaderMake/HeaderMake.cpp
@@ -33,7 +33,7 @@
 /*
 	++ 概要 ++
 
-	enum と define の2種類の定数定義ヘッダを生成するためのモノ
+	enum と define の2種類の定数定義ヘッダーを生成するためのモノ
 
 	enum定数はソースコードから参照し、(デバッグがしやすくなる)
 	define定数はリソースから参照する  (リソース内ではenum定数を利用できない)
diff --git a/help/macro/source/reference/file/S_OpenHfromtoC.html b/help/macro/source/reference/file/S_OpenHfromtoC.html
index 28de02be6f..1b9826fd07 100644
--- a/help/macro/source/reference/file/S_OpenHfromtoC.html
+++ b/help/macro/source/reference/file/S_OpenHfromtoC.html
@@ -11,7 +11,7 @@
 
      S_OpenHfromtoC
      
 
      
 	
      機能
      
-		
      同名のC/C++ヘッダ(ソース)を開く
      
+		
      同名のC/C++ヘッダー(ソース)を開く
      
 	
      構文
      
 		
      void  S_OpenHfromtoC ( )
      
 
      
diff --git a/help/macro/source/usage/keymacro.html b/help/macro/source/usage/keymacro.html
index 4025766c59..f69cdcb862 100644
--- a/help/macro/source/usage/keymacro.html
+++ b/help/macro/source/usage/keymacro.html
@@ -67,7 +67,7 @@ 
      「キーマクロの記録」で記録できない機能(関数)
      
 	
    • Print  [印刷]
      • 
 	
    • PrintPreview  [印刷プレビュー]
      • 
 	
    • PrintPageSetup  [ページ設定]
      • 
-	
    • OpenHfromtoC  [同名のC/C++ヘッダ(ソース)を開く]
      • 
+	
    • OpenHfromtoC  [同名のC/C++ヘッダー(ソース)を開く]
      • 
 	
    • ActivateSQLPLUS  [SQL*Plusをアクティブ表示]
      • 
 	
    • ExecSQLPLUS  [SQL*Plusで実行]
      • 
 	
    • Browse  [ブラウズ]
      • 
diff --git a/help/sakura/res/HLP000052.html b/help/sakura/res/HLP000052.html
index d3815acacd..0b1b66dcd6 100644
--- a/help/sakura/res/HLP000052.html
+++ b/help/sakura/res/HLP000052.html
@@ -30,7 +30,7 @@ 
      E-Mail(JIS→SJIS)コード変換
      
 
      
 メール本文のJISコードをSjift-JISに変換します。
      
 
      
-共通設定 『ファイル』プロパティで「ファイルを開いたときにMIMEエンコードされたヘッダをデコードする」のチェック状態に関係なく、メールのヘッダーにあるMIMEエンコードされた日本語JISコードもデコードしてShift_JISに変換します。
      
+共通設定 『ファイル』プロパティで「ファイルを開いたときにMIMEエンコードされたヘッダーをデコードする」のチェック状態に関係なく、メールのヘッダーにあるMIMEエンコードされた日本語JISコードもデコードしてShift_JISに変換します。
      
 
      
 ■マクロ構文
      
 ・構文: JIStoSJIS( );
      
diff --git a/help/sakura/res/HLP000058.html b/help/sakura/res/HLP000058.html
index 97f7640ce0..7ce3f4ec0b 100644
--- a/help/sakura/res/HLP000058.html
+++ b/help/sakura/res/HLP000058.html
@@ -40,7 +40,7 @@ 
      「検索(S)」メニューの一覧
      
 ・タグファイルの作成...
      
 ・ダイレクトタグジャンプ
      
 ・キーワードを指定してタグジャンプ
      
-・同名のC/C++ヘッダ(ソース)を開く(C)
      
+・同名のC/C++ヘッダー(ソース)を開く(C)
      
 ・ファイル内容比較(@)...
      
 ・DIFF差分表示(D)...
      
 ・次の差分へ
      
diff --git a/help/sakura/res/HLP000083.html b/help/sakura/res/HLP000083.html
index f6cf801e49..ce918aab35 100644
--- a/help/sakura/res/HLP000083.html
+++ b/help/sakura/res/HLP000083.html
@@ -94,8 +94,8 @@ 
      共通設定 『ファイル』プロパティ
      
 ■ファイルを開いたときにブックマークを復元する
      
 有効にしておくと、前にファイルを閉じたときのブックマークを復元してファイルを開きます。
      
 
      
-□ファイルを開いたときにMIMEエンコードされたヘッダをデコードする
      
-有効にしておくと、MIMEエンコードされているファイルを開いたときにヘッダ部をデコードして開きます。
      
+□ファイルを開いたときにMIMEエンコードされたヘッダーをデコードする
      
+有効にしておくと、MIMEエンコードされているファイルを開いたときにヘッダー部をデコードして開きます。
      
 
      
 □前回と異なる文字コードのとき問い合わせを行う
      
 有効にしておくと、指定した文字コード（指定無しの場合は自動判別した文字コード）と前回開いた文字コードが異なるとき、問い合わせのダイアログを表示します。
      
diff --git a/help/sakura/res/HLP000107.html b/help/sakura/res/HLP000107.html
index 368f6a16ae..ccff924c7a 100644
--- a/help/sakura/res/HLP000107.html
+++ b/help/sakura/res/HLP000107.html
@@ -178,10 +178,10 @@ 
      キー割り当て一覧
      - + - + diff --git a/help/sakura/res/HLP000109.html b/help/sakura/res/HLP000109.html index d1f4dbcce5..ea119ebf5b 100644 --- a/help/sakura/res/HLP000109.html +++ b/help/sakura/res/HLP000109.html @@ -111,7 +111,7 @@

      Grepに関するオプション

      - +
      無題
      プラグインの種類ジャック名
      ([Plug]で定義)      		ジャック名.Labelインタフェースオブジェクト
      プラグインの種類ジャック名
      ([Plug]で定義)      		ジャック名.Labelインターフェースオブジェクト
      アウトライン解析Outlineアウトライン標準ルール選択肢Outline
      スマートインデントIndentスマートインデント選択肢Indent
      補完候補検索
      (Ver.2.0.6.0以降)      		ComplementGlobalnoComplement
      Shift+Ctrl+2メニュー22×
      Shift+Ctrl+3メニュー23×
      Shift+Ctrl+4タブメニュー×
      Shift+Ctrl+C同名のC/C++ヘッダ(ソース)を開く×
      Shift+Ctrl+C同名のC/C++ヘッダー(ソース)を開く×
      Shift+Ctrl+D単語削除○
      Shift+Ctrl+E行削除(折り返し単位)○
      Shift+Ctrl+H同名のC/C++ヘッダ(ソース)を開く×
      Shift+Ctrl+H同名のC/C++ヘッダー(ソース)を開く×
      Shift+Ctrl+K行末まで削除(改行単位)○
      Shift+Ctrl+Lキーマクロの実行×
      Shift+Ctrl+Mキーマクロの記録開始／終了×
      O(置換)バックアップ作成 (sakura:2.2.0.0以降)
      U標準出力に出力し、Grep画面にデータを表示しない
      コマンドラインからパイプやリダイレクトを指定することで結果を利用できます。(sakura:2.2.0.0以降)
      Hヘッダ・フッタを出力しない(sakura:2.2.0.0以降)
      Hヘッダー・フッターを出力しない(sakura:2.2.0.0以降)
      (例) -GOPT=SRK

      diff --git a/help/sakura/res/HLP000192.html b/help/sakura/res/HLP000192.html index 1d007a4e7a..154bcd9325 100644 --- a/help/sakura/res/HLP000192.html +++ b/help/sakura/res/HLP000192.html @@ -4,27 +4,27 @@ -同名のC/C++ヘッダ(ソース)を開く - - +同名のC/C++ヘッダー(ソース)を開く + + -

      同名のC/C++ヘッダ(ソース)を開く

      +

      同名のC/C++ヘッダー(ソース)を開く

      C/C++の

          ・ソースファイル(.c/cpp/cxx/cc/cp/c++)

      または

      -    ・ヘッダファイル(.h/hpp/hxx/hh/hp/h++)
      +    ・ヘッダーファイル(.h/hpp/hxx/hh/hp/h++)

      を開いている場合のみ、この機能が使えます。

      編集中のファイルがソースファイルのとき、ファイル名が同じで拡張子が .h/hpp/hxx/hh/hp/h++ のファイルをこの順に探し、最初に見つかったものを開きます。
      -また編集中のファイルがヘッダファイルのときは、ファイル名が同じで拡張子が 同様.c/cpp/cxx/cc/cp/c++ の順序でソースファイルを探し、最初に見つかったものを開きます。
      +また編集中のファイルがヘッダーファイルのときは、ファイル名が同じで拡張子が 同様.c/cpp/cxx/cc/cp/c++ の順序でソースファイルを探し、最初に見つかったものを開きます。

      ■マクロ構文
      ・構文: OpenHfromtoC( );
      diff --git a/help/sakura/res/HLP000193.html b/help/sakura/res/HLP000193.html index c3d9e6bab6..d9374ad179 100644 --- a/help/sakura/res/HLP000193.html +++ b/help/sakura/res/HLP000193.html @@ -45,7 +45,7 @@

      コマンド一覧 (機能別)

      印刷Ctrl+P 印刷プレビューShift+Ctrl+P 印刷ページ設定※Ctrl+Alt+P -同名のC/C++ヘッダ(ソース)を開くShift+Ctrl+C, Shift+Ctrl+H +同名のC/C++ヘッダー(ソース)を開くShift+Ctrl+C, Shift+Ctrl+H SQL*Plusをアクティブ表示Shift+F11 SQL*Plusで実行F10 ブラウズCtrl+B diff --git a/help/sakura/res/HLP000284.html b/help/sakura/res/HLP000284.html index 87b17c42bb..f11d13cdd2 100644 --- a/help/sakura/res/HLP000284.html +++ b/help/sakura/res/HLP000284.html @@ -14,7 +14,7 @@

      ExpandParameter

      ExpandParameterの書式

      この特殊記号は以下の各文字列で利用できます。
        -
      • 印刷ページ設定のヘッダ・フッダ
        • +
      • 印刷ページ設定のヘッダー・フッダー
      • 外部コマンド実行
      • ウィンドウのタイトルバー文字列 共通設定 『ウィンドウ』プロパティ
      • マクロ専用関数 ExpandParameterの引数
        • @@ -47,8 +47,8 @@

        特殊記号

        $y 現在の論理行位置(1開始)
        $d 現在の日付(共通設定の日付書式)
        $t 現在の時刻(共通設定の時刻書式)
        -$p 現在のページ(印刷のヘッダ・フッダでのみ利用可能)
        -$P 総ページ(印刷のヘッダ・フッダでのみ利用可能)
        +$p 現在のページ(印刷のヘッダー・フッダーでのみ利用可能)
        +$P 総ページ(印刷のヘッダー・フッダーでのみ利用可能)
        $D ファイルのタイムスタンプ(共通設定の日付書式)
        $T ファイルのタイムスタンプ(共通設定の時刻書式)
        $V エディタのバージョン文字列
        diff --git a/help/sakura/res/HLP_UR004.html b/help/sakura/res/HLP_UR004.html index ddfa45a773..98c4249348 100644 --- a/help/sakura/res/HLP_UR004.html +++ b/help/sakura/res/HLP_UR004.html @@ -90,8 +90,8 @@

        変更履歴(2000/11/20～)


        [機能追加・仕様変更]
        -・[同名のC/C++ソース(ヘッダ)を開く]を追加 アイコンは[c←→h]
        -・(仕様) c→hはh→hpp→hxx→hh→hp→h++の順にヘッダファイルを探し、h→cはc→cpp→cxx→cc→cp→c++の順にソースファイルを探す．従来からのものもコマンドとしては残してあります(コマンド一覧)
        +・[同名のC/C++ソース(ヘッダー)を開く]を追加 アイコンは[c←→h]
        +・(仕様) c→hはh→hpp→hxx→hh→hp→h++の順にヘッダーファイルを探し、h→cはc→cpp→cxx→cc→cp→c++の順にソースファイルを探す．従来からのものもコマンドとしては残してあります(コマンド一覧)
        単発ものも上記の仕様に強化しました。
        (今まではアイコン[.c]では.c/cpp/cxx→.h、[.h]では .h→ .c/cpp/cxx )．ただし実際には[c←→h]の方が同じキー操作でどちらも開けるので楽です。
        ・カラーのindex管理を数字から文字列に変更し色設定のバージョンを2.1から3に更新した
        diff --git a/help/sakura/res/HLP_UR007.html b/help/sakura/res/HLP_UR007.html index d7167affd2..2348400389 100644 --- a/help/sakura/res/HLP_UR007.html +++ b/help/sakura/res/HLP_UR007.html @@ -17,7 +17,7 @@

        変更履歴(2001/12/03～)


        [仕様変更]
        -・印刷時のヘッダ・フッタ設定の特殊文字を &?形式から$?形式に変更。(BY horさん)
        +・印刷時のヘッダー・フッター設定の特殊文字を &?形式から$?形式に変更。(BY horさん)

        [機能追加]
        @@ -38,7 +38,7 @@

        変更履歴(2001/12/03～)

        ・検索,置換ダイアログの「該当行マーク」(F_BOOKMARK_PATTERN)もマクロで記録できるように変更 (BY horさん)
        ・再描画(F_REDRAW)もマクロで記録できるように変更 (BY horさん)
        ・ファイル→印刷を使用可能に (BY やざきさん)
        -・ページ設定ダイアログでヘッダとフッタを設定可能に (BY やざきさん)
        +・ページ設定ダイアログでヘッダーとフッターを設定可能に (BY やざきさん)
        テキストボックスは、左から、左寄せ、中央寄せ、右寄せ。
        使える特殊文字は次のとおり。
        @@ -46,7 +46,7 @@

        変更履歴(2001/12/03～)

        $F：開いているファイル名（フルパス）パス区切りが"\"
        $f：開いているファイル名（ファイル名のみ）
        $/：開いているファイル名（フルパス）パス区切りが"/"
        -$C：選択中のテキスト（ヘッダとフッタではたぶん意味なし。常に削除されるかな？）
        +$C：選択中のテキスト（ヘッダーとフッターではたぶん意味なし。常に削除されるかな？）
        $d：印刷日時（書式は、共通設定の日付書式）
        $t：印刷時刻（書式は、共通設定の時刻書式）
        $D：タイムスタンプ（日付。書式は、共通設定の日付書式）
        @@ -101,7 +101,7 @@

        変更履歴(2001/12/03～)


        [その他]
        -・ソースコードの無駄見直し。ヘッダの無用なinclude削減(BYあろかさん)
        +・ソースコードの無駄見直し。ヘッダーの無用なinclude削減(BYあろかさん)
        ・my_icmp で２バイト文字の大小文字同一視機能追加。(BY みくさん)

        [残存バグ・制限事項など]
        diff --git a/help/sakura/res/HLP_UR008.html b/help/sakura/res/HLP_UR008.html index 2c2970d20e..1e76299a20 100644 --- a/help/sakura/res/HLP_UR008.html +++ b/help/sakura/res/HLP_UR008.html @@ -180,7 +180,7 @@

        変更履歴(2002/02/23～)

        [バグ修正]
        ・水平スクロールバーを操作するとルーラーがついてこないことがあるのを修正．(BY げんた)
        -・印刷ヘッダとフッタの描画位置が、プレビューと実際の印刷で異なる．(BY やざきさん)
        +・印刷ヘッダーとフッターの描画位置が、プレビューと実際の印刷で異なる．(BY やざきさん)

        Mar. 16, 2002 (1.2.106.9)

        diff --git a/help/sakura/res/HLP_UR009.html b/help/sakura/res/HLP_UR009.html index 7dbbf6de50..de201fd69e 100644 --- a/help/sakura/res/HLP_UR009.html +++ b/help/sakura/res/HLP_UR009.html @@ -515,7 +515,7 @@

        変更履歴(2002/05/01～)


        [仕様変更]
        -・「ファイルを開いたときにMIMEエンコードされたヘッダをデコードする」をデフォルトでオフに。
        +・「ファイルを開いたときにMIMEエンコードされたヘッダーをデコードする」をデフォルトでオフに。
        ・(不正なMIME Headerがあると後続部分が失われるため。)

        [バグ修正]
        diff --git a/help/sakura/res/HLP_UR011.html b/help/sakura/res/HLP_UR011.html index e6a9d11fd9..03dba3a120 100644 --- a/help/sakura/res/HLP_UR011.html +++ b/help/sakura/res/HLP_UR011.html @@ -281,7 +281,7 @@

        変更履歴(2003/06/26～)

        ・Grepダイアログの[現在選択中のファイルから検索]でファイル名を指定した場合に""で囲むようにする．(by もかさん)
        ・「階層付テキスト」を「WZ階層付テキスト」に改名．(by もかさん)
        -・C/C++ソース・ヘッダファイルを開く関数を統合．(by もかさん)
        +・C/C++ソース・ヘッダーファイルを開く関数を統合．(by もかさん)
        ・メニューのアクセスキー表記を「機能名称(KEY)」という形に統一．(by げんた)

        Aug. 10, 2003 (1.4.2.0)
        diff --git a/help/sakura/res/HLP_UR012.html b/help/sakura/res/HLP_UR012.html index 7e370ebc1d..99b04ee95c 100644 --- a/help/sakura/res/HLP_UR012.html +++ b/help/sakura/res/HLP_UR012.html @@ -183,7 +183,7 @@

        変更履歴(2004/10/02～)


        [その他変更]
        -・プリコンパイルヘッダの有効化 (あろかさん)
        +・プリコンパイルヘッダーの有効化 (あろかさん)
        ・EOFのみの最終行でもスマートインデントが動くように (ryojiさん)
        ・正規表現無しの後方検索でマッチ方法を正規表現の場合と同様に．(かろとさん)
        ・Diff処理の改善．(コンパイルエラー回避) (maruさん)
        diff --git a/help/sakura/res/HLP_UR014.html b/help/sakura/res/HLP_UR014.html index f8348020c4..88fef08cf2 100644 --- a/help/sakura/res/HLP_UR014.html +++ b/help/sakura/res/HLP_UR014.html @@ -171,7 +171,7 @@

        Nov. 27, 2008 (1.6.3.0)

      • タブ切り替えでスクロールバーの動作が不正になることがある (svn:1356 patches:1971010 ryoji)
      • 行数が1のときにCDocLineMgr::DeleteNodeが呼ばれるとメモリリークが発生する (svn:1335 patches:1923031 ryoji)
      • CEditWnd::OnMouseMoveでCDropSourceがメモリリークする (svn:1323 patches:1958000 ryoji)
        • -
      • [同名のC/C++ヘッダファイルを開く]と[同名のC/C++ソースファイルを開く]の動作が逆(svn:1293 patches:1938647 ryoji)
        • +
      • [同名のC/C++ヘッダーファイルを開く]と[同名のC/C++ソースファイルを開く]の動作が逆(svn:1293 patches:1938647 ryoji)
      • ATOK16/2007の単語登録操作時に単語欄に選択範囲の語句が表示されない (svn:1231 patches:1881776 もか)
      • 2ページになる文書の印刷プレビューで前のページに移動するとホイールスクロールができなくなる (svn:1223 patches:1881776 dev:5243 なすこじ，げんた)
      • タブグループ画面からタブを切り離せなくなることがある (svn:1419 patches:1842668 ryoji)
        • diff --git a/help/sakura/res/HLP_UR016.html b/help/sakura/res/HLP_UR016.html index d7e8212106..ceb9efa7b0 100644 --- a/help/sakura/res/HLP_UR016.html +++ b/help/sakura/res/HLP_UR016.html @@ -213,7 +213,7 @@

        Jul. 20, 2013 (2.1.0.0)

        [機能追加]
        • カラー印刷 (svn:3030 upatchid:491 Request/105 ossan&Uchi)
          • -
        • 印刷でヘッダ･フッタのフォントを設定 (svn:3059 svn:3099 svn:3117 upatchid:536 Uchi)
          • +
        • 印刷でヘッダー･フッターのフォントを設定 (svn:3059 svn:3099 svn:3117 upatchid:536 Uchi)
        • 外部コマンド実行の拡張 (svn:3078 svn:3156 upatchid:324 upatchid:599 Request/149 Moca)
        • カラーHTMLコピー (svn:3080 upatchid:500 Request/431 Moca)
        • NEL,LS,PS限定的サポート (svn:3081 upatchid:450 Moca)
          • @@ -236,7 +236,7 @@

          Jul. 20, 2013 (2.1.0.0)

        [仕様変更]
          -
        • ヘッダ・フッタを設定していないときに印字可能領域を広げる (svn:3049 upatchid:527 aroka)
          • +
        • ヘッダー・フッターを設定していないときに印字可能領域を広げる (svn:3049 upatchid:527 aroka)
        • 印刷ページ設定のフォントサイズを高さで入力 (svn:3055 upatchid:550 aroka)
        • キーワードヘルプで「次の辞書も検索」で利用時に、フルパスではなくファイル名を表示するように (svn:3067 upatchid:511 Request/190 Moca)
        • 折り返し行インデントが限界のとき最大値のままにする (svn:3072 upatchid:531 BugReport/120 Moca)
          • diff --git a/installer/sinst_src/keyword/CSS2.khp b/installer/sinst_src/keyword/CSS2.khp index dab352afa8..bd90b24441 100644 --- a/installer/sinst_src/keyword/CSS2.khp +++ b/installer/sinst_src/keyword/CSS2.khp @@ -100,7 +100,7 @@ position /// 対象が生成するボックスの位置の計算方法を指定\ quotes /// 引用符のレンダリング方法を指定\n 引用符を挿入するかどうかは'content'で指定\n quotes: [ ]+ | none | inherit richness /// 話し声の豊かさを指定\n richness: (0～100) | inherit right /// 'position'の値がstatic以外の場合に指定可能\n ボックスの包含ブロックに対するオフセット値を指定\n right: | percentage | auto | inherit -speak-header /// 表のヘッダの音声読み上げ方法を指定\n speak-header: once | always | inherit +speak-header /// 表のヘッダーの音声読み上げ方法を指定\n speak-header: once | always | inherit speak-numeral /// 数字の読み方を指定\n speak-numeral: digits | continuous | inherit speak-punctuation /// 区切り文字の読み方を指定\n speak-punctuation: code | none | inherit speak /// テキストを音声出力するか、するならばどのような方式かを指定\n speak: normal | none | spell-out | inherit diff --git a/installer/sinst_src/keyword/S_MACPPA.KHP b/installer/sinst_src/keyword/S_MACPPA.KHP index 5ac2c22522..2d1251d91f 100644 --- a/installer/sinst_src/keyword/S_MACPPA.KHP +++ b/installer/sinst_src/keyword/S_MACPPA.KHP @@ -101,8 +101,8 @@ S_FileReopenUTF7 /// void S_FileReopenUTF7 ( ) ；\nUTF-7で開き直す S_Print /// void S_Print ( ) ；\n印刷 S_PrintPreview /// void S_PrintPreview ( ) ；\n印刷プレビュー S_PrintPageSetup /// void S_PrintPageSetup ( ) ；\n印刷ページ設定 -S_OpenHfromtoC /// void S_OpenHfromtoC ( ) ；\n同名のC/C++ヘッダ(ソース)を開く -S_OpenHHpp /// void S_OpenHHpp ( ) ；\n同名のC/C++ヘッダファイルを開く +S_OpenHfromtoC /// void S_OpenHfromtoC ( ) ；\n同名のC/C++ヘッダー(ソース)を開く +S_OpenHHpp /// void S_OpenHHpp ( ) ；\n同名のC/C++ヘッダーファイルを開く S_OpenCCpp /// void S_OpenCCpp ( ) ；\n同名のC/C++ソースファイルを開く S_ActivateSQLPLUS /// void S_ActivateSQLPLUS ( ) ；\nOracle SQL*Plusをアクティブ表示 S_ExecSQLPLUS /// void S_ExecSQLPLUS ( ) ；\nOracle SQL*Plusで実行 diff --git a/installer/sinst_src/keyword/php.khp b/installer/sinst_src/keyword/php.khp index cc698eafbe..b74a62fe8e 100644 --- a/installer/sinst_src/keyword/php.khp +++ b/installer/sinst_src/keyword/php.khp @@ -6,7 +6,7 @@ apache_response_headers /// array apache_response_headers ( void)\n Fetch all HT apache_setenv /// int apache_setenv ( string variable, string value [, bool walk_to_top])\nApacheサブプロセスの環境変数を設定する ascii2ebcdic /// int ascii2ebcdic ( string ascii_str)\nASCIIからEBCDICに文字列を変換する ebcdic2ascii /// int ebcdic2ascii ( string ebcdic_str)\nEBCDICからASCIIに文字列を変換する -getallheaders /// array getallheaders ( void)\n全てのHTTPリクエストヘッダを取得する +getallheaders /// array getallheaders ( void)\n全てのHTTPリクエストヘッダーを取得する virtual /// int virtual ( string filename)\nApacheサブリクエストを実行する array_change_key_case /// array array_change_key_case ( array input [, int case])\n 配列のキーを全て小文字または大文字にして返す array_chunk /// array array_chunk ( array input, int size [, bool preserve_keys])\n配列を分割する @@ -723,7 +723,7 @@ gmp_sqrtrm /// array gmp_sqrtrm ( resource a)\n余りと平方根 gmp_strval /// string gmp_strval ( resource gmpnumber, int [base])\nGMP 数を文字列に変換する gmp_sub /// resource gmp_sub ( resource a, resource b)\n数値の減算 gmp_xor /// resource gmp_xor ( resource a, resource b)\n論理演算 XOR -header /// int header ( string string [, bool replace])\n生のHTTPヘッダを送信する +header /// int header ( string string [, bool replace])\n生のHTTPヘッダーを送信する headers_sent /// boolean headers_sent ( void)\nヘッダーが送信されている場合に TRUE を返す setcookie /// int setcookie ( string name, string [value], int [expire], string [path], string [domain], int [secure])\nクッキーを送信する hw_Array2Objrec /// strin hw_array2objrec ( array object_array)\n オブジェクト配列からオブジェクトレコードに属性を変換する @@ -846,7 +846,7 @@ iconv_set_encoding /// array iconv_set_encoding ( string type, string charset)\n iconv /// string iconv ( string in_charset, string out_charset, string str)\n リクエストした文字エンコーディングに文字列を変換する ob_iconv_handler /// array ob_iconv_handler ( string contents, int status)\n 出力バッファハンドラとして文字エンコーディングを変換する exif_imagetype /// int|false exif_imagetype ( string filename)\nイメージの型を定義する -exif_read_data /// array exif_read_data ( string filename [, string sections [, bool arrays [, bool thumbnail]]])\n JPEGまたはTIFFから EXIFヘッダを読みこむ +exif_read_data /// array exif_read_data ( string filename [, string sections [, bool arrays [, bool thumbnail]]])\n JPEGまたはTIFFから EXIFヘッダーを読みこむ exif_thumbnail /// string exif_thumbnail ( string filename [, int &width [, int &height]])\nTIFFまたはJPEGイメージに埋め込まれたサムネイルを取得する GetImageSize /// array getimagesize ( string filename, array [imageinfo])\nJPEG、GIF、PNG、SWF画像の大きさを取得する image_type_to_mime_type /// string image_type_to_mime_type ( int imagetype)\nGet Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype @@ -939,7 +939,7 @@ iptcparse /// array iptcparse ( string iptcblock)\n バイナリのIPTChttp://ww http://www.iptc.org/ /// \n JPEG2WBMP /// int jpeg2wbmp ( string jpegname, string wbmpname, int d_height, int d_width, int threshold)\n JPEGイメージファイルからWBMPイメージファイルに変換する PNG2WBMP /// int png2wbmp ( string pngname, string wbmpname, int d_height, int d_width, int threshold)\n PNGイメージファイルからWBMPイメージファイルに変換する -read_exif_data /// array read_exif_data ( string filename)\nJPEGからEXIFヘッダを読み込む +read_exif_data /// array read_exif_data ( string filename)\nJPEGからEXIFヘッダーを読み込む imap_8bit /// string imap_8bit ( string string)\n 8bit 文字列を quoted-printable 文字列に変換する imap_alerts /// array imap_alerts ( void)\n ページリクエストの間または最後にスタックがリセットされて以来発生した 全てのIMAP警告メッセージを返す imap_append /// int imap_append ( int imap_stream, string mbox, string message, string [flags])\n 指定されたメールボックスに文字列メッセージを追加する @@ -955,17 +955,17 @@ imap_delete /// int imap_delete ( int imap_stream, int msg_number, int [flags])\ imap_deletemailbox /// int imap_deletemailbox ( int imap_stream, string mbox)\nメールボックスを削除する imap_errors /// array imap_errors ( void)\n ページのリクエストの間かエラースタックがリセットされて以来 生じた全てのIMAPエラーを返す imap_expunge /// int imap_expunge ( int imap_stream)\n 削除用にマークされたすべてのメッセージを削除する -imap_fetch_overview /// array imap_fetch_overview ( int imap_stream, string sequence)\n 指定したメッセージのヘッダ情報の概要を読む +imap_fetch_overview /// array imap_fetch_overview ( int imap_stream, string sequence)\n 指定したメッセージのヘッダー情報の概要を読む imap_fetchbody /// string imap_fetchbody ( int imap_stream, int msg_number, string part_number, flags [flags])\nメッセージ本文中の特定のセクションを取り出す -imap_fetchheader /// string imap_fetchheader ( int imap_stream, int msgno, int flags)\nメッセージのヘッダを返す +imap_fetchheader /// string imap_fetchheader ( int imap_stream, int msgno, int flags)\nメッセージのヘッダーを返す imap_fetchstructure /// object imap_fetchstructure ( int imap_stream, int msg_number, int [flags])\n 特定のメッセージの構造を読み込む imap_get_quota /// array imap_get_quota ( int imap_stream, string quota_root)\n クオータレベルの設定、メールボックス毎の使用状況を取得する imap_get_quotaroot /// array imap_get_quotaroot ( resource imap_stream, string quota_root)\n Retrieve the quota settings per user imap_getmailboxes /// array imap_getmailboxes ( int imap_stream, string ref, string pattern)\n メールボックスのリストを読み込み、各ボックスに関する詳細な情報を返す imap_getsubscribed /// array imap_getsubscribed ( int imap_stream, string ref, string pattern)\n購読中の全メールボックスの一覧 -imap_header /// object imap_header ( int imap_stream, int msg_number, int [fromlength], int [subjectlength], string [defaulthost])\nメッセージのヘッダを読む -imap_headerinfo /// object imap_headerinfo ( int imap_stream, int msg_number, int [fromlength], int [subjectlength], string [defaulthost])\nメッセージヘッダを読み込む -imap_headers /// array imap_headers ( int imap_stream)\n メールボックス内の、すべてのメッセージのヘッダを返す +imap_header /// object imap_header ( int imap_stream, int msg_number, int [fromlength], int [subjectlength], string [defaulthost])\nメッセージのヘッダーを読む +imap_headerinfo /// object imap_headerinfo ( int imap_stream, int msg_number, int [fromlength], int [subjectlength], string [defaulthost])\nメッセージヘッダーを読み込む +imap_headers /// array imap_headers ( int imap_stream)\n メールボックス内の、すべてのメッセージのヘッダーを返す imap_last_error /// string imap_last_error ( void)\n ページリクエスト時に生じた直近の IMAP エラーを返す imap_list /// array imap_list ( resource imap_stream, string ref, string pattern)\nRead the list of mailboxes imap_listmailbox /// array imap_listmailbox ( int imap_stream, string ref, string pattern)\nメールボックスのリストを読む @@ -987,7 +987,7 @@ imap_qprint /// string imap_qprint ( string string)\nquoted-printable 文字列 imap_renamemailbox /// int imap_renamemailbox ( int imap_stream, string old_mbox, string new_mbox)\nメールボックスの名前を変更する imap_reopen /// int imap_reopen ( int imap_stream, string mailbox, string [flags])\n 新規メールボックスへのIMAP ストリームを再度オープンする imap_rfc822_parse_adrlist /// array imap_rfc822_parse_adrlist ( string address, string default_host)\nアドレス文字列を解釈します -imap_rfc822_parse_headers /// object imap_rfc822_parse_headers ( string headers, string [defaulthost])\n文字列からメールヘッダを解釈する +imap_rfc822_parse_headers /// object imap_rfc822_parse_headers ( string headers, string [defaulthost])\n文字列からメールヘッダーを解釈する imap_rfc822_write_address /// string imap_rfc822_write_address ( string mailbox, string host, string personal)\n 指定したメールボックス、ホスト、個人情報を適当にフォーマットされ た電子メールアドレスにして返す imap_scanmailbox /// array imap_scanmailbox ( int imap_stream, string ref, string pattern, string content)\n メールボックスのリストを読み、メールボックスのテキストにおいて 文字列を検索する imap_search /// array imap_search ( int imap_stream, string criteria, int flags)\n 指定した検索条件にマッチするメッセージを配列として返す @@ -1221,11 +1221,11 @@ mb_convert_case /// string mb_convert_case ( string str, int mode [, string enco mb_convert_encoding /// string mb_convert_encoding ( string str, string to-encoding [, mixed from-encoding])\n文字エンコーディングを変換する mb_convert_kana /// string mb_convert_kana ( string str, string option [, mixed encoding])\n カナを("全角かな"、"半角かな"等に)変換する mb_convert_variables /// string mb_convert_variables ( string to-encoding, mixed from-encoding, mixed vars)\n変数の文字コードを変換する -mb_decode_mimeheader /// string mb_decode_mimeheader ( string str)\nMIMEヘッダフィールドの文字列をデコードする +mb_decode_mimeheader /// string mb_decode_mimeheader ( string str)\nMIMEヘッダーフィールドの文字列をデコードする mb_decode_numericentity /// string mb_decode_numericentity ( string str, array convmap [, string encoding])\n HTML数値エンティティを文字にデコードする mb_detect_encoding /// string mb_detect_encoding ( string str [, mixed encoding-list])\n文字エンコーディングを検出する mb_detect_order /// array mb_detect_order ( [mixed encoding-list])\n 文字エンコーディング検出順序の設定/取得 -mb_encode_mimeheader /// string mb_encode_mimeheader ( string str [, string charset [, string transfer-encoding [, string linefeed]]])\nMIMEヘッダの文字列をエンコードする +mb_encode_mimeheader /// string mb_encode_mimeheader ( string str [, string charset [, string transfer-encoding [, string linefeed]]])\nMIMEヘッダーの文字列をエンコードする mb_encode_numericentity /// string mb_encode_numericentity ( string str, array convmap [, string encoding])\n 文字をHTML数値エンティティにエンコードする mb_ereg_match /// bool mb_ereg_match ( string pattern, string string [, string option])\nマルチバイト文字列が正規表現に一致するか調べる mb_ereg_replace /// string mb_ereg_replace ( string pattern, string replacement, string string [, array option])\nマルチバイト文字列に正規表現による置換を行う diff --git a/parse-buildlog.py b/parse-buildlog.py index 3d918a4486..ecd63d22f7 100644 --- a/parse-buildlog.py +++ b/parse-buildlog.py @@ -171,7 +171,7 @@ def converterPython2(value): # 列幅に必要なサイズを保持する配列 maxWidths = [] - # ヘッダ部分を設定する + # ヘッダー部分を設定する y = 0 for x, item in enumerate(excelKeys): cell = ws.cell(row=y+1, column=x+1) @@ -283,7 +283,7 @@ def converterPython2(value): 'blobURL', ] - # ヘッダ部分を設定 + # ヘッダー部分を設定 for x, key in enumerate(outputKeys): cell = wsError.cell(row=y+1, column=x+1) cell.value = key diff --git a/sakura_core/CDicMgr.cpp b/sakura_core/CDicMgr.cpp index 452baeb1f6..4579f2ec7c 100644 --- a/sakura_core/CDicMgr.cpp +++ b/sakura_core/CDicMgr.cpp @@ -19,7 +19,7 @@ #include "StdAfx.h" #include #include "CDicMgr.h" -#include "mem/CMemory.h" // 2002/2/10 aroka ヘッダ整理 +#include "mem/CMemory.h" // 2002/2/10 aroka ヘッダー整理 #include "mem/CNativeW.h" #include "debug/CRunningTimer.h" #include "io/CTextStream.h" diff --git a/sakura_core/CGrepAgent.h b/sakura_core/CGrepAgent.h index 7f4c219359..f60f6fa818 100644 --- a/sakura_core/CGrepAgent.h +++ b/sakura_core/CGrepAgent.h @@ -39,7 +39,7 @@ struct SGrepOption{ bool bGrepReplace; //!< Grep置換 bool bGrepSubFolder; //!< サブフォルダからも検索する bool bGrepStdout; //!< 標準出力モード - bool bGrepHeader; //!< ヘッダ・フッダ表示 + bool bGrepHeader; //!< ヘッダー・フッダー表示 ECodeType nGrepCharSet; //!< 文字コードセット選択 int nGrepOutputLineType; //!< 0:ヒット部分を出力, 1: ヒット行を出力, 2: 否ヒット行を出力 int nGrepOutputStyle; //!< 出力形式 1: Normal, 2: WZ風(ファイル単位) 3: 結果のみ diff --git a/sakura_core/Funccode_x.hsrc b/sakura_core/Funccode_x.hsrc index 43b8d3c440..61892ca740 100644 --- a/sakura_core/Funccode_x.hsrc +++ b/sakura_core/Funccode_x.hsrc @@ -86,9 +86,9 @@ F_PRINT = 30150, //印刷 なし F_PRINT_PREVIEW = 30151, //印刷プレビュー なし F_PRINT_PAGESETUP = 30152, //印刷ページ設定 なし //F_PRINT_DIALOG = 30151, //印刷ダイアログ ？ -//F_OPEN_HHPP = 30160, //同名のC/C++ヘッダファイルを開く bool bCheckOnly // del 2008/6/23 Uchi +//F_OPEN_HHPP = 30160, //同名のC/C++ヘッダーファイルを開く bool bCheckOnly // del 2008/6/23 Uchi //F_OPEN_CCPP = 30161, //同名のC/C++ソースファイルを開く bool bCheckOnly // del 2008/6/23 Uchi -F_OPEN_HfromtoC = 30162, //同名のC/C++ヘッダ(ソース)を開く bool bCheckOnly +F_OPEN_HfromtoC = 30162, //同名のC/C++ヘッダー(ソース)を開く bool bCheckOnly F_ACTIVATE_SQLPLUS = 30170, //Oracle SQL*Plusをアクティブ表示 なし F_PLSQL_COMPILE_ON_SQLPLUS = 30171, //Oracle SQL*Plusで実行 なし F_BROWSE = 30180, //ブラウズ なし diff --git a/sakura_core/GrepInfo.h b/sakura_core/GrepInfo.h index 508d5518e2..5f24537af0 100644 --- a/sakura_core/GrepInfo.h +++ b/sakura_core/GrepInfo.h @@ -46,7 +46,7 @@ struct GrepInfo { SSearchOption sGrepSearchOption; //!< 検索オプション bool bGrepCurFolder; //!< カレントディレクトリを維持 bool bGrepStdout; //!< 標準出力モード - bool bGrepHeader; //!< ヘッダ情報表示 + bool bGrepHeader; //!< ヘッダー情報表示 bool bGrepSubFolder; //!< サブフォルダを検索する ECodeType nGrepCharSet; //!< 文字コードセット int nGrepOutputStyle; //!< 結果出力形式 diff --git a/sakura_core/_main/CCommandLine.h b/sakura_core/_main/CCommandLine.h index 18125145d0..addd8c10f2 100644 --- a/sakura_core/_main/CCommandLine.h +++ b/sakura_core/_main/CCommandLine.h @@ -1,5 +1,5 @@ /*! @file - @brief コマンドラインパーサ ヘッダファイル + @brief コマンドラインパーサ ヘッダーファイル @author aroka @date 2002/01/08 作成 diff --git a/sakura_core/_main/CControlProcess.cpp b/sakura_core/_main/CControlProcess.cpp index ed1db79ee5..f65c3a2b89 100644 --- a/sakura_core/_main/CControlProcess.cpp +++ b/sakura_core/_main/CControlProcess.cpp @@ -23,7 +23,7 @@ #include "env/CShareData_IO.h" #include "debug/CRunningTimer.h" #include "env/CShareData.h" -#include "sakura_rc.h"/// IDD_EXITTING 2002/2/10 aroka ヘッダ整理 +#include "sakura_rc.h"/// IDD_EXITTING 2002/2/10 aroka ヘッダー整理 #include "config/system_constants.h" #include "String_define.h" diff --git a/sakura_core/_main/CControlProcess.h b/sakura_core/_main/CControlProcess.h index e42f5527de..e8eef37b13 100644 --- a/sakura_core/_main/CControlProcess.h +++ b/sakura_core/_main/CControlProcess.h @@ -1,5 +1,5 @@ /*! @file - @brief コントロールプロセスクラスヘッダファイル + @brief コントロールプロセスクラスヘッダーファイル @author aroka @date 2002/01/08 作成 diff --git a/sakura_core/_main/CNormalProcess.h b/sakura_core/_main/CNormalProcess.h index d517594b4c..7b4f509c65 100644 --- a/sakura_core/_main/CNormalProcess.h +++ b/sakura_core/_main/CNormalProcess.h @@ -1,5 +1,5 @@ /*! @file - @brief エディタプロセスクラスヘッダファイル + @brief エディタプロセスクラスヘッダーファイル @author aroka @date 2002/01/08 作成 diff --git a/sakura_core/_main/CProcess.h b/sakura_core/_main/CProcess.h index 9db1943f43..a4128afdc1 100644 --- a/sakura_core/_main/CProcess.h +++ b/sakura_core/_main/CProcess.h @@ -1,5 +1,5 @@ /*! @file - @brief プロセス基底クラスヘッダファイル + @brief プロセス基底クラスヘッダーファイル @author aroka @date 2002/01/08 作成 diff --git a/sakura_core/_main/CProcessFactory.h b/sakura_core/_main/CProcessFactory.h index 5274eb7e49..aabb409955 100644 --- a/sakura_core/_main/CProcessFactory.h +++ b/sakura_core/_main/CProcessFactory.h @@ -1,5 +1,5 @@ /*! @file - @brief プロセス生成クラスヘッダファイル + @brief プロセス生成クラスヘッダーファイル @author aroka @date 2002/01/08 作成 diff --git a/sakura_core/_os/CDropTarget.h b/sakura_core/_os/CDropTarget.h index f2cdfa4779..3f38c60daf 100644 --- a/sakura_core/_os/CDropTarget.h +++ b/sakura_core/_os/CDropTarget.h @@ -24,7 +24,7 @@ class CDropTarget; class CYbInterfaceBase; class CEditWnd; // 2008.06.20 ryoji -class CEditView;// 2002/2/3 aroka ヘッダ軽量化 +class CEditView;// 2002/2/3 aroka ヘッダー軽量化 /*----------------------------------------------------------------------- クラスの宣言 diff --git a/sakura_core/apiwrap/StdApi.h b/sakura_core/apiwrap/StdApi.h index 0731af8445..a14544d6d2 100644 --- a/sakura_core/apiwrap/StdApi.h +++ b/sakura_core/apiwrap/StdApi.h @@ -27,7 +27,7 @@ #define SAKURA_STDAPI_29C8A971_234C_46ED_96DB_A2D479992ABE_H_ #pragma once -//ランタイム情報ライブラリにアクセスするWindowsヘッダを参照する +//ランタイム情報ライブラリにアクセスするWindowsヘッダーを参照する #include //デバッグ用。 diff --git a/sakura_core/charset/CCodeFactory.cpp b/sakura_core/charset/CCodeFactory.cpp index ac6be7984f..b30e313c8c 100644 --- a/sakura_core/charset/CCodeFactory.cpp +++ b/sakura_core/charset/CCodeFactory.cpp @@ -42,7 +42,7 @@ //! eCodeTypeに適合する CCodeBaseインスタンス を生成 CCodeBase* CCodeFactory::CreateCodeBase( ECodeType eCodeType, //!< 文字コード - int nFlag //!< bit 0: MIME Encodeされたヘッダをdecodeするかどうか + int nFlag //!< bit 0: MIME Encodeされたヘッダーをdecodeするかどうか ) { switch( eCodeType ){ diff --git a/sakura_core/charset/CCodeFactory.h b/sakura_core/charset/CCodeFactory.h index 02960b1a74..6bf5782955 100644 --- a/sakura_core/charset/CCodeFactory.h +++ b/sakura_core/charset/CCodeFactory.h @@ -36,7 +36,7 @@ class CCodeFactory{ //! eCodeTypeに適合する CCodeBaseインスタンス を生成 static CCodeBase* CreateCodeBase( ECodeType eCodeType, //!< 文字コード - int nFlag //!< bit 0: MIME Encodeされたヘッダをdecodeするかどうか + int nFlag //!< bit 0: MIME Encodeされたヘッダーをdecodeするかどうか ); //! eCodeTypeに適合する CCodeBaseインスタンス を生成 diff --git a/sakura_core/cmd/CViewCommander.cpp b/sakura_core/cmd/CViewCommander.cpp index 168a6493cf..fb2113614c 100644 --- a/sakura_core/cmd/CViewCommander.cpp +++ b/sakura_core/cmd/CViewCommander.cpp @@ -226,8 +226,8 @@ BOOL CViewCommander::HandleCommand( case F_PRINT: Command_PRINT();break; /* 印刷 */ case F_PRINT_PREVIEW: Command_PRINT_PREVIEW();break; /* 印刷プレビュー */ case F_PRINT_PAGESETUP: Command_PRINT_PAGESETUP();break; /* 印刷ページ設定 */ //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 - case F_OPEN_HfromtoC: bRet = Command_OPEN_HfromtoC( (BOOL)lparam1 );break; /* 同名のC/C++ヘッダ(ソース)を開く */ //Feb. 7, 2001 JEPRO 追加 -// case F_OPEN_HHPP: bRet = Command_OPEN_HHPP( (BOOL)lparam1, TRUE );break; /* 同名のC/C++ヘッダファイルを開く */ //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi + case F_OPEN_HfromtoC: bRet = Command_OPEN_HfromtoC( (BOOL)lparam1 );break; /* 同名のC/C++ヘッダー(ソース)を開く */ //Feb. 7, 2001 JEPRO 追加 +// case F_OPEN_HHPP: bRet = Command_OPEN_HHPP( (BOOL)lparam1, TRUE );break; /* 同名のC/C++ヘッダーファイルを開く */ //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi // case F_OPEN_CCPP: bRet = Command_OPEN_CCPP( (BOOL)lparam1, TRUE );break; /* 同名のC/C++ソースファイルを開く */ //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi case F_ACTIVATE_SQLPLUS: Command_ACTIVATE_SQLPLUS();break; /* Oracle SQL*Plusをアクティブ表示 */ case F_PLSQL_COMPILE_ON_SQLPLUS: /* Oracle SQL*Plusで実行 */ diff --git a/sakura_core/cmd/CViewCommander.h b/sakura_core/cmd/CViewCommander.h index 3d159d8c5e..fecbda581f 100644 --- a/sakura_core/cmd/CViewCommander.h +++ b/sakura_core/cmd/CViewCommander.h @@ -111,8 +111,8 @@ class CViewCommander{ void Command_PRINT( void ); /* 印刷*/ void Command_PRINT_PREVIEW( void ); /* 印刷プレビュー*/ void Command_PRINT_PAGESETUP( void ); /* 印刷ページ設定 */ //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 - BOOL Command_OPEN_HfromtoC(BOOL bCheckOnly); /* 同名のC/C++ヘッダ(ソース)を開く */ //Feb. 7, 2001 JEPRO 追加 - BOOL Command_OPEN_HHPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ); /* 同名のC/C++ヘッダファイルを開く */ //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 + BOOL Command_OPEN_HfromtoC(BOOL bCheckOnly); /* 同名のC/C++ヘッダー(ソース)を開く */ //Feb. 7, 2001 JEPRO 追加 + BOOL Command_OPEN_HHPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ); /* 同名のC/C++ヘッダーファイルを開く */ //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 BOOL Command_OPEN_CCPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ); /* 同名のC/C++ソースファイルを開く */ //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 void Command_ACTIVATE_SQLPLUS( void ); /* Oracle SQL*Plusをアクティブ表示 */ void Command_PLSQL_COMPILE_ON_SQLPLUS( void );/* Oracle SQL*Plusで実行 */ diff --git a/sakura_core/cmd/CViewCommander_File.cpp b/sakura_core/cmd/CViewCommander_File.cpp index e660169fb0..0fc84c8c7c 100644 --- a/sakura_core/cmd/CViewCommander_File.cpp +++ b/sakura_core/cmd/CViewCommander_File.cpp @@ -310,7 +310,7 @@ void CViewCommander::Command_PRINT_PAGESETUP( void ) } //From Here Feb. 10, 2001 JEPRO 追加 -/* C/C++ヘッダファイルまたはソースファイル オープン機能 */ +/* C/C++ヘッダーファイルまたはソースファイル オープン機能 */ BOOL CViewCommander::Command_OPEN_HfromtoC( BOOL bCheckOnly ) { if ( Command_OPEN_HHPP( bCheckOnly, FALSE ) ) return TRUE; @@ -321,11 +321,11 @@ BOOL CViewCommander::Command_OPEN_HfromtoC( BOOL bCheckOnly ) // 2003.06.28 Moca コメントとして残っていたコードを削除 } -/* C/C++ヘッダファイル オープン機能 */ //Feb. 10, 2001 jepro 説明を「インクルードファイル」から変更 +/* C/C++ヘッダーファイル オープン機能 */ //Feb. 10, 2001 jepro 説明を「インクルードファイル」から変更 //BOOL CViewCommander::Command_OPENINCLUDEFILE( BOOL bCheckOnly ) BOOL CViewCommander::Command_OPEN_HHPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ) { - // 2003.06.28 Moca ヘッダ・ソースのコードを統合＆削除 + // 2003.06.28 Moca ヘッダー・ソースのコードを統合＆削除 static const WCHAR* source_ext[] = { L"c", L"cpp", L"cxx", L"cc", L"cp", L"c++" }; static const WCHAR* header_ext[] = { L"h", L"hpp", L"hxx", L"hh", L"hp", L"h++" }; return m_pCommanderView->OPEN_ExtFromtoExt( @@ -338,7 +338,7 @@ BOOL CViewCommander::Command_OPEN_HHPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ) //BOOL CViewCommander::Command_OPENCCPP( BOOL bCheckOnly ) //Feb. 10, 2001 JEPRO コマンド名を若干変更 BOOL CViewCommander::Command_OPEN_CCPP( BOOL bCheckOnly, BOOL bBeepWhenMiss ) { - // 2003.06.28 Moca ヘッダ・ソースのコードを統合＆削除 + // 2003.06.28 Moca ヘッダー・ソースのコードを統合＆削除 static const WCHAR* source_ext[] = { L"c", L"cpp", L"cxx", L"cc", L"cp", L"c++" }; static const WCHAR* header_ext[] = { L"h", L"hpp", L"hxx", L"hh", L"hp", L"h++" }; return m_pCommanderView->OPEN_ExtFromtoExt( diff --git a/sakura_core/config/system_constants.h b/sakura_core/config/system_constants.h index c66120078c..1eda1fc6e8 100644 --- a/sakura_core/config/system_constants.h +++ b/sakura_core/config/system_constants.h @@ -413,7 +413,7 @@ カラー印刷 Version 132: - 印刷のヘッダ･フッタのフォント指定 + 印刷のヘッダー･フッターのフォント指定 Version 133: 外部コマンド実行のカレントディレクトリ 2013.02.22 Moca diff --git a/sakura_core/dlg/CDialog.h b/sakura_core/dlg/CDialog.h index 3e50d2ee5f..711f610189 100644 --- a/sakura_core/dlg/CDialog.h +++ b/sakura_core/dlg/CDialog.h @@ -1,5 +1,5 @@ /*! @file - @brief Dialog Box基底クラスヘッダファイル + @brief Dialog Box基底クラスヘッダーファイル @author Norio Nakatani */ diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 253839913c..6badf7c807 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -169,7 +169,7 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // Jun. 8, 2001 genta GPL化に伴い、OfficialなReleaseとしての道を歩み始める // Feb. 7, 2002 genta コンパイラ情報追加 // 2004.05.13 Moca バージョン番号は、プロセスごとに取得する - // 2010.04.15 Moca コンパイラ情報を分離/WINヘッダ,N_SHAREDATA_VERSION追加 + // 2010.04.15 Moca コンパイラ情報を分離/WINヘッダー,N_SHAREDATA_VERSION追加 // 以下の形式で出力 //サクラエディタ開発版(64bitデバッグ) Ver. 2.4.1.1234 GHA (xxxxxxxx) diff --git a/sakura_core/dlg/CDlgCtrlCode.cpp b/sakura_core/dlg/CDlgCtrlCode.cpp index 9dbd2dc15b..7a38bab9c3 100644 --- a/sakura_core/dlg/CDlgCtrlCode.cpp +++ b/sakura_core/dlg/CDlgCtrlCode.cpp @@ -57,7 +57,7 @@ struct ctrl_info_t { const WCHAR *jname; //説明 } static p_ctrl_list[] = { { 0x0000, 0x00c0, L"NUL", L"" }, //NULL 空文字 - { 0x0001, 'A', L"SOH", L"" }, //START OF HEADING ヘッダ開始 + { 0x0001, 'A', L"SOH", L"" }, //START OF HEADING ヘッダー開始 { 0x0002, 'B', L"STX", L"" }, //START OF TEXT テキスト開始 { 0x0003, 'C', L"ETX", L"" }, //END OF TEXT テキスト終了 { 0x0004, 'D', L"EOT", L"" }, //END OF TRANSMISSION 転送終了 diff --git a/sakura_core/dlg/CDlgFavorite.cpp b/sakura_core/dlg/CDlgFavorite.cpp index 004afd6685..1ad281e505 100644 --- a/sakura_core/dlg/CDlgFavorite.cpp +++ b/sakura_core/dlg/CDlgFavorite.cpp @@ -636,7 +636,7 @@ BOOL CDlgFavorite::OnNotify(NMHDR* pNMHDR) } return TRUE; - // ListViewヘッダクリック:ソートする + // ListViewヘッダークリック:ソートする case LVN_COLUMNCLICK: ListViewSort( m_aListViewInfo[m_nCurrentTab], @@ -1130,7 +1130,7 @@ void CDlgFavorite::ListViewSort(ListViewSortInfo& info, const CRecent* pRecent, info.bSortAscending = (bReverse ? (!info.bSortAscending): true); } - // ヘッダ書き換え + // ヘッダー書き換え WCHAR szHeader[200]; LV_COLUMN col; if( -1 != info.nSortColumn ){ diff --git a/sakura_core/dlg/CDlgJump.cpp b/sakura_core/dlg/CDlgJump.cpp index c7ea236588..3b5022cdd9 100644 --- a/sakura_core/dlg/CDlgJump.cpp +++ b/sakura_core/dlg/CDlgJump.cpp @@ -21,7 +21,7 @@ #include "doc/CEditDoc.h" #include "func/Funccode.h" // Stonee, 2001/03/12 #include "outline/CFuncInfo.h" -#include "outline/CFuncInfoArr.h"// 2002/2/10 aroka ヘッダ整理 +#include "outline/CFuncInfoArr.h"// 2002/2/10 aroka ヘッダー整理 #include "util/shell.h" #include "util/os.h" #include "window/CEditWnd.h" diff --git a/sakura_core/dlg/CDlgPrintSetting.cpp b/sakura_core/dlg/CDlgPrintSetting.cpp index 20eb77aa65..559a761266 100644 --- a/sakura_core/dlg/CDlgPrintSetting.cpp +++ b/sakura_core/dlg/CDlgPrintSetting.cpp @@ -633,11 +633,11 @@ int CDlgPrintSetting::GetData( void ) ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[1], HEADER_MAX ); // 100文字で制限しないと。。。 ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[2], HEADER_MAX ); // 100文字で制限しないと。。。 - // ヘッダフォント + // ヘッダーフォント if (!IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_USE_FONT_HEAD )) { memset( &m_PrintSettingArr[m_nCurrentPrintSetting].m_lfHeader, 0, sizeof(LOGFONT) ); } - // フッタフォント + // フッターフォント if (!IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_USE_FONT_FOOT )) { memset( &m_PrintSettingArr[m_nCurrentPrintSetting].m_lfFooter, 0, sizeof(LOGFONT) ); } @@ -733,11 +733,11 @@ void CDlgPrintSetting::OnChangeSettingType( BOOL bGetData ) ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_CENTER] ); // 100文字で制限しないと。。。 ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_RIGHT] ); // 100文字で制限しないと。。。 - // ヘッダフォント + // ヘッダーフォント SetFontName( IDC_STATIC_FONT_HEAD, IDC_CHECK_USE_FONT_HEAD, m_PrintSettingArr[m_nCurrentPrintSetting].m_lfHeader, m_PrintSettingArr[m_nCurrentPrintSetting].m_nHeaderPointSize ); - // フッタフォント + // フッターフォント SetFontName( IDC_STATIC_FONT_FOOT, IDC_CHECK_USE_FONT_FOOT, m_PrintSettingArr[m_nCurrentPrintSetting].m_lfFooter, m_PrintSettingArr[m_nCurrentPrintSetting].m_nFooterPointSize ); diff --git a/sakura_core/doc/CDocOutline.cpp b/sakura_core/doc/CDocOutline.cpp index 4f4863ea96..50d8984ea1 100644 --- a/sakura_core/doc/CDocOutline.cpp +++ b/sakura_core/doc/CDocOutline.cpp @@ -229,7 +229,7 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::wstri sTitleOverride = title.c_str(); } - /* ネストの深さは、32レベルまで、ひとつのヘッダは、最長256文字まで区別 + /* ネストの深さは、32レベルまで、ひとつのヘッダーは、最長256文字まで区別 （256文字まで同じだったら同じものとして扱います） */ const int nMaxStack = 32; // ネストの最深 diff --git a/sakura_core/doc/logic/CDocLineMgr.cpp b/sakura_core/doc/logic/CDocLineMgr.cpp index a644720a16..1e05f4db47 100644 --- a/sakura_core/doc/logic/CDocLineMgr.cpp +++ b/sakura_core/doc/logic/CDocLineMgr.cpp @@ -27,7 +27,7 @@ #include #include #include "CDocLineMgr.h" -#include "CDocLine.h"// 2002/2/10 aroka ヘッダ整理 +#include "CDocLine.h"// 2002/2/10 aroka ヘッダー整理 #include "charset/charcode.h" #include "charset/CCodeFactory.h" #include "charset/CCodeBase.h" diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index a18e9407b9..d679f81e86 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -1295,14 +1295,14 @@ void CShareData_IO::ShareData_IO_Print( CDataProfile& cProfile ) cProfile.IOProfileData(pszSecName, szKeyName, StringBufferW(printsetting.m_szPrintFontFaceHan)); auto_sprintf( szKeyName, LTEXT("PS[%02d].szFFZ") , i ); cProfile.IOProfileData(pszSecName, szKeyName, StringBufferW(printsetting.m_szPrintFontFaceZen)); - // ヘッダ/フッタ + // ヘッダー/フッター for( j = 0; j < 3; ++j ){ auto_sprintf( szKeyName, LTEXT("PS[%02d].szHF[%d]") , i, j ); cProfile.IOProfileData(pszSecName, szKeyName, StringBufferW(printsetting.m_szHeaderForm[j])); auto_sprintf( szKeyName, LTEXT("PS[%02d].szFTF[%d]"), i, j ); cProfile.IOProfileData(pszSecName, szKeyName, StringBufferW(printsetting.m_szFooterForm[j])); } - { // ヘッダ/フッタ フォント設定 + { // ヘッダー/フッター フォント設定 WCHAR szKeyName2[64]; WCHAR szKeyName3[64]; auto_sprintf( szKeyName, LTEXT("PS[%02d].lfHeader"), i ); diff --git a/sakura_core/func/CKeyBind.cpp b/sakura_core/func/CKeyBind.cpp index 6c4cbb33f7..7349da80a1 100644 --- a/sakura_core/func/CKeyBind.cpp +++ b/sakura_core/func/CKeyBind.cpp @@ -600,14 +600,14 @@ EFunctionCode CKeyBind::GetFuncCodeAt( KEYDATA& KeyData, int nState, BOOL bGetDe //2001.12.06 hor Alt+A を「SORT_ASC」に割当 //Jan. 13, 2001 JEPRO Ctrl+B に「ブラウズ」を追加 //Jan. 16, 2001 JEPRO SHift+Ctrl+C に「.hと同名の.c(なければ.cpp)を開く」を追加 -//Feb. 07, 2001 JEPRO SHift+Ctrl+C を「.hと同名の.c(なければ.cpp)を開く」→「同名のC/C++ヘッダ(ソース)を開く」に変更 +//Feb. 07, 2001 JEPRO SHift+Ctrl+C を「.hと同名の.c(なければ.cpp)を開く」→「同名のC/C++ヘッダー(ソース)を開く」に変更 //Jan. 16, 2001 JEPRO Ctrl+D に「単語切り取り」, Shift+Ctrl+D に「単語削除」を追加 //2001.12.06 hor Alt+D を「SORT_DESC」に割当 //Oct. 7, 2000 JEPRO Ctrl+Alt+E に「重ねて表示」を追加 //Jan. 16, 2001 JEPRO Ctrl+E に「行切り取り(折り返し単位)」, Shift+Ctrl+E に「行削除(折り返し単位)」を追加 //Oct. 07, 2000 JEPRO Ctrl+Alt+H に「上下に並べて表示」を追加 //Jan. 16, 2001 JEPRO Ctrl+H を「カーソル前を削除」→「カーソル行をウィンドウ中央へ」に変更し Shift+Ctrl+H に「.cまたは.cppと同名の.hを開く」を追加 -//Feb. 07, 2001 JEPRO SHift+Ctrl+H を「.cまたは.cppと同名の.hを開く」→「同名のC/C++ヘッダ(ソース)を開く」に変更 +//Feb. 07, 2001 JEPRO SHift+Ctrl+H を「.cまたは.cppと同名の.hを開く」→「同名のC/C++ヘッダー(ソース)を開く」に変更 //Jan. 21, 2001 JEPRO Ctrl+I に「行の二重化」を追加 //Jan. 16, 2001 JEPRO Ctrl+K に「行末まで切り取り(改行単位)」, Shift+Ctrl+E に「行末まで削除(改行単位)」を追加 //Jan. 14, 2001 JEPRO Ctrl+Alt+L に「小文字」, Shift+Ctrl+Alt+L に「大文字」を追加 diff --git a/sakura_core/func/Funccode.cpp b/sakura_core/func/Funccode.cpp index 0ded27ba38..a9eceab666 100644 --- a/sakura_core/func/Funccode.cpp +++ b/sakura_core/func/Funccode.cpp @@ -113,8 +113,8 @@ const EFunctionCode pnFuncList_File[] = { //Oct. 16, 2000 JEPRO 変数名変更( F_PRINT , //印刷 F_PRINT_PREVIEW , //印刷プレビュー F_PRINT_PAGESETUP , //印刷ページ設定 //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 - F_OPEN_HfromtoC , //同名のC/C++ヘッダ(ソース)を開く //Feb. 7, 2001 JEPRO 追加 -// F_OPEN_HHPP , //同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi + F_OPEN_HfromtoC , //同名のC/C++ヘッダー(ソース)を開く //Feb. 7, 2001 JEPRO 追加 +// F_OPEN_HHPP , //同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi // F_OPEN_CCPP , //同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi F_ACTIVATE_SQLPLUS , /* Oracle SQL*Plusをアクティブ表示 */ //Sept. 20, 2000 「コンパイル」JEPRO アクティブ表示を上に移動した F_PLSQL_COMPILE_ON_SQLPLUS , /* Oracle SQL*Plusで実行 */ //Sept. 20, 2000 jepro 説明の「コンパイル」を「実行」に統一 @@ -604,8 +604,8 @@ int FuncID_To_HelpContextID( EFunctionCode nFuncID ) case F_PRINT: return HLP000162; //印刷 //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 case F_PRINT_PREVIEW: return HLP000120; //印刷プレビュー case F_PRINT_PAGESETUP: return HLP000122; //印刷ページ設定 //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 - case F_OPEN_HfromtoC: return HLP000192; //同名のC/C++ヘッダ(ソース)を開く //Feb. 7, 2001 JEPRO 追加 -// case F_OPEN_HHPP: return HLP000024; //同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi + case F_OPEN_HfromtoC: return HLP000192; //同名のC/C++ヘッダー(ソース)を開く //Feb. 7, 2001 JEPRO 追加 +// case F_OPEN_HHPP: return HLP000024; //同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi // case F_OPEN_CCPP: return HLP000026; //同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi case F_ACTIVATE_SQLPLUS: return HLP000132; /* Oracle SQL*Plusをアクティブ表示 */ case F_PLSQL_COMPILE_ON_SQLPLUS: return HLP000027; /* Oracle SQL*Plusで実行 */ @@ -1180,8 +1180,8 @@ bool IsFuncEnable( const CEditDoc* pcEditDoc, const DLLSHAREDATA* pShareData, EF case F_UNDO: return pcEditDoc->m_cDocEditor.IsEnableUndo(); /* Undo(元に戻す)可能な状態か？ */ case F_REDO: return pcEditDoc->m_cDocEditor.IsEnableRedo(); /* Redo(やり直し)可能な状態か？ */ - case F_OPEN_HfromtoC: //同名のC/C++ヘッダ(ソース)を開く //Feb. 7, 2001 JEPRO 追加 -// case F_OPEN_HHPP: //同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi + case F_OPEN_HfromtoC: //同名のC/C++ヘッダー(ソース)を開く //Feb. 7, 2001 JEPRO 追加 +// case F_OPEN_HHPP: //同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi // case F_OPEN_CCPP: //同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi return pcEditDoc->m_cDocFile.GetFilePathClass().IsValidPath() && GetEditWnd().GetActiveView().GetCommander().Command_OPEN_HfromtoC(TRUE); case F_COPYPATH: diff --git a/sakura_core/io/CIoBridge.cpp b/sakura_core/io/CIoBridge.cpp index 2dd67f1c54..5a94902725 100644 --- a/sakura_core/io/CIoBridge.cpp +++ b/sakura_core/io/CIoBridge.cpp @@ -33,7 +33,7 @@ EConvertResult CIoBridge::FileToImpl( const CMemory& cSrc, //!< [in] 変換元メモリ CNativeW* pDst, //!< [out] 変換先メモリ(UNICODE) CCodeBase* pCode, //!< [in] 変換元メモリの文字コード - int nFlag //!< [in] bit 0: MIME Encodeされたヘッダをdecodeするかどうか + int nFlag //!< [in] bit 0: MIME Encodeされたヘッダーをdecodeするかどうか ) { //任意の文字コードからUnicodeへ変換する diff --git a/sakura_core/io/CIoBridge.h b/sakura_core/io/CIoBridge.h index 6ee6e850f3..3a4de8f96e 100644 --- a/sakura_core/io/CIoBridge.h +++ b/sakura_core/io/CIoBridge.h @@ -37,7 +37,7 @@ class CIoBridge{ const CMemory& cSrc, //!< [in] 変換元メモリ CNativeW* pDst, //!< [out] 変換先メモリ(UNICODE) CCodeBase* pCodeBase, //!< [in] 変換元メモリの文字コードクラス - int nFlag //!< [in] bit 0: MIME Encodeされたヘッダをdecodeするかどうか + int nFlag //!< [in] bit 0: MIME Encodeされたヘッダーをdecodeするかどうか ); //! ファイルのエンコードへ変更 diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp index c9301eb0ca..27427f68f2 100644 --- a/sakura_core/macro/CMacro.cpp +++ b/sakura_core/macro/CMacro.cpp @@ -46,7 +46,7 @@ #include "cmd/CViewCommander_inline.h" #include "view/CEditView.h" //2002/2/10 aroka #include "macro/CSMacroMgr.h" //2002/2/10 aroka -#include "doc/CEditDoc.h" // 2002/5/13 YAZAKI ヘッダ整理 +#include "doc/CEditDoc.h" // 2002/5/13 YAZAKI ヘッダー整理 #include "_os/OleTypes.h" //2003-02-21 鬼 #include "io/CTextStream.h" #include "window/CEditWnd.h" diff --git a/sakura_core/macro/CSMacroMgr.cpp b/sakura_core/macro/CSMacroMgr.cpp index 856911525d..9fa706f255 100644 --- a/sakura_core/macro/CSMacroMgr.cpp +++ b/sakura_core/macro/CSMacroMgr.cpp @@ -69,8 +69,8 @@ MacroFuncInfo CSMacroMgr::m_MacroFuncInfoCommandArr[] = // {F_PRINT_DIALOG, LTEXT("PrintDialog"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //印刷ダイアログ {F_PRINT_PREVIEW, LTEXT("PrintPreview"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //印刷プレビュー {F_PRINT_PAGESETUP, LTEXT("PrintPageSetup"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //印刷ページ設定 //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 - {F_OPEN_HfromtoC, LTEXT("OpenHfromtoC"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //同名のC/C++ヘッダ(ソース)を開く //Feb. 7, 2001 JEPRO 追加 -// {F_OPEN_HHPP, LTEXT("OpenHHpp"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi + {F_OPEN_HfromtoC, LTEXT("OpenHfromtoC"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //同名のC/C++ヘッダー(ソース)を開く //Feb. 7, 2001 JEPRO 追加 +// {F_OPEN_HHPP, LTEXT("OpenHHpp"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi // {F_OPEN_CCPP, LTEXT("OpenCCpp"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, //同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi {F_ACTIVATE_SQLPLUS, LTEXT("ActivateSQLPLUS"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, /* Oracle SQL*Plusをアクティブ表示 */ {F_PLSQL_COMPILE_ON_SQLPLUS, LTEXT("ExecSQLPLUS"), {VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY}, VT_EMPTY, NULL}, /* Oracle SQL*Plusで実行 */ @@ -915,8 +915,8 @@ BOOL CSMacroMgr::CanFuncIsKeyMacro( int nFuncID ) // case F_PRINT_DIALOG ://印刷ダイアログ // case F_PRINT_PREVIEW ://印刷プレビュー // case F_PRINT_PAGESETUP ://印刷ページ設定 //Sept. 14, 2000 jepro 「印刷のページレイアウトの設定」から変更 -// case F_OPEN_HfromtoC: ://同名のC/C++ヘッダ(ソース)を開く //Feb. 9, 2001 JEPRO 追加 -// case F_OPEN_HHPP ://同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 +// case F_OPEN_HfromtoC: ://同名のC/C++ヘッダー(ソース)を開く //Feb. 9, 2001 JEPRO 追加 +// case F_OPEN_HHPP ://同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 // case F_OPEN_CCPP ://同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 // case F_ACTIVATE_SQLPLUS :/* Oracle SQL*Plusをアクティブ表示 */ // case F_PLSQL_COMPILE_ON_SQLPLUS :/* Oracle SQL*Plusで実行 */ //Sept. 17, 2000 jepro 説明の「コンパイル」を「実行」に統一 diff --git a/sakura_core/mem/CPoolResource.h b/sakura_core/mem/CPoolResource.h index 577284051e..39a30b074c 100644 --- a/sakura_core/mem/CPoolResource.h +++ b/sakura_core/mem/CPoolResource.h @@ -112,7 +112,7 @@ class CPoolResource : public std::pmr::memory_resource union Node { ~Node() {} T element; // 要素型 - Node* next; // ブロックのヘッダの場合は、次のブロックに繋がる + Node* next; // ブロックのヘッダーの場合は、次のブロックに繋がる // 解放後の未割当領域の場合は次の未割当領域に繋がる }; diff --git a/sakura_core/outline/CDlgFuncList.cpp b/sakura_core/outline/CDlgFuncList.cpp index 2bbd17e73a..7996231c27 100644 --- a/sakura_core/outline/CDlgFuncList.cpp +++ b/sakura_core/outline/CDlgFuncList.cpp @@ -740,7 +740,7 @@ void CDlgFuncList::SetData() ::ShowWindow( GetItemHwnd( IDC_COMBO_nSortType ), SW_HIDE ); ::ShowWindow( GetItemHwnd( IDC_STATIC_nSortType ), SW_HIDE ); //ListView_SortItems( hwndList, CompareFunc_Asc, (LPARAM)this ); // 2005.04.05 zenryaku ソート状態を保持 - SortListView( hwndList, m_nSortCol ); // 2005.04.23 genta 関数化(ヘッダ書き換えのため) + SortListView( hwndList, m_nSortCol ); // 2005.04.23 genta 関数化(ヘッダー書き換えのため) } //2002.02.08 hor @@ -2102,7 +2102,7 @@ BOOL CDlgFuncList::OnNotify(NMHDR* pNMHDR) } /*! 指定されたカラムでリストビューをソートする． - 同時にヘッダも書き換える． + 同時にヘッダーも書き換える． ソート後はフォーカスが画面内に現れるように表示位置を調整する． diff --git a/sakura_core/parse/CWordParse.cpp b/sakura_core/parse/CWordParse.cpp index 829455ad58..28ee29cab8 100644 --- a/sakura_core/parse/CWordParse.cpp +++ b/sakura_core/parse/CWordParse.cpp @@ -477,7 +477,7 @@ BOOL IsURL( if( wc_to_c(*begin)==0 ) return FALSE; /* 2バイト文字 */ if( 0 < url_char[wc_to_c(*begin)] ){ /* URL開始文字 */ for(urlp = &url_table[url_char[wc_to_c(*begin)]-1]; urlp->name[0] == wc_to_c(*begin); urlp++){ /* URLテーブルを探索 */ - if( (urlp->length <= end - begin) && (wmemcmp(urlp->name, begin, urlp->length) == 0) ){ /* URLヘッダは一致した */ + if( (urlp->length <= end - begin) && (wmemcmp(urlp->name, begin, urlp->length) == 0) ){ /* URLヘッダーは一致した */ if( urlp->is_mail ){ /* メール専用の解析へ */ if( IsMailAddress(begin, urlp->length, end - begin - urlp->length, pnMatchLen) ){ *pnMatchLen = *pnMatchLen + urlp->length; @@ -488,7 +488,7 @@ BOOL IsURL( for(i = urlp->length; i < end - begin; i++){ /* 通常の解析へ */ if( wc_to_c(begin[i])==0 || (!(url_char[wc_to_c(begin[i])])) ) break; /* 終端に達した */ } - if( i == urlp->length ) return FALSE; /* URLヘッダだけ */ + if( i == urlp->length ) return FALSE; /* URLヘッダーだけ */ *pnMatchLen = i; return TRUE; } diff --git a/sakura_core/print/CPrint.cpp b/sakura_core/print/CPrint.cpp index 5ebe659879..6c38e2463f 100644 --- a/sakura_core/print/CPrint.cpp +++ b/sakura_core/print/CPrint.cpp @@ -639,7 +639,7 @@ int CPrint::CalculatePrintableLines( PRINTSETTING *pPS, int nPaperAllHeight ) } /*! - ヘッダ高さの計算(行送り分こみ) + ヘッダー高さの計算(行送り分こみ) @date 2013.05.16 Uchi 新規作成 */ int CPrint::CalcHeaderHeight( PRINTSETTING* pPS ) @@ -664,7 +664,7 @@ int CPrint::CalcHeaderHeight( PRINTSETTING* pPS ) } /*! - フッタ高さの計算(行送り分こみ) + フッター高さの計算(行送り分こみ) @date 2013.05.16 Uchi 新規作成 */ int CPrint::CalcFooterHeight( PRINTSETTING* pPS ) diff --git a/sakura_core/print/CPrint.h b/sakura_core/print/CPrint.h index 44c7232d38..3b544d50e1 100644 --- a/sakura_core/print/CPrint.h +++ b/sakura_core/print/CPrint.h @@ -110,16 +110,16 @@ struct PRINTSETTING { bool m_bPrintLineNumber; /*!< 行番号を印刷する */ MYDEVMODE m_mdmDevMode; /*!< プリンタ設定 DEVMODE用 */ - BOOL m_bHeaderUse[3]; /* ヘッダが使われているか？ */ - EDIT_CHAR m_szHeaderForm[3][HEADER_MAX]; /* 0:左寄せヘッダ。1:中央寄せヘッダ。2:右寄せヘッダ。*/ - BOOL m_bFooterUse[3]; /* フッタが使われているか？ */ - EDIT_CHAR m_szFooterForm[3][FOOTER_MAX]; /* 0:左寄せフッタ。1:中央寄せフッタ。2:右寄せフッタ。*/ - - // ヘッダ/フッタのフォント(lfFaceNameが設定されていなければ半角/全角フォントを使用) - LOGFONT m_lfHeader; // ヘッダフォント用LOGFONT構造体 - int m_nHeaderPointSize; // ヘッダフォントポイントサイズ - LOGFONT m_lfFooter; // フッタフォント用LOGFONT構造体 - int m_nFooterPointSize; // フッタフォントポイントサイズ + BOOL m_bHeaderUse[3]; /* ヘッダーが使われているか？ */ + EDIT_CHAR m_szHeaderForm[3][HEADER_MAX]; /* 0:左寄せヘッダー。1:中央寄せヘッダー。2:右寄せヘッダー。*/ + BOOL m_bFooterUse[3]; /* フッターが使われているか？ */ + EDIT_CHAR m_szFooterForm[3][FOOTER_MAX]; /* 0:左寄せフッター。1:中央寄せフッター。2:右寄せフッター。*/ + + // ヘッダー/フッターのフォント(lfFaceNameが設定されていなければ半角/全角フォントを使用) + LOGFONT m_lfHeader; // ヘッダーフォント用LOGFONT構造体 + int m_nHeaderPointSize; // ヘッダーフォントポイントサイズ + LOGFONT m_lfFooter; // フッターフォント用LOGFONT構造体 + int m_nFooterPointSize; // フッターフォントポイントサイズ }; /*----------------------------------------------------------------------- @@ -154,7 +154,7 @@ class CPrint static int CalculatePrintableColumns( PRINTSETTING*, int width, int nLineNumberColumns ); static int CalculatePrintableLines( PRINTSETTING*, int height ); - /* ヘッダ・フッタの高さ計算 */ + /* ヘッダー・フッターの高さ計算 */ static int CalcHeaderHeight( PRINTSETTING* ); static int CalcFooterHeight( PRINTSETTING* ); public: diff --git a/sakura_core/print/CPrintPreview.cpp b/sakura_core/print/CPrintPreview.cpp index 5044dfe97a..05bf6451b3 100644 --- a/sakura_core/print/CPrintPreview.cpp +++ b/sakura_core/print/CPrintPreview.cpp @@ -264,7 +264,7 @@ LRESULT CPrintPreview::OnPaint( int nHeaderHeight = CPrint::CalcHeaderHeight( m_pPrintSetting ); - // ヘッダ + // ヘッダー if( nHeaderHeight ){ DrawHeaderFooter( hdc, cRect, true ); } @@ -281,7 +281,7 @@ LRESULT CPrintPreview::OnPaint( pStrategyStart ); - // フッタ + // フッター if( CPrint::CalcFooterHeight( m_pPrintSetting ) ){ DrawHeaderFooter( hdc, cRect, false ); } @@ -1136,7 +1136,7 @@ void CPrintPreview::OnPrint( void ) cRect.top = nDirectY * ( m_pPrintSetting->m_nPrintMarginTY - m_nPreview_PaperOffsetTop + 5 ); cRect.bottom = nDirectY * ( m_nPreview_PaperAllHeight - (m_pPrintSetting->m_nPrintMarginBY + m_nPreview_PaperOffsetTop + 5) ); - /* ヘッダ・フッタの$pを展開するために、m_nCurPageNumを保持 */ + /* ヘッダー・フッターの$pを展開するために、m_nCurPageNumを保持 */ WORD nCurPageNumOld = m_nCurPageNum; CColorStrategy* pStrategy = DrawPageTextFirst( m_nCurPageNum ); for( i = 0; i < nNum; ++i ){ @@ -1166,7 +1166,7 @@ void CPrintPreview::OnPrint( void ) int nHeaderHeight = CPrint::CalcHeaderHeight( m_pPrintSetting ); - // ヘッダ印刷 + // ヘッダー印刷 if( nHeaderHeight ){ DrawHeaderFooter( hdc, cRect, true ); } @@ -1193,7 +1193,7 @@ void CPrintPreview::OnPrint( void ) pStrategy ); - // フッタ印刷 + // フッター印刷 if( CPrint::CalcFooterHeight( m_pPrintSetting ) ){ DrawHeaderFooter( hdc, cRect, false ); } @@ -1235,7 +1235,7 @@ static void Tab2Space(wchar_t* pTrg) } } -/*! 印刷/印刷プレビュー ヘッダ･フッタの描画 +/*! 印刷/印刷プレビュー ヘッダー･フッターの描画 */ void CPrintPreview::DrawHeaderFooter( HDC hdc, const CMyRect& rect, bool bHeader ) { diff --git a/sakura_core/print/CPrintPreview.h b/sakura_core/print/CPrintPreview.h index a6e8af3712..110774bd47 100644 --- a/sakura_core/print/CPrintPreview.h +++ b/sakura_core/print/CPrintPreview.h @@ -188,7 +188,7 @@ class CPrintPreview { int GetAllPageNum(){ return m_nAllPageNum; } /* 現在のページ */ /* - || ヘッダ・フッタ + || ヘッダー・フッター */ void SetHeader(char* pszWork[]); // &fなどを登録 void SetFooter(char* pszWork[]); // &p/&Pなどを登録 diff --git a/sakura_core/sakura.hh b/sakura_core/sakura.hh index 0b2b41ac11..1bd1bd54f0 100644 --- a/sakura_core/sakura.hh +++ b/sakura_core/sakura.hh @@ -52,7 +52,7 @@ #define HLP000162 162 //印刷 #define HLP000120 120 //印刷プレビュー #define HLP000122 122 //ページ設定 -#define HLP000192 192 //同名のC/C++ヘッダ(ソース)を開く +#define HLP000192 192 //同名のC/C++ヘッダー(ソース)を開く #define HLP000132 132 //Oracle SQL*Plusをアクティブ表示 #define HLP000027 27 //Oracle SQL*Plusで実行 #define HLP000121 121 //ブラウズ @@ -294,7 +294,7 @@ #define HLP000100 100 //ヘルプ目次 #define HLP000101 101 //キーワード検索 #define HLP000189 189 //コマンド一覧 -//#define HLP000024 24 //同名のC/C++ヘッダファイルを開く +//#define HLP000024 24 //同名のC/C++ヘッダーファイルを開く //#define HLP000026 26 //同名のC/C++ソースファイルを開く #define HLP000198 198 //テキストを１行下へスクロール #define HLP000199 199 //テキストを１行上へスクロール diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index fc3d499df3..3e088c3d9f 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -1254,7 +1254,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,140,174,10 CONTROL "ファイルを開いたときにブックマークを復元する(&B)",IDC_CHECK_RestoreBookmarks, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,155,214,10 - CONTROL "ファイルを開いたときにMIMEエンコードされたヘッダをデコードする(&D)",IDC_CHECK_AutoMIMEDecode, + CONTROL "ファイルを開いたときにMIMEエンコードされたヘッダーをデコードする(&D)",IDC_CHECK_AutoMIMEDecode, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,169,231,10 CONTROL "前回と異なる文字コードのとき問い合わせを行う(&Q)",IDC_CHECK_QueryIfCodeChange, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,182,223,13 @@ -2273,7 +2273,7 @@ END STRINGTABLE BEGIN - F_OPEN_HfromtoC "同名のC/C++ヘッダ(ソース)を開く" + F_OPEN_HfromtoC "同名のC/C++ヘッダー(ソース)を開く" F_ACTIVATE_SQLPLUS "SQL*Plusをアクティブ表示" F_PLSQL_COMPILE_ON_SQLPLUS "SQL*Plusで実行" END @@ -2959,7 +2959,7 @@ BEGIN STR_DLGCTRLCODE_NAME "名前" STR_DLGCTRLCODE_DESC "説明" STR_ERR_DLGCTL5 "空文字" - STR_ERR_DLGCTL6 "ヘッダ開始" + STR_ERR_DLGCTL6 "ヘッダー開始" STR_ERR_DLGCTL7 "テキスト開始" STR_ERR_DLGCTL8 "テキスト終了" STR_ERR_DLGCTL9 "転送終了" @@ -3509,7 +3509,7 @@ BEGIN STR_ERR_CEDITVIEW_CMD05 "タグファイルを作成中です。" STR_ERR_CEDITVIEW_CMD06 "タグ作成コマンド実行は失敗しました。\n\n%hs" STR_ERR_CEDITVIEW_CMD07 "タグファイルの作成が終了しました。" - STR_ERR_CEDITVIEW_CMD08 "C/C++ヘッダファイルのオープンに失敗しました。" + STR_ERR_CEDITVIEW_CMD08 "C/C++ヘッダーファイルのオープンに失敗しました。" STR_ERR_CEDITVIEW_CMD09 "C/C++ソースファイルのオープンに失敗しました。" STR_ERR_CEDITVIEW_CMD10 "クリップボードに有効なデータがありません！" STR_ERR_CEDITVIEW_CMD11 "最後まで置換しました。" diff --git a/sakura_core/typeprop/CImpExpManager.cpp b/sakura_core/typeprop/CImpExpManager.cpp index 91f8a5265a..8d5910770c 100644 --- a/sakura_core/typeprop/CImpExpManager.cpp +++ b/sakura_core/typeprop/CImpExpManager.cpp @@ -566,7 +566,7 @@ bool CImpExpColors::Import( const wstring& sFileName, wstring& sErrMsg ) } /* ファイル先頭 */ - //ヘッダ読取 + //ヘッダー読取 wstring szHeader = in.ReadLineW(); if(szHeader.length()>=2) { //コメントを抜く @@ -910,7 +910,7 @@ bool CImpExpKeybind::Import( const wstring& sFileName, wstring& sErrMsg ) sErrMsg += sFileName; return false; } - // ヘッダチェック + // ヘッダーチェック wstring szLine = in.ReadLineW(); bVer2 = true; if ( wcscmp(szLine.c_str(), WSTR_KEYBIND_HEAD2) != 0) bVer2 = false; @@ -1034,7 +1034,7 @@ bool CImpExpKeybind::Export( const wstring& sFileName, wstring& sErrMsg ) // 書き込みモード設定 cProfile.SetWritingMode(); - // ヘッダ + // ヘッダー StaticString szKeydataHead = WSTR_KEYBIND_HEAD4; cProfile.IOProfileData( szSecInfo, L"KEYBIND_VERSION", szKeydataHead ); cProfile.IOProfileData(szSecInfo, L"KEYBIND_COUNT", m_Common.m_sKeyBind.m_nKeyNameArrNum ); @@ -1060,7 +1060,7 @@ bool CImpExpCustMenu::Import( const wstring& sFileName, wstring& sErrMsg ) { const auto& strPath = sFileName; - //ヘッダ確認 + //ヘッダー確認 CTextInputStream in(strPath.c_str()); if (!in) { sErrMsg = LS(STR_IMPEXP_ERR_FILEOPEN); @@ -1101,14 +1101,14 @@ bool CImpExpCustMenu::Export( const wstring& sFileName, wstring& sErrMsg ) out.Close(); /* カスタムメニュー情報 */ - //ヘッダ + //ヘッダー CDataProfile cProfile; CommonSetting_CustomMenu* menu=&m_Common.m_sCustomMenu; // 書き込みモード設定 cProfile.SetWritingMode(); - //ヘッダ + //ヘッダー cProfile.IOProfileData(szSecInfo, L"MENU_VERSION", StringBufferW(WSTR_CUSTMENU_HEAD_V2)); int iWork = MAX_CUSTOM_MENU; cProfile.IOProfileData(szSecInfo, L"MAX_CUSTOM_MENU", iWork ); @@ -1224,7 +1224,7 @@ bool CImpExpMainMenu::Import( const wstring& sFileName, wstring& sErrMsg ) { const auto& strPath = sFileName; - //ヘッダ確認 + //ヘッダー確認 CTextInputStream in(strPath.c_str()); if (!in) { sErrMsg = LS(STR_IMPEXP_ERR_FILEOPEN); @@ -1264,14 +1264,14 @@ bool CImpExpMainMenu::Export( const wstring& sFileName, wstring& sErrMsg ) out.Close(); - //ヘッダ + //ヘッダー CDataProfile cProfile; CommonSetting_MainMenu* menu=&m_Common.m_sMainMenu; // 書き込みモード設定 cProfile.SetWritingMode(); - //ヘッダ + //ヘッダー cProfile.IOProfileData(szSecInfo, L"MENU_VERSION", StringBufferW(WSTR_MAINMENU_HEAD_V1)); //内容 diff --git a/sakura_core/types/CType_Html.cpp b/sakura_core/types/CType_Html.cpp index 693969c10f..2b72af106e 100644 --- a/sakura_core/types/CType_Html.cpp +++ b/sakura_core/types/CType_Html.cpp @@ -73,7 +73,7 @@ void CDocOutline::MakeTopicList_html(CFuncInfoArr* pcFuncInfoArr, bool bXml) bool bCDATA = false; bool bParaTag = false; // 2008.08.15 aroka - /* ネストの深さは、nMaxStackレベルまで、ひとつのヘッダは、最長32文字まで区別 + /* ネストの深さは、nMaxStackレベルまで、ひとつのヘッダーは、最長32文字まで区別 （32文字まで同じだったら同じものとして扱います） */ // 2014.12.25 ネスト32→64 diff --git a/sakura_core/types/CType_Text.cpp b/sakura_core/types/CType_Text.cpp index 7114b7aac5..b3cdc52281 100644 --- a/sakura_core/types/CType_Text.cpp +++ b/sakura_core/types/CType_Text.cpp @@ -99,7 +99,7 @@ void CDocOutline::MakeTopicList_txt( CFuncInfoArr* pcFuncInfoArr ) const wchar_t* pszStarts = GetDllShareData().m_Common.m_sFormat.m_szMidashiKigou; int nStartsLen = wcslen( pszStarts ); - /* ネストの深さは、nMaxStackレベルまで、ひとつのヘッダは、最長32文字まで区別 + /* ネストの深さは、nMaxStackレベルまで、ひとつのヘッダーは、最長32文字まで区別 （32文字まで同じだったら同じものとして扱います） */ const int nMaxStack = 32; // ネストの最深 diff --git a/sakura_core/uiparts/CMenuDrawer.cpp b/sakura_core/uiparts/CMenuDrawer.cpp index 40f574b2c8..eb12a77163 100644 --- a/sakura_core/uiparts/CMenuDrawer.cpp +++ b/sakura_core/uiparts/CMenuDrawer.cpp @@ -122,8 +122,8 @@ CMenuDrawer::CMenuDrawer() /* 13 */ F_PRINT /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //印刷 /* 14 */ F_PRINT_PREVIEW /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //印刷プレビュー /* 15 */ F_PRINT_PAGESETUP /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //印刷ページ設定 //Sept. 21, 2000 JEPRO 追加 -/* 16 */ F_OPEN_HfromtoC /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //同名のC/C++ヘッダ(ソース)を開く //Feb. 7, 2001 JEPRO 追加 -/* 17 */ F_DISABLE /*F_OPEN_HHPP*/ /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //同名のC/C++ヘッダファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi +/* 16 */ F_OPEN_HfromtoC /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //同名のC/C++ヘッダー(ソース)を開く //Feb. 7, 2001 JEPRO 追加 +/* 17 */ F_DISABLE /*F_OPEN_HHPP*/ /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //同名のC/C++ヘッダーファイルを開く //Feb. 9, 2001 jepro「.cまたは.cppと同名の.hを開く」から変更 del 2008/6/23 Uchi /* 18 */ F_DISABLE /*F_OPEN_CCPP*/ /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //同名のC/C++ソースファイルを開く //Feb. 9, 2001 jepro「.hと同名の.c(なければ.cpp)を開く」から変更 del 2008/6/23 Uchi /* 19 */ F_ACTIVATE_SQLPLUS /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //Oracle SQL*Plusをアクティブ表示 */ //Sept. 20, 2000 JEPRO 追加 /* 20 */ F_PLSQL_COMPILE_ON_SQLPLUS /* , TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0 */, //Oracle SQL*Plusで実行 */ //Sept. 17, 2000 jepro 説明の「コンパイル」を「実行」に統一 diff --git a/sakura_core/util/std_macro.h b/sakura_core/util/std_macro.h index 1b0babb41a..4a6a885566 100644 --- a/sakura_core/util/std_macro.h +++ b/sakura_core/util/std_macro.h @@ -34,7 +34,7 @@ 2007.10.18 kobake テンプレート式 min とか max とか。 - どっかの標準ヘッダに、同じようなものがあった気がするけど、 + どっかの標準ヘッダーに、同じようなものがあった気がするけど、 NOMINMAX を定義するにしても、なんだか min とか max とかいう名前だと、 テンプレートを呼んでるんだかマクロを呼んでるんだか訳分かんないので、 明示的に「t_～」という名前を持つ関数を用意。 diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 146f79cba7..9fbe8c750f 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -140,7 +140,7 @@ class CTextWidthCalc enum StaticMagicNambers{ //! スクロールバーとアイテムの間の隙間 WIDTH_MARGIN_SCROLLBER = 8, - //! リストビューヘッダ マージン + //! リストビューヘッダー マージン WIDTH_LV_HEADER = 17, //! リストビューのマージン WIDTH_LV_ITEM_NORMAL = 14, diff --git a/sakura_core/view/CEditView.h b/sakura_core/view/CEditView.h index 49c3bb00ff..7d0533e8f7 100644 --- a/sakura_core/view/CEditView.h +++ b/sakura_core/view/CEditView.h @@ -74,13 +74,13 @@ class CViewFont; class CRuler; -class CDropTarget; /// 2002/2/3 aroka ヘッダ軽量化 +class CDropTarget; /// 2002/2/3 aroka ヘッダー軽量化 class COpeBlk;/// class CSplitBoxWnd;/// class CRegexKeyword;/// -class CAutoMarkMgr; /// 2002/2/3 aroka ヘッダ軽量化 to here -class CEditDoc; // 2002/5/13 YAZAKI ヘッダ軽量化 -class CLayout; // 2002/5/13 YAZAKI ヘッダ軽量化 +class CAutoMarkMgr; /// 2002/2/3 aroka ヘッダー軽量化 to here +class CEditDoc; // 2002/5/13 YAZAKI ヘッダー軽量化 +class CLayout; // 2002/5/13 YAZAKI ヘッダー軽量化 class CMigemo; // 2004.09.14 isearch struct SColorStrategyInfo; struct CColor3Setting; diff --git a/sakura_core/view/CEditView_Command.cpp b/sakura_core/view/CEditView_Command.cpp index cd5fc838cb..c7cd2e623b 100644 --- a/sakura_core/view/CEditView_Command.cpp +++ b/sakura_core/view/CEditView_Command.cpp @@ -185,7 +185,7 @@ bool CEditView::TagJumpSub( /*! 指定拡張子のファイルに対応するファイルを開く補助関数 - @date 2003.06.28 Moca ヘッダ・ソースファイルオープン機能のコードを統合 + @date 2003.06.28 Moca ヘッダー・ソースファイルオープン機能のコードを統合 @date 2008.04.09 ryoji 処理対象(file_ext)と開く対象(open_ext)の扱いが逆になっていたのを修正 */ BOOL CEditView::OPEN_ExtFromtoExt( diff --git a/sakura_core/view/CEditView_Command_New.cpp b/sakura_core/view/CEditView_Command_New.cpp index a9e34b6343..54c7b63b23 100644 --- a/sakura_core/view/CEditView_Command_New.cpp +++ b/sakura_core/view/CEditView_Command_New.cpp @@ -26,7 +26,7 @@ #include "charset/charcode.h" #include "COpe.h" /// 2002/2/3 aroka from here #include "COpeBlk.h" /// -#include "doc/CEditDoc.h" // 2002/5/13 YAZAKI ヘッダ整理 +#include "doc/CEditDoc.h" // 2002/5/13 YAZAKI ヘッダー整理 #include "doc/CDocReader.h" #include "doc/layout/CLayout.h" #include "doc/logic/CDocLine.h" diff --git a/tests/unittest.md b/tests/unittest.md index 661b0a9716..4e3e1dd012 100644 --- a/tests/unittest.md +++ b/tests/unittest.md @@ -83,4 +83,4 @@ GUI でステップ実行することができます。 ## インクルードディレクトリ 単体テスト用の [CMakeLists.txt](unittests/CMakeLists.txt) で [サクラエディタ用のディレクトリ](../sakura_core) を -インクルードディレクトリに指定しているので、そこからの相対パスを指定すれば、サクラエディタのヘッダをインクルードできます。 +インクルードディレクトリに指定しているので、そこからの相対パスを指定すれば、サクラエディタのヘッダーをインクルードできます。 diff --git a/tests/unittests/test-is_mailaddress.cpp b/tests/unittests/test-is_mailaddress.cpp index 3b131ce3f4..06c9c7e0a1 100644 --- a/tests/unittests/test-is_mailaddress.cpp +++ b/tests/unittests/test-is_mailaddress.cpp @@ -35,7 +35,7 @@ #include #include "parse/CWordParse.h" -// テスト対象関数のヘッダファイル +// テスト対象関数のヘッダーファイル //#include "util/string_ex.h" //依存関係が多いのでテスト対象の関数定義のみ抜き出し BOOL IsMailAddress(const wchar_t* pszBuf, int nBufLen, int* pnAddressLength); From 5fd700f29c96c3ef3238ee60e00e5ca523bfa43d Mon Sep 17 00:00:00 2001 From: Mari Sano Date: Tue, 3 May 2022 16:31:23 +0900 Subject: [PATCH 116/129] =?UTF-8?q?=E3=80=8C=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E3=80=8D=E3=81=AE=E3=82=AB=E3=82=BF=E3=82=AB=E3=83=8A?= =?UTF-8?q?=E8=A1=A8=E8=A8=98=E3=82=92=E7=B5=B1=E4=B8=80=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit コメントやドキュメントに現れる「ユーザー」のカタカナ表記を統一します。 「ユーザーにとっての利便性」を表す「ユーザビリティ」やVB用語「ユーザ定義型」は置換対象から除外します。 修正対象にissファイルが含まれるので、インストーラーにも影響する修正です。 --- CHANGELOG.md | 2 +- help/plugin/Text/overview.html | 2 +- help/sakura/res/HLP000078.html | 2 +- help/sakura/res/HLP000083.html | 6 +- help/sakura/res/HLP000144.html | 2 +- help/sakura/res/HLP000204.html | 2 +- help/sakura/res/HLP000261.html | 2 +- help/sakura/res/HLP000300.html | 2 +- help/sakura/res/HLP_UR009.html | 4 +- help/sakura/res/HLP_UR014.html | 6 +- help/sakura/res/HLP_UR017.html | 2 +- installer/readme.md | 2 +- installer/sakura-common.iss | 8 +-- installer/sinst_src/keyword/php.khp | 62 +++++++++---------- sakura_core/CCodeChecker.cpp | 4 +- sakura_core/CLoadAgent.cpp | 2 +- sakura_core/CReadManager.cpp | 2 +- sakura_core/_main/CControlProcess.cpp | 16 ++--- sakura_core/_main/CProcess.cpp | 2 +- .../dlg/CDlgOpenFile_CommonFileDialog.cpp | 2 +- sakura_core/doc/CDocFileOperation.cpp | 2 +- sakura_core/env/CShareData.cpp | 6 +- sakura_core/env/DLLSHAREDATA.h | 2 +- sakura_core/func/CFuncLookup.cpp | 2 +- sakura_core/macro/CPPA.cpp | 2 +- sakura_core/parse/CWordParse.cpp | 6 +- sakura_core/parse/CWordParse.h | 2 +- sakura_core/recent/CRecentCmd.cpp | 2 +- sakura_core/recent/CRecentCurDir.cpp | 2 +- sakura_core/recent/CRecentEditNode.cpp | 2 +- sakura_core/recent/CRecentExceptMru.cpp | 2 +- sakura_core/recent/CRecentExcludeFile.cpp | 2 +- sakura_core/recent/CRecentExcludeFolder.cpp | 2 +- sakura_core/recent/CRecentFile.cpp | 2 +- sakura_core/recent/CRecentFolder.cpp | 2 +- sakura_core/recent/CRecentGrepFile.cpp | 2 +- sakura_core/recent/CRecentGrepFolder.cpp | 2 +- sakura_core/recent/CRecentReplace.cpp | 2 +- sakura_core/recent/CRecentSearch.cpp | 2 +- sakura_core/recent/CRecentTagjumpKeyword.cpp | 2 +- sakura_core/sakura_rc.rc | 2 +- sakura_core/typeprop/CPropTypesRegex.cpp | 2 +- sakura_core/types/CType_Perl.cpp | 2 +- sakura_core/types/CType_Tex.cpp | 4 +- sakura_core/types/CType_Text.cpp | 2 +- sakura_core/types/CType_Vb.cpp | 2 +- sakura_core/util/MessageBoxF.h | 2 +- sakura_core/view/colors/EColorIndexType.h | 2 +- tests/unittests/test-cfileext.cpp | 6 +- tests/unittests/test-file.cpp | 8 +-- 50 files changed, 106 insertions(+), 106 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a789a3d1a0..7d57214bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -332,7 +332,7 @@ - CodeFactor の badge を追加 [\#693](https://github.com/sakura-editor/sakura/pull/693) ([m-tmatma](https://github.com/m-tmatma)) - WinMainを整理したい [\#692](https://github.com/sakura-editor/sakura/pull/692) ([berryzplus](https://github.com/berryzplus)) - 8bit256色ツールアイコンを取り込む [\#690](https://github.com/sakura-editor/sakura/pull/690) ([berryzplus](https://github.com/berryzplus)) -- マルチユーザ設定を有効にする [\#689](https://github.com/sakura-editor/sakura/pull/689) ([berryzplus](https://github.com/berryzplus)) +- マルチユーザー設定を有効にする [\#689](https://github.com/sakura-editor/sakura/pull/689) ([berryzplus](https://github.com/berryzplus)) - ツール類のコンパイルオプションに/MPを付ける [\#688](https://github.com/sakura-editor/sakura/pull/688) ([berryzplus](https://github.com/berryzplus)) - 「このファイルのパス名をコピー」 をタブメニューにも追加する [\#666](https://github.com/sakura-editor/sakura/pull/666) ([m-tmatma](https://github.com/m-tmatma)) - 縦スクロール時に不必要にルーラーの再描画がされないように対策 [\#660](https://github.com/sakura-editor/sakura/pull/660) ([beru](https://github.com/beru)) diff --git a/help/plugin/Text/overview.html b/help/plugin/Text/overview.html index 0b25d71ba1..1046afc117 100644 --- a/help/plugin/Text/overview.html +++ b/help/plugin/Text/overview.html @@ -39,7 +39,7 @@

          インストール

          プラグインをインストールすると、設定ファイルがあるフォルダの下にpluginsフォルダができ、その配下にZIPファイルの中身が展開されます。 -ユーザ別設定が有効な場合はC:\Users\(ユーザ名)\AppData\Roaming\sakura\plugins、そうでなければC:\Program Files(x86)\sakura\pluginsにあるはずです。
          +ユーザー別設定が有効な場合はC:\Users\(ユーザー名)\AppData\Roaming\sakura\plugins、そうでなければC:\Program Files(x86)\sakura\pluginsにあるはずです。
          以下、pluginsをプラグインフォルダと呼び、その下のプラグインごとのフォルダを個別フォルダと呼びます。

        diff --git a/help/sakura/res/HLP000078.html b/help/sakura/res/HLP000078.html index c667829c96..f12e621e6f 100644 --- a/help/sakura/res/HLP000078.html +++ b/help/sakura/res/HLP000078.html @@ -49,7 +49,7 @@

        UserRootFolder

        無題 0アプリケーションデータフォルダ（デフォルト）
        %APPDATA% -1ユーザフォルダ
        %USERPROFILE% +1ユーザーフォルダ
        %USERPROFILE% 2ドキュメントフォルダ
        \My Documents 3デスクトップフォルダ
        \デスクトップ diff --git a/help/sakura/res/HLP000083.html b/help/sakura/res/HLP000083.html index f6cf801e49..c7b8ef7c2b 100644 --- a/help/sakura/res/HLP000083.html +++ b/help/sakura/res/HLP000083.html @@ -40,14 +40,14 @@

        共通設定 『ファイル』プロパティ

        編集中のファイルを、他のプログラムから保護するための機能です。例えばサーバーにあるファイルを、複数の人が同時に更新してわけがわからなる等ということがなくなります。
        [排他制御] コンボボックス
        しない
        - 排他制御をしない場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザ(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、参照・更新することができます。
        + 排他制御をしない場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザー(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、参照・更新することができます。
        「更新の監視」を有効にしておくと、サクラエディタで編集中のファイルが更新された事を検出してあなたに通知します。

        上書きを禁止する
        - 他プロセスからの上書きを禁止する場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザ(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、更新が不可能で参照のみ可能になります。
        + 他プロセスからの上書きを禁止する場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザー(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、更新が不可能で参照のみ可能になります。

        読み書きを禁止する
        - 他プロセスからの上書きを禁止する場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザ(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、参照も更新も不可能になります。
        + 他プロセスからの上書きを禁止する場合は、サクラエディタで編集中のファイルを、他のアプリケーションや他のコンピュータのユーザー(ネットワーク経由でそのファイルが参照・更新可能な環境にある場合)が、参照も更新も不可能になります。

        □上書き禁止検出時は編集禁止にする
        有効にしておくと、上書き禁止の状態で編集できなくなります。
        diff --git a/help/sakura/res/HLP000144.html b/help/sakura/res/HLP000144.html index 752bdc6037..d86d53ee04 100644 --- a/help/sakura/res/HLP000144.html +++ b/help/sakura/res/HLP000144.html @@ -93,7 +93,7 @@

        共通設定 『編集』プロパティ

        ○最近使ったフォルダ
        最近使ったフォルダに設定します。
        ○指定フォルダ
        - ユーザが設定したフォルダに設定します。メタ文字列を含むことができます。
        + ユーザーが設定したフォルダに設定します。メタ文字列を含むことができます。
        (sakura:2.2.0.0以降)新規ウィンドウ、閉じて(無題)などで、無題になった場合、この設定のフォルダへカレントディレクトリを移動します。
        ファイルダイアログの設定が「カレントフォルダ」の場合は、元のウィンドウのカレントディレクトリを引き継ぎます。
        diff --git a/help/sakura/res/HLP000204.html b/help/sakura/res/HLP000204.html index 132c77766e..1b2ecbbe47 100644 --- a/help/sakura/res/HLP000204.html +++ b/help/sakura/res/HLP000204.html @@ -11,7 +11,7 @@

        マクロについて

        -キーマクロの記録によってユーザの操作をマクロとして記録することができます。
        +キーマクロの記録によってユーザーの操作をマクロとして記録することができます。
        この他にマクロファイルを直接記述することによって、キーマクロで記録されない機能も使えるようになります。
        記録・手書きのキーマクロ、WSHマクロとPPAマクロが利用できます。

        diff --git a/help/sakura/res/HLP000261.html b/help/sakura/res/HLP000261.html index 38199045b0..3208854f83 100644 --- a/help/sakura/res/HLP000261.html +++ b/help/sakura/res/HLP000261.html @@ -15,7 +15,7 @@

        あると便利なツール、ファイル

        サクラエディタは、実行ファイル(sakura.exe)と設定ファイル(sakura.ini)のみでも利用できますが、いくつかの機能は、別のファイルが必要です。
        * …フルパッケージ版に同封されています。
        -t …テキストファイルで、ユーザが簡単に作成可能なファイルです。
        +t …テキストファイルで、ユーザーが簡単に作成可能なファイルです。
        b …バイナリファイル
        i …INI形式(に見える)ファイル

        diff --git a/help/sakura/res/HLP000300.html b/help/sakura/res/HLP000300.html index ecdd38e60d..b4a78a2091 100644 --- a/help/sakura/res/HLP000300.html +++ b/help/sakura/res/HLP000300.html @@ -13,7 +13,7 @@

        タイプ (ファイルタイプ, 文書タイプ)

        タイプとはファイルの種類を指し、拡張子によって判断されます。
        -インストール時には以下のようなタイプが定義されていますが、ユーザが自由にタイプ名と識別子を編集可能です（タイプ別設定のダイアログで行う）。
        +インストール時には以下のようなタイプが定義されていますが、ユーザーが自由にタイプ名と識別子を編集可能です（タイプ別設定のダイアログで行う）。
        タイプを定義しておけば、例えばC++言語のソースファイルとテキストファイルで、それぞれ異なった色設定や折り返し桁数の設定などをすることができます。
         
diff --git a/help/sakura/res/HLP_UR009.html b/help/sakura/res/HLP_UR009.html
index 7dbbf6de50..e8bfa254fa 100644
--- a/help/sakura/res/HLP_UR009.html
+++ b/help/sakura/res/HLP_UR009.html
@@ -55,7 +55,7 @@ 
        変更履歴(2002/05/01～)

        
 [機能追加]
        
-・アプリケーションアイコン，Grepアイコンをユーザがカスタマイズ可能に．(by げんた)
        
+・アプリケーションアイコン，Grepアイコンをユーザーがカスタマイズ可能に．(by げんた)
        
 ・sakura.exeと同じディレクトリに，my_appicon.ico, my_grepicon.ico というファイルを置くことで，好きなアイコンをアプリケーションアイコン及びタスクトレイアイコンとして使用できます．
        
 

        
 [バグ修正]
        
@@ -72,7 +72,7 @@ 
        変更履歴(2002/05/01～)

        
 [機能追加]
        
-・ファンクションバーのグループあたりのボタン数を1-12で設定できるように(PC98ユーザに贈る機能) (by もかさん)
        
+・ファンクションバーのグループあたりのボタン数を1-12で設定できるように(PC98ユーザーに贈る機能) (by もかさん)
        
 

        
 [バグ修正]
        
diff --git a/help/sakura/res/HLP_UR014.html b/help/sakura/res/HLP_UR014.html
index f8348020c4..df93e803d3 100644
--- a/help/sakura/res/HLP_UR014.html
+++ b/help/sakura/res/HLP_UR014.html
@@ -58,7 +58,7 @@ 
        Oct 17, 2010 (1.6.6.0)
        
 	
      • 存在しないcursor1.curのsakura.dsp登録を解除 (svn:1829 patches:2992320 dev:5673 ryoji)
        • 
 	
      • Viewウィンドウの遅延作成(ANSI版) (svn:1830 patches:3008991 unicode:1249 もか)
        • 
 	
      • ツールバー折返しの番号ずれ対応 (svn:1833 patches:3026401 dev:5676 syat,もか)
        • 
-	
      • ユーザの意図しないプログラム実行の抑制(A用) (svn:1839 patches:3055711 dev:5679 dev:5685 もか)
        • 
+	
      • ユーザーの意図しないプログラム実行の抑制(A用) (svn:1839 patches:3055711 dev:5679 dev:5685 もか)
        • 
 
 
 
        Sep. 26, 2009 (1.6.5.0)
        
@@ -253,10 +253,10 @@ 
        Sep. 27, 2007 (1.6.0.0)
        
 [機能追加]
        
 
          
 	
        • Grep 画面へのドラッグ＆ドロップ (svn:1117 patches:1786543 bosagami, げんた)
          • 
-	
        • Vista UACとマルチユーザへの対応 (svn:1120 patches:1721425 dev:4809 ryoji)
          • 
+	
        • Vista UACとマルチユーザーへの対応 (svn:1120 patches:1721425 dev:4809 ryoji)
          • 
 	
            
 		
          • sakura.ini等の設定ファイルを個人のプロファイルディレクトリに置ける
            • 
-		
          • 管理者権限とユーザ権限のプロセス混在を防止
            • 
+		
          • 管理者権限とユーザー権限のプロセス混在を防止
            • 
 		
          • sakuextとの連携
            • 
 	
          
 	
        • Pythonアウトライン解析 (svn:1121 patches:1668208 げんた)
          • 
diff --git a/help/sakura/res/HLP_UR017.html b/help/sakura/res/HLP_UR017.html
index 60dd29d9c8..229fc24a21 100644
--- a/help/sakura/res/HLP_UR017.html
+++ b/help/sakura/res/HLP_UR017.html
@@ -150,7 +150,7 @@ 
          Aug. 14, 2016 (2.3.1.0)
          
 
        • 起動時のプロファイルマネージャで新規作成・名前変更で落ちる (svn:4106 upatchid:1059 Moca)
          • 
 
        • マクロ関数InputBoxバッファオーバーラン (svn:4107 upatchid:1058 Moca)
          • 
 
        • プロファイルマネージャで表示直後(default)が削除・名前変更できるバグ (svn:4109 upatchid:1061 Moca)
          • 
-
        • ユーザ別設定のときのマルチプロファイルの場所がおかしい (svn:4112 upatchid:1024 Moca)
          • 
+
        • ユーザー別設定のときのマルチプロファイルの場所がおかしい (svn:4112 upatchid:1024 Moca)
          • 
 
        • EOF直前の改行を改行なしに置換するとEOFの再描画が不足する (svn:4113 upatchid:1008 Moca)
          • 
 
        • プラグインオプションのコンボボックスの高さが不正 (svn:4114 upatchid:1054 Moca)
          • 
 
        • 1行目で前の段落へ移動を実行すると落ちる (svn:4115 upatchid:1023 Moca)
          • 
diff --git a/installer/readme.md b/installer/readme.md
index b9e0d51459..7c58951048 100644
--- a/installer/readme.md
+++ b/installer/readme.md
@@ -139,4 +139,4 @@ https://www.kymoto.org/products/inno-script-studio/downloads
 
 英語版のインストーラーの挙動を確認する場合には、実行環境を英語モードにする必要があります。
 お使いのPCの言語設定を英語に変更するか([こちら](https://www.google.co.jp/search?q=%E8%A8%80%E8%AA%9E+%E6%97%A5%E6%9C%AC%E8%AA%9E+%E8%8B%B1%E8%AA%9E+Windows&oq=%E8%A8%80%E8%AA%9E%E3%80%80%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%80%80%E8%8B%B1%E8%AA%9E%E3%80%80Windows&aqs=chrome..69i57j0l2.5435j0j4&sourceid=chrome&ie=UTF-8)参考)、お使いのPCのリソースに余裕があれば、[VirtualBOX](https://www.virtualbox.org/)等の仮想化ソフトウエアにて、[開発用Windowsマシン](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/)を利用する方法もあります。
-（覚書：この仮想PCのユーザのパスワードは「Passw0rd!」です)
\ No newline at end of file
+（覚書：この仮想PCのユーザーのパスワードは「Passw0rd!」です)
\ No newline at end of file
diff --git a/installer/sakura-common.iss b/installer/sakura-common.iss
index f807ca76c4..8852ea717c 100644
--- a/installer/sakura-common.iss
+++ b/installer/sakura-common.iss
@@ -158,7 +158,7 @@ zh_hans.StartNow=现在启动
 zh_hant.StartNow=現在啟動
 
 en.MultiUser=Install in compatibility mode. When editing system files and programs with user authority, editing results may not be accessible from other applications. (VirtualStore function)
-ja.MultiUser=互換モードでインストールします．システムファイルおよびプログラムをユーザ権限で編集すると編集結果が他のアプリケーションから参照できないことがあります．(VirtualStore機能)
+ja.MultiUser=互換モードでインストールします．システムファイルおよびプログラムをユーザー権限で編集すると編集結果が他のアプリケーションから参照できないことがあります．(VirtualStore機能)
 zh_hans.MultiUser=软件将会以兼容模式安装。使用非管理员用户编辑配置文件时，文件可能无法被管理员用户访问。(VirtualStore功能)
 zh_hant.MultiUser=軟件將會以相容模式安裝。使用非管理員用戶編輯設定檔時，檔案可能無法被管理員用戶訪問。（VirtualStore功能）
 
@@ -168,7 +168,7 @@ zh_hans.InitWiz_Title=配置文件保存位置
 zh_hant.InitWiz_Title=設定檔保存位置
 
 en.InitWiz_SubTitle=Please choose whether you want to save the settings for each user or to the location of the executable file
-ja.InitWiz_SubTitle=設定をユーザ毎に保存するか実行ファイルの場所へ保存するかを選択してください
+ja.InitWiz_SubTitle=設定をユーザー毎に保存するか実行ファイルの場所へ保存するかを選択してください
 zh_hans.InitWiz_SubTitle=选择将Sukura配置文件保存至当前用户或软件目录内
 zh_hant.InitWiz_SubTitle=選擇將Sukura設定檔保存至當前用戶或軟件目錄內
 
@@ -178,7 +178,7 @@ zh_hans.InitWiz_Comment=若您不清楚此选项，请不要修改
 zh_hant.InitWiz_Comment=若您不清楚此選項，請不要修改
 
 en.InitWiz_Check=Manage Preference individually for each user
-ja.InitWiz_Check=設定をユーザ毎に個別に管理する
+ja.InitWiz_Check=設定をユーザー毎に個別に管理する
 zh_hans.InitWiz_Check=将每个用户的配置文件单独保存
 zh_hant.InitWiz_Check=將每個用戶的設定檔單獨保存
 
@@ -188,7 +188,7 @@ zh_hans.ReadyMemo_SaveLocation=设定文件保存位置
 zh_hant.ReadyMemo_SaveLocation=設定檔案保存位置
 
 en.ReadyMemo_UserProfileDir=User-Profile directory
-ja.ReadyMemo_UserProfileDir=ユーザ個別ディレクトリ
+ja.ReadyMemo_UserProfileDir=ユーザー個別ディレクトリ
 zh_hans.ReadyMemo_UserProfileDir=用户配置文件目录
 zh_hant.ReadyMemo_UserProfileDir=用戶設定檔目錄
 
diff --git a/installer/sinst_src/keyword/php.khp b/installer/sinst_src/keyword/php.khp
index cc698eafbe..24a75d76cc 100644
--- a/installer/sinst_src/keyword/php.khp
+++ b/installer/sinst_src/keyword/php.khp
@@ -137,7 +137,7 @@ com_propput /// void com_propput ( resource com_object, string property, mixed v
 com_propset /// void com_propset ( resource com_object, string property, mixed value)\n COMコンポーネントのプロパティに値を代入する 
 com_release /// void com_release ( void)\n コンポーネントリファレンスカウンタを減らす 
 com_set /// void com_set ( resource com_object, string property, mixed value)\n COMコンポーネントのプロパティに値を代入する 
-call_user_method_array /// mixed call_user_method_array ( string method_name, object obj [, array paramarr])\n パラメータの配列を指定してユーザメソッドをコールする 
+call_user_method_array /// mixed call_user_method_array ( string method_name, object obj [, array paramarr])\n パラメータの配列を指定してユーザーメソッドをコールする 
 call_user_method /// mixed call_user_method ( string method_name, object obj [, mixed parameter [, mixed ...]])\n 指定したオブジェクトのユーザーメソッドをコールする 
 class_exists /// bool class_exists ( string class_name)\nクラスが定義済か確認する
 get_class_methods /// array get_class_methods ( string class_name)\nクラスメソッドの名前を連想配列として返す
@@ -459,12 +459,12 @@ dotnet_load /// int dotnet_load ( string assembly_name [, string datatype_name [
 error_log /// int error_log ( string message, int message_type, string [destination], string [extra_headers])\nエラーメッセージを送信する
 error_reporting /// int error_reporting ( int [level])\n出力するPHPエラーの種類を設定する
 restore_error_handler /// void restore_error_handler ( void)\n 以前のエラーハンドラ関数を回復する 
-set_error_handler /// string set_error_handler ( string error_handler)\n ユーザ定義のエラーハンドラ関数を設定する 
-trigger_error /// void trigger_error ( string error_msg, int [error_type])\n ユーザレベルのエラー/警告/通知メッセージを生成する 
-user_error /// void user_error ( string error_msg, int [error_type])\n ユーザレベルのエラー/警告/通知メッセージを発生する 
+set_error_handler /// string set_error_handler ( string error_handler)\n ユーザー定義のエラーハンドラ関数を設定する 
+trigger_error /// void trigger_error ( string error_msg, int [error_type])\n ユーザーレベルのエラー/警告/通知メッセージを生成する 
+user_error /// void user_error ( string error_msg, int [error_type])\n ユーザーレベルのエラー/警告/通知メッセージを発生する 
 fbsql_affected_rows /// int fbsql_affected_rows ( [int link_identifier])\n 直近のFrontBase処理により作用を受けたレコードの数を得る 
 fbsql_autocommit /// bool fbsql_autocommit ( resource link_identifier [, bool OnOff])\nautocommitを有効または無効にする
-fbsql_change_user /// resource fbsql_change_user ( string user, string password [, string database [, int link_identifier]])\n アクティブな接続にログインしているユーザを変更する 
+fbsql_change_user /// resource fbsql_change_user ( string user, string password [, string database [, int link_identifier]])\n アクティブな接続にログインしているユーザーを変更する 
 fbsql_close /// boolean fbsql_close ( [resource link_identifier])\nFrontBase接続を閉じる
 fbsql_commit /// bool fbsql_commit ( [resource link_identifier])\nデータベースへのトランザクションをコミットする
 fbsql_connect /// resource fbsql_connect ( [string hostname [, string username [, string password]]])\nFrontBaseサーバへの接続をオープンする
@@ -664,8 +664,8 @@ ftp_site /// bool ftp_site ( resource ftp_stream, string cmd)\nSITEコマンド
 ftp_size /// int ftp_size ( resource ftp_stream, string remote_file)\n指定したファイルのサイズを返す
 ftp_ssl_connect /// resource ftp_ssl_connect ( string host [, int port [, int timeout]])\nOpens an Secure SSL-FTP connection
 ftp_systype /// string ftp_systype ( resource ftp_stream)\n リモート FTP サーバーのシステム型IDを返す 
-call_user_func_array /// mixed call_user_func_array ( string function_name [, array paramarr])\n パラメータの配列を指定してユーザ関数をコールする 
-call_user_func /// mixed call_user_func ( string function_name [, mixed parameter [, mixed ...]])\n 最初の引数で指定したユーザ関数をコールする 
+call_user_func_array /// mixed call_user_func_array ( string function_name [, array paramarr])\n パラメータの配列を指定してユーザー関数をコールする 
+call_user_func /// mixed call_user_func ( string function_name [, mixed parameter [, mixed ...]])\n 最初の引数で指定したユーザー関数をコールする 
 create_function /// string create_function ( string args, string code)\n匿名(ラムダ形式)関数を作成する
 func_get_arg /// mixed func_get_arg ( int arg_num)\n引数のリストから要素を1つ返す
 func_get_args /// array func_get_args ( void )\n関数の引数リストを配列として返す
@@ -1086,22 +1086,22 @@ ingres_num_rows /// int ingres_num_rows ( resource [link])\n 直近のクエリ
 ingres_pconnect /// resource ingres_pconnect ( string [database], string [username], string [password])\n Ingres II データベースへの持続的接続をオープンする 
 ingres_query /// bool ingres_query ( string query, resource [link])\nIngres II にSQLクエリを送信する
 ingres_rollback /// bool ingres_rollback ( resource [link])\nトランザクションをロールバックする
-ircg_channel_mode /// boolean ircg_channel_mode ( resource connection, string channel, string mode_spec, string nick)\n ユーザ用にチャンネルモードフラグを設定する 
+ircg_channel_mode /// boolean ircg_channel_mode ( resource connection, string channel, string mode_spec, string nick)\n ユーザー用にチャンネルモードフラグを設定する 
 ircg_disconnect /// boolean ircg_disconnect ( resource connection, string reason)\n サーバへの接続を閉じる 
 ircg_fetch_error_msg /// array ircg_fetch_error_msg ( resource connection)\n 以前のircg処理からエラーを返す 
-ircg_get_username /// string ircg_get_username ( int connection)\n 接続用にユーザ名を取得する 
+ircg_get_username /// string ircg_get_username ( int connection)\n 接続用にユーザー名を取得する 
 ircg_html_encode /// boolean ircg_html_encode ( string html_string)\n HTMLで保存された文字列をエンコードする 
-ircg_ignore_add /// boolean ircg_ignore_add ( resource connection, string nick)\n サーバ上の除外リストにユーザを追加する 
-ircg_ignore_del /// boolean ircg_ignore_del ( resource connection, string nick)\n サーバ上の除外リストからユーザを削除する 
+ircg_ignore_add /// boolean ircg_ignore_add ( resource connection, string nick)\n サーバ上の除外リストにユーザーを追加する 
+ircg_ignore_del /// boolean ircg_ignore_del ( resource connection, string nick)\n サーバ上の除外リストからユーザーを削除する 
 ircg_is_conn_alive /// boolean ircg_is_conn_alive ( resource connection)\n 接続ステータスを確認する 
 ircg_join /// boolean ircg_join ( resource connection, string channel)\n 接続中のサーバ上でチャンネルに接続する 
-ircg_kick /// boolean ircg_kick ( resource connection, string channel, string nick, string reason)\n サーバ上のチャネルからユーザを排除する 
+ircg_kick /// boolean ircg_kick ( resource connection, string channel, string nick, string reason)\n サーバ上のチャネルからユーザーを排除する 
 ircg_lookup_format_messages /// boolean ircg_lookup_format_messages ( string name)\n IRCメッセージの表示用文字列フォーマットの設定を選択する 
-ircg_msg /// boolean ircg_msg ( resource connection, string recipient, string message [, boolean suppress])\n サーバ上のチャンネルまたはユーザにメッセージを送信する 
+ircg_msg /// boolean ircg_msg ( resource connection, string recipient, string message [, boolean suppress])\n サーバ上のチャンネルまたはユーザーにメッセージを送信する 
 ircg_nick /// boolean ircg_nick ( resource connection, string nick)\n サーバ上のニックネームを変更する 
 ircg_nickname_escape /// string ircg_nickname_escape ( string nick)\n ニックネームの中の特別な文字がIRC互換となるようにデコードする 
 ircg_nickname_unescape /// string ircg_nickname_unescape ( string nick)\n エンコードされたニックネームをデコードする 
-ircg_notice /// boolean ircg_notice ( resource connection, string , string message)\n サーバ上のユーザに通知を送信する 
+ircg_notice /// boolean ircg_notice ( resource connection, string , string message)\n サーバ上のユーザーに通知を送信する 
 ircg_part /// boolean ircg_part ( resource connection, string channel)\n サーバ上のチャンネルから離脱する 
 ircg_pconnect /// resource ircg_pconnect ( string username [, string server_ip [, int server_port [, string msg_format [, array ctcp_messages [, array user_settings]]]]])\n IRCサーバに接続する 
 ircg_register_format_messages /// boolean ircg_register_format_messages ( string name, array messages)\n IRCメッセージの表示用文字列フォーマットの設定を登録する 
@@ -1109,7 +1109,7 @@ ircg_set_current /// boolean ircg_set_current ( resource connection)\n 出力用
 ircg_set_file /// bool ircg_set_file ( int connection, string path)\n 接続用にログファイルを設定する 
 ircg_set_on_die /// bool ircg_set_on_die ( int connection, string host, int port, string data)\n 接続が終了する際にホスト側で実行されるアクションを設定する 
 ircg_topic /// boolean ircg_topic ( resource connection, string channel, string new_topic)\n サーバ上のチャネル用にトピックを設定する 
-ircg_whois /// boolean ircg_whois ( resource connection, string nick)\n サーバ上のニックネームからユーザ情報を検索する 
+ircg_whois /// boolean ircg_whois ( resource connection, string nick)\n サーバ上のニックネームからユーザー情報を検索する 
 java_last_exception_clear /// void java_last_exception_clear ( void)\n直近の例外をクリアする
 java_last_exception_get /// exception java_last_exception_get ( void)\n直近のJava例外を取得する
 ldap_8859_to_t61 /// string ldap_8859_to_t61 ( string value)\n 8859文字をt61文字に変換する 
@@ -1120,7 +1120,7 @@ ldap_compare /// int ldap_compare ( int link_identifier, string dn, string attri
 ldap_connect /// int ldap_connect ( string [hostname], int [port])\nLDAP サーバーへ接続する
 ldap_count_entries /// int ldap_count_entries ( int link_identifier, int result_identifier)\nサーチ時のエントリ数をカウントする
 ldap_delete /// int ldap_delete ( int link_identifier, string dn)\nディレクトリからエントリを削除する
-ldap_dn2ufn /// string ldap_dn2ufn ( string dn)\n DN をユーザに分かりやすい名前のフォーマットに変換する 
+ldap_dn2ufn /// string ldap_dn2ufn ( string dn)\n DN をユーザーに分かりやすい名前のフォーマットに変換する 
 ldap_err2str /// string ldap_err2str ( int errno)\n LDAP のエラー番号をエラーメッセージ文字列に変換する 
 ldap_errno /// int ldap_errno ( int link_id)\n 直近の LDAP コマンドのLDAP エラー番号を返す 
 ldap_error /// string ldap_error ( int link_id)\n 直近のLDAPコマンドのLDAP エラーメッセージを返す 
@@ -1552,7 +1552,7 @@ defined /// bool defined ( string name)\n 指定した名前の定数が存在
 die /// この関数は\nexit()のエイリアス
 eval /// mixed eval ( string code_str)\n文字列をPHPコードとして評価する
 exit /// void exit ( [string status])\nメッセージを出力し、カレントのスクリプトを終了する
-get_browser /// object get_browser ( string [user_agent])\n ユーザのブラウザの機能を取得する 
+get_browser /// object get_browser ( string [user_agent])\n ユーザーのブラウザの機能を取得する 
 highlight_file /// bool highlight_file ( string filename)\nファイルの構文ハイライト表示
 highlight_string /// bool highlight_string ( string str)\n文字列の構文ハイライト化
 ignore_user_abort /// int ignore_user_abort ( int [setting])\n クライアント接続が断となった時にスクリプトの実行を中断するかどう かを設定する 
@@ -1847,11 +1847,11 @@ notes_drop_db /// bool notes_drop_db ( string database_name)\nロータスノー
 notes_find_note /// bool notes_find_note ( string database_name, string name [, string type])\n database_nameにあるノートIDを返す。ノートの名前を指定する。typeは 省略可 
 notes_header_info /// object notes_header_info ( string server, string mailbox, int msg_number)\n 指定したサーバ上の指定したメールボックスにあるメッセージ msg_numberをオープンする 
 notes_list_msgs /// bool notes_list_msgs ( string db)\n選択したdatabase_nameからノートを返す
-notes_mark_read /// string notes_mark_read ( string database_name, string user_name, string note_id)\nユーザuser_name用にnote_idに既読マークを付ける
-notes_mark_unread /// string notes_mark_unread ( string database_name, string user_name, string note_id)\nユーザuser_name用にnote_idに未読マークを付ける
+notes_mark_read /// string notes_mark_read ( string database_name, string user_name, string note_id)\nユーザーuser_name用にnote_idに既読マークを付ける
+notes_mark_unread /// string notes_mark_unread ( string database_name, string user_name, string note_id)\nユーザーuser_name用にnote_idに未読マークを付ける
 notes_nav_create /// bool notes_nav_create ( string database_name, string name)\ndatabase_nameにナビゲータ名を作成する
 notes_search /// string notes_search ( string database_name, string keywords)\ndatabase_nameのキーワードにマッチするノーツを見つける
-notes_unread /// string notes_unread ( string database_name, string user_name)\nカレントユーザuser_nameに関して未読のノートIDを返す
+notes_unread /// string notes_unread ( string database_name, string user_name)\nカレントユーザーuser_nameに関して未読のノートIDを返す
 notes_version /// string notes_version ( string database_name)\nロータスノーツのバージョンを取得する
 odbc_autocommit /// int odbc_autocommit ( int connection_id, int [OnOff])\nautocommitの動作をオンまたはオフにします
 odbc_binmode /// int odbc_binmode ( int result_id, int mode)\nバイナリカラムデータを処理する
@@ -2178,7 +2178,7 @@ getlastmod /// int getlastmod ( void)\n最終ページ更新時刻を取得す
 getmygid /// int getmygid ( void)\nPHPスクリプトの所有者のGIDを得る
 getmyinode /// int getmyinode ( void)\n現在のスクリプトの i ノードを取得する
 getmypid /// int getmypid ( void)\nPHP のプロセス ID を取得する
-getmyuid /// int getmyuid ( void)\nPHP スクリプト所有者のユーザ ID を取得する
+getmyuid /// int getmyuid ( void)\nPHP スクリプト所有者のユーザー ID を取得する
 getopt /// string getopt ( string options)\nGets options from the command line argument list
 getrusage /// array getrusage ( int [who])\nカレントリソースの使用に関する情報を得る
 ini_alter /// string ini_alter ( string varname, string newvalue)\n設定オプションの値を変更する
@@ -2212,7 +2212,7 @@ posix_getpgid /// int posix_getpgid ( int pid)\nジョブ制御のプロセス
 posix_getpgrp /// int posix_getpgrp ( void)\n 現在のプロセスのグループIDを返す 
 posix_getpid /// int posix_getpid ( void)\n現在のプロセスIDを返す
 posix_getppid /// int posix_getppid ( void)\n親プロセスのIDを返す
-posix_getpwnam /// array posix_getpwnam ( string username)\n指定したユーザ名を有するユーザに関する情報を返す
+posix_getpwnam /// array posix_getpwnam ( string username)\n指定したユーザー名を有するユーザーに関する情報を返す
 posix_getpwuid /// array posix_getpwuid ( int uid)\n指定したユーザーIDを有するユーザーに関する情報を返す
 posix_getrlimit /// array posix_getrlimit ( void )\nシステムリソース制限に関する情報を返す
 posix_getsid /// int posix_getsid ( int pid)\nプロセスの現在のsidを得る
@@ -2346,7 +2346,7 @@ printer_set_option /// bool printer_set_option ( resource handle, int option, mi
 printer_start_doc /// bool printer_start_doc ( resource handle [, string document])\n新規ドキュメントを開始する
 printer_start_page /// bool printer_start_page ( resource handle)\n新規ページを開始する
 printer_write /// bool printer_write ( resource handle, string content)\nプリンタへデータを書き込む
-pspell_add_to_personal /// int pspell_add_to_personal ( int dictionary_link, string word)\nユーザの単語リストに単語を追加
+pspell_add_to_personal /// int pspell_add_to_personal ( int dictionary_link, string word)\nユーザーの単語リストに単語を追加
 pspell_add_to_session /// int pspell_add_to_session ( int dictionary_link, string word)\n カレントのセッションの単語リストに単語を追加 
 pspell_check /// bool pspell_check ( int dictionary_link, string word)\n単語をチェックする
 pspell_clear_session /// int pspell_clear_session ( int dictionary_link)\nカレントのセッションをクリアする
@@ -2439,7 +2439,7 @@ session_readonly /// void session_readonly ( void)\nBegin session - reinitialize
 session_register /// bool session_register ( mixed name, mixed [...])\n現在のセッションに1つ以上の変数を登録する
 session_save_path /// string session_save_path ( string [path])\n 現在のセッションデータ保存パスを取得または設定する 
 session_set_cookie_params /// void session_set_cookie_params ( int lifetime, string [path], string [domain])\n セッションクッキーパラメータを設定する 
-session_set_save_handler /// void session_set_save_handler ( string open, string close, string read, string write, string destroy, string gc)\n ユーザ定義のセッション保存関数を設定する 
+session_set_save_handler /// void session_set_save_handler ( string open, string close, string read, string write, string destroy, string gc)\n ユーザー定義のセッション保存関数を設定する 
 session_start /// bool session_start ( void)\nセッションデータを初期化する
 session_unregister /// bool session_unregister ( string name)\n現在のセッションから変数の登録を削除する
 session_unset /// void session_unset ( void)\n 全てのセッション変数を開放する 
@@ -2486,7 +2486,7 @@ swf_mulcolor /// void swf_mulcolor ( float r, float g, float b, float a)\n グ
 swf_nextid /// int swf_nextid ( void)\n 次の未使用のオブジェクトIDを返す 
 swf_oncondition /// void swf_oncondition ( int transition)\n アクションリストのトリガとして使用されるトランジションを定義する 
 swf_openfile /// void swf_openfile ( string filename, float width, float height, float framerate, float r, float g, float b)\n 新規にShockwave Flashファイルをオープンする 
-swf_ortho2 /// void swf_ortho2 ( float xmin, float xmax, float ymin, float ymax)\n ユーザ座標の2D直交マッピングをカレントのビューポイントに定義する 
+swf_ortho2 /// void swf_ortho2 ( float xmin, float xmax, float ymin, float ymax)\n ユーザー座標の2D直交マッピングをカレントのビューポイントに定義する 
 swf_ortho /// void swf_ortho ( float xmin, float xmax, float ymin, float ymax, float zmin, float zmax)\n カレントのビューポートにおけるユーザー座標の直交マッピングを定義する 
 swf_perspective /// void swf_perspective ( float fovy, float aspect, float near, float far)\n 遠近法による投影変換を定義する 
 swf_placeobject /// void swf_placeobject ( int objid, int depth)\n オブジェクトを画面に配置する 
@@ -2706,19 +2706,19 @@ vpopmail_add_alias_domain_ex /// bool vpopmail_add_alias_domain_ex ( string oldd
 vpopmail_add_alias_domain /// bool vpopmail_add_alias_domain ( string domain, string aliasdomain)\n仮想ドメインへのエイリアスを追加する
 vpopmail_add_domain_ex /// bool vpopmail_add_domain_ex ( string domain, string passwd [, string quota [, string bounce [, bool apop]]])\n新規に仮想ドメインを追加する
 vpopmail_add_domain /// bool vpopmail_add_domain ( string domain, string dir, int uid, int gid)\n仮想ドメインを新たに追加する
-vpopmail_add_user /// bool vpopmail_add_user ( string user, string domain, string password [, string gecos [, bool apop]])\n指定した仮想ドメインに新規ユーザを追加する
+vpopmail_add_user /// bool vpopmail_add_user ( string user, string domain, string password [, string gecos [, bool apop]])\n指定した仮想ドメインに新規ユーザーを追加する
 vpopmail_alias_add /// bool vpopmail_alias_add ( string user, string domain, string alias)\n仮想エイリアスを追加する
 vpopmail_alias_del_domain /// bool vpopmail_alias_del_domain ( string domain)\nあるドメインに関する仮想エイリアスを全て削除する
-vpopmail_alias_del /// bool vpopmail_alias_del ( string user, string domain)\nあるユーザの仮想エイリアスを全て削除する
+vpopmail_alias_del /// bool vpopmail_alias_del ( string user, string domain)\nあるユーザーの仮想エイリアスを全て削除する
 vpopmail_alias_get_all /// array vpopmail_alias_get_all ( string domain)\nあるドメインに関するエイリアスを全て取得する
 vpopmail_alias_get /// array vpopmail_alias_get ( string alias, string domain)\nあるドメインに関するエイリアスを取得する
-vpopmail_auth_user /// bool vpopmail_auth_user ( string user, string domain, string password [, string apop])\n ユーザ名/ドメイン/パスワードの認証を試み、true/falseを返す 
+vpopmail_auth_user /// bool vpopmail_auth_user ( string user, string domain, string password [, string apop])\n ユーザー名/ドメイン/パスワードの認証を試み、true/falseを返す 
 vpopmail_del_domain_ex /// bool vpopmail_del_domain_ex ( string domain)\n仮想ドメインを削除する
 vpopmail_del_domain /// bool vpopmail_del_domain ( string domain)\n仮想ドメインを削除する
-vpopmail_del_user /// bool vpopmail_del_user ( string user, string domain)\n仮想ドメインからユーザを削除する
+vpopmail_del_user /// bool vpopmail_del_user ( string user, string domain)\n仮想ドメインからユーザーを削除する
 vpopmail_error /// string vpopmail_error ( void)\n 直近のvpopmailエラーに関するエラーメッセージを取得する 
-vpopmail_passwd /// bool vpopmail_passwd ( string user, string domain, string password)\n仮想ユーザのパスワードを変更する
-vpopmail_set_user_quota /// bool vpopmail_set_user_quota ( string user, string domain, string quota)\n仮想ユーザの容量制限(クオータ)を設定する
+vpopmail_passwd /// bool vpopmail_passwd ( string user, string domain, string password)\n仮想ユーザーのパスワードを変更する
+vpopmail_set_user_quota /// bool vpopmail_set_user_quota ( string user, string domain, string quota)\n仮想ユーザーの容量制限(クオータ)を設定する
 w32api_deftype /// int w32api_deftype ( string typename, string member1_type, string member1_name)\n他のw32api_functionsで使用するために型を定義する
 w32api_init_dtype /// resource w32api_init_dtype ( string typename, mixed val1, mixed val2)\n データ型typenameのインスタンスを作成し、val1, val2, 関数の値で埋 める 
 w32api_invoke_function /// mixed w32api_invoke_function ( string funcname)\n 関数名の後ろで指定された引数を指定して関数funcnameを実行する 
diff --git a/sakura_core/CCodeChecker.cpp b/sakura_core/CCodeChecker.cpp
index 5d6bf912c2..a4b3f7674c 100644
--- a/sakura_core/CCodeChecker.cpp
+++ b/sakura_core/CCodeChecker.cpp
@@ -161,7 +161,7 @@ ECallbackResult CCodeChecker::OnCheckSave(SSaveInfo* pSaveInfo)
 		);
 	}
 
-	//ユーザ問い合わせ
+	//ユーザー問い合わせ
 	if (bTmpResult) {
 		int nDlgResult = MYMESSAGEBOX(
 			CEditWnd::getInstance()->GetHwnd(),
@@ -185,7 +185,7 @@ ECallbackResult CCodeChecker::OnCheckSave(SSaveInfo* pSaveInfo)
 		point, cmemChar
 	);
 
-	//ユーザ問い合わせ
+	//ユーザー問い合わせ
 	if(nTmpResult==RESULT_LOSESOME){
 		WCHAR szCpName[100];
 		WCHAR  szLineNum[60];  // 123桁
diff --git a/sakura_core/CLoadAgent.cpp b/sakura_core/CLoadAgent.cpp
index c41ebe120f..b045f43012 100644
--- a/sakura_core/CLoadAgent.cpp
+++ b/sakura_core/CLoadAgent.cpp
@@ -169,7 +169,7 @@ ECallbackResult CLoadAgent::OnCheckLoad(SLoadInfo* pLoadInfo)
 			return CALLBACK_INTERRUPT;
 		}
 
-		// ファイルサイズがユーザ設定の閾値以上の場合は警告ダイアログを出す
+		// ファイルサイズがユーザー設定の閾値以上の場合は警告ダイアログを出す
 		if (GetDllShareData().m_Common.m_sFile.m_bAlertIfLargeFile) {
 			// GetDllShareData().m_Common.m_sFile.m_nAlertFileSize はMB単位
 			if( (nFileSize.QuadPart>>20) >= (GetDllShareData().m_Common.m_sFile.m_nAlertFileSize) ){
diff --git a/sakura_core/CReadManager.cpp b/sakura_core/CReadManager.cpp
index 6d2efbd48d..b502140ca6 100644
--- a/sakura_core/CReadManager.cpp
+++ b/sakura_core/CReadManager.cpp
@@ -39,7 +39,7 @@
 	@version	2.0
 	@note	Windows用にコーディングしてある
 	@retval	TRUE	正常読み込み
-	@retval	FALSE	エラー(またはユーザによるキャンセル?)
+	@retval	FALSE	エラー(またはユーザーによるキャンセル?)
 	@date	2002/08/30 Moca 旧ReadFileを元に作成 ファイルアクセスに関する部分をCFileLoadで行う
 	@date	2003/07/26 ryoji BOMの状態の取得を追加
 */
diff --git a/sakura_core/_main/CControlProcess.cpp b/sakura_core/_main/CControlProcess.cpp
index ed1db79ee5..783603ca44 100644
--- a/sakura_core/_main/CControlProcess.cpp
+++ b/sakura_core/_main/CControlProcess.cpp
@@ -41,9 +41,9 @@ std::filesystem::path CControlProcess::GetIniFileName() const
 	// exe基準のiniファイルパスを得る
 	auto iniPath = GetExeFileName().replace_extension(L".ini");
 
-	// マルチユーザ用のiniファイルパス
-	//		exeと同じフォルダに置かれたマルチユーザ構成設定ファイル（sakura.exe.ini）の内容
-	//		に従ってマルチユーザ用のiniファイルパスを決める
+	// マルチユーザー用のiniファイルパス
+	//		exeと同じフォルダに置かれたマルチユーザー構成設定ファイル（sakura.exe.ini）の内容
+	//		に従ってマルチユーザー用のiniファイルパスを決める
 	auto exeIniPath = GetExeFileName().concat(L".ini");
 	if (bool isMultiUserSeggings = ::GetPrivateProfileInt(L"Settings", L"MultiUser", 0, exeIniPath.c_str()); isMultiUserSeggings) {
 		return GetPrivateIniFileName(exeIniPath, iniPath.filename());
@@ -60,23 +60,23 @@ std::filesystem::path CControlProcess::GetIniFileName() const
 }
 
 /*!
-	@brief マルチユーザ用のiniファイルパスを取得する
+	@brief マルチユーザー用のiniファイルパスを取得する
  */
 std::filesystem::path CControlProcess::GetPrivateIniFileName(const std::wstring& exeIniPath, const std::wstring& filename) const
 {
 	KNOWNFOLDERID refFolderId;
 	switch (int nFolder = ::GetPrivateProfileInt(L"Settings", L"UserRootFolder", 0, exeIniPath.c_str())) {
 	case 1:
-		refFolderId = FOLDERID_Profile;			// ユーザのルートフォルダ
+		refFolderId = FOLDERID_Profile;			// ユーザーのルートフォルダ
 		break;
 	case 2:
-		refFolderId = FOLDERID_Documents;		// ユーザのドキュメントフォルダ
+		refFolderId = FOLDERID_Documents;		// ユーザーのドキュメントフォルダ
 		break;
 	case 3:
-		refFolderId = FOLDERID_Desktop;			// ユーザのデスクトップフォルダ
+		refFolderId = FOLDERID_Desktop;			// ユーザーのデスクトップフォルダ
 		break;
 	default:
-		refFolderId = FOLDERID_RoamingAppData;	// ユーザのアプリケーションデータフォルダ
+		refFolderId = FOLDERID_RoamingAppData;	// ユーザーのアプリケーションデータフォルダ
 		break;
 	}
 
diff --git a/sakura_core/_main/CProcess.cpp b/sakura_core/_main/CProcess.cpp
index 85361de7dd..b8e61d2502 100644
--- a/sakura_core/_main/CProcess.cpp
+++ b/sakura_core/_main/CProcess.cpp
@@ -129,7 +129,7 @@ int CProcess::WriteDump( PEXCEPTION_POINTERS pExceptPtrs )
 
 	static WCHAR szFile[MAX_PATH];
 	// 出力先はiniと同じ（InitializeProcess()後に確定）
-	// Vista以降では C:\Users\(ユーザ名)\AppData\Local\CrashDumps に出力
+	// Vista以降では C:\Users\(ユーザー名)\AppData\Local\CrashDumps に出力
 	GetInidirOrExedir( szFile, _APP_NAME_(_T) L".dmp" );
 
 	HANDLE hFile = ::CreateFile(
diff --git a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
index fa4ded52c7..e68d5e59c6 100644
--- a/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
+++ b/sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
@@ -1071,7 +1071,7 @@ void CDlgOpenFile_CommonFileDialog::DlgOpenFail(void)
 	const WCHAR*	pszError;
 	DWORD dwError = ::CommDlgExtendedError();
 	if( dwError == 0 ){
-		//	ユーザキャンセルによる
+		//	ユーザーキャンセルによる
 		return;
 	}
 	
diff --git a/sakura_core/doc/CDocFileOperation.cpp b/sakura_core/doc/CDocFileOperation.cpp
index 9a7aa11d92..b155ed596a 100644
--- a/sakura_core/doc/CDocFileOperation.cpp
+++ b/sakura_core/doc/CDocFileOperation.cpp
@@ -449,7 +449,7 @@ bool CDocFileOperation::FileSaveAs( const WCHAR* filename,ECodeType eCodeType, E
 
 /*
 	閉じて(無題)。
-	ユーザキャンセル操作等によりクローズされなかった場合は false を返す。
+	ユーザーキャンセル操作等によりクローズされなかった場合は false を返す。
 
 	@date 2006.12.30 ryoji CEditView::Command_FILESAVEAS()から処理本体を切り出し
 */
diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp
index 06ea8fb4b1..39d4b36613 100644
--- a/sakura_core/env/CShareData.cpp
+++ b/sakura_core/env/CShareData.cpp
@@ -175,7 +175,7 @@ bool CShareData::InitShareData()
 			m_pShareData->m_dwCustColors[i] = RGB( 255, 255, 255 );
 		}
 
-		// マルチユーザ用のiniファイルパス(exe基準の初期化よりも先に行う必要がある)
+		// マルチユーザー用のiniファイルパス(exe基準の初期化よりも先に行う必要がある)
 		auto privateIniPath = GetIniFileName();
 		m_pShareData->m_szPrivateIniFile = privateIniPath.c_str();
 
@@ -379,7 +379,7 @@ bool CShareData::InitShareData()
 			//ファイルの保存
 			sFile.m_bEnableUnmodifiedOverwrite = false;	// 無変更でも上書きするか
 
-			// 「名前を付けて保存」でファイルの種類が[ユーザ指定]のときのファイル一覧表示	//ファイル保存ダイアログのフィルタ設定	// 2006.11.16 ryoji
+			// 「名前を付けて保存」でファイルの種類が[ユーザー指定]のときのファイル一覧表示	//ファイル保存ダイアログのフィルタ設定	// 2006.11.16 ryoji
 			sFile.m_bNoFilterSaveNew = true;		// 新規から保存時は全ファイル表示
 			sFile.m_bNoFilterSaveFile = true;		// 新規以外から保存時は全ファイル表示
 
@@ -1068,7 +1068,7 @@ bool CShareData::OpenDebugWindow( HWND hwnd, bool bAllwaysActive )
 /*!
 	設定フォルダがEXEフォルダと別かどうかを返す
 
-	iniファイルの保存先がユーザ別設定フォルダかどうか 2007.05.25 ryoji
+	iniファイルの保存先がユーザー別設定フォルダかどうか 2007.05.25 ryoji
 */
 [[nodiscard]]  bool CShareData::IsPrivateSettings( void ) const noexcept
 {
diff --git a/sakura_core/env/DLLSHAREDATA.h b/sakura_core/env/DLLSHAREDATA.h
index ed247c3d43..fc2147b980 100644
--- a/sakura_core/env/DLLSHAREDATA.h
+++ b/sakura_core/env/DLLSHAREDATA.h
@@ -149,7 +149,7 @@ struct DLLSHAREDATA{
 	SShare_Handles				m_sHandles;
 
 	SFilePath					m_szIniFile;							//!< EXE基準のiniファイルパス
-	SFilePath					m_szPrivateIniFile;						//!< マルチユーザ用のiniファイルパス
+	SFilePath					m_szPrivateIniFile;						//!< マルチユーザー用のiniファイルパス
 
 	SCharWidthCache				m_sCharWidth;							//!< 文字半角全角キャッシュ
 	DWORD						m_dwCustColors[16];						//!< フォントDialogカスタムパレット
diff --git a/sakura_core/func/CFuncLookup.cpp b/sakura_core/func/CFuncLookup.cpp
index 192824de14..04703f9d35 100644
--- a/sakura_core/func/CFuncLookup.cpp
+++ b/sakura_core/func/CFuncLookup.cpp
@@ -216,7 +216,7 @@ void CFuncLookup::SetCategory2Combo( HWND hComboBox ) const
 		Combo_AddString( hComboBox, LS( nsFuncCode::ppszFuncKind[i] ) );
 	}
 
-	//	ユーザマクロ
+	//	ユーザーマクロ
 	Combo_AddString( hComboBox, LS( STR_ERR_DLGFUNCLKUP01 ) );
 	//	カスタムメニュー
 	Combo_AddString( hComboBox, LS( STR_ERR_DLGFUNCLKUP02 ) );
diff --git a/sakura_core/macro/CPPA.cpp b/sakura_core/macro/CPPA.cpp
index 0c9d9b90c3..9c6d6c1327 100644
--- a/sakura_core/macro/CPPA.cpp
+++ b/sakura_core/macro/CPPA.cpp
@@ -325,7 +325,7 @@ void __stdcall CPPA::stdStrObj(const char* ObjName, int Index, BYTE GS_Mode, int
 	@param Err_CD IN  0以外各コールバック関数が設定した値
 			 1以上 FuncID + 1
 			 0     PPAのエラー
-			-1以下 その他ユーザ定義エラー
+			-1以下 その他ユーザー定義エラー
 	@param Err_Mes IN エラーメッセージ
 
 	@date 2003.06.01 Moca
diff --git a/sakura_core/parse/CWordParse.cpp b/sakura_core/parse/CWordParse.cpp
index 829455ad58..9de57baa5e 100644
--- a/sakura_core/parse/CWordParse.cpp
+++ b/sakura_core/parse/CWordParse.cpp
@@ -158,7 +158,7 @@ ECharKind CWordParse::WhatKindOfChar(
 		if( IsHankakuKatakana(c) )return CK_KATA;	// 半角のカタカナ
 		if( 0x00C0 <= c && c < 0x0180 && c != 0x00D7 && c != 0x00F7 )return CK_LATIN;
 													// ラテン１補助、ラテン拡張のうちアルファベット風のもの（×÷を除く）
-		//if( c == L'#'|| c == L'$' || c == L'@'|| c == L'\\' )return CK_UDEF;	// ユーザ定義
+		//if( c == L'#'|| c == L'$' || c == L'@'|| c == L'\\' )return CK_UDEF;	// ユーザー定義
 
 		//その他
 		if( IsZenkakuSpace(c)    )return CK_ZEN_SPACE;	// 全角スペース
@@ -207,7 +207,7 @@ ECharKind CWordParse::WhatKindOfTwoChars( ECharKind kindPre, ECharKind kindCur )
 
 	if( kindPre == CK_LATIN )kindPre = CK_CSYM;		// ラテン系文字はアルファベットとみなす
 	if( kindCur == CK_LATIN )kindCur = CK_CSYM;
-	if( kindPre == CK_UDEF )kindPre = CK_ETC;		// ユーザ定義文字はその他の半角とみなす
+	if( kindPre == CK_UDEF )kindPre = CK_ETC;		// ユーザー定義文字はその他の半角とみなす
 	if( kindCur == CK_UDEF )kindCur = CK_ETC;
 	if( kindPre == CK_CTRL )kindPre = CK_ETC;		// 制御文字はその他の半角とみなす
 	if( kindCur == CK_CTRL )kindCur = CK_ETC;
@@ -233,7 +233,7 @@ ECharKind CWordParse::WhatKindOfTwoChars4KW( ECharKind kindPre, ECharKind kindCu
 
 	if( kindPre == CK_LATIN )kindPre = CK_CSYM;		// ラテン系文字はアルファベットとみなす
 	if( kindCur == CK_LATIN )kindCur = CK_CSYM;
-	if( kindPre == CK_UDEF )kindPre = CK_CSYM;		// ユーザ定義文字はアルファベットとみなす
+	if( kindPre == CK_UDEF )kindPre = CK_CSYM;		// ユーザー定義文字はアルファベットとみなす
 	if( kindCur == CK_UDEF )kindCur = CK_CSYM;
 	if( kindPre == CK_CTRL )kindPre = CK_CTRL;		// 制御文字はそのまま制御文字とみなす
 	if( kindCur == CK_CTRL )kindCur = CK_CTRL;
diff --git a/sakura_core/parse/CWordParse.h b/sakura_core/parse/CWordParse.h
index b27abe0646..54bc34ff81 100644
--- a/sakura_core/parse/CWordParse.h
+++ b/sakura_core/parse/CWordParse.h
@@ -43,7 +43,7 @@ enum ECharKind{
 	CK_CSYM,			//!< 識別子に使用可能な文字 (英数字、アンダースコア)
 	CK_KATA,			//!< 半角のカタカナ 0xA1<=c<=0xFD
 	CK_LATIN,			//!< ラテン１補助、ラテン拡張のうちアルファベット風のもの 0x00C0<=c<0x0180
-	CK_UDEF,			//!< ユーザ定義キーワード文字（#$@\）
+	CK_UDEF,			//!< ユーザー定義キーワード文字（#$@\）
 	CK_ETC,				//!< 半角のその他
 
 	CK_ZEN_SPACE,		//!< 全角スペース
diff --git a/sakura_core/recent/CRecentCmd.cpp b/sakura_core/recent/CRecentCmd.cpp
index 67d52901de..76d33d2550 100644
--- a/sakura_core/recent/CRecentCmd.cpp
+++ b/sakura_core/recent/CRecentCmd.cpp
@@ -50,7 +50,7 @@ CRecentCmd::CRecentCmd()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentCmd::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentCurDir.cpp b/sakura_core/recent/CRecentCurDir.cpp
index ac235f5b17..d51a3b0cae 100644
--- a/sakura_core/recent/CRecentCurDir.cpp
+++ b/sakura_core/recent/CRecentCurDir.cpp
@@ -51,7 +51,7 @@ CRecentCurDir::CRecentCurDir()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentCurDir::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentEditNode.cpp b/sakura_core/recent/CRecentEditNode.cpp
index 09e973abf2..b4cf156983 100644
--- a/sakura_core/recent/CRecentEditNode.cpp
+++ b/sakura_core/recent/CRecentEditNode.cpp
@@ -50,7 +50,7 @@ CRecentEditNode::CRecentEditNode()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentEditNode::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentExceptMru.cpp b/sakura_core/recent/CRecentExceptMru.cpp
index 3d91b5bdc5..6c662764fa 100644
--- a/sakura_core/recent/CRecentExceptMru.cpp
+++ b/sakura_core/recent/CRecentExceptMru.cpp
@@ -51,7 +51,7 @@ CRecentExceptMRU::CRecentExceptMRU()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentExceptMRU::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentExcludeFile.cpp b/sakura_core/recent/CRecentExcludeFile.cpp
index ec2e09ab49..7f26e157fd 100644
--- a/sakura_core/recent/CRecentExcludeFile.cpp
+++ b/sakura_core/recent/CRecentExcludeFile.cpp
@@ -49,7 +49,7 @@ CRecentExcludeFile::CRecentExcludeFile()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentExcludeFile::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentExcludeFolder.cpp b/sakura_core/recent/CRecentExcludeFolder.cpp
index b61ad6d28c..8cc9e0efd7 100644
--- a/sakura_core/recent/CRecentExcludeFolder.cpp
+++ b/sakura_core/recent/CRecentExcludeFolder.cpp
@@ -49,7 +49,7 @@ CRecentExcludeFolder::CRecentExcludeFolder()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentExcludeFolder::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentFile.cpp b/sakura_core/recent/CRecentFile.cpp
index f8114041b5..a11b088af9 100644
--- a/sakura_core/recent/CRecentFile.cpp
+++ b/sakura_core/recent/CRecentFile.cpp
@@ -31,7 +31,7 @@
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentFile::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentFolder.cpp b/sakura_core/recent/CRecentFolder.cpp
index 42296fdec6..78e368f7a7 100644
--- a/sakura_core/recent/CRecentFolder.cpp
+++ b/sakura_core/recent/CRecentFolder.cpp
@@ -51,7 +51,7 @@ CRecentFolder::CRecentFolder()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentFolder::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentGrepFile.cpp b/sakura_core/recent/CRecentGrepFile.cpp
index 6863f9e5f2..134dad8391 100644
--- a/sakura_core/recent/CRecentGrepFile.cpp
+++ b/sakura_core/recent/CRecentGrepFile.cpp
@@ -50,7 +50,7 @@ CRecentGrepFile::CRecentGrepFile()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentGrepFile::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentGrepFolder.cpp b/sakura_core/recent/CRecentGrepFolder.cpp
index 06bee2926b..b11060fa93 100644
--- a/sakura_core/recent/CRecentGrepFolder.cpp
+++ b/sakura_core/recent/CRecentGrepFolder.cpp
@@ -50,7 +50,7 @@ CRecentGrepFolder::CRecentGrepFolder()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentGrepFolder::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentReplace.cpp b/sakura_core/recent/CRecentReplace.cpp
index 06365ce740..a96255edf4 100644
--- a/sakura_core/recent/CRecentReplace.cpp
+++ b/sakura_core/recent/CRecentReplace.cpp
@@ -51,7 +51,7 @@ CRecentReplace::CRecentReplace()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentReplace::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentSearch.cpp b/sakura_core/recent/CRecentSearch.cpp
index 95dd26786f..8b2defa263 100644
--- a/sakura_core/recent/CRecentSearch.cpp
+++ b/sakura_core/recent/CRecentSearch.cpp
@@ -51,7 +51,7 @@ CRecentSearch::CRecentSearch()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentSearch::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/recent/CRecentTagjumpKeyword.cpp b/sakura_core/recent/CRecentTagjumpKeyword.cpp
index acb9bbbd31..5a1164c5a4 100644
--- a/sakura_core/recent/CRecentTagjumpKeyword.cpp
+++ b/sakura_core/recent/CRecentTagjumpKeyword.cpp
@@ -51,7 +51,7 @@ CRecentTagjumpKeyword::CRecentTagjumpKeyword()
 /*
 	アイテムの比較要素を取得する。
 
-	@note	取得後のポインタはユーザ管理の構造体にキャストして参照してください。
+	@note	取得後のポインタはユーザー管理の構造体にキャストして参照してください。
 */
 const WCHAR* CRecentTagjumpKeyword::GetItemText( int nIndex ) const
 {
diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc
index fc3d499df3..ec8aa1032c 100644
--- a/sakura_core/sakura_rc.rc
+++ b/sakura_core/sakura_rc.rc
@@ -2936,7 +2936,7 @@ STRINGTABLE
 BEGIN
     STR_PLGMGR_INST_IDNUM   "Plugin.IDの先頭に数字は使用できません"
     STR_PLGMGR_INST_NAME    "同じプラグインが別の名前でインストールされています。上書きしますか？\n　はい　→　新しい「%s」を使用\n　いいえ→　インストール済みの「%ls」を使用"
-    STR_PLGMGR_INST_USERCANCEL "ユーザキャンセル"
+    STR_PLGMGR_INST_USERCANCEL "ユーザーキャンセル"
     STR_PLGMGR_INST_MAX     "プラグインをこれ以上登録できません"
     STR_WSHPLUG_LOADMACRO   "マクロの読み込みに失敗しました。\n\n%s"
     STR_CARET_WITHBOM       " BOM付"
diff --git a/sakura_core/typeprop/CPropTypesRegex.cpp b/sakura_core/typeprop/CPropTypesRegex.cpp
index 00286a8fc7..a4eaac5912 100644
--- a/sakura_core/typeprop/CPropTypesRegex.cpp
+++ b/sakura_core/typeprop/CPropTypesRegex.cpp
@@ -138,7 +138,7 @@ INT_PTR CPropTypesRegex::DispatchEvent(
 			}
 			else
 			{
-				//使用するになってるんだけどDisableにする。もうユーザは変更できない。
+				//使用するになってるんだけどDisableにする。もうユーザーは変更できない。
 				EnableWindow( GetDlgItem( hwndDlg, IDC_CHECK_REGEX ), FALSE );
 			}
 		}
diff --git a/sakura_core/types/CType_Perl.cpp b/sakura_core/types/CType_Perl.cpp
index 03ea6efe25..8ebd9ee44c 100644
--- a/sakura_core/types/CType_Perl.cpp
+++ b/sakura_core/types/CType_Perl.cpp
@@ -33,7 +33,7 @@
 #include "view/Colors/EColorIndexType.h"
 
 /* Perl */
-//Jul. 08, 2001 JEPRO Perl ユーザに贈る
+//Jul. 08, 2001 JEPRO Perl ユーザーに贈る
 //Jul. 08, 2001 JEPRO 追加
 void CType_Perl::InitTypeConfigImp(STypeConfig* pType)
 {
diff --git a/sakura_core/types/CType_Tex.cpp b/sakura_core/types/CType_Tex.cpp
index 6347cdb6b1..21496bc83d 100644
--- a/sakura_core/types/CType_Tex.cpp
+++ b/sakura_core/types/CType_Tex.cpp
@@ -35,8 +35,8 @@
 #include "view/Colors/EColorIndexType.h"
 
 /* TeX */
-//Oct. 31, 2000 JEPRO TeX  ユーザに贈る
-//Oct. 31, 2000 JEPRO TeX ユーザに贈る	//Mar. 10, 2001 JEPRO 追加
+//Oct. 31, 2000 JEPRO TeX  ユーザーに贈る
+//Oct. 31, 2000 JEPRO TeX ユーザーに贈る	//Mar. 10, 2001 JEPRO 追加
 void CType_Tex::InitTypeConfigImp(STypeConfig* pType)
 {
 	//名前と拡張子
diff --git a/sakura_core/types/CType_Text.cpp b/sakura_core/types/CType_Text.cpp
index 7114b7aac5..82b2f55674 100644
--- a/sakura_core/types/CType_Text.cpp
+++ b/sakura_core/types/CType_Text.cpp
@@ -64,7 +64,7 @@ void CType_Text::InitTypeConfigImp(STypeConfig* pType)
 
 	//※小さな親切として、C:\～～ や \\～～ などのファイルパスをクリッカブルにする設定を「テキスト」に既定で仕込む
 	//※""で挟まれる設定は挟まれない設定よりも上に無ければならない
-	//※""で挟まれる設定を複製してちょっと修正すれば、<>や[]に挟まれたものにも対応できる（ユーザに任せる）
+	//※""で挟まれる設定を複製してちょっと修正すれば、<>や[]に挟まれたものにも対応できる（ユーザーに任せる）
 
 	//正規表現キーワード
 	int keywordPos = 0;
diff --git a/sakura_core/types/CType_Vb.cpp b/sakura_core/types/CType_Vb.cpp
index 9016433784..7da58d092c 100644
--- a/sakura_core/types/CType_Vb.cpp
+++ b/sakura_core/types/CType_Vb.cpp
@@ -33,7 +33,7 @@
 #include "view/Colors/EColorIndexType.h"
 
 /* Visual Basic */
-//JUl. 10, 2001 JEPRO VB   ユーザに贈る
+//JUl. 10, 2001 JEPRO VB   ユーザーに贈る
 //Jul. 09, 2001 JEPRO 追加 //Dec. 16, 2002 MIK追加 // Feb. 19, 2006 genta .vb追加
 void CType_Vb::InitTypeConfigImp(STypeConfig* pType)
 {
diff --git a/sakura_core/util/MessageBoxF.h b/sakura_core/util/MessageBoxF.h
index 36a6242a80..89411cca8b 100644
--- a/sakura_core/util/MessageBoxF.h
+++ b/sakura_core/util/MessageBoxF.h
@@ -52,7 +52,7 @@ int Wrap_MessageBox(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
 int VMessageBoxF( HWND hwndOwner, UINT uType, LPCWSTR lpCaption, LPCWSTR lpText, va_list& v );
 int MessageBoxF ( HWND hwndOwner, UINT uType, LPCWSTR lpCaption, LPCWSTR lpText, ... );
 
-//                ユーザ用メッセージボックス                   //
+//                ユーザー用メッセージボックス                   //
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
 
 //デバッグ用メッセージボックス
diff --git a/sakura_core/view/colors/EColorIndexType.h b/sakura_core/view/colors/EColorIndexType.h
index e1500e17c4..02675d5766 100644
--- a/sakura_core/view/colors/EColorIndexType.h
+++ b/sakura_core/view/colors/EColorIndexType.h
@@ -61,7 +61,7 @@ enum EColorIndexType {
 	COLORIDX_WRAP,			//!< 折り返し記号
 	COLORIDX_VERTLINE,		//!< 指定桁縦線	// 2005.11.08 Moca
 	COLORIDX_EOF,			//!< EOF記号
-	COLORIDX_DIGIT,			//!< 半角数値	 //@@@ 2001.02.17 by MIK //色設定Ver.3からユーザファイルに対しては文字列で処理しているのでリナンバリングしてもよい. Mar. 7, 2001 JEPRO noted
+	COLORIDX_DIGIT,			//!< 半角数値	 //@@@ 2001.02.17 by MIK //色設定Ver.3からユーザーファイルに対しては文字列で処理しているのでリナンバリングしてもよい. Mar. 7, 2001 JEPRO noted
 	COLORIDX_BRACKET_PAIR,	//!< 対括弧	  // 02/09/18 ai Add
 	COLORIDX_SELECT,		//!< 選択範囲
 	COLORIDX_SEARCH,		//!< 検索文字列
diff --git a/tests/unittests/test-cfileext.cpp b/tests/unittests/test-cfileext.cpp
index 3b9a569eb1..98a29ef9e9 100644
--- a/tests/unittests/test-cfileext.cpp
+++ b/tests/unittests/test-cfileext.cpp
@@ -67,7 +67,7 @@ TEST(CFileExt, RawLongFilter)
 {
 	CFileExt cFileExt;
 	cFileExt.AppendExtRaw(
-		L"ユーザ設定",
+		L"ユーザー設定",
 		L"*.extensin_250_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_longX"
 	);
 }
@@ -76,7 +76,7 @@ TEST(CFileExt, RawManyFilter)
 {
 	CFileExt cFileExt;
 	cFileExt.AppendExtRaw(
-		L"ユーザ指定",
+		L"ユーザー指定",
 		L"*.extensin_50_0_long_long_long_long_long_long_long_l;*.extensin_50_1_long_long_long_long_long_long_long_l;*.extensin_50_2_long_long_long_long_long_long_long_l;*.extensin_50_3_long_long_long_long_long_long_long_l;*.extensin_50_4_long_long_long_long_long_long_long_l;*.extensin_50_5_long_long_long_long_long_long_long_l;*.extensin_50_6_long_long_long_long_long_long_long_l;*.extensin_50_7_long_long_long_long_long_long_long_l;*.extensin_50_8_long_long_long_long_long_long_long_l;*.extensin_50_9_long_long_long_long_long_long_long_l"
 	);
 }
@@ -85,7 +85,7 @@ TEST(CFileExt, LongFilter)
 {
 	CFileExt cFileExt;
 	cFileExt.AppendExt(
-		L"ユーザ設定",
+		L"ユーザー設定",
 		L"*.extensin_250_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_long_longX"
 	);
 }
diff --git a/tests/unittests/test-file.cpp b/tests/unittests/test-file.cpp
index 621df499fd..d4ab3c2b7d 100644
--- a/tests/unittests/test-file.cpp
+++ b/tests/unittests/test-file.cpp
@@ -222,7 +222,7 @@ TEST(file, GetIniFileName_PrivateRoamingAppData)
 	// プロセスのインスタンスを用意する
 	CControlProcess dummy(nullptr, LR"(-PROF="profile1")");
 
-	// マルチユーザ構成設定ファイルのパス
+	// マルチユーザー構成設定ファイルのパス
 	auto exeIniPath = GetExeFileName().concat(L".ini");
 
 	// 設定を書き込む
@@ -262,7 +262,7 @@ TEST(file, GetIniFileName_PrivateDesktop)
 	// プロセスのインスタンスを用意する
 	CControlProcess dummy(nullptr, LR"(-PROF="")");
 
-	// マルチユーザ構成設定ファイルのパス
+	// マルチユーザー構成設定ファイルのパス
 	auto exeIniPath = GetExeFileName().concat(L".ini");
 
 	// 設定を書き込む
@@ -302,7 +302,7 @@ TEST(file, GetIniFileName_PrivateProfile)
 	// プロセスのインスタンスを用意する
 	CControlProcess dummy(nullptr, LR"(-PROF="")");
 
-	// マルチユーザ構成設定ファイルのパス
+	// マルチユーザー構成設定ファイルのパス
 	auto exeIniPath = GetExeFileName().concat(L".ini");
 
 	// 設定を書き込む
@@ -342,7 +342,7 @@ TEST(file, GetIniFileName_PrivateDocument)
 	// プロセスのインスタンスを用意する
 	CControlProcess dummy(nullptr, LR"(-PROF="")");
 
-	// マルチユーザ構成設定ファイルのパス
+	// マルチユーザー構成設定ファイルのパス
 	auto exeIniPath = GetExeFileName().concat(L".ini");
 
 	// 設定を書き込む

From a6292292e0f919e74d7e1e85cf35f510f69635c9 Mon Sep 17 00:00:00 2001
From: Mari Sano 
Date: Tue, 3 May 2022 20:17:58 +0900
Subject: [PATCH 117/129] =?UTF-8?q?=E3=80=8C=E3=83=95=E3=83=83=E3=83=80?=
 =?UTF-8?q?=E3=83=BC=E3=80=8D=E3=82=92=E3=80=8C=E3=83=95=E3=83=83=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=80=8D=E3=81=AB=E7=BD=AE=E6=8F=9B=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

footerのカタカナ表記が一部「フッダー」になっていたのを修正します。
---
 help/sakura/res/HLP000103.html | 4 ++--
 help/sakura/res/HLP000284.html | 6 +++---
 sakura_core/CGrepAgent.h       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/help/sakura/res/HLP000103.html b/help/sakura/res/HLP000103.html
index 20ba9da161..4e5068d0fc 100644
--- a/help/sakura/res/HLP000103.html
+++ b/help/sakura/res/HLP000103.html
@@ -82,8 +82,8 @@ 
          外部コマンド実行
          
     0x04    編集中の内容を子プロセスにリダイレクト
          
     0x08    標準出力をUnicodeで行う
          
     0x10    標準入力をUnicodeで行う
          
-    0x20    ヘッダー・フッダー情報を出力する (2.0.0.0 以降)
          
-    0x40    ヘッダー・フッダー情報を出力しない (2.0.0.0 以降)
          
+    0x20    ヘッダー・フッター情報を出力する (2.0.0.0 以降)
          
+    0x40    ヘッダー・フッター情報を出力しない (2.0.0.0 以降)
          
     0x80    標準出力をUTF-8で行う (2.1.0.0 以降)
          
    0x100    標準入力をUTF-8で行う (2.1.0.0 以降)
          
    0x200    カレントディレクトリを有効にする (2.1.0.0 以降)
          
diff --git a/help/sakura/res/HLP000284.html b/help/sakura/res/HLP000284.html
index f11d13cdd2..a658d14e75 100644
--- a/help/sakura/res/HLP000284.html
+++ b/help/sakura/res/HLP000284.html
@@ -14,7 +14,7 @@ 
          ExpandParameter
          
 
          ExpandParameterの書式
          
 この特殊記号は以下の各文字列で利用できます。
          
 
            
-
          • 印刷ページ設定のヘッダー・フッダー
            • 
+
          • 印刷ページ設定のヘッダー・フッター
            • 
 
          • 外部コマンド実行
            • 
 
          • ウィンドウのタイトルバー文字列 共通設定 『ウィンドウ』プロパティ
            • 
 
          • マクロ専用関数 ExpandParameterの引数
            • 
@@ -47,8 +47,8 @@ 
            特殊記号
            
 $y	現在の論理行位置(1開始)
            
 $d	現在の日付(共通設定の日付書式)
            
 $t 	現在の時刻(共通設定の時刻書式)
            
-$p	現在のページ(印刷のヘッダー・フッダーでのみ利用可能)
            
-$P	総ページ(印刷のヘッダー・フッダーでのみ利用可能)
            
+$p	現在のページ(印刷のヘッダー・フッターでのみ利用可能)
            
+$P	総ページ(印刷のヘッダー・フッターでのみ利用可能)
            
 $D	ファイルのタイムスタンプ(共通設定の日付書式)
            
 $T	ファイルのタイムスタンプ(共通設定の時刻書式)
            
 $V	エディタのバージョン文字列
            
diff --git a/sakura_core/CGrepAgent.h b/sakura_core/CGrepAgent.h
index f60f6fa818..b52f3b0a34 100644
--- a/sakura_core/CGrepAgent.h
+++ b/sakura_core/CGrepAgent.h
@@ -39,7 +39,7 @@ struct SGrepOption{
 	bool		bGrepReplace;			//!< Grep置換
 	bool		bGrepSubFolder;			//!< サブフォルダからも検索する
 	bool		bGrepStdout;			//!< 標準出力モード
-	bool		bGrepHeader;			//!< ヘッダー・フッダー表示
+	bool		bGrepHeader;			//!< ヘッダー・フッター表示
 	ECodeType	nGrepCharSet;			//!< 文字コードセット選択
 	int			nGrepOutputLineType;	//!< 0:ヒット部分を出力, 1: ヒット行を出力, 2: 否ヒット行を出力
 	int			nGrepOutputStyle;		//!< 出力形式 1: Normal, 2: WZ風(ファイル単位) 3: 結果のみ

From 349fce697331f5aacf999fc9daa7607566656082 Mon Sep 17 00:00:00 2001
From: Mari Sano 
Date: Thu, 5 May 2022 15:05:01 +0900
Subject: [PATCH 118/129] =?UTF-8?q?=E3=80=8C=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=80=E3=83=BC=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=92?=
 =?UTF-8?q?OS=E3=81=A8=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

folderのOS表記に合わせて「フォルダー」に変更します。
---
 CHANGELOG.md                                  |  24 ++--
 addDoxygenFileComment.md                      |   2 +-
 addDoxygenFileComment.py                      |   2 +-
 ci/build-batchfiles.md                        |  12 +-
 ci/build-envvars.md                           |  12 +-
 .../reference/clipboard/S_CopyDirPath.html    |   2 +-
 help/macro/source/reference/find/S_Grep.html  |   8 +-
 help/macro/source/sample/SampleGrep.html      |   2 +-
 help/plugin/Text/implementation01.html        |   8 +-
 help/plugin/Text/implementation02.html        |   2 +-
 help/plugin/Text/index.html                   |   2 +-
 help/plugin/Text/overview.html                |  22 ++--
 help/sakura/res/HLP000005.html                |  18 +--
 help/sakura/res/HLP000010.html                |   2 +-
 help/sakura/res/HLP000015.html                |  12 +-
 help/sakura/res/HLP000016.html                |   2 +-
 help/sakura/res/HLP000021.html                |   8 +-
 help/sakura/res/HLP000023.html                |  16 +--
 help/sakura/res/HLP000029.html                |   2 +-
 help/sakura/res/HLP000065.html                |   2 +-
 help/sakura/res/HLP000067.html                |  42 +++---
 help/sakura/res/HLP000074.html                |   6 +-
 help/sakura/res/HLP000075.html                |   4 +-
 help/sakura/res/HLP000077.html                |  18 +--
 help/sakura/res/HLP000078.html                |  14 +-
 help/sakura/res/HLP000080.html                |  24 ++--
 help/sakura/res/HLP000081.html                |   8 +-
 help/sakura/res/HLP000082.html                |   4 +-
 help/sakura/res/HLP000083.html                |   4 +-
 help/sakura/res/HLP000084.html                |   4 +-
 help/sakura/res/HLP000085.html                |   4 +-
 help/sakura/res/HLP000086.html                |   4 +-
 help/sakura/res/HLP000087.html                |   4 +-
 help/sakura/res/HLP000088.html                |   6 +-
 help/sakura/res/HLP000103.html                |   2 +-
 help/sakura/res/HLP000107.html                |   2 +-
 help/sakura/res/HLP000109.html                |  14 +-
 help/sakura/res/HLP000110.html                |   6 +-
 help/sakura/res/HLP000125.html                |   2 +-
 help/sakura/res/HLP000130.html                |   2 +-
 help/sakura/res/HLP000144.html                |  20 +--
 help/sakura/res/HLP000145.html                |  30 ++---
 help/sakura/res/HLP000146.html                |   4 +-
 help/sakura/res/HLP000147.html                |   4 +-
 help/sakura/res/HLP000148.html                |   6 +-
 help/sakura/res/HLP000150.html                |   4 +-
 help/sakura/res/HLP000151.html                |  16 +--
 help/sakura/res/HLP000152.html                |   4 +-
 help/sakura/res/HLP000197.html                |   6 +-
 help/sakura/res/HLP000201.html                |  16 +--
 help/sakura/res/HLP000203.html                |   4 +-
 help/sakura/res/HLP000251.html                |   2 +-
 help/sakura/res/HLP000259.html                |   4 +-
 help/sakura/res/HLP000260.html                |   2 +-
 help/sakura/res/HLP000261.html                |   4 +-
 help/sakura/res/HLP000268.html                |   8 +-
 help/sakura/res/HLP000270.html                |   2 +-
 help/sakura/res/HLP000272.html                |   8 +-
 help/sakura/res/HLP000275.html                |   2 +-
 help/sakura/res/HLP000277.html                |  12 +-
 help/sakura/res/HLP000278.html                |   6 +-
 help/sakura/res/HLP000279.html                |  14 +-
 help/sakura/res/HLP000280.html                |   2 +-
 help/sakura/res/HLP000284.html                |   4 +-
 help/sakura/res/HLP000315.html                |   6 +-
 help/sakura/res/HLP000319.html                |   6 +-
 help/sakura/res/HLP000358.html                |   4 +-
 help/sakura/res/HLP000362.html                |  40 +++---
 help/sakura/res/HLP000363.html                |  14 +-
 help/sakura/res/HLP000368.html                |  18 +--
 help/sakura/res/HLP000380.html                |   8 +-
 help/sakura/res/HLP000400.html                |   2 +-
 help/sakura/res/HLP000500.html                |   2 +-
 help/sakura/res/HLP_RELEASE.html              |  14 +-
 help/sakura/res/HLP_UR002.html                |   4 +-
 help/sakura/res/HLP_UR003.html                |   4 +-
 help/sakura/res/HLP_UR004.html                |   2 +-
 help/sakura/res/HLP_UR006.html                |   2 +-
 help/sakura/res/HLP_UR007.html                |   2 +-
 help/sakura/res/HLP_UR008.html                |   6 +-
 help/sakura/res/HLP_UR009.html                |   8 +-
 help/sakura/res/HLP_UR010.html                |   6 +-
 help/sakura/res/HLP_UR011.html                |   2 +-
 help/sakura/res/HLP_UR012.html                |   2 +-
 help/sakura/res/HLP_UR013.html                |   4 +-
 help/sakura/res/HLP_UR014.html                |   4 +-
 help/sakura/res/HLP_UR015.html                |   8 +-
 help/sakura/res/HLP_UR016.html                |  20 +--
 help/sakura/res/HLP_UR017.html                |   6 +-
 installer/externals/readme.txt                |   4 +-
 installer/sakura-common.iss                   |   4 +-
 installer/sinst_src/keyword/HSP.KHP           |   2 +-
 .../sinst_src/keyword/MortScript-readme.txt   |   2 +-
 installer/sinst_src/keyword/MortScript.khp    |   2 +-
 installer/sinst_src/keyword/S_MACPPA.KHP      |   2 +-
 installer/sinst_src/keyword/bat_win2k.khp     |   6 +-
 remove-redundant-blank-lines.py               |   2 +-
 sakura_core/CBackupAgent.cpp                  |  10 +-
 sakura_core/CGrepAgent.cpp                    |  40 +++---
 sakura_core/CGrepAgent.h                      |  10 +-
 sakura_core/CGrepEnumFileBase.h               |   4 +-
 sakura_core/CGrepEnumKeys.h                   |  10 +-
 sakura_core/CLoadAgent.cpp                    |   4 +-
 sakura_core/CProfile.cpp                      |   4 +-
 sakura_core/CSelectLang.cpp                   |   4 +-
 sakura_core/CSortedTagJumpList.cpp            |   6 +-
 sakura_core/Funccode_x.hsrc                   |  10 +-
 sakura_core/GrepInfo.h                        |   8 +-
 sakura_core/_main/CCommandLine.cpp            |   4 +-
 sakura_core/_main/CControlProcess.cpp         |  10 +-
 sakura_core/_main/CControlTray.cpp            |   8 +-
 sakura_core/_main/CNormalProcess.cpp          |   4 +-
 sakura_core/cmd/CViewCommander.cpp            |   4 +-
 sakura_core/cmd/CViewCommander.h              |   4 +-
 sakura_core/cmd/CViewCommander_Clipboard.cpp  |   4 +-
 sakura_core/cmd/CViewCommander_File.cpp       |   6 +-
 sakura_core/cmd/CViewCommander_Grep.cpp       |   2 +-
 sakura_core/cmd/CViewCommander_Insert.cpp     |   2 +-
 sakura_core/cmd/CViewCommander_Macro.cpp      |  14 +-
 sakura_core/cmd/CViewCommander_TagJump.cpp    |  30 ++---
 sakura_core/config/maxdata.h                  |   4 +-
 sakura_core/config/system_constants.h         |  10 +-
 sakura_core/dlg/CDlgFavorite.cpp              |   4 +-
 sakura_core/dlg/CDlgFavorite.h                |   2 +-
 sakura_core/dlg/CDlgGrep.cpp                  |  82 ++++++------
 sakura_core/dlg/CDlgGrep.h                    |  12 +-
 sakura_core/dlg/CDlgGrepReplace.cpp           |  24 ++--
 sakura_core/dlg/CDlgOpenFile.h                |   2 +-
 .../dlg/CDlgOpenFile_CommonFileDialog.cpp     |  14 +-
 .../dlg/CDlgOpenFile_CommonItemDialog.cpp     |   2 +-
 sakura_core/dlg/CDlgPluginOption.cpp          |   2 +-
 sakura_core/dlg/CDlgTagJumpList.cpp           |   6 +-
 sakura_core/dlg/CDlgTagsMake.cpp              |  12 +-
 sakura_core/dlg/CDlgTagsMake.h                |   2 +-
 sakura_core/doc/CDocFileOperation.cpp         |  12 +-
 sakura_core/doc/CDocFileOperation.h           |   2 +-
 sakura_core/env/CFileNameManager.cpp          |   8 +-
 sakura_core/env/CSakuraEnvironment.cpp        |  12 +-
 sakura_core/env/CShareData.cpp                |  34 ++---
 sakura_core/env/CShareData_IO.cpp             |  10 +-
 sakura_core/env/CommonSetting.h               |  34 ++---
 sakura_core/func/CKeyBind.cpp                 |   2 +-
 sakura_core/func/Funccode.cpp                 |   8 +-
 sakura_core/io/CZipFile.cpp                   |   2 +-
 sakura_core/io/CZipFile.h                     |   2 +-
 sakura_core/macro/CMacro.cpp                  |  14 +-
 sakura_core/macro/CSMacroMgr.cpp              |  10 +-
 sakura_core/macro/CWSH.cpp                    |   2 +-
 sakura_core/outline/CDlgFuncList.cpp          |   8 +-
 sakura_core/plugin/CPlugin.cpp                |   2 +-
 sakura_core/plugin/CPlugin.h                  |   6 +-
 sakura_core/plugin/CPluginIfObj.h             |   6 +-
 sakura_core/plugin/CPluginManager.cpp         |  30 ++---
 sakura_core/plugin/CPluginManager.h           |   6 +-
 sakura_core/prop/CPropComBackup.cpp           |  40 +++---
 sakura_core/prop/CPropComEdit.cpp             |  12 +-
 sakura_core/prop/CPropComGeneral.cpp          |  12 +-
 sakura_core/prop/CPropComHelper.cpp           |   2 +-
 sakura_core/prop/CPropComMacro.cpp            |   8 +-
 sakura_core/prop/CPropComPlugin.cpp           |  14 +-
 sakura_core/recent/CMRUFile.cpp               |   4 +-
 sakura_core/recent/CMRUFolder.cpp             |   8 +-
 sakura_core/recent/CMRUFolder.h               |   4 +-
 sakura_core/recent/CRecentExceptMru.h         |   2 +-
 sakura_core/recent/CRecentExcludeFolder.h     |   2 +-
 sakura_core/recent/CRecentFolder.h            |   2 +-
 sakura_core/recent/CRecentGrepFolder.h        |   2 +-
 sakura_core/sakura.hh                         |  60 ++++-----
 sakura_core/sakura_rc.rc                      | 120 +++++++++---------
 sakura_core/typeprop/CImpExpManager.cpp       |   4 +-
 sakura_core/typeprop/CImpExpManager.h         |   2 +-
 sakura_core/uiparts/CMenuDrawer.cpp           |   4 +-
 sakura_core/util/file.cpp                     |  28 ++--
 sakura_core/util/file.h                       |   8 +-
 sakura_core/util/module.cpp                   |   2 +-
 sakura_core/util/shell.cpp                    |  22 ++--
 sakura_core/util/shell.h                      |   4 +-
 sakura_core/view/CEditView_Diff.cpp           |   2 +-
 sakura_core/window/CEditWnd.cpp               |  12 +-
 sakura_core/window/CTabWnd.cpp                |   2 +-
 tests/unittest.md                             |   8 +-
 tests/unittests/test-cdlgprofilemgr.cpp       |   8 +-
 tests/unittests/test-cprofile.cpp             |   4 +-
 tests/unittests/test-czipfile.cpp             |   4 +-
 tests/unittests/test-file.cpp                 |  10 +-
 tests/unittests/test-winmain.cpp              |   2 +-
 tools/macro/CopyDirPath/CopyDirPath.js        |   4 +-
 tools/macro/CopyDirPath/CopyDirPath.mac       |   4 +-
 tools/macro/CopyDirPath/CopyDirPath.vbs       |   4 +-
 tools/macro/macro.md                          |   6 +-
 tools/zip/readme.md                           |   4 +-
 vcx-props/project-PlatformToolset.md          |   2 +-
 192 files changed, 884 insertions(+), 884 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 181920b4ba..b3014eb5ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,7 +92,7 @@
 ### その他変更
 
 - バージョン情報に表示するプロジェクトURLに付けるラベルキャプションを短くする [\#1215](https://github.com/sakura-editor/sakura/pull/1215) ([berryzplus](https://github.com/berryzplus))
-- 除外ファイル・除外フォルダの指定をGrep置換でも使えるようにする [\#1210](https://github.com/sakura-editor/sakura/pull/1210) ([berryzplus](https://github.com/berryzplus))
+- 除外ファイル・除外フォルダーの指定をGrep置換でも使えるようにする [\#1210](https://github.com/sakura-editor/sakura/pull/1210) ([berryzplus](https://github.com/berryzplus))
 - キーワードを指定してタグジャンプができないバグを修正 [\#1208](https://github.com/sakura-editor/sakura/pull/1208) ([7-rate](https://github.com/7-rate))
 - マクロMakeStringBufferW0を廃止する [\#1203](https://github.com/sakura-editor/sakura/pull/1203) ([berryzplus](https://github.com/berryzplus))
 - ヘルプのコピーライトの年とソフト名変更。 [\#1202](https://github.com/sakura-editor/sakura/pull/1202) ([KENCHjp](https://github.com/KENCHjp))
@@ -173,7 +173,7 @@
 
 ### 機能追加
 
-- 最近使ったファイル挿入 と 最近使ったフォルダ挿入 を行う機能追加 [\#1063](https://github.com/sakura-editor/sakura/pull/1063) ([beru](https://github.com/beru))
+- 最近使ったファイル挿入 と 最近使ったフォルダー挿入 を行う機能追加 [\#1063](https://github.com/sakura-editor/sakura/pull/1063) ([beru](https://github.com/beru))
 - PlatformToolset 指定をプロパティーシートに分離して VS2017 および VS2019 で両対応できるようにする [\#866](https://github.com/sakura-editor/sakura/pull/866) ([m-tmatma](https://github.com/m-tmatma))
 - 「同名のC/C++ヘッダー\(ソース\)を開く」機能が利用可能か調べる処理で拡張子の確認が行われるように記述追加 [\#812](https://github.com/sakura-editor/sakura/pull/812) ([beru](https://github.com/beru))
 
@@ -252,7 +252,7 @@
 ### 機能追加
 
 - Window テキストをCNativeT で取得/設定するユーティリティ関数を追加 [\#776](https://github.com/sakura-editor/sakura/pull/776) ([m-tmatma](https://github.com/m-tmatma))
-- 開いているファイルのフォルダのパスをクリップボードにコピーできるようにする [\#718](https://github.com/sakura-editor/sakura/pull/718) ([m-tmatma](https://github.com/m-tmatma))
+- 開いているファイルのフォルダーのパスをクリップボードにコピーできるようにする [\#718](https://github.com/sakura-editor/sakura/pull/718) ([m-tmatma](https://github.com/m-tmatma))
 - Vistaスタイルのファイルダイアログを使えるようにする [\#716](https://github.com/sakura-editor/sakura/pull/716) ([beru](https://github.com/beru))
 - 背景画像表示の不透明度を設定出来るように変更 [\#704](https://github.com/sakura-editor/sakura/pull/704) ([ds14050](https://github.com/ds14050))
 - Windows Imaging Component を使って背景画像を読み込み、透過描画対応 [\#683](https://github.com/sakura-editor/sakura/pull/683) ([beru](https://github.com/beru))
@@ -268,7 +268,7 @@
 - ツールバーを非表示から表示に切り替える際にアイコンの状態を設定する処理を呼び出し [\#464](https://github.com/sakura-editor/sakura/pull/464) ([beru](https://github.com/beru))
 - メールアドレスの色替え判定を高速化すると同時にRFCに準拠させる [\#421](https://github.com/sakura-editor/sakura/pull/421) ([berryzplus](https://github.com/berryzplus))
 - 『SAKURAで Grep』をエクスプローラに追加する [\#411](https://github.com/sakura-editor/sakura/pull/411) ([m-tmatma](https://github.com/m-tmatma))
-- grep/grep 置換で除外ファイル、除外フォルダを指定できるようにする [\#403](https://github.com/sakura-editor/sakura/pull/403) ([m-tmatma](https://github.com/m-tmatma))
+- grep/grep 置換で除外ファイル、除外フォルダーを指定できるようにする [\#403](https://github.com/sakura-editor/sakura/pull/403) ([m-tmatma](https://github.com/m-tmatma))
 - 環境変数 SKIP\_CREATE\_GITHASH が 1 にセットしている場合、githash.h の生成をスキップする [\#319](https://github.com/sakura-editor/sakura/pull/319) ([m-tmatma](https://github.com/m-tmatma))
 - res ファイルのハッシュを計算するスクリプト [\#317](https://github.com/sakura-editor/sakura/pull/317) ([m-tmatma](https://github.com/m-tmatma))
 - python のアウトライン解析を実装 [\#314](https://github.com/sakura-editor/sakura/pull/314) ([m-tmatma](https://github.com/m-tmatma))
@@ -277,8 +277,8 @@
 
 ### バグ修正
 
-- grep で 除外ファイル、除外フォルダが効かない のを修正 [\#758](https://github.com/sakura-editor/sakura/pull/758) ([m-tmatma](https://github.com/m-tmatma))
-- grep で 除外ファイル、除外フォルダが効かない問題を修正するため、除外パターンを指定するコマンドラインを復活する [\#750](https://github.com/sakura-editor/sakura/pull/750) ([m-tmatma](https://github.com/m-tmatma))
+- grep で 除外ファイル、除外フォルダーが効かない のを修正 [\#758](https://github.com/sakura-editor/sakura/pull/758) ([m-tmatma](https://github.com/m-tmatma))
+- grep で 除外ファイル、除外フォルダーが効かない問題を修正するため、除外パターンを指定するコマンドラインを復活する [\#750](https://github.com/sakura-editor/sakura/pull/750) ([m-tmatma](https://github.com/m-tmatma))
 - ウィンドウ一覧画面を開いた後にウィンドウサイズを大きくしてから閉じて開き直すとウィンドウサイズにコントロールが追従していない問題を修正 [\#726](https://github.com/sakura-editor/sakura/pull/726) ([beru](https://github.com/beru))
 - マウスクリックによるキャレット移動が出来なくなる不具合の解消 [\#574](https://github.com/sakura-editor/sakura/pull/574) ([beru](https://github.com/beru))
 - Fix \#539 「Texのファイルで落ちます。」 [\#553](https://github.com/sakura-editor/sakura/pull/553) ([ds14050](https://github.com/ds14050))
@@ -313,7 +313,7 @@
 - Copyright を 2019 にする [\#761](https://github.com/sakura-editor/sakura/pull/761) ([m-tmatma](https://github.com/m-tmatma))
 - issue template を追加する [\#757](https://github.com/sakura-editor/sakura/pull/757) ([m-tmatma](https://github.com/m-tmatma))
 - プラグインを列挙して呼び出す同じような記述があちらこちらにあったので、CJackManager::InvokePlugins を追加して使用 [\#755](https://github.com/sakura-editor/sakura/pull/755) ([beru](https://github.com/beru))
-- Revert "grep で 除外ファイル、除外フォルダが効かない問題を修正するため、除外パターンを指定するコマンドラインを復活する" [\#753](https://github.com/sakura-editor/sakura/pull/753) ([m-tmatma](https://github.com/m-tmatma))
+- Revert "grep で 除外ファイル、除外フォルダーが効かない問題を修正するため、除外パターンを指定するコマンドラインを復活する" [\#753](https://github.com/sakura-editor/sakura/pull/753) ([m-tmatma](https://github.com/m-tmatma))
 - 新規インストール時に言語設定に英語を適用する処理方法の変更 [\#749](https://github.com/sakura-editor/sakura/pull/749) ([beru](https://github.com/beru))
 - doxygen と cppcheck のインストールを install セクションで行う [\#742](https://github.com/sakura-editor/sakura/pull/742) ([m-tmatma](https://github.com/m-tmatma))
 - 開いているファイル名をクリップボードにコピーする機能をデフォルトでメニューに追加する [\#741](https://github.com/sakura-editor/sakura/pull/741) ([m-tmatma](https://github.com/m-tmatma))
@@ -340,7 +340,7 @@
 - 辞書Tipの描画改善、およびHighDPI対応 [\#647](https://github.com/sakura-editor/sakura/pull/647) ([berryzplus](https://github.com/berryzplus))
 - フォントラベルのHighDPI対応 [\#645](https://github.com/sakura-editor/sakura/pull/645) ([berryzplus](https://github.com/berryzplus))
 - 分割線ウィンドウクラスの処理で使用している各数値をDPI設定に応じて調整 [\#641](https://github.com/sakura-editor/sakura/pull/641) ([beru](https://github.com/beru))
-- 独自拡張プロパティシートの「設定フォルダ」ボタンの位置調整処理でDPIを考慮 [\#638](https://github.com/sakura-editor/sakura/pull/638) ([beru](https://github.com/beru))
+- 独自拡張プロパティシートの「設定フォルダー」ボタンの位置調整処理でDPIを考慮 [\#638](https://github.com/sakura-editor/sakura/pull/638) ([beru](https://github.com/beru))
 - `ファイルの場所を コマンドプロンプトを開く` で 管理者ではないときに 32bit アプリから 64bit OS上で起動したときに 32bit で起動してしまうのを修正 [\#627](https://github.com/sakura-editor/sakura/pull/627) ([m-tmatma](https://github.com/m-tmatma))
 - 設定データ読み込み処理において言語設定切り替え後にMRUエントリが無い場合は新規インストール後とみなし false を返すように変更 [\#620](https://github.com/sakura-editor/sakura/pull/620) ([beru](https://github.com/beru))
 - reST 用の拡張子 \(.rst\) を関連付け用の設定に追加 [\#612](https://github.com/sakura-editor/sakura/pull/612) ([m-tmatma](https://github.com/m-tmatma))
@@ -373,7 +373,7 @@
 - LICENSEファイルを追加する [\#470](https://github.com/sakura-editor/sakura/pull/470) ([berryzplus](https://github.com/berryzplus))
 - IME編集エリアの位置変更を行う ImmSetCompositionWindow の呼び出しは IMEが開いている時だけに限定 [\#460](https://github.com/sakura-editor/sakura/pull/460) ([beru](https://github.com/beru))
 - ツールバーの状態更新を必要な場合にのみ行うように変更 [\#456](https://github.com/sakura-editor/sakura/pull/456) ([beru](https://github.com/beru))
-- bregonig のライセンスファイルをライセンス用のサブフォルダに配置する [\#455](https://github.com/sakura-editor/sakura/pull/455) ([m-tmatma](https://github.com/m-tmatma))
+- bregonig のライセンスファイルをライセンス用のサブフォルダーに配置する [\#455](https://github.com/sakura-editor/sakura/pull/455) ([m-tmatma](https://github.com/m-tmatma))
 - SetScrollInfo の呼び出しを抑制 [\#453](https://github.com/sakura-editor/sakura/pull/453) ([beru](https://github.com/beru))
 - ステータスバーのテキスト設定、既に同じ値が設定されている場合は再設定しないようにする [\#452](https://github.com/sakura-editor/sakura/pull/452) ([beru](https://github.com/beru))
 - タイプ別設定のカラーで強調キーワードの共通設定を押すと表示されるダイアログの高さ調整、DPIスケーリング [\#443](https://github.com/sakura-editor/sakura/pull/443) ([beru](https://github.com/beru))
@@ -396,7 +396,7 @@
 - deleteのオーバーロードがGCCに怒られる対応 [\#386](https://github.com/sakura-editor/sakura/pull/386) ([berryzplus](https://github.com/berryzplus))
 - HTML Help 中のリンクを GitHub のものに変える [\#383](https://github.com/sakura-editor/sakura/pull/383) ([m-tmatma](https://github.com/m-tmatma))
 - githash.batも exit /b 0 にする [\#374](https://github.com/sakura-editor/sakura/pull/374) ([berryzplus](https://github.com/berryzplus))
-- MinGW向けMakefileからbtoolフォルダへの参照を取り除く [\#371](https://github.com/sakura-editor/sakura/pull/371) ([berryzplus](https://github.com/berryzplus))
+- MinGW向けMakefileからbtoolフォルダーへの参照を取り除く [\#371](https://github.com/sakura-editor/sakura/pull/371) ([berryzplus](https://github.com/berryzplus))
 - sakura\_lang\_en\_US.dll の MinGW 向け Makefile を更新する [\#369](https://github.com/sakura-editor/sakura/pull/369) ([berryzplus](https://github.com/berryzplus))
 - HTML Help Workshop がVS2017で導入される条件 [\#366](https://github.com/sakura-editor/sakura/pull/366) ([KENCHjp](https://github.com/KENCHjp))
 - MINGW\_HAS\_SECURE\_APIが無効か判定する式の修正 [\#363](https://github.com/sakura-editor/sakura/pull/363) ([berryzplus](https://github.com/berryzplus))
@@ -405,7 +405,7 @@
 - githash.bat のエラー耐性を上げる [\#360](https://github.com/sakura-editor/sakura/pull/360) ([m-tmatma](https://github.com/m-tmatma))
 - インストーラの UI を英語対応にする [\#359](https://github.com/sakura-editor/sakura/pull/359) ([m-tmatma](https://github.com/m-tmatma))
 - MinGWでサクラエディタをビルドできるようにメイクファイルを更新する [\#351](https://github.com/sakura-editor/sakura/pull/351) ([berryzplus](https://github.com/berryzplus))
-- インストーラ関連のフォルダを無視ファイルに追加 [\#343](https://github.com/sakura-editor/sakura/pull/343) ([m-tmatma](https://github.com/m-tmatma))
+- インストーラ関連のフォルダーを無視ファイルに追加 [\#343](https://github.com/sakura-editor/sakura/pull/343) ([m-tmatma](https://github.com/m-tmatma))
 - バッチファイルのコピーで /Y と /B をつける [\#342](https://github.com/sakura-editor/sakura/pull/342) ([m-tmatma](https://github.com/m-tmatma))
 - ビルドに関するドキュメントを更新、SKIP\_CREATE\_GITHASH に関する説明を移動 [\#341](https://github.com/sakura-editor/sakura/pull/341) ([m-tmatma](https://github.com/m-tmatma))
 - keyword ディレクトリ以下のファイルの説明を追加 [\#340](https://github.com/sakura-editor/sakura/pull/340) ([m-tmatma](https://github.com/m-tmatma))
@@ -413,7 +413,7 @@
 - インストーラ用のドキュメントを更新 [\#337](https://github.com/sakura-editor/sakura/pull/337) ([m-tmatma](https://github.com/m-tmatma))
 - postBuild.bat の処理内容を更新 [\#336](https://github.com/sakura-editor/sakura/pull/336) ([m-tmatma](https://github.com/m-tmatma))
 - bregonig.dll のファイル内容とタイムスタンプを比較する [\#335](https://github.com/sakura-editor/sakura/pull/335) ([m-tmatma](https://github.com/m-tmatma))
-- インストーラの生成先のフォルダにプラットフォーム名を含める [\#333](https://github.com/sakura-editor/sakura/pull/333) ([m-tmatma](https://github.com/m-tmatma))
+- インストーラの生成先のフォルダーにプラットフォーム名を含める [\#333](https://github.com/sakura-editor/sakura/pull/333) ([m-tmatma](https://github.com/m-tmatma))
 - \#329 によるデグレを修正 \(bron412.zip の bregonig.dll が使われなくなる\) [\#332](https://github.com/sakura-editor/sakura/pull/332) ([m-tmatma](https://github.com/m-tmatma))
 - 大きすぎるファイル \(2GBくらいを超えるもの\) を読み込もうとしたときに正しくエラーメッセージを出す [\#330](https://github.com/sakura-editor/sakura/pull/330) ([kobake](https://github.com/kobake))
 - bregonig.dll を sakura.exe と同じ場所に自動配置 [\#329](https://github.com/sakura-editor/sakura/pull/329) ([kobake](https://github.com/kobake))
diff --git a/addDoxygenFileComment.md b/addDoxygenFileComment.md
index 011dc91308..b7de87689c 100644
--- a/addDoxygenFileComment.md
+++ b/addDoxygenFileComment.md
@@ -16,5 +16,5 @@ doxygen は解析対象かどうかを `@file` コメントの有無で認識し
 
 ## ファイル構成
 
-- `addDoxygenFileComment.py`  : スクリプト本体。第一引数で指定したフォルダ以下のソースに対して `@file` コメントがなければ先頭行に付与します。
+- `addDoxygenFileComment.py`  : スクリプト本体。第一引数で指定したフォルダー以下のソースに対して `@file` コメントがなければ先頭行に付与します。
 - `addDoxygenFileComment.bat` : `sakura_core` の引数を渡して `addDoxygenFileComment.py` を実行します。
diff --git a/addDoxygenFileComment.py b/addDoxygenFileComment.py
index c825d6e4bf..4f446b8402 100644
--- a/addDoxygenFileComment.py
+++ b/addDoxygenFileComment.py
@@ -15,7 +15,7 @@ def checkExtension(fileName):
 	base, ext = os.path.splitext(fileName)
 	return (ext in extensions)
 
-# 引数で指定したフォルダ以下のすべての対象ファイルを yield で返す
+# 引数で指定したフォルダー以下のすべての対象ファイルを yield で返す
 def checkAll(topDir):
 	for rootdir, dirs, files in os.walk(topDir):
 		for fileName in files:
diff --git a/ci/build-batchfiles.md b/ci/build-batchfiles.md
index 3ea58479bc..d2591c04f3 100644
--- a/ci/build-batchfiles.md
+++ b/ci/build-batchfiles.md
@@ -96,13 +96,13 @@ SonarQube に関しては [こちら](../SonarQube.md) も参照してくださ
 |build-all.bat       | platform ("Win32" または "x64" または "MinGW") | configuration ("Debug" または "Release")  |
 |build-sln.bat       | platform ("Win32" または "x64") | configuration ("Debug" または "Release")  |
 |build-gnu.bat       | platform ("MinGW") | configuration ("Debug" または "Release")  |
-|sakura\preBuild.bat | HeaderMake.exe の実行ファイルのフォルダパス | なし |
+|sakura\preBuild.bat | HeaderMake.exe の実行ファイルのフォルダーパス | なし |
 |sakura\postBuild.bat| platform ("Win32" または "x64") | configuration ("Debug" または "Release")  |
 |parse-buildlog.bat  | msbuild のビルドログパス | なし |
 |build-chm.bat       | なし | なし |
 |build-installer.bat | platform ("Win32" または "x64") | configuration ("Debug" または "Release")  |
 |zipArtifacts.bat    | platform ("Win32" または "x64") | configuration ("Debug" または "Release")  |
-|calc-hash.bat       | sha256 のハッシュ値の出力先ファイル | ハッシュ値を計算するフォルダパス |
+|calc-hash.bat       | sha256 のハッシュ値の出力先ファイル | ハッシュ値を計算するフォルダーパス |
 
 ## バッチファイルの仕組み
 
@@ -123,9 +123,9 @@ SonarQube に関しては [こちら](../SonarQube.md) も参照してくださ
 
 #### 処理の流れ
 
-* if 文の条件判定を元に、成果物のファイル名、フォルダ名を構築して環境変数に設定する
+* if 文の条件判定を元に、成果物のファイル名、フォルダー名を構築して環境変数に設定する
     - 設定される環境変数については [こちら](build-envvars.md#zipartifactsbat-で設定する環境変数) を参照してください。
-* 作業用フォルダに必要なファイルをコピーする
-* [calc-hash.bat](../calc-hash.bat) で sha256 のハッシュを計算して、作業用フォルダにコピーする
-* [tools\zip\zip.bat](../tools/zip/zip.bat) を使用して作業用フォルダの中身を zip ファイルにまとめる
+* 作業用フォルダーに必要なファイルをコピーする
+* [calc-hash.bat](../calc-hash.bat) で sha256 のハッシュを計算して、作業用フォルダーにコピーする
+* [tools\zip\zip.bat](../tools/zip/zip.bat) を使用して作業用フォルダーの中身を zip ファイルにまとめる
     - [7-Zip](https://sevenzip.osdn.jp/) が利用できる場合は 7z.exe を、利用できない場合は PowerShell を利用してファイルを作成します。
diff --git a/ci/build-envvars.md b/ci/build-envvars.md
index 20d85b0239..82033c2244 100644
--- a/ci/build-envvars.md
+++ b/ci/build-envvars.md
@@ -94,12 +94,12 @@ APPVEYOR_REPO_TAG_NAME は利用をやめて 代わりに GIT_TAG_NAME を使う
 | SHORTHASH     | commit hash の先頭8文字                            | 実体は GIT_SHORT_COMMIT_HASH      |
 | RELEASE_PHASE | "alpha" または 空                                  | x64 ビルドの場合のみ有効               |
 | BASENAME      | 成果物の zip ファイル名(拡張子含まない部分)        | 常に有効                               |
-| WORKDIR       | 作業用フォルダ                                     | 常に有効                               |
-| WORKDIR_LOG   | ログファイル用の作業用フォルダ                     | 常に有効                               |
-| WORKDIR_EXE   | 実行ファイル(一般向け)用の作業用フォルダ           | 常に有効                               |
-| WORKDIR_DEV   | 開発者向け成果物用の作業用フォルダ                 | 常に有効                               |
-| WORKDIR_INST  | インストーラ用の作業用フォルダ                     | 常に有効                               |
-| WORKDIR_ASM   | アセンブラ出力用の作業用フォルダ                   | 常に有効                               |
+| WORKDIR       | 作業用フォルダー                                     | 常に有効                               |
+| WORKDIR_LOG   | ログファイル用の作業用フォルダー                     | 常に有効                               |
+| WORKDIR_EXE   | 実行ファイル(一般向け)用の作業用フォルダー           | 常に有効                               |
+| WORKDIR_DEV   | 開発者向け成果物用の作業用フォルダー                 | 常に有効                               |
+| WORKDIR_INST  | インストーラ用の作業用フォルダー                     | 常に有効                               |
+| WORKDIR_ASM   | アセンブラ出力用の作業用フォルダー                   | 常に有効                               |
 | OUTFILE       | 成果物の zip ファイル名                            | 常に有効                               |
 | OUTFILE_LOG   | ログファイルの成果物の zip ファイル名              | 常に有効                               |
 | OUTFILE_EXE   | 実行ファイル(一般向け)の成果物の zip ファイル名    | 常に有効                               |
diff --git a/help/macro/source/reference/clipboard/S_CopyDirPath.html b/help/macro/source/reference/clipboard/S_CopyDirPath.html
index d1f9dd047d..0a257bb819 100644
--- a/help/macro/source/reference/clipboard/S_CopyDirPath.html
+++ b/help/macro/source/reference/clipboard/S_CopyDirPath.html
@@ -11,7 +11,7 @@
 
            S_CopyFolder
            
 
            
 	
            機能
            
-		
            このファイルのフォルダ名をコピー
            
+		
            このファイルのフォルダー名をコピー
            
 	
            構文
            
 		
            void  S_CopyFolder ( )
            
 
            
diff --git a/help/macro/source/reference/find/S_Grep.html b/help/macro/source/reference/find/S_Grep.html
index bc6977d8b6..dc9099f2c0 100644
--- a/help/macro/source/reference/find/S_Grep.html
+++ b/help/macro/source/reference/find/S_Grep.html
@@ -20,7 +20,7 @@ 
            S_Grep
            
 
        
-			
+			
        
 
 
 
 
 
        引数型内容
        
 			
        S1文字列検索文字列
        
 			
        S2文字列検索対象ファイル
        S3文字列検索対象フォルダ
        S3文字列検索対象フォルダー
        
 			
        i1整数数値Grep ダイアログの状態を10進数数値で指定する。
        
 			
        i2整数数値文字コードセット
        
 		
        
@@ -31,7 +31,7 @@ 
        S_Grep
        
 		
-			
+			
@@ -41,8 +41,8 @@ 
        S_Grep
        
-			
-			
+			
+			
        
 	無題
 
        bit内容
        0サブフォルダからも検索する
        0サブフォルダーからも検索する
        
 			
        1- No Use -
        
 			
        2英大文字と小文字を区別する
        
 			
        3正規表現
        
 			
        15～8文字コードセット
        
 			
        16単語単位で探す(sakura:2.1.0.0以降)
        
 			
        17ファイル毎最初のみ検索(sakura:2.1.0.0以降)
        18ベースフォルダ表示(sakura:2.1.0.0以降)
        19フォルダ毎に表示(sakura:2.1.0.0以降)
        18ベースフォルダー表示(sakura:2.1.0.0以降)
        19フォルダー毎に表示(sakura:2.1.0.0以降)
      文字コードセット
      diff --git a/help/macro/source/sample/SampleGrep.html b/help/macro/source/sample/SampleGrep.html index 6ded8168f5..9d5052606a 100644 --- a/help/macro/source/sample/SampleGrep.html +++ b/help/macro/source/sample/SampleGrep.html @@ -19,7 +19,7 @@

      S_Grepの使用例

      sPath = ExpandParameter(Cstr("$F")) sDir = Left(CStr(sPath), Len(sPath) - Len(sFile) - 1) -' サブフォルダから検索しない +' サブフォルダーから検索しない ' 大文字小文字を区別する ' 正規表現無効 ' 文字コードセット自動 diff --git a/help/plugin/Text/implementation01.html b/help/plugin/Text/implementation01.html index c511d9c021..7c3944fd4b 100644 --- a/help/plugin/Text/implementation01.html +++ b/help/plugin/Text/implementation01.html @@ -106,7 +106,7 @@

      プラグイン定義ファイル(plugin.def)

      ■WSHプラグイン固有
      ・Plug, Command セクションでのハンドラにはスクリプトファイル名を指定する。
      -　例）パスは個別フォルダ起点の相対パスとする。
      +　例）パスは個別フォルダー起点の相対パスとする。
      　　Outline=outline.js @@ -125,7 +125,7 @@

      プラグイン定義ファイル(plugin.def)

      無題
      NameDLLファイル名

      - ■localサブフォルダ内のplugin_<言語名>.def (sakura:2.1.1.0 以降)
      + ■localサブフォルダー内のplugin_<言語名>.def (sakura:2.1.1.0 以降)
      ・デフォルト言語は、「ja_JP」(local\plugin_ja_JP.def)です。
      各定義を言語ごとに上書きすることができます。
      @@ -140,7 +140,7 @@

      プラグイン定義ファイル(plugin.def)

      ReadMeファイル(readme.txt等)

      -ファイル名は ReadMe.txt または 個別フォルダ名.txt とする。
      +ファイル名は ReadMe.txt または 個別フォルダー名.txt とする。
      プラグインに関する情報を記述する。
      必須ではありません。
      エディタの「共通設定」「プラグイン」で該当プラグインを選択し、[ReadMe]でこのファイルを表示する。
      @@ -148,7 +148,7 @@

      ReadMeファイル(readme.txt等)

      ZIPプラグイン(XP以降)

      -プラグイン開発後、plugins配下の個別フォルダを「圧縮(ZIP形式)フォルダー」へ「送る」を実行で配布形式が出来る(XP以降)。
      +プラグイン開発後、plugins配下の個別フォルダーを「圧縮(ZIP形式)フォルダー」へ「送る」を実行で配布形式が出来る(XP以降)。
      拡張子はzipとする。
      WindowsXP以降ではZIPファイルから導入できる。
      diff --git a/help/plugin/Text/implementation02.html b/help/plugin/Text/implementation02.html index 9e668f46f4..f3ddc3fb3d 100644 --- a/help/plugin/Text/implementation02.html +++ b/help/plugin/Text/implementation02.html @@ -34,7 +34,7 @@

      Plugin ・・・ プラグインの共通機能を提供する - + diff --git a/help/plugin/Text/index.html b/help/plugin/Text/index.html index fb554bbf0f..fe3f259f59 100644 --- a/help/plugin/Text/index.html +++ b/help/plugin/Text/index.html @@ -35,7 +35,7 @@

      プラグイン仕様

      ●利用イメージ
      ●動き
      - ●フォルダ構成
      + ●フォルダー構成
      ●ER図
      ●ジャック一覧
      diff --git a/help/plugin/Text/overview.html b/help/plugin/Text/overview.html index d4951e211d..151293aca8 100644 --- a/help/plugin/Text/overview.html +++ b/help/plugin/Text/overview.html @@ -33,21 +33,21 @@

      インストール

      これでインストールは完了ですが、まだプラグインは利用できません。 これ以降に新しく開いたエディタでは起動時にプラグインが読み込まれ、利用可能になります。

      -hintWindows2000はZIPプラグインに未対応のため、ダウンロードしたファイルをプラグインフォルダ配下に解凍し、「新規プラグインを追加」からインストールしてください。
      +hintWindows2000はZIPプラグインに未対応のため、ダウンロードしたファイルをプラグインフォルダー配下に解凍し、「新規プラグインを追加」からインストールしてください。

      プラグインは最大40個までインストールできます。

      -プラグインをインストールすると、設定ファイルがあるフォルダの下にpluginsフォルダができ、その配下にZIPファイルの中身が展開されます。 +プラグインをインストールすると、設定ファイルがあるフォルダーの下にpluginsフォルダーができ、その配下にZIPファイルの中身が展開されます。 ユーザー別設定が有効な場合はC:\Users\(ユーザー名)\AppData\Roaming\sakura\plugins、そうでなければC:\Program Files(x86)\sakura\pluginsにあるはずです。
      -以下、pluginsをプラグインフォルダと呼び、その下のプラグインごとのフォルダを個別フォルダと呼びます。
      +以下、pluginsをプラグインフォルダーと呼び、その下のプラグインごとのフォルダーを個別フォルダーと呼びます。

      アンインストール

      プラグインのアンインストールは、設定画面から「削除」を行います。 -ディスク上には残るので、完全に削除する場合は手動で個別フォルダを削除してください。 +ディスク上には残るので、完全に削除する場合は手動で個別フォルダーを削除してください。 ディスクから削除していなければ、「新規プラグインの追加」で再度インストールできます。

      @@ -56,18 +56,18 @@

      バージョンアップ

      プラグインの新バージョンが出た場合は、設定画面からZIPプラグインの導入でファイルを指定し更新し、エディタ本体を再起動すると利用可能になります。

      -hintWindows2000の場合は、個別フォルダの内容を上書きして更新してください。 +hintWindows2000の場合は、個別フォルダーの内容を上書きして更新してください。

      大まかな動き

      ・エディタプロセスの起動時に、共通情報のプラグインテーブルを参照し、インストール済みのプラグインに対して以下の読み込み操作を行う。
      -　個別フォルダ内にはプラグインの情報を記述したテキストファイル(plugin.def)があり、エディタはまずこのテキストファイルを読み込む。
      +　個別フォルダー内にはプラグインの情報を記述したテキストファイル(plugin.def)があり、エディタはまずこのテキストファイルを読み込む。
      　以下、このファイルをプラグイン定義ファイルと呼ぶ。

      -　また、プラグインフォルダ直下に、プラグインごとのテキストファイルを置き、そこにプラグインのオプションなど可変の情報を記述する。
      +　また、プラグインフォルダー直下に、プラグインごとのテキストファイルを置き、そこにプラグインのオプションなど可変の情報を記述する。
      　以下、このファイルをオプションファイルと呼ぶ。
      -　ファイル名は "個別フォルダ名.ini" とする。
      +　ファイル名は "個別フォルダー名.ini" とする。
      　プラグイン定義ファイルのOptionセクションで指定した項目は、共通設定のプラグイン個別設定から値を編集できる。

      ・プラグイン定義ファイルの内容に従い、メモリ上にプラグインオブジェクトを作成する。
      @@ -83,15 +83,15 @@

      大まかな動き

      　(現時点でDLLプラグインはまだ使い物にならない)

      -

      フォルダ構成

      +

      フォルダー構成

      -設定ファイルフォルダ
+設定ファイルフォルダー
   ├ sakura.ini
   └ plugins/
       ├ ○○.ini           // オプションファイル
       ├ ××.ini
-      ├ ○○/              // 個別フォルダ
+      ├ ○○/              // 個別フォルダー
       │  ├ plugin.def     // プラグイン定義ファイル
       │  ├ readme.txt     // 説明
       │  ├ ○○_A.js      // プログラム等
diff --git a/help/sakura/res/HLP000005.html b/help/sakura/res/HLP000005.html
index 63679eda63..2986cbee6f 100644
--- a/help/sakura/res/HLP000005.html
+++ b/help/sakura/res/HLP000005.html
@@ -18,7 +18,7 @@ 
      単体配布版インストール
      
 解凍方法についてはここでは説明しません。
      
 
        
 
      1. 以前のバージョンのサクラエディタがインストールされている場合、実行中のサクラエディタを(常駐も含めて)すべて終了させます。
        2. 
-
      2. 任意のフォルダを作成し、そのフォルダに配布ファイルsakura_xxxx-xx-xx.zip を解凍します。更新の場合は通常、上書きで構いません。
        3. 
+
      3. 任意のフォルダーを作成し、そのフォルダーに配布ファイルsakura_xxxx-xx-xx.zip を解凍します。更新の場合は通常、上書きで構いません。
        4. 
 
      4. Windows 2000以降で、ユーザー別設定にしたい場合は、sakura.exe.ini (sakura.iniとは別のファイル)を設置します。
        
 	　*Vista以降でVirtual Storeを無効にする場合はユーザー別設定が必須です。
        5. 
 
      5. Windows XP以降でVisualStyleを有効にする場合はsakura.exe.manifest を設置します。また、Vista以降でVirtual Storeを無効にする場合にも sakura.exe.manifest が必要になります。
        6. 
@@ -28,7 +28,7 @@ 
        単体配布版インストール
        
 note注意
        
 Vista以降のUACに対応していないバージョン(1.5.17.0以前)からバージョンアップする場合は、manifestを置くことでVirtual Storeが無効化されるため、これまで使っていた設定が引き継がれません。
 必要に応じてsakura.ini を適切な位置へ移動するなどの対応をお願いします。
-詳しくはVirtual Store、ユーザー別設定および設定フォルダを参照。
        
+詳しくはVirtual Store、ユーザー別設定および設定フォルダーを参照。
        
 
        
 
        
 
@@ -44,7 +44,7 @@ 
        パッケージ版インストール
        
 note注意
        
 新バージョンに更新したことによってそれまで使えていた機能が動作しなくなる場合があります。
        
 旧バージョンの実行ファイルsakura.exe と設定ファイルsakura.ini をバックアップしておくことをお勧めします。
        
-この場合sakura.exe を単に別フォルダに移動しただけでは、ショートカットがリンク先を自動変更して旧バージョンを起動してしまうことがあるのでファイル名を変更したほうがいいでしょう。
        
+この場合sakura.exe を単に別フォルダーに移動しただけでは、ショートカットがリンク先を自動変更して旧バージョンを起動してしまうことがあるのでファイル名を変更したほうがいいでしょう。
        
 
        
 
        
 note注意
        
@@ -56,8 +56,8 @@ 
        アンインストール
        
 
        単体配布版アンインストール
        
 
          
 
        1. 実行中のサクラエディタを常駐も含めてすべて終了させます。
          2. 
-
        2. sakura.exe のフォルダを丸ごと削除します。
          3. 
-
        3. 2000以降でユーザー別設定を行っていた場合は、設定フォルダも削除します。
          4. 
+
        4. sakura.exe のフォルダーを丸ごと削除します。
          5. 
+
        5. 2000以降でユーザー別設定を行っていた場合は、設定フォルダーも削除します。
          6. 
 
        6. Vista以降にてVirtual Storeが有効になっている場合は、"%LOCALAPPDATA%\VirtualStore" 以下にあるsakura.ini などのファイルも削除します。
          7. 
 
        7. 自分で作成したショートカットなども削除してください。
          8. 
 
        
@@ -86,7 +86,7 @@ 
        パッケージ版アンインストール
      無題
      GetPluginDir()個別フォルダのパスを返す。
      GetPluginDir()個別フォルダーのパスを返す。
      GetDef(section, key) 定義ファイルの値を取得する。
      GetOption(section, key) オプションファイルの値を取得する。
      SetOption(section, key, value) オプションファイルの値を設定する。
      - +
      無題
      XP以前で標準インストールの場合sakura.exeと同じ場所
      2000以降でユーザー別設定の場合ユーザー別設定および設定フォルダ参照
      2000以降でユーザー別設定の場合ユーザー別設定および設定フォルダー参照
      Vista以降でVirtual Store有効の場合"%LOCALAPPDATA%\VirtualStore\Program Files\sakura"
      *パッケージ版でデフォルトのインストール先を指定した場合

      @@ -106,7 +106,7 @@

      パッケージ版ファイル一式

      uninstall.exeアンインストーラ -<keyword>フォルダ +<keyword>フォルダー @@ -210,14 +210,14 @@

      パッケージ版ファイル一式


      サクラエディタが作成する作業ファイルについて

      -サクラエディタをインストールした後にサクラエディタを実行すると、 sakura.exeのあるフォルダ（または設定フォルダ）に以下のファイルが作成されます。
      +サクラエディタをインストールした後にサクラエディタを実行すると、 sakura.exeのあるフォルダー（または設定フォルダー）に以下のファイルが作成されます。
      無題
      ファイル名言語内容
      無題
      ファイル名説明
      sakura.ini サクラエディタ用の設定ファイルです。

      -キーマクロの記録を使うと、共通設定のマクロ一覧のフォルダに以下のファイルが作成されます。
      +キーマクロの記録を使うと、共通設定のマクロ一覧のフォルダーに以下のファイルが作成されます。
      diff --git a/help/sakura/res/HLP000010.html b/help/sakura/res/HLP000010.html index 7e17cf56f3..e62183e0d2 100644 --- a/help/sakura/res/HLP000010.html +++ b/help/sakura/res/HLP000010.html @@ -12,7 +12,7 @@

      ツールバーアイコンの変更手順

      変更手順

      -メニューやツールバーで使われるアイコンを標準のアイコン以外にしたい場合は、公開されているサクラエディタのソースファイル内にある mytool.bmp と同形式のビットマップ・ファイルをサクラエディタのインストールフォルダ（もしくは設定フォルダ）に my_icons.bmp というファイル名でおくだけです。
      +メニューやツールバーで使われるアイコンを標準のアイコン以外にしたい場合は、公開されているサクラエディタのソースファイル内にある mytool.bmp と同形式のビットマップ・ファイルをサクラエディタのインストールフォルダー（もしくは設定フォルダー）に my_icons.bmp というファイル名でおくだけです。
      サクラエディタは起動時にまずこのファイルがあるかどうかチェックし、あればそれを、なければ自分自身が持っているものをアイコンとして使うようになっています。

      note注意
      diff --git a/help/sakura/res/HLP000015.html b/help/sakura/res/HLP000015.html index 613f3ea2bd..82523e976e 100644 --- a/help/sakura/res/HLP000015.html +++ b/help/sakura/res/HLP000015.html @@ -15,7 +15,7 @@

      開く

      ディスクにあるファイルを開くことができます。
      (無題)で変更していないウィンドウの場合は、今のウィンドウでファイルを開きます。
      それ以外の場合は、新しいウィンドウを作成して開きます。
      -フォルダの初期値はカレントディレクトリ/MRUの1番目/指定フォルダを共通設定 『編集』で指定可能です。(2.0.6.0 以降)
      +フォルダーの初期値はカレントディレクトリ/MRUの1番目/指定フォルダーを共通設定 『編集』で指定可能です。(2.0.6.0 以降)

      OpenFile

      @@ -76,9 +76,9 @@

      開く

      ・[最近のファイル]
      最近使ったファイルの一覧をアルファベット順に見ることができます。

      -・[最近のフォルダ]
      -最近使ったフォルダの一覧をアルファベット順に見ることができます。
      -フォルダを選択すると、現在のフォルダが変化します。
      +・[最近のフォルダー]
      +最近使ったフォルダーの一覧をアルファベット順に見ることができます。
      +フォルダーを選択すると、現在のフォルダーが変化します。

      ・[ファイルの種類]
      ファイルの種類には、すべてのファイル、テキストファイル以外に、タイプ別設定で設定しているタイプ（拡張子）がセットされています。
      @@ -94,7 +94,7 @@

      開く

          str1    ファイル名
          int2    文字コード（省略可能、ただしPPAマクロは省略不可）(2.1.0.0以降)
          int3    ビューモード（省略可能、ただしPPAマクロは省略不可）(2.1.0.0以降)
      -    str4    デフォルトフォルダ・ファイル名（省略可能、ただしPPAマクロは省略不可）(2.1.0.0以降)
      +    str4    デフォルトフォルダー・ファイル名（省略可能、ただしPPAマクロは省略不可）(2.1.0.0以降)
      ・記録: ×
      ・解説
      ファイル名に""(空文字列)を指定すると、ファイルダイアログを表示します。
      @@ -113,7 +113,7 @@

      開く

         91    CP_OEM (sakura:2.2.0.0以降)
         コードページ番号  (sakura:2.2.0.0以降)
      ビューモードは、0（false、省略時規定）、または1(true)を指定します。
      -デフォルトフォルダ・ファイル名は、ダイアログのデフォルトの表示位置と、デフォルトの名前を指定します。
      +デフォルトフォルダー・ファイル名は、ダイアログのデフォルトの表示位置と、デフォルトの名前を指定します。
      省略時は、共通設定に従った表示位置になります。

      note注意
      diff --git a/help/sakura/res/HLP000016.html b/help/sakura/res/HLP000016.html index ba0b565a01..7a66a48b25 100644 --- a/help/sakura/res/HLP000016.html +++ b/help/sakura/res/HLP000016.html @@ -38,7 +38,7 @@

      「ファイル(F)」メニューの一覧

      ・ファイルのプロパティ(T)
      ・ブラウズ(B)
      ・最近使ったファイルDelta
      -・最近使ったフォルダDelta
      +・最近使ったフォルダーDelta
      ・グループを閉じる(G)
      ・編集の全終了(Q)
      ・サクラエディタの全終了(X)
      diff --git a/help/sakura/res/HLP000021.html b/help/sakura/res/HLP000021.html index 48a21cfc94..e4a762b9f2 100644 --- a/help/sakura/res/HLP000021.html +++ b/help/sakura/res/HLP000021.html @@ -14,7 +14,7 @@

      名前を付けて保存

      現在編集しているテキストにファイル名を付けて保存します。
      -フォルダの初期値はカレントディレクトリ/MRUの1番目/指定フォルダを共通設定 『編集』で指定可能です。(2.0.6.0 以降)
      +フォルダーの初期値はカレントディレクトリ/MRUの1番目/指定フォルダーを共通設定 『編集』で指定可能です。(2.0.6.0 以降)
      無題のファイル名には現在の日時を示す文字列が付加されます。(2.4.2 以降)

      FileSave
      @@ -35,9 +35,9 @@

      名前を付けて保存

      ・[最近のファイル]
      最近使ったファイルの一覧をアルファベット順に見ることができます。

      -・[最近のフォルダ]
      -最近使ったフォルダの一覧をアルファベット順に見ることができます。
      -フォルダを選択すると、現在のフォルダが変化します。
      +・[最近のフォルダー]
      +最近使ったフォルダーの一覧をアルファベット順に見ることができます。
      +フォルダーを選択すると、現在のフォルダーが変化します。

      hintヒント
      ダイアログ表示時にプレースバーを表示します。(sakura:1.5.8.0以降)
      diff --git a/help/sakura/res/HLP000023.html b/help/sakura/res/HLP000023.html index 2fd6977669..1d2713b679 100644 --- a/help/sakura/res/HLP000023.html +++ b/help/sakura/res/HLP000023.html @@ -4,23 +4,23 @@ -最近使ったフォルダ - +最近使ったフォルダー + -

      最近使ったフォルダ

      -最近使ったファイルの場所(フォルダ)をサブメニューに一覧表示します。
      -サブメニューからフォルダを選択すると、そのフォルダを初期フォルダとした「開く」ダイアログを表示します。
      +

      最近使ったフォルダー

      +最近使ったファイルの場所(フォルダー)をサブメニューに一覧表示します。
      +サブメニューからフォルダーを選択すると、そのフォルダーを初期フォルダーとした「開く」ダイアログを表示します。

      hintヒント
      お気に入りにしたファイルは、押し出されて履歴から消えることがなくなります。
      -履歴の管理でお気に入りに設定したフォルダは、マークアイコンがつきます。
      +履歴の管理でお気に入りに設定したフォルダーは、マークアイコンがつきます。
      メニューアイコンを非表示にしている場合は、星印がつきます。

      -表示するフォルダ数を設定することができます。
      +表示するフォルダー数を設定することができます。
      詳しくは、共通設定 『全般』プロパティをご覧ください。

      -履歴の管理の「ファイル・フォルダ除外」で登録を除外することができます。
      +履歴の管理の「ファイル・フォルダー除外」で登録を除外することができます。
      diff --git a/help/sakura/res/HLP000029.html b/help/sakura/res/HLP000029.html index 0ce544af9c..45cb88e840 100644 --- a/help/sakura/res/HLP000029.html +++ b/help/sakura/res/HLP000029.html @@ -23,5 +23,5 @@

      最近使ったファイル

      表示するファイル数を設定することができます。
      詳しくは、共通設定 『全般』プロパティをご覧ください。

      -履歴の管理の「ファイル・フォルダ除外」で登録を除外することができます。
      +履歴の管理の「ファイル・フォルダー除外」で登録を除外することができます。
      diff --git a/help/sakura/res/HLP000065.html b/help/sakura/res/HLP000065.html index 421c5d2258..36c0e5fa22 100644 --- a/help/sakura/res/HLP000065.html +++ b/help/sakura/res/HLP000065.html @@ -32,7 +32,7 @@

      タグジャンプ


      ■C/C++インクルードファイルへのタグジャンプ
      次のような記述のある行からインクルードファイルなどにタグジャンプできます。
      -ただしジャンプ元と同じフォルダか相対パスのファイルにしかタグジャンプできません。
      +ただしジャンプ元と同じフォルダーか相対パスのファイルにしかタグジャンプできません。
      #include <ファイル名>
      #include "ファイル名"
      diff --git a/help/sakura/res/HLP000067.html b/help/sakura/res/HLP000067.html index 1041d07729..0b026eb4fb 100644 --- a/help/sakura/res/HLP000067.html +++ b/help/sakura/res/HLP000067.html @@ -15,7 +15,7 @@

      Grep

      Grep
      ディスクにある複数のファイルから、指定した文字列を検索することができます。
      -指定したフォルダの下層のフォルダを全て検索することもできます。
      +指定したフォルダーの下層のフォルダーを全て検索することもできます。
      ・検索結果は、別のウィンドウが作成されて、そこに表示されます。
      @@ -24,31 +24,31 @@

      Grep

      - (条件) …… 検索条件を指定します。何も指定せずに実行すると、ファイル名検索ができます。ただし、フォルダ名検索はできません。
      + (条件) …… 検索条件を指定します。何も指定せずに実行すると、ファイル名検索ができます。ただし、フォルダー名検索はできません。
      (ファイル) … 検索対象となるファイル指定します。ワイルドカードが使えます。
      カンマ、スペース、セミコロン(, ;)のどれかで区切ると複数の条件を指定できます。
      ファイル名に(, ;)を含む場合は、ダブルクオーテーションで囲うことで、ひとつのファイル名として扱えます。
      ファイルパターンの先頭に!を付ける(例: !*.obj)と，そのパターンに当たるファイルをGrep対象から外します。
      - ファイルパターンの先頭に#を付ける(例: #*.svn)と、そのパターンに当たるサブフォルダをGrep対象から外します。(sakura:2.1.0.0以降)
      + ファイルパターンの先頭に#を付ける(例: #*.svn)と、そのパターンに当たるサブフォルダーをGrep対象から外します。(sakura:2.1.0.0以降)
      指定位置にかかわらず除外指定は検索指定より優先されます．
      何も指定しない場合は、「*.*」を指定したことになります。
      - (フォルダ) … 検索対象ファイルのあるフォルダを指定します。エクスプローラなどからのフォルダのドロップも受け付けます。
      - 複数フォルダを;で区切って指定することができます。;を含むフォルダを指定する場合は""で囲ってください。(sakura:2.1.0.0以降)
      + (フォルダー) … 検索対象ファイルのあるフォルダーを指定します。エクスプローラなどからのフォルダーのドロップも受け付けます。
      + 複数フォルダーを;で区切って指定することができます。;を含むフォルダーを指定する場合は""で囲ってください。(sakura:2.1.0.0以降)
      (除外ファイル) … 検索対象から外すファイルパターンを指定します。
      (ファイル) で ファイルパターンの先頭に!を付ける ことにより除外ファイルを指定できるのを簡単に使えるようにするものです。
      ファイルパターンを;で区切って指定することができます。;を含むファイルパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      - (除外フォルダ) … 検索対象から外すフォルダパターンを指定します。
      - (ファイル) で ファイルパターンの先頭に#を付ける ことにより除外フォルダを指定できるのを簡単に使えるようにするものです。
      - フォルダパターンを;で区切って指定することができます。;を含むフォルダパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      + (除外フォルダー) … 検索対象から外すフォルダーパターンを指定します。
      + (ファイル) で ファイルパターンの先頭に#を付ける ことにより除外フォルダーを指定できるのを簡単に使えるようにするものです。
      + フォルダーパターンを;で区切って指定することができます。;を含むフォルダーパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      □単語単位で探す
          単語として識別するもののみ検索します。
          スペースなどで区切ると複数単語検索が行えます。(2.0.6.0 以降)
      - ■サブフォルダからも検索する
      -     指定フォルダの下層フォルダからも検索するかどうかを指定します。
      + ■サブフォルダーからも検索する
      +     指定フォルダーの下層フォルダーからも検索するかどうかを指定します。
      □現在編集中のファイルから検索
          現在編集中のファイルのみを検索対象に指定します。
      @@ -60,9 +60,9 @@

      Grep

      □ファイル毎最初のみ検索 … ファイル毎に1回だけ結果を出力します。
      - □フォルダ毎に表示 … サブフォルダ毎にパスをまとめて相対パスで出力します。(sakura:2.1.0.0以降)
      + □フォルダー毎に表示 … サブフォルダー毎にパスをまとめて相対パスで出力します。(sakura:2.1.0.0以降)
      - □ベースフォルダ表示 … ルートフォルダの表示とそこからの相対パスで出力します。(sakura:2.1.0.0以降)
      + □ベースフォルダー表示 … ルートフォルダーの表示とそこからの相対パスで出力します。(sakura:2.1.0.0以降)
      □文字コードセット
          検索対象となるファイルの文字コードセットを選択します。
      @@ -71,8 +71,8 @@

      Grep

      □CP … 文字コードセットでコードページを選択できるようにします。(sakura:2.2.0.0以降)
      - □フォルダの初期値をカレントフォルダにする
      -     現在開いているファイルがあるフォルダを(フォルダ)の初期値にします。次回のダイアログ表示時に反映されます。
      + □フォルダーの初期値をカレントフォルダーにする
      +     現在開いているファイルがあるフォルダーを(フォルダー)の初期値にします。次回のダイアログ表示時に反映されます。
      <結果出力> … 検索条件に合致した箇所の出力方法を指定します。合致した箇所はその先頭の合致箇所の位置が示され、タイプ別設定 『カラー』プロパティで「検索文字列」に指定した色でハイライト表示されます。
      @@ -89,10 +89,10 @@

      Grep

      [上]ボタン
      -     フォルダを1階層上に設定します。(sakura:2.1.0.0以降)
      +     フォルダーを1階層上に設定します。(sakura:2.1.0.0以降)
      - [現フォルダ]ボタン
      -     このボタンを押すと現在開いているファイルを元に「フォルダ」を設定します。
      + [現フォルダー]ボタン
      +     このボタンを押すと現在開いているファイルを元に「フォルダー」を設定します。

      @@ -111,13 +111,13 @@

      Grep

      ・構文: Grep( str1 :String, str2 :String, str3 :String, int4 :Integer, int5 :Integer );
          str1    検索文字列
          str2    検索対象にするファイル名
      -    str3    検索対象にするフォルダ名
      +    str3    検索対象にするフォルダー名
          int4    オプション（省略可能、ただしPPAマクロは省略不可）
          int5    文字コードセット（省略可能、ただしPPAマクロは省略不可）(sakura:2.1.0.0以降)
      ・記録: ○
      ・解説
      オプションには以下の値の組み合わせを指定できます。
      -    0x01    サブフォルダからも検索する（省略時規定値）
      +    0x01    サブフォルダーからも検索する（省略時規定値）
          0x02    この編集中のテキストから検索する（未実装）
          0x04    英大文字と英小文字を区別する（省略時規定値）
          0x08    正規表現
      @@ -143,8 +143,8 @@

      Grep

          0x6300    自動選択
          0x010000;  単語単位で探す(sakura:2.1.0.0以降)
          0x020000;  ファイル毎最初のみ検索(sakura:2.1.0.0以降)
      -    0x040000;  ベースフォルダ表示(sakura:2.1.0.0以降)
      -    0x080000;  フォルダ毎に表示(sakura:2.1.0.0以降)
      +    0x040000;  ベースフォルダー表示(sakura:2.1.0.0以降)
      +    0x080000;  フォルダー毎に表示(sakura:2.1.0.0以降)
      文字コード自動判別を設定した場合と文字コードセットを 自動選択にした場合の動作は同じです。
      int4の文字コードセットよりint5が優先されます。

      diff --git a/help/sakura/res/HLP000074.html b/help/sakura/res/HLP000074.html index 92ee043c1a..9320076d75 100644 --- a/help/sakura/res/HLP000074.html +++ b/help/sakura/res/HLP000074.html @@ -103,7 +103,7 @@

      タイプ別設定 『スクリーン』プロパティ

          ルールファイルを使うと「テキスト トピックツリー」の「見出し記号」よりも細かくカスタマイズすることができます。
          ルールファイルには、「見出し文字列」と「グループ名」を、「 /// 」(前後の半角スペースもセパレータの一部)で区切って記述します。
          最終行にも改行が必要です。
      -    ファイル名が相対パスの場合、設定フォルダからの相対パスとして開きます。
      +    ファイル名が相対パスの場合、設定フォルダーからの相対パスとして開きます。

      ルールファイルの解析方法
          行の先頭のTAB・SP・全角空白を除いて、行頭に「見出し文字列」が現れたら、アウトラインに該当行を追加します。
      @@ -192,6 +192,6 @@

      タイプ別設定 『スクリーン』プロパティ

      □行末禁則
      行末禁則に指定された文字を、次行に折り返します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000075.html b/help/sakura/res/HLP000075.html index e6af5ecdb4..a58a7cd171 100644 --- a/help/sakura/res/HLP000075.html +++ b/help/sakura/res/HLP000075.html @@ -233,6 +233,6 @@

      タイプ別設定 『カラー』プロパティ

      -->
      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000077.html b/help/sakura/res/HLP000077.html index 6273466333..bcf1178e24 100644 --- a/help/sakura/res/HLP000077.html +++ b/help/sakura/res/HLP000077.html @@ -4,22 +4,22 @@ -設定フォルダ - - +設定フォルダー + + -

      設定フォルダ

      -ユーザー別設定になっているときには、共通設定・タイプ別設定の設定ダイアログ左下に設定フォルダボタンが表示されます。
      -ボタンが表示されない場合は、設定フォルダは sakura.exe と同じフォルダになります。
      +

      設定フォルダー

      +ユーザー別設定になっているときには、共通設定・タイプ別設定の設定ダイアログ左下に設定フォルダーボタンが表示されます。
      +ボタンが表示されない場合は、設定フォルダーは sakura.exe と同じフォルダーになります。
      -

      設定フォルダとは

      +

      設定フォルダーとは

      sakura.exe.iniにてユーザー別設定を行うと、指定の場所にサクラエディタの設定ファイルsakura.iniが保存されます。この場合、各ユーザーそれぞれのsakura.iniを持つことになります。

      -現在起動しているサクラエディタが参照しているsakura.iniの場所を『設定フォルダ(iniフォルダ)』と呼びます。ExpandParameterでは$Iで取得できます。
      +現在起動しているサクラエディタが参照しているsakura.iniの場所を『設定フォルダー(iniフォルダー)』と呼びます。ExpandParameterでは$Iで取得できます。

      -カスタムアイコンおよび相対パス指定のカスタムファイル(入力補完辞書・アウトラインルールなど)は、設定フォルダが基点となります。
      +カスタムアイコンおよび相対パス指定のカスタムファイル(入力補完辞書・アウトラインルールなど)は、設定フォルダーが基点となります。

      diff --git a/help/sakura/res/HLP000078.html b/help/sakura/res/HLP000078.html index f12e621e6f..c49ff60cf3 100644 --- a/help/sakura/res/HLP000078.html +++ b/help/sakura/res/HLP000078.html @@ -15,7 +15,7 @@

      ユーザー別設定

      Windows2000以降のNT系OSであれば、ユーザーごとにエディタの設定を独立させることができます。Vista以降のOSでVirtual Storeを無効にする場合は、原則としてユーザー別設定の手順が必須です。

      -
      参考：設定フォルダ
      +
      参考：設定フォルダー

      権限の異なるユーザーによるプロセスの混在はできません。たとえばVistaの「管理者として実行」などで起動するケースがこれに該当します。1.5.17.0以前の古いバージョンでは一応起動したように見える場合もありますが、BackSpaceが効かないなどといった動作上の障害が発生します。 @@ -30,7 +30,7 @@

      ユーザー別設定の手順


      note注意
      -Vista以降のOSのときは、sakura.exe.iniがVirtual Storeに入ってしまわないように、デスクトップなどの非保護フォルダで編集を行い、エクスプローラでコピーしてください。
      +Vista以降のOSのときは、sakura.exe.iniがVirtual Storeに入ってしまわないように、デスクトップなどの非保護フォルダーで編集を行い、エクスプローラでコピーしてください。

      sakura.exe.iniの設定値

      @@ -48,14 +48,14 @@

      UserRootFolder

      無題
      ファイル名内容
      - - - - + + + +
      無題
      0アプリケーションデータフォルダ（デフォルト）
      %APPDATA%
      1ユーザーフォルダ
      %USERPROFILE%
      2ドキュメントフォルダ
      \My Documents
      3デスクトップフォルダ
      \デスクトップ
      0アプリケーションデータフォルダー（デフォルト）
      %APPDATA%
      1ユーザーフォルダー
      %USERPROFILE%
      2ドキュメントフォルダー
      \My Documents
      3デスクトップフォルダー
      \デスクトップ

      UserSubFolder

      -サブフォルダ名を指定します。 +サブフォルダー名を指定します。

      設定例

      例１

      diff --git a/help/sakura/res/HLP000080.html b/help/sakura/res/HLP000080.html index 34f4474d84..2880edf6a8 100644 --- a/help/sakura/res/HLP000080.html +++ b/help/sakura/res/HLP000080.html @@ -20,42 +20,42 @@

      Virtual Store

      *sakura.exe.manifestの内容は頁末参照

      Virtual Storeとは

      -Program FilesフォルダやWindowsフォルダ配下に設定を保存するようなVista未対応のアプリが、Vista上では急に動かなくなってしまうことが無いように設けられた互換性維持機能です。 -Vista未対応アプリはVirtual Store有効で動作します。Virtual Store有効のアプリがProgram Filesのように保護強化されたフォルダにファイルを保存しようとすると、目的のフォルダではなくVirtual Storeと呼ばれる別のフォルダにファイルが保存され、 +Program FilesフォルダーやWindowsフォルダー配下に設定を保存するようなVista未対応のアプリが、Vista上では急に動かなくなってしまうことが無いように設けられた互換性維持機能です。 +Vista未対応アプリはVirtual Store有効で動作します。Virtual Store有効のアプリがProgram Filesのように保護強化されたフォルダーにファイルを保存しようとすると、目的のフォルダーではなくVirtual Storeと呼ばれる別のフォルダーにファイルが保存され、 以後、同じファイルを開こうとしたときにはVirtual Store側にあるファイルが開かれる仕組みになっています。

      Virtual Store有効時の問題

      -Virtual Store有効のままでアプリを使用していると、そのアプリで保護フォルダのファイルを操作したときに次のような混乱が起きます。 +Virtual Store有効のままでアプリを使用していると、そのアプリで保護フォルダーのファイルを操作したときに次のような混乱が起きます。
      • 新規保存したはずなのにエクスプローラで見るとファイルが見つからない
      • 上書き保存したのにメモ帳で見ると内容が更新されていない
      • エクスプローラでファイルを上書きしたのに開いてみると更新されていない
      -アプリに適用されるVirtual Storeを無効にすれば、保護フォルダへの書き込みは通常通り拒否され、保護フォルダのファイルを開こうとしてVirtual Store側のファイルが開くこともないので、上記のような混乱も起きなくなります。 +アプリに適用されるVirtual Storeを無効にすれば、保護フォルダーへの書き込みは通常通り拒否され、保護フォルダーのファイルを開こうとしてVirtual Store側のファイルが開くこともないので、上記のような混乱も起きなくなります。

      Virtual Storeを無効にする場合の注意事項

      -必ずユーザー別設定の機能を利用し、設定ファイル(sakura.ini)が非保護フォルダに保存されるようにしてください。 -その際、ユーザー別設定構成ファイルsakura.exe.iniの編集はデスクトップなどの非保護フォルダで行い、編集後のファイルをエクスプローラでコピーしてください。 +必ずユーザー別設定の機能を利用し、設定ファイル(sakura.ini)が非保護フォルダーに保存されるようにしてください。 +その際、ユーザー別設定構成ファイルsakura.exe.iniの編集はデスクトップなどの非保護フォルダーで行い、編集後のファイルをエクスプローラでコピーしてください。
      -既に、ユーザー別設定を適用せずにProgram Filesにインストールして使用している場合はインストール先フォルダ下の設定ファイルやその他のファイルがVirtual Storeに転送されている可能性があります。 -エクスプローラで確認して転送ファイルのほうを優先的に設定フォルダにコピーしてください。 +既に、ユーザー別設定を適用せずにProgram Filesにインストールして使用している場合はインストール先フォルダー下の設定ファイルやその他のファイルがVirtual Storeに転送されている可能性があります。 +エクスプローラで確認して転送ファイルのほうを優先的に設定フォルダーにコピーしてください。

      -Program Filesではなく、保護対象外のフォルダにインストールして使用する場合はユーザー別設定にする必要はありません。
      +Program Filesではなく、保護対象外のフォルダーにインストールして使用する場合はユーザー別設定にする必要はありません。

      1.5.17.0以前のバージョンではユーザー別設定に対応していないため、Virtual Store無効での利用ができません。

      Virtual Storeに転送されたファイルの確認方法

      -フォルダの仮想化されたファイル（Virtual Storeに転送されたファイル）を表示するにはエクスプローラのツールバーに表示される [互換性ファイル]ボタンをクリックします。 -[互換性ファイル]ボタンは、そのフォルダに仮想化されたファイルがある場合にのみ表示されます。
      +フォルダーの仮想化されたファイル（Virtual Storeに転送されたファイル）を表示するにはエクスプローラのツールバーに表示される [互換性ファイル]ボタンをクリックします。 +[互換性ファイル]ボタンは、そのフォルダーに仮想化されたファイルがある場合にのみ表示されます。

      実際のパスは、たとえばProgram Files\sakuraにインストールされているとき、C:\Users\<username>\AppData\Local\Virtual Store\Program Files\sakura が転送先になります。

      sakura.exe.manifestの内容

      以下の内容のファイルをsakura.exeと同じ場所に保存します。sakura.exe.manifest自身がVirtual Storeに入らないように注意してください。
      -*デスクトップなどの非保護フォルダで編集を済ませてエクスプローラでコピーなど。
      +*デスクトップなどの非保護フォルダーで編集を済ませてエクスプローラでコピーなど。

      Visual Styleを有効にし、Virtual Storeを無効(UAC対応)にする例です。 
      diff --git a/help/sakura/res/HLP000081.html b/help/sakura/res/HLP000081.html
index 4c47335a20..ceacf19627 100644
--- a/help/sakura/res/HLP000081.html
+++ b/help/sakura/res/HLP000081.html
@@ -105,10 +105,10 @@ 
      共通設定 『全般』プロパティ
      
 	
      
 	[履歴をクリア]ボタン …… 最近使ったファイルの履歴をクリアします。
      
 	
      
-	フォルダの履歴MAX(15) … 最近使ったフォルダの履歴の最大数(36まで)を設定します。
      
+	フォルダーの履歴MAX(15) … 最近使ったフォルダーの履歴の最大数(36まで)を設定します。
      
 	ただしリムーバブルメディアからのものは履歴に入りません。
      
 	
      
-	[履歴をクリア]ボタン …… 最近使ったフォルダの履歴をクリアします。
      
+	[履歴をクリア]ボタン …… 最近使ったフォルダーの履歴をクリアします。

      □[すべて閉じる]で他に編集用のウィンドウがあれば確認する
          (sakura:1.5.15.0以降)
      @@ -119,6 +119,6 @@

      共通設定 『全般』プロパティ

      有効にすると、「サクラエディタの終了」(常駐タスクトレイアイコンも含めて終了する)時に編集ウィンドウが一枚以上ある場合は、終了の確認をします。
      ただし未保存のファイルがある場合は、どんなときでも必ず保存の確認をします。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000082.html b/help/sakura/res/HLP000082.html index 072282722d..20a9c9bb00 100644 --- a/help/sakura/res/HLP000082.html +++ b/help/sakura/res/HLP000082.html @@ -83,7 +83,7 @@

      共通設定 『書式』プロパティ

      選択範囲内全行引用コピーの機能で、各行の先頭につける引用符を定義します。
      関連：引用符の変更

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。

      diff --git a/help/sakura/res/HLP000083.html b/help/sakura/res/HLP000083.html index 5f80af3d36..7bca393fcc 100644 --- a/help/sakura/res/HLP000083.html +++ b/help/sakura/res/HLP000083.html @@ -114,6 +114,6 @@

      共通設定 『ファイル』プロパティ

      □開こうとしたファイルが大きい場合に警告する
      ファイルを開こうとしたときに認識したファイルサイズが設定を超えている場合に警告します。(sakura:1.6.6.0以降)

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000084.html b/help/sakura/res/HLP000084.html index 95e878367c..92c9b99dfb 100644 --- a/help/sakura/res/HLP000084.html +++ b/help/sakura/res/HLP000084.html @@ -49,8 +49,8 @@

      共通設定 『キー割り当て』プロパティ

      [エクスポート]ボタン
      現在設定されているキーの設定内容を、キー設定ファイルとして書き出します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。

      参考 キー割り当て一覧をコピー
      diff --git a/help/sakura/res/HLP000085.html b/help/sakura/res/HLP000085.html index b8882c2a6f..a3edbc3682 100644 --- a/help/sakura/res/HLP000085.html +++ b/help/sakura/res/HLP000085.html @@ -61,8 +61,8 @@

      共通設定 『ツールバー』プロパティ

      [折返]ボタン
          ボタンを押すと、"――ツールバー折返――"が追加されます。追加された位置ででツールバーを折り返して表示します。(sakura:1.5.5.0以降)

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。

      hintヒント
      Windows XPで画面のデザインがWindows XP スタイルの場合にはこのチェックボックスの状態にかかわらずフラットになります。
      diff --git a/help/sakura/res/HLP000086.html b/help/sakura/res/HLP000086.html index 9ceec3bb61..a2a68e1916 100644 --- a/help/sakura/res/HLP000086.html +++ b/help/sakura/res/HLP000086.html @@ -100,6 +100,6 @@

      共通設定 『強調キーワード』プロパティ

      [エクスポート]ボタン
      現在選択されているセットのキーワードを、単語リストファイルとして書き出します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000087.html b/help/sakura/res/HLP000087.html index 86ec5ff18b..9233132102 100644 --- a/help/sakura/res/HLP000087.html +++ b/help/sakura/res/HLP000087.html @@ -73,6 +73,6 @@

      共通設定 『カスタムメニュー』プロパティ

      □サブメニューとして表示(sakura:2.1.0.0以降)
      ONにすると設定中のカスタムメニューが他のメニューに組み込まれたときにサブメニューとしてポップアップ表示されます。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000088.html b/help/sakura/res/HLP000088.html index cf4f0d2d83..aed80cbd0b 100644 --- a/help/sakura/res/HLP000088.html +++ b/help/sakura/res/HLP000088.html @@ -32,7 +32,7 @@

      共通設定 『支援』プロパティ


      ComHelper

      -各ファイル名が相対パスの場合、設定フォルダからの相対パスとして認識します。ただし、「..」は使えません。
      +各ファイル名が相対パスの場合、設定フォルダーからの相対パスとして認識します。ただし、「..」は使えません。

      <入力補完機能>
      入力補完機能の詳細については、ここをご覧下さい。
      @@ -76,6 +76,6 @@

      共通設定 『支援』プロパティ

          dictディレクトリのパスを指定します。


      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000103.html b/help/sakura/res/HLP000103.html index 4e5068d0fc..11d9340f67 100644 --- a/help/sakura/res/HLP000103.html +++ b/help/sakura/res/HLP000103.html @@ -90,7 +90,7 @@

      外部コマンド実行

      カレントディレクトリでは特殊文字の展開はしません。
      引数のカレントディレクトリを省略した場合は、サクラエディタのカレントディレクトリで実行されます。
      サクラエディタのカレントディレクトリは、ファイルを開いている場合はファイルの場所、ファイルを開いていないときは、
      -(sakura:2.2.0.0以降)共通設定-編集-「ファイルダイアログの初期位置」です。初期位置が「カレントフォルダ」の場合は2.1.1.4と同じです。
      +(sakura:2.2.0.0以降)共通設定-編集-「ファイルダイアログの初期位置」です。初期位置が「カレントフォルダー」の場合は2.1.1.4と同じです。
      (sakura:2.1.1.4以前)そのウィンドウで最後に開いたファイルの場所か、起動元プロセスから継承した場所です。

      ・構文: ExecCommandDialog( ); (sakura:2.1.0.0以降)
      diff --git a/help/sakura/res/HLP000107.html b/help/sakura/res/HLP000107.html index ccff924c7a..ab737ffe2f 100644 --- a/help/sakura/res/HLP000107.html +++ b/help/sakura/res/HLP000107.html @@ -300,7 +300,7 @@

      キー割り当て一覧を確認

      デフォルトの設定に戻すには

      1. サクラエディタを常駐も含めてすべて終了します。
        2. -
      2. サクラエディタのインストールフォルダ(ユーザー別設定の時は設定フォルダ)内にある設定ファイルsakura.iniを削除します。
        3. +
      3. サクラエディタのインストールフォルダー(ユーザー別設定の時は設定フォルダー)内にある設定ファイルsakura.iniを削除します。
      以上で設定が初期状態に戻ります。

      diff --git a/help/sakura/res/HLP000109.html b/help/sakura/res/HLP000109.html index ea119ebf5b..86a6a081b9 100644 --- a/help/sakura/res/HLP000109.html +++ b/help/sakura/res/HLP000109.html @@ -50,7 +50,7 @@

      ファイルオープンに関するオプション

      -WY= ウィンドウ左上のY座標。 -GROUP= タブモードのグループを指定して開く(1開始)。
      ・0を指定するとアクティブのグループ
      ・未使用のグループ番号を指定すると新規グループ
      ファイル名指定なしのときも使えます。 -M= -MTYPE 未指定時、起動時に実行するマクロのファイル名を指定します。
      共通設定の自動実行マクロの後に実行されます。
      Grep、アウトプットでは実行されません。
      -相対パスの場合その時点のカレントフォルダからの相対になります。
      +相対パスの場合その時点のカレントフォルダーからの相対になります。
      -MTYPE= -M とあわせて指定します。-M はマクロの文字列そのものとして解釈されます。
      -MTYPE にはマクロの種類を拡張子名で指定します。(ピリオドを除く)
      -MTYPE=file は-M単独と同じ意味になります。
      sakura.exe -M=D:\macro.mac
      @@ -74,7 +74,7 @@

      単独で使用するオプション


      -Windowsの起動と同時にサクラエディタを常駐したい場合、ショートカットのプロパティでリンク先のexeに -NOWIN を指定してスタートアップフォルダに入れておくといいでしょう。
      +Windowsの起動と同時にサクラエディタを常駐したい場合、ショートカットのプロパティでリンク先のexeに -NOWIN を指定してスタートアップフォルダーに入れておくといいでしょう。

      Grepに関するオプション

      @@ -86,7 +86,7 @@

      Grepに関するオプション

      -GKEY=Grepの検索文字列
      "'で囲む。条件中の'"'は二つの連続した'"'にする
      (例) -GKEY="printf("        「printf(」を検索
      (例) -GKEY="printf( ""%s"    「printf( "%s」を検索 -GREPR=Grepの置換文字列 (sakura:2.2.0.0以降)
      これを指定すると置換になる
      '"'で囲む。条件中の'"'は二つの連続した'"'にする -GFILE=Grepの検索対象のファイル
      '"'で囲む。条件中の'"'は二つの連続した'"'にする --GFOLDER=Grepの検索対象のフォルダ
      '"'で囲む。条件中の'"'は二つの連続した'"'にする +-GFOLDER=Grepの検索対象のフォルダー
      '"'で囲む。条件中の'"'は二つの連続した'"'にする -GREPDLGサクラエディタが起動すると同時にGrepダイアログを表示します。
      -GCODE=Grepでの文字コードを指定します。
      -CODEと同じように数字で指定します。 -GOPT=Grepの検索条件
      [S][L][R][P][W][1|2|3][K][F][B][G][X][C][O][U][H] @@ -96,7 +96,7 @@

      Grepに関するオプション

      - + @@ -104,8 +104,8 @@

      Grepに関するオプション

      - - + + @@ -126,7 +126,7 @@

      プロファイルに関するオプション

      無題
      Sサブフォルダからも検索
      Sサブフォルダーからも検索
      L大文字と小文字を区別
      R正規表現
      P該当行を出力／未指定時は該当部分だけ出力
      1|2|3結果出力形式。1か2か3のどれかを指定します。
      (1=ノーマル、2=ファイル毎、3=結果のみ)
      K-GCODE=99と同じ意味です。
      互換性のためだけに残されています。
      Fファイル毎最初のみ
      Bベースフォルダ表示
      Gフォルダ毎に表示
      Bベースフォルダー表示
      Gフォルダー毎に表示
      XGrep実行後カレントディレクトリを移動しない
      C(置換)クリップボードから貼り付け (sakura:2.2.0.0以降)
      O(置換)バックアップ作成 (sakura:2.2.0.0以降)
      hintヒント
      -エクスプローラ(フォルダウィンドウ)の送るメニューや、IEのソースの表示ではコマンドラインオプションを設定しても、無視されてしまいます。これを回避するにはヘルパーアプリケーションが必要です。
      +エクスプローラ(フォルダーウィンドウ)の送るメニューや、IEのソースの表示ではコマンドラインオプションを設定しても、無視されてしまいます。これを回避するにはヘルパーアプリケーションが必要です。

      note注意
      数字等を指定するコマンドラインオプションは-CODE="4"のようにダブルクオートで囲って指定できません。(sakura:1.3.5.6まで)
      diff --git a/help/sakura/res/HLP000110.html b/help/sakura/res/HLP000110.html index d1fd3c5e4f..c6d09fc06a 100644 --- a/help/sakura/res/HLP000110.html +++ b/help/sakura/res/HLP000110.html @@ -16,12 +16,12 @@

      プラグイン

      導入方法

      1. プラグインのzipファイルを入手します。 -
      2. サクラエディタの設定ファイル(sakura.ini)があるフォルダに「plugins」というフォルダを作成し、その中にプラグインzipを解凍します。
        -　以下のようなフォルダ構成になっていればOKです。
        +
      3. サクラエディタの設定ファイル(sakura.ini)があるフォルダーに「plugins」というフォルダーを作成し、その中にプラグインzipを解凍します。
        +　以下のようなフォルダー構成になっていればOKです。
                 ├ sakura.ini
         └ plugins/
-            └ ○○/              // プラグイン名のフォルダ
+            └ ○○/              // プラグイン名のフォルダー
                 ├ plugin.def     // プラグイン定義ファイル
                 ├   ：
        diff --git a/help/sakura/res/HLP000125.html b/help/sakura/res/HLP000125.html index e94c6e7e50..3bd459fcc8 100644 --- a/help/sakura/res/HLP000125.html +++ b/help/sakura/res/HLP000125.html @@ -15,7 +15,7 @@

        キーマクロの記録開始／終了

        キーマクロバッファをクリアして、キー入力の記録を開始します。
        一度にひとつの編集ウィンドウでのみ記録できます。
        -記録を終了すると、共通設定 『マクロ』プロパティのマクロ一覧で指定したフォルダに、「RecKey.mac」と言う名前で保存されます。
        +記録を終了すると、共通設定 『マクロ』プロパティのマクロ一覧で指定したフォルダーに、「RecKey.mac」と言う名前で保存されます。
        ステータスバー上のRECをダブルクリックすることでマクロの記録開始・終了が行えます。(sakura:1.4.3.7以降)

        diff --git a/help/sakura/res/HLP000130.html b/help/sakura/res/HLP000130.html index efcf8a0b26..ad1a3e2346 100644 --- a/help/sakura/res/HLP000130.html +++ b/help/sakura/res/HLP000130.html @@ -11,7 +11,7 @@

        右ドロップ

        -ファイルやフォルダをマウスの右ボタンでドラッグし、編集画面にドロップすると、『パス名貼り付け』『ファイル名貼り付け』『ファイルを開く』のコンテキストメニューが表示されます。 +ファイルやフォルダーをマウスの右ボタンでドラッグし、編集画面にドロップすると、『パス名貼り付け』『ファイル名貼り付け』『ファイルを開く』のコンテキストメニューが表示されます。
        パス名貼り付け
        diff --git a/help/sakura/res/HLP000144.html b/help/sakura/res/HLP000144.html index d86d53ee04..96680a3c6a 100644 --- a/help/sakura/res/HLP000144.html +++ b/help/sakura/res/HLP000144.html @@ -88,14 +88,14 @@

        共通設定 『編集』プロパティ

        <ファイルダイアログの初期位置>
        ファイルダイアログ(開く、名前をつけて保存)の初期位置を指定します。(sakura:2.0.6.0以降)
        - ◎カレントフォルダ
        - カレントフォルダに設定します。
        - ○最近使ったフォルダ
        - 最近使ったフォルダに設定します。
        - ○指定フォルダ
        - ユーザーが設定したフォルダに設定します。メタ文字列を含むことができます。
        - (sakura:2.2.0.0以降)新規ウィンドウ、閉じて(無題)などで、無題になった場合、この設定のフォルダへカレントディレクトリを移動します。
        - ファイルダイアログの設定が「カレントフォルダ」の場合は、元のウィンドウのカレントディレクトリを引き継ぎます。
        + ◎カレントフォルダー
        + カレントフォルダーに設定します。
        + ○最近使ったフォルダー
        + 最近使ったフォルダーに設定します。
        + ○指定フォルダー
        + ユーザーが設定したフォルダーに設定します。メタ文字列を含むことができます。
        + (sakura:2.2.0.0以降)新規ウィンドウ、閉じて(無題)などで、無題になった場合、この設定のフォルダーへカレントディレクトリを移動します。
        + ファイルダイアログの設定が「カレントフォルダー」の場合は、元のウィンドウのカレントディレクトリを引き継ぎます。

        □改行コードNEL,PS,LSを有効にする (sakura:2.2.0.0以降)
        @@ -107,6 +107,6 @@

        共通設定 『編集』プロパティ

        選択をロックすると「矩形範囲選択開始」と同様に、カーソルキー等の通常移動系コマンドで矩形選択を続行できます。
        ロックしない場合は、選択系コマンドと同様に通常移動系コマンドでは矩形選択が解除されます。

        -[設定フォルダ]
        -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
        +[設定フォルダー]
        +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
        diff --git a/help/sakura/res/HLP000145.html b/help/sakura/res/HLP000145.html index 5b78ec53cf..2e93089683 100644 --- a/help/sakura/res/HLP000145.html +++ b/help/sakura/res/HLP000145.html @@ -59,15 +59,15 @@

        共通設定 『バックアップ』プロパティ

      -□指定フォルダに作成する
      -このオプションを有効にすると、バックアップは指定されたフォルダに作成されます。
      -このオプションを無効にすると、バックアップは編集中のファイルと同じフォルダに作成されます。
      +□指定フォルダーに作成する
      +このオプションを有効にすると、バックアップは指定されたフォルダーに作成されます。
      +このオプションを無効にすると、バックアップは編集中のファイルと同じフォルダーに作成されます。

      □リムーバブルメディアのみ
      -編集中のファイルがリムーバブルメディアにある場合のみ指定フォルダにバックアップを作成します。
      +編集中のファイルがリムーバブルメディアにある場合のみ指定フォルダーにバックアップを作成します。

      -フォルダ名
      -指定フォルダに作成するをチェックしたときにバックアップを作成するフォルダを設定できます。
      +フォルダー名
      +指定フォルダーに作成するをチェックしたときにバックアップを作成するフォルダーを設定できます。
      メタ文字列を含むことができます。(sakura:2.0.8.0以降)

      □バックアップファイルをごみ箱に放り込む
      @@ -78,12 +78,12 @@

      共通設定 『バックアップ』プロパティ

      無題 ローカルドライブにあるファイルリムーバブルメディアにあるファイル -□指定フォルダに作成する
      □リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダ編集中のファイルのあるフォルダ -■指定フォルダに作成する
      □リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      指定フォルダ指定フォルダ -■指定フォルダに作成する
      ■リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダ指定フォルダ -□指定フォルダに作成する
      □リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダ→ごみ箱編集中のファイルのあるフォルダ -■指定フォルダに作成する
      □リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      指定フォルダ→ごみ箱指定フォルダ -■指定フォルダに作成する
      ■リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダ→ごみ箱指定フォルダ +□指定フォルダーに作成する
      □リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダー編集中のファイルのあるフォルダー +■指定フォルダーに作成する
      □リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      指定フォルダー指定フォルダー +■指定フォルダーに作成する
      ■リムーバブルメディアのみ
      □バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダー指定フォルダー +□指定フォルダーに作成する
      □リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダー→ごみ箱編集中のファイルのあるフォルダー +■指定フォルダーに作成する
      □リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      指定フォルダー→ごみ箱指定フォルダー +■指定フォルダーに作成する
      ■リムーバブルメディアのみ
      ■バックアップファイルをごみ箱に放り込む
      編集中のファイルのあるフォルダー→ごみ箱指定フォルダー
      ■作成前に確認する
      @@ -103,7 +103,7 @@

      共通設定 『バックアップ』プロパティ

      無題 $0ファイル名 -$1 .. $9上位階層へx個移動したところにあるフォルダ名 +$1 .. $9上位階層へx個移動したところにあるフォルダー名 *拡張子 %Y西暦（4桁） %y西暦（2桁） @@ -125,7 +125,7 @@

      共通設定 『バックアップ』プロパティ

      前回の保存時の日時（ファイルの更新日時）すなわちファイルのタイムスタンプを使います。


      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000146.html b/help/sakura/res/HLP000146.html index 4b1e64a663..b8fb91047d 100644 --- a/help/sakura/res/HLP000146.html +++ b/help/sakura/res/HLP000146.html @@ -95,6 +95,6 @@

      共通設定 『ウィンドウ』プロパティ

      ${w?$h$:アウトプット$:$f$n$}${U?(更新)$} - $A $V ${R?(ビューモード)$:(上書き禁止)$}${M? 【キーマクロの記録中】$} $<profile>
      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000147.html b/help/sakura/res/HLP000147.html index b53b89a286..8fd5141aca 100644 --- a/help/sakura/res/HLP000147.html +++ b/help/sakura/res/HLP000147.html @@ -56,6 +56,6 @@

      共通設定 『ステータスバー』プロパティ

      オフのときは、Unicodeでの文字数を表示します。
      ※オンにした場合、選択範囲が変わるたびにバイト数の再計算を行うため、データ量によっては高負荷となる可能性があります
      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000148.html b/help/sakura/res/HLP000148.html index bce3380656..7f20bb8ae3 100644 --- a/help/sakura/res/HLP000148.html +++ b/help/sakura/res/HLP000148.html @@ -68,12 +68,12 @@

      共通設定 『検索』プロパティ

      <タグジャンプ>(sakura:2.2.0.0以降)
      タグファイルの検索
      ダイレクトタグジャンプのときに、次のtagsファイルを検索するかどうかを指定します。
      -次とは、1つ上のフォルダまたは、tagsファイルの中で!_TAG_S_SEARCH_NEXTで指定されたフォルダにあるtagsファイルです。
      +次とは、1つ上のフォルダーまたは、tagsファイルの中で!_TAG_S_SEARCH_NEXTで指定されたフォルダーにあるtagsファイルです。

      キーワード指定のタグファイル検索
      キーワード指定のときに、次のtagsファイルを検索するかどうかを指定します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000150.html b/help/sakura/res/HLP000150.html index 5d15e80165..64e2b33424 100644 --- a/help/sakura/res/HLP000150.html +++ b/help/sakura/res/HLP000150.html @@ -96,7 +96,7 @@

      共通設定 『タブバー』プロパティ

      動作モードの設定に応じて、タブバーの右端に×ボタンまたはXXボタンが表示されます。
      タブ上の右クリックメニューのカスタマイズは 共通設定『カスタムメニュー』 の選択「タブメニュー」です。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000151.html b/help/sakura/res/HLP000151.html index fb63a4ca8b..067f8a4296 100644 --- a/help/sakura/res/HLP000151.html +++ b/help/sakura/res/HLP000151.html @@ -42,14 +42,14 @@

      共通設定 『プラグイン』プロパティ

      プラグインを有効にします。
      無効にした場合、すべてのプラグインを読み込みません。

      -[フォルダを開く]ボタン
      -
      iniと同じ階層のpluginsフォルダを開きます。
      +[フォルダーを開く]ボタン
      +
      iniと同じ階層のpluginsフォルダーを開きます。

      [ZIPプラグインを導入]ボタン
      ファイル選択ダイアログでZIPファイルを指定して、プラグインを導入します。(XP以降)

      [新規プラグインを追加]ボタン
      -
      登録されていないプラグインを、iniフォルダ内のpluginsフォルダから検索して、登録または更新します。
      +
      登録されていないプラグインを、iniフォルダー内のpluginsフォルダーから検索して、登録または更新します。
      40個まで登録できます。(2.0.6.0 以降)
      20個まで登録できます。(2.0.6.0 以前)

      @@ -66,8 +66,8 @@

      共通設定 『プラグイン』プロパティ

      追加, 更新, 停止, 稼働, 削除 があります。
      読込
      プラグインが読み込まれているかを表示します。
      -フォルダ
      -
      プラグインのあるフォルダを表示します。
      +フォルダー
      +
      プラグインのあるフォルダーを表示します。

      [配布元]ボタン
      プラグインの配布元サイトをブラウザで開きます。(sakura:2.2.0.0以降)
      @@ -82,8 +82,8 @@

      共通設定 『プラグイン』プロパティ

      プラグイン設定画面を開きます。

      [ReadMe]ボタン
      -プラグインフォルダ以下の ReadMe.txt か プラグインフォルダ名.txt のファイルがあると、それを新しいサクラエディタのグループを開いて読み取り専用で表示します。
      +プラグインフォルダー以下の ReadMe.txt か プラグインフォルダー名.txt のファイルがあると、それを新しいサクラエディタのグループを開いて読み取り専用で表示します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000152.html b/help/sakura/res/HLP000152.html index d06287b18a..7b858f7f59 100644 --- a/help/sakura/res/HLP000152.html +++ b/help/sakura/res/HLP000152.html @@ -79,6 +79,6 @@

      共通設定 『メインメニュー』プロパティ

      [初期設定] ボタン
      設定中のメインメニュー設定の内容を、初期状態に戻します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000197.html b/help/sakura/res/HLP000197.html index df1f09468d..6cc62da384 100644 --- a/help/sakura/res/HLP000197.html +++ b/help/sakura/res/HLP000197.html @@ -15,7 +15,7 @@

      タイプ別設定 『支援』プロパティ

      『スクリーン』 『カラー』 『ウィンドウ』 『支援』 『正規表現キーワード』 『キーワードヘルプ』
      TypeHelper

      -各ファイル名が相対パスの場合、設定フォルダからの相対パスとして認識します。ただし、「..」は使えません。
      +各ファイル名が相対パスの場合、設定フォルダーからの相対パスとして認識します。ただし、「..」は使えません。
      <入力補完機能>
      入力補完機能の詳細については、ここをご覧下さい。
      @@ -51,6 +51,6 @@

      タイプ別設定 『支援』プロパティ

      保存時に改行コードが混在していた場合、改行コードを統一するか確認するメッセージを表示します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000201.html b/help/sakura/res/HLP000201.html index 7329742461..f6371a35f8 100644 --- a/help/sakura/res/HLP000201.html +++ b/help/sakura/res/HLP000201.html @@ -36,14 +36,14 @@

      共通設定 『マクロ』プロパティ

      マクロの詳細は、マクロについてをご覧ください。

      -マクロフォルダ
      -
      マクロリストのファイル名が相対パスの場合の元になるフォルダを指定します。
      -フォルダ名が相対パスの場合も、フォルダ名は、設定フォルダからの相対パスとして認識します。ただし、「..」は使えません。
      -たとえば、「Macro\」と指定し、設定ファイルが「C:\Program files\sakura」フォルダにある場合は、「C:\Program files\sakura\Macro\」を指すことになります。
      -キーマクロの記録は、このフォルダに「RecKey.mac」と言うファイル名で保存されます。
      +マクロフォルダー
      +
      マクロリストのファイル名が相対パスの場合の元になるフォルダーを指定します。
      +フォルダー名が相対パスの場合も、フォルダー名は、設定フォルダーからの相対パスとして認識します。ただし、「..」は使えません。
      +たとえば、「Macro\」と指定し、設定ファイルが「C:\Program files\sakura」フォルダーにある場合は、「C:\Program files\sakura\Macro\」を指すことになります。
      +キーマクロの記録は、このフォルダーに「RecKey.mac」と言うファイル名で保存されます。

      [参照]ボタン
      -
      マクロが格納されているフォルダを指定します。
      +
      マクロが格納されているフォルダーを指定します。

      マクロ一覧リスト
      マクロの一覧を表示します。
      @@ -80,8 +80,8 @@

      共通設定 『マクロ』プロパティ

      登録を解除するには、名前及びファイル名を空欄にして[設定]ボタンを押します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。

      hintヒント
      名前、ファイルなどを変更しても、[設定]ボタンを押さないとリストには登録されません。
      diff --git a/help/sakura/res/HLP000203.html b/help/sakura/res/HLP000203.html index f3763a352d..33511778e7 100644 --- a/help/sakura/res/HLP000203.html +++ b/help/sakura/res/HLP000203.html @@ -91,6 +91,6 @@

      タイプ別設定 『正規表現キーワード』プロパティ


      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000251.html b/help/sakura/res/HLP000251.html index 5021bbeea8..29bc6208a4 100644 --- a/help/sakura/res/HLP000251.html +++ b/help/sakura/res/HLP000251.html @@ -35,7 +35,7 @@

      DIFF差分表示

      差分表示の行番号の色はタイプ別設定 『カラー』プロパティで設定できます。

      hintヒント
      -diff.exe は サクラエディタ本体と同じフォルダに置く必要があります。
      +diff.exe は サクラエディタ本体と同じフォルダーに置く必要があります。
      diff.exeは、GNU diff 2.5/2.7 互換で、DOS版でない(=WinCUI版)必要があります。
      スペースを含むパスを扱えない物もありますので、注意してください。

      diff --git a/help/sakura/res/HLP000259.html b/help/sakura/res/HLP000259.html index 3b24fdffcb..b75d0e75b7 100644 --- a/help/sakura/res/HLP000259.html +++ b/help/sakura/res/HLP000259.html @@ -12,11 +12,11 @@

      パスの貼り付け／ドロップ

      クリップボードから

      -ファイルやフォルダをエクスプローラなどでコピーして、サクラエディタの編集画面に貼り付けすると、ファイルのパス名を貼り付けします。
      +ファイルやフォルダーをエクスプローラなどでコピーして、サクラエディタの編集画面に貼り付けすると、ファイルのパス名を貼り付けします。

      複数ファイルからの貼り付けは、複数行で貼り付き、改行コードは入力改行コード指定に従います。
      -

      ファイルやフォルダの右ドロップ

      +

      ファイルやフォルダーの右ドロップ

      参照：右ドロップ

      アイコンからドロップ

      diff --git a/help/sakura/res/HLP000260.html b/help/sakura/res/HLP000260.html index 49a954a936..1e28d8c898 100644 --- a/help/sakura/res/HLP000260.html +++ b/help/sakura/res/HLP000260.html @@ -11,7 +11,7 @@

      アプリアイコンの変更手順

      -サクラエディタと同じフォルダ（あるいは設定フォルダ）にアイコンファイルを置くとタイトルバーのアイコンを変更できます。(sakura:1.3.5.8以降)
      +サクラエディタと同じフォルダー（あるいは設定フォルダー）にアイコンファイルを置くとタイトルバーのアイコンを変更できます。(sakura:1.3.5.8以降)
      ファイル名は"my_appicon.ico"と"my_grepicon.ico"です。
      さらに、タイプ別設定 『スクリーン』プロパティではエクスプローラで表示されるファイルタイプに関連付けられたアイコンに設定することもできます。
      diff --git a/help/sakura/res/HLP000261.html b/help/sakura/res/HLP000261.html index 3208854f83..e29149ce34 100644 --- a/help/sakura/res/HLP000261.html +++ b/help/sakura/res/HLP000261.html @@ -66,11 +66,11 @@

      拡張ツール

      ダイレクトタグジャンプのtagsファイル生成に必要です。(インストーラパッケージには含まれています)
      Migemo.dll
      -
      日本語インクリメンタルサーチのために必要です。同梱のdictフォルダも必要です。
      +
      日本語インクリメンタルサーチのために必要です。同梱のdictフォルダーも必要です。
      PPA.DLL
      PPAマクロの実行に必要です。
      -いずれもsakura.exeと同じフォルダに置いてください。
      +いずれもsakura.exeと同じフォルダーに置いてください。
      diff --git a/help/sakura/res/HLP000268.html b/help/sakura/res/HLP000268.html index 71384daf8f..1bc0522ce4 100644 --- a/help/sakura/res/HLP000268.html +++ b/help/sakura/res/HLP000268.html @@ -544,7 +544,7 @@

      マクロ専用関数/変数

      ■ function FileOpenDialog( str1 :String, str2 :String ) :String; [↑]
      引数
      -str1    既定のファイルまたはフォルダパス
      +str1    既定のファイルまたはフォルダーパス
      str2    フィルタ文字列
      戻り値
      選択ファイルパス名。キャンセル押下時は空文字列
      @@ -556,7 +556,7 @@

      マクロ専用関数/変数

      ■ function FileSaveDialog( str1 :String, str2 :String ) :String; [↑]
      引数
      -str1    既定のファイルまたはフォルダパス
      +str1    既定のファイルまたはフォルダーパス
      str2    フィルタ文字列
      戻り値
      選択ファイルパス名。キャンセル押下時は空文字列
      @@ -569,11 +569,11 @@

      マクロ専用関数/変数

      引数
      str1    表示メッセージ
      -str2    既定のファイルまたはフォルダパス
      +str2    既定のファイルまたはフォルダーパス
      戻り値
      選択ファイルパス名。キャンセル押下時は空文字列
      解説
      -フォルダを開くダイアログを表示します。
      +フォルダーを開くダイアログを表示します。
      sakura:2.0.3.0以降

      diff --git a/help/sakura/res/HLP000270.html b/help/sakura/res/HLP000270.html index 4991deb0a1..c1495f8df5 100644 --- a/help/sakura/res/HLP000270.html +++ b/help/sakura/res/HLP000270.html @@ -26,7 +26,7 @@

      マクロ記載例

      InsText( "<br />" ); // S_ はあってもなくても動作します。
      // キーマクロではExpandParameter は使えません
      ExecCommand('echo $f($x,$y)', 3); // ExecCommandでも同様の処理が行われます。
      -ExecCommand('dir /b', 3); // 外部コマンド実行で、現在のフォルダのファイル一覧を取込
      +ExecCommand('dir /b', 3); // 外部コマンド実行で、現在のフォルダーのファイル一覧を取込

      ■例2: WSH(JScript)
      // コメント
      diff --git a/help/sakura/res/HLP000272.html b/help/sakura/res/HLP000272.html index 7b3d9ee644..01ef8d8424 100644 --- a/help/sakura/res/HLP000272.html +++ b/help/sakura/res/HLP000272.html @@ -11,13 +11,13 @@

      メタ文字列の仕様

      -メタ文字列はWindowsに設定された特殊なフォルダを指定するときに使います。
      -また、サクラエディタの実行ファイルのあるフォルダも指定可能です。
      +メタ文字列はWindowsに設定された特殊なフォルダーを指定するときに使います。
      +また、サクラエディタの実行ファイルのあるフォルダーも指定可能です。
      ファイル名の簡易表示で使えます。
      1. %% … %(パーセント記号) -
      2. %SAKURA% … 実行ファイル(sakura.exe)があるフォルダ -
      3. %SAKURADATA% … 設定ファイル(sakura.ini)があるフォルダ(sakura:1.6.6.0以降) +
      4. %SAKURA% … 実行ファイル(sakura.exe)があるフォルダー +
      5. %SAKURADATA% … 設定ファイル(sakura.ini)があるフォルダー(sakura:1.6.6.0以降)
      6. エクスプローラ(シェル)のパス
            HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Foldersの値
            HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Foldersの値
        diff --git a/help/sakura/res/HLP000275.html b/help/sakura/res/HLP000275.html index fb20feec0f..0f92be4b1b 100644 --- a/help/sakura/res/HLP000275.html +++ b/help/sakura/res/HLP000275.html @@ -12,7 +12,7 @@

        開く（ドロップダウン）

        ツールバー用の機能です。
        -ツールバーの開くボタンの横に、最近使ったファイルのリストとその下に最近使ったフォルダ、新規作成、開くのドロップダウンメニューが表示されます。
        +ツールバーの開くボタンの横に、最近使ったファイルのリストとその下に最近使ったフォルダー、新規作成、開くのドロップダウンメニューが表示されます。
        それ以外は「開く」と同じです。
        カスタムメニューに登録した場合は、開くボタンと同じ動作になります。

        diff --git a/help/sakura/res/HLP000277.html b/help/sakura/res/HLP000277.html index bc0780b466..dd5b3305c3 100644 --- a/help/sakura/res/HLP000277.html +++ b/help/sakura/res/HLP000277.html @@ -32,7 +32,7 @@

        共通設定 『ファイル名表示』プロパティ


        ComFileName

        -ファイル名またはフォルダ名の文字列中の、「置換前文字列」を「置換後文字列」に置き換えて表示します。
        +ファイル名またはフォルダー名の文字列中の、「置換前文字列」を「置換後文字列」に置き換えて表示します。
        設定された項目の0番目(上)の条件から順に置換を実行していきます。
        1番目以降はそれより前に置換された文字列を元に再び置換します。
        大文字小文字は区別しません。
        @@ -41,7 +41,7 @@

        共通設定 『ファイル名表示』プロパティ

        ・アクティブ時のウィンドウタイトルのファイル名 ($N: 初期設定時、変更可能)
        ・最近使ったファイル
        -・最近使ったフォルダ
        +・最近使ったフォルダー
        ・メニューのウィンドウ一覧
        ・トレイメニューの一覧
        ・タブのパス名一覧
        @@ -50,9 +50,9 @@

        共通設定 『ファイル名表示』プロパティ


        ■長いパスの省略表示
        -長いファイル名またはフォルダ名の文字列を省略表示することができます。
        +長いファイル名またはフォルダー名の文字列を省略表示することができます。
        省略表示は、下記の簡易表示を適用した後の文字列に対して適用されます。
        -まずフォルダ部分が省略され「C:\...\subdir\file.ext」のような表示になります。
        +まずフォルダー部分が省略され「C:\...\subdir\file.ext」のような表示になります。
        ファイル名部分が長い場合は「C:\...\longfile...ext」のような表示になります。
        文字数
        @@ -84,6 +84,6 @@

        共通設定 『ファイル名表示』プロパティ

        ［削除］ボタン
        置換条件一覧で選択した条件を削除します。

        -[設定フォルダ]
        -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
        +[設定フォルダー]
        +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
        diff --git a/help/sakura/res/HLP000278.html b/help/sakura/res/HLP000278.html index e7f6f80767..2ecc58f403 100644 --- a/help/sakura/res/HLP000278.html +++ b/help/sakura/res/HLP000278.html @@ -22,7 +22,7 @@

        ダイレクトタグジャンプの使い方

        ver 2.4.0.0 以前の場合
        -以下のいずれかの ctags をダウンロードして ctags.exeを sakura.exe と同一フォルダに置きます。
        +以下のいずれかの ctags をダウンロードして ctags.exeを sakura.exe と同一フォルダーに置きます。
        • Universal Ctags (現在積極的に開発されている)
          • @@ -32,7 +32,7 @@

          ダイレクトタグジャンプの使い方

          Universal Ctags には x86版 (32bit)と x64版(64bit) があります。sakura.exe と同じタイプ(x86版 or x64版)をダウンロードします。
          Exuberant Ctags の場合 Win32版をダウンロードします。

          -アーカイブに含まれている ctags.exe を sakura.exeと同一フォルダに置きます。
          +アーカイブに含まれている ctags.exe を sakura.exeと同一フォルダーに置きます。


      @@ -42,7 +42,7 @@

      ダイレクトタグジャンプの使い方

      ダイアログボックスでタグファイルの作成位置とオプションを指定してOKを押すとtagsファイルが生成されます。

      サブディレクトリを含むダイレクトタグジャンプを使う場合は，対象とするディレクトリすべてを配下に含むディレクトリをtags作成先に指定してください。
      -また作成時に「サブフォルダも対象にする」オプションにチェックを入れてください。
      +また作成時に「サブフォルダーも対象にする」オプションにチェックを入れてください。
      そのディレクトリ配下のファイル間でダイレクトタグジャンプができるようになります。

      tagsファイルにはキーワードと行番号の対応が保存されています。
      diff --git a/help/sakura/res/HLP000279.html b/help/sakura/res/HLP000279.html index d56a21b371..22c49a2d84 100644 --- a/help/sakura/res/HLP000279.html +++ b/help/sakura/res/HLP000279.html @@ -13,12 +13,12 @@

      履歴の管理

      -最近使ったファイルおよびフォルダにお気に入りを設定します。
      -お気に入りに設定したものは、最近使ったファイルおよびフォルダメニューにマークが付きます。
      -お気に入りのファイルおよびフォルダは、履歴から消えることはありません。
      +最近使ったファイルおよびフォルダーにお気に入りを設定します。
      +お気に入りに設定したものは、最近使ったファイルおよびフォルダーメニューにマークが付きます。
      +お気に入りのファイルおよびフォルダーは、履歴から消えることはありません。

      -ファイル・フォルダ除外で最近使ったファイル・フォルダへの登録を除外することができます。
      -除外する前に最近使ったファイル・フォルダへ追加されていたものはそのまま残ります。
      +ファイル・フォルダー除外で最近使ったファイル・フォルダーへの登録を除外することができます。
      +除外する前に最近使ったファイル・フォルダーへ追加されていたものはそのまま残ります。

      Favorite
      ［追加］ボタン
      @@ -33,7 +33,7 @@

      履歴の管理

      お気に入り以外の履歴を削除します。

      [存在しない項目］ボタン
      -存在しないファイルやフォルダの履歴を削除します。
      +存在しないファイルやフォルダーの履歴を削除します。

      [選択項目］ボタン
      選択行の履歴を削除します。
      @@ -46,7 +46,7 @@

      履歴の管理

      新規に項目を追加します。

      [除外リストに追加］メニュー
      -選択中の項目を履歴ファイル・フォルダ除外へ追加します。
      +選択中の項目を履歴ファイル・フォルダー除外へ追加します。

      各項目はDelキーでも削除できます。

      diff --git a/help/sakura/res/HLP000280.html b/help/sakura/res/HLP000280.html index 0c4e323edf..506582ab4d 100644 --- a/help/sakura/res/HLP000280.html +++ b/help/sakura/res/HLP000280.html @@ -13,7 +13,7 @@

      タグファイルの作成

      ダイレクトタグジャンプで使用するタグファイルを作成します。
      -タグファイルは現在開いているファイルがあるフォルダから、ルート(C:\など)に向かって探して行き、途中で見つけたすべての「tags」というファイルを使います。
      +タグファイルは現在開いているファイルがあるフォルダーから、ルート(C:\など)に向かって探して行き、途中で見つけたすべての「tags」というファイルを使います。

      TagsMake

      diff --git a/help/sakura/res/HLP000284.html b/help/sakura/res/HLP000284.html index a658d14e75..7988d2155e 100644 --- a/help/sakura/res/HLP000284.html +++ b/help/sakura/res/HLP000284.html @@ -36,8 +36,8 @@

      特殊記号

      $N 開いているファイルの名前(簡易表示)
              例：ソース\Main.cpp(設定によります)
      $n 無題の通し番号 (sakura:2.0.6.0以降)
      -$E 開いているファイルのあるフォルダの名前(簡易表示) (sakura:2.0.6.0以降)
      -$e 開いているファイルのあるフォルダの名前 (sakura:2.0.6.0以降)
      +$E 開いているファイルのあるフォルダーの名前(簡易表示) (sakura:2.0.6.0以降)
      +$e 開いているファイルのあるフォルダーの名前 (sakura:2.0.6.0以降)
      $B タイプ別設定の名前 (sakura:2.0.7.0以降)
      $b 開いているファイルの拡張子 (sakura:2.0.7.0以降)
      $Q 印刷ページ設定の名前 (sakura:2.0.7.0以降)
      diff --git a/help/sakura/res/HLP000315.html b/help/sakura/res/HLP000315.html index 301ff49db9..1a8ddeb693 100644 --- a/help/sakura/res/HLP000315.html +++ b/help/sakura/res/HLP000315.html @@ -32,7 +32,7 @@

      タイプ別設定 『キーワードヘルプ』プロパティ


      [辞書ファイル]
      挿入したい辞書ファイルを指定します。
      -フルパスまたは設定フォルダからの相対パスです。
      +フルパスまたは設定フォルダーからの相対パスです。

      [インポート], [エクスポート]ボタン
      キーワードヘルプ設定のインポート/エクスポートができます。
      @@ -59,6 +59,6 @@

      タイプ別設定 『キーワードヘルプ』プロパティ

      □[選択範囲で前方一致検索]チェックボックス
      選択範囲のキーワードで前方一致検索します。

      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000319.html b/help/sakura/res/HLP000319.html index fb03ad103c..d020613927 100644 --- a/help/sakura/res/HLP000319.html +++ b/help/sakura/res/HLP000319.html @@ -40,7 +40,7 @@

      タイプ別設定 『ウィンドウ』プロパティ


      □文書アイコンを使う
      -エディタのアイコンを文書に関連づけられたもの(フォルダで表示されるもの)に変更します。
      +エディタのアイコンを文書に関連づけられたもの(フォルダーで表示されるもの)に変更します。

      <行番号の表示>
      行番号の表示を「○折り返し単位」と「◎改行単位」から選べます。
      @@ -88,6 +88,6 @@

      タイプ別設定 『ウィンドウ』プロパティ


      -[設定フォルダ]
      -設定フォルダボタンは、ユーザー別設定を行っている場合のみ表示されます。
      +[設定フォルダー]
      +設定フォルダーボタンは、ユーザー別設定を行っている場合のみ表示されます。
      diff --git a/help/sakura/res/HLP000358.html b/help/sakura/res/HLP000358.html index 66ebf06372..da8470b458 100644 --- a/help/sakura/res/HLP000358.html +++ b/help/sakura/res/HLP000358.html @@ -11,9 +11,9 @@

      表示言語の切り替え

      -サクラエディタと同じフォルダに言語DLLを置くとエディタの表示言語を変更できます。(sakura:2.1.1.0以降)
      +サクラエディタと同じフォルダーに言語DLLを置くとエディタの表示言語を変更できます。(sakura:2.1.1.0以降)
      ファイル名は"sakura_lang_(言語名).dll"です。
      -言語DLLをサクラエディタと同じフォルダに置き、共通設定 『ウィンドウ』プロパティで言語を選択しOKを押すと表示言語が切り替わります。
      +言語DLLをサクラエディタと同じフォルダーに置き、共通設定 『ウィンドウ』プロパティで言語を選択しOKを押すと表示言語が切り替わります。

      hintヒント
      メニュー名が切り替わらないときは、共通設定 『メインメニュー』プロパティにて「初期設定」ボタンを押すことで切り替わります。
      diff --git a/help/sakura/res/HLP000362.html b/help/sakura/res/HLP000362.html index 15b844aa14..b45fd7432f 100644 --- a/help/sakura/res/HLP000362.html +++ b/help/sakura/res/HLP000362.html @@ -15,7 +15,7 @@

      Grep置換

      GrepReplace
      ディスクにある複数のファイルから、指定した文字列を検索・置換することができます。(sakura:2.2.0.0以降)
      -指定したフォルダの下層のフォルダを全て置換することもできます。
      +指定したフォルダーの下層のフォルダーを全て置換することもできます。
      サクラエディタ自身や他のプログラムが排他制御で書き込み禁止の場合、改名処理に失敗します。
      以下の手順で置換処理を実行します。
      @@ -39,26 +39,26 @@

      Grep置換

      カンマ、スペース、セミコロン(, ;)のどれかで区切ると複数の条件を指定できます。
      ファイル名に(, ;)を含む場合は、ダブルクオーテーションで囲うことで、ひとつのファイル名として扱えます。
      ファイルパターンの先頭に!を付ける(例: !*.obj)と，そのパターンに当たるファイルをGrep対象から外します。
      - ファイルパターンの先頭に#を付ける(例: #*.svn)と、そのパターンに当たるサブフォルダをGrep対象から外します。
      + ファイルパターンの先頭に#を付ける(例: #*.svn)と、そのパターンに当たるサブフォルダーをGrep対象から外します。
      指定位置にかかわらず除外指定は検索指定より優先されます．
      何も指定しない場合は、「*.*」を指定したことになります。
      - (フォルダ) … 検索対象ファイルのあるフォルダを指定します。エクスプローラなどからのフォルダのドロップも受け付けます。
      - 複数フォルダを;で区切って指定することができます。;を含むフォルダを指定する場合は""で囲ってください。
      + (フォルダー) … 検索対象ファイルのあるフォルダーを指定します。エクスプローラなどからのフォルダーのドロップも受け付けます。
      + 複数フォルダーを;で区切って指定することができます。;を含むフォルダーを指定する場合は""で囲ってください。
      (除外ファイル) … 検索対象から外すファイルパターンを指定します。
      (ファイル) で ファイルパターンの先頭に!を付ける ことにより除外ファイルを指定できるのを簡単に使えるようにするものです。
      ファイルパターンを;で区切って指定することができます。;を含むファイルパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      - (除外フォルダ) … 検索対象から外すフォルダパターンを指定します。
      - (ファイル) で ファイルパターンの先頭に#を付ける ことにより除外フォルダを指定できるのを簡単に使えるようにするものです。
      - フォルダパターンを;で区切って指定することができます。;を含むフォルダパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      + (除外フォルダー) … 検索対象から外すフォルダーパターンを指定します。
      + (ファイル) で ファイルパターンの先頭に#を付ける ことにより除外フォルダーを指定できるのを簡単に使えるようにするものです。
      + フォルダーパターンを;で区切って指定することができます。;を含むフォルダーパターンを指定する場合は""で囲ってください。(sakura:2.4.0.0以降)
      □単語単位で探す
          単語として識別するもののみ検索します。
          スペースなどで区切ると複数単語検索が行えます。
      - ■サブフォルダからも検索する
      -     指定フォルダの下層フォルダからも検索するかどうかを指定します。
      + ■サブフォルダーからも検索する
      +     指定フォルダーの下層フォルダーからも検索するかどうかを指定します。
      □英大文字と小文字を区別する
          半角英字の大文字と小文字を区別して検索するかどうかを指定します。
      @@ -66,16 +66,16 @@

      Grep置換

      □ファイル毎最初のみ検索 … ファイル毎に1回だけ結果を出力します。
      - □ベースフォルダ表示 … ルートフォルダの表示とそこからの相対パスで出力します。
      + □ベースフォルダー表示 … ルートフォルダーの表示とそこからの相対パスで出力します。
      - □フォルダ毎に表示 … サブフォルダ毎にパスをまとめて相対パスで出力します。
      + □フォルダー毎に表示 … サブフォルダー毎にパスをまとめて相対パスで出力します。
      □文字コードセット
          検索対象となるファイルの文字コードセットを選択します。
          自動選択、SJIS、JIS、EUC、Latin1(Windows-1252)、UTF-16、UTF-16BE、UTF-8、CESU-8、UTF-7、コードページから選択します。
      - □フォルダの初期値をカレントフォルダにする
      -     現在開いているファイルがあるフォルダを(フォルダ)の初期値にします。次回のダイアログ表示時に反映されます。
      + □フォルダーの初期値をカレントフォルダーにする
      +     現在開いているファイルがあるフォルダーを(フォルダー)の初期値にします。次回のダイアログ表示時に反映されます。
      □正規表現 … 検索条件に、正規表現を使うかどうかを指定します。
      @@ -101,10 +101,10 @@

      Grep置換

      [上]ボタン
      -     フォルダを1階層上に設定します。
      +     フォルダーを1階層上に設定します。
      - [現フォルダ]ボタン
      -     このボタンを押すと現在開いているファイルを元に「フォルダ」を設定します。
      + [現フォルダー]ボタン
      +     このボタンを押すと現在開いているファイルを元に「フォルダー」を設定します。

      @@ -120,13 +120,13 @@

      Grep置換

          str1    検索文字列
          str2    置換後文字列
          str3    検索対象にするファイル名
      -    str4    検索対象にするフォルダ名
      +    str4    検索対象にするフォルダー名
          int5    オプション（省略可能、ただしPPAマクロは省略不可）
          int6    文字コードセット（省略可能、ただしPPAマクロは省略不可）
      ・記録: ○
      ・解説
      オプションには以下の値の組み合わせを指定できます。
      -    0x01    サブフォルダからも検索する（省略時規定値）
      +    0x01    サブフォルダーからも検索する（省略時規定値）
          0x02    この編集中のテキストから検索する（未実装）
          0x04    英大文字と英小文字を区別する（省略時規定値）
          0x08    正規表現
      @@ -151,8 +151,8 @@

      Grep置換

          0x6300    自動選択
          0x010000;  単語単位で探す
          0x020000;  ファイル毎最初のみ検索
      -    0x040000;  ベースフォルダ表示
      -    0x080000;  フォルダ毎に表示
      +    0x040000;  ベースフォルダー表示
      +    0x080000;  フォルダー毎に表示
          0x100000;  クリップボードから貼り付ける
          0x200000;  バックアップ作成
      文字コード自動判別を設定した場合と文字コードセットを 自動選択にした場合の動作は同じです。
      diff --git a/help/sakura/res/HLP000363.html b/help/sakura/res/HLP000363.html index adc79c0aa7..aa24d9edaf 100644 --- a/help/sakura/res/HLP000363.html +++ b/help/sakura/res/HLP000363.html @@ -13,10 +13,10 @@

      プロファイルマネージャ

      プロファイルマネージャを表示します。
      マルチプロファイル機能は、サクラエディタの設定を複数使い分けることができるようになるものです。
      -各設定は、設定フォルダ(従来のsakura.iniがおかれているフォルダ)にプロファイル名のサブフォルダを作成し、 -それぞれのサブフォルダ内に各設定ファイル・sakura.ini・マクロ・プラグインを置くことができます。
      -従来の設定フォルダにじかにおかれているsakura.iniは「(default)」と表示されます。
      -プロファイルマネージャの設定は、設定フォルダの[実行ファイル名]_prof.iniに書き込まれます。
      +各設定は、設定フォルダー(従来のsakura.iniがおかれているフォルダー)にプロファイル名のサブフォルダーを作成し、 +それぞれのサブフォルダー内に各設定ファイル・sakura.ini・マクロ・プラグインを置くことができます。
      +従来の設定フォルダーにじかにおかれているsakura.iniは「(default)」と表示されます。
      +プロファイルマネージャの設定は、設定フォルダーの[実行ファイル名]_prof.iniに書き込まれます。

      (プロファイル名一覧)
      @@ -24,11 +24,11 @@

      プロファイルマネージャ

      *が付いているものは、コマンドラインで-PROF=未指定時のデフォルト起動のプロファイルです。
      実際に存在するプロファイル一覧とここに表示される一覧は異なることがあります。
      [新規作成]
      -新しくプロファイル一覧に名前を登録します。サブフォルダの実体は作成しません。
      +新しくプロファイル一覧に名前を登録します。サブフォルダーの実体は作成しません。
      [名前変更]
      -現在一覧で選択されているプロファイル名の名前を変更します。サブフォルダの実体がある場合、フォルダの名前の変更も行います。
      +現在一覧で選択されているプロファイル名の名前を変更します。サブフォルダーの実体がある場合、フォルダーの名前の変更も行います。
      [削除]
      -現在一覧で選択されているプロファイル名の名前を削除します。サブフォルダの実体は削除しません。
      +現在一覧で選択されているプロファイル名の名前を削除します。サブフォルダーの実体は削除しません。
      [デフォルト設定]
      現在一覧で選択されているプロファイル名をデフォルト起動のプロファイルに設定します。
      [デフォルト解除]
      diff --git a/help/sakura/res/HLP000368.html b/help/sakura/res/HLP000368.html index 8a00b4d3e2..252bb5daca 100644 --- a/help/sakura/res/HLP000368.html +++ b/help/sakura/res/HLP000368.html @@ -12,7 +12,7 @@

      ファイルツリー

      ファイルツリーを表示します。(sakura:2.2.0.0以降)
      -デフォルトでは、各ファイルのあるフォルダ以下のファイル一覧が表示されます。
      +デフォルトでは、各ファイルのあるフォルダー以下のファイル一覧が表示されます。
      各ファイルは、ダブルクリックでそのファイルを開くことができます。
      設定は、アウトラインドッキングの「タイプ別継承」「共通継承」に連動しています。
      [設定]ボタンを押すと、設定画面が表示されます。
      @@ -26,7 +26,7 @@

      ファイルツリー

      「設定: 共通設定」 : 現在の表示は全ウィンドウで共通設定になっています。
      「設定: (タイプ別/共通)設定+ファイル」 : デフォルト設定ファイルを読み込んでいます。
      「設定: ＜ファイル名＞」 : 各ディレクトリの_sakurafiletree.iniを読み込んでいます。
      -■各フォルダの設定を読み込む
      +■各フォルダーの設定を読み込む
      開いているファイルの上位ディレクトリにある_sakurafiletree.iniを読み込むかどうか設定できます。
      この項目はタイプ別・共通設定のみに保存され、iniには保存されません。
      デフォルト設定ファイル名
      @@ -42,26 +42,26 @@

      ファイルツリー

      追加するアイテムの種類を指定します。
      ・Grep
      -指定フォルダ以下のファイル一覧をツリー形式で追加します。 +指定フォルダー以下のファイル一覧をツリー形式で追加します。
      ・ファイル
      特定ファイルを1つ追加します。
      -・フォルダ
      +・フォルダー
      -ツリーの仮想サブフォルダを1つ追加します。 +ツリーの仮想サブフォルダーを1つ追加します。
      パス
      -アイテムのパスを指定します。Grepの場合はフォルダのパスです。種類がファイルの場合はファイルのパスです。
      +アイテムのパスを指定します。Grepの場合はフォルダーのパスです。種類がファイルの場合はファイルのパスです。
      「.」で現在開いているファイルからのカレントディレクトリを指定できます。
      -「<iniroot>」で、現在の設定ファイルのフォルダを指定できます。
      +「<iniroot>」で、現在の設定ファイルのフォルダーを指定できます。
      他には、メタ文字列を指定可能です。
      ラベル
      ツリーに表示する表示名を指定します。
      省略した場合、フルパスが表示されます。
      ファイル
      -Grepタイプのときの、表示に追加するファイル・サブフォルダをGrepのファイル指定と同じ書式で指定します。
      +Grepタイプのときの、表示に追加するファイル・サブフォルダーをGrepのファイル指定と同じ書式で指定します。
      非表示属性
      隠しファイル・読み取り専用・システムファイルからチェックした属性を持つファイルをGrep結果から除外します。

      @@ -74,7 +74,7 @@

      ファイルツリー

      [>>]
      一番下に画面左側で設定したアイテムを追加します。
      [更新]
      -現在選択しているアイテムの内容を画面左側で設定したアイテムで更新します。フォルダにGrep・ファイルは更新できません。
      +現在選択しているアイテムの内容を画面左側で設定したアイテムで更新します。フォルダーにGrep・ファイルは更新できません。
      [ファイル挿入]
      複数ファイル一括してダイアログで選択して、現在選択しているアイテムの下側に追加します。
      [パスの一括置換]
      diff --git a/help/sakura/res/HLP000380.html b/help/sakura/res/HLP000380.html index fb31898ec7..57dbd8e8aa 100644 --- a/help/sakura/res/HLP000380.html +++ b/help/sakura/res/HLP000380.html @@ -4,15 +4,15 @@ -このファイルのフォルダ名をコピー - +このファイルのフォルダー名をコピー + -

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

      -現在編集中のファイルのフォルダ名をクリップボードへコピーします。
      +

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

      +現在編集中のファイルのフォルダー名をクリップボードへコピーします。

      ■マクロ構文
      ・構文: CopyDirPath( );
      diff --git a/help/sakura/res/HLP000400.html b/help/sakura/res/HLP000400.html index 68f80b7eb7..cbec97cced 100644 --- a/help/sakura/res/HLP000400.html +++ b/help/sakura/res/HLP000400.html @@ -23,7 +23,7 @@

      タスクトレイメニュー

    • 開く(O)...
    • Grep(G)...
    • 最近使ったファイル(F)...
      • -
    • 最近使ったフォルダ(D)...
      • +
    • 最近使ったフォルダー(D)...
    • すべて上書き保存(Z)
    • (ウィンドウリスト)(1～0A～Z)
    • 編集の全終了(Q)
      • diff --git a/help/sakura/res/HLP000500.html b/help/sakura/res/HLP000500.html index 6e548fd92c..be50c27159 100644 --- a/help/sakura/res/HLP000500.html +++ b/help/sakura/res/HLP000500.html @@ -57,6 +57,6 @@

      「設定(O)」メニュー

      ・文字コードセット指定(A)
      ・入力改行コード指定(E)Delta

      -・設定フォルダ(/)Delta
      +・設定フォルダー(/)Delta

      diff --git a/help/sakura/res/HLP_RELEASE.html b/help/sakura/res/HLP_RELEASE.html index 00b2deca6f..4dd2e487ea 100644 --- a/help/sakura/res/HLP_RELEASE.html +++ b/help/sakura/res/HLP_RELEASE.html @@ -157,14 +157,14 @@

      リリース履歴(1999/04/01～)


      ◆Ver 0.3.8.1 1999.10.04
      -・設定はsakura.exeと同じフォルダのsakura.iniに保存するよう変更
      +・設定はsakura.exeと同じフォルダーのsakura.iniに保存するよう変更
      ・URL上、選択テキスト、Drag&Drop中のマウスカーソル形状を変えた
      ・スクロールバー操作時のスクロール処理の改善
      ・選択テキストをDrag&Dropで移動またはコピーする機能
      ・印刷ページ設定で行あたりの文字数と縦方向の行数を表示するようにした
      ・「開く」「名前をつけて保存」ダイアログのサイズを小さくした
      -・マクロ保存・読み込みのフォルダの保存
      -・設定インポート・エクスポートフォルダの保存
      +・マクロ保存・読み込みのフォルダーの保存
      +・設定インポート・エクスポートフォルダーの保存
      ・アウトラインダイアログのリサイズ
      ・折り返しを変更してもUndo/Redoバッファをクリアしないようにした
      ・WZ風のGrepの出力形式を追加
      @@ -190,7 +190,7 @@

      リリース履歴(1999/04/01～)

      ・コンパイラをVC++6.0 Standard Editionに戻した。(プロパティシートの問題へ対応できたら良いな)
      ・キーマクロ記録で上下カーソル移動が正しく記録、実行されない不具合
      ・ときどきカーソルが消える不具合を一部修正
      -・フォルダを送ったりドロップしたら、落ちる不具合
      +・フォルダーを送ったりドロップしたら、落ちる不具合
      ・マウスのホイール操作対応
      ・タスクトレイへ常駐しない設定、タスクトレイを使わない設定が可能になった
      ・「Oracle SQL*Plusをアクティブ表示」機能追加
      @@ -202,7 +202,7 @@

      リリース履歴(1999/04/01～)


      ◆Ver 0.3.7.2 1999.08.27
      -・指定フォルダへバックアップするときのファイル名生成の不具合
      +・指定フォルダーへバックアップするときのファイル名生成の不具合
      ・常駐したままWindowsを終了すると、設定が保存されない
      ・印刷用紙サイズ取得の不具合
      ・フラットツールバーのボタンが上にずれている不具合
      @@ -234,7 +234,7 @@

      リリース履歴(1999/04/01～)

      ◇1999.08.18
      ・タイプ別設定のダイアログで、プロックコメントの開始と終端の入力エリアがありますが、左右が逆になっている不具合
      ・ウィンドウ幅より折り返し文字数の幅が小さいときでも、右端付近でスクロールしてしまう不具合
      -・開いたフォルダ、検索文字列、置換後文字列、Grep対象ファイル、Grep対象フォルダ が正しく保存されない不具合
      +・開いたフォルダー、検索文字列、置換後文字列、Grep対象ファイル、Grep対象フォルダー が正しく保存されない不具合
      ◇1999.08.17
      ・なんとなくバージョン番号を上げました
      ・設定（共通設定、フォント設定）が、レジストリに保存されない不具合
      @@ -316,7 +316,7 @@

      リリース履歴(1999/04/01～)

      ◇1999.06/01
      ・強調キーワード編集機能を追加
      -・最近開いたファイル、フォルダ：履歴の削除機能、履歴の最大数の設定機能を追加
      +・最近開いたファイル、フォルダー：履歴の削除機能、履歴の最大数の設定機能を追加

      ◆Ver 0.3.1.0
      diff --git a/help/sakura/res/HLP_UR002.html b/help/sakura/res/HLP_UR002.html index 7aaa82aa46..ead76b0627 100644 --- a/help/sakura/res/HLP_UR002.html +++ b/help/sakura/res/HLP_UR002.html @@ -63,7 +63,7 @@

      変更履歴(2000/05/12～)

      ・ショートカットをいくつか追加＆変更
      ・各ダイアログでのタブ移動や矢印キーでの移動にもかなり配慮したつもり
      ・コマンド一覧表示のとき下がステータスバーを隠してしまうので真ん中に移動
      -・ファイルとフォルダの履歴MAXを30から36に変更(0-9とA-Zで36個になるので(^_^;))
      +・ファイルとフォルダーの履歴MAXを30から36に変更(0-9とA-Zで36個になるので(^_^;))
      ・縦横分割が解除可能の時はそのようなメッセージになるように変更
      ・上とは逆にツールバーやファンクションキーなどを隠すことができる時にメッセージが「隠す」となっていてかつチェックが付いているのは違和感があるのでメッセージを変えないようにした．これは特に[アイコン付きメニュー]OFF時、Win標準と異なる仕様になって「ん？」なのです．
      ・[タイプ別設定]‐[テキスト]の[折り返し桁数]を80→120に増やした
      @@ -112,7 +112,7 @@

      変更履歴(2000/05/12～)


      Aug 23, 2000 (β6)
      -・「ファイル」メニューにあるファイルとフォルダの履歴にも0～9, A～Zのアクセスキーを付けた．
      +・「ファイル」メニューにあるファイルとフォルダーの履歴にも0～9, A～Zのアクセスキーを付けた．

      Aug. 22, 2000 (β5)
      diff --git a/help/sakura/res/HLP_UR003.html b/help/sakura/res/HLP_UR003.html index e3e8d4bbbf..5d08860d2e 100644 --- a/help/sakura/res/HLP_UR003.html +++ b/help/sakura/res/HLP_UR003.html @@ -147,7 +147,7 @@

      変更履歴(2000/10/10～)

      ・[タイプ別設定]-[スクリーン]で行間の下限を0に設定出来なかった不具合を修正(0に設定すればちょっと表示行が増えます.デフォルトでは1)
      ・[指定行へジャンプ]の設定でPL/SQLエラー行の数値入力のところに反転表示が残ってしまう不具合を修正
      -・ファイルやフォルダ名に&があるとき、[最近使った...]で&が正しく表示できず、アクセスキーに下線が付かない不具合を&2倍化法(&→&&)で暫定修正(実際にはアクセスキーは今でも有効です)
      +・ファイルやフォルダー名に&があるとき、[最近使った...]で&が正しく表示できず、アクセスキーに下線が付かない不具合を&2倍化法(&→&&)で暫定修正(実際にはアクセスキーは今でも有効です)
      ・[ファイル比較]で比較元ファイル名が長いとき表示し切れなかった不具合を2行に折り曲げるよう修正
      ・同[カラー]-[色指定]のアクセスキーLで[インポート]になってしまう不具合を修正
      ・[共通設定]-[キー割り当て]で[Enter]が2つ入っていたので1つ削除
      @@ -173,7 +173,7 @@

      変更履歴(2000/10/10～)

      ・デフォルト設定の変更
      ・テキストの色 RGB(255,255,255) (真っ白)→ RGB(255,251,240) (ほんのりsakura色)
      -・[ファイル(フォルダ)の履歴MAX]を10→15に増やした
      +・[ファイル(フォルダー)の履歴MAX]を10→15に増やした
      ・ツールバーに[置換]、[コマンド一覧]を追加
      ・[右クリックメニュー]に[タグジャンプ]、[タグジャンプバック]、[選択範囲内全行コピー]、[選択範囲内全行引用符付きコピー]を追加
      ・メニューバーの第一階層のアクセスキーとショートカットキーを追加＆変更
      diff --git a/help/sakura/res/HLP_UR004.html b/help/sakura/res/HLP_UR004.html index 98c4249348..01c215b0b6 100644 --- a/help/sakura/res/HLP_UR004.html +++ b/help/sakura/res/HLP_UR004.html @@ -155,7 +155,7 @@

      変更履歴(2000/11/20～)

      [バグ修正]
      ・[キー割り当て一覧をコピー]にショートカットキーを割り付けても動作しなかった不具合を修正 (by げんた氏)
      -・ファイルやフォルダ名に&があるとき[ウィンドウ]の編集ファイル一覧で&とアクセスキーが正しく表示できなかった不具合を例によって&2倍化法で暫定修正. (誰か本式に修正してくれんかいのー)
      +・ファイルやフォルダー名に&があるとき[ウィンドウ]の編集ファイル一覧で&とアクセスキーが正しく表示できなかった不具合を例によって&2倍化法で暫定修正. (誰か本式に修正してくれんかいのー)

      [デフォルト設定値の追加・変更]
      diff --git a/help/sakura/res/HLP_UR006.html b/help/sakura/res/HLP_UR006.html index b918f872d3..85ff698da1 100644 --- a/help/sakura/res/HLP_UR006.html +++ b/help/sakura/res/HLP_UR006.html @@ -103,7 +103,7 @@

      変更履歴(2001/06/22～)

      子プロセスを監視するツールから使った場合でも編集終了が常に認識されるようになった．

      * コントロールプロセスのカレントディレクトリはシステムディレクトリ．
      -コントロールプロセスのカレントディレクトリが残るためにフォルダが削除できないことが無くなったはず．
      +コントロールプロセスのカレントディレクトリが残るためにフォルダーが削除できないことが無くなったはず．

      * -NOWIN オプションの振る舞い
      既にコントロールプロセスがいる場合には従来はウィンドウを開いていたが，コントロールプロセスの有無に関わらずエディタは開かないようにした．
      diff --git a/help/sakura/res/HLP_UR007.html b/help/sakura/res/HLP_UR007.html index 2348400389..621488f77b 100644 --- a/help/sakura/res/HLP_UR007.html +++ b/help/sakura/res/HLP_UR007.html @@ -181,7 +181,7 @@

      変更履歴(2001/12/03～)


      ・表示に関する問題
      -・Grep検索中画面のフォルダ名表示がサブフォルダから戻ったときに更新されなかったのを修正 (by みくさん)
      +・Grep検索中画面のフォルダー名表示がサブフォルダーから戻ったときに更新されなかったのを修正 (by みくさん)
      ・「ウィンドウサイズ継承」にして殆ど画面一杯にしても、再起動後に開いた時に、ウィンドウが少し小さくなる問題を修正 (by みくさん)
      ・タイトルバーがちらつかないように修正 (by げんた)
      ・正規表現キーワードの一部が検索キーワードに一致すると、検索キーワードの後ろがデフォルトテキスト色になってしまうのを修正 (by みくさん)
      diff --git a/help/sakura/res/HLP_UR008.html b/help/sakura/res/HLP_UR008.html index 1e76299a20..f8fa11450d 100644 --- a/help/sakura/res/HLP_UR008.html +++ b/help/sakura/res/HLP_UR008.html @@ -286,7 +286,7 @@

      変更履歴(2002/02/23～)

      ・行番号表示の桁数が変わるとルーラーの表示がずれるのを修正．(by やざきさん)
      ・WinNTで「ヘルプ」-「目次」が出なくなったのを修正．(by やざきさん／みくさん)
      -・Windows XPでmanifestファイルを使っている場合に共通設定→バックアップを選ぶと、自動的に「フォルダの選択」ダイアログが表示される問題を修正 (by みくさん，げんた)
      +・Windows XPでmanifestファイルを使っている場合に共通設定→バックアップを選ぶと、自動的に「フォルダーの選択」ダイアログが表示される問題を修正 (by みくさん，げんた)
      ・画面最大化時に右下のリサイズ表示がおかしくなるのを修正(by みくさん，やざきさん)

      [その他変更]
      @@ -313,13 +313,13 @@

      変更履歴(2002/02/23～)

      ・行番号表示の桁数が変わるとルーラーの表示がずれる．
      ・WinNTで「ヘルプ」-「目次」が出ない．
      -・Windows XPでmanifestファイルを使っている場合に，「共通設定」-「バックアップ」タブを選択するとフォルダ選択ダイアログが勝手に出てきてしまう．
      +・Windows XPでmanifestファイルを使っている場合に，「共通設定」-「バックアップ」タブを選択するとフォルダー選択ダイアログが勝手に出てきてしまう．

      Feb. 23, 2002 (1.2.106.2)

      [機能追加]
      -・GREPでフォルダの初期値をカレントフォルダにするかどうかを選択可能に (BY horさん)
      +・GREPでフォルダーの初期値をカレントフォルダーにするかどうかを選択可能に (BY horさん)
      ・アウトライン解析関連 (BY horさん)
      ・ブックマークの「空行を無視する」オプションを変更したらリストを再表示するように
      diff --git a/help/sakura/res/HLP_UR009.html b/help/sakura/res/HLP_UR009.html index dfb36eaea6..837a4af895 100644 --- a/help/sakura/res/HLP_UR009.html +++ b/help/sakura/res/HLP_UR009.html @@ -153,7 +153,7 @@

      変更履歴(2002/05/01～)

      ・2行目以降をインデントしているときに、インデントされている行の行番号をクリックすると、選択範囲がおかしくなるのを修正．(by やざきさん)
      ・TABインデント時に、折り返し行にインデントが挿入されないように．
      ・Javaのアウトラインで関数内のキャストが関数宣言と誤認されるのを修正．(by げんた)
      -・バックアップフォルダ名の指定で，制限いっぱいまで入力すると1文字バッファオーバーランするのを修正．(by げんた)
      +・バックアップフォルダー名の指定で，制限いっぱいまで入力すると1文字バッファオーバーランするのを修正．(by げんた)

      [その他変更]
      @@ -179,7 +179,7 @@

      変更履歴(2002/05/01～)

      ・ダイアログからの文字列取得部を見直し．不要な -1 を削除し，内部バッファの最後まで利用するようにした．(by げんた)
      ・タイプ別設定-ルールファイル，外部ヘルプ，外部HTMLヘルプ等の入力長を保存可能な長さに制限．(by げんた)
      -・共通設定-バックアップ-フォルダ名入力長を保存可能な長さに制限．(by げんた)
      +・共通設定-バックアップ-フォルダー名入力長を保存可能な長さに制限．(by げんた)
      ・折り返しインデントタイプ「前行先頭」を「論理行先頭」に名称変更．(by げんた)

      Oct. 3, 2002 (1.3.5.0)
      @@ -397,7 +397,7 @@

      変更履歴(2002/05/01～)

      ・ドロップダウン付き「開く」をツールバーに追加できるように．(by みくさん)
      ・検索BOXをツールバーに配置できるように．(by みくさん)
      -・DIFF差分表示．(by みくさん) sakura.exeと同じフォルダにdiff.exeが必要．
      +・DIFF差分表示．(by みくさん) sakura.exeと同じフォルダーにdiff.exeが必要．
      ・コントロールコードの入力．(by みくさん)
      ・Unicode Big Endian形式のファイルを扱えるように．(by もかさん)

      @@ -576,7 +576,7 @@

      変更履歴(2002/05/01～)

      ・印刷時のページ設定、余白の下限を0に。(by やざきさん)
      ・アンダーライン行をクリックしたときにアンダーラインが一瞬消えないように。(by やざきさん)
      ・Grep検索直後に結果ウィンドウでもう一回Grepした場合に前回の検索パターンがデフォルトで出るように検索後のキャレット位置を移動。(by やざきさん)
      -・「共通設定」-「マクロ」-「File」で、マクロフォルダにあるファイルを拡張子にかかわらずすべて列挙するように。(by やざきさん) [複数マクロ対応]
      +・「共通設定」-「マクロ」-「File」で、マクロフォルダーにあるファイルを拡張子にかかわらずすべて列挙するように。(by やざきさん) [複数マクロ対応]

      [残存バグ・制限事項など]
      diff --git a/help/sakura/res/HLP_UR010.html b/help/sakura/res/HLP_UR010.html index 9477e09601..ddaee462e6 100644 --- a/help/sakura/res/HLP_UR010.html +++ b/help/sakura/res/HLP_UR010.html @@ -109,13 +109,13 @@

      変更履歴(2003/01/14～)


      Exuberant Ctags 日本語対応版

      -上のリンクからctags.exeを取得し，それをsakura.exeと同一フォルダに置きます．次にctagsを作成したいディレクトリを開き，検索メニュー→タグファイルの作成でタグファイルを作成します．カレントフォルダのみのタグファイルを作成します．サブディレクトリのファイルも含んだタグファイルを作成したい場合はコマンドラインからctagsを直接実行してください．手動で作成するときは， ctags.exe --excmd=n -R * のように指定してください．カレントディレクトリ以外のtagsは参照されません．
      +上のリンクからctags.exeを取得し，それをsakura.exeと同一フォルダーに置きます．次にctagsを作成したいディレクトリを開き，検索メニュー→タグファイルの作成でタグファイルを作成します．カレントフォルダーのみのタグファイルを作成します．サブディレクトリのファイルも含んだタグファイルを作成したい場合はコマンドラインからctagsを直接実行してください．手動で作成するときは， ctags.exe --excmd=n -R * のように指定してください．カレントディレクトリ以外のtagsは参照されません．

      キーワード上でタグジャンプすると定義位置へジャンプします．複数のジャンプ先がある場合はダイアログが出ます．タグジャンプに失敗した場合に自動的にダイレクトタグジャンプを行いますが，ダイレクトタグジャンプという機能も追加されています．

      ・編集中ファイルのDIFF (by みくさん)
      ・閉じてタブジャンプを独立したコマンドとし，Ctrl押下時のタグジャンプでジャンプ元ウィンドウを閉じる機能を抑止．(by げんた) ただしこのコマンドはマクロに記録されません．
      -・お気に入り機能．最近使ったファイル・フォルダからお気に入りを指定することで先頭に表示させることができます． (by みくさん)
      +・お気に入り機能．最近使ったファイル・フォルダーからお気に入りを指定することで先頭に表示させることができます． (by みくさん)
      ・履歴クリア機能 (by みくさん)
      ・特殊文字 $V(エディタのバージョン)，$h (Grep Key)，$I (アイコン化有無)を追加 (by げんた)
      ・ウィンドウキャプションのカスタマイズ (by みくさん)
      @@ -176,7 +176,7 @@

      変更履歴(2003/01/14～)


      [仕様変更]
      -・ファイル名が決まっていないときの「開く」「保存」ダイアログの初期フォルダを最後に使ったフォルダからエディタ起動時のカレントフォルダに変更．(by げんた)
      +・ファイル名が決まっていないときの「開く」「保存」ダイアログの初期フォルダーを最後に使ったフォルダーからエディタ起動時のカレントフォルダーに変更．(by げんた)

      [機能追加]
      diff --git a/help/sakura/res/HLP_UR011.html b/help/sakura/res/HLP_UR011.html index 32932dc153..88f7277da8 100644 --- a/help/sakura/res/HLP_UR011.html +++ b/help/sakura/res/HLP_UR011.html @@ -21,7 +21,7 @@

      変更履歴(2003/06/26～)

      [バグ修正]
      ・ALT+?にカーソルキーを割り当てるとALTを離すまで入力が二重になるのを修正．(もかさん)
      -・アクセス権限なし・フォルダを開きキャンセルをするとタブだけ残って消えるのを修正．(もかさん)
      +・アクセス権限なし・フォルダーを開きキャンセルをするとタブだけ残って消えるのを修正．(もかさん)
      ・D&Dでクリップボードが書き換わらないように．(もかさん)
      ・D&Dでのグローバルメモリのメモリリークを修正．(もかさん)
      ・タブ表示，ファンクションキー上部表示でツールバーを表示すると画面にTABの残骸が残るのを修正．(もかさん)
      diff --git a/help/sakura/res/HLP_UR012.html b/help/sakura/res/HLP_UR012.html index 99b04ee95c..ea92c1ef48 100644 --- a/help/sakura/res/HLP_UR012.html +++ b/help/sakura/res/HLP_UR012.html @@ -273,7 +273,7 @@

      変更履歴(2004/10/02～)


      [その他変更]
      -・バックアップフォルダが存在しない場合にその旨警告するように．(げんた)
      +・バックアップフォルダーが存在しない場合にその旨警告するように．(げんた)
      ・「現在のウィンドウ幅で折り返し」による幅の変更は，現在のウィンドウだけに適用されるように．タイプ別設定や別のエディタウィンドウには影響しません．(げんた)

      Jul. 20, 2005 (1.5.4.1)
      diff --git a/help/sakura/res/HLP_UR013.html b/help/sakura/res/HLP_UR013.html index faa33b35f8..8896ba981a 100644 --- a/help/sakura/res/HLP_UR013.html +++ b/help/sakura/res/HLP_UR013.html @@ -57,8 +57,8 @@

      Jun 19, 2007 (1.5.16.0)

      • システムメニューの有効／無効状態が不正になる(svn:1090 patches:1705864 ryoji)
      • 印刷時に折り返し行インデントが反映されない(svn:1092 patches:1573150 data:5259 Moca)
        • -
      • ファイルメニュー「最近使ったフォルダ」で多重オープンチェックの文字コード指定が無視される(svn:1095 patches:1672919 maru)
        • -
      • 未編集ウィンドウへのフォルダD&Dですでに開いているウィンドウがアクティブにならない(svn:1095 patches:1672919 maru)
        • +
      • ファイルメニュー「最近使ったフォルダー」で多重オープンチェックの文字コード指定が無視される(svn:1095 patches:1672919 maru)
        • +
      • 未編集ウィンドウへのフォルダーD&Dですでに開いているウィンドウがアクティブにならない(svn:1095 patches:1672919 maru)
      [その他の変更]
        diff --git a/help/sakura/res/HLP_UR014.html b/help/sakura/res/HLP_UR014.html index 7937f6813e..2803ad4e03 100644 --- a/help/sakura/res/HLP_UR014.html +++ b/help/sakura/res/HLP_UR014.html @@ -30,7 +30,7 @@

        Oct 17, 2010 (1.6.6.0)

      • 文書末を含む選択状態で文字列を貼り付けるとEOF表示が消える (svn:1681 patches:2895958 unicode:1052 ryoji)
      • r1676(#2869217)で起きる bcc5.5.1のエラー対策 (svn:1680 patches:2869217 ds14050)
      • 上検索の結果が幅0のとき選択範囲が 1あったのを 0に修正 (svn:1675 patches:2869217 unicode:1035 ds14050)
        • -
      • 浅いフォルダにあるファイルの編集・保存時にバックアップ処理で異常終了する (svn:1738 patches:2875910 dev:5624 あろか)
        • +
      • 浅いフォルダーにあるファイルの編集・保存時にバックアップ処理で異常終了する (svn:1738 patches:2875910 dev:5624 あろか)
      • タブバーツールチップの&表示不正 (svn:1739 patches:2912612 dev:5637 ryoji)
      • 検索・置換マクロのエラーチェック不具合 (svn:1741 patches:2921768 dev:5648 ryoji)
      • -GREPDLG指定でキャレットが消える (svn:1742 patches:2928898 dev:5650 ryoji)
        • @@ -124,7 +124,7 @@

        Jan. 16, 2009 (1.6.4.0)

      • コンボボックスでリスト表示＋末尾削除＋Enterで削除部分が復活する (svn:1496 patches:2394131 dev:5503 syat)
      • アウトライン解析の「フォーカスを移す」で分割画面のアクティブビューが切り替わる (svn:1505 patches:2461745 ryoji)
      • アイコン（メニュー、ツールバー）が黒くなる (svn:1506 patches:2497716 data:6842 ryoji)
        • -
      • GrepへのDrag & Dropフォルダパス貼り付けが動作しない (svn:1507 patches:2497740 ryoji)
        • +
      • GrepへのDrag & Dropフォルダーパス貼り付けが動作しない (svn:1507 patches:2497740 ryoji)
      • Grep時のファイル名パターンのバッファオーバラン対策 (svn:1510 patches:2402850 data:6818 dev:5484なすこじ)
      diff --git a/help/sakura/res/HLP_UR015.html b/help/sakura/res/HLP_UR015.html index a42b177f34..70dccb9a12 100644 --- a/help/sakura/res/HLP_UR015.html +++ b/help/sakura/res/HLP_UR015.html @@ -54,7 +54,7 @@

      Apr. 13, 2013 (2.0.7.0)

    • 単語判定処理コード変更 (svn:2691 upatchid:361 aroka)
    • OS バージョンチェックの修正(起動時のバージョンチェックをWin2000以降に変更、不要なバージョンチェックおよびルーチンを条件コンパイルではずす) (svn:2693 upatchid:357 Uchi)
    • CRunningTimerの分解能向上 (svn:2698 upatchid:364 Uchi)
      • -
    • Grepダイアログのアイテム(条件、ファイル、フォルダ)の遅延登録 (svn:2743 upatchid:368 novice)
      • +
    • Grepダイアログのアイテム(条件、ファイル、フォルダー)の遅延登録 (svn:2743 upatchid:368 novice)
    • ファイルダイアログの初期位置GUI調整 (svn:2752 upatchid:378 novice)
    • タグジャンプダイアログのリサイズ (svn:2754 upatchid:363 Moca)
    • 共通設定-バックアップのGUI調整 (svn:2766 upatchid:386 novice)
      • @@ -100,7 +100,7 @@

      Mar. 11, 2013 (2.0.6.0)

    • プラグインの最大個数を20から40に変更 (svn:2366 upatch:3396061 syat)
    • 外部ヘルプ1でもHTMLヘルプを表示 (svn:2428 upatch:3571858 Moca)
    • 検索置換キー長制限の撤廃 (svn:2453 upatch:3462954 Moca)
      • -
    • Grep終了後Grep画面のフォルダを検索したフォルダに変更する(svn:2473 upatchid:269 Uchi)
      • +
    • Grep終了後Grep画面のフォルダーを検索したフォルダーに変更する(svn:2473 upatchid:269 Uchi)
    • 正規表現キーワードを最大1000文字に (svn:2499 upatchid:237 Moca)
    • 初期値にないキーコードへの割り当てに対応 (svn:2505 upatchid:282 aroka)
    • 検索入力コンボボックスに画面のフォントを設定します (svn:2509 upatchid:287 Uchi)
      • @@ -378,8 +378,8 @@

      Feb. 11, 2011 (2.0.0.0)

    • タブバーへのタブ追加時のビューのちらつき（Vista/7）を抑止する (svn:1870 unicode:1447 ryoji)
    • タイプ別設定一覧画面でのインポート/エクスポート操作でメモリリーク (svn:1865 unicode:1442 ryoji)
    • インデントプラグインと「改行時に末尾の空白を削除」併用でクラッシュする (svn:1862 upatch:3140869 unicode:1436 syat)
      • -
    • タイプ別設定一覧画面でのエクスポート操作で保存ダイアログの初期フォルダが不正(2) (svn:1860 unicode:1423 ryoji)
      • -
    • タイプ別設定一覧画面でのエクスポート操作で保存ダイアログの初期フォルダが不正 (svn:1859 unicode:1422 ryoji)
      • +
    • タイプ別設定一覧画面でのエクスポート操作で保存ダイアログの初期フォルダーが不正(2) (svn:1860 unicode:1423 ryoji)
      • +
    • タイプ別設定一覧画面でのエクスポート操作で保存ダイアログの初期フォルダーが不正 (svn:1859 unicode:1422 ryoji)
    • 行頭以外からの選択だと[折り返し位置に改行を付けてコピー]で最初の折り返しに改行が付かない (svn:1855 unicode:1418 ryoji)
    • [選択範囲内全行コピー]等の全行選択の挙動が不正 (svn:1854 unicode:1417 ryoji)
    • 画面上端よりも上にある矩形選択を解除するとルーラーが反転表示になる (svn:1851 unicode:1414 ryoji)
      • diff --git a/help/sakura/res/HLP_UR016.html b/help/sakura/res/HLP_UR016.html index 5d291f0b2b..71a3321e69 100644 --- a/help/sakura/res/HLP_UR016.html +++ b/help/sakura/res/HLP_UR016.html @@ -91,7 +91,7 @@

      May. 5, 2014 (2.1.1.2)

    • GetDocumentationの修正 (svn:3664 upatchid:788 Moca)
    • PPAでS_GREPで異常終了する (svn:3665 upatchid:782 Moca)
    • 折り返し行で1文字削除した場合のRedoでエラー(r3477-) (svn:3666 upatchid:790 Moca)
      • -
    • Grepフォルダの解析処理変更 (svn:3667 upatchid:785 unicode:2138 novice)
      • +
    • Grepフォルダーの解析処理変更 (svn:3667 upatchid:785 unicode:2138 novice)
    • このタブ以外を閉じるのアクセスキー不正 (svn:3679 upatchid:798 Moca)
    • 文字コード不一致時のダイアログ表示 (svn:3681 upatchid:800 novice)
    • gccでお気に入りダイアログでフリーズする (svn:3697 upatchid:791 Moca)
      • @@ -148,7 +148,7 @@

      Jan. 25, 2014 (2.1.1.0)

    • DIFFの色分けをデフォルトで有効にする (svn:3542 upatchid:730 Moca)
    • 変更行の色属性をDIFF・ブックマーク時に継承する (svn:3543 upatchid:731 Moca)
    • コントロールコードの入力で改行コード変換をしないように (svn:3546 upatchid:714 Moca)
      • -
    • Grep実行後カレントフォルダを移動しないオプション (svn:3562 upatchid:742 Moca)
      • +
    • Grep実行後カレントフォルダーを移動しないオプション (svn:3562 upatchid:742 Moca)